vike 0.4.236-commit-eab75f6 → 0.4.237-commit-85e89b1

package/dist/cjs/node/vite/plugins/pluginVirtualFiles.js

@@ -5,11 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginVirtualFiles = pluginVirtualFiles;
 const vite_1 = require("vite");
-const getVirtualFilePageConfigLazy_js_1 = require("./pluginVirtualFiles/getVirtualFilePageConfigLazy.js");
-const getVirtualFileEntry_js_1 = require("./pluginVirtualFiles/getVirtualFileEntry.js");
+const generateVirtualFilePageEntry_js_1 = require("./pluginVirtualFiles/generateVirtualFilePageEntry.js");
+const generateVirtualFileGlobalEntryWithOldDesign_js_1 = require("./pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.js");
 const utils_js_1 = require("../utils.js");
-const virtualFilePageConfigLazy_js_1 = require("../../shared/virtualFiles/virtualFilePageConfigLazy.js");
-const virtualFileEntry_js_1 = require("../../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../../shared/virtualFileId.js");
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loggerNotProd_js_1 = require("../shared/loggerNotProd.js");
@@ -49,13 +48,16 @@ function pluginVirtualFiles() {
             id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
-            if ((0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(id)) {
-                const code = await (0, getVirtualFilePageConfigLazy_js_1.getVirtualFilePageConfigLazy)(id, isDev, config);
-                return code;
-            }
-            if ((0, virtualFileEntry_js_1.isVirtualFileIdEntry)(id)) {
-                const code = await (0, getVirtualFileEntry_js_1.getVirtualFileEntry)(id, options, config, isDev);
-                return code;
+            const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+            if (idParsed) {
+                if (idParsed.type === 'page-entry') {
+                    const code = await (0, generateVirtualFilePageEntry_js_1.generateVirtualFilePageEntry)(id, isDev, config);
+                    return code;
+                }
+                if (idParsed.type === 'global-entry') {
+                    const code = await (0, generateVirtualFileGlobalEntryWithOldDesign_js_1.generateVirtualFileGlobalEntryWithOldDesign)(id, options, config, this.environment, isDev);
+                    return code;
+                }
             }
         },
         configureServer(server) {
@@ -168,7 +170,7 @@ function reloadConfig(filePath, config, op, server) {
 }
 function getVikeVirtualFiles(server) {
     const vikeVirtualFiles = Array.from(server.moduleGraph.urlToModuleMap.keys())
-        .filter((url) => (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(url) || (0, virtualFileEntry_js_1.isVirtualFileIdEntry)(url))
+        .filter((url) => (0, virtualFileId_js_1.parseVirtualFileId)(url))
         .map((url) => {
         const mod = server.moduleGraph.urlToModuleMap.get(url);
         (0, utils_js_1.assert)(mod);

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

@@ -10,7 +10,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getOutDirs_js_1 = require("./getOutDirs.js");
 async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
-    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
+    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
     const timeBase = new Date().getTime();
     let pageFiles = await (0, tinyglobby_1.glob)(fileTypes.map((fileType) => `**/*${fileType}.${utils_js_1.scriptFileExtensionPattern}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
     pageFiles = pageFiles.map((p) => '/' + (0, utils_js_1.toPosixPath)(p));

package/dist/cjs/node/vite/shared/{resolveClientEntriesDev.js → getClientEntrySrcDev.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveClientEntriesDev = resolveClientEntriesDev;
+exports.getClientEntrySrcDev = getClientEntrySrcDev;
 const utils_js_1 = require("../utils.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-function resolveClientEntriesDev(clientEntry, viteDevServer) {
+function getClientEntrySrcDev(clientEntry, viteDevServer) {
     let userRootDir = viteDevServer.config.root;
     (0, utils_js_1.assert)(userRootDir);
     userRootDir = (0, utils_js_1.toPosixPath)(userRootDir);

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

@@ -5,23 +5,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutDirs = getOutDirs;
 exports.resolveOutDir = resolveOutDir;
+exports.resolveOutDir_configEnvironment = resolveOutDir_configEnvironment;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
 const isViteServerBuild_js_1 = require("./isViteServerBuild.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);
+    assertOutDirResolved(outDir, configGlobal, viteEnv);
+    const outDirs = getOutDirsAll(outDir, configGlobal.root);
     return outDirs;
 }
+function resolveOutDir_configEnvironment(configGlobal, envName, configEnv) {
+    (0, utils_js_1.assert)(configGlobal && envName && configEnv);
+    const viteEnv = { name: envName, config: configEnv };
+    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(configGlobal, viteEnv);
+    return resolveOutDir(configEnv, isServerSide);
+}
 /** Appends `client/` or `server/` to `config.build.outDir` */
-function resolveOutDir(config, isSSR) {
+function resolveOutDir(config, isServerSide) {
     debug('resolveOutDir()', new Error().stack);
-    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(config) || isSSR;
     debug('isServerSide', isServerSide);
     const outDir = getOutDirFromViteUserConfig(config) || 'dist';
     debug('outDir', outDir);
@@ -103,14 +107,16 @@ 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)) {
+    if ((0, isViteServerBuild_js_1.isViteServerBuild_withoutEnv)(configGlobal, viteEnv)) {
         (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }
     else {
@@ -124,7 +130,7 @@ function getOutDirFromViteUserConfig(config) {
     outDir = normalizeOutDir(outDir);
     return outDir;
 }
-function getOutDirFromViteResolvedConfig(config) {
+function getOutDirFromResolvedConfig(config) {
     let outDir = config.build.outDir;
     (0, utils_js_1.assert)(outDir);
     outDir = normalizeOutDir(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/isViteServerBuild.js

@@ -2,46 +2,69 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isViteServerBuild = isViteServerBuild;
 exports.isViteClientBuild = isViteClientBuild;
-exports.isViteServerBuild_options = isViteServerBuild_options;
-exports.isViteServerBuild_safe = isViteServerBuild_safe;
+exports.isViteServerBuild_withoutEnv = isViteServerBuild_withoutEnv;
 exports.isViteServerBuild_onlySsrEnv = isViteServerBuild_onlySsrEnv;
+exports.isViteServerBuild_extraSafe = isViteServerBuild_extraSafe;
 const assert_js_1 = require("../../../utils/assert.js");
-function isViteServerBuild(configGlobal, viteEnv) {
-    const configEnv = viteEnv?.config ?? configGlobal;
-    return !!configEnv?.build?.ssr;
+function isViteServerBuild_withoutEnv(configGlobal, viteEnv) {
+    (0, assert_js_1.assert)(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
+    const isServerSide1 = !viteEnv?.config.consumer ? null : viteEnv.config.consumer !== 'client';
+    const isServerSide2 = !viteEnv?.name ? null : viteEnv.name !== 'client'; // I can't think of a use case for creating another client-side environment
+    const isServerSide3 = !viteEnv ? null : !!viteEnv.config.build?.ssr;
+    const isServerSide4 = !!configGlobal.build?.ssr;
+    const debug = {
+        envIsUndefined: !viteEnv,
+        envName: viteEnv?.name ?? null,
+        envConsumer: viteEnv?.config.consumer ?? null,
+        configEnvBuildSsr: viteEnv?.config.build?.ssr ?? null,
+        configGlobalBuildSsr: configGlobal.build?.ssr ?? null,
+        isServerSide1,
+        isServerSide2,
+        isServerSide3,
+        isServerSide4,
+    };
+    if (isServerSide1 !== null) {
+        (0, assert_js_1.assert)(isServerSide1 === isServerSide2 || isServerSide2 === null, debug);
+        (0, assert_js_1.assert)(isServerSide1 === isServerSide3, debug);
+        return isServerSide1;
+    }
+    if (isServerSide2 !== null) {
+        /* This assertion can fail, seems to be a Vite bug?
+        assert(isServerSide2 === isServerSide3, debug)
+        */
+        return isServerSide2;
+    }
+    if (isServerSide3 !== null) {
+        return isServerSide3;
+    }
+    return isServerSide4;
 }
-// Only `ssr` env: for example don't include `vercel_edge` nor `vercel_node`.
-function isViteServerBuild_onlySsrEnv(configGlobal, viteEnv) {
-    return viteEnv ? viteEnv.name === 'ssr' : isViteServerBuild(configGlobal);
+function isViteServerBuild(configGlobal, viteEnv) {
+    return isViteServerBuild_withoutEnv(configGlobal, viteEnv);
 }
 function isViteClientBuild(configGlobal, viteEnv) {
-    const yes = !isViteServerBuild(configGlobal, viteEnv);
-    const isVite5 = viteEnv === undefined;
-    if (!isVite5) {
-        const yes2 = viteEnv.name === 'client';
-        (0, assert_js_1.assert)(yes === yes2);
-    }
-    return yes;
+    return !isViteServerBuild(configGlobal, viteEnv);
 }
-function isViteServerBuild_options(options) {
-    return !!options?.ssr;
+// Only `ssr` env: for example don't include `vercel_edge` nor `vercel_node`.
+function isViteServerBuild_onlySsrEnv(configGlobal, viteEnv) {
+    return viteEnv ? viteEnv.name === 'ssr' : isViteServerBuild(configGlobal, viteEnv);
 }
-// Vite is quite messy about setting `ssr: boolean`, thus we use an extra safe implementation for security purposes.
-// It's used for .client.js and .server.js guarantee thus we use aggressive assert() calls for added safety.
-function isViteServerBuild_safe(config, options) {
+// 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 isViteServerBuild_extraSafe(config, options, viteEnv) {
     if (config.command === 'build') {
-        (0, assert_js_1.assert)(typeof config.build.ssr === 'boolean');
-        const val = config.build.ssr;
-        if (options?.ssr !== undefined)
-            (0, assert_js_1.assert)(val === options.ssr);
-        return val;
+        const res = config.build.ssr;
+        (0, assert_js_1.assert)(typeof res === 'boolean');
+        (0, assert_js_1.assert)(res === options?.ssr || options?.ssr === undefined);
+        (0, assert_js_1.assert)(res === isViteServerBuild(config, viteEnv));
+        return res;
     }
     else {
-        (0, assert_js_1.assert)(typeof options?.ssr === 'boolean');
-        const val = options.ssr;
-        /* This assert() fails (which is very unexpected).
-        if (typeof config.build.ssr === 'boolean') assert(val === config.build.ssr)
-        //*/
-        return val;
+        const res = options?.ssr;
+        (0, assert_js_1.assert)(typeof res === 'boolean');
+        /* This assertion can fail, seems to be a Vite bug? It's very unexpected.
+        if (typeof config.build.ssr === 'boolean') assert(res === config.build.ssr)
+        */
+        (0, assert_js_1.assert)(res === isViteServerBuild(config, viteEnv));
+        return res;
     }
 }

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configDefinitionsBuiltIn = void 0;
 const utils_js_1 = require("../../utils.js");
 const getConfigDefinedAt_js_1 = require("../../../../shared/page-configs/getConfigDefinedAt.js");
+const getConfigValueSourcesRelevant_js_1 = require("../../plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js");
 const configDefinitionsBuiltIn = {
     onRenderHtml: {
         env: { server: true },
@@ -97,6 +98,22 @@ const configDefinitionsBuiltIn = {
     meta: {
         env: { config: true },
     },
+    serverOnlyHooks: {
+        env: { client: true },
+        eager: true,
+        _computed: (pageConfig) => {
+            const sources = ['data', 'onBeforeRender', 'onCreatePageContext']
+                .map((hookName) => (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourcesRelevant)(hookName, {
+                isForClientSide: false,
+                // TO-DO/eventually/remove-server-router: let's eventually remove support for Server Routing
+                isClientRouting: true,
+            }, pageConfig))
+                .flat(1)
+                // Server-only
+                .filter((source) => !source.configEnv.client);
+            return sources.length > 0;
+        },
+    },
     // Whether the page loads:
     //  - Vike's client runtime
     //  - User's client hooks
@@ -104,7 +121,8 @@ const configDefinitionsBuiltIn = {
     isClientRuntimeLoaded: {
         env: { server: true, client: true },
         eager: true,
-        _computed: (configValueSources) => {
+        _computed: (pageConfig) => {
+            const { configValueSources } = pageConfig;
             {
                 const source = getConfigValueSource(configValueSources, 'clientHooks');
                 if (source) {
@@ -122,15 +140,25 @@ const configDefinitionsBuiltIn = {
                 !!getConfigEnv(configValueSources, 'Page')?.client);
         },
     },
+    // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
     onBeforeRenderEnv: {
         env: { client: true },
         eager: true,
-        _computed: (configValueSources) => !isConfigSet(configValueSources, 'onBeforeRender') ? null : getConfigEnv(configValueSources, 'onBeforeRender'),
+        _computed: (pageConfig) => {
+            const { configValueSources } = pageConfig;
+            return !isConfigSet(configValueSources, 'onBeforeRender')
+                ? null
+                : getConfigEnv(configValueSources, 'onBeforeRender');
+        },
     },
+    // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
     dataEnv: {
         env: { client: true },
         eager: true,
-        _computed: (configValueSources) => !isConfigSet(configValueSources, 'data') ? null : getConfigEnv(configValueSources, 'data'),
+        _computed: (pageConfig) => {
+            const { configValueSources } = pageConfig;
+            return !isConfigSet(configValueSources, 'data') ? null : getConfigEnv(configValueSources, 'data');
+        },
     },
     hooksTimeout: {
         env: { server: true, client: true },

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

@@ -12,7 +12,6 @@ exports.isV1Design = isV1Design;
 exports.getConfVal = getConfVal;
 exports.getConfigDefinitionOptional = getConfigDefinitionOptional;
 exports.getVikeConfigFromCliOrEnv = getVikeConfigFromCliOrEnv;
-exports.isOverridden = isOverridden;
 exports.getVikeConfig = getVikeConfig;
 const utils_js_1 = require("../utils.js");
 const configDefinitionsBuiltIn_js_1 = require("./resolveVikeConfigInternal/configDefinitionsBuiltIn.js");
@@ -182,7 +181,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,
@@ -290,15 +289,16 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
         applyEffectsMetaEnv(configValueSources, configDefinitionsLocal);
         applyEffectsConfVal(configValueSources, configDefinitionsLocal, plusFilesAll);
         sortConfigValueSources(configValueSources, locationId);
-        const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
             pageId: locationId,
             ...pageConfigRoute,
             configDefinitions: configDefinitionsLocal,
             plusFiles: plusFilesRelevant,
             configValueSources,
-            configValuesComputed,
         };
+        const configValuesComputed = getComputed(pageConfig);
+        (0, utils_js_1.objectAssign)(pageConfig, { configValuesComputed });
+        (0, utils_js_1.checkType)(pageConfig);
         return pageConfig;
     });
     assertPageConfigs(pageConfigs);
@@ -365,7 +365,7 @@ function assertOnBeforeRenderEnv(pageConfig) {
 }
 function getConfigValues(pageConfig, tolerateMissingValue) {
     const configValues = {};
-    (0, serializeConfigValues_js_1.getConfigValuesBase)(pageConfig, (configEnv) => !!configEnv.config, null).forEach((entry) => {
+    (0, serializeConfigValues_js_1.getConfigValuesBase)(pageConfig, { isForConfig: true }, null).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
             (0, utils_js_1.assert)('value' in entry); // Help TS
             const { configValueBase, value, configName } = entry;
@@ -899,12 +899,12 @@ function applyEffectMetaEnv(configModFromEffect, configValueSources, configDefEf
         });
     });
 }
-function getComputed(configValueSources, configDefinitions) {
+function getComputed(pageConfig) {
     const configValuesComputed = {};
-    (0, utils_js_1.objectEntries)(configDefinitions).forEach(([configName, configDef]) => {
+    (0, utils_js_1.objectEntries)(pageConfig.configDefinitions).forEach(([configName, configDef]) => {
         if (!configDef._computed)
             return;
-        const value = configDef._computed(configValueSources);
+        const value = configDef._computed(pageConfig);
         if (value === undefined)
             return;
         configValuesComputed[configName] = {
@@ -1100,17 +1100,6 @@ function isGlobalLocation(locationId, plusFilesAll) {
         .map(([locationId]) => locationId);
     return locationIdsPage.every((locId) => (0, filesystemRouting_js_1.isInherited)(locationId, locId));
 }
-function isOverridden(source, configName, pageConfig) {
-    const configDef = pageConfig.configDefinitions[configName];
-    (0, utils_js_1.assert)(configDef);
-    if (configDef.cumulative)
-        return false;
-    const sources = pageConfig.configValueSources[configName];
-    (0, utils_js_1.assert)(sources);
-    const idx = sources.indexOf(source);
-    (0, utils_js_1.assert)(idx >= 0);
-    return idx > 0;
-}
 function resolvePrerenderContext(vikeConfig) {
     const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
     prerenderContext ?? (prerenderContext = {

package/dist/cjs/shared/createGlobalContextShared.js

@@ -3,17 +3,29 @@ 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;
-async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext, 
+const globalObject_ = (0, utils_js_1.getGlobalObject)('shared/createGlobalContextShared.ts', {});
+// TO-DO/eventually use flat globalContext — like flat pageContext
+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 globalContext = createGlobalContextBase(virtualFileExports);
+    const { previousCallPromise } = globalObject_;
+    const { promise, resolve } = (0, utils_js_1.genPromise)({
+        // Avoid this Cloudflare Worker error:
+        // ```console
+        // Error: Disallowed operation called within global scope. Asynchronous I/O (ex: fetch() or connect()), setting a timeout, and generating random values are not allowed within global scope. To fix this error, perform this operation within a handler.
+        // ```
+        timeout: null,
+    });
+    globalObject_.previousCallPromise = promise;
+    await previousCallPromise;
+    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.
@@ -25,7 +37,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);
@@ -55,10 +67,11 @@ addGlobalContextTmp, addGlobalContextAsync) {
             (0, utils_js_1.objectAssign)(globalObject.globalContext, globalContext, true);
         }
     }
+    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.
@@ -67,7 +80,7 @@ function createGlobalContextBase(virtualFileExports) {
          */
         isGlobalContext: true,
         _isOriginalObject: true,
-        _virtualFileExports: virtualFileExports,
+        _virtualFileExportsGlobalEntry: virtualFileExportsGlobalEntry,
         _pageFilesAll: pageFilesAll,
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
@@ -79,14 +92,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/modifyUrlSameOrigin.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.modifyUrlSameOrigin = modifyUrlSameOrigin;
+// We don't move modifyUrlSameOrigin() to the modifyUrl.ts file because we plan to use modifyUrlSameOrigin() on the client-side:
+// https://github.com/vikejs/vike/blob/c5a2de5e85262771f97851767c00ac35da69c64b/packages/vike/client/runtime-client-routing/navigate.ts#L4
 const utils_js_1 = require("./utils.js");
 function modifyUrlSameOrigin(url, modify) {
     const urlParsed = (0, utils_js_1.parseUrl)(url, '/');
@@ -27,16 +29,19 @@ function modifyUrlSameOrigin(url, modify) {
     const urlModified = (0, utils_js_1.createUrlFromComponents)(urlParsed.origin, pathname, search, hash);
     return urlModified;
 }
-function resolveSearch(urlParsed, search) {
+function resolveSearch(urlParsed, modifySearch) {
     let searchParams;
-    if (search instanceof URLSearchParams) {
+    if (modifySearch instanceof URLSearchParams) {
         // Overwrite
-        searchParams = search;
+        searchParams = modifySearch;
     }
     else {
         // Merge
-        const searchMap = (0, utils_js_1.objectFilter)({ ...urlParsed.search, ...search }, (utils_js_1.isNotNullish_keyVal));
+        const searchMap = (0, utils_js_1.objectFilter)({ ...urlParsed.search, ...(0, utils_js_1.objectFilter)(modifySearch, isNotUndefined) }, (utils_js_1.isNotNullish_keyVal));
         searchParams = new URLSearchParams(searchMap);
     }
     return '?' + searchParams.toString();
 }
+function isNotUndefined(arg) {
+    return arg[1] !== undefined;
+}