vike 0.4.237-commit-92dc549 → 0.4.237-commit-2d6f480

package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginBuildConfig = pluginBuildConfig;
 exports.assertRollupInput = assertRollupInput;
 exports.analyzeClientEntries = analyzeClientEntries;
+exports.pluginAutoFullBuild = pluginAutoFullBuild;
+exports.isPrerenderForceExit = isPrerenderForceExit;
 const utils_js_1 = require("../../utils.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
@@ -12,12 +17,20 @@ const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
 const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
-const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
 const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
+const context_js_1 = require("../../../prerender/context.js");
+const isViteCliCall_js_1 = require("../../shared/isViteCliCall.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const logErrorHint_js_1 = require("../../../runtime/renderPage/logErrorHint.js");
+const context_js_2 = require("../../../api/context.js");
+const runPrerenderEntry_js_1 = require("../../../prerender/runPrerenderEntry.js");
+const getManifestFilePathRelative_js_1 = require("../../shared/getManifestFilePathRelative.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('build/pluginAutoFullBuild.ts', {
+    forceExit: false,
+});
 function pluginBuildConfig() {
     let config;
-    let configUnresolved;
     return [
         {
             name: 'vike:build:pluginBuildConfig',
@@ -36,21 +49,9 @@ function pluginBuildConfig() {
                     (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssCodeSplit)(config);
                 },
             },
-            configEnvironment: {
-                order: 'post',
-                async handler(envName, configEnv) {
-                    (0, utils_js_1.assert)(configUnresolved);
-                    return {
-                        build: {
-                            outDir: (0, getOutDirs_js_1.resolveOutDir_configEnvironment)(configUnresolved, envName, configEnv),
-                        },
-                    };
-                },
-            },
             config: {
                 order: 'post',
                 async handler(config) {
-                    configUnresolved = config;
                     (0, utils_js_1.onSetupBuild)();
                     const build = await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config);
                     return { build };
@@ -232,3 +233,108 @@ function assertRollupInput(config) {
     const htmlInput = htmlInputs[0];
     (0, utils_js_1.assertUsage)(htmlInput === undefined, `The entry ${htmlInput} of config build.rollupOptions.input is an HTML entry which is forbidden when using Vike, instead follow https://vike.dev/add`);
 }
+function pluginAutoFullBuild() {
+    let config;
+    return [
+        {
+            name: 'vike:build:pluginAutoFullBuild',
+            apply: 'build',
+            enforce: 'pre',
+            async configResolved(config_) {
+                config = config_;
+                await abortViteBuildSsr();
+            },
+            writeBundle: {
+                /* We can't use this because it breaks Vite's logging. TO-DO/eventually: try again with latest Vite version.
+                sequential: true,
+                order: 'pre',
+                */
+                async handler(options, bundle) {
+                    try {
+                        await (0, handleAssetsManifest_js_1.handleAssetsManifest)(config, this.environment, options, bundle);
+                        await triggerPrerendering(config, this.environment, bundle);
+                    }
+                    catch (err) {
+                        // We use try-catch also because:
+                        // - Vite/Rollup swallows errors thrown inside the writeBundle() hook. (It doesn't swallow errors thrown inside the first writeBundle() hook while building the client-side, but it does swallow errors thrown inside the second writeBundle() while building the server-side triggered after Vike calls Vite's `build()` API.)
+                        // - Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
+                        console.error(err);
+                        (0, logErrorHint_js_1.logErrorHint)(err);
+                        process.exit(1);
+                    }
+                },
+            },
+        },
+        {
+            name: 'vike:build:pluginAutoFullBuild:post',
+            apply: 'build',
+            enforce: 'post',
+            closeBundle: {
+                sequential: true,
+                order: 'post',
+                handler() {
+                    (0, utils_js_1.onSetupBuild)();
+                    (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config, this.environment);
+                    /* Let vike:build:pluginBuildApp force exit
+                    runPrerender_forceExit()
+                    */
+                },
+            },
+        },
+    ];
+}
+async function triggerPrerendering(config, viteEnv, bundle) {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    if (!(0, isViteServerSide_js_1.isViteServerSide_onlySsrEnv)(config, viteEnv))
+        return;
+    if (isDisabled(vikeConfig))
+        return;
+    // Workaround for @vitejs/plugin-legacy
+    //  - The legacy plugin triggers its own Rollup build for the client-side.
+    //  - The legacy plugin doesn't generate a manifest => we can use that to detect the legacy plugin build.
+    //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
+    if (!bundle[(0, getManifestFilePathRelative_js_1.getManifestFilePathRelative)(config.build.manifest)])
+        return;
+    const configInline = getFullBuildInlineConfig(config);
+    if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
+        const res = await (0, runPrerenderEntry_js_1.runPrerenderFromAutoRun)(configInline);
+        globalObject.forceExit = res.forceExit;
+        (0, utils_js_1.assert)((0, context_js_1.wasPrerenderRun)());
+    }
+}
+async function abortViteBuildSsr() {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    if (vikeConfig.config.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
+        (0, utils_js_1.assertWarning)(false, `The CLI call ${picocolors_1.default.cyan('$ vite build --ssr')} is superfluous since ${picocolors_1.default.cyan('$ vite build')} also builds the server-side. If you want two separate build steps then use https://vike.dev/disableAutoFullBuild or use Vite's ${picocolors_1.default.cyan('build()')} API.`, { onlyOnce: true });
+        process.exit(0);
+    }
+}
+function isDisabled(vikeConfig) {
+    const { disableAutoFullBuild } = vikeConfig.config;
+    if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
+        const isUserUsingViteApi = !(0, isViteCliCall_js_1.isViteCliCall)() && !(0, context_js_2.isVikeCliOrApi)();
+        return isUserUsingViteApi;
+    }
+    else {
+        return disableAutoFullBuild;
+    }
+}
+function isPrerenderForceExit() {
+    return globalObject.forceExit;
+}
+function getFullBuildInlineConfig(config) {
+    const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
+    if (config._viteConfigFromUserEnhanced) {
+        return config._viteConfigFromUserEnhanced;
+    }
+    else {
+        return {
+            ...configFromCli,
+            configFile: configFromCli?.configFile || config.configFile,
+            root: config.root,
+            build: {
+                ...configFromCli?.build,
+            },
+        };
+    }
+}

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

@@ -5,7 +5,6 @@ const pluginBuildApp_js_1 = require("./pluginBuild/pluginBuildApp.js");
 const pluginDistPackageJsonFile_js_1 = require("./pluginBuild/pluginDistPackageJsonFile.js");
 const pluginSuppressRollupWarning_js_1 = require("./pluginBuild/pluginSuppressRollupWarning.js");
 const pluginDistFileNames_js_1 = require("./pluginBuild/pluginDistFileNames.js");
-const pluginAutoFullBuild_js_1 = require("./pluginBuild/pluginAutoFullBuild.js");
 const pluginBuildEntry_js_1 = require("./pluginBuild/pluginBuildEntry.js");
 const pluginBuildConfig_js_1 = require("./pluginBuild/pluginBuildConfig.js");
 const pluginModuleBanner_js_1 = require("./pluginBuild/pluginModuleBanner.js");
@@ -13,7 +12,7 @@ function pluginBuild() {
     return [
         ...(0, pluginBuildConfig_js_1.pluginBuildConfig)(),
         ...(0, pluginBuildApp_js_1.pluginBuildApp)(),
-        ...(0, pluginAutoFullBuild_js_1.pluginAutoFullBuild)(),
+        ...(0, pluginBuildConfig_js_1.pluginAutoFullBuild)(),
         ...(0, pluginBuildEntry_js_1.pluginBuildEntry)(),
         (0, pluginDistPackageJsonFile_js_1.pluginDistPackageJsonFile)(),
         (0, pluginSuppressRollupWarning_js_1.pluginSuppressRollupWarning)(),

package/dist/cjs/node/vite/plugins/pluginDev/determineOptimizeDeps.js

@@ -15,8 +15,9 @@ async function determineOptimizeDeps(config) {
     const { entriesClient, entriesServer, includeClient, includeServer } = await getPageDeps(config, pageConfigs);
     config.optimizeDeps.include = add(config.optimizeDeps.include, includeClient);
     config.optimizeDeps.entries = add(config.optimizeDeps.entries, entriesClient);
-    // Workaround until https://github.com/vitejs/vite-plugin-react/issues/650
-    // - TODO/soon: remove workaround once https://github.com/vitejs/vite/pull/20495 is released
+    // Workaround for https://github.com/vitejs/vite-plugin-react/issues/650
+    // - The issue was closed as completed with https://github.com/vitejs/vite/pull/20495 but it doesn't fix the issue and the workaround is still needed.
+    // - TO-DO/eventually: try removing the workaround and see if the CI fails (at test/@cloudflare_vite-plugin/) — maybe the issue will get fixed at some point.
     includeServer.push('react/jsx-dev-runtime');
     for (const envName in config.environments) {
         const env = config.environments[envName];

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

@@ -12,6 +12,7 @@ const getFilePath_js_1 = require("../shared/getFilePath.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
 function pluginFileEnv() {
     let config;
     let viteDevServer;
@@ -33,7 +34,7 @@ function pluginFileEnv() {
             const importers = Array.from(moduleInfo.importers)
                 .map((m) => m.id)
                 .filter((id) => id !== null);
-            assertFileEnv(id, !!options?.ssr, importers, 
+            assertFileEnv(id, (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment), importers, 
             // In dev, we only show a warning because we don't want to disrupt when the user plays with settings such as [ssr](https://vike.dev/ssr).
             true);
         },
@@ -45,7 +46,7 @@ function pluginFileEnv() {
                 return;
             if (skip(id))
                 return;
-            const isServerSide = !!options?.ssr;
+            const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment);
             if (!isWrongEnv(id, isServerSide))
                 return;
             const { importers } = this.getModuleInfo(id);
@@ -71,7 +72,7 @@ function pluginFileEnv() {
                     */
                     return;
                 }
-                assertFileEnv(moduleId, !!config.build.ssr, importers, false);
+                assertFileEnv(moduleId, (0, isViteServerSide_js_1.isViteServerSide)(config, this.environment), importers, false);
             });
         },
         configResolved(config_) {

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

@@ -15,25 +15,15 @@ const sirv_1 = __importDefault(require("sirv"));
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 function pluginPreview() {
     let config;
-    let configUnresolved;
     let vikeConfig;
     return {
         name: 'vike:pluginPreview',
         apply: utils_js_1.applyPreview,
-        config(config) {
-            configUnresolved = config;
+        config() {
             return {
                 appType: 'custom',
             };
         },
-        configEnvironment(envName, configEnv) {
-            (0, utils_js_1.assert)(configUnresolved);
-            return {
-                build: {
-                    outDir: (0, getOutDirs_js_1.resolveOutDir_configEnvironment)(configUnresolved, envName, configEnv),
-                },
-            };
-        },
         async configResolved(config_) {
             config = config_;
             vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();

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

@@ -5,14 +5,13 @@ 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 isViteServerSide_js_1 = require("./isViteServerSide.js");
 const debug = (0, utils_js_1.createDebugger)('vike:outDir');
 function getOutDirs(configGlobal, viteEnv) {
     debug('getOutDirs()', new Error().stack);
-    const outDir = getOutDirFromResolvedConfig(configGlobal);
+    const outDir = getOutDirFromResolvedConfig(configGlobal, viteEnv);
     assertOutDirResolved(outDir, configGlobal, viteEnv);
     const outDirs = getOutDirsAll(outDir, configGlobal.root);
     assertNormalization(outDirs.outDirRoot);
@@ -20,12 +19,6 @@ function getOutDirs(configGlobal, viteEnv) {
     assertNormalization(outDirs.outDirServer);
     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, isViteServerSide_js_1.isViteServerSide)(configGlobal, viteEnv);
-    return resolveOutDir(configEnv, isServerSide);
-}
 /** Appends `client/` or `server/` to `config.build.outDir` */
 function resolveOutDir(config, isServerSide) {
     debug('resolveOutDir()', new Error().stack);
@@ -119,7 +112,8 @@ function assertOutDirResolved(outDir, configGlobal, viteEnv) {
     (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, isViteServerSide_js_1.isViteServerSide_withoutEnv)(configGlobal, viteEnv)) {
+    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(configGlobal, viteEnv);
+    if (isServerSide) {
         (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }
     else {
@@ -133,8 +127,8 @@ function getOutDirFromViteUserConfig(config) {
     outDir = normalizeOutDir(outDir);
     return outDir;
 }
-function getOutDirFromResolvedConfig(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/isViteServerSide.js

@@ -6,16 +6,16 @@ exports.isViteServerSide_withoutEnv = isViteServerSide_withoutEnv;
 exports.isViteServerSide_onlySsrEnv = isViteServerSide_onlySsrEnv;
 exports.isViteServerSide_extraSafe = isViteServerSide_extraSafe;
 const assert_js_1 = require("../../../utils/assert.js");
-function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
+function isViteServerSide_impl(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 isServerSide2 = !viteEnv?.config.build ? null : getBuildSsrValue(viteEnv.config.build.ssr);
+    const isServerSide3 = !configGlobal.build ? null : getBuildSsrValue(configGlobal.build.ssr);
+    const isServerSide4 = viteEnv?.name === 'ssr' ? true : viteEnv?.name === 'client' ? false : null;
     const debug = {
-        envIsUndefined: !viteEnv,
-        envName: viteEnv?.name ?? null,
-        envConsumer: viteEnv?.config.consumer ?? null,
+        viteEnvIsUndefined: !viteEnv,
+        viteEnvName: viteEnv?.name ?? null,
+        viteEnvConsumer: viteEnv?.config.consumer ?? null,
         configEnvBuildSsr: viteEnv?.config.build?.ssr ?? null,
         configGlobalBuildSsr: configGlobal.build?.ssr ?? null,
         isServerSide1,
@@ -24,25 +24,36 @@ function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
         isServerSide4,
     };
     if (isServerSide1 !== null) {
-        (0, assert_js_1.assert)(isServerSide1 === isServerSide2 || isServerSide2 === null, debug);
+        // assert(isServerSide1 === isServerSide4 || isServerSide4 === null, debug)
         /* This assertion can fail, seems to be a Vite bug?
-        assert(isServerSide1 === isServerSide3, debug)
+        assert(isServerSide1 === isServerSide2, debug)
         */
         return isServerSide1;
     }
     if (isServerSide2 !== null) {
-        /* This assertion can fail, seems to be a Vite bug?
-        assert(isServerSide2 === isServerSide3, debug)
-        */
+        // assert(isServerSide2 === isServerSide4 || isServerSide4 === null, debug)
         return isServerSide2;
     }
     if (isServerSide3 !== null) {
+        // assert(isServerSide3 === isServerSide4 || isServerSide4 === null, debug)
         return isServerSide3;
     }
-    return isServerSide4;
+    if (isServerSide4 !== null) {
+        return isServerSide4;
+    }
+    (0, assert_js_1.assert)(!viteEnv);
+    return !!configGlobal.build?.ssr;
+}
+function getBuildSsrValue(buildSsr) {
+    if (buildSsr === undefined)
+        return null;
+    return !!buildSsr;
 }
 function isViteServerSide(configGlobal, viteEnv) {
-    return isViteServerSide_withoutEnv(configGlobal, viteEnv);
+    return isViteServerSide_impl(configGlobal, viteEnv);
+}
+function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
+    return isViteServerSide_impl(configGlobal, viteEnv);
 }
 function isViteClientSide(configGlobal, viteEnv) {
     return !isViteServerSide(configGlobal, viteEnv);
@@ -53,20 +64,36 @@ function isViteServerSide_onlySsrEnv(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, options, viteEnv) {
+    const isServerSide = isViteServerSide(config, viteEnv);
+    const debug = {
+        configCommand: config.command,
+        configBuildSsr: config.build.ssr,
+        optionsIsUndefined: options === undefined,
+        optionsSsr: options?.ssr,
+        isServerSide,
+    };
+    if (true) {
+        const res = options?.ssr;
+        if (typeof res === 'boolean') {
+            (0, assert_js_1.assert)(res === isServerSide, debug);
+            return res;
+        }
+        return isServerSide;
+    }
     if (config.command === 'build') {
         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 === isViteServerSide(config, viteEnv));
+        (0, assert_js_1.assert)(typeof res === 'boolean', debug);
+        (0, assert_js_1.assert)(res === options?.ssr || options?.ssr === undefined, debug);
+        (0, assert_js_1.assert)(res === isServerSide, debug);
         return res;
     }
     else {
         const res = options?.ssr;
-        (0, assert_js_1.assert)(typeof res === 'boolean');
+        (0, assert_js_1.assert)(typeof res === 'boolean', debug);
         /* 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 === isViteServerSide(config, viteEnv));
+        (0, assert_js_1.assert)(res === isServerSide, debug);
         return res;
     }
 }

package/dist/cjs/shared/page-configs/{loadPageEntry.js → loadAndParseVirtualFilePageEntry.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPageEntry = loadPageEntry;
+exports.loadAndParseVirtualFilePageEntry = loadAndParseVirtualFilePageEntry;
 const utils_js_1 = require("../utils.js");
 const parsePageConfigsSerialized_js_1 = require("./serialize/parsePageConfigsSerialized.js");
-async function loadPageEntry(pageConfig, isDev) {
+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) {

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

@@ -1,4 +1,9 @@
 "use strict";
+// TO-DO/soon: 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
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

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/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-commit-92dc549';
+exports.PROJECT_VERSION = '0.4.237-commit-2d6f480';

package/dist/cjs/utils/{augmentType.js → updateType.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.augmentType = augmentType;
+exports.updateType = updateType;
 const assert_js_1 = require("./assert.js");
-/** Help TypeScript augment the type of objects. */
-function augmentType(thing, clone) {
+/** Help TypeScript update the type of dynamically modified objects. */
+function updateType(thing, clone) {
     // @ts-ignore
     (0, assert_js_1.assert)(thing === clone);
 }

package/dist/esm/__internal/index.d.ts

@@ -16,5 +16,5 @@ declare function getPagesAndRoutes(): Promise<{
     allPageIds: string[];
 }>;
 declare function route(pageContext: Parameters<typeof routeInternal>[0]): Promise<{
-    pageContextAddendum: import("../shared/route/index.js").PageContextFromRoute;
+    pageContextAddendum: import("../shared/route/index.js").PageContextAfterRoute;
 }>;

package/dist/esm/client/runtime-client-routing/createPageContextClientSide.js

@@ -3,7 +3,7 @@ import { createPageContextObject, createPageContextShared } from '../../shared/c
 import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
 import { getBaseServer } from './getBaseServer.js';
 import { getGlobalContextClientInternal } from './globalContext.js';
-import { assert, augmentType, isBaseServer, objectAssign } from './utils.js';
+import { assert, updateType, isBaseServer, objectAssign } from './utils.js';
 async function createPageContextClientSide(urlOriginal) {
     const globalContext = await getGlobalContextClientInternal();
     const baseServer = getBaseServer();
@@ -22,6 +22,6 @@ async function createPageContextClientSide(urlOriginal) {
     const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
     objectAssign(pageContextCreated, pageContextUrlComputed);
     const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal);
-    augmentType(pageContextCreated, pageContextAugmented);
+    updateType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

package/dist/esm/client/runtime-client-routing/renderPageClientSide.js

@@ -3,7 +3,7 @@ export { getRenderCount };
 export { disableClientRouting };
 export { firstRenderStartPromise };
 export { getPageContextClient };
-import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, hasProp, augmentType, genPromise, isCallable, catchInfiniteLoop, } from './utils.js';
+import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, hasProp, updateType, genPromise, isCallable, catchInfiniteLoop, } from './utils.js';
 import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient, } from './getPageContextFromHooks.js';
 import { createPageContextClientSide } from './createPageContextClientSide.js';
 import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache, } from './prefetch.js';
@@ -159,7 +159,7 @@ async function renderPageClientSide(renderArgs) {
             await onError(res.err);
             return;
         }
-        augmentType(pageContext, res.pageContext);
+        updateType(pageContext, res.pageContext);
         setPageContextCurrent(pageContext);
         // Set global hydrationCanBeAborted
         if (pageContext.exports.hydrationCanBeAborted) {
@@ -184,7 +184,7 @@ async function renderPageClientSide(renderArgs) {
             }
             if (isRenderOutdated())
                 return;
-            augmentType(pageContext, pageContextAugmented);
+            updateType(pageContext, pageContextAugmented);
             // Render page view
             await renderPageView(pageContext);
         }
@@ -225,7 +225,7 @@ async function renderPageClientSide(renderArgs) {
             }
             if (isRenderOutdated())
                 return;
-            augmentType(pageContext, pageContextFromClientHooks);
+            updateType(pageContext, pageContextFromClientHooks);
             await renderPageView(pageContext);
         }
     }
@@ -336,7 +336,7 @@ async function renderPageClientSide(renderArgs) {
             onError(res.err);
             return;
         }
-        augmentType(pageContext, res.pageContext);
+        updateType(pageContext, res.pageContext);
         setPageContextCurrent(pageContext);
         let pageContextFromServerHooks;
         try {
@@ -364,7 +364,7 @@ async function renderPageClientSide(renderArgs) {
         }
         if (isRenderOutdated())
             return;
-        augmentType(pageContext, pageContextFromClientHooks);
+        updateType(pageContext, pageContextFromClientHooks);
         await renderPageView(pageContext, args);
     }
     async function renderPageView(pageContext, isErrorPage) {

package/dist/esm/client/runtime-client-routing/utils.d.ts

@@ -17,7 +17,7 @@ export * from '../../utils/slice.js';
 export * from '../../utils/throttle.js';
 export * from '../../utils/assertRoutingType.js';
 export * from '../../utils/onPageVisibilityChange.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';

package/dist/esm/client/runtime-client-routing/utils.js

@@ -21,7 +21,7 @@ export * from '../../utils/slice.js';
 export * from '../../utils/throttle.js';
 export * from '../../utils/assertRoutingType.js';
 export * from '../../utils/onPageVisibilityChange.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';

package/dist/esm/client/runtime-server-routing/createPageContextClientSide.js

@@ -1,5 +1,5 @@
 export { createPageContextClientSide };
-import { assertUsage, augmentType, objectAssign } from './utils.js';
+import { assertUsage, updateType, objectAssign } from './utils.js';
 import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtml.js';
 import { loadPageConfigsLazyClientSide, } from '../shared/loadPageConfigsLazyClientSide.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
@@ -22,9 +22,9 @@ async function createPageContextClientSide() {
     });
     objectAssign(pageContextCreated, getPageContextSerializedInHtml());
     // Sets pageContext.config to global configs
-    augmentType(pageContextCreated, createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal));
+    updateType(pageContextCreated, createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal));
     // Sets pageContext.config to local configs (overrides the pageContext.config set above)
-    augmentType(pageContextCreated, await loadPageConfigsLazyClientSideAndExecHook(pageContextCreated));
+    updateType(pageContextCreated, await loadPageConfigsLazyClientSideAndExecHook(pageContextCreated));
     assertPristineUrl();
     return pageContextCreated;
 }

package/dist/esm/client/runtime-server-routing/utils.d.ts

@@ -10,5 +10,5 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/slice.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/getPropAccessNotation.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/changeEnumerable.js';

package/dist/esm/client/runtime-server-routing/utils.js

@@ -14,5 +14,5 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/slice.js';
 export * from '../../utils/unique.js'; // Only used by Server Routing (not needed for Client Routing)
 export * from '../../utils/getPropAccessNotation.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/changeEnumerable.js';

package/dist/esm/client/shared/loadPageConfigsLazyClientSide.js

@@ -3,7 +3,7 @@ export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
 import { resolveVikeConfigPublicPageLazyLoaded } from '../../shared/page-configs/resolveVikeConfigPublic.js';
 import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
-import { loadPageEntry } from '../../shared/page-configs/loadPageEntry.js';
+import { loadAndParseVirtualFilePageEntry } from '../../shared/page-configs/loadAndParseVirtualFilePageEntry.js';
 import { objectAssign } from '../runtime-server-routing/utils.js';
 const errStamp = '_isAssetsError';
 async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
@@ -16,7 +16,7 @@ async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs,
         // prettier-ignore
         // biome-ignore format:
         const result = await Promise.all([
-            pageConfig && loadPageEntry(pageConfig, isDev),
+            pageConfig && loadAndParseVirtualFilePageEntry(pageConfig, isDev),
             ...pageFilesClientSide.map((p) => p.loadFile?.()),
         ]);
         pageConfigLoaded = result[0];