vike 0.4.236-commit-64431e7 → 0.4.236-commit-08fbc10

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

@@ -11,38 +11,78 @@ const debug = (0, utils_js_1.createDebugger)('vike:optimizeDeps');
 async function determineOptimizeDeps(config) {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     const { _pageConfigs: pageConfigs } = vikeConfig;
-    const { entries, include } = await getPageDeps(config, pageConfigs);
-    {
-        // This actually doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.
-        //  - Should we make it work? E.g. by creating a temporary file at node_modules/.vike/virtualFiles.js
-        //  - Or should we remove it? And make sure getPageDeps() also works for aliased import paths
-        //    - If we do, then we need to adjust include/entries (maybe by making include === entries -> will Vite complain?)
-        const entriesVirtualFiles = getVirtualFiles(config, pageConfigs);
-        entries.push(...entriesVirtualFiles);
+    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);
+    // TO-DO/eventually: use a check that is agnostic to @cloudflare/vite-plugin
+    const isNotRunnable = config.environments?.ssr?.resolve.conditions.includes('workerd');
+    if (isNotRunnable) {
+        config.ssr.optimizeDeps.include = add(config.ssr.optimizeDeps.include, includeServer);
+        // @ts-ignore — Vite doesn't seem to support ssr.optimizeDeps.entries (vite@7.0.6, July 2025)
+        config.ssr.optimizeDeps.entries = add(config.ssr.optimizeDeps.entries, entriesServer);
     }
-    /* Other Vite plugins may populate optimizeDeps, e.g. Cypress: https://github.com/vikejs/vike/issues/386
-    assert(config.optimizeDeps.entries === undefined)
-    */
-    config.optimizeDeps.include = [...include, ...normalizeInclude(config.optimizeDeps.include)];
-    config.optimizeDeps.entries = [...entries, ...normalizeEntries(config.optimizeDeps.entries)];
     if (debug.isActivated)
-        debug('config.optimizeDeps', {
+        debug('optimizeDeps', {
             'config.optimizeDeps.entries': config.optimizeDeps.entries,
             'config.optimizeDeps.include': config.optimizeDeps.include,
+            'config.optimizeDeps.exclude': config.optimizeDeps.exclude,
+            /* Vite doesn't seem to support ssr.optimizeDeps.entries (vite@7.0.6, July 2025)
+            'config.ssr.optimizeDeps.entries': config.ssr.optimizeDeps.entries,
+            //*/
+            'config.ssr.optimizeDeps.include': config.ssr.optimizeDeps.include,
+            'config.ssr.optimizeDeps.exclude': config.ssr.optimizeDeps.exclude,
         });
 }
 async function getPageDeps(config, pageConfigs) {
-    let entries = [];
-    let include = [];
-    const addEntry = (e) => {
+    let entriesClient = [];
+    let entriesServer = [];
+    let includeClient = [];
+    let includeServer = [];
+    const addEntry = (e, configEnv, definedAt) => {
         (0, utils_js_1.assert)(e);
-        entries.push(e);
+        // optimizeDeps.entries expects filesystem absolute paths
+        (0, utils_js_1.assert)((0, utils_js_1.isVirtualFileId)(e) || (0, utils_js_1.isFilePathAbsoluteFilesystem)(e));
+        if (isRelevant(e, false, configEnv, definedAt)) {
+            entriesClient.push(e);
+        }
+        if (isRelevant(e, true, configEnv, definedAt)) {
+            entriesServer.push(e);
+        }
     };
-    const addInclude = (e) => {
+    const addInclude = (e, configEnv, definedAt) => {
         (0, utils_js_1.assert)(e);
-        // Shouldn't be a path alias, as path aliases would need to be added to config.optimizeDeps.entries instead of config.optimizeDeps.include
+        // optimizeDeps.include expects npm packages
+        (0, utils_js_1.assert)(!e.startsWith('/'));
+        // Shouldn't be a path alias, as path aliases would need to be added to optimizeDeps.entries instead of optimizeDeps.include
         (0, utils_js_1.assertIsImportPathNpmPackage)(e);
-        include.push(e);
+        if (isRelevant(e, false, configEnv, definedAt)) {
+            includeClient.push(e);
+        }
+        if (isRelevant(e, true, configEnv, definedAt)) {
+            includeServer.push(e);
+        }
+    };
+    const isRelevant = (e, server, configEnv, definedAt) => {
+        if (server) {
+            if (!configEnv || !configEnv.server)
+                return false;
+        }
+        else {
+            if (configEnv && !configEnv.client)
+                return false;
+        }
+        return !isExcluded(e, server, definedAt);
+    };
+    const isExcluded = (e, server, definedAt) => {
+        const exclude = server ? config.ssr.optimizeDeps.exclude : config.optimizeDeps.exclude;
+        if (!exclude)
+            return false;
+        if (definedAt?.importPathAbsolute) {
+            const npmPackageName = (0, utils_js_1.getNpmPackageName)(definedAt.importPathAbsolute);
+            if (npmPackageName && exclude.includes(npmPackageName))
+                return true;
+        }
+        return exclude.includes(e);
     };
     // V1 design
     {
@@ -54,22 +94,17 @@ async function getPageDeps(config, pageConfigs) {
                     if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                         return;
                     const { definedAt, configEnv } = configValueSource;
-                    if (!configEnv.client)
-                        return;
                     if (definedAt.definedBy)
                         return;
-                    if (definedAt.importPathAbsolute) {
-                        const npmPackageName = (0, utils_js_1.getNpmPackageName)(definedAt.importPathAbsolute);
-                        if (npmPackageName && config.optimizeDeps.exclude?.includes(npmPackageName))
-                            return;
-                    }
                     if (definedAt.filePathAbsoluteUserRootDir !== null) {
-                        // Vite expects entries to be filesystem absolute paths (surprisingly so).
-                        addEntry(definedAt.filePathAbsoluteFilesystem);
+                        addEntry(
+                        // optimizeDeps.entries expects filesystem absolute paths
+                        definedAt.filePathAbsoluteFilesystem, configEnv, definedAt);
                     }
                     else {
-                        // Adding definedAtFilePath.filePathAbsoluteFilesystem doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
-                        addInclude(definedAt.importPathAbsolute);
+                        addInclude(
+                        // optimizeDeps.include expects npm packages
+                        definedAt.importPathAbsolute, configEnv, definedAt);
                     }
                 });
             });
@@ -85,32 +120,39 @@ async function getPageDeps(config, pageConfigs) {
             addEntry(filePathAbsoluteFilesystem);
         });
     }
-    entries = (0, utils_js_1.unique)(entries);
-    include = (0, utils_js_1.unique)(include);
-    return { entries, include };
-}
-function getVirtualFiles(config, pageConfigs) {
-    const { hasClientRouting, hasServerRouting, clientEntries } = (0, pluginBuildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
-    const entriesVirtualFiles = Object.values(clientEntries);
-    if (hasClientRouting)
-        entriesVirtualFiles.push(virtualFileEntry_js_1.virtualFileIdEntryClientCR);
-    if (hasServerRouting)
-        entriesVirtualFiles.push(virtualFileEntry_js_1.virtualFileIdEntryClientSR);
-    return entriesVirtualFiles;
+    // Add virtual files.
+    // - This doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.
+    //   - Should we make it work? E.g. by creating a temporary file at node_modules/.vike/virtualFiles.js
+    //   - Or should we remove it? And make sure getPageDeps() also works for aliased import paths
+    //     - If we do, then we need to adjust include/entries (maybe by making include === entries -> will Vite complain?)
+    {
+        const { hasClientRouting, hasServerRouting, clientEntries } = (0, pluginBuildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
+        Object.values(clientEntries).forEach((e) => addEntry(e));
+        if (hasClientRouting)
+            addEntry(virtualFileEntry_js_1.virtualFileIdEntryClientCR);
+        if (hasServerRouting)
+            addEntry(virtualFileEntry_js_1.virtualFileIdEntryClientSR);
+    }
+    entriesClient = entriesClient;
+    entriesServer = entriesServer;
+    includeClient = includeClient;
+    includeServer = includeServer;
+    return {
+        entriesClient,
+        entriesServer,
+        includeClient,
+        includeServer,
+    };
 }
-function normalizeEntries(entries) {
-    if ((0, utils_js_1.isArray)(entries))
-        return entries;
-    if (typeof entries === 'string')
-        return [entries];
-    if (entries === undefined)
-        return [];
-    (0, utils_js_1.assert)(false);
+function add(input, listAddendum) {
+    const list = !input ? [] : (0, utils_js_1.isArray)(input) ? unique(input) : [input];
+    listAddendum.forEach((e) => {
+        if (!list.includes(e))
+            list.push(e);
+    });
+    return list;
 }
-function normalizeInclude(include) {
-    if ((0, utils_js_1.isArray)(include))
-        return include;
-    if (include === undefined)
-        return [];
-    (0, utils_js_1.assert)(false);
+function unique(arr) {
+    const arrUnique = Array.from(new Set(arr));
+    return arr.length !== arrUnique.length ? arrUnique : arr;
 }

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

@@ -12,7 +12,7 @@ const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
 // TO-DO/eventually:
-// - Make ({}) work inside +config.js
+// - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
 //   - Or stop using Vite's `mode` implementation and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
@@ -39,7 +39,7 @@ function pluginEnvVars() {
             (0, utils_js_1.assertPosixPath)(config.root);
             if (!id.startsWith(config.root))
                 return;
-            if (!code.includes('({}).'))
+            if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
             const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
@@ -52,7 +52,7 @@ function pluginEnvVars() {
                 return !envPrefix.some((prefix) => key.startsWith(prefix));
             })
                 .map(([envName, envVal]) => {
-                const envStatement = `({}).${envName}`;
+                const envStatement = `import.meta.env.${envName}`;
                 const envStatementRegExpStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
                 // Security check
                 {

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

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractAssetsRE = void 0;
 exports.pluginExtractAssets = pluginExtractAssets;
 const utils_js_1 = require("../utils.js");
-const virtualFiles_js_1 = require("../../shared/virtualFiles.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
@@ -124,9 +123,9 @@ function pluginExtractAssets() {
             name: 'vike:pluginExtractAssets-3',
             apply: 'build',
             load(id) {
-                if (!(0, virtualFiles_js_1.isVirtualFileId)(id))
+                if (!(0, utils_js_1.isVirtualFileId)(id))
                     return undefined;
-                id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+                id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
                 if (id === EMPTY_MODULE_ID) {
                     return '// Erased by vike:pluginExtractAssets';
                 }
@@ -153,7 +152,7 @@ function pluginExtractAssets() {
 }
 function emptyModule(file, importer) {
     debugOperation('NUKED', file, importer);
-    return (0, virtualFiles_js_1.resolveVirtualFileId)(EMPTY_MODULE_ID);
+    return (0, utils_js_1.addVirtualFileIdPrefix)(EMPTY_MODULE_ID);
 }
 function appendExtractAssetsQuery(file, importer) {
     debugOperation('TRANSFORMED', file, importer);

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

@@ -81,12 +81,12 @@ function injectHmr(code, isClientSide, isProduction) {
     }
     if (isClientSide) {
         code += '\n';
-        code += `if ((undefined)) (undefined).accept((mod) => { exportNames.length=0; exportNames.push(...mod.exportNames); });`;
+        code += `if (import.meta.hot) import.meta.hot.accept((mod) => { exportNames.length=0; exportNames.push(...mod.exportNames); });`;
     }
     else {
         // Ensure Vite considers the module as `isSelfAccepting`. (Needed because Vite's module graph erroneously conflates the Vite server-side modules with their client-side counterparts.)
         code += '\n';
-        code += 'if(false){(undefined).accept(()=>{})};';
+        code += 'if(false){import.meta.hot.accept(()=>{})};';
     }
     return code;
 }

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

@@ -26,7 +26,7 @@ function pluginReplaceConstants() {
             (0, utils_js_1.assertPosixPath)(config.root);
             if (!id.startsWith(config.root))
                 return;
-            if (!code.includes('({}).'))
+            if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
             (0, utils_js_1.assert)(isBuild);

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFilePageConfigLazy = getVirtualFilePageConfigLazy;
+// TODO/now: rename file to generateVirtualFileEntryPage.ts
 const utils_js_1 = require("../../utils.js");
 const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");

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

@@ -8,7 +8,6 @@ const vite_1 = require("vite");
 const getVirtualFilePageConfigLazy_js_1 = require("./pluginVirtualFiles/getVirtualFilePageConfigLazy.js");
 const getVirtualFileEntry_js_1 = require("./pluginVirtualFiles/getVirtualFileEntry.js");
 const utils_js_1 = require("../utils.js");
-const virtualFiles_js_1 = require("../../shared/virtualFiles.js");
 const virtualFilePageConfigLazy_js_1 = require("../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const virtualFileEntry_js_1 = require("../../shared/virtualFiles/virtualFileEntry.js");
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
@@ -30,8 +29,8 @@ function pluginVirtualFiles() {
                 config.experimental.importGlobRestoreExtension = true;
         },
         resolveId(id) {
-            if ((0, virtualFiles_js_1.isVirtualFileId)(id)) {
-                return (0, virtualFiles_js_1.resolveVirtualFileId)(id);
+            if ((0, utils_js_1.isVirtualFileId)(id)) {
+                return (0, utils_js_1.addVirtualFileIdPrefix)(id);
             }
         },
         async handleHotUpdate(ctx) {
@@ -45,9 +44,9 @@ function pluginVirtualFiles() {
             }
         },
         async load(id, options) {
-            if (!(0, virtualFiles_js_1.isVirtualFileId)(id))
+            if (!(0, utils_js_1.isVirtualFileId)(id))
                 return undefined;
-            id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+            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)) {

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyRegExpWithMagicString = applyRegExpWithMagicString;
-// TODO/now: replace with .replaceAll() ?
 function applyRegExpWithMagicString(magicString, regExp, replacement) {
     const envStatementRegEx = typeof regExp === 'string' ? new RegExp(regExp, 'g') : regExp;
     let match;

package/dist/cjs/node/vite/utils.js

@@ -42,3 +42,4 @@ __exportStar(require("../../utils/isDocker.js"), exports);
 __exportStar(require("../../utils/isVitest.js"), exports);
 __exportStar(require("../../utils/rollupSourceMap.js"), exports);
 __exportStar(require("../../utils/isImportPath.js"), exports);
+__exportStar(require("../../utils/virtualFileId.js"), exports);

package/dist/cjs/shared/createGlobalContextShared.js

@@ -12,7 +12,7 @@ const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGl
 exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
 async function createGlobalContextShared(virtualFileExports, 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) {
+addGlobalContextTmp) {
     const globalContext = createGlobalContextBase(virtualFileExports);
     let isNewGlobalContext;
     if (!globalObject.globalContext) {
@@ -34,10 +34,6 @@ addGlobalContextTmp, addGlobalContextAsync) {
         const globalContextAdded = await addGlobalContextTmp?.(globalContext);
         (0, utils_js_1.objectAssign)(globalContext, globalContextAdded);
     }
-    {
-        const globalContextAddedAsync = await addGlobalContextAsync?.(globalContext);
-        (0, utils_js_1.objectAssign)(globalContext, globalContextAddedAsync);
-    }
     const onCreateGlobalContextHooks = (0, getHook_js_1.getHookFromPageConfigGlobalCumulative)(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
     let hooksCalled = false;
     if (!hooksAreEqual(globalObject.onCreateGlobalContextHooks ?? [], onCreateGlobalContextHooks)) {

package/dist/cjs/shared/getPageFiles/parseVirtualFileExports.js

@@ -1,6 +1,12 @@
 "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
+// ```
 // 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");

package/dist/cjs/shared/getProxyForPublicUsage.js

@@ -43,8 +43,8 @@ function onInternalProp(propStr, objName) {
     // - We must skip it in the client-side because of the reactivity mechanism of UI frameworks like Solid.
     // - TO-DO/eventually: use import.meta.CLIENT instead of isBrowser()
     //   - Where import.meta.CLIENT is defined by Vike
-    //   - Using ({}).CLIENT (note `.env.`) doesn't seem possible: https://github.com/brillout/playground_node_({})
-    //     - If Rolldown Vite + Rolldowns always transpiles node_modules/ then we can simply use ({}).SSR
+    //   - Using import.meta.env.CLIENT (note `.env.`) doesn't seem possible: https://github.com/brillout/playground_node_import.meta.env
+    //     - If Rolldown Vite + Rolldowns always transpiles node_modules/ then we can simply use import.meta.env.SSR
     if ((0, utils_js_1.isBrowser)())
         return;
     // TO-DO/soon/proxy: remove this and only warn on built-in access instead

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.236-commit-64431e7';
+exports.PROJECT_VERSION = '0.4.236-commit-08fbc10';

package/dist/cjs/utils/assertSetup.js

@@ -29,9 +29,6 @@ function assertIsNotProductionRuntime() {
     setup.shouldNotBeProduction = true;
 }
 function onSetupRuntime() {
-    // TODO/now
-    if (true)
-        return;
     if (debug.isActivated)
         debug('assertSetup()', new Error().stack);
     if (isTest())

package/dist/cjs/utils/debug.js

@@ -35,7 +35,6 @@ const flags = [
     'vike:setup',
     'vike:stream',
     'vike:virtualFiles',
-    'vike:vite-rpc',
 ];
 const flagsSkipWildcard = ['vike:log'];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;

package/dist/cjs/utils/isFilePathAbsoluteFilesystem.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertFilePathAbsoluteFilesystem = assertFilePathAbsoluteFilesystem;
+exports.isFilePathAbsoluteFilesystem = isFilePathAbsoluteFilesystem;
 exports.isFilePathAbsolute = isFilePathAbsolute;
 const node_path_1 = __importDefault(require("node:path"));
 const assert_js_1 = require("./assert.js");

package/dist/cjs/utils/virtualFileId.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVirtualFileId = isVirtualFileId;
+exports.addVirtualFileIdPrefix = addVirtualFileIdPrefix;
+exports.removeVirtualFileIdPrefix = removeVirtualFileIdPrefix;
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const assert_js_1 = require("./assert.js");
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
+const idBase = 'virtual:vike:';
+// https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
+const prefix = '\0';
+function isVirtualFileId(id) {
+    if (id.startsWith(idBase))
+        return true;
+    if (id.startsWith(prefix + idBase))
+        return true;
+    // https://github.com/vikejs/vike/issues/1985
+    (0, assert_js_1.assertUsage)(!id.includes(idBase), `Encountered a module ID ${picocolors_1.default.cyan(id)} that is unexpected. Are you using a tool that modifies the ID of modules? For example, the baseUrl setting in tsconfig.json cannot be used.`);
+    return false;
+}
+function addVirtualFileIdPrefix(id) {
+    (0, assert_js_1.assert)(isVirtualFileId(id));
+    if (!id.startsWith(prefix)) {
+        id = prefix + id;
+    }
+    (0, assert_js_1.assert)(id.startsWith(prefix));
+    return id;
+}
+function removeVirtualFileIdPrefix(id) {
+    if (id.startsWith(prefix)) {
+        id = id.slice(prefix.length);
+    }
+    (0, assert_js_1.assert)(!id.startsWith(prefix));
+    return id;
+}

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

@@ -30,7 +30,7 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     } & {
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } & Record<string, any>;
+    };
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _urlHandler: null;
     _urlRewrite: null | string;

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

@@ -50,7 +50,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     } & {
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } & Record<string, any>;
+    };
     _pageFilesAll: PageFile[];
     _urlHandler: null;
     _urlRewrite: null | string;
@@ -264,7 +264,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     } & {
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } & Record<string, any>;
+    };
     _pageFilesAll: PageFile[];
     _urlHandler: null;
     _urlRewrite: null | string;

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

@@ -27,4 +27,4 @@ declare const getGlobalContextClientInternal: () => Promise<{
 } & {
     _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-} & Record<string, any>>;
+}>;

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

@@ -63,7 +63,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     } & {
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } & Record<string, any>;
+    };
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _urlHandler: null;
     _urlRewrite: null | string;

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

@@ -84,7 +84,7 @@ async function renderPageClientSide(renderArgs) {
                     return;
             }
         }
-        // Route
+        // Get pageContext serialized in <script id="vike_pageContext" type="application/json">
         if (isFirstRender) {
             const pageContextSerialized = getPageContextFromHooks_serialized();
             // TO-DO/eventually: create helper assertPageContextFromHook()
@@ -93,7 +93,9 @@ async function renderPageClientSide(renderArgs) {
             // TO-DO/pageContext-prefetch: remove or change, because this only makes sense for a pre-rendered page
             populatePageContextPrefetchCache(pageContext, { pageContextFromServerHooks: pageContextSerialized });
         }
-        else {
+        // Route
+        // - We must also run it upon hydration to call the onBeforeRoute() hook, which is needed for i18n URL locale extraction.
+        {
             let pageContextFromRoute;
             try {
                 pageContextFromRoute = await route(pageContext);
@@ -104,38 +106,49 @@ async function renderPageClientSide(renderArgs) {
             }
             if (isRenderOutdated())
                 return;
-            if (!pageContextFromRoute.pageId) {
-                /*
-                // We don't use the client router to render the 404 page:
-                //  - So that the +redirects setting (https://vike.dev/redirects) can be applied.
-                //    - This is the main argument.
-                //    - See also failed CI: https://github.com/vikejs/vike/pull/1871
-                //  - So that server-side error tracking can track 404 links?
-                //    - We do use the client router for rendering the error page, so I don't think this is much of an argument.
-                await renderErrorPage({ is404: true })
-                */
-                redirectHard(urlOriginal);
-                return;
+            // TO-DO/eventually: create helper assertPageContextFromHook()
+            assert(!('urlOriginal' in pageContextFromRoute));
+            if (isFirstRender) {
+                // Set pageContext properties set by onBeforeRoute()
+                // - But we skip pageId and routeParams because routing may have been aborted by a server-side `throw render()`
+                const { pageId, routeParams, ...pageContextFromRouteRest } = pageContextFromRoute;
+                objectAssign(pageContext, pageContextFromRouteRest);
+                assert(hasProp(pageContext, 'routeParams', 'string{}')); // Help TS
             }
-            assert(hasProp(pageContextFromRoute, 'pageId', 'string')); // Help TS
-            const isClientRoutable = await isClientSideRoutable(pageContextFromRoute.pageId, pageContext);
-            if (isRenderOutdated())
-                return;
-            if (!isClientRoutable) {
-                redirectHard(urlOriginal);
-                return;
+            else {
+                objectAssign(pageContext, pageContextFromRoute);
             }
-            const isSamePage = pageContextFromRoute.pageId &&
-                previousPageContext?.pageId &&
-                pageContextFromRoute.pageId === previousPageContext.pageId;
-            if (doNotRenderIfSamePage && isSamePage) {
-                // Skip's Vike's rendering; let the user handle the navigation
-                return;
+            if (!isFirstRender) {
+                if (!pageContextFromRoute.pageId) {
+                    /*
+                    // We don't use the client router to render the 404 page:
+                    //  - So that the +redirects setting (https://vike.dev/redirects) can be applied.
+                    //    - This is the main argument.
+                    //    - See also failed CI: https://github.com/vikejs/vike/pull/1871
+                    //  - So that server-side error tracking can track 404 links?
+                    //    - We do use the client router for rendering the error page, so I don't think this is much of an argument.
+                    await renderErrorPage({ is404: true })
+                    */
+                    redirectHard(urlOriginal);
+                    return;
+                }
+                const isClientRoutable = await isClientSideRoutable(pageContextFromRoute.pageId, pageContext);
+                if (isRenderOutdated())
+                    return;
+                if (!isClientRoutable) {
+                    redirectHard(urlOriginal);
+                    return;
+                }
+                const isSamePage = pageContextFromRoute.pageId &&
+                    previousPageContext?.pageId &&
+                    pageContextFromRoute.pageId === previousPageContext.pageId;
+                if (doNotRenderIfSamePage && isSamePage) {
+                    // Skip's Vike's rendering; let the user handle the navigation
+                    return;
+                }
             }
-            // TO-DO/eventually: create helper assertPageContextFromHook()
-            assert(!('urlOriginal' in pageContextFromRoute));
-            objectAssign(pageContext, pageContextFromRoute);
         }
+        assert(hasProp(pageContext, 'pageId', 'string')); // Help TS
         const res = await loadPageConfigsLazyClientSideAndExecHook(pageContext, isFirstRender, isRenderOutdated);
         /* Already called inside loadPageConfigsLazyClientSideAndExecHook()
         if (isRenderOutdated()) return

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

@@ -26,7 +26,7 @@ declare function createPageContextClientSide(): Promise<{
         };
     } & {
         isClientSide: true;
-    } & object & Record<string, any>;
+    } & object;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     isBackwardNavigation: null;
     _hasPageContextFromServer: true;

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

@@ -24,4 +24,4 @@ declare const getGlobalContextClientInternal: () => Promise<{
     };
 } & {
     isClientSide: true;
-} & object & Record<string, any>>;
+} & object>;

package/dist/esm/client/shared/createGetGlobalContextClient.d.ts

@@ -30,7 +30,7 @@ declare function createGetGlobalContextClient<GlobalContextAddendum extends obje
      * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
      */
     isClientSide: true;
-} & Awaited<GlobalContextAddendum> & Record<string, any>>;
+} & Awaited<GlobalContextAddendum>>;
 type NeverExported = never;
 declare function getGlobalContext(): Promise<NeverExported>;
 declare function getGlobalContextSync(): NeverExported;