vike 0.4.245-commit-189d2b8 → 0.4.245-commit-292c95d

package/dist/esm/__internal/index.js

@@ -4,14 +4,14 @@ export { setGlobalContext_prodBuildEntry } from '../node/runtime/globalContext.j
 export { route, getPagesAndRoutes };
 import { route as routeInternal } from '../shared/route/index.js';
 import { getGlobalContextServerInternal, initGlobalContext_getPagesAndRoutes } from '../node/runtime/globalContext.js';
-import { setNodeEnvProduction } from '../utils/assertSetup.js';
+import { setNodeEnvProductionIfUndefined } from '../utils/assertSetup.js';
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
  *
  * TO-DO/eventually: remove
  */
 async function getPagesAndRoutes() {
-    setNodeEnvProduction();
+    setNodeEnvProductionIfUndefined();
     await initGlobalContext_getPagesAndRoutes();
     const { globalContext } = await getGlobalContextServerInternal();
     const { 

package/dist/esm/node/runtime/globalContext.js

@@ -29,7 +29,7 @@ export { vikeConfigErrorRecoverMsg };
 //   - Without vike-server it's manually loaded here using importServerProductionEntry() which uses @brillout/vite-plugin-server-entry's autoImporter or crawler
 // - In development: globalObject.viteDevServer which is Vite's development server
 //   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExportsGlobalEntry
-import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, isNonRunnableDev, objectAssign, } from './utils.js';
+import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, isNonRunnableDev, objectAssign, setNodeEnvProductionIfUndefined, } from './utils.js';
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdGlobalEntryServer } from '../shared/virtualFileId.js';
 import pc from '@brillout/picocolors';
@@ -270,6 +270,7 @@ async function setGlobalContext_prodBuildEntry(prodBuildEntry) {
     debug('setGlobalContext_prodBuildEntry()');
     assert(!isNonRunnableDev());
     assertProdBuildEntry(prodBuildEntry);
+    setNodeEnvProductionIfUndefined();
     globalObject.prodBuildEntry = prodBuildEntry;
     globalObject.prodBuildEntryPrevious = prodBuildEntry;
     assert(globalObject.prodBuildEntry); // ensure no infinite loop

package/dist/esm/node/vite/shared/resolveVikeConfigInternal.js

@@ -263,8 +263,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
             return;
         pageConfigGlobal.configValueSources[configName] = sources;
     });
-    applyEffectsMetaEnv(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal);
-    applyEffectsConfVal(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal, plusFilesAll);
+    applyEffects(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal, plusFilesAll);
     sortConfigValueSources(pageConfigGlobal.configValueSources, null);
     assertPageConfigGlobal(pageConfigGlobal, plusFilesAll);
     const pageConfigs = objectEntries(configDefinitionsResolved.configDefinitionsLocal)
@@ -281,8 +280,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
             configValueSources[configName] = sources;
         });
         const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
-        applyEffectsMetaEnv(configValueSources, configDefinitionsLocal);
-        applyEffectsConfVal(configValueSources, configDefinitionsLocal, plusFilesAll);
+        applyEffects(configValueSources, configDefinitionsLocal, plusFilesAll);
         sortConfigValueSources(configValueSources, locationId);
         const pageConfig = {
             pageId: locationId,
@@ -801,8 +799,8 @@ function assertMetaUsage(metaVal, metaConfigDefinedAt) {
         }
     });
 }
