vike 0.4.237 → 0.4.238-commit-3c1a09d

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

@@ -35,21 +35,19 @@ const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderCon
 const getProxyForPublicUsage_js_1 = require("../../../shared/getProxyForPublicUsage.js");
 const getVikeConfigError_js_1 = require("../../shared/getVikeConfigError.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-// We can simply use global variables since Vike's config is:
-//  - global
-//  - independent of Vite (therefore we don't need to tie Vike's config with Vite's `config` object)
-(0, utils_js_1.assertIsSingleModuleInstance)('v1-design/getVikeConfig.ts');
-let restartVite = false;
-let vikeConfigHasBuildError = null;
-let isV1Design_ = null;
-let vikeConfigPromise = null;
-// TO-DO/next-major-release: remove
-let vikeConfigSync = null;
-let vikeConfigCtx = null; // Information provided by Vite's `config` and Vike's CLI. We could, if we want or need to, completely remove the dependency on Vite.
-let prerenderContext;
+const globalObject = (0, utils_js_1.getGlobalObject)('vite/shared/resolveVikeConfigInternal.ts', {
+    restartVite: false,
+    vikeConfigHasBuildError: null,
+    isV1Design_: null,
+    vikeConfigPromise: null,
+    // TO-DO/next-major-release: remove
+    vikeConfigSync: null,
+    vikeConfigCtx: null, // Information provided by Vite's `config` and Vike's CLI. We could, if we want or need to, completely remove the dependency on Vite.
+    prerenderContext: null,
+});
 function reloadVikeConfig() {
-    (0, utils_js_1.assert)(vikeConfigCtx);
-    const { userRootDir, vikeVitePluginOptions } = vikeConfigCtx;
+    (0, utils_js_1.assert)(globalObject.vikeConfigCtx);
+    const { userRootDir, vikeVitePluginOptions } = globalObject.vikeConfigCtx;
     (0, utils_js_1.assert)(vikeVitePluginOptions);
     resolveVikeConfigInternal_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
 }
@@ -57,15 +55,15 @@ async function getVikeConfigInternal(
 // I don't remember the logic behind it — neither why we restart Vite's dev server, nor why we sometimes don't.
 // TO-DO/eventually: re-think all that. Some + settings are expected to influence Vite's config (restarting Vite's dev server is needed) while some don't.
 doNotRestartViteOnError = false) {
-    (0, utils_js_1.assert)(vikeConfigCtx);
-    const { userRootDir, isDev, vikeVitePluginOptions } = vikeConfigCtx;
+    (0, utils_js_1.assert)(globalObject.vikeConfigCtx);
+    const { userRootDir, isDev, vikeVitePluginOptions } = globalObject.vikeConfigCtx;
     const vikeConfig = await getOrResolveVikeConfig(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     return vikeConfig;
 }
 // TO-DO/next-major-release: remove
 function getVikeConfigInternalSync() {
-    (0, utils_js_1.assert)(vikeConfigSync);
-    return vikeConfigSync;
+    (0, utils_js_1.assert)(globalObject.vikeConfigSync);
+    return globalObject.vikeConfigSync;
 }
 // TO-DO/eventually: this maybe(/probably?) isn't safe against race conditions upon file changes in development, thus:
 // - Like getGlobalContext() and getGlobalContextSync() — make getVikeConfig() async and provide a getVikeConfigSync() while discourage using it
@@ -86,29 +84,29 @@ config) {
 }
 function setVikeConfigContext(vikeConfigCtx_) {
     // If the user changes Vite's `config.root` => Vite completely reloads itself => setVikeConfigContext() is called again
-    vikeConfigCtx = vikeConfigCtx_;
+    globalObject.vikeConfigCtx = vikeConfigCtx_;
 }
 async function getOrResolveVikeConfig(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
-    if (!vikeConfigPromise) {
+    if (!globalObject.vikeConfigPromise) {
         resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     }
-    (0, utils_js_1.assert)(vikeConfigPromise);
-    const vikeConfig = await vikeConfigPromise;
+    (0, utils_js_1.assert)(globalObject.vikeConfigPromise);
+    const vikeConfig = await globalObject.vikeConfigPromise;
     return vikeConfig;
 }
 async function getVikeConfigInternalOptional() {
-    if (!vikeConfigPromise)
+    if (!globalObject.vikeConfigPromise)
         return null;
-    const vikeConfig = await vikeConfigPromise;
+    const vikeConfig = await globalObject.vikeConfigPromise;
     return vikeConfig;
 }
 function isV1Design() {
-    (0, utils_js_1.assert)(typeof isV1Design_ === 'boolean');
-    return isV1Design_;
+    (0, utils_js_1.assert)(typeof globalObject.isV1Design_ === 'boolean');
+    return globalObject.isV1Design_;
 }
 async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
     const { promise, resolve, reject } = (0, utils_js_1.genPromise)();
-    vikeConfigPromise = promise;
+    globalObject.vikeConfigPromise = promise;
     const esbuildCache = {
         transpileCache: {},
         vikeConfigDependencies: new Set(),
@@ -125,10 +123,10 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
     }
     // There is a newer call — let the new call supersede the old one.
     // We deliberately swallow the intermetidate state (including any potential error) — it's now outdated and has existed only for a very short period of time.
-    if (vikeConfigPromise !== promise) {
+    if (globalObject.vikeConfigPromise !== promise) {
         // vikeConfigPromise.then(resolve).catch(reject)
         try {
-            resolve(await vikeConfigPromise);
+            resolve(await globalObject.vikeConfigPromise);
         }
         catch (err) {
             reject(err);
@@ -138,13 +136,13 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
     if (!hasError) {
         (0, utils_js_1.assert)(ret);
         (0, utils_js_1.assert)(err === undefined);
-        const hadError = vikeConfigHasBuildError;
-        vikeConfigHasBuildError = false;
+        const hadError = globalObject.vikeConfigHasBuildError;
+        globalObject.vikeConfigHasBuildError = false;
         (0, getVikeConfigError_js_1.setVikeConfigError)({ errorBuild: false });
         if (hadError) {
             (0, loggerNotProd_js_1.logConfigErrorRecover)();
-            if (restartVite) {
-                restartVite = false;
+            if (globalObject.restartVite) {
+                globalObject.restartVite = false;
                 restartViteDevServer();
             }
         }
@@ -153,10 +151,10 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
     else {
         (0, utils_js_1.assert)(ret === undefined);
         (0, utils_js_1.assert)(err);
-        vikeConfigHasBuildError = true;
+        globalObject.vikeConfigHasBuildError = true;
         (0, getVikeConfigError_js_1.setVikeConfigError)({ errorBuild: { err } });
         if (!doNotRestartViteOnError)
-            restartVite = true;
+            globalObject.restartVite = true;
         if (!isDev) {
             reject(err);
         }
@@ -170,8 +168,8 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
     const plusFilesAll = await (0, getPlusFilesAll_js_1.getPlusFilesAll)(userRootDir, esbuildCache);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
-    if (!isV1Design_)
-        isV1Design_ = pageConfigs.length > 0;
+    if (!globalObject.isV1Design_)
+        globalObject.isV1Design_ = pageConfigs.length > 0;
     // Backwards compatibility for vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
@@ -181,7 +179,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
     // pages
     const vikeConfigPublicPagesEager = (0, utils_js_1.objectFromEntries)(pageConfigs.map((pageConfig) => {
         const pageConfigValues = getConfigValues(pageConfig, true);
-        return (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageEager)(pageConfigGlobalValues, pageConfig, pageConfigValues);
+        return (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageEagerLoaded)(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
     const prerenderContext = resolvePrerenderContext({
         config: vikeConfigPublicGlobal.config,
@@ -197,7 +195,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
         prerenderContext,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
     };
-    vikeConfigSync = vikeConfig;
+    globalObject.vikeConfigSync = vikeConfig;
     return vikeConfig;
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
@@ -421,9 +419,9 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
 }
 function setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved) {
     // Vike API — passed options [lowest precedence]
-    const apiOperation = (0, context_js_1.getApiOperation)();
-    if (apiOperation?.options.vikeConfig) {
-        addSources(apiOperation.options.vikeConfig, { definedBy: 'api', operation: apiOperation.operation }, false);
+    const vikeApiOperation = (0, context_js_1.getVikeApiOperation)();
+    if (vikeApiOperation?.options.vikeConfig) {
+        addSources(vikeApiOperation.options.vikeConfig, { definedBy: 'api', operation: vikeApiOperation.operation }, false);
     }
     const { configFromCliOptions, configFromEnvVar } = getVikeConfigFromCliOrEnv();
     // Vike CLI options
@@ -1102,7 +1100,7 @@ function isGlobalLocation(locationId, plusFilesAll) {
 }
 function resolvePrerenderContext(vikeConfig) {
     const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
-    prerenderContext ?? (prerenderContext = {
+    globalObject.prerenderContext ?? (globalObject.prerenderContext = {
         isPrerenderingEnabled: false,
         isPrerenderingEnabledForAllPages: false,
         // Set at runPrerender()
@@ -1110,9 +1108,9 @@ function resolvePrerenderContext(vikeConfig) {
         // Set at runPrerender()
         pageContexts: null,
     });
-    prerenderContext.isPrerenderingEnabled = isPrerenderingEnabled;
-    prerenderContext.isPrerenderingEnabledForAllPages = isPrerenderingEnabledForAllPages;
-    return prerenderContext;
+    globalObject.prerenderContext.isPrerenderingEnabled = isPrerenderingEnabled;
+    globalObject.prerenderContext.isPrerenderingEnabledForAllPages = isPrerenderingEnabledForAllPages;
+    return globalObject.prerenderContext;
 }
 function restartViteDevServer() {
     const viteDevServer = (0, globalContext_js_1.getViteDevServer)();
@@ -1149,7 +1147,7 @@ function getVikeConfigDummy(esbuildCache) {
         prerenderContext: prerenderContextDummy,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
     };
-    vikeConfigSync = vikeConfigDummy;
-    isV1Design_ = true;
+    globalObject.vikeConfigSync = vikeConfigDummy;
+    globalObject.isV1Design_ = true;
     return vikeConfigDummy;
 }

package/dist/cjs/shared/createGlobalContextShared.js

@@ -3,19 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalContextSyncErrMsg = void 0;
 exports.createGlobalContextShared = createGlobalContextShared;
 const utils_js_1 = require("./utils.js");
-const parseVirtualFileExports_js_1 = require("./getPageFiles/parseVirtualFileExports.js");
+const parseVirtualFileExportsGlobalEntry_js_1 = require("./getPageFiles/parseVirtualFileExportsGlobalEntry.js");
 const resolveVikeConfigPublic_js_1 = require("./page-configs/resolveVikeConfigPublic.js");
 const execHook_js_1 = require("./hooks/execHook.js");
 const prepareGlobalContextForPublicUsage_js_1 = require("./prepareGlobalContextForPublicUsage.js");
 const getHook_js_1 = require("./hooks/getHook.js");
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
-const globalObject_ = (0, utils_js_1.getGlobalObject)('shared/createGlobalContextShared.ts', {});
 // TO-DO/eventually use flat globalContext — like flat pageContext
-async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext, 
+async function createGlobalContextShared(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, 
 // TO-DO/next-major-release: we'll be able to remove addGlobalContextTmp after loadPageRoutes() is sync (it will be sync after we remove the old design)
 addGlobalContextTmp, addGlobalContextAsync) {
-    const { previousCallPromise } = globalObject_;
+    const { previousCreateGlobalContextPromise } = globalObject;
     const { promise, resolve } = (0, utils_js_1.genPromise)({
         // Avoid this Cloudflare Worker error:
         // ```console
@@ -23,9 +22,12 @@ addGlobalContextTmp, addGlobalContextAsync) {
         // ```
         timeout: null,
     });
-    globalObject_.previousCallPromise = promise;
-    await previousCallPromise;
-    const globalContext = createGlobalContextBase(virtualFileExports);
+    globalObject.previousCreateGlobalContextPromise = promise;
+    if (previousCreateGlobalContextPromise) {
+        (0, utils_js_1.assert)(globalObject.globalContext);
+        await previousCreateGlobalContextPromise;
+    }
+    const globalContext = createGlobalContextBase(virtualFileExportsGlobalEntry);
     let isNewGlobalContext;
     if (!globalObject.globalContext) {
         // We set globalObject.globalContext early and before any async operations, so that getGlobalContextSync() can be used early.
@@ -37,7 +39,7 @@ addGlobalContextTmp, addGlobalContextAsync) {
         isNewGlobalContext = true;
     }
     if (addGlobalContext &&
-        // TODO/next-major-release: remove
+        // TO-DO/next-major-release: remove
         globalContext._pageConfigs.length > 0) {
         const globalContextAdded = addGlobalContext?.(globalContext);
         (0, utils_js_1.objectAssign)(globalContext, globalContextAdded);
@@ -70,8 +72,8 @@ addGlobalContextTmp, addGlobalContextAsync) {
     resolve();
     return globalObject.globalContext;
 }
-function createGlobalContextBase(virtualFileExports) {
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, vikeConfigPublicGlobal, vikeConfigPublicPagesEager, } = getConfigsAll(virtualFileExports);
+function createGlobalContextBase(virtualFileExportsGlobalEntry) {
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, vikeConfigPublicGlobal, vikeConfigPublicPagesEager, } = getConfigsAll(virtualFileExportsGlobalEntry);
     const globalContext = {
         /**
          * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
@@ -80,7 +82,7 @@ function createGlobalContextBase(virtualFileExports) {
          */
         isGlobalContext: true,
         _isOriginalObject: true,
-        _virtualFileExports: virtualFileExports,
+        _virtualFileExportsGlobalEntry: virtualFileExportsGlobalEntry,
         _pageFilesAll: pageFilesAll,
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
@@ -92,14 +94,14 @@ function createGlobalContextBase(virtualFileExports) {
     (0, utils_js_1.changeEnumerable)(globalContext, '_isOriginalObject', false);
     return globalContext;
 }
-function getConfigsAll(virtualFileExports) {
-    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseVirtualFileExports_js_1.parseVirtualFileExports)(virtualFileExports);
+function getConfigsAll(virtualFileExportsGlobalEntry) {
+    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseVirtualFileExportsGlobalEntry_js_1.parseVirtualFileExportsGlobalEntry)(virtualFileExportsGlobalEntry);
     const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
     const vikeConfigPublicGlobal = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicGlobal)({
         pageConfigGlobalValues: pageConfigGlobal.configValues,
     });
     const vikeConfigPublicPagesEager = Object.fromEntries(pageConfigs.map((pageConfig) => {
-        return (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageEager)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
+        return (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageEagerLoaded)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
     }));
     return {
         pageFilesAll,

package/dist/cjs/shared/getPageFiles/{parseVirtualFileExports.js → parseVirtualFileExportsGlobalEntry.js}

@@ -1,35 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseVirtualFileExports = parseVirtualFileExports;
-// TODO/now: rename parseVirtualFileExportsEntryGlobal
-// TODO/now: merge or collocate following both files?
-// ```filesystem
-// vike/packages/vike/shared/getPageFiles/parseVirtualFileExports.ts
-// vike/shared/page-configs/serialize/parsePageConfigs.ts
-// ```
+exports.parseVirtualFileExportsGlobalEntry = parseVirtualFileExportsGlobalEntry;
 // TO-DO/next-major-release: remove old design code, and remove all assertions.
 const utils_js_1 = require("../utils.js");
 const assert_exports_old_design_js_1 = require("./assert_exports_old_design.js");
 const getPageFileObject_js_1 = require("./getPageFileObject.js");
 const fileTypes_js_1 = require("./fileTypes.js");
-const parsePageConfigs_js_1 = require("../page-configs/serialize/parsePageConfigs.js");
-function parseVirtualFileExports(virtualFileExports) {
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesLazy', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesEager', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesExportNamesLazy', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesExportNamesEager', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page.client') ||
-        (0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page.server'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesList', 'string[]'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageConfigsSerialized'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageConfigGlobalSerialized'));
-    const { pageConfigsSerialized, pageConfigGlobalSerialized } = virtualFileExports;
+const parsePageConfigsSerialized_js_1 = require("../page-configs/serialize/parsePageConfigsSerialized.js");
+function parseVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry) {
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageFilesLazy', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageFilesEager', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageFilesExportNamesLazy', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageFilesExportNamesEager', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry.pageFilesLazy, '.page'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry.pageFilesLazy, '.page.client') ||
+        (0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry.pageFilesLazy, '.page.server'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageFilesList', 'string[]'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageConfigsSerialized'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageConfigGlobalSerialized'));
+    const { pageConfigsSerialized, pageConfigGlobalSerialized } = virtualFileExportsGlobalEntry;
     assertPageConfigsSerialized(pageConfigsSerialized);
     assertPageConfigGlobalSerialized(pageConfigGlobalSerialized);
-    const { pageConfigs, pageConfigGlobal } = (0, parsePageConfigs_js_1.parsePageConfigs)(pageConfigsSerialized, pageConfigGlobalSerialized);
+    const { pageConfigs, pageConfigGlobal } = (0, parsePageConfigsSerialized_js_1.parsePageConfigsSerialized)(pageConfigsSerialized, pageConfigGlobalSerialized);
     const pageFilesMap = {};
-    parseGlobResult(virtualFileExports.pageFilesLazy).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExportsGlobalEntry.pageFilesLazy).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const loadModule = globValue;
         assertLoadModule(loadModule);
@@ -40,7 +34,7 @@ function parseVirtualFileExports(virtualFileExports) {
             }
         };
     });
-    parseGlobResult(virtualFileExports.pageFilesExportNamesLazy).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExportsGlobalEntry.pageFilesExportNamesLazy).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const loadModule = globValue;
         assertLoadModule(loadModule);
@@ -53,20 +47,20 @@ function parseVirtualFileExports(virtualFileExports) {
         };
     });
     // `pageFilesEager` contains `.page.route.js` files
-    parseGlobResult(virtualFileExports.pageFilesEager).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExportsGlobalEntry.pageFilesEager).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const moduleExports = globValue;
         (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
         pageFile.fileExports = moduleExports;
     });
-    parseGlobResult(virtualFileExports.pageFilesExportNamesEager).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExportsGlobalEntry.pageFilesExportNamesEager).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const moduleExports = globValue;
         (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(moduleExports, 'exportNames', 'string[]'), pageFile.filePath);
         pageFile.exportNames = moduleExports.exportNames;
     });
-    virtualFileExports.pageFilesList.forEach((filePath) => {
+    virtualFileExportsGlobalEntry.pageFilesList.forEach((filePath) => {
         pageFilesMap[filePath] = pageFilesMap[filePath] ?? (0, getPageFileObject_js_1.getPageFileObject)(filePath);
     });
     const pageFilesAll = Object.values(pageFilesMap);

package/dist/cjs/shared/page-configs/loadAndParseVirtualFilePageEntry.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadAndParseVirtualFilePageEntry = loadAndParseVirtualFilePageEntry;
+const utils_js_1 = require("../utils.js");
+const parsePageConfigsSerialized_js_1 = require("./serialize/parsePageConfigsSerialized.js");
+async function loadAndParseVirtualFilePageEntry(pageConfig, isDev) {
+    if ('isPageEntryLoaded' in pageConfig &&
+        // We don't need to cache in dev, since Vite already caches the virtual module
+        !isDev) {
+        return pageConfig;
+    }
+    const { moduleId, moduleExportsPromise } = pageConfig.loadVirtualFilePageEntry();
+    const virtualFileExportsPageEntry = await moduleExportsPromise;
+    // `configValuesLoaded` is sometimes `undefined` https://github.com/vikejs/vike/discussions/2092
+    if (!virtualFileExportsPageEntry)
+        (0, utils_js_1.assert)(false, { moduleExportsPromise, virtualFileExportsPageEntry, moduleId });
+    const configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
+    Object.assign(pageConfig.configValues, configValues);
+    (0, utils_js_1.objectAssign)(pageConfig, { isPageEntryLoaded: true });
+    return pageConfig;
+}
+function parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry) {
+    const configValues = (0, parsePageConfigsSerialized_js_1.parseConfigValuesSerialized)(virtualFileExportsPageEntry.configValuesSerialized);
+    return configValues;
+}

package/dist/cjs/shared/page-configs/resolveVikeConfigPublic.js

@@ -1,17 +1,23 @@
 "use strict";
+// TODO/now: rename PageConfig names
+// - Use `Internal` suffix, i.e. {Page,Global}ConfigInternal
+//   - While keeping {Page,Global}ConfigPublic or remove Public suffix and rename it to {Page,Global}Config ?
+// - rename EagerLoaded EagerlyLoaded
+// - remove `LazyLoaded` suffix
+// TODO/now: rename VikeConfigPublicPageLazyLoaded PageContextSomething (for `pageContext: PageContextSomething` usage)
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveVikeConfigPublicGlobal = resolveVikeConfigPublicGlobal;
-exports.resolveVikeConfigPublicPageEager = resolveVikeConfigPublicPageEager;
-exports.resolveVikeConfigPublicPageLazy = resolveVikeConfigPublicPageLazy;
+exports.resolveVikeConfigPublicPageEagerLoaded = resolveVikeConfigPublicPageEagerLoaded;
+exports.resolveVikeConfigPublicPageLazyLoaded = resolveVikeConfigPublicPageLazyLoaded;
 const assert_exports_old_design_js_1 = require("../getPageFiles/assert_exports_old_design.js");
 const getConfigDefinedAt_js_1 = require("./getConfigDefinedAt.js");
 const helpers_js_1 = require("./helpers.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function resolveVikeConfigPublicPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+function resolveVikeConfigPublicPageEagerLoaded(pageConfigGlobalValues, pageConfig, pageConfigValues) {
     const vikeConfigPublicPage_ = resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues });
     const vikeConfigPublicPage = getPublicCopy(vikeConfigPublicPage_);
     let page;
@@ -46,7 +52,7 @@ function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues, }) {
     const vikeConfigPublicGlobal = resolveVikeConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
     return getPublicCopy(vikeConfigPublicGlobal);
 }
-function resolveVikeConfigPublicPageLazy(pageFiles, // V0.4 design
+function resolveVikeConfigPublicPageLazyLoaded(pageFiles, // V0.4 design
 pageConfig, // V1 design
 pageConfigGlobal) {
     const config = {};

package/dist/cjs/shared/page-configs/serialize/{parsePageConfigs.js → parsePageConfigsSerialized.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePageConfigs = parsePageConfigs;
+exports.parsePageConfigsSerialized = parsePageConfigsSerialized;
 exports.parseConfigValuesSerialized = parseConfigValuesSerialized;
 const utils_js_1 = require("../../utils.js");
 const getConfigDefinedAt_js_1 = require("../getConfigDefinedAt.js");
 const parse_1 = require("@brillout/json-serializer/parse");
 const assertPlusFileExport_js_1 = require("../assertPlusFileExport.js");
-function parsePageConfigs(pageConfigsSerialized, pageConfigGlobalSerialized) {
+function parsePageConfigsSerialized(pageConfigsSerialized, pageConfigGlobalSerialized) {
     // pageConfigs
     const pageConfigs = pageConfigsSerialized.map((pageConfigSerialized) => {
         const configValues = parseConfigValuesSerialized(pageConfigSerialized.configValuesSerialized);

package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js

@@ -16,9 +16,9 @@ const getConfigValueSourcesRelevant_js_1 = require("../../../node/vite/plugins/p
 const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
-// This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigs()
-// - vike/shared/page-configs/serialize/parsePageConfigs.ts
-// - parsePageConfigs() is loaded on both the client- and server-side.
+// This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigsSerialized()
+// - vike/shared/page-configs/serialize/parsePageConfigsSerialized.ts
+// - parsePageConfigsSerialized() is loaded on both the client- and server-side.
 (0, utils_js_1.assertIsNotBrowser)();
 (0, assertSetup_js_1.assertIsNotProductionRuntime)();
 function serializeConfigValues(pageConfig, importStatements, filesEnv, runtimeEnv, tabspace, isEager) {

package/dist/cjs/shared/route/execHookOnBeforeRoute.js

@@ -28,7 +28,6 @@ async function execHookOnBeforeRoute(pageContext) {
             }
             (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, {
                 _routingProvidedByOnBeforeRouteHook: true,
-                _debugRouteMatches: 'CUSTOM_ROUTING',
             });
             return pageContextFromOnBeforeRouteHook;
         }

package/dist/cjs/shared/route/index.js

@@ -86,7 +86,6 @@ async function route(pageContext, skipOnBeforeRouteHook) {
     (0, resolvePrecedence_js_1.resolvePrecedence)(routeMatches);
     const winner = routeMatches[0] ?? null;
     (0, debug_js_1.debug)(`Route matches for URL ${picocolors_1.default.cyan(urlPathname)} (in precedence order):`, routeMatches);
-    (0, utils_js_1.objectAssign)(pageContextFromRoute, { _debugRouteMatches: routeMatches });
     // For vite-plugin-vercel https://github.com/magne4000/vite-plugin-vercel/blob/main/packages/vike-integration/vike.ts#L173
     (0, utils_js_1.objectAssign)(pageContextFromRoute, { _routeMatch: winner });
     if (!winner) {

package/dist/cjs/types/VikeGlobalInternal.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.237';
+exports.PROJECT_VERSION = '0.4.238-commit-3c1a09d';

package/dist/cjs/utils/assertSetup.js

@@ -17,6 +17,7 @@ const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const debug_js_1 = require("./debug.js");
 const getGlobalObject_js_1 = require("./getGlobalObject.js");
+const isNonRunnableDev_js_1 = require("./isNonRunnableDev.js");
 const isVitest_js_1 = require("./isVitest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
@@ -29,8 +30,6 @@ function assertIsNotProductionRuntime() {
     setup.shouldNotBeProduction = true;
 }
 function onSetupRuntime() {
-    if (true)
-        return; // TODO/now refactor this
     if (debug.isActivated)
         debug('assertSetup()', new Error().stack);
     if (isTest())
@@ -38,7 +37,7 @@ function onSetupRuntime() {
     assertNodeEnvIsNotUndefinedString();
     if (!setup.viteDevServer && setup.isViteDev === undefined) {
         // TO-DO/eventually: make it assertUsage() again once https://github.com/vikejs/vike/issues/1528 is implemented.
-        (0, assert_js_1.assertWarning)(!isNodeEnvDev(), `The ${getEnvDescription()}, which is contradictory because the environment seems to be a production environment (Vite isn't loaded), see ${picocolors_1.default.underline('https://vike.dev/NODE_ENV')} and ${picocolors_1.default.underline('https://vike.dev/warning/setup')}`, { onlyOnce: true });
+        (0, assert_js_1.assertWarning)(!isNodeEnvDev() || (0, isNonRunnableDev_js_1.isNonRunnableDev)(), `The ${getEnvDescription()}, which is contradictory because the environment seems to be a production environment (Vite isn't loaded), see ${picocolors_1.default.underline('https://vike.dev/NODE_ENV')} and ${picocolors_1.default.underline('https://vike.dev/warning/setup')}`, { onlyOnce: true });
         (0, assert_js_1.assertUsage)(!setup.vikeVitePlugin, `Vike's Vite plugin (the ${picocolors_1.default.cyan('vike/plugin')} module) shouldn't be loaded in production, see ${picocolors_1.default.underline('https://vike.dev/warning/setup')}`);
         // This assert() one of the main goal of this file: it ensures assertIsNotProductionRuntime()
         (0, assert_js_1.assert)(!setup.shouldNotBeProduction);

package/dist/cjs/utils/assertVersion.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertVersion = assertVersion;
 exports.isVersionOrAbove = isVersionOrAbove;
 const assert_js_1 = require("./assert.js");
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 function assertVersion(dependencyName, versionActual, versionExpected) {
     (0, assert_js_1.assert)(versionActual);
     (0, assert_js_1.assert)(versionExpected);

package/dist/cjs/utils/debug.js

@@ -5,17 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDebugger = createDebugger;
 exports.isDebugActivated = isDebugActivated;
-const isBrowser_js_1 = require("./isBrowser.js");
 const isCallable_js_1 = require("./isCallable.js");
 const objectAssign_js_1 = require("./objectAssign.js");
 const assert_js_1 = require("./assert.js");
 const checkType_js_1 = require("./checkType.js");
-const getTerminWidth_js_1 = require("./getTerminWidth.js");
+const getTerminalWidth_js_1 = require("./getTerminalWidth.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isArray_js_1 = require("./isArray.js");
 const isObject_js_1 = require("./isObject.js");
 const debug_js_1 = require("../shared/route/debug.js");
-(0, assert_js_1.assert)(!(0, isBrowser_js_1.isBrowser)());
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 (0, debug_js_1.setCreateDebugger)(createDebugger); // for isomorphic code
 const flags = [
     'vike:crawl',
@@ -117,7 +117,7 @@ function formatMsg(info, options, padding, position) {
     return str;
 }
 function pad(str, padding) {
-    const terminalWidth = (0, getTerminWidth_js_1.getTerminalWidth)();
+    const terminalWidth = (0, getTerminalWidth_js_1.getTerminalWidth)();
     const lines = [];
     str.split('\n').forEach((line) => {
         if (!terminalWidth) {

package/dist/cjs/utils/getGlobalObject.js

@@ -1,22 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalObject = getGlobalObject;
-exports.assertIsSingleModuleInstance = assertIsSingleModuleInstance;
-const assert_js_1 = require("./assert.js");
 /** Share information across module instances. */
-function getGlobalObject(key, defaultValue) {
-    const globalObjects = getGlobalObjects();
-    const globalObject = (globalObjects[key] = globalObjects[key] || defaultValue);
+function getGlobalObject(moduleId, defaultValue) {
+    const globals = getGlobals();
+    const globalObject = (globals[moduleId] ?? (globals[moduleId] = defaultValue));
     return globalObject;
 }
-/** Assert that the module is instantiated only once. */
-function assertIsSingleModuleInstance(key) {
-    const globalObjects = getGlobalObjects();
-    (0, assert_js_1.assert)(!(key in globalObjects));
-}
-function getGlobalObjects() {
-    const projectKey = '_vike';
-    // @ts-ignore
-    const globalObjects = (globalThis[projectKey] = globalThis[projectKey] || {});
-    return globalObjects;
+function getGlobals() {
+    var _a;
+    globalThis._vike ?? (globalThis._vike = {});
+    (_a = globalThis._vike).globals ?? (_a.globals = {});
+    return globalThis._vike.globals;
 }

package/dist/cjs/utils/isNonRunnableDev.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isNonRunnableDev = isNonRunnableDev;
+const assert_js_1 = require("./assert.js");
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
+function isNonRunnableDev() {
+    if (typeof __VIKE__IS_NON_RUNNABLE_DEV === 'undefined')
+        return false;
+    (0, assert_js_1.assert)(__VIKE__IS_NON_RUNNABLE_DEV === true);
+    return true;
+}

package/dist/cjs/utils/isScriptFile.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scriptFileExtensionList = exports.scriptFileExtensionPattern = void 0;
+exports.scriptFileExtensionPattern = exports.scriptFileExtensionList = void 0;
 exports.isScriptFile = isScriptFile;
 exports.isPlainScriptFile = isPlainScriptFile;
 exports.isTemplateFile = isTemplateFile;