vike 0.4.161-commit-ba539a4 → 0.4.161-commit-6a208ab

package/dist/cjs/node/plugin/plugins/envVars.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyEnvVar = exports.envVarsPlugin = void 0;
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
+const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 function envVarsPlugin() {
     let envsAll;
     let config;
@@ -62,8 +63,11 @@ function envVarsPlugin() {
                 // Apply
                 code = applyEnvVar(envName, envVal, code);
             });
-            // No need for low-resolution source map since line numbers didn't change. (Does Vite do high-resolution column numbers source mapping?)
-            return code;
+            // Line numbers didn't change.
+            //  - We only break the column number of a couple of lines, wich is acceptable.
+            //  - Anyways, I'm not even sure Vite supports high-resolution column number source mapping.
+            const ret = (0, rollupSourceMap_js_1.sourceMapPassthrough)(code);
+            return ret;
         }
     };
 }

package/dist/cjs/node/plugin/plugins/extractAssetsPlugin.js

@@ -11,10 +11,11 @@ const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
-const removeSourceMap_js_1 = require("../shared/removeSourceMap.js");
+const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -26,6 +27,7 @@ const debugEnabled = (0, utils_js_1.isDebugEnabled)(debugNamespace);
 function extractAssetsPlugin() {
     let config;
     let configVike;
+    let vikeConfig;
     let isServerAssetsFixEnabled;
     return [
         // This plugin removes all JavaScript from server-side only code, so that only CSS imports remains. (And also satic files imports e.g. `import logoURL from './logo.svg.js'`).
@@ -38,14 +40,18 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }
-                (0, utils_js_1.assert)(!isServerAssetsFixEnabled);
+                if (isServerAssetsFixEnabled) {
+                    // I'm guessing isServerAssetsFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
+                    (0, assertV1Design_js_1.assertV1Design)(true, vikeConfig.pageConfigs);
+                    (0, utils_js_1.assert)(false);
+                }
                 (0, utils_js_1.assert)(configVike.includeAssetsImportedByServer);
                 (0, utils_js_1.assert)(!(0, utils_js_1.viteIsSSR_options)(options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
                 debugTransformResult(id, code, importStatements);
-                return (0, removeSourceMap_js_1.removeSourceMap)(code);
+                return (0, rollupSourceMap_js_1.sourceMapRemove)(code);
             }
         },
         // This plugin appends `?extractAssets` to module IDs
@@ -136,6 +142,7 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 configVike = await (0, getConfigVike_js_1.getConfigVike)(config_);
                 config = config_;
+                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config, false);
                 isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
             },
             load(id) {

package/dist/cjs/node/plugin/plugins/extractExportNamesPlugin.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractExportNamesRE = exports.isUsingClientRouter = exports.extractExportNamesPlugin = void 0;
 const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
-const removeSourceMap_js_1 = require("../shared/removeSourceMap.js");
+const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
 const debugNamespace = 'vike:extractExportNames';
@@ -40,7 +40,7 @@ async function getExtractExportNamesCode(src, isClientSide, isProduction, id) {
         globalObject.usesClientRouter = true;
     }
     const code = getCode(exportNames, wildcardReExports, isClientSide, isProduction, id);
-    return (0, removeSourceMap_js_1.removeSourceMap)(code);
+    return (0, rollupSourceMap_js_1.sourceMapRemove)(code);
 }
 function getCode(exportNames, wildcardReExports, isClientSide, isProduction, id) {
     let code = '';

package/dist/cjs/node/plugin/plugins/importBuild/getVikeManifest.js

@@ -1,38 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVikeManifest = void 0;
 const utils_js_1 = require("../../utils.js");
 const assertPluginManifest_js_1 = require("../../../shared/assertPluginManifest.js");
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
-const path_1 = __importDefault(require("path"));
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
-function getVikeManifest(config, configVike) {
+function getVikeManifest(configVike) {
     const runtimeManifest = (0, globalContext_js_1.getRuntimeManifest)(configVike);
     const manifest = {
         version: utils_js_1.projectInfo.projectVersion,
         usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
-        manifestKeyMap: getManifestKeyMap(configVike, config),
         ...runtimeManifest
     };
     (0, assertPluginManifest_js_1.assertPluginManifest)(manifest);
     return manifest;
 }
 exports.getVikeManifest = getVikeManifest;
-function getManifestKeyMap(configVike, config) {
-    const manifestKeyMap = {};
-    configVike.extensions
-        .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-        .flat()
-        .filter(utils_js_1.isNotNullish)
-        .forEach(({ importPath, filePath }) => {
-        // Recreating https://github.com/vitejs/vite/blob/8158ece72b66307e7b607b98496891610ca70ea2/packages/vite/src/node/plugins/manifest.ts#L38
-        const filePathRelative = path_1.default.posix.relative(config.root, (0, utils_js_1.toPosixPath)(filePath));
-        (0, utils_js_1.assertPosixPath)(filePathRelative);
-        (0, utils_js_1.assertPosixPath)(importPath);
-        manifestKeyMap[importPath] = filePathRelative;
-    });
-    return manifestKeyMap;
-}

package/dist/cjs/node/plugin/plugins/importBuild/index.js

@@ -39,7 +39,7 @@ function importBuild() {
 exports.importBuild = importBuild;
 function getEntryCode(config, configVike) {
     const importPath = getImportPath(config);
-    const vikeManifest = (0, getVikeManifest_js_1.getVikeManifest)(config, configVike);
+    const vikeManifest = (0, getVikeManifest_js_1.getVikeManifest)(configVike);
     const importerCode = [
         `  import { setImportBuildGetters } from '${importPath}';`,
         `  import * as pageFiles from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,

package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFileImportUserCode = void 0;
 const utils_js_1 = require("../../utils.js");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
+const vite_1 = require("vite");
 const fileTypes_js_1 = require("../../../../shared/getPageFiles/fileTypes.js");
 const path_1 = __importDefault(require("path"));
 const getVirtualFilePageConfigs_js_1 = require("./v1-design/getVirtualFilePageConfigs.js");
-const generateEagerImport_js_1 = require("./generateEagerImport.js");
 async function getVirtualFileImportUserCode(id, options, configVike, config, isDev) {
     const idParsed = (0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(id);
     (0, utils_js_1.assert)(idParsed);
@@ -27,53 +27,13 @@ async function getCode(config, configVike, isForClientSide, isClientRouting, isP
     (0, utils_js_1.assert)(isDev === !isBuild);
     let content = '';
     {
-        const globRoots = getGlobRoots(config, configVike);
+        const globRoots = getGlobRoots(config);
         (0, utils_js_1.debugGlob)('Glob roots: ', globRoots);
         content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, configVike, isPrerendering, config, isDev, id);
     }
-    {
-        const extensionsImportPaths = configVike.extensions
-            .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-            .flat()
-            .filter(utils_js_1.isNotNullish)
-            .map(({ importPath }) => importPath);
-        content += generateExtensionImports(extensionsImportPaths, isForClientSide, isBuild, isClientRouting, isPrerendering);
-    }
     (0, utils_js_1.debugGlob)(`Glob imports for ${isForClientSide ? 'client' : 'server'}:\n`, content);
     return content;
 }
-function generateExtensionImports(extensionsImportPaths, isForClientSide, isBuild, isClientRouting, isPrerendering) {
-    let fileContent = '\n\n';
-    extensionsImportPaths
-        .filter((importPath) => {
-        (0, utils_js_1.assert)(
-        // V1 design
-        importPath.includes('+') ||
-            // V0.4 design
-            importPath.includes('.page.'));
-        return !importPath.includes('+');
-    })
-        .forEach((importPath) => {
-        const fileType = (0, fileTypes_js_1.determineFileType)(importPath);
-        const { includeImport, includeExportNames } = determineInjection({
-            fileType,
-            isForClientSide,
-            isClientRouting,
-            isPrerendering,
-            isBuild
-        });
-        if (includeImport) {
-            fileContent += addImport(importPath, fileType, false, isBuild);
-        }
-        if (includeExportNames) {
-            fileContent += addImport(importPath, fileType, true, isBuild);
-        }
-        if (!includeImport && !includeExportNames && !isForClientSide) {
-            fileContent += `pageFilesList.push("${importPath}");` + '\n';
-        }
-    });
-    return fileContent;
-}
 function determineInjection({ fileType, isForClientSide, isClientRouting, isPrerendering, isBuild }) {
     if (!isForClientSide) {
         return {
@@ -99,42 +59,6 @@ function determineInjection({ fileType, isForClientSide, isClientRouting, isPrer
         }
     }
 }
-function addImport(importPath, fileType, exportNames, isBuild) {
-    const pageFilesVar = (() => {
-        if (exportNames) {
-            if (isBuild) {
-                return 'pageFilesExportNamesEager';
-            }
-            else {
-                return 'pageFilesExportNamesLazy';
-            }
-        }
-        else {
-            if (fileType === '.page.route') {
-                return 'pageFilesEager';
-            }
-            else {
-                return 'pageFilesLazy';
-            }
-        }
-    })();
-    const query = !exportNames ? '' : '?extractExportNames';
-    let fileContent = '';
-    const mapVar = `${pageFilesVar}['${fileType}']`;
-    fileContent += `${mapVar} = ${mapVar} ?? {};\n`;
-    const value = (() => {
-        if (!pageFilesVar.endsWith('Eager')) {
-            return `() => import('${importPath}${query}')`;
-        }
-        else {
-            const { importName, importStatement } = (0, generateEagerImport_js_1.generateEagerImport)(`${importPath}${query}`);
-            fileContent += importStatement + '\n';
-            return importName;
-        }
-    })();
-    fileContent += `${mapVar}['${importPath}'] = ${value};\n`;
-    return fileContent;
-}
 async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, configVike, isPrerendering, config, isDev, id) {
     let fileContent = `// Generatead by node/plugin/plugins/virtualFiles/index.ts
 
@@ -212,10 +136,15 @@ function getGlobs(globRoots, isBuild, fileType, query) {
             varNameLocals.push(varNameLocal);
             const globIncludePath = `'${getGlobPath(globRoot.includeDir, fileType)}'`;
             const globExcludePath = globRoot.excludeDir ? `'!${getGlobPath(globRoot.excludeDir, fileType)}'` : null;
-            const globOptions = JSON.stringify({ eager: isEager, as: query });
-            (0, utils_js_1.assert)(globOptions.startsWith('{"eager":true') || globOptions.startsWith('{"eager":false'));
+            const globOptions = { eager: isEager };
+            if ((0, utils_js_1.isVersionOrAbove)(vite_1.version, '5.1.0')) {
+                globOptions.as = query;
+            }
+            else {
+                globOptions.query = `?${query}`;
+            }
             const globPaths = globExcludePath ? `[${globIncludePath}, ${globExcludePath}]` : `[${globIncludePath}]`;
-            const globLine = `const ${varNameLocal} = import.meta.glob(${globPaths}, ${globOptions});`;
+            const globLine = `const ${varNameLocal} = import.meta.glob(${globPaths}, ${JSON.stringify(globOptions)});`;
             return globLine;
         }),
         `const ${varName} = {${varNameLocals.map((varNameLocal) => `...${varNameLocal}`).join(',')}};`,
@@ -223,22 +152,13 @@ function getGlobs(globRoots, isBuild, fileType, query) {
         ''
     ].join('\n');
 }
-function getGlobRoots(config, configVike) {
+function getGlobRoots(config) {
     const globRoots = [
         {
             includeDir: '/',
             excludeDir: path_1.default.posix.relative(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot)
         }
     ];
-    configVike.extensions
-        .map(({ pageConfigsSrcDir }) => pageConfigsSrcDir)
-        .filter(utils_js_1.isNotNullish)
-        .forEach((pageConfigsSrcDir) => {
-        const globRoot = {
-            includeDir: path_1.default.posix.relative(config.root, pageConfigsSrcDir)
-        };
-        globRoots.push(globRoot);
-    });
     return globRoots;
 }
 function getGlobPath(globRootDir, fileType) {

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -76,7 +76,9 @@ async function getVikeConfig(config, isDev, tolerateInvalidConfig = false, exten
 }
 exports.getVikeConfig = getVikeConfig;
 async function isV1Design(config, isDev) {
-    const isV1Design = (await getVikeConfig(config, isDev)).pageConfigs.length > 0;
+    const vikeConfig = await getVikeConfig(config, isDev);
+    const { pageConfigs } = vikeConfig;
+    const isV1Design = pageConfigs.length > 0;
     return isV1Design;
 }
 exports.isV1Design = isV1Design;

package/dist/cjs/node/plugin/plugins/setGlobalContext.js

@@ -11,20 +11,6 @@ function setGlobalContext() {
             handler(viteDevServer) {
                 (0, globalContext_js_1.setGlobalContext_viteDevServer)(viteDevServer);
             }
-        },
-        configurePreviewServer: {
-            order: 'pre',
-            handler(vitePreviewServer) {
-                (0, globalContext_js_1.setGlobalContext_vitePreviewServer)(
-                // Type cast won't be necessary after https://github.com/vitejs/vite/pull/14119 is released in Vite 5
-                vitePreviewServer);
-            }
-        },
-        configResolved: {
-            order: 'pre',
-            handler(config) {
-                (0, globalContext_js_1.setGlobalContext_viteConfig)(config);
-            }
         }
     };
 }

package/dist/cjs/node/plugin/shared/rollupSourceMap.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sourceMapPassthrough = exports.sourceMapRemove = void 0;
+// https://rollupjs.org/guide/en/#source-code-transformations
+/** Remove entire source mapping, to save KBs. */
+function sourceMapRemove(code) {
+    return {
+        code,
+        map: { mappings: '' }
+    };
+}
+exports.sourceMapRemove = sourceMapRemove;
+/** Don't provide any source map, pass through current source map instead. */
+function sourceMapPassthrough(code) {
+    return {
+        code,
+        map: null
+    };
+}
+exports.sourceMapPassthrough = sourceMapPassthrough;

package/dist/cjs/node/prerender/runPrerender.js

@@ -90,6 +90,7 @@ async function runPrerender(options, manuallyTriggered) {
     handleNodeEnv();
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'vike pre-rendering', 'production');
+    (0, globalContext_js_1.setGlobalContext_prerender)(viteConfig);
     assertLoadedConfig(viteConfig, options);
     const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
     const { outDirClient, outDirRoot } = (0, utils_js_1.getOutDirs)(viteConfig);

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntimeManifest = exports.setGlobalContext_viteConfig = exports.setGlobalContext_vitePreviewServer = exports.setGlobalContext_viteDevServer = exports.getViteConfig = exports.getViteDevServer = exports.getGlobalContext = exports.initGlobalContext = void 0;
+exports.getRuntimeManifest = exports.setGlobalContext_prerender = exports.setGlobalContext_viteDevServer = exports.getViteConfig = exports.getViteDevServer = exports.getGlobalContext = exports.initGlobalContext = void 0;
 const utils_js_1 = require("./utils.js");
 const loadImportBuild_js_1 = require("./globalContext/loadImportBuild.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
@@ -21,27 +21,22 @@ function setGlobalContext_viteDevServer(viteDevServer) {
     if (globalObject.viteDevServer)
         return;
     (0, utils_js_1.assert)(!globalObject.globalContext);
+    (0, utils_js_1.assert)(!globalObject.globalContext);
+    globalObject.viteConfig = viteDevServer.config;
     globalObject.viteDevServer = viteDevServer;
 }
 exports.setGlobalContext_viteDevServer = setGlobalContext_viteDevServer;
-function setGlobalContext_vitePreviewServer(vitePreviewServer) {
-    if (globalObject.vitePreviewServer)
-        return;
-    (0, utils_js_1.assert)(!globalObject.globalContext);
-    globalObject.vitePreviewServer = vitePreviewServer;
-}
-exports.setGlobalContext_vitePreviewServer = setGlobalContext_vitePreviewServer;
 function getViteDevServer() {
     return globalObject.viteDevServer ?? null;
 }
 exports.getViteDevServer = getViteDevServer;
-function setGlobalContext_viteConfig(viteConfig) {
+function setGlobalContext_prerender(viteConfig) {
     if (globalObject.viteConfig)
         return;
     (0, utils_js_1.assert)(!globalObject.globalContext);
     globalObject.viteConfig = viteConfig;
 }
-exports.setGlobalContext_viteConfig = setGlobalContext_viteConfig;
+exports.setGlobalContext_prerender = setGlobalContext_prerender;
 function getViteConfig() {
     return globalObject.viteConfig ?? null;
 }
@@ -49,13 +44,12 @@ exports.getViteConfig = getViteConfig;
 async function initGlobalContext(isPrerendering = false, outDir) {
     if (globalObject.globalContext)
         return;
-    const { viteDevServer, vitePreviewServer, viteConfig } = globalObject;
+    const { viteDevServer, viteConfig } = globalObject;
     assertNodeEnv(!!viteDevServer);
     const isProduction = !viteDevServer;
     if (!isProduction) {
         (0, utils_js_1.assert)(viteConfig);
         (0, utils_js_1.assert)(!isPrerendering);
-        (0, utils_js_1.assert)(!vitePreviewServer);
         const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
         const pluginManifest = getRuntimeManifest(configVike);
         globalObject.globalContext = {
@@ -64,9 +58,7 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             clientManifest: null,
             pluginManifest: null,
             viteDevServer,
-            vitePreviewServer: null,
             viteConfig,
-            configVike,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
@@ -87,7 +79,6 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             clientManifest,
             pluginManifest,
             viteDevServer: null,
-            vitePreviewServer: vitePreviewServer ?? null,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
@@ -101,16 +92,14 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             (0, utils_js_1.assert)(configVike);
             (0, utils_js_1.objectAssign)(globalContext, {
                 isPrerendering: true,
-                viteConfig,
-                configVike
+                viteConfig
             });
             globalObject.globalContext = globalContext;
         }
         else {
             (0, utils_js_1.objectAssign)(globalContext, {
                 isPrerendering: false,
-                viteConfig: null,
-                configVike: null
+                viteConfig: null
             });
             globalObject.globalContext = globalContext;
         }

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

@@ -5,9 +5,7 @@ const utils_js_1 = require("../../utils.js");
 const assertClientEntryId_js_1 = require("./assertClientEntryId.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
-function getManifestEntry(id, clientManifest, 
-// TODO: remove
-manifestKeyMap) {
+function getManifestEntry(id, clientManifest) {
     (0, assertClientEntryId_js_1.assertClientEntryId)(id);
     const debugInfo = getDebugInfo(id, clientManifest);
     // Vike client entry

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

@@ -4,7 +4,7 @@ exports.retrieveAssetsProd = void 0;
 const utils_js_1 = require("../../utils.js");
 const getManifestEntry_js_1 = require("./getManifestEntry.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
-function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImportedByServer, manifestKeyMap) {
+function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImportedByServer) {
     let assetUrls = new Set();
     (0, utils_js_1.assert)(clientManifest);
     const visistedAssets = new Set();
@@ -21,7 +21,7 @@ function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImp
                 id = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(id);
             }
         }
-        const { manifestKey } = (0, getManifestEntry_js_1.getManifestEntry)(id, clientManifest, manifestKeyMap);
+        const { manifestKey } = (0, getManifestEntry_js_1.getManifestEntry)(id, clientManifest);
         collectAssets(manifestKey, assetUrls, visistedAssets, clientManifest, onlyAssets);
     });
     collectSingleStyle(assetUrls, clientManifest);

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

@@ -16,15 +16,14 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     let assetUrls;
     let clientEntriesSrc;
     if (isDev) {
-        const { viteDevServer, configVike } = globalContext;
-        clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => resolveClientEntriesDev(clientEntry, viteDevServer, configVike)));
+        const { viteDevServer } = globalContext;
+        clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => resolveClientEntriesDev(clientEntry, viteDevServer)));
         assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
     }
     else {
-        const { pluginManifest, clientManifest } = globalContext;
-        const manifestKeyMap = pluginManifest.manifestKeyMap;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, clientManifest, manifestKeyMap));
-        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, clientManifest, pageContext._includeAssetsImportedByServer, manifestKeyMap);
+        const { clientManifest } = globalContext;
+        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, clientManifest));
+        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, clientManifest, pageContext._includeAssetsImportedByServer);
     }
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -59,7 +58,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     return pageAssets;
 }
 exports.getPageAssets = getPageAssets;
