vike 0.4.237 → 0.4.238-commit-3c1a09d

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

@@ -16,28 +16,22 @@ exports.initGlobalContext_getPagesAndRoutes = initGlobalContext_getPagesAndRoute
 exports.setGlobalContext_viteDevServer = setGlobalContext_viteDevServer;
 exports.setGlobalContext_viteConfig = setGlobalContext_viteConfig;
 exports.setGlobalContext_isPrerendering = setGlobalContext_isPrerendering;
-exports.setGlobalContext_isProduction = setGlobalContext_isProduction;
-exports.setGlobalContext_buildEntry = setGlobalContext_buildEntry;
+exports.setGlobalContext_isProductionAccordingToVite = setGlobalContext_isProductionAccordingToVite;
+exports.setGlobalContext_prodBuildEntry = setGlobalContext_prodBuildEntry;
 exports.clearGlobalContext = clearGlobalContext;
 exports.assertBuildInfo = assertBuildInfo;
 exports.updateUserFiles = updateUserFiles;
-// TODO/now: use isProductionEnvironment() instead of globalObject.isProduction
-// TODO/now: rename:
-//  - isProduction => isProductionEnvironment
-//  - setIsProduction => setIsProductionEnvironment
-//  - setGlobalContext_isProduction => setGlobalContext_isProductionEnvironment
-//  - sProductionEnvironment => sDevEnv
 // The core logic revolves around:
-// - virtualFileExports is the main requirement
-// - In production: globalObject.buildEntry which is the production entry set by @brillout/vite-plugin-server-entry
-//   - loadBuildEntry() sets globalObject.buildEntry and then sets virtualFileExports
-//   - With vike-server it's set at server start: @brillout/vite-plugin-server-entry injects `import './entry.mjs'` (the production entry generated by @brillout/vite-plugin-server-entry) as first line of code of dist/server/index.mjs while dist/server/entry.mjs calls setGlobalContext_buildEntry()
+// - virtualFileExportsGlobalEntry is the main requirement
+// - In production: globalObject.prodBuildEntry which is the production entry set by @brillout/vite-plugin-server-entry
+//   - loadProdBuildEntry() sets globalObject.prodBuildEntry and then sets virtualFileExportsGlobalEntry
+//   - With vike-server it's set at server start: @brillout/vite-plugin-server-entry injects `import './entry.mjs'` (the production entry generated by @brillout/vite-plugin-server-entry) as first line of code of dist/server/index.mjs while dist/server/entry.mjs calls setGlobalContext_prodBuildEntry()
 //   - 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 virtualFileExports
+//   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExportsGlobalEntry
 const utils_js_1 = require("./utils.js");
 const runtime_1 = require("@brillout/vite-plugin-server-entry/runtime");
