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.
125 lines
3.5 KiB
JavaScript
125 lines
3.5 KiB
JavaScript
import { dirname, join } from "node:path";
|
|
import { fileURLToPath } from "node:url";
|
|
import { existsSync } from "node:fs";
|
|
import { readFile } from "node:fs/promises";
|
|
import { isBuiltin } from "node:module";
|
|
import { createJiti } from "./jiti.mjs";
|
|
|
|
let jiti;
|
|
|
|
// https://nodejs.org/api/module.html#initialize
|
|
export async function initialize() {
|
|
jiti = createJiti();
|
|
}
|
|
|
|
// https://nodejs.org/api/module.html#resolvespecifier-context-nextresolve
|
|
export async function resolve(specifier, context, nextResolve) {
|
|
if (_shouldSkip(specifier)) {
|
|
return nextResolve(specifier, context);
|
|
}
|
|
const resolvedPath = jiti.esmResolve(specifier, {
|
|
parentURL: context?.parentURL,
|
|
conditions: context?.conditions,
|
|
});
|
|
return {
|
|
url: resolvedPath,
|
|
shortCircuit: true,
|
|
};
|
|
}
|
|
|
|
// https://nodejs.org/api/module.html#loadurl-context-nextload
|
|
export async function load(url, context, nextLoad) {
|
|
if (_shouldSkip(url)) {
|
|
return nextLoad(url, context);
|
|
}
|
|
|
|
const filename = fileURLToPath(url);
|
|
|
|
if (url.endsWith(".js")) {
|
|
const pkg = await _findClosestPackageJson(dirname(filename));
|
|
if (pkg && pkg.type === "module") {
|
|
return nextLoad(url, context);
|
|
}
|
|
}
|
|
|
|
const rawSource = await readFile(filename, "utf8");
|
|
|
|
if (url.endsWith(".json")) {
|
|
const pkg = await _findClosestPackageJson(dirname(filename));
|
|
return pkg && pkg.type === "module"
|
|
? {
|
|
source: `export default ${rawSource}`,
|
|
format: "module",
|
|
shortCircuit: true,
|
|
}
|
|
: {
|
|
source: `module.exports = ${rawSource}`,
|
|
format: "commonjs",
|
|
shortCircuit: true,
|
|
};
|
|
}
|
|
|
|
const transpiledSource = jiti.transform({
|
|
source: rawSource,
|
|
filename: filename,
|
|
ts: url.endsWith("ts"),
|
|
retainLines: true,
|
|
async: true,
|
|
jsx: jiti.options.jsx,
|
|
});
|
|
|
|
if (url.endsWith(".js") && !transpiledSource.includes("jitiImport")) {
|
|
return {
|
|
source: transpiledSource,
|
|
format: "commonjs",
|
|
shortCircuit: true,
|
|
};
|
|
}
|
|
|
|
return {
|
|
source: _wrapSource(transpiledSource, filename),
|
|
format: "module",
|
|
shortCircuit: true,
|
|
};
|
|
}
|
|
|
|
function _wrapSource(source, filename) {
|
|
const _jitiPath = new URL("jiti.mjs", import.meta.url).href;
|
|
return /*js*/ `import { createJiti as __createJiti__ } from ${JSON.stringify(_jitiPath)};async function _module(exports, require, module, __filename, __dirname, jitiImport) { ${source}\n};
|
|
// GENERATED BY JITI ESM LOADER
|
|
const filename = ${JSON.stringify(filename)};
|
|
const dirname = ${JSON.stringify(dirname(filename))};
|
|
const jiti = __createJiti__(filename);
|
|
const module = { exports: Object.create(null) };
|
|
await _module(module.exports, jiti, module, filename, dirname, jiti.import);
|
|
if (module.exports && module.exports.__JITI_ERROR__) {
|
|
const { filename, line, column, code, message } =
|
|
module.exports.__JITI_ERROR__;
|
|
const loc = [filename, line, column].join(':');
|
|
const err = new Error(code + ": " + message + " " + loc);
|
|
Error.captureStackTrace(err, _module);
|
|
throw err;
|
|
}
|
|
export default module.exports;
|
|
`;
|
|
}
|
|
|
|
function _shouldSkip(url) {
|
|
return (
|
|
!jiti ||
|
|
url.endsWith(".mjs") ||
|
|
url.endsWith(".cjs") ||
|
|
(!url.startsWith("./") && !url.startsWith("file://")) ||
|
|
isBuiltin(url)
|
|
);
|
|
}
|
|
|
|
async function _findClosestPackageJson(dir) {
|
|
if (dir === "/") return null;
|
|
const packageJsonPath = join(dir, "package.json");
|
|
if (existsSync(packageJsonPath)) {
|
|
return JSON.parse(await readFile(packageJsonPath, "utf8"));
|
|
}
|
|
return _findClosestPackageJson(dirname(dir));
|
|
}
|