vike 0.4.161 → 0.4.162-commit-49fe40c

package/dist/esm/node/plugin/utils.d.ts

@@ -1,7 +1,6 @@
 export * from '../runtime/utils.js';
 export * from '../../utils/viteIsSSR.js';
 export * from '../../utils/getFilePathAbsolute.js';
-export * from '../../utils/getDependencyPackageJson.js';
 export * from '../../utils/requireResolve.js';
 export * from '../../utils/arrayIncludes.js';
 export * from '../../utils/isDev.js';

package/dist/esm/node/plugin/utils.js

@@ -7,7 +7,6 @@ export * from '../runtime/utils.js';
 // Utils only needed by `plugin/*`
 export * from '../../utils/viteIsSSR.js';
 export * from '../../utils/getFilePathAbsolute.js';
-export * from '../../utils/getDependencyPackageJson.js';
 export * from '../../utils/requireResolve.js';
 export * from '../../utils/arrayIncludes.js';
 export * from '../../utils/isDev.js';

package/dist/esm/node/prerender/runPrerender.d.ts

@@ -36,11 +36,11 @@ type PrerenderOptions = {
     root?: string;
     /** @deprecated Define `prerender({ viteConfig: { configFile }})` instead. */
     configFile?: string;
-    /** @deprecated Define `partial` in vite.config.js instead, see https://vike.dev/prerender-config */
+    /** @deprecated Define `partial` in vite.config.js instead, see https://vike.dev/prerender */
     partial?: boolean;
-    /** @deprecated Define `noExtraDir` in vite.config.js instead, see https://vike.dev/prerender-config */
+    /** @deprecated Define `noExtraDir` in vite.config.js instead, see https://vike.dev/prerender */
     noExtraDir?: boolean;
-    /** @deprecated Define `parallel` in vite.config.js instead, see https://vike.dev/prerender-config */
+    /** @deprecated Define `parallel` in vite.config.js instead, see https://vike.dev/prerender */
     parallel?: number;
     /** @deprecated */
     outDir?: string;

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

@@ -10,7 +10,7 @@ import { pLimit } from '../../utils/pLimit.js';
 import { prerenderPage, prerender404Page, getRenderContext, getPageContextInitEnhanced } from '../runtime/renderPage/renderPageAlreadyRouted.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'os';
-import { getGlobalContext, initGlobalContext } from '../runtime/globalContext.js';
+import { getGlobalContext, initGlobalContext, setGlobalContext_prerender } from '../runtime/globalContext.js';
 import { resolveConfig } from 'vite';
 import { getConfigVike } from '../shared/getConfigVike.js';
 import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
@@ -62,6 +62,7 @@ async function runPrerender(options, manuallyTriggered) {
     handleNodeEnv();
     await disableReactStreaming();
     const viteConfig = await resolveConfig(options.viteConfig || {}, 'vike pre-rendering', 'production');
+    setGlobalContext_prerender(viteConfig);
     assertLoadedConfig(viteConfig, options);
     const configVike = await getConfigVike(viteConfig);
     const { outDirClient, outDirRoot } = getOutDirs(viteConfig);
@@ -529,7 +530,7 @@ function warnMissingPages(prerenderedPageContexts, doNotPrerenderList, renderCon
         .filter((pageId) => !isErrorPage(pageId, renderContext.pageConfigs))
         .forEach((pageId) => {
         const pageAt = isV1 ? pageId : `\`${pageId}.page.*\``;
-        assertWarning(partial, `Cannot pre-render page ${pageAt} because it has a non-static route, while no ${hookName}() hook returned any URL matching the page's route. You need to use a ${hookName}() hook (https://vike.dev/${hookName}) providing a list of URLs for ${pageAt} that should be pre-rendered. If you don't want to pre-render ${pageAt} then use the option prerender.partial (https://vike.dev/prerender-config#partial) to suppress this warning.`, { onlyOnce: true });
+        assertWarning(partial, `Cannot pre-render page ${pageAt} because it has a non-static route, while no ${hookName}() hook returned any URL matching the page's route. You need to use a ${hookName}() hook (https://vike.dev/${hookName}) providing a list of URLs for ${pageAt} that should be pre-rendered. If you don't want to pre-render ${pageAt} then use the option prerender.partial (https://vike.dev/prerender#partial) to suppress this warning.`, { onlyOnce: true });
     });
 }
 async function prerender404(prerenderedPageContexts, renderContext, prerenderContext, onComplete) {
@@ -645,7 +646,7 @@ function checkOutdatedOptions(options) {
     assertUsage(options.root === undefined, 'Option `prerender({ root })` deprecated: set `prerender({ viteConfig: { root }})` instead.', { showStackTrace: true });
     assertUsage(options.configFile === undefined, 'Option `prerender({ configFile })` deprecated: set `prerender({ viteConfig: { configFile }})` instead.', { showStackTrace: true });
     ['noExtraDir', 'partial', 'parallel'].forEach((prop) => {
-        assertUsage(options[prop] === undefined, `[prerender()] Option ${pc.cyan(prop)} is deprecated. Define ${pc.cyan(prop)} in vite.config.js instead. See https://vike.dev/prerender-config`, { showStackTrace: true });
+        assertUsage(options[prop] === undefined, `[prerender()] Option ${pc.cyan(prop)} is deprecated. Define ${pc.cyan(prop)} in vite.config.js instead. See https://vike.dev/prerender`, { showStackTrace: true });
     });
     ['base', 'outDir'].forEach((prop) => {
         assertWarning(options[prop] === undefined, `[prerender()] Option ${pc.cyan(prop)} is outdated and has no effect (vike now automatically determines ${pc.cyan(prop)})`, {

package/dist/esm/node/prerender/utils.d.ts

@@ -10,4 +10,4 @@ export * from '../../utils/filesystemPathHandling.js';
 export * from '../../utils/urlToFile.js';
 export * from '../../shared/hooks/executeHook.js';
 export * from '../../utils/isPlainObject.js';
-export * from '../../utils/nodeEnv.js';
+export * from '../../utils/assertNodeEnv.js';

package/dist/esm/node/prerender/utils.js

@@ -12,4 +12,4 @@ export * from '../../utils/filesystemPathHandling.js';
 export * from '../../utils/urlToFile.js';
 export * from '../../shared/hooks/executeHook.js';
 export * from '../../utils/isPlainObject.js';
-export * from '../../utils/nodeEnv.js';
+export * from '../../utils/assertNodeEnv.js';

package/dist/esm/node/runtime/globalContext.d.ts

@@ -3,11 +3,10 @@ export { getGlobalContext };
 export { getViteDevServer };
 export { getViteConfig };
 export { setGlobalContext_viteDevServer };
-export { setGlobalContext_vitePreviewServer };
-export { setGlobalContext_viteConfig };
+export { setGlobalContext_prerender };
 export { getRuntimeManifest };
 import type { ViteManifest } from '../shared/ViteManifest.js';
-import type { ResolvedConfig, ViteDevServer, PreviewServer as VitePreviewServer } from 'vite';
+import type { ResolvedConfig, ViteDevServer } from 'vite';
 import { PluginManifest } from '../shared/assertPluginManifest.js';
 import type { ConfigVikeResolved } from '../../shared/ConfigVike.js';
 import { type RuntimeManifest } from '../shared/assertRuntimeManifest.js';
@@ -22,9 +21,7 @@ type GlobalContext = {
     isProduction: false;
     isPrerendering: false;
     viteConfig: ResolvedConfig;
-    configVike: ConfigVikeResolved;
     viteDevServer: ViteDevServer;
-    vitePreviewServer: null;
     clientManifest: null;
     pluginManifest: null;
 } | ({
@@ -32,21 +29,17 @@ type GlobalContext = {
     clientManifest: ViteManifest;
     pluginManifest: PluginManifest;
     viteDevServer: null;
-    vitePreviewServer: null | VitePreviewServer;
 } & ({
     isPrerendering: false;
     viteConfig: null;
-    configVike: null;
 } | {
     isPrerendering: true;
     viteConfig: ResolvedConfig;
-    configVike: ConfigVikeResolved;
 })));
 declare function getGlobalContext(): GlobalContext;
 declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): void;
-declare function setGlobalContext_vitePreviewServer(vitePreviewServer: VitePreviewServer): void;
 declare function getViteDevServer(): ViteDevServer | null;
-declare function setGlobalContext_viteConfig(viteConfig: ResolvedConfig): void;
+declare function setGlobalContext_prerender(viteConfig: ResolvedConfig): void;
 declare function getViteConfig(): ResolvedConfig | null;
 declare function initGlobalContext(isPrerendering?: boolean, outDir?: string): Promise<void>;
 declare function getRuntimeManifest(configVike: ConfigVikeResolved): RuntimeManifest;

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

@@ -3,8 +3,7 @@ export { getGlobalContext };
 export { getViteDevServer };
 export { getViteConfig };
 export { setGlobalContext_viteDevServer };
-export { setGlobalContext_vitePreviewServer };
-export { setGlobalContext_viteConfig };
+export { setGlobalContext_prerender };
 export { getRuntimeManifest };
 import { assert, assertUsage, getGlobalObject, getNodeEnv, getNodeEnvDesc, isNodeEnvDev, isPlainObject, objectAssign } from './utils.js';
 import { loadImportBuild } from './globalContext/loadImportBuild.js';
@@ -22,18 +21,14 @@ function setGlobalContext_viteDevServer(viteDevServer) {
     if (globalObject.viteDevServer)
         return;
     assert(!globalObject.globalContext);
-    globalObject.viteDevServer = viteDevServer;
-}
-function setGlobalContext_vitePreviewServer(vitePreviewServer) {
-    if (globalObject.vitePreviewServer)
-        return;
     assert(!globalObject.globalContext);
-    globalObject.vitePreviewServer = vitePreviewServer;
+    globalObject.viteConfig = viteDevServer.config;
+    globalObject.viteDevServer = viteDevServer;
 }
 function getViteDevServer() {
     return globalObject.viteDevServer ?? null;
 }
-function setGlobalContext_viteConfig(viteConfig) {
+function setGlobalContext_prerender(viteConfig) {
     if (globalObject.viteConfig)
         return;
     assert(!globalObject.globalContext);
@@ -45,13 +40,12 @@ function 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) {
         assert(viteConfig);
         assert(!isPrerendering);
-        assert(!vitePreviewServer);
         const configVike = await getConfigVike(viteConfig);
         const pluginManifest = getRuntimeManifest(configVike);
         globalObject.globalContext = {
@@ -60,9 +54,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,
@@ -83,7 +75,6 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             clientManifest,
             pluginManifest,
             viteDevServer: null,
-            vitePreviewServer: vitePreviewServer ?? null,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
@@ -97,16 +88,14 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             assert(configVike);
             objectAssign(globalContext, {
                 isPrerendering: true,
-                viteConfig,
-                configVike
+                viteConfig
             });
             globalObject.globalContext = globalContext;
         }
         else {
             objectAssign(globalContext, {
                 isPrerendering: false,
-                viteConfig: null,
-                configVike: null
+                viteConfig: null
             });
             globalObject.globalContext = globalContext;
         }

package/dist/esm/node/runtime/html/serializePageContextClientSide.js

@@ -100,6 +100,7 @@ function serializePageContextAbort(pageContext) {
     delete pageContext._abortCaller;
     const unknownProps = Object.keys(pageContext).filter((prop) => ![
         // prettier-ignore
+        // biome-ignore format:
         '_abortCall',
         /* Not needed on the client-side
         '_abortCaller',

package/dist/esm/node/runtime/renderPage/analyzePage.js

@@ -4,11 +4,11 @@ import { analyzePageClientSide } from '../../../shared/getPageFiles/analyzePageC
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { analyzeClientSide } from '../../../shared/getPageFiles/analyzeClientSide.js';
 import { getGlobalContext } from '../globalContext.js';
-import { getClientEntryFilePath } from '../../shared/getClientEntryFilePath.js';
+import { getClientEntry } from '../../shared/getClientEntry.js';
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientSideRenderable, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
-        const clientFilePath = getClientEntryFilePath(pageConfig);
+        const clientFilePath = getClientEntry(pageConfig);
         const clientEntry = !isClientSideRenderable ? clientFilePath : getVikeClientEntry(isClientRouting);
         const clientDependencies = [];
         clientDependencies.push({

package/dist/esm/node/runtime/renderPage/getPageAssets/assertClientEntryId.js

@@ -1,11 +1,9 @@
 export { assertClientEntryId };
-import { getGlobalContext } from '../../globalContext.js';
 import { assert, assertPosixPath, isNpmPackageImport } from '../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 function assertClientEntryId(id) {
     assertPosixPath(id);
     assert(!id.startsWith('/@fs'), id);
-    const isPkg = isNpmPackageImport(id);
     assert(
     // Client entry
     id.startsWith('@@vike/') ||
@@ -13,10 +11,6 @@ function assertClientEntryId(id) {
         id.startsWith('/') ||
         // Page code importer
         isVirtualFileIdPageConfigValuesAll(id) ||
-        // Stem packages
-        isPkg, id);
-    if (isPkg) {
-        const { configVike } = getGlobalContext();
-        assert(configVike === null || configVike.extensions.some(({ npmPackageName }) => id.startsWith(npmPackageName)), id);
-    }
+        // Import
+        isNpmPackageImport(id), id);
 }

package/dist/esm/node/runtime/renderPage/getPageAssets/getManifestEntry.d.ts

@@ -1,6 +1,6 @@
 export { getManifestEntry };
 import type { ViteManifest, ViteManifestEntry } from '../../../shared/ViteManifest.js';
-declare function getManifestEntry(id: string, clientManifest: ViteManifest, manifestKeyMap: Record<string, string>): {
+declare function getManifestEntry(id: string, clientManifest: ViteManifest): {
     manifestKey: string;
     manifestEntry: ViteManifestEntry;
 };

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

@@ -2,7 +2,8 @@ export { getManifestEntry };
 import { assert, slice, isNpmPackageImport } from '../../utils.js';
 import { assertClientEntryId } from './assertClientEntryId.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
-function getManifestEntry(id, clientManifest, manifestKeyMap) {
+import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
+function getManifestEntry(id, clientManifest) {
     assertClientEntryId(id);
     const debugInfo = getDebugInfo(id, clientManifest);
     // Vike client entry
@@ -40,13 +41,11 @@ function getManifestEntry(id, clientManifest, manifestKeyMap) {
         assert(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
-    // extensions[number].pageConfigsDistFiles
+    // npm package import
     if (isNpmPackageImport(id)) {
-        const manifestKey = manifestKeyMap[id];
-        const debugInfo2 = { ...debugInfo, manifestKey };
-        assert(manifestKey, debugInfo2);
-        const manifestEntry = clientManifest[manifestKey];
-        assert(manifestEntry, debugInfo2);
+        const found = Object.entries(clientManifest).find(([, e]) => e.name === prependEntriesDir(id));
+        assert(found);
+        const [manifestKey, manifestEntry] = found;
         return { manifestEntry, manifestKey };
     }
     // extensions[number].pageConfigsSrcDir

package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.d.ts

@@ -1,4 +1,4 @@
 export { retrieveAssetsProd };
 import type { ViteManifest } from '../../../shared/ViteManifest.js';
 import type { ClientDependency } from '../../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
-declare function retrieveAssetsProd(clientDependencies: ClientDependency[], clientManifest: ViteManifest, includeAssetsImportedByServer: boolean, manifestKeyMap: Record<string, string>): string[];
+declare function retrieveAssetsProd(clientDependencies: ClientDependency[], clientManifest: ViteManifest, includeAssetsImportedByServer: boolean): string[];

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

@@ -2,7 +2,7 @@ export { retrieveAssetsProd };
 import { assert, isNpmPackageImport } from '../../utils.js';
 import { getManifestEntry } from './getManifestEntry.js';
 import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js';
-function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImportedByServer, manifestKeyMap) {
+function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImportedByServer) {
     let assetUrls = new Set();
     assert(clientManifest);
     const visistedAssets = new Set();
@@ -19,7 +19,7 @@ function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImp
                 id = extractAssetsAddQuery(id);
             }
         }
-        const { manifestKey } = getManifestEntry(id, clientManifest, manifestKeyMap);
+        const { manifestKey } = getManifestEntry(id, clientManifest);
         collectAssets(manifestKey, assetUrls, visistedAssets, clientManifest, onlyAssets);
     });
     collectSingleStyle(assetUrls, clientManifest);

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

@@ -1,5 +1,5 @@
 export { getPageAssets };
-import { assert, prependBase, assertPosixPath, toPosixPath, isNpmPackageImport, unique, isNotNullish, pathJoin } from '../utils.js';
+import { assert, prependBase, assertPosixPath, toPosixPath, isNpmPackageImport, unique, pathJoin } from '../utils.js';
 import { retrieveAssetsDev } from './getPageAssets/retrieveAssetsDev.js';
 import { retrieveAssetsProd } from './getPageAssets/retrieveAssetsProd.js';
 import { inferMediaType } from './inferMediaType.js';
@@ -14,15 +14,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 retrieveAssetsDev(clientDependencies, viteDevServer);
     }
     else {
-        const { pluginManifest, clientManifest } = globalContext;
-        const manifestKeyMap = pluginManifest.manifestKeyMap;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, clientManifest, manifestKeyMap));
-        assetUrls = retrieveAssetsProd(clientDependencies, clientManifest, pageContext._includeAssetsImportedByServer, manifestKeyMap);
+        const { clientManifest } = globalContext;
+        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, clientManifest));
+        assetUrls = retrieveAssetsProd(clientDependencies, clientManifest, pageContext._includeAssetsImportedByServer);
     }
     let pageAssets = [];
     unique([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -56,7 +55,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     sortPageAssetsForEarlyHintsHeader(pageAssets);
     return pageAssets;
 }
-async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
+async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     assertClientEntryId(clientEntry);
     let root = viteDevServer.config.root;
     assert(root);
@@ -77,7 +76,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         // User files
         filePath = pathJoin(root, clientEntry);
     }
-    else if (clientEntry.startsWith('@@vike/')) {
+    else if (clientEntry.startsWith('@@vike/') || isNpmPackageImport(clientEntry)) {
         // Vike client entry
         const { createRequire } = (await import_('module')).default;
         const { dirname } = (await import_('path')).default;
@@ -89,27 +88,23 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         // @ts-expect-error
         // Bun workaround https://github.com/vikejs/vike/pull/1048
         const res = typeof Bun !== 'undefined' ? (toPath) => Bun.resolveSync(toPath, __dirname_) : require_.resolve;
-        assert(clientEntry.endsWith('.js'));
-        try {
-            // For Vitest (which doesn't resolve vike to its dist but to its source files)
-            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/runtime/renderPage/getPageAssets.js
-            filePath = toPosixPath(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
+        if (isNpmPackageImport(clientEntry)) {
+            filePath = res(clientEntry);
         }
-        catch {
-            // For users
-            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/runtime/renderPage/getPageAssets.js
-            filePath = toPosixPath(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+        else {
+            assert(clientEntry.endsWith('.js'));
+            try {
+                // For Vitest (which doesn't resolve vike to its dist but to its source files)
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/runtime/renderPage/getPageAssets.js
+                filePath = toPosixPath(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
+            }
+            catch {
+                // For users
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/runtime/renderPage/getPageAssets.js
+                filePath = toPosixPath(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+            }
         }
     }
-    else if (isNpmPackageImport(clientEntry)) {
-        const extensionPageFile = configVike.extensions
-            .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-            .flat()
-            .filter(isNotNullish)
-            .find((e) => e.importPath === clientEntry);
-        assert(extensionPageFile, clientEntry);
-        filePath = extensionPageFile.filePath;
-    }
     else {
         assert(false);
     }
@@ -121,8 +116,8 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
     assertPosixPath(filePath);
     return filePath;
 }
-function resolveClientEntriesProd(clientEntry, clientManifest, manifestKeyMap) {
-    const { manifestEntry } = getManifestEntry(clientEntry, clientManifest, manifestKeyMap);
+function resolveClientEntriesProd(clientEntry, clientManifest) {
+    const { manifestEntry } = getManifestEntry(clientEntry, clientManifest);
     assert(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
     let { file } = manifestEntry;
     assert(!file.startsWith('/'));

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

@@ -6,7 +6,7 @@ export { getRenderContext };
 import { getErrorPageId } from '../../../shared/error-page.js';
 import { getHtmlString } from '../html/renderHtml.js';
 import { getPageFilesAll } from '../../../shared/getPageFiles.js';
-import { assert, assertUsage, assertWarning, hasProp, isNotNullish, objectAssign, unique } from '../utils.js';
+import { assert, assertUsage, hasProp, objectAssign } from '../utils.js';
 import { serializePageContextClientSide } from '../html/serializePageContextClientSide.js';
 import { addUrlComputedProps } from '../../../shared/addUrlComputedProps.js';
 import { getGlobalContext } from '../globalContext.js';
@@ -20,8 +20,8 @@ import { preparePageContextForUserConsumptionServerSide } from './preparePageCon
 import { executeGuardHook } from '../../../shared/route/executeGuardHook.js';
 import { loadPageRoutes } from '../../../shared/route/loadPageRoutes.js';
 import pc from '@brillout/picocolors';
-import { getConfigValueFilePathToShowToUser } from '../../../shared/page-configs/helpers.js';
 import { isServerSideError } from '../../../shared/misc/isServerSideError.js';
+import { assertV1Design } from '../../shared/assertV1Design.js';
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -151,7 +151,7 @@ async function getRenderContext() {
     const globalContext = getGlobalContext();
     const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = await getPageFilesAll(false, globalContext.isProduction);
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-    assertV1Design(pageFilesAll, pageConfigs);
+    assertV1Design(pageFilesAll.length > 0, pageConfigs, pageFilesAll);
     const renderContext = {
         pageFilesAll: pageFilesAll,
         pageConfigs,
@@ -162,24 +162,3 @@ async function getRenderContext() {
     };
     return renderContext;
 }
-function assertV1Design(pageFilesAll, pageConfigs) {
-    const isV1Design = pageConfigs.length !== 0;
-    const isDesignOld = pageFilesAll.length !== 0;
-    if (isV1Design && isDesignOld) {
-        const indent = '- ';
-        const v1Files = unique(pageConfigs
-            .map((p) => Object.values(p.configValues)
-            .map(getConfigValueFilePathToShowToUser)
-            .filter(isNotNullish)
-            .map((filePathToShowToUser) => indent + filePathToShowToUser))
-            .flat(2));
-        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'));
-    }
-    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/esm/node/runtime/utils.d.ts

@@ -30,7 +30,6 @@ export * from '../../utils/debug.js';
 export * from '../../utils/urlToFile.js';
 export * from '../../utils/getGlobalObject.js';
 export * from '../../shared/hooks/executeHook.js';
-export * from '../../utils/isStemPackageName.js';
 export * from '../../utils/freezePartial.js';
 export * from '../../utils/isNpmPackage.js';
 export * from '../../utils/isNotNullish.js';
@@ -42,7 +41,7 @@ export * from '../../utils/getFileExtension.js';
 export * from '../../utils/assertIsNotProductionRuntime.js';
 export * from '../../utils/virtual-files.js';
 export * from '../../utils/path-shim.js';
-export * from '../../utils/nodeEnv.js';
+export * from '../../utils/assertNodeEnv.js';
 export * from '../../utils/isHtml.js';
 export * from '../../utils/warnIfErrorIsNotObject.js';
 export * from '../../utils/stripAnsi.js';

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

@@ -33,7 +33,6 @@ export * from '../../utils/debug.js';
 export * from '../../utils/urlToFile.js';
 export * from '../../utils/getGlobalObject.js';
 export * from '../../shared/hooks/executeHook.js';
-export * from '../../utils/isStemPackageName.js';
 export * from '../../utils/freezePartial.js';
 export * from '../../utils/isNpmPackage.js';
 export * from '../../utils/isNotNullish.js';
@@ -45,7 +44,7 @@ export * from '../../utils/getFileExtension.js';
 export * from '../../utils/assertIsNotProductionRuntime.js';
 export * from '../../utils/virtual-files.js';
 export * from '../../utils/path-shim.js';
-export * from '../../utils/nodeEnv.js';
+export * from '../../utils/assertNodeEnv.js';
 export * from '../../utils/isHtml.js';
 export * from '../../utils/warnIfErrorIsNotObject.js';
 export * from '../../utils/stripAnsi.js';

package/dist/esm/node/shared/ViteManifest.d.ts

@@ -6,6 +6,7 @@ type ViteManifestEntry = {
     css?: string[];
     assets?: string[];
     isEntry?: boolean;
+    name?: string;
     isDynamicEntry?: boolean;
     imports?: string[];
     dynamicImports?: string[];

package/dist/esm/node/shared/assertPluginManifest.d.ts

@@ -6,7 +6,6 @@ type PluginManifest = {
     baseAssets: string | null;
     usesClientRouter: boolean;
     includeAssetsImportedByServer: boolean;
-    manifestKeyMap: Record<string, string>;
     redirects: Record<string, string>;
     trailingSlash: boolean;
     disableUrlNormalization: boolean;

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

@@ -1,21 +1,18 @@
 export { assertPluginManifest };
 import { assertRuntimeManifest } from './assertRuntimeManifest.js';
-import { assert, assertUsage, isPlainObject, projectInfo, checkType, hasProp, isStringRecord, objectAssign } from './utils.js';
+import { assert, assertUsage, isPlainObject, projectInfo, checkType, hasProp } from './utils.js';
 function assertPluginManifest(pluginManifest) {
     assert(isPlainObject(pluginManifest));
     assertUsage(pluginManifest.version === projectInfo.projectVersion, `Re-build your app (you're using vike@${projectInfo.projectVersion} but your app was built with vike@${pluginManifest.version})`);
     assertRuntimeManifest(pluginManifest);
     assert(hasProp(pluginManifest, 'usesClientRouter', 'boolean'));
     assert(hasProp(pluginManifest, 'version', 'string'));
-    assert(hasProp(pluginManifest, 'manifestKeyMap', 'object'));
-    const { manifestKeyMap } = pluginManifest;
-    assert(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 };
-    objectAssign(pluginManifestClone, { manifestKeyMap });
     checkType(pluginManifestClone);
 }

package/dist/esm/node/shared/assertV1Design.d.ts

@@ -0,0 +1,4 @@
+export { assertV1Design };
+import { PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigBuildTime, PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
+declare function assertV1Design(isOldDesign: boolean, pageConfigs: (PageConfigRuntime | PageConfigBuildTime)[], pageFilesAll?: PageFile[]): void;

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

@@ -0,0 +1,23 @@
+export { assertV1Design };
+import { getConfigValueFilePathToShowToUser } from '../../shared/page-configs/helpers.js';
+import { assert, assertUsage, assertWarning, isNotNullish, unique } from './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) {
+            assert(pageFilesAll.length > 0);
+            const indent = '- ';
+            const filesV1 = unique(pageConfigs
+                .map((p) => Object.values(p.configValues)
+                .map(getConfigValueFilePathToShowToUser)
+                .filter(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]);
+        }
+        assertUsage(false, lines.join('\n'));
+    }
+    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 });
+}

package/dist/esm/node/shared/getClientEntry.d.ts

@@ -0,0 +1,3 @@
+export { getClientEntry };
+import type { PageConfigRuntime, PageConfigBuildTime } from '../../shared/page-configs/PageConfig.js';
+declare function getClientEntry(pageConfig: PageConfigRuntime | PageConfigBuildTime): null | string;

package/dist/esm/node/shared/{getClientEntryFilePath.js → getClientEntry.js}

@@ -1,6 +1,6 @@
-export { getClientEntryFilePath };
+export { getClientEntry };
 import { getConfigValue } from '../../shared/page-configs/helpers.js';
-function getClientEntryFilePath(pageConfig) {
+function getClientEntry(pageConfig) {
     const configName = 'client';
     const configValue = getConfigValue(pageConfig, configName, 'string');
     if (!configValue)

package/dist/esm/node/shared/prependEntriesDir.d.ts

@@ -0,0 +1,2 @@
+export { prependEntriesDir };
+declare function prependEntriesDir(entryName: string): string;

package/dist/esm/node/shared/prependEntriesDir.js

@@ -0,0 +1,10 @@
+export { prependEntriesDir };
+import { assert } from './utils.js';
+function prependEntriesDir(entryName) {
+    if (entryName.startsWith('/')) {
+        entryName = entryName.slice(1);
+    }
+    assert(!entryName.startsWith('/'));
+    entryName = `entries/${entryName}`;
+    return entryName;
+}

package/dist/esm/node/shared/utils.d.ts

@@ -13,3 +13,5 @@ export * from '../../utils/parseUrl-extras.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/virtual-files.js';
 export * from '../../utils/assertIsNotBrowser.js';
+export * from '../../utils/isNotNullish.js';
+export * from '../../utils/unique.js';