-async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
+async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     (0, assertClientEntryId_js_1.assertClientEntryId)(clientEntry);
     let root = viteDevServer.config.root;
     (0, utils_js_1.assert)(root);
@@ -120,8 +119,8 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
     (0, utils_js_1.assertPosixPath)(filePath);
     return filePath;
 }
-function resolveClientEntriesProd(clientEntry, clientManifest, manifestKeyMap) {
-    const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, clientManifest, manifestKeyMap);
+function resolveClientEntriesProd(clientEntry, clientManifest) {
+    const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, clientManifest);
     (0, utils_js_1.assert)(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
     let { file } = manifestEntry;
     (0, utils_js_1.assert)(!file.startsWith('/'));

package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js

@@ -21,8 +21,8 @@ const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePa
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
 const loadPageRoutes_js_1 = require("../../../shared/route/loadPageRoutes.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
+const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -156,7 +156,7 @@ async function getRenderContext() {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
     const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = await (0, getPageFiles_js_1.getPageFilesAll)(false, globalContext.isProduction);
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-    assertV1Design(pageFilesAll, pageConfigs);
+    (0, assertV1Design_js_1.assertV1Design)(pageFilesAll.length > 0, pageConfigs, pageFilesAll);
     const renderContext = {
         pageFilesAll: pageFilesAll,
         pageConfigs,
@@ -168,24 +168,3 @@ async function getRenderContext() {
     return renderContext;
 }
 exports.getRenderContext = getRenderContext;
-function assertV1Design(pageFilesAll, pageConfigs) {
-    const isV1Design = pageConfigs.length !== 0;
-    const isDesignOld = pageFilesAll.length !== 0;
-    if (isV1Design && isDesignOld) {
-        const indent = '- ';
-        const v1Files = (0, utils_js_1.unique)(pageConfigs
-            .map((p) => Object.values(p.configValues)
-            .map(helpers_js_1.getConfigValueFilePathToShowToUser)
-            .filter(utils_js_1.isNotNullish)
-            .map((filePathToShowToUser) => indent + filePathToShowToUser))
-            .flat(2));
-        (0, utils_js_1.assertUsage)(false, [
-            'Mixing the new V1 design with the old V0.4 design is forbidden.',
-            'V1 files:',
-            ...v1Files,
-            'V0.4 files:',
-            ...pageFilesAll.map((p) => indent + p.filePath)
-        ].join('\n'));
-    }
-    (0, utils_js_1.assertWarning)(!isDesignOld, "You are using Vike's deprecated design. Update to the new V1 design, see https://vike.dev/migration/v1-design for how to migrate.", { onlyOnce: true });
-}

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

@@ -9,16 +9,13 @@ function assertPluginManifest(pluginManifest) {
     (0, assertRuntimeManifest_js_1.assertRuntimeManifest)(pluginManifest);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pluginManifest, 'usesClientRouter', 'boolean'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pluginManifest, 'version', 'string'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pluginManifest, 'manifestKeyMap', 'object'));
-    const { manifestKeyMap } = pluginManifest;
-    (0, utils_js_1.assert)((0, utils_js_1.isStringRecord)(manifestKeyMap));
     // Avoid:
     // ```
     // Uncaught (in promise) TypeError: Cannot set property manifestKeyMap of #<Object> which has only a getter
     // ```
+    // We removed manifestKeyMap, maybe this isn't needed anymore.
     // See https://github.com/vikejs/vike/issues/596
     const pluginManifestClone = { ...pluginManifest };
-    (0, utils_js_1.objectAssign)(pluginManifestClone, { manifestKeyMap });
     (0, utils_js_1.checkType)(pluginManifestClone);
 }
 exports.assertPluginManifest = assertPluginManifest;

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

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertV1Design = void 0;
+const helpers_js_1 = require("../../shared/page-configs/helpers.js");
+const utils_js_1 = require("./utils.js");
+function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
+    const isV1Design = pageConfigs.length > 0;
+    if (isV1Design && isOldDesign) {
+        const lines = ['Mixing the new V1 design with the old V0.4 design is forbidden.'];
+        if (pageFilesAll) {
+            (0, utils_js_1.assert)(pageFilesAll.length > 0);
+            const indent = '- ';
+            const filesV1 = (0, utils_js_1.unique)(pageConfigs
+                .map((p) => Object.values(p.configValues)
+                .map(helpers_js_1.getConfigValueFilePathToShowToUser)
+                .filter(utils_js_1.isNotNullish)
+                .map((filePathToShowToUser) => indent + filePathToShowToUser))
+                .flat(2));
+            const filesOld = pageFilesAll.map((p) => indent + p.filePath);
+            lines.push(...['V1 design files:', ...filesV1, 'Old design files:', ...filesOld]);
+        }
+        (0, utils_js_1.assertUsage)(false, lines.join('\n'));
+    }
+    (0, utils_js_1.assertWarning)(!isOldDesign, "You are using Vike's deprecated design. Update to the new V1 design, see https://vike.dev/migration/v1-design for how to migrate.", { onlyOnce: true });
+}
+exports.assertV1Design = assertV1Design;

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

@@ -31,3 +31,5 @@ __exportStar(require("../../utils/parseUrl-extras.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/virtual-files.js"), exports);
 __exportStar(require("../../utils/assertIsNotBrowser.js"), exports);
+__exportStar(require("../../utils/isNotNullish.js"), exports);
+__exportStar(require("../../utils/unique.js"), exports);

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.161-commit-ba539a4';
+const PROJECT_VERSION = '0.4.161-commit-6a208ab';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',