vike 0.4.236-commit-e752d12 → 0.4.236-commit-08fbc10

package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.js

@@ -2,12 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retrieveAssetsDev = retrieveAssetsDev;
 const utils_js_1 = require("../../utils.js");
+const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
 async function retrieveAssetsDev(clientDependencies, viteDevServer) {
     const assetUrls = new Set();
     await Promise.all(clientDependencies.map(async ({ id }) => {
         if (id.startsWith('@@vike'))
             return; // vike doesn't have any CSS
         (0, utils_js_1.assert)(id);
+        (0, utils_js_1.assert)(!(0, virtualFileEntry_js_1.isVirtualFileIdEntry)(id));
         const { moduleGraph } = viteDevServer;
         const [_, graphId] = await moduleGraph.resolveUrl(id);
         (0, utils_js_1.assert)(graphId, { id });
@@ -34,6 +36,8 @@ function collectCss(mod, styleUrls, visitedModules, importer) {
     if (visitedModules.has(mod.url))
         return;
     visitedModules.add(mod.url);
+    if ((0, virtualFileEntry_js_1.isVirtualFileIdEntry)(mod.id || mod.url))
+        return; // virtual:vike:entry:server dependency list includes all pages
     if (isStyle(mod) && (!importer || !isStyle(importer))) {
         if (mod.url.startsWith('/')) {
             styleUrls.add(mod.url);

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

@@ -62,6 +62,7 @@ __exportStar(require("../../utils/assertSetup.js"), exports);
 __exportStar(require("../../utils/path.js"), exports);
 __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
+__exportStar(require("../../utils/virtualFileId.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);
 __exportStar(require("../../utils/getTerminWidth.js"), exports);
 __exportStar(require("../../utils/truncateString.js"), exports);

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

@@ -32,3 +32,4 @@ __exportStar(require("../../utils/assertIsNotBrowser.js"), exports);
 __exportStar(require("../../utils/isNullish.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports);
 __exportStar(require("../../utils/debug.js"), exports);
+__exportStar(require("../../utils/virtualFileId.js"), exports);

package/dist/cjs/node/shared/virtualFiles/virtualFileEntry.js

@@ -2,27 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.virtualFileIdEntryClientCR = exports.virtualFileIdEntryClientSR = exports.virtualFileIdEntryServer = void 0;
 exports.isVirtualFileIdEntry = isVirtualFileIdEntry;
+// TODO/now: merge virtualFileEntry.ts and virtualFilePageConfigLazy.ts
+// - One function parseVirtualFileIdEntry() to rule them all?
 const utils_js_1 = require("../utils.js");
-const virtualFiles_js_1 = require("../virtualFiles.js");
-const idBase = 'virtual:vike:entry';
-const virtualFileIdEntryServer = `${idBase}:server`;
+(0, utils_js_1.assertIsNotBrowser)();
+// TODO/now: rename:
+// ```diff
+// - virtual:vike:entry:server
+// + virtual:vike:entry:global:server
+// ```
+const virtualFileIdEntryServer = 'virtual:vike:entry:server';
 exports.virtualFileIdEntryServer = virtualFileIdEntryServer;
-const virtualFileIdEntryClientSR = `${idBase}:client:server-routing`;
+const virtualFileIdEntryClientSR = 'virtual:vike:entry:client:server-routing';
 exports.virtualFileIdEntryClientSR = virtualFileIdEntryClientSR;
-const virtualFileIdEntryClientCR = `${idBase}:client:client-routing`;
+const virtualFileIdEntryClientCR = 'virtual:vike:entry:client:client-routing';
 exports.virtualFileIdEntryClientCR = virtualFileIdEntryClientCR;
+const virtualFileIdEntries = [virtualFileIdEntryServer, virtualFileIdEntryClientCR, virtualFileIdEntryClientSR];
+const idBase = 'virtual:vike:entry';
+(0, utils_js_1.assert)(virtualFileIdEntries.every((v) => v.startsWith(`${idBase}:`)));
 function isVirtualFileIdEntry(id) {
-    id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+    id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
     if (!id.startsWith(idBase))
         return false;
-    (0, utils_js_1.assert)(
-    // prettier-ignore
-    // biome-ignore format:
-    [
-        virtualFileIdEntryServer,
-        virtualFileIdEntryClientCR,
-        virtualFileIdEntryClientSR
-    ].includes(id));
+    (0, utils_js_1.assert)(virtualFileIdEntries.includes(id));
     const isForClientSide = id !== virtualFileIdEntryServer;
     const isClientRouting = id === virtualFileIdEntryClientCR;
     return { isForClientSide, isClientRouting };

package/dist/cjs/node/shared/virtualFiles/virtualFilePageConfigLazy.js

@@ -4,16 +4,22 @@ exports.isVirtualFileIdPageConfigLazy = isVirtualFileIdPageConfigLazy;
 exports.getVirtualFileIdPageConfigLazy = getVirtualFileIdPageConfigLazy;
 const extractAssetsQuery_js_1 = require("../extractAssetsQuery.js");
 const utils_js_1 = require("../utils.js");
-const virtualFiles_js_1 = require("../virtualFiles.js");
+(0, utils_js_1.assertIsNotBrowser)();
+// TODO/now: rename:
+// ```diff
+// - virtual:vike:pageConfigLazy:server:
+// + virtual:vike:entry:page:server:
+// ```
+const idBaseClient = 'virtual:vike:pageConfigLazy:client:';
+const idBaseServer = 'virtual:vike:pageConfigLazy:server:';
 const idBase = 'virtual:vike:pageConfigLazy:';
-const idBaseClient = `${idBase}client:`;
-const idBaseServer = `${idBase}server:`;
+// TODO/now: rename to generateVirtualFileIdEntry()
 function getVirtualFileIdPageConfigLazy(pageId, isForClientSide) {
     const id = `${isForClientSide ? idBaseClient : idBaseServer}${pageId}`;
     return id;
 }
 function isVirtualFileIdPageConfigLazy(id) {
-    id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+    id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
     if (!id.includes(idBase))
         return false;
     (0, utils_js_1.assert)(id.startsWith(idBase));

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

@@ -8,6 +8,34 @@ const pluginAutoFullBuild_js_1 = require("./pluginAutoFullBuild.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 function pluginBuildApp() {
     return [
+        {
+            name: 'vike:build:pluginBuildApp:pre',
+            apply: 'build',
+            enforce: 'pre',
+            config: {
+                order: 'pre',
+                async handler(_config) {
+                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+                    if (!vikeConfig.config.vite6BuilderApp)
+                        return;
+                    return {
+                        builder: {
+                            // Can be overridden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
+                            async buildApp(builder) {
+                                (0, utils_js_1.assert)(builder.environments.client);
+                                (0, utils_js_1.assert)(builder.environments.ssr);
+                                await builder.build(builder.environments.client);
+                                await builder.build(builder.environments.ssr);
+                                if ((0, pluginAutoFullBuild_js_1.isPrerenderForceExit)()) {
+                                    (0, runPrerenderEntry_js_1.runPrerender_forceExit)();
+                                    (0, utils_js_1.assert)(false);
+                                }
+                            },
+                        },
+                    };
+                },
+            },
+        },
         {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
@@ -16,19 +44,6 @@ function pluginBuildApp() {
                 if (!vikeConfig.config.vite6BuilderApp)
                     return;
                 return {
-                    builder: {
-                        // Can be overridden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
-                        async buildApp(builder) {
-                            (0, utils_js_1.assert)(builder.environments.client);
-                            (0, utils_js_1.assert)(builder.environments.ssr);
-                            await builder.build(builder.environments.client);
-                            await builder.build(builder.environments.ssr);
-                            if ((0, pluginAutoFullBuild_js_1.isPrerenderForceExit)()) {
-                                (0, runPrerenderEntry_js_1.runPrerender_forceExit)();
-                                (0, utils_js_1.assert)(false);
-                            }
-                        },
-                    },
                     environments: {
                         ssr: {
                             consumer: 'server',

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

@@ -156,13 +156,8 @@ function getEntryFileName(chunkInfo, config, isEntry) {
         return `${name}.${isEntry ? 'mjs' : 'js'}`;
     }
 }
-function removePathSeparators(name, userRootDir) {
+function removePathSeparators(name) {
     (0, utils_js_1.assertPosixPath)(name);
-    if (name.startsWith(userRootDir)) {
-        name = name.slice(userRootDir.length);
-        if (name.startsWith('/'))
-            name = name.slice(1);
-    }
     (0, utils_js_1.assert)(!name.startsWith('/'), { name });
     const entryDir = 'entries/';
     const hasEntryDir = name.startsWith(entryDir);
@@ -176,14 +171,24 @@ function removePathSeparators(name, userRootDir) {
     }
     return name;
 }
+function removeUserRootDir(name, userRootDir) {
+    if (name.startsWith(userRootDir)) {
+        name = name.slice(userRootDir.length);
+        if (name.startsWith('/'))
+            name = name.slice(1);
+    }
+    (0, utils_js_1.assert)(!name.startsWith('/'), { name });
+    return name;
+}
 function clean(name, userRootDir, removePathSep, fixGlob) {
+    name = removeUserRootDir(name, userRootDir);
     name = fixExtractAssetsQuery(name);
     if (fixGlob) {
         name = workaroundGlob(name);
     }
     name = replaceNonLatinCharacters(name);
     if (removePathSep) {
-        name = removePathSeparators(name, userRootDir);
+        name = removePathSeparators(name);
     }
     name = removeLeadingUnderscoreInFilename(name);
     name = removeUnderscoreDoublets(name);

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
 const magic_string_1 = __importDefault(require("magic-string"));
-const virtualFiles_js_1 = require("../../../shared/virtualFiles.js");
+const utils_js_1 = require("../../utils.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
@@ -28,7 +28,7 @@ function pluginModuleBanner() {
                 }
                 if (id.startsWith('\0'))
                     id = id;
-                id = (0, virtualFiles_js_1.removeVirtualIdTag)(id);
+                id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
                 id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377

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/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/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/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/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/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-e752d12';
+exports.PROJECT_VERSION = '0.4.236-commit-08fbc10';

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/history.d.ts

@@ -2,7 +2,8 @@ export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };
 export { saveScrollPosition };
-export { initHistory };
+export { initHistoryState };
+export { monkeyPatchHistoryAPI };
 export type { HistoryInfo };
 export type { ScrollPosition };
 type StateEnhanced = {
@@ -18,6 +19,7 @@ type ScrollPosition = {
 declare function saveScrollPosition(): void;
 declare function pushHistoryState(url: string, overwriteLastHistoryEntry: boolean): void;
 declare function replaceHistoryStateOriginal(state: unknown, url: string): void;
+declare function monkeyPatchHistoryAPI(): void;
 type HistoryInfo = {
     url: `/${string}`;
     state: StateEnhanced;
@@ -27,4 +29,4 @@ declare function onPopStateBegin(): {
     previous: HistoryInfo;
     current: HistoryInfo;
 };
-declare function initHistory(): void;
+declare function initHistoryState(): void;