@genesislcap/vite-builder 15.76.0 → 15.77.0-GENC-1660.7

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;yBA0CrC,KAAK,YAAY;AAAvC,wBAqOE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;yBA4CrC,KAAK,YAAY;AAAvC,wBA6RE"}

package/dist/index.js

@@ -35,21 +35,118 @@ const VITE_DEFAULT_DEP_SCAN_ENTRIES = ['**/*.html', '!**/__tests__/**', '!**/cov
 exports.default = (ctx) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d;
     const { config: { app: { rootElement }, env, http, }, dirs: { cwd }, cli: { isDev, isBuild, isAnalyze, options: { open, https }, }, pkg: { description }, resolve: { alias }, } = ctx;
-    const define = (0, build_kit_1.resolveDefineConfig)(env, http, 'vite');
     /**
-     * The same map, narrowed to keys esbuild will accept as defines (see the `esbuildOptions` note in
-     * `optimizeDeps` below for why the optimizer needs it at all).
+     * Everything derived from `process.env`. Returned from the `genesis-env` plugin's `config` hook
+     * rather than baked into the inline config, so it is recomputed whenever Vite resolves config.
+     */
+    let publicPath = (0, build_kit_1.getPublicPath)();
+    const envConfig = () => {
+        const define = (0, build_kit_1.resolveDefineConfig)(env, http, 'vite');
+        /**
+         * The same map, narrowed to keys esbuild will accept as defines (see the `esbuildOptions` note
+         * below for why the optimizer needs it at all).
+         *
+         * `resolveDefineConfig` derives its keys from `process.env` via pattern match, so a machine with,
+         * say, `GENX-SOMETHING` set would produce a key that is not a valid JS identifier. Vite tolerates
+         * that in its own `define`; esbuild rejects the whole build. Filtering keeps a stray environment
+         * variable from turning into a hard build failure for everyone.
+         */
+        const IDENTIFIER = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
+        const depDefine = Object.fromEntries(Object.entries(define).filter(([key]) => IDENTIFIER.test(key)));
+        publicPath = (0, build_kit_1.getPublicPath)();
+        return {
+            define,
+            base: publicPath,
+            optimizeDeps: {
+                /**
+                 * GENC-1581 — the `define` above is applied when Vite TRANSFORMS source, but dependency
+                 * pre-bundling is a separate esbuild pass that does not inherit it. Any env-driven global
+                 * consumed from inside a pre-bundled dependency was therefore left as a bare identifier in
+                 * `node_modules/.vite/deps`, and silently resolved to `undefined` at runtime.
+                 *
+                 * MEASURED before this change: the served `@genesislcap/foundation-utils` chunk contained
+                 * `_DEFAULT_USER = DEFAULT_USER;` with no substitution, and the configured value appeared
+                 * nowhere in the bundle. `foundation-utils` reads these behind `try {} catch {}`, so the
+                 * resulting ReferenceError was swallowed and the variable simply stayed undefined — no
+                 * error, no warning, just a feature that never worked. `DEFAULT_USER`/`DEFAULT_PASSWORD`
+                 * (login pre-fill) is the case that surfaced it; every dependency-resident define was
+                 * equally affected. `API_HOST` masked the problem because `foundation-comms` falls back to
+                 * deriving it from `location`, and the dev proxy makes that fallback correct.
+                 *
+                 * Passing the same map to the optimizer's esbuild keeps source and dependencies consistent.
+                 * Vite hashes `optimizeDeps` into the dep-cache key, so changing a value re-optimizes rather
+                 * than silently serving a stale chunk.
+                 */
+                esbuildOptions: {
+                    define: Object.assign({ 
+                        /**
+                         * Vite seeds its OWN optimizer define with `process.env.NODE_ENV` and then spreads
+                         * `esbuildOptions` straight over it (`vite/dist/node/chunks/config.js`: `define: define$1,
+                         * … …esbuildOptions,` — note `supported` gets an explicit deep-merge just below and
+                         * `define` does not). So a bare `define` here REPLACES that map rather than adding to it,
+                         * and pre-bundled deps lose the substitution.
+                         *
+                         * That is not academic: `@reduxjs/toolkit` resolves through its `module` condition to
+                         * `redux-toolkit.modern.mjs` (57 bare `process.env.NODE_ENV` reads) plus `redux` (22),
+                         * and `foundation-redux/src/store.ts` calls `configureStore` at module scope — so any app
+                         * pulling in `@genesislcap/foundation-redux` would get `ReferenceError: process is not
+                         * defined` out of the dep chunk. Dev only (`vite build` applies `define` through Rollup
+                         * for node_modules too), which is exactly the path this change targets.
+                         *
+                         * Re-seeded before the spread. `depDefine` cannot collide with it: its keys are filtered
+                         * to bare identifiers, and this one is dotted.
+                         */
+                        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || (isDev ? 'development' : 'production')) }, depDefine),
+                },
+            },
+            // Dev only: createDevProxies logs its table, which `vite build` must not print
+            server: isDev ? { proxy: (0, build_kit_1.createDevProxies)() } : undefined,
+        };
+    };
+    /**
+     * FUI-2654 — Vite already restarts the dev server in-process when a `.env` file in `envDir` (the
+     * root) changes, but the restart re-resolves the same inline config object, so defines, `base`
+     * and the proxy target captured at startup stayed stale until a manual restart. Plugin `config`
+     * hooks DO re-run on every restart, so reload the env files and hand back fresh values here.
      *
-     * `resolveDefineConfig` derives its keys from `process.env` via pattern match, so a machine with,
-     * say, `GENX-SOMETHING` set would produce a key that is not a valid JS identifier. Vite tolerates
-     * that in its own `define`; esbuild rejects the whole build. Filtering keeps a stray environment
-     * variable from turning into a hard build failure for everyone.
+     * Vite only restarts for `.env`, `.env.local`, `.env.[mode]` and `.env.[mode].local` in `envDir`,
+     * while genx also loads the workspace-root files and the `DOT_ENV_FILE` variants. Without
+     * `configureServer` below, a save in one of those was picked up only on the next restart.
      */
