vike 0.4.161 → 0.4.162-commit-49fe40c

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

@@ -15,7 +15,6 @@ const loggerNotProd_js_1 = require("../../../shared/loggerNotProd.js");
 const removeSuperfluousViteLog_js_1 = require("../../../shared/loggerVite/removeSuperfluousViteLog.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const helpers_js_1 = require("../../../../../shared/page-configs/helpers.js");
-const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
 const crawlPlusFiles_js_1 = require("./getVikeConfig/crawlPlusFiles.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
@@ -28,10 +27,10 @@ let wasConfigInvalid = null;
 let vikeConfigPromise = null;
 const vikeConfigDependencies = new Set();
 exports.vikeConfigDependencies = vikeConfigDependencies;
-function reloadVikeConfig(userRootDir, outDirRoot, extensions) {
+function reloadVikeConfig(userRootDir, outDirRoot) {
     vikeConfigDependencies.clear();
     (0, resolveImportPath_js_1.clearFilesEnvMap)();
-    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, true, extensions, true);
+    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, true, true);
     handleReloadSideEffects();
 }
 exports.reloadVikeConfig = reloadVikeConfig;
@@ -66,22 +65,24 @@ async function handleReloadSideEffects() {
         }
     }
 }
-async function getVikeConfig(config, isDev, tolerateInvalidConfig = false, extensions) {
+async function getVikeConfig(config, isDev, tolerateInvalidConfig = false) {
     const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
     const userRootDir = config.root;
     if (!vikeConfigPromise) {
-        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, extensions ?? (await (0, getConfigVike_js_1.getConfigVike)(config)).extensions, tolerateInvalidConfig);
+        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, tolerateInvalidConfig);
     }
     return await vikeConfigPromise;
 }
 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;
-async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
-    const plusFiles = await findPlusFiles(userRootDir, outDirRoot, isDev, extensions);
+async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
+    const plusFiles = await findPlusFiles(userRootDir, outDirRoot, isDev);
     const configFiles = [];
     const valueFiles = [];
     plusFiles.forEach((f) => {
@@ -107,14 +108,14 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
             extendsConfigs.forEach((extendsConfig) => {
                 /* We purposely use the same locationId because the Vike extension's config should only apply to where it's being extended from, for example:
                 ```js
-                // /pages/admin/+config.h.js
+                // /pages/admin/+config.js
         
                 import vikeVue from 'vike-vue/config'
                 // Should only apply to /pages/admin/**
                 export default { extends: [vikeVue] }
                 ```
                 ```js
-                // /pages/marketing/+config.h.js
+                // /pages/marketing/+config.js
         
                 import vikeReact from 'vike-react/config'
                 // Should only apply to /pages/marketing/**
@@ -122,6 +123,28 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
                 ```
                 */
                 const interfaceFile = getInterfaceFileFromConfigFile(extendsConfig, true, locationId);
+                {
+                    const alreadyMigrated = [
+                        'vike-react',
+                        'vike-react-query',
+                        'vike-react-zustand',
+                        'vike-vue',
+                        'vike-pinia',
+                        'vike-solid'
+                    ];
+                    const extensionName = extendsConfig.filePath.importPathAbsolute.split('/')[0];
+                    const warnMsg = alreadyMigrated.includes(extensionName)
+                        ? `You're using a deprecated version of the Vike extension ${extensionName}, update ${extensionName} to its latest version.`
+                        : `The config of the Vike extension ${extensionName} should set a ${picocolors_1.default.cyan('name')} value`;
+                    const isNameDefined = interfaceFile.fileExportsByConfigName.name?.configValue;
+                    if (alreadyMigrated) {
+                        // Eventually always make it a assertUsage()
+                        (0, utils_js_1.assertWarning)(isNameDefined, warnMsg, { onlyOnce: true });
+                    }
+                    else {
+                        (0, utils_js_1.assertUsage)(isNameDefined, warnMsg);
+                    }
+                }
                 interfaceFilesByLocationId[locationId].push(interfaceFile);
             });
         }),
@@ -189,12 +212,12 @@ function assertAllConfigsAreKnown(interfaceFilesByLocationId) {
         });
     });
 }
-async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, extensions, tolerateInvalidConfig) {
+async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, tolerateInvalidConfig) {
     let hasError = false;
     let ret;
     let err;
     try {
-        ret = await loadVikeConfig(userRootDir, outDirRoot, isDev, extensions);
+        ret = await loadVikeConfig(userRootDir, outDirRoot, isDev);
     }
     catch (err_) {
         hasError = true;
@@ -230,8 +253,8 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
         }
     }
 }
-async function loadVikeConfig(userRootDir, outDirRoot, isDev, extensions) {
-    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions);
+async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
+    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, outDirRoot, isDev);
     const importedFilesLoaded = {};
     const { globalVikeConfig, pageConfigGlobal } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded);
     const pageConfigs = await Promise.all((0, utils_js_1.objectEntries)(interfaceFilesByLocationId)
@@ -406,7 +429,7 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
             // Make this value:
             //   /pages/some-page/+{configName}.js > `export default`
             // override that value:
-            //   /pages/some-page/+config.h.js > `export default { someConfig }`
+            //   /pages/some-page/+config.js > `export default { someConfig }`
             const interfaceFileWinner = interfaceValueFile ?? interfaceConfigFile;
             if (interfaceFileWinner) {
                 const interfaceFilesOverriden = [...interfaceValueFiles, ...interfaceConfigFiles].filter((f) => f !== interfaceFileWinner);
@@ -714,26 +737,9 @@ function getComputed(configValueSources, configDefinitions) {
     });
     return configValuesComputed;
 }
