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.
104 lines
2.8 KiB
JavaScript
104 lines
2.8 KiB
JavaScript
/*
|
|
MIT License http://www.opensource.org/licenses/mit-license.php
|
|
Author Tobias Koppers @sokra
|
|
*/
|
|
|
|
"use strict";
|
|
|
|
const DescriptionFileUtils = require("./DescriptionFileUtils");
|
|
|
|
/** @typedef {import("./Resolver")} Resolver */
|
|
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
|
|
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
|
|
|
|
const BACKSLASH_G = /\\/g;
|
|
|
|
module.exports = class DescriptionFilePlugin {
|
|
/**
|
|
* @param {string | ResolveStepHook} source source
|
|
* @param {string[]} filenames filenames
|
|
* @param {boolean} pathIsFile pathIsFile
|
|
* @param {string | ResolveStepHook} target target
|
|
*/
|
|
constructor(source, filenames, pathIsFile, target) {
|
|
this.source = source;
|
|
this.filenames = filenames;
|
|
this.pathIsFile = pathIsFile;
|
|
this.target = target;
|
|
}
|
|
|
|
/**
|
|
* @param {Resolver} resolver the resolver
|
|
* @returns {void}
|
|
*/
|
|
apply(resolver) {
|
|
const target = resolver.ensureHook(this.target);
|
|
resolver
|
|
.getHook(this.source)
|
|
.tapAsync(
|
|
"DescriptionFilePlugin",
|
|
(request, resolveContext, callback) => {
|
|
const { path } = request;
|
|
if (!path) return callback();
|
|
const directory = this.pathIsFile
|
|
? DescriptionFileUtils.cdUp(path)
|
|
: path;
|
|
if (!directory) return callback();
|
|
DescriptionFileUtils.loadDescriptionFile(
|
|
resolver,
|
|
directory,
|
|
this.filenames,
|
|
request.descriptionFilePath
|
|
? {
|
|
path: request.descriptionFilePath,
|
|
content: request.descriptionFileData,
|
|
directory:
|
|
/** @type {string} */
|
|
(request.descriptionFileRoot),
|
|
}
|
|
: undefined,
|
|
resolveContext,
|
|
(err, result) => {
|
|
if (err) return callback(err);
|
|
if (!result) {
|
|
if (resolveContext.log) {
|
|
resolveContext.log(
|
|
`No description file found in ${directory} or above`,
|
|
);
|
|
}
|
|
return callback();
|
|
}
|
|
const rawRelative = path.slice(result.directory.length);
|
|
const relativePath = `.${
|
|
rawRelative.includes("\\")
|
|
? rawRelative.replace(BACKSLASH_G, "/")
|
|
: rawRelative
|
|
}`;
|
|
/** @type {ResolveRequest} */
|
|
const obj = {
|
|
...request,
|
|
descriptionFilePath: result.path,
|
|
descriptionFileData: result.content,
|
|
descriptionFileRoot: result.directory,
|
|
relativePath,
|
|
};
|
|
resolver.doResolve(
|
|
target,
|
|
obj,
|
|
`using description file: ${result.path} (relative path: ${relativePath})`,
|
|
resolveContext,
|
|
(err, result) => {
|
|
if (err) return callback(err);
|
|
|
|
// Don't allow other processing
|
|
if (result === undefined) return callback(null, null);
|
|
callback(null, result);
|
|
},
|
|
);
|
|
},
|
|
);
|
|
},
|
|
);
|
|
}
|
|
};
|