-    const IDENTIFIER = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
-    const depDefine = Object.fromEntries(Object.entries(define).filter(([key]) => IDENTIFIER.test(key)));
+    let isFirstConfig = true;
+    const envPlugin = {
+        name: 'genesis-env',
+        config() {
+            // The first resolve runs right after genx's own `setEnvVars`, which already loaded them
+            if (!isFirstConfig)
+                (0, build_kit_1.loadEnvFiles)(ctx);
+            isFirstConfig = false;
+            return envConfig();
+        },
+        configureServer(server) {
+            // Recomputed per server, as a restart may change DOT_ENV_FILE
+            const { envDir, logger, mode } = server.config;
+            const viteEnvFiles = envDir
+                ? ['.env', '.env.local', `.env.${mode}`, `.env.${mode}.local`].map((file) => (0, node_path_1.resolve)(envDir, file))
+                : [];
+            const extraEnvFiles = (0, build_kit_1.getEnvFilePaths)(ctx).filter((file) => !viteEnvFiles.includes(file));
+            server.watcher.add(extraEnvFiles);
+            const onEnvFileChange = (file) => {
+                if (!extraEnvFiles.includes((0, node_path_1.resolve)(file)))
+                    return;
+                logger.info(`${(0, node_path_1.relative)(process.cwd(), file)} changed, restarting server...`, {
+                    clear: true,
+                    timestamp: true,
+                });
+                // Concurrent calls share one restart, and the old watcher closes with the old server
+                server.restart().catch((e) => logger.error(String(e)));
+            };
+            server.watcher.on('add', onEnvFileChange);
+            server.watcher.on('change', onEnvFileChange);
+        },
+    };
     const handlebars = yield (0, vite_js_1.getHandlebarsModule)();
     const vite = yield (0, vite_js_1.getViteModule)();
-    const publicPath = (0, build_kit_1.getPublicPath)();
     const tsconfigPath = (0, node_path_1.resolve)(cwd, 'tsconfig.json');
     const buildMode = (_c = (_b = (_a = ctx.config.vite) === null || _a === void 0 ? void 0 : _a.checker) === null || _b === void 0 ? void 0 : _b.buildMode) !== null && _c !== void 0 ? _c : false;
     const checkerPlugin = (0, node_fs_1.existsSync)(tsconfigPath)