-const virtualFileEntry_js_1 = require("../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../shared/virtualFileId.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
 const assertV1Design_js_1 = require("../shared/assertV1Design.js");
@@ -47,6 +41,7 @@ const prepareGlobalContextForPublicUsage_js_1 = require("../../shared/prepareGlo
 const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const getVikeConfigError_js_1 = require("../shared/getVikeConfigError.js");
 const isNewError_js_1 = require("./renderPage/isNewError.js");
+const context_js_1 = require("../api/context.js");
 const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
 const globalObject = (0, utils_js_1.getGlobalObject)('runtime/globalContext.ts', getInitialGlobalObject());
 // Trick to break down TypeScript circular dependency
@@ -59,7 +54,7 @@ async function getGlobalContextServerInternal() {
     // getGlobalContextServerInternal() should always be called after initGlobalContext()
     (0, utils_js_1.assert)(globalObject.isInitialized);
     assertGlobalContextIsDefined();
-    if (globalObject.isProduction !== true)
+    if (!isProd())
         await globalObject.waitForUserFilesUpdate;
     const { globalContext } = globalObjectTyped;
     assertIsDefined(globalContext);
@@ -84,10 +79,9 @@ function assertGlobalContextIsDefined() {
  */
 async function getGlobalContext() {
     debug('getGlobalContext()');
-    const { isProduction } = globalObject;
+    const isProduction = isProdOptional();
     // This assertion cannot fail for vike-server users (because when using vike-server it's guaranteed that globalObject.isProduction is set before executing any user-land code and any Vike extension code).
-    (0, utils_js_1.assertUsage)(isProduction !== undefined, "The global context isn't set yet, use getGlobalContextAsync() instead.");
-    (0, utils_js_1.assert)(typeof globalObject.isProduction === 'boolean');
+    (0, utils_js_1.assertUsage)(isProduction !== null, "The global context isn't set yet, use getGlobalContextAsync() instead.");
     return await getGlobalContextAsync(isProduction);
 }
 /**
@@ -98,7 +92,7 @@ async function getGlobalContext() {
 async function getGlobalContextAsync(isProduction) {
     debug('getGlobalContextAsync()');
     (0, utils_js_1.assertUsage)(typeof isProduction === 'boolean', `[getGlobalContextAsync(isProduction)] Argument ${picocolors_1.default.cyan('isProduction')} ${isProduction === undefined ? 'is missing' : `should be ${picocolors_1.default.cyan('true')} or ${picocolors_1.default.cyan('false')}`}`);
-    setIsProduction(isProduction);
+    globalObject.isProductionAccordingToUser = isProduction;
     if (!globalObject.globalContext)
         await initGlobalContext_getGlobalContextAsync();
     if (!isProduction)
@@ -115,9 +109,7 @@ function getGlobalContextSync() {
     debug('getGlobalContextSync()');
     const { globalContext } = globalObjectTyped;
     (0, utils_js_1.assertUsage)(globalContext, createGlobalContextShared_js_1.getGlobalContextSyncErrMsg);
-    const isProd = globalContext._isProduction;
-    (0, utils_js_1.assert)(typeof isProd === 'boolean');
-    (0, utils_js_1.assertWarning)(isProd, 
+    (0, utils_js_1.assertWarning)(isProd(), 
     // - We discourage users from using it in development because `pageContext.globalContext` is safer: I ain't sure but there could be race conditions when using `getGlobalContextSync()` inside React/Vue components upon HMR.
     // - I don't see any issues with getGlobalContextSync() in production.
     // - getGlobalContextSync() is used in production by vike-vercel
@@ -133,7 +125,6 @@ function getGlobalContextForPublicUsage() {
 }
 async function setGlobalContext_viteDevServer(viteDevServer) {
     debug('setGlobalContext_viteDevServer()');
-    setIsProduction(false);
     // We cannot cache globalObject.viteDevServer because it's fully replaced when the user modifies vite.config.js => Vite's dev server is fully reloaded and a new viteDevServer replaces the previous one.
     if (!globalObject.viteDevServer) {
         assertIsNotInitializedYet();
@@ -161,18 +152,9 @@ function assertIsNotInitializedYet() {
 }
 function setGlobalContext_isPrerendering() {
     globalObject.isPrerendering = true;
-    setIsProduction(true);
-}
-// TODO/now: `rename tolerateContraditction tolerateContradiction`
-function setGlobalContext_isProduction(isProduction, tolerateContraditction = false) {
-    if (debug.isActivated)
-        debug('setGlobalContext_isProduction()', { isProduction, tolerateContraditction });
-    if (globalObject.isProduction === undefined) {
-        setIsProduction(isProduction);
-    }
-    else {
-        (0, utils_js_1.assert)(globalObject.isProduction === isProduction || tolerateContraditction);
-    }
+}
+function setGlobalContext_isProductionAccordingToVite(isProductionAccordingToVite) {
+    globalObject.isProductionAccordingToVite = isProductionAccordingToVite;
 }
 function getViteDevServer() {
     return globalObject.viteDevServer ?? null;
@@ -182,15 +164,13 @@ function getViteConfig() {
 }
 async function initGlobalContext_renderPage() {
     debug('initGlobalContext_renderPage()');
-    // `globalObject.isProduction === undefined` when using production server without `vike-server`. (There isn't any reliable signal we can use to determine early whether the environment is production or development.)
-    if (globalObject.isProduction === undefined)
-        setIsProduction(true);
+    globalObject.isAfterFirstRenderPageCall = true;
     await initGlobalContext();
 }
 async function initGlobalContext_runPrerender() {
     debug('initGlobalContext_runPrerender()');
     (0, utils_js_1.assert)(globalObject.isPrerendering === true);
-    (0, utils_js_1.assert)(globalObject.isProduction === true);
+    (0, utils_js_1.assert)(isProd());
     if (globalObject.initGlobalContext_runPrerender_alreadyCalled)
         return;
     globalObject.initGlobalContext_runPrerender_alreadyCalled = true;
@@ -208,36 +188,28 @@ async function initGlobalContext_getGlobalContextAsync() {
 }
 async function initGlobalContext_getPagesAndRoutes() {
     debug('initGlobalContext_getPagesAndRoutes()');
-    setIsProduction(true);
+    globalObject.isProductionAccordingToPhotonVercel = true;
     await initGlobalContext();
 }
 async function initGlobalContext() {
-    const { isProduction } = globalObject;
-    (0, utils_js_1.assert)(typeof isProduction === 'boolean');
+    const isProduction = isProd();
     if (!isProduction) {
         if (isProcessSharedWithVite()) {
             await globalObject.viteDevServerPromise;
         }
         else {
-            (0, utils_js_1.assert)(isNonRunnableDev());
+            (0, utils_js_1.assert)((0, utils_js_1.isNonRunnableDev)());
             await updateUserFiles();
         }
         (0, utils_js_1.assert)(globalObject.waitForUserFilesUpdate);
         await globalObject.waitForUserFilesUpdate;
     }
     else {
-        await loadBuildEntry(globalObject.viteConfigRuntime?.build.outDir);
+        await loadProdBuildEntry(globalObject.viteConfigRuntime?.build.outDir);
     }
     assertGlobalContextIsDefined();
     globalObject.isInitialized = true;
 }
-function setIsProduction(isProduction) {
-    debug('setIsProduction', isProduction);
-    (0, utils_js_1.assert)(typeof isProduction === 'boolean');
-    if (globalObject.isProduction !== undefined)
-        (0, utils_js_1.assert)(globalObject.isProduction === isProduction);
-    globalObject.isProduction = isProduction;
-}
 function assertViteManifest(manifest) {
     (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(manifest));
     /* We should include these assertions but we don't as a workaround for PWA manifests: https://github.com/vikejs/vike/issues/769
@@ -251,59 +223,58 @@ function assertViteManifest(manifest) {
       })
     */
 }
-async function loadBuildEntry(outDir) {
-    debug('loadBuildEntry()');
+async function loadProdBuildEntry(outDir) {
+    debug('loadProdBuildEntry()');
     if (globalObject.globalContext) {
-        debug('loadBuildEntry() - already done');
+        debug('loadProdBuildEntry() - already done');
         return;
     }
-    if (!globalObject.buildEntry) {
+    if (!globalObject.prodBuildEntry) {
         debug('importServerProductionEntry()');
-        // importServerProductionEntry() loads dist/server/entry.mjs which calls setGlobalContext_buildEntry()
+        // importServerProductionEntry() loads dist/server/entry.mjs which calls setGlobalContext_prodBuildEntry()
         await (0, runtime_1.importServerProductionEntry)({ outDir });
-        if (!globalObject.buildEntry) {
-            debug('globalObject.buildEntryPrevious');
+        if (!globalObject.prodBuildEntry) {
+            debug('globalObject.prodBuildEntryPrevious');
             // Needed, for example, when calling the API prerender() then preview() because both trigger a importServerProductionEntry() call but only the first only is applied because of the import() cache. (A proper implementation would be to clear the import() cache, but it probably isn't possible on platforms such as Cloudflare Workers.)
-            globalObject.buildEntry = globalObject.buildEntryPrevious;
+            globalObject.prodBuildEntry = globalObject.prodBuildEntryPrevious;
         }
-        (0, utils_js_1.assert)(globalObject.buildEntry);
-        // If using `inject` then dist/server/index.js imports dist/server/entry.js and loadBuildEntry() isn't needed.
+        (0, utils_js_1.assert)(globalObject.prodBuildEntry);
+        // If using `inject` then dist/server/index.js imports dist/server/entry.js and loadProdBuildEntry() isn't needed.
         // If dist/server/entry.js isn't imported then this means the user is running the original server entry `$ ts-node server/index.ts`.
         (0, utils_js_1.assertWarning)(
         // vike-server => `inject === true`
         // vike-node => `inject === [ 'index' ]` => we don't show the warning to vike-node users (I don't remember why).
         globalObject.buildInfo?.viteConfigRuntime.vitePluginServerEntry.inject !== true || globalObject.isPrerendering, `Run the built server entry (e.g. ${picocolors_1.default.cyan('$ node dist/server/index.mjs')}) instead of the original server entry (e.g. ${picocolors_1.default.cyan('$ ts-node server/index.ts')})`, { onlyOnce: true });
     }
-    const { buildEntry } = globalObject;
-    assertBuildEntry(buildEntry);
-    globalObject.assetsManifest = buildEntry.assetsManifest;
-    globalObject.buildInfo = buildEntry.buildInfo;
-    await createGlobalContext(buildEntry.virtualFileExports);
+    const { prodBuildEntry } = globalObject;
+    assertProdBuildEntry(prodBuildEntry);
+    globalObject.assetsManifest = prodBuildEntry.assetsManifest;
+    globalObject.buildInfo = prodBuildEntry.buildInfo;
+    await createGlobalContext(prodBuildEntry.virtualFileExportsGlobalEntry);
 }
 // This is the production entry, see:
-// https://github.com/vikejs/vike/blob/798e5465dc3e3e6723b38b601a50350c0a006fb8/packages/vike/node/vite/plugins/pluginBuild/pluginBuildEntry.ts#L47
-async function setGlobalContext_buildEntry(buildEntry) {
-    debug('setGlobalContext_buildEntry()');
-    setIsProduction(true);
-    assertBuildEntry(buildEntry);
-    globalObject.buildEntry = buildEntry;
-    globalObject.buildEntryPrevious = buildEntry;
-    (0, utils_js_1.assert)(globalObject.buildEntry); // ensure no infinite loop
-    await loadBuildEntry();
+// https://github.com/vikejs/vike/blob/8c350e8105a626469e87594d983090919e82099b/packages/vike/node/vite/plugins/pluginBuild/pluginProdBuildEntry.ts#L47
+async function setGlobalContext_prodBuildEntry(prodBuildEntry) {
+    debug('setGlobalContext_prodBuildEntry()');
+    assertProdBuildEntry(prodBuildEntry);
+    globalObject.prodBuildEntry = prodBuildEntry;
+    globalObject.prodBuildEntryPrevious = prodBuildEntry;
+    (0, utils_js_1.assert)(globalObject.prodBuildEntry); // ensure no infinite loop
+    await loadProdBuildEntry();
     assertGlobalContextIsDefined();
-    debug('setGlobalContext_buildEntry() - done');
-}
-function assertBuildEntry(buildEntry) {
-    (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildEntry));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'virtualFileExports', 'object'));
-    const { virtualFileExports } = buildEntry;
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'assetsManifest', 'object'));
-    const { assetsManifest } = buildEntry;
+    debug('setGlobalContext_prodBuildEntry() - done');
+}
+function assertProdBuildEntry(prodBuildEntry) {
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(prodBuildEntry));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(prodBuildEntry, 'virtualFileExportsGlobalEntry', 'object'));
+    const { virtualFileExportsGlobalEntry } = prodBuildEntry;
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(prodBuildEntry, 'assetsManifest', 'object'));
+    const { assetsManifest } = prodBuildEntry;
     assertViteManifest(assetsManifest);
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'buildInfo', 'object'));
-    const { buildInfo } = buildEntry;
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(prodBuildEntry, 'buildInfo', 'object'));
+    const { buildInfo } = prodBuildEntry;
     assertBuildInfo(buildInfo);
