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.
66 lines
2.0 KiB
JavaScript
66 lines
2.0 KiB
JavaScript
"use strict";
|
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
exports.fixLocations = fixLocations;
|
|
const traverse_1 = require("../traverse");
|
|
/** Fix locations */
|
|
function fixLocations(node, tokens, comments, offset, visitorKeys, ctx) {
|
|
if (offset === 0) {
|
|
return;
|
|
}
|
|
const traversed = new Set();
|
|
(0, traverse_1.traverseNodes)(node, {
|
|
visitorKeys,
|
|
enterNode: (n) => {
|
|
if (traversed.has(n)) {
|
|
return;
|
|
}
|
|
traversed.add(n);
|
|
if (traversed.has(n.range)) {
|
|
if (!traversed.has(n.loc)) {
|
|
// However, `Node#loc` may not be shared.
|
|
const locs = ctx.getConvertLocation({
|
|
start: n.range[0],
|
|
end: n.range[1],
|
|
});
|
|
applyLocs(n, locs);
|
|
traversed.add(n.loc);
|
|
}
|
|
}
|
|
else {
|
|
const start = n.range[0] + offset;
|
|
const end = n.range[1] + offset;
|
|
const locs = ctx.getConvertLocation({ start, end });
|
|
applyLocs(n, locs);
|
|
traversed.add(n.range);
|
|
traversed.add(n.loc);
|
|
}
|
|
},
|
|
leaveNode: Function.prototype,
|
|
});
|
|
for (const t of tokens) {
|
|
const start = t.range[0] + offset;
|
|
const end = t.range[1] + offset;
|
|
const locs = ctx.getConvertLocation({ start, end });
|
|
applyLocs(t, locs);
|
|
}
|
|
for (const t of comments) {
|
|
const start = t.range[0] + offset;
|
|
const end = t.range[1] + offset;
|
|
const locs = ctx.getConvertLocation({ start, end });
|
|
applyLocs(t, locs);
|
|
}
|
|
}
|
|
/**
|
|
* applyLocs
|
|
*/
|
|
function applyLocs(target, locs) {
|
|
target.loc = locs.loc;
|
|
target.range = locs.range;
|
|
if (typeof target.start === "number") {
|
|
delete target.start;
|
|
}
|
|
if (typeof target.end === "number") {
|
|
delete target.end;
|
|
}
|
|
}
|