feat: Phase 1 — extract the client (web SPA + desktop) to dtoro/oikos-web
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.
This commit is contained in:
77
web/node_modules/strip-json-comments/index.js
generated
vendored
Normal file
77
web/node_modules/strip-json-comments/index.js
generated
vendored
Normal file
@@ -0,0 +1,77 @@
|
||||
'use strict';
|
||||
const singleComment = Symbol('singleComment');
|
||||
const multiComment = Symbol('multiComment');
|
||||
const stripWithoutWhitespace = () => '';
|
||||
const stripWithWhitespace = (string, start, end) => string.slice(start, end).replace(/\S/g, ' ');
|
||||
|
||||
const isEscaped = (jsonString, quotePosition) => {
|
||||
let index = quotePosition - 1;
|
||||
let backslashCount = 0;
|
||||
|
||||
while (jsonString[index] === '\\') {
|
||||
index -= 1;
|
||||
backslashCount += 1;
|
||||
}
|
||||
|
||||
return Boolean(backslashCount % 2);
|
||||
};
|
||||
|
||||
module.exports = (jsonString, options = {}) => {
|
||||
if (typeof jsonString !== 'string') {
|
||||
throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``);
|
||||
}
|
||||
|
||||
const strip = options.whitespace === false ? stripWithoutWhitespace : stripWithWhitespace;
|
||||
|
||||
let insideString = false;
|
||||
let insideComment = false;
|
||||
let offset = 0;
|
||||
let result = '';
|
||||
|
||||
for (let i = 0; i < jsonString.length; i++) {
|
||||
const currentCharacter = jsonString[i];
|
||||
const nextCharacter = jsonString[i + 1];
|
||||
|
||||
if (!insideComment && currentCharacter === '"') {
|
||||
const escaped = isEscaped(jsonString, i);
|
||||
if (!escaped) {
|
||||
insideString = !insideString;
|
||||
}
|
||||
}
|
||||
|
||||
if (insideString) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!insideComment && currentCharacter + nextCharacter === '//') {
|
||||
result += jsonString.slice(offset, i);
|
||||
offset = i;
|
||||
insideComment = singleComment;
|
||||
i++;
|
||||
} else if (insideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
|
||||
i++;
|
||||
insideComment = false;
|
||||
result += strip(jsonString, offset, i);
|
||||
offset = i;
|
||||
continue;
|
||||
} else if (insideComment === singleComment && currentCharacter === '\n') {
|
||||
insideComment = false;
|
||||
result += strip(jsonString, offset, i);
|
||||
offset = i;
|
||||
} else if (!insideComment && currentCharacter + nextCharacter === '/*') {
|
||||
result += jsonString.slice(offset, i);
|
||||
offset = i;
|
||||
insideComment = multiComment;
|
||||
i++;
|
||||
continue;
|
||||
} else if (insideComment === multiComment && currentCharacter + nextCharacter === '*/') {
|
||||
i++;
|
||||
insideComment = false;
|
||||
result += strip(jsonString, offset, i + 1);
|
||||
offset = i + 1;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
return result + (insideComment ? strip(jsonString.slice(offset)) : jsonString.slice(offset));
|
||||
};
|
||||
Reference in New Issue
Block a user