-// Test: https://github.com/vikejs/vike/blob/441a37c4c1a3b07bb8f6efb1d1f7be297a53974a/test/playground/vite.config.ts#L39
-function applyEffectsConfVal(configValueSources, configDefinitions, plusFilesAll) {
+// Test: https://github.com/vikejs/vike/blob/871a111a77d637bbd156b07be5ae728c3d595501/test/playground/pages/config-meta/effect/e2e-test.ts
+function applyEffects(configValueSources, configDefinitions, plusFilesAll) {
     objectEntries(configDefinitions).forEach(([configNameEffect, configDefEffect]) => {
         const sourceEffect = configValueSources[configNameEffect]?.[0];
         if (!sourceEffect)
@@ -811,19 +809,8 @@ function applyEffectsConfVal(configValueSources, configDefinitions, plusFilesAll
         if (!effect)
             return;
         const configModFromEffect = effect;
+        // Apply config value changes first to create sources, then meta.env changes to modify their env
         applyEffectConfVal(configModFromEffect, sourceEffect, configValueSources, configNameEffect, configDefEffect, configDefinitions, plusFilesAll);
-    });
-}
-// Test: https://github.com/vikejs/vike/blob/441a37c4c1a3b07bb8f6efb1d1f7be297a53974a/test/playground/pages/config-meta/effect/e2e-test.ts#L16
-function applyEffectsMetaEnv(configValueSources, configDefinitions) {
-    objectEntries(configDefinitions).forEach(([configNameEffect, configDefEffect]) => {
-        const sourceEffect = configValueSources[configNameEffect]?.[0];
-        if (!sourceEffect)
-            return;
-        const effect = runEffect(configNameEffect, configDefEffect, sourceEffect);
-        if (!effect)
-            return;
-        const configModFromEffect = effect;
         applyEffectMetaEnv(configModFromEffect, configValueSources, configDefEffect);
     });
 }

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.245-commit-189d2b8";
+export declare const PROJECT_VERSION: "0.4.245-commit-292c95d";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.245-commit-189d2b8';
+export const PROJECT_VERSION = '0.4.245-commit-292c95d';

package/dist/esm/utils/assertSetup.d.ts

@@ -3,7 +3,7 @@ export { onSetupRuntime };
 export { onSetupBuild };
 export { onSetupPrerender };
 export { onSetupPreview };
-export { setNodeEnvProduction };
+export { setNodeEnvProductionIfUndefined };
 export { markSetup_viteDevServer };
 export { markSetup_vitePreviewServer };
 export { markSetup_vikeVitePlugin };
@@ -17,4 +17,4 @@ declare function markSetup_viteDevServer(): void | undefined;
 declare function markSetup_vitePreviewServer(): void | undefined;
 declare function markSetup_vikeVitePlugin(): void;
 declare function markSetup_isViteDev(isViteDev: boolean): void;
-declare function setNodeEnvProduction(): void | undefined;
+declare function setNodeEnvProductionIfUndefined(): void | undefined;

package/dist/esm/utils/assertSetup.js

@@ -3,7 +3,7 @@ export { onSetupRuntime };
 export { onSetupBuild };
 export { onSetupPrerender };
 export { onSetupPreview };
-export { setNodeEnvProduction };
+export { setNodeEnvProductionIfUndefined };
 export { markSetup_viteDevServer };
 export { markSetup_vitePreviewServer };
 export { markSetup_vikeVitePlugin };
@@ -55,7 +55,7 @@ function onSetupRuntime() {
 function onSetupBuild() {
     assertUsageNodeEnvIsNotDev('building');
     /* Not needed: Vite already sets `process.env.NODE_ENV = 'production'`
-    setNodeEnvProduction()
+    setNodeEnvProductionIfUndefined()
     */
 }
 // Called by ../node/prerender/runPrerender.ts
@@ -63,7 +63,7 @@ function onSetupPrerender() {
     markSetup_isPrerendering();
     if (getNodeEnv())
         assertUsageNodeEnvIsNotDev('pre-rendering');
-    setNodeEnvProduction();
+    setNodeEnvProductionIfUndefined();
 }
 // Called by ../node/api/preview.ts
 function onSetupPreview() {
@@ -157,10 +157,21 @@ function getNodeEnv() {
     //*/
     return val;
 }
-function setNodeEnvProduction() {
+// TODO: rename
+function setNodeEnvProductionIfUndefined() {
     // The statement `process.env['NODE_ENV'] = 'production'` chokes webpack v4
-    const proc = process;
+    let val;
+    let proc;
+    try {
+        proc = process;
+        val = process.env.NODE_ENV;
+    }
+    catch {
+        return;
+    }
+    if (val !== undefined)
+        return;
     const { env } = proc;
-    env.NODE_ENV = 'production';
+    env.NODE_ENV ?? (env.NODE_ENV = 'production');
     assert(isNodeEnv('production'));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.245-commit-189d2b8",
+  "version": "0.4.245-commit-292c95d",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -245,7 +245,7 @@
     "@types/picomatch": "^3.0.2",
     "@types/semver": "^7.5.8",
     "@types/source-map-support": "^0.5.10",
-    "react-streaming": "^0.4.10",
+    "react-streaming": "^0.4.12",
     "rimraf": "^5.0.5",
     "typescript": "^5.9.2",
     "vite": "^7.1.5"