-    (0, utils_js_1.checkType)({ virtualFileExports, assetsManifest, buildInfo });
+    (0, utils_js_1.checkType)({ virtualFileExportsGlobalEntry, assetsManifest, buildInfo });
 }
 function assertBuildInfo(buildInfo) {
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildInfo));
@@ -324,7 +295,7 @@ function assertVersionAtBuildTime(versionAtBuildTime) {
 }
 async function updateUserFiles() {
     debug('updateUserFiles()');
-    (0, utils_js_1.assert)(!globalObject.isProduction);
+    (0, utils_js_1.assert)(!isProd());
     const { promise, resolve } = (0, utils_js_1.genPromise)();
     globalObject.waitForUserFilesUpdate = promise;
     globalObject.waitForUserFilesUpdateResolve ?? (globalObject.waitForUserFilesUpdateResolve = []);
@@ -357,15 +328,15 @@ async function updateUserFiles() {
         viteDevServer !== globalObject.viteDevServer;
     const { viteDevServer } = globalObject;
     let hasError = false;
-    let virtualFileExports;
+    let virtualFileExportsGlobalEntry;
     let err;
     if (viteDevServer) {
         (0, utils_js_1.assert)(isRunnable(viteDevServer));
         /* We don't use runner.import() yet, because as of vite@7.0.6 (July 2025) runner.import() unexpectedly invalidates the module graph, which is a unexpected behavior that doesn't happen with ssrLoadModule()
         // Vite 6
         try {
-          virtualFileExports = await (viteDevServer.environments.ssr as RunnableDevEnvironment).runner.import(
-            'virtual:vike:entry:server',
+          virtualFileExportsGlobalEntry = await (viteDevServer.environments.ssr as RunnableDevEnvironment).runner.import(
+            'virtual:vike:global-entry:server',
           )
         } catch (err_) {
           hasError = true
@@ -374,7 +345,7 @@ async function updateUserFiles() {
         */
         // Vite 5
         try {
-            virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileEntry_js_1.virtualFileIdEntryServer);
+            virtualFileExportsGlobalEntry = await viteDevServer.ssrLoadModule(virtualFileId_js_1.virtualFileIdGlobalEntryServer);
         }
         catch (err_) {
             hasError = true;
@@ -387,10 +358,10 @@ async function updateUserFiles() {
                ```js
                assert(false)
                // This line breaks the HMR of regular (runnable) apps, even though (as per the assert() above) it's never run. It seems to be a Vite bug: handleHotUpdate() receives an empty `modules` list.
-               import('virtual:vike:entry:server')
+               import('virtual:vike:global-entry:server')
                ```
             */
-            virtualFileExports = await __VIKE__DYNAMIC_IMPORT('virtual:vike:entry:server');
+            virtualFileExportsGlobalEntry = await __VIKE__DYNAMIC_IMPORT('virtual:vike:global-entry:server');
         }
         catch (err_) {
             hasError = true;
@@ -401,12 +372,12 @@ async function updateUserFiles() {
         return { success: false };
     if (hasError)
         return onError(err);
-    virtualFileExports = virtualFileExports.default || virtualFileExports;
+    virtualFileExportsGlobalEntry = virtualFileExportsGlobalEntry.default || virtualFileExportsGlobalEntry;
     if ((0, getVikeConfigError_js_1.getVikeConfigErrorBuild)()) {
         return { success: false };
     }
     try {
-        await createGlobalContext(virtualFileExports);
+        await createGlobalContext(virtualFileExportsGlobalEntry);
     }
     catch (err_) {
         hasError = true;
@@ -418,16 +389,21 @@ async function updateUserFiles() {
         return onError(err);
     return onSuccess();
 }
-async function createGlobalContext(virtualFileExports) {
+async function createGlobalContext(virtualFileExportsGlobalEntry) {
     debug('createGlobalContext()');
     (0, utils_js_1.assert)(!(0, getVikeConfigError_js_1.getVikeConfigErrorBuild)());
-    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
+    const globalContextPromise = (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
+    debug('createGlobalContext() - done [sync]');
+    // We define an early globalContext version synchronously, so that getGlobalContextSync() can be called early.
+    // - Required by vike-vercel
+    (0, utils_js_1.assert)(globalObject.globalContext);
+    const globalContext = await globalContextPromise;
+    debug('createGlobalContext() - done [async]');
     (0, assertV1Design_js_1.assertV1Design)(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
     assertGlobalContextIsDefined();
     (0, utils_js_1.onSetupRuntime)();
-    debug('createGlobalContext() - done');
     // Never actually used, only used for TypeScript `ReturnType<typeof createGlobalContext>`
     return globalContext;
 }
@@ -447,8 +423,8 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         _pageRoutes: pageRoutes,
         _onBeforeRouteHook: onBeforeRouteHook,
     };
-    const { viteDevServer, viteConfig, isPrerendering, isProduction } = globalObject;
-    (0, utils_js_1.assert)(typeof isProduction === 'boolean');
+    const { viteDevServer, viteConfig, isPrerendering } = globalObject;
+    const isProduction = isProd();
     if (!isProduction) {
         (0, utils_js_1.assert)(globalContext); // main common requirement
         (0, utils_js_1.assert)(!isPrerendering);
@@ -462,7 +438,7 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         };
     }
     else {
-        (0, utils_js_1.assert)(globalObject.buildEntry);
+        (0, utils_js_1.assert)(globalObject.prodBuildEntry);
         (0, utils_js_1.assert)(globalContext); // main common requiement
         const { buildInfo, assetsManifest } = globalObject;
         (0, utils_js_1.assert)(buildInfo);
@@ -500,8 +476,8 @@ async function addGlobalContextAsync(globalContext) {
         }
         else {
             (0, utils_js_1.assert)(!isProcessSharedWithVite()); // process shared with Vite => globalObject.viteConfigRuntime should be set
-            (0, utils_js_1.assert)(!globalObject.isProduction); // production => globalObject.buildInfo.viteConfigRuntime should be set
-            (0, utils_js_1.assert)(isNonRunnableDev());
+            (0, utils_js_1.assert)(!isProd()); // production => globalObject.buildInfo.viteConfigRuntime should be set
+            (0, utils_js_1.assert)((0, utils_js_1.isNonRunnableDev)());
             const rpc = (0, utils_js_1.getViteRPC)();
             viteConfigRuntime = await rpc.getViteConfigRuntimeRPC();
         }
@@ -514,13 +490,12 @@ async function addGlobalContextAsync(globalContext) {
 }
 function clearGlobalContext() {
     debug('clearGlobalContext()');
-    (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalObject(), ['buildEntryPrevious']);
+    (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalObject(), ['prodBuildEntryPrevious']);
 }
 function getInitialGlobalObject() {
     debug('getInitialGlobalObject()');
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
     return {
-        isProduction: isNonRunnableDev() ? false : undefined,
         viteDevServerPromise,
         viteDevServerPromiseResolve,
     };
@@ -534,7 +509,7 @@ function resolveBaseRuntime(viteConfigRuntime, config) {
 function isProcessSharedWithVite() {
     const yes = globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE ?? false;
     if (yes)
-        (0, utils_js_1.assert)(!isNonRunnableDev());
+        (0, utils_js_1.assert)(!(0, utils_js_1.isNonRunnableDev)());
     return yes;
 }
 function isRunnable(viteDevServer) {
@@ -544,13 +519,54 @@ function isRunnable(viteDevServer) {
         // Vite 6 or above
         (0, utils_js_1.isRunnableDevEnvironment)(viteDevServer.environments.ssr);
     if (yes)
-        (0, utils_js_1.assert)(!isNonRunnableDev());
+        (0, utils_js_1.assert)(!(0, utils_js_1.isNonRunnableDev)());
     return yes;
 }
-function isNonRunnableDev() {
-    if (typeof __VIKE__IS_NON_RUNNABLE_DEV === 'undefined')
-        return null;
-    const yes = __VIKE__IS_NON_RUNNABLE_DEV;
+function isProd() {
+    const isProduction = isProdOptional();
+    if (isProduction === null) {
+        if (globalObject.isAfterFirstRenderPageCall) {
+            // When using a production server without vike-server, there isn't any reliable signal we can use to determine early whether the environment is production or development. If renderPage() was called then some non-negligible amount of time passed — it's likely that, in dev, one of the Vite hooks should have already sent a signal we can use to determine prod/dev.
+            return true;
+        }
+        else {
+            (0, utils_js_1.assert)(false);
+        }
+    }
+    return isProduction;
+}
+function isProdOptional() {
+    const vikeApiOperation = (0, context_js_1.getVikeApiOperation)()?.operation ?? null;
+    const yes = 
+    // setGlobalContext_prodBuildEntry() was called
+    !!globalObject.prodBuildEntry ||
+        globalObject.isPrerendering === true ||
+        // Vike CLI & Vike API
+        (!!vikeApiOperation && vikeApiOperation !== 'dev') ||
+        // Vite command
+        globalObject.isProductionAccordingToVite === true ||
+        // getGlobalContextAsync(isProduction)
+        globalObject.isProductionAccordingToUser === true ||
+        // vite-plugin-vercel
+        globalObject.isProductionAccordingToPhotonVercel === true;
     (0, utils_js_1.assert)(typeof yes === 'boolean');
-    return yes;
+    const no = !!globalObject.viteDevServer ||
+        // Vike CLI & Vike API
+        vikeApiOperation === 'dev' ||
+        // Vite command
+        globalObject.isProductionAccordingToVite === false ||
+        // getGlobalContextAsync(isProduction)
+        globalObject.isProductionAccordingToUser === false ||
+        // @cloudflare/vite-plugin
+        (0, utils_js_1.isNonRunnableDev)() === true;
+    (0, utils_js_1.assert)(typeof no === 'boolean');
+    if (yes) {
+        (0, utils_js_1.assert)(no === false);
+        return true;
+    }
+    if (no) {
+        (0, utils_js_1.assert)(yes === false);
+        return false;
+    }
+    return null;
 }

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHtmlTags = getHtmlTags;
-const isFontFallback_js_1 = require("../../renderPage/isFontFallback.js");
 const utils_js_1 = require("../../utils.js");
 const serializeContext_js_1 = require("../serializeContext.js");
 const sanitizeJson_js_1 = require("./sanitizeJson.js");
@@ -15,6 +14,8 @@ const getConfigValueRuntime_js_1 = require("../../../../shared/page-configs/getC
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getConfigDefinedAt_js_1 = require("../../../../shared/page-configs/getConfigDefinedAt.js");
 const htmlElementIds_js_1 = require("../../../../shared/htmlElementIds.js");
+const isFontFallback_js_1 = require("../../renderPage/isFontFallback.js");
+const csp_js_1 = require("../../csp.js");
 const stamp = '__injectFilterEntry';
 async function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript, isStream) {
     (0, utils_js_1.assert)([true, false].includes(pageContext._isHtmlOnly));
@@ -81,7 +82,7 @@ async function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectF
         .forEach((asset) => {
         if (!asset.inject)
             return;
-        const htmlTag = asset.isEntry ? (0, inferHtmlTags_js_1.inferAssetTag)(asset) : (0, inferHtmlTags_js_1.inferPreloadTag)(asset);
+        const htmlTag = asset.isEntry ? (0, inferHtmlTags_js_1.inferAssetTag)(asset, pageContext) : (0, inferHtmlTags_js_1.inferPreloadTag)(asset);
         htmlTags.push({ htmlTag, position: asset.inject });
     });
     // ==========
@@ -142,7 +143,7 @@ async function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectF
         });
     }
     // The JavaScript entry <script> tag
-    const scriptEntry = mergeScriptEntries(pageAssets, viteDevScript);
+    const scriptEntry = mergeScriptEntries(pageAssets, viteDevScript, pageContext);
     if (scriptEntry) {
         htmlTags.push({
             htmlTag: scriptEntry,
@@ -163,9 +164,9 @@ async function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectF
     });
     return htmlTags;
 }
-function mergeScriptEntries(pageAssets, viteDevScript) {
+function mergeScriptEntries(pageAssets, viteDevScript, pageContext) {
     const scriptEntries = pageAssets.filter((pageAsset) => pageAsset.isEntry && pageAsset.assetType === 'script');
-    let scriptEntry = `${viteDevScript}${scriptEntries.map((asset) => (0, inferHtmlTags_js_1.inferAssetTag)(asset)).join('')}`;
+    let scriptEntry = `${viteDevScript}${scriptEntries.map((asset) => (0, inferHtmlTags_js_1.inferAssetTag)(asset, pageContext)).join('')}`;
     // We merge scripts to avoid the infamous HMR preamble error.
     // - Infamous HMR preamble error:
     //   ```browser-console
@@ -183,12 +184,13 @@ function mergeScriptEntries(pageAssets, viteDevScript) {
     //   ```
     // - Maybe an alternative would be to make Vike's client runtime entry <script> tag non-async. Would that work? Would it be a performance issue?
     //   - The entry <script> shouldn't be `<script defer>` upon HTML streaming, otherwise progressive hydration while SSR streaming won't work.
-    scriptEntry = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptEntry);
+    scriptEntry = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptEntry, pageContext);
     return scriptEntry;
 }
 function getPageContextJsonScriptTag(pageContext) {
     const pageContextClientSerialized = (0, sanitizeJson_js_1.sanitizeJson)((0, serializeContext_js_1.getPageContextClientSerialized)(pageContext, true));
-    const htmlTag = `<script id="${htmlElementIds_js_1.htmlElementId_pageContext}" type="application/json">${pageContextClientSerialized}</script>`;
+    const nonceAttr = (0, csp_js_1.inferNonceAttr)(pageContext);
+    const htmlTag = `<script id="${htmlElementIds_js_1.htmlElementId_pageContext}" type="application/json"${nonceAttr}>${pageContextClientSerialized}</script>`;
     // Used by contra.com https://github.com/gajus
     // @ts-expect-error
     pageContext._pageContextHtmlTag = htmlTag;
@@ -196,7 +198,8 @@ function getPageContextJsonScriptTag(pageContext) {
 }
 function getGlobalContextJsonScriptTag(pageContext) {
     const globalContextClientSerialized = (0, sanitizeJson_js_1.sanitizeJson)((0, serializeContext_js_1.getGlobalContextClientSerialized)(pageContext, true));
-    const htmlTag = `<script id="${htmlElementIds_js_1.htmlElementId_globalContext}" type="application/json">${globalContextClientSerialized}</script>`;
+    const nonceAttr = (0, csp_js_1.inferNonceAttr)(pageContext);
+    const htmlTag = `<script id="${htmlElementIds_js_1.htmlElementId_globalContext}" type="application/json"${nonceAttr}>${globalContextClientSerialized}</script>`;
     return htmlTag;
 }
 function assertInjectFilterEntries(injectFilterEntries) {

package/dist/cjs/node/runtime/html/injectAssets/inferHtmlTags.js

@@ -5,6 +5,8 @@ exports.inferAssetTag = inferAssetTag;
 exports.inferPreloadTag = inferPreloadTag;
 exports.inferEarlyHintLink = inferEarlyHintLink;
 const utils_js_1 = require("../../utils.js");
+const csp_js_1 = require("../../csp.js");
+// TODO/now rename scriptAttrs scriptCommonAttrs
 // We can't use `defer` here. With `defer`, the entry script won't start before `</body>` has been parsed, preventing progressive hydration during SSR streaming, see https://github.com/vikejs/vike/pull/1271
 const scriptAttrs = 'type="module" async';
 exports.scriptAttrs = scriptAttrs;
@@ -23,11 +25,12 @@ function inferPreloadTag(pageAsset) {
         .join(' ');
     return `<link ${attributes}>`;
 }
-function inferAssetTag(pageAsset) {
+function inferAssetTag(pageAsset, pageContext) {
     const { src, assetType, mediaType } = pageAsset;
     if (assetType === 'script') {
         (0, utils_js_1.assert)(mediaType === 'text/javascript');
-        return `<script src="${src}" ${scriptAttrs}></script>`;
+        const nonceAttr = (0, csp_js_1.inferNonceAttr)(pageContext);
+        return `<script src="${src}" ${scriptAttrs}${nonceAttr}></script>`;
     }
     if (assetType === 'style') {
         // WARNING: if changing following line, then also update https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/client/shared/removeFoucBuster.ts#L29

package/dist/cjs/node/runtime/html/injectAssets/mergeScriptTags.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeScriptTags = mergeScriptTags;
+const csp_js_1 = require("../../csp.js");
 const utils_js_1 = require("../../utils.js");
 const inferHtmlTags_js_1 = require("./inferHtmlTags.js");
 const scriptRE = /(<script\b(?:\s[^>]*>|>))(.*?)<\/script>/gims;
 const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
 const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
-function mergeScriptTags(scriptTagsHtml) {
+function mergeScriptTags(scriptTagsHtml, pageContext) {
     let scriptTag = '';
     const scripts = parseScripts(scriptTagsHtml);
     // We need to merge module scripts to ensure execution order
@@ -35,7 +36,8 @@ function mergeScriptTags(scriptTagsHtml) {
                 }
             });
             if (contents.length > 0) {
-                scriptTag += `<script ${inferHtmlTags_js_1.scriptAttrs}>\n${contents.join('\n')}\n</script>`;
+                const nonceAttr = (0, csp_js_1.inferNonceAttr)(pageContext);
+                scriptTag += `<script ${inferHtmlTags_js_1.scriptAttrs}${nonceAttr}>\n${contents.join('\n')}\n</script>`;
             }
         }
     }

package/dist/cjs/node/runtime/renderPage/analyzePage.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.analyzePage = analyzePage;
 const determineClientEntry_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide/determineClientEntry.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
-const virtualFilePageConfigLazy_js_1 = require("../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+const virtualFileId_js_1 = require("../../shared/virtualFileId.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const getConfigValueRuntime_js_1 = require("../../../shared/page-configs/getConfigValueRuntime.js");
-async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
+function analyzePage(pageContext) {
+    const { pageId, _pageConfig: pageConfig, _globalContext: globalContext } = pageContext;
+    const { _pageFilesAll: pageFilesAll } = globalContext;
     if (pageConfig) {
         const { isClientRuntimeLoaded, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];
@@ -17,14 +19,14 @@ async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
             clientEntries.push((0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
-            id: (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageConfig.pageId, true),
+            id: (0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId: pageConfig.pageId, isForClientSide: true }),
             onlyAssets: isClientRuntimeLoaded ? false : true,
             eagerlyImported: false,
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
         if (!globalContext._isProduction) {
             clientDependencies.push({
-                id: (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageConfig.pageId, false),
+                id: (0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId: pageConfig.pageId, isForClientSide: false }),
                 onlyAssets: true,
                 eagerlyImported: false,
             });

package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js

@@ -41,7 +41,7 @@ function createPageContextServerSide(pageContextInit, globalContext, args) {
         (0, utils_js_1.objectAssign)(pageContextCreated, { headers });
     }
     const pageContextAugmented = (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._vikeConfigPublicGlobal);
-    (0, utils_js_1.augmentType)(pageContextCreated, pageContextAugmented);
+    (0, utils_js_1.updateType)(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }
 function createPageContextServerSideWithoutGlobalContext(pageContextInit) {