Problem: the hexagonal refactor churns the backend tree for nine more phases; the UI delivery stack (web/ SPA, cmd/desktop Wails wrapper, compose/web image) must move to its own repo first so doc/layout rewrites land once on a backend-only tree. Change: - New repo git.hubris.network/dtoro/oikos-web (v0.33.0): web/, desktop/ (updateURL repointed to oikos-web releases), compose/, own CI (web + desktop jobs), own deploy script (CI-green gate, TOCTOU guard, version-tagged images, prune-to-3), own webhook receiver on :9798 + launchd unit, own compose project publishing the same 8091:80. - Cutover executed on mac-mini in order: oikos stack's web service stopped+removed, oikos-web project brought up on 8091; outer Caddy untouched (targets the published port) — serving + Authentik flow + /wails 404 quirk verified post-cutover. - Stripped from oikos: web/, cmd/desktop/, compose/web/, desktop CI workflow, ci.yml web job, Makefile ui/desktop/desktop-package/install targets, the compose web service, oikos-web from deploy.sh's fallback prune list; wails + go-keyring dropped from go.mod, vendor synced. - README / CONTRIBUTING / AGENTS.md / .agents dev+operations docs now point at the new repo; mbse + mascot design docs carry a path note. Risk: production SPA serving depends on the new pipeline now; rollback is versioned-image re-up of the old web service from a pre-split checkout (port 8091). Desktop builds installed before the split still check dtoro/oikos releases — one manual reinstall, noted in the oikos-web release notes. Verification: go vet, make test (race), make generate-check, golangci (no new findings; baseline down 400→365); post-cutover curls — localhost:8091 200, /wails/runtime.js 404, outer Caddy 302 Authentik.
50 lines
1.3 KiB
JavaScript
50 lines
1.3 KiB
JavaScript
'use strict'
|
|
|
|
// given a set of versions and a range, create a "simplified" range
|
|
// that includes the same versions that the original range does
|
|
// If the original range is shorter than the simplified one, return that.
|
|
const satisfies = require('../functions/satisfies.js')
|
|
const compare = require('../functions/compare.js')
|
|
module.exports = (versions, range, options) => {
|
|
const set = []
|
|
let first = null
|
|
let prev = null
|
|
const v = versions.sort((a, b) => compare(a, b, options))
|
|
for (const version of v) {
|
|
const included = satisfies(version, range, options)
|
|
if (included) {
|
|
prev = version
|
|
if (!first) {
|
|
first = version
|
|
}
|
|
} else {
|
|
if (prev) {
|
|
set.push([first, prev])
|
|
}
|
|
prev = null
|
|
first = null
|
|
}
|
|
}
|
|
if (first) {
|
|
set.push([first, null])
|
|
}
|
|
|
|
const ranges = []
|
|
for (const [min, max] of set) {
|
|
if (min === max) {
|
|
ranges.push(min)
|
|
} else if (!max && min === v[0]) {
|
|
ranges.push('*')
|
|
} else if (!max) {
|
|
ranges.push(`>=${min}`)
|
|
} else if (min === v[0]) {
|
|
ranges.push(`<=${max}`)
|
|
} else {
|
|
ranges.push(`${min} - ${max}`)
|
|
}
|
|
}
|
|
const simplified = ranges.join(' || ')
|
|
const original = typeof range.raw === 'string' ? range.raw : String(range)
|
|
return simplified.length < original.length ? simplified : range
|
|
}
|