@@ -67,6 +164,7 @@ exports.default = (ctx) => tslib_1.__awaiter(void 0, void 0, void 0, function* (
     };
     const config = {
         plugins: [
+            envPlugin,
             baseHrefPlugin,
             ...(checkerPlugin ? [checkerPlugin] : []),
             handlebars({
@@ -128,7 +226,6 @@ exports.default = (ctx) => tslib_1.__awaiter(void 0, void 0, void 0, function* (
                 '@genesislcap/pbc-reporting',
             ],
         },
-        define,
         build: {
             /**
              * Left to Vite's production default (esbuild for JS and CSS) unless the app opts out, matching
@@ -162,48 +259,7 @@ exports.default = (ctx) => tslib_1.__awaiter(void 0, void 0, void 0, function* (
              * reference, should we convert the above to a glob.
              */
             include: ['@genesis-community/golden-layout'],
-            /**
-             * GENC-1581 — the `define` above is applied when Vite TRANSFORMS source, but dependency
-             * pre-bundling is a separate esbuild pass that does not inherit it. Any env-driven global
-             * consumed from inside a pre-bundled dependency was therefore left as a bare identifier in
-             * `node_modules/.vite/deps`, and silently resolved to `undefined` at runtime.
-             *
-             * MEASURED before this change: the served `@genesislcap/foundation-utils` chunk contained
-             * `_DEFAULT_USER = DEFAULT_USER;` with no substitution, and the configured value appeared
-             * nowhere in the bundle. `foundation-utils` reads these behind `try {} catch {}`, so the
-             * resulting ReferenceError was swallowed and the variable simply stayed undefined — no
-             * error, no warning, just a feature that never worked. `DEFAULT_USER`/`DEFAULT_PASSWORD`
-             * (login pre-fill) is the case that surfaced it; every dependency-resident define was
-             * equally affected. `API_HOST` masked the problem because `foundation-comms` falls back to
-             * deriving it from `location`, and the dev proxy makes that fallback correct.
-             *
-             * Passing the same map to the optimizer's esbuild keeps source and dependencies consistent.
-             * Vite hashes `optimizeDeps` into the dep-cache key, so changing a value re-optimizes rather
-             * than silently serving a stale chunk.
-             */
-            esbuildOptions: {
-                define: Object.assign({ 
-                    /**
-                     * Vite seeds its OWN optimizer define with `process.env.NODE_ENV` and then spreads
-                     * `esbuildOptions` straight over it (`vite/dist/node/chunks/config.js`: `define: define$1,
-                     * … …esbuildOptions,` — note `supported` gets an explicit deep-merge just below and
-                     * `define` does not). So a bare `define` here REPLACES that map rather than adding to it,
-                     * and pre-bundled deps lose the substitution.
-                     *
-                     * That is not academic: `@reduxjs/toolkit` resolves through its `module` condition to
-                     * `redux-toolkit.modern.mjs` (57 bare `process.env.NODE_ENV` reads) plus `redux` (22),
-                     * and `foundation-redux/src/store.ts` calls `configureStore` at module scope — so any app
-                     * pulling in `@genesislcap/foundation-redux` would get `ReferenceError: process is not
-                     * defined` out of the dep chunk. Dev only (`vite build` applies `define` through Rollup
-                     * for node_modules too), which is exactly the path this change targets.
-                     *
-                     * Re-seeded before the spread. `depDefine` cannot collide with it: its keys are filtered
-                     * to bare identifiers, and this one is dotted.
-                     */
-                    'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || (isDev ? 'development' : 'production')) }, depDefine),
-            },
         },
-        base: publicPath,
     };
     if (!(0, node_fs_1.existsSync)((0, node_path_1.resolve)(cwd, 'index.html'))) {
         consola_1.default.warn('index.html file not found - copying default one.');
@@ -216,7 +272,6 @@ exports.default = (ctx) => tslib_1.__awaiter(void 0, void 0, void 0, function* (
                 open,
                 host: '0.0.0.0',
                 port: (0, build_kit_1.getPort)(ctx.pkg),
-                proxy: (0, build_kit_1.createDevProxies)(),
                 https: https ? (0, build_kit_1.getDevCertOptions)() : undefined,
             } }));
         yield server.listen();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/vite-builder",
   "description": "Vite builder",
-  "version": "15.76.0",
+  "version": "15.77.0-GENC-1660.7",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
     "lint:fix": "genx lint -l ox --fix"
   },
   "dependencies": {
-    "@genesislcap/build-kit": "15.76.0",
+    "@genesislcap/build-kit": "15.77.0-GENC-1660.7",
     "consola": "^3.0.2",
     "copyfiles": "^2.4.1",
     "vite": "^7.2.2",