vike 0.4.237 → 0.4.238

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMagicString = getMagicString;
 const magic_string_1 = __importDefault(require("magic-string"));
-// TODO/now use everywhere
+// Used everywhere instead of `new MagicString()` for consistent source map generation
 function getMagicString(code, id) {
     const magicString = new magic_string_1.default(code);
     const getMagicStringResult = () => {

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

@@ -7,27 +7,23 @@ exports.getOutDirs = getOutDirs;
 exports.resolveOutDir = resolveOutDir;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
-const isViteServerBuild_js_1 = require("./isViteServerBuild.js");
+const isViteServerSide_js_1 = require("./isViteServerSide.js");
 const debug = (0, utils_js_1.createDebugger)('vike:outDir');
 function getOutDirs(configGlobal, viteEnv) {
-    const configEnv = viteEnv?.config ?? configGlobal;
     debug('getOutDirs()', new Error().stack);
-    const outDir = getOutDirFromViteResolvedConfig(configEnv);
-    if (!isOutDirRoot(outDir))
-        assertOutDirResolved(outDir, configEnv);
-    const outDirs = getOutDirsAll(outDir, configEnv.root);
+    const outDir = getOutDirFromResolvedConfig(configGlobal, viteEnv);
+    assertOutDirResolved(outDir, configGlobal, viteEnv);
+    const outDirs = getOutDirsAll(outDir, configGlobal.root);
+    assertNormalization(outDirs.outDirRoot);
+    assertNormalization(outDirs.outDirClient);
+    assertNormalization(outDirs.outDirServer);
     return outDirs;
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */
-function resolveOutDir(config, isSSR) {
-    debug('resolveOutDir()', new Error().stack);
-    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(config) || isSSR;
-    debug('isServerSide', isServerSide);
+function resolveOutDir(config, isServerSide) {
+    debug('resolveOutDir()');
     const outDir = getOutDirFromViteUserConfig(config) || 'dist';
     debug('outDir', outDir);
-    /* outDir may already be resolved when using Telefunc + Vike (because both Telefunc and Vike use this logic)
-    assert(isOutDirRoot(outDir))
-    */
     const { outDirClient, outDirServer } = getOutDirsAll(outDir);
     if (isServerSide) {
         debug('outDirServer', 'outDirServer');
@@ -91,9 +87,9 @@ function getOutDirsAllFromRootNormalized(outDirRoot, root) {
 }
 function assertNormalization(outDirAny) {
     (0, utils_js_1.assertPosixPath)(outDirAny);
-    (0, utils_js_1.assert)(outDirIsAbsolutePath(outDirAny));
-    (0, utils_js_1.assert)(outDirAny.endsWith('/'));
-    (0, utils_js_1.assert)(!outDirAny.endsWith('//'));
+    (0, utils_js_1.assert)(outDirIsAbsolutePath(outDirAny), outDirAny);
+    (0, utils_js_1.assert)(outDirAny.endsWith('/'), outDirAny);
+    (0, utils_js_1.assert)(!outDirAny.endsWith('//'), outDirAny);
 }
 function isOutDirRoot(outDirRot) {
     const p = outDirRot.split('/').filter(Boolean);
@@ -103,14 +99,17 @@ function isOutDirRoot(outDirRot) {
 function assertIsNotOutDirRoot(outDir) {
     (0, utils_js_1.assert)(outDir.endsWith('/client') || outDir.endsWith('/server'));
 }
-/** Assert that `outDir` ends with `/server` or `/client` */
-function assertOutDirResolved(outDir, config) {
+/** Assert that `outDir` ends with the correct directory `/server` or `/client` */
+function assertOutDirResolved(outDir, configGlobal, viteEnv) {
     (0, utils_js_1.assertPosixPath)(outDir);
-    assertIsNotOutDirRoot(outDir);
+    if (isOutDirRoot(outDir))
+        return;
+    (0, utils_js_1.assert)(outDir.endsWith('/client') || outDir.endsWith('/server')); // we normalized outDir
     (0, utils_js_1.assert)('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${picocolors_1.default.cyan(outDir)} but you should set it to ${picocolors_1.default.cyan(outDirCorrected)} instead.`;
-    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
+    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_viteEnvOptional)(configGlobal, viteEnv);
+    if (isServerSide) {
         (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }
     else {
@@ -124,8 +123,8 @@ function getOutDirFromViteUserConfig(config) {
     outDir = normalizeOutDir(outDir);
     return outDir;
 }
-function getOutDirFromViteResolvedConfig(config) {
-    let outDir = config.build.outDir;
+function getOutDirFromResolvedConfig(config, viteEnv) {
+    let outDir = viteEnv?.config.build?.outDir ?? config.build.outDir;
     (0, utils_js_1.assert)(outDir);
     outDir = normalizeOutDir(outDir);
     return outDir;

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

@@ -5,7 +5,7 @@ const utils_js_1 = require("../utils.js");
 const getOutDirs_js_1 = require("./getOutDirs.js");
 function getViteConfigRuntime(config) {
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(config, '_baseViteOriginal', 'string'));
-    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
+    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot);
     const viteConfigRuntime = {
         root: config.root,

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

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isViteServerSide = isViteServerSide;
+exports.isViteClientSide = isViteClientSide;
+exports.isViteServerSide_viteEnvOptional = isViteServerSide_viteEnvOptional;
+exports.isViteServerSide_onlySsrEnv = isViteServerSide_onlySsrEnv;
+exports.isViteServerSide_extraSafe = isViteServerSide_extraSafe;
+const assert_js_1 = require("../../../utils/assert.js");
+function isViteServerSide_impl(configGlobal, viteEnv) {
+    (0, assert_js_1.assert)(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
+    const debug = {
+        viteEnvIsUndefined: !viteEnv,
+        viteEnvName: viteEnv?.name ?? null,
+        viteEnvConsumer: viteEnv?.config.consumer ?? null,
+        configEnvBuildSsr: viteEnv?.config.build?.ssr ?? null,
+        configGlobalBuildSsr: configGlobal.build?.ssr ?? null,
+    };
+    if (!viteEnv) {
+        const isServerSide = getBuildSsrValue(configGlobal.build?.ssr);
+        (0, assert_js_1.assert)(typeof isServerSide === 'boolean', debug);
+        return isServerSide;
+    }
+    else {
+        const isServerSide1 = !viteEnv.config.consumer ? null : viteEnv.config.consumer !== 'client';
+        const isServerSide2 = getBuildSsrValue(viteEnv.config.build?.ssr);
+        const isServerSide3 = viteEnv.name === 'ssr' ? true : viteEnv.name === 'client' ? false : null;
+        const isServerSide = isServerSide1 ?? isServerSide2;
+        (0, assert_js_1.assert)(isServerSide === isServerSide1 || isServerSide1 === null, debug);
+        (0, assert_js_1.assert)(isServerSide === isServerSide2 || isServerSide2 === null, debug);
+        (0, assert_js_1.assert)(isServerSide === isServerSide3 || isServerSide3 === null, debug);
+        (0, assert_js_1.assert)(isServerSide !== null);
+        return isServerSide;
+    }
+}
+function getBuildSsrValue(buildSsr) {
+    if (buildSsr === undefined)
+        return null;
+    (0, assert_js_1.assert)(typeof buildSsr === 'boolean' || typeof buildSsr === 'string');
+    return !!buildSsr;
+}
+function isViteServerSide(configGlobal, viteEnv) {
+    return isViteServerSide_impl(configGlobal, viteEnv);
+}
+function isViteServerSide_viteEnvOptional(configGlobal, viteEnv) {
+    return isViteServerSide_impl(configGlobal, viteEnv);
+}
+function isViteClientSide(configGlobal, viteEnv) {
+    return !isViteServerSide(configGlobal, viteEnv);
+}
+// Only `ssr` env: for example don't include `vercel_edge` nor `vercel_node`.
+function isViteServerSide_onlySsrEnv(configGlobal, viteEnv) {
+    return viteEnv.name ? viteEnv.name === 'ssr' : isViteServerSide(configGlobal, viteEnv);
+}
+// Vite is quite messy about setting config.build.ssr — for security purposes, we use an extra safe implementation with lots of assertions, which is needed for the .client.js and .server.js guarantee.
+function isViteServerSide_extraSafe(config, viteEnv, options) {
+    const isServerSide = isViteServerSide(config, viteEnv);
+    const debug = {
+        isServerSide,
+        configCommand: config.command,
+        configBuildSsr: getBuildSsrValue(config.build.ssr),
+        optionsIsUndefined: options === undefined,
+        optionsSsr: options?.ssr ?? null,
+    };
+    (0, assert_js_1.assert)(options, debug);
+    (0, assert_js_1.assert)(typeof options.ssr === 'boolean', debug);
+    (0, assert_js_1.assert)(options.ssr === isServerSide, debug);
+    return isServerSide;
+}

package/dist/cjs/node/vite/shared/loggerVite/removeSuperfluousViteLog.js

@@ -4,10 +4,12 @@ exports.removeSuperfluousViteLog = removeSuperfluousViteLog;
 exports.removeSuperfluousViteLog_enable = removeSuperfluousViteLog_enable;
 exports.removeSuperfluousViteLog_disable = removeSuperfluousViteLog_disable;
 const utils_js_1 = require("../../utils.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('removeSuperfluousViteLog.ts', {
+    enabled: false,
+});
 const superfluousLog = 'Forced re-optimization of dependencies';
-let enabled = false;
 function removeSuperfluousViteLog(msg) {
-    if (!enabled) {
+    if (!globalObject.enabled) {
         return false;
     }
     if (msg.toLowerCase().includes('forced') && msg.toLowerCase().includes('optimization')) {
@@ -17,8 +19,8 @@ function removeSuperfluousViteLog(msg) {
     return false;
 }
 function removeSuperfluousViteLog_enable() {
-    enabled = true;
+    globalObject.enabled = true;
 }
 function removeSuperfluousViteLog_disable() {
-    enabled = false;
+    globalObject.enabled = false;
 }

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

@@ -33,7 +33,7 @@ function intercept(logType, config) {
             // We swallow Vite's message: we didn't see it add any value so far.
             //  - It can even be confusing, such as the following:
             //    ```
-            //    Error when evaluating SSR module virtual:vike:pageConfigLazy:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
+            //    Error when evaluating SSR module virtual:vike:page-entry:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
             //    ```
             (0, utils_js_1.assert)(!(0, isErrorDebug_js_1.isErrorDebug)());
             return;

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

@@ -110,7 +110,9 @@ const configDefinitionsBuiltIn = {
             }, pageConfig))
                 .flat(1)
                 // Server-only
-                .filter((source) => !source.configEnv.client);
+                .filter((source) => !source.configEnv.client)
+                // Config value isn't `null`
+                .filter((source) => !(0, getConfigValueSourcesRelevant_js_1.isConfigSourceValueNull)(source));
             return sources.length > 0;
         },
     },
@@ -122,22 +124,19 @@ const configDefinitionsBuiltIn = {
         env: { server: true, client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
             {
-                const source = getConfigValueSource(configValueSources, 'clientHooks');
+                const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)('clientHooks', pageConfig);
                 if (source) {
                     (0, utils_js_1.assert)(source.valueIsLoaded);
-                    if (source.value !== null) {
-                        const { value } = source;
-                        const definedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', source.definedAt);
-                        (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${definedAt} should be a boolean`);
-                        return value;
-                    }
+                    const { value, definedAt } = source;
+                    const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', definedAt);
+                    (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${configDefinedAt} should be a boolean`);
+                    return value;
                 }
             }
-            return (isConfigSet(configValueSources, 'onRenderClient') &&
-                isConfigSet(configValueSources, 'Page') &&
-                !!getConfigEnv(configValueSources, 'Page')?.client);
+            return (isConfigSet(pageConfig, 'onRenderClient') &&
+                isConfigSet(pageConfig, 'Page') &&
+                !!getConfigEnv(pageConfig, 'Page')?.client);
         },
     },
     // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
@@ -145,10 +144,7 @@ const configDefinitionsBuiltIn = {
         env: { client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
-            return !isConfigSet(configValueSources, 'onBeforeRender')
-                ? null
-                : getConfigEnv(configValueSources, 'onBeforeRender');
+            return !isConfigSet(pageConfig, 'onBeforeRender') ? null : getConfigEnv(pageConfig, 'onBeforeRender');
         },
     },
     // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
@@ -156,8 +152,7 @@ const configDefinitionsBuiltIn = {
         env: { client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
-            return !isConfigSet(configValueSources, 'data') ? null : getConfigEnv(configValueSources, 'data');
+            return !isConfigSet(pageConfig, 'data') ? null : getConfigEnv(pageConfig, 'data');
         },
     },
     hooksTimeout: {
@@ -246,11 +241,11 @@ const configDefinitionsBuiltIn = {
     },
 };
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;
-function getConfigEnv(configValueSources, configName) {
-    const configValueSource = getConfigValueSource(configValueSources, configName);
-    if (!configValueSource)
+function getConfigEnv(pageConfig, configName) {
+    const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)(configName, pageConfig);
+    if (!source)
         return null;
-    const { configEnv } = configValueSource;
+    const { configEnv } = source;
     const env = {};
     if (configEnv.client)
         env.client = true;
@@ -258,18 +253,7 @@ function getConfigEnv(configValueSources, configName) {
         env.server = true;
     return env;
 }
-function isConfigSet(configValueSources, configName) {
-    const source = getConfigValueSource(configValueSources, configName);
-    return (!!source &&
-        !(source.valueIsLoaded &&
-            // Enable users to suppress inherited config by overriding it with `null`
-            source.value === null));
-}
-function getConfigValueSource(configValueSources, configName) {
-    const sources = configValueSources[configName];
-    if (!sources)
-        return null;
-    const configValueSource = sources[0];
-    (0, utils_js_1.assert)(configValueSource);
-    return configValueSource;
+function isConfigSet(pageConfig, configName) {
+    const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)(configName, pageConfig);
+    return !!source;
 }

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

@@ -19,8 +19,9 @@ const ignorePatternsBuiltIn_js_1 = require("./crawlPlusFiles/ignorePatternsBuilt
 const execA = (0, node_util_1.promisify)(node_child_process_1.exec);
 const debug = (0, utils_js_1.createDebugger)('vike:crawl');
 (0, utils_js_1.assertIsNotProductionRuntime)();
-(0, utils_js_1.assertIsSingleModuleInstance)('getVikeConfig/crawlPlusFiles.ts');
-let gitIsNotUsable = false;
+const globalObject = (0, utils_js_1.getGlobalObject)('getVikeConfig/crawlPlusFiles.ts', {
+    gitIsNotUsable: false,
+});
 async function crawlPlusFiles(userRootDir) {
     (0, utils_js_1.assertPosixPath)(userRootDir);
     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(userRootDir);
@@ -53,7 +54,7 @@ async function crawlPlusFiles(userRootDir) {
 }
 // Same as tinyglobby() but using `$ git ls-files`
 async function gitLsFiles(userRootDir, ignorePatterns, ignoreMatchers) {
-    if (gitIsNotUsable)
+    if (globalObject.gitIsNotUsable)
         return null;
     // Preserve UTF-8 file paths.
     // https://github.com/vikejs/vike/issues/1658
@@ -87,7 +88,7 @@ async function gitLsFiles(userRootDir, ignorePatterns, ignoreMatchers) {
     }
     catch (err) {
         if (await isGitNotUsable(userRootDir)) {
-            gitIsNotUsable = true;
+            globalObject.gitIsNotUsable = true;
             return null;
         }
         throw err;

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,