@genesislcap/genx 15.64.2-alpha-241aa02942.0 → 15.65.0

package/dist/index.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const node_path_1 = require("node:path");
 const build_kit_1 = require("@genesislcap/build-kit");
 const cac_1 = tslib_1.__importDefault(require("cac"));
 const consola_1 = require("consola");
 const commands_1 = require("./commands");
-const dev_env_supervisor_1 = require("./dev-env-supervisor");
 const packageJSON = require('../package.json');
 process.on('unhandledRejection', (err) => {
     consola_1.consola.error('[unhandledRejection]', err);
@@ -82,12 +80,6 @@ cli
     .option('-n, --no-open', "Don't launch browser window")
     .option('-e, --env <ENV_VAR1=VAL1,ENV_VAR2=VAL2,ENV3>', 'Set environment variables')
     .action((folder, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const cwd = folder ? (0, node_path_1.resolve)(folder) : process.cwd();
-    const ctx = yield (0, build_kit_1.loadBuildContext)(cwd, build_kit_1.COMMAND.DEV, options);
-    if ((0, dev_env_supervisor_1.shouldSupervise)(process.env, (0, dev_env_supervisor_1.builderId)(ctx))) {
-        (0, dev_env_supervisor_1.superviseDev)({ cwd });
-        return;
-    }
     const action = yield commands_1.commands.runBuilder();
     action(folder, options, build_kit_1.ENV.DEV, build_kit_1.COMMAND.DEV);
 }));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/genx",
   "description": "Genx CLI",
-  "version": "15.64.2-alpha-241aa02942.0",
+  "version": "15.65.0",
   "license": "SEE LICENSE IN license.txt",
   "engines": {
     "node": ">=22.0.0"
@@ -18,20 +18,20 @@
     "genx": "./bin/genx"
   },
   "dependencies": {
-    "@genesislcap/build-kit": "15.64.2-alpha-241aa02942.0",
-    "@genesislcap/eslint-stylelint-builder": "15.64.2-alpha-241aa02942.0",
-    "@genesislcap/event-type-codegen": "15.64.2-alpha-241aa02942.0",
-    "@genesislcap/rollup-builder": "15.64.2-alpha-241aa02942.0",
-    "@genesislcap/ts-builder": "15.64.2-alpha-241aa02942.0",
-    "@genesislcap/uvu-playwright-builder": "15.64.2-alpha-241aa02942.0",
-    "@genesislcap/vite-builder": "15.64.2-alpha-241aa02942.0",
-    "@genesislcap/webpack-builder": "15.64.2-alpha-241aa02942.0",
+    "@genesislcap/build-kit": "15.65.0",
+    "@genesislcap/eslint-stylelint-builder": "15.65.0",
+    "@genesislcap/event-type-codegen": "15.65.0",
+    "@genesislcap/rollup-builder": "15.65.0",
+    "@genesislcap/ts-builder": "15.65.0",
+    "@genesislcap/uvu-playwright-builder": "15.65.0",
+    "@genesislcap/vite-builder": "15.65.0",
+    "@genesislcap/webpack-builder": "15.65.0",
     "cac": "^6.7.14",
     "consola": "^3.0.2",
     "serve-handler": "^6.1.5"
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "15.64.2-alpha-241aa02942.0"
+    "@genesislcap/foundation-testing": "15.65.0"
   },
   "repository": {
     "type": "git",

package/dist/dev-env-supervisor.d.ts

@@ -1,43 +0,0 @@
-import type { BuildContext } from '@genesislcap/build-kit';
-/**
- * Parent genx process. The child runs the real `dev` command and must not supervise again.
- * A full process restart is required: Vite defines and the dev proxy are captured once at startup.
- */
-export declare const ENV_RESTART_CHILD = "GENX_DEV_ENV_RESTART_CHILD";
-/**
- * One editor save is several filesystem events. Restarting on each of them kills the new
- * process mid dependency scan ("The server is being restarted or closed").
- */
-export declare const DEBOUNCE_MS = 300;
-export declare const ENV_RESTART_LOG = "\n[dev] .env changed, restarting dev server\n";
-export interface SupervisedChild {
-    readonly exitCode: number | null;
-    kill(signal?: NodeJS.Signals | number): boolean;
-}
-export declare function builderId(ctx: BuildContext): string;
-export declare function shouldSupervise(env: NodeJS.ProcessEnv, builder: string): boolean;
-/** Later spawns pass this so a .env save does not open another browser tab. */
-export declare function restartExtraArgs(argv: readonly string[]): string[];
-export declare function isEnvWatchFilename(filename: string | Buffer | null): boolean;
-type CancelTimer = () => void;
-export declare function createEnvRestartController(deps: {
-    readEnv: () => Buffer;
-    spawn: (extraArgs: string[]) => SupervisedChild;
-    kill: (child: SupervisedChild, signal: NodeJS.Signals) => void;
-    onChildExit: (cb: (code: number | null) => void) => void;
-    exit: (code: number) => void;
-    log: (message: string) => void;
-    debounceMs?: number;
-    argv?: readonly string[];
-    schedule?: (callback: () => void, delayMs: number) => CancelTimer;
-}): {
-    scheduleRestart: () => void;
-    shutdown: (signal: NodeJS.Signals) => void;
-    start: () => void;
-};
-/** Watches `{cwd}/.env` and re-runs this CLI until the user stops it. Does not return into the builder. */
-export declare function superviseDev(options: {
-    cwd: string;
-}): void;
-export {};
-//# sourceMappingURL=dev-env-supervisor.d.ts.map

package/dist/dev-env-supervisor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dev-env-supervisor.d.ts","sourceRoot":"","sources":["../src/dev-env-supervisor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;GAGG;AACH,eAAO,MAAM,iBAAiB,+BAA+B,CAAC;AAE9D;;;GAGG;AACH,eAAO,MAAM,WAAW,MAAM,CAAC;AAE/B,eAAO,MAAM,eAAe,kDAAkD,CAAC;AAE/E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;CACjD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAQnD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAEhF;AAED,+EAA+E;AAC/E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAGlE;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,OAAO,CAI5E;AAED,KAAK,WAAW,GAAG,MAAM,IAAI,CAAC;AAE9B,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAC/C,OAAO,EAAE,MAAM,MAAM,CAAC;IACtB,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,eAAe,CAAC;IAChD,IAAI,EAAE,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IAC/D,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,KAAK,IAAI,CAAC;IACzD,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,OAAO,EAAE,MAAM,KAAK,WAAW,CAAC;CACnE,GAAG;IACF,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IAC3C,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAgFA;AAUD,2GAA2G;AAC3G,wBAAgB,YAAY,CAAC,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAiC3D"}

package/dist/dev-env-supervisor.js

@@ -1,168 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENV_RESTART_LOG = exports.DEBOUNCE_MS = exports.ENV_RESTART_CHILD = void 0;
-exports.builderId = builderId;
-exports.shouldSupervise = shouldSupervise;
-exports.restartExtraArgs = restartExtraArgs;
-exports.isEnvWatchFilename = isEnvWatchFilename;
-exports.createEnvRestartController = createEnvRestartController;
-exports.superviseDev = superviseDev;
-const node_child_process_1 = require("node:child_process");
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-/**
- * Parent genx process. The child runs the real `dev` command and must not supervise again.
- * A full process restart is required: Vite defines and the dev proxy are captured once at startup.
- */
-exports.ENV_RESTART_CHILD = 'GENX_DEV_ENV_RESTART_CHILD';
-/**
- * One editor save is several filesystem events. Restarting on each of them kills the new
- * process mid dependency scan ("The server is being restarted or closed").
- */
-exports.DEBOUNCE_MS = 300;
-exports.ENV_RESTART_LOG = '\n[dev] .env changed, restarting dev server\n';
-function builderId(ctx) {
-    var _a, _b;
-    const { command, options: { builder }, } = ctx.cli;
-    // Same precedence as resolveBuilder in ./utils/builder.ts
-    const id = builder || ((_a = ctx.config.builder) === null || _a === void 0 ? void 0 : _a[command]) || ((_b = ctx.config.builder) === null || _b === void 0 ? void 0 : _b.default) || '';
-    return String(id).toLowerCase();
-}
-function shouldSupervise(env, builder) {
-    return env[exports.ENV_RESTART_CHILD] !== '1' && builder === 'vite';
-}
-/** Later spawns pass this so a .env save does not open another browser tab. */
-function restartExtraArgs(argv) {
-    if (argv.includes('--no-open') || argv.includes('-n'))
-        return [];
-    return ['--no-open'];
-}
-function isEnvWatchFilename(filename) {
-    if (filename == null)
-        return true;
-    const name = typeof filename === 'string' ? filename : filename.toString();
-    return name === '.env';
-}
-function createEnvRestartController(deps) {
-    var _a, _b, _c;
-    const debounceMs = (_a = deps.debounceMs) !== null && _a !== void 0 ? _a : exports.DEBOUNCE_MS;
-    const argv = (_b = deps.argv) !== null && _b !== void 0 ? _b : [];
-    const schedule = (_c = deps.schedule) !== null && _c !== void 0 ? _c : ((callback, delayMs) => {
-        const timer = setTimeout(callback, delayMs);
-        return () => clearTimeout(timer);
-    });
-    let child = null;
-    let childExited = false;
-    let stopping = false;
-    let restarting = false;
-    let lastEnv = Buffer.alloc(0);
-    let cancelTimer;
-    const spawnChild = (extraArgs) => {
-        childExited = false;
-        child = deps.spawn(extraArgs);
-    };
-    const handleExit = (code) => {
-        childExited = true;
-        if (stopping) {
-            restarting = false;
-            deps.exit(code !== null && code !== void 0 ? code : 0);
-            return;
-        }
-        if (restarting) {
-            restarting = false;
-            if (!stopping)
-                spawnChild(restartExtraArgs(argv));
-            return;
-        }
-        deps.exit(code !== null && code !== void 0 ? code : 0);
-    };
-    deps.onChildExit(handleExit);
-    const restart = () => {
-        if (stopping || restarting)
-            return;
-        const nextEnv = Buffer.from(deps.readEnv());
-        if (nextEnv.equals(lastEnv))
-            return;
-        lastEnv = nextEnv;
-        restarting = true;
-        deps.log(exports.ENV_RESTART_LOG);
-        if (!child || childExited) {
-            restarting = false;
-            if (!stopping)
-                spawnChild(restartExtraArgs(argv));
-            return;
-        }
-        // SIGKILL, not SIGTERM: a graceful stop during Vite's dep scan is raced by the next start.
-        deps.kill(child, 'SIGKILL');
-    };
-    return {
-        start() {
-            lastEnv = Buffer.from(deps.readEnv());
-            spawnChild([]);
-        },
-        scheduleRestart() {
-            if (stopping)
-                return;
-            cancelTimer === null || cancelTimer === void 0 ? void 0 : cancelTimer();
-            cancelTimer = schedule(() => {
-                cancelTimer = undefined;
-                restart();
-            }, debounceMs);
-        },
-        shutdown(signal) {
-            if (stopping)
-                return;
-            stopping = true;
-            cancelTimer === null || cancelTimer === void 0 ? void 0 : cancelTimer();
-            cancelTimer = undefined;
-            if (child && !childExited) {
-                deps.kill(child, signal);
-                return;
-            }
-            deps.exit(0);
-        },
-    };
-}
-function readEnvFile(cwd) {
-    try {
-        return (0, node_fs_1.readFileSync)((0, node_path_1.resolve)(cwd, '.env'));
-    }
-    catch (_a) {
-        return Buffer.alloc(0);
-    }
-}
-/** Watches `{cwd}/.env` and re-runs this CLI until the user stops it. Does not return into the builder. */
-function superviseDev(options) {
-    let notifyExit = () => { };
-    const controller = createEnvRestartController({
-        argv: process.argv,
-        readEnv: () => readEnvFile(options.cwd),
-        spawn(extraArgs) {
-            const child = (0, node_child_process_1.spawn)(process.execPath, [...process.argv.slice(1), ...extraArgs], {
-                stdio: 'inherit',
-                env: Object.assign(Object.assign({}, process.env), { [exports.ENV_RESTART_CHILD]: '1' }),
-            });
-            child.on('exit', (code) => notifyExit(code));
-            return child;
-        },
-        kill(child, signal) {
-            child.kill(signal);
-        },
-        onChildExit(cb) {
-            notifyExit = cb;
-        },
-        exit(code) {
-            process.exit(code);
-        },
-        log(message) {
-            console.log(message);
-        },
-    });
-    (0, node_fs_1.watch)(options.cwd, (_event, filename) => {
-        if (isEnvWatchFilename(filename))
-            controller.scheduleRestart();
-    });
-    process.on('SIGINT', () => controller.shutdown('SIGINT'));
-    process.on('SIGTERM', () => controller.shutdown('SIGTERM'));
-    controller.start();
-}