-async function findPlusFiles(userRootDir, outDirRoot, isDev, extensions) {
+async function findPlusFiles(userRootDir, outDirRoot, isDev) {
     const files = await (0, crawlPlusFiles_js_1.crawlPlusFiles)(userRootDir, outDirRoot, isDev);
     const plusFiles = files.map(({ filePathRelativeToUserRootDir }) => (0, resolveFilePath_js_1.resolveFilePathRelativeToUserRootDir)(filePathRelativeToUserRootDir, userRootDir));
-    // TODO/v1-release: remove
-    extensions.forEach((extension) => {
-        extension.pageConfigsDistFiles?.forEach((pageConfigDistFile) => {
-            if (!pageConfigDistFile.importPath.includes('+'))
-                return;
-            (0, utils_js_1.assert)(pageConfigDistFile.importPath.includes('+'));
-            (0, utils_js_1.assert)(path_1.default.posix.basename(pageConfigDistFile.importPath).startsWith('+'));
-            const { importPath, filePath } = pageConfigDistFile;
-            plusFiles.push({
-                filePathRelativeToUserRootDir: null,
-                filePathAbsoluteVite: importPath,
-                filePathAbsoluteFilesystem: filePath,
-                filePathToShowToUser: importPath,
-                importPathAbsolute: importPath
-            });
-        });
-    });
     return plusFiles;
 }
 function getConfigName(filePath) {

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/plugin/utils.js

@@ -23,7 +23,6 @@ __exportStar(require("../runtime/utils.js"), exports);
 // Utils only needed by `plugin/*`
 __exportStar(require("../../utils/viteIsSSR.js"), exports);
 __exportStar(require("../../utils/getFilePathAbsolute.js"), exports);
-__exportStar(require("../../utils/getDependencyPackageJson.js"), exports);
 __exportStar(require("../../utils/requireResolve.js"), exports);
 __exportStar(require("../../utils/arrayIncludes.js"), exports);
 __exportStar(require("../../utils/isDev.js"), exports);

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);
@@ -557,7 +558,7 @@ function warnMissingPages(prerenderedPageContexts, doNotPrerenderList, renderCon
         .filter((pageId) => !(0, error_page_js_1.isErrorPage)(pageId, renderContext.pageConfigs))
         .forEach((pageId) => {
         const pageAt = isV1 ? pageId : `\`${pageId}.page.*\``;
-        (0, utils_js_1.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 });
+        (0, utils_js_1.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) {
@@ -673,7 +674,7 @@ function checkOutdatedOptions(options) {
     (0, utils_js_1.assertUsage)(options.root === undefined, 'Option `prerender({ root })` deprecated: set `prerender({ viteConfig: { root }})` instead.', { showStackTrace: true });
     (0, utils_js_1.assertUsage)(options.configFile === undefined, 'Option `prerender({ configFile })` deprecated: set `prerender({ viteConfig: { configFile }})` instead.', { showStackTrace: true });
     ['noExtraDir', 'partial', 'parallel'].forEach((prop) => {
-        (0, utils_js_1.assertUsage)(options[prop] === undefined, `[prerender()] Option ${picocolors_1.default.cyan(prop)} is deprecated. Define ${picocolors_1.default.cyan(prop)} in vite.config.js instead. See https://vike.dev/prerender-config`, { showStackTrace: true });
+        (0, utils_js_1.assertUsage)(options[prop] === undefined, `[prerender()] Option ${picocolors_1.default.cyan(prop)} is deprecated. Define ${picocolors_1.default.cyan(prop)} in vite.config.js instead. See https://vike.dev/prerender`, { showStackTrace: true });
     });
     ['base', 'outDir'].forEach((prop) => {
         (0, utils_js_1.assertWarning)(options[prop] === undefined, `[prerender()] Option ${picocolors_1.default.cyan(prop)} is outdated and has no effect (vike now automatically determines ${picocolors_1.default.cyan(prop)})`, {

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

@@ -28,4 +28,4 @@ __exportStar(require("../../utils/filesystemPathHandling.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../shared/hooks/executeHook.js"), exports);
 __exportStar(require("../../utils/isPlainObject.js"), exports);
-__exportStar(require("../../utils/nodeEnv.js"), exports);
+__exportStar(require("../../utils/assertNodeEnv.js"), exports);

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/html/serializePageContextClientSide.js

@@ -105,6 +105,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/cjs/node/runtime/renderPage/analyzePage.js

@@ -6,11 +6,11 @@ const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyze
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const globalContext_js_1 = require("../globalContext.js");
-const getClientEntryFilePath_js_1 = require("../../shared/getClientEntryFilePath.js");
+const getClientEntry_js_1 = require("../../shared/getClientEntry.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientSideRenderable, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
-        const clientFilePath = (0, getClientEntryFilePath_js_1.getClientEntryFilePath)(pageConfig);
+        const clientFilePath = (0, getClientEntry_js_1.getClientEntry)(pageConfig);
         const clientEntry = !isClientSideRenderable ? clientFilePath : (0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting);
         const clientDependencies = [];
         clientDependencies.push({

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

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertClientEntryId = void 0;
-const globalContext_js_1 = require("../../globalContext.js");
 const utils_js_1 = require("../../utils.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 function assertClientEntryId(id) {
     (0, utils_js_1.assertPosixPath)(id);
     (0, utils_js_1.assert)(!id.startsWith('/@fs'), id);
-    const isPkg = (0, utils_js_1.isNpmPackageImport)(id);
     (0, utils_js_1.assert)(
     // Client entry
     id.startsWith('@@vike/') ||
@@ -15,11 +13,7 @@ function assertClientEntryId(id) {
         id.startsWith('/') ||
         // Page code importer
         (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id) ||
-        // Stem packages
-        isPkg, id);
-    if (isPkg) {
-        const { configVike } = (0, globalContext_js_1.getGlobalContext)();
-        (0, utils_js_1.assert)(configVike === null || configVike.extensions.some(({ npmPackageName }) => id.startsWith(npmPackageName)), id);
-    }
+        // Import
+        (0, utils_js_1.isNpmPackageImport)(id), id);
 }
 exports.assertClientEntryId = assertClientEntryId;

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

@@ -4,7 +4,8 @@ exports.getManifestEntry = void 0;
 const utils_js_1 = require("../../utils.js");
 const assertClientEntryId_js_1 = require("./assertClientEntryId.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-function getManifestEntry(id, clientManifest, manifestKeyMap) {
+const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
+function getManifestEntry(id, clientManifest) {
     (0, assertClientEntryId_js_1.assertClientEntryId)(id);
     const debugInfo = getDebugInfo(id, clientManifest);
     // Vike client entry
@@ -42,13 +43,11 @@ function getManifestEntry(id, clientManifest, manifestKeyMap) {
         (0, utils_js_1.assert)(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
-    // extensions[number].pageConfigsDistFiles
+    // npm package import
     if ((0, utils_js_1.isNpmPackageImport)(id)) {
-        const manifestKey = manifestKeyMap[id];
-        const debugInfo2 = { ...debugInfo, manifestKey };
-        (0, utils_js_1.assert)(manifestKey, debugInfo2);
-        const manifestEntry = clientManifest[manifestKey];
-        (0, utils_js_1.assert)(manifestEntry, debugInfo2);
+        const found = Object.entries(clientManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
+        (0, utils_js_1.assert)(found);
+        const [manifestKey, manifestEntry] = found;
         return { manifestEntry, manifestKey };
     }
     // extensions[number].pageConfigsSrcDir

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);
@@ -80,7 +79,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         // User files
         filePath = (0, utils_js_1.pathJoin)(root, clientEntry);
     }
-    else if (clientEntry.startsWith('@@vike/')) {
+    else if (clientEntry.startsWith('@@vike/') || (0, utils_js_1.isNpmPackageImport)(clientEntry)) {
         // Vike client entry
         const { createRequire } = (await (0, import_1.import_)('module')).default;
         const { dirname } = (await (0, import_1.import_)('path')).default;
@@ -92,27 +91,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;
-        (0, utils_js_1.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 = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
+        if ((0, utils_js_1.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 = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+        else {
+            (0, utils_js_1.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 = (0, utils_js_1.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 = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+            }
         }
     }
-    else if ((0, utils_js_1.isNpmPackageImport)(clientEntry)) {
-        const extensionPageFile = configVike.extensions
-            .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-            .flat()
-            .filter(utils_js_1.isNotNullish)
-            .find((e) => e.importPath === clientEntry);
-        (0, utils_js_1.assert)(extensionPageFile, clientEntry);
-        filePath = extensionPageFile.filePath;
-    }
     else {
         (0, utils_js_1.assert)(false);
     }
@@ -124,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/runtime/utils.js

@@ -49,7 +49,6 @@ __exportStar(require("../../utils/debug.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
 __exportStar(require("../../shared/hooks/executeHook.js"), exports);
-__exportStar(require("../../utils/isStemPackageName.js"), exports);
 __exportStar(require("../../utils/freezePartial.js"), exports);
 __exportStar(require("../../utils/isNpmPackage.js"), exports);
 __exportStar(require("../../utils/isNotNullish.js"), exports);
@@ -61,7 +60,7 @@ __exportStar(require("../../utils/getFileExtension.js"), exports);
 __exportStar(require("../../utils/assertIsNotProductionRuntime.js"), exports);
 __exportStar(require("../../utils/virtual-files.js"), exports);
 __exportStar(require("../../utils/path-shim.js"), exports);
-__exportStar(require("../../utils/nodeEnv.js"), exports);
+__exportStar(require("../../utils/assertNodeEnv.js"), exports);
 __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);

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;