vike 0.4.160 → 0.4.161-commit-0e9c635

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;
         }
@@ -157,8 +146,11 @@ function assertNodeEnv(hasViteDevServer) {
     const nodeEnv = (0, utils_js_1.getNodeEnv)();
     if (nodeEnv === null || nodeEnv === 'test')
         return;
-    const isDevNodeEnv = (0, utils_js_1.isNodeEnvDev)();
-    // - Calling Vite's createServer() is enough for hasViteDevServer to be true, even without actually adding Vite's development middleware to the server: https://github.com/vikejs/vike/issues/792#issuecomment-1516830759
-    // - We should change this to be a warning if it blocks users (e.g. if a bad-citizen tool sets a wrong process.env.NODE_ENV value).
-    (0, utils_js_1.assertUsage)(hasViteDevServer === isDevNodeEnv, `Vite's development server was${hasViteDevServer ? '' : "n't"} instantiated while the environment is set to be a ${isDevNodeEnv ? 'development' : 'production'} environment by ${picocolors_1.default.cyan(`process.env.NODE_ENV === ${JSON.stringify(nodeEnv)}`)} which is contradictory, see https://vike.dev/NODE_ENV`);
+    const isDev = (0, utils_js_1.isNodeEnvDev)();
+    // Calling Vite's createServer() is enough for hasViteDevServer to be true, even without actually adding Vite's development middleware to the server: https://github.com/vikejs/vike/issues/792#issuecomment-1516830759
+    if (hasViteDevServer === isDev)
+        return;
+    const nodeEnvDesc = (0, utils_js_1.getNodeEnvDesc)();
+    // We should change this to be a warning if it blocks users (e.g. if a bad-citizen tool sets a wrong process.env.NODE_ENV value)
+    (0, utils_js_1.assertUsage)(false, `Vite's development server was${hasViteDevServer ? '' : "n't"} instantiated while the ${nodeEnvDesc} which is contradictory, see https://vike.dev/NODE_ENV`);
 }

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -90,8 +90,8 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     // See https://github.com/vikejs/vike/pull/1271
     const positionJavaScriptEntry = (() => {
         if (pageContext._pageContextPromise) {
-            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time as progressive hydration won't work", { onlyOnce: true });
-            // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/stream#initial-data-after-stream-end
+            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time, because progressive hydration won't work.", { onlyOnce: true });
+            // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/streaming#initial-data-after-stream-end
             return 'HTML_END';
         }
         if (injectToStream) {

package/dist/cjs/node/runtime/html/renderHtml.js

@@ -186,7 +186,7 @@ async function renderTemplate(templateContent, pageContext) {
             const varType = typeof templateVar;
             const streamNote = ['boolean', 'number', 'bigint', 'symbol'].includes(varType)
                 ? null
-                : '(See https://vike.dev/stream for HTML streaming.)';
+                : '(See https://vike.dev/streaming for HTML streaming.)';
             (0, utils_js_1.assertUsage)(varType === 'string', getErrMsg(picocolors_1.default.cyan(`typeof htmlVar === "${varType}"`), streamNote));
         }
         {

package/dist/cjs/node/runtime/html/stream.js

@@ -631,7 +631,7 @@ exports.isStream = isStream;
 const __streamPipeWeb = '__streamPipeWeb';
 /** @deprecated */
 function pipeWebStream(pipe) {
-    (0, utils_js_1.assertWarning)(false, 'pipeWebStream() is outdated, use stampPipe() instead. See https://vike.dev/stream', {
+    (0, utils_js_1.assertWarning)(false, 'pipeWebStream() is outdated, use stampPipe() instead. See https://vike.dev/streaming', {
         onlyOnce: true,
         showStackTrace: true
     });
@@ -668,7 +668,7 @@ exports.isStreamPipeWeb = isStreamPipeWeb;
 const __streamPipeNode = '__streamPipeNode';
 /** @deprecated */
 function pipeNodeStream(pipe) {
-    (0, utils_js_1.assertWarning)(false, 'pipeNodeStream() is outdated, use stampPipe() instead. See https://vike.dev/stream', {
+    (0, utils_js_1.assertWarning)(false, 'pipeNodeStream() is outdated, use stampPipe() instead. See https://vike.dev/streaming', {
         onlyOnce: true,
         showStackTrace: true
     });

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/executeOnRenderHtmlHook.js

@@ -125,11 +125,11 @@ function processHookReturnValue(hookReturnValue, renderHook) {
         const val = hookReturnValue.pageContext;
         const errBegin = `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext }')}, but ${picocolors_1.default.cyan('pageContext')}`;
         if ((0, utils_js_1.isPromise)(val) || (0, utils_js_1.isCallable)(val)) {
-            (0, utils_js_1.assertWarning)(!(0, utils_js_1.isPromise)(val), `${errBegin} is a promise which is deprecated in favor of async functions, see https://vike.dev/stream#initial-data-after-stream-end`, { onlyOnce: true });
+            (0, utils_js_1.assertWarning)(!(0, utils_js_1.isPromise)(val), `${errBegin} is a promise which is deprecated in favor of async functions, see https://vike.dev/streaming#initial-data-after-stream-end`, { onlyOnce: true });
             pageContextPromise = val;
         }
         else {
-            (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(val), `${errBegin} should be an object or an async function, see https://vike.dev/stream#initial-data-after-stream-end`);
+            (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(val), `${errBegin} should be an object or an async function, see https://vike.dev/streaming#initial-data-after-stream-end`);
             (0, assertPageContextProvidedByUser_js_1.assertPageContextProvidedByUser)(val, renderHook);
             pageContextProvidedByRenderHook = val;
         }

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

@@ -8,7 +8,7 @@ const stream_js_1 = require("../html/stream.js");
 const utils_js_1 = require("../utils.js");
 const renderHtml_js_1 = require("../html/renderHtml.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const streamDocs = 'See https://vike.dev/stream for more information.';
+const streamDocs = 'See https://vike.dev/streaming for more information.';
 function getHttpResponseBody(htmlRender, renderHook) {
     if (typeof htmlRender !== 'string') {
         (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'body', `Use ${picocolors_1.default.cyan('pageContext.httpResponse.pipe()')} instead`));
@@ -19,6 +19,44 @@ function getHttpResponseBody(htmlRender, renderHook) {
 exports.getHttpResponseBody = getHttpResponseBody;
 function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
     return {
+        pipe(writable) {
+            const getErrMsgMixingStreamTypes = (writableType) => `The ${getErrMsgBody(htmlRender, renderHook)} while a ${writableType} was passed to pageContext.httpResponse.pipe() which is contradictory. You cannot mix a Web Stream with a Node.js Stream.`;
+            if ((0, stream_js_1.isStreamWritableWeb)(writable)) {
+                const success = (0, stream_js_1.pipeToStreamWritableWeb)(htmlRender, writable);
+                if (success) {
+                    return;
+                }
+                else {
+                    (0, utils_js_1.assert)((0, stream_js_1.isStreamReadableNode)(htmlRender) || (0, stream_js_1.isStreamPipeNode)(htmlRender));
+                    (0, utils_js_1.assertUsage)(false, getErrMsgMixingStreamTypes('Web Writable'));
+                }
+            }
+            if ((0, stream_js_1.isStreamWritableNode)(writable)) {
+                const success = (0, stream_js_1.pipeToStreamWritableNode)(htmlRender, writable);
+                if (success) {
+                    return;
+                }
+                else {
+                    (0, utils_js_1.assert)((0, stream_js_1.isStreamReadableWeb)(htmlRender) || (0, stream_js_1.isStreamPipeWeb)(htmlRender));
+                    (0, utils_js_1.assertUsage)(false, getErrMsgMixingStreamTypes('Node.js Writable'));
+                }
+            }
+            (0, utils_js_1.assertUsage)(false, `The argument ${picocolors_1.default.cyan('writable')} passed to ${picocolors_1.default.cyan('pageContext.httpResponse.pipe(writable)')} doesn't seem to be ${(0, stream_js_1.getStreamName)('writable', 'web')} nor ${(0, stream_js_1.getStreamName)('writable', 'node')}.`);
+        },
+        getReadableWebStream() {
+            const webStream = (0, stream_js_1.getStreamReadableWeb)(htmlRender);
+            if (webStream === null) {
+                (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'getReadableWebStream()', getFixMsg('readable', 'web')));
+            }
+            return webStream;
+        },
+        async getReadableNodeStream() {
+            const nodeStream = await (0, stream_js_1.getStreamReadableNode)(htmlRender);
+            if (nodeStream === null) {
+                (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'getReadableNodeStream()', getFixMsg('readable', 'node')));
+            }
+            return nodeStream;
+        },
         async getBody() {
             const body = await (0, renderHtml_js_1.getHtmlString)(htmlRender);
             return body;
@@ -43,20 +81,6 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
             return webStream;
         },
-        async getReadableNodeStream() {
-            const nodeStream = await (0, stream_js_1.getStreamReadableNode)(htmlRender);
-            if (nodeStream === null) {
-                (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'getReadableNodeStream()', getFixMsg('readable', 'node')));
-            }
-            return nodeStream;
-        },
-        getReadableWebStream() {
-            const webStream = (0, stream_js_1.getStreamReadableWeb)(htmlRender);
-            if (webStream === null) {
-                (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'getReadableWebStream()', getFixMsg('readable', 'web')));
-            }
-            return webStream;
-        },
         // TODO/v1-release: remove
         pipeToWebWritable(writable) {
             (0, utils_js_1.assertWarning)(false, '`pageContext.httpResponse.pipeToWebWritable(res)` is outdated, use `pageContext.httpResponse.pipe(res)` instead. ' +
@@ -74,30 +98,6 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             if (!success) {
                 (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'pipeToNodeWritable()'));
             }
-        },
-        pipe(writable) {
-            const getErrMsgMixingStreamTypes = (writableType) => `The ${getErrMsgBody(htmlRender, renderHook)} while a ${writableType} was passed to pageContext.httpResponse.pipe() which is contradictory. You cannot mix a Web Stream with a Node.js Stream.`;
-            if ((0, stream_js_1.isStreamWritableWeb)(writable)) {
-                const success = (0, stream_js_1.pipeToStreamWritableWeb)(htmlRender, writable);
-                if (success) {
-                    return;
-                }
-                else {
-                    (0, utils_js_1.assert)((0, stream_js_1.isStreamReadableNode)(htmlRender) || (0, stream_js_1.isStreamPipeNode)(htmlRender));
-                    (0, utils_js_1.assertUsage)(false, getErrMsgMixingStreamTypes('Web Writable'));
-                }
-            }
-            if ((0, stream_js_1.isStreamWritableNode)(writable)) {
-                const success = (0, stream_js_1.pipeToStreamWritableNode)(htmlRender, writable);
-                if (success) {
-                    return;
-                }
-                else {
-                    (0, utils_js_1.assert)((0, stream_js_1.isStreamReadableWeb)(htmlRender) || (0, stream_js_1.isStreamPipeWeb)(htmlRender));
-                    (0, utils_js_1.assertUsage)(false, getErrMsgMixingStreamTypes('Node.js Writable'));
-                }
-            }
-            (0, utils_js_1.assertUsage)(false, `The argument ${picocolors_1.default.cyan('writable')} passed to ${picocolors_1.default.cyan('pageContext.httpResponse.pipe(writable)')} doesn't seem to be ${(0, stream_js_1.getStreamName)('writable', 'web')} nor ${(0, stream_js_1.getStreamName)('writable', 'node')}.`);
         }
     };
     function getFixMsg(type, standard) {

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

@@ -1,7 +1,6 @@
 "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) {
@@ -17,9 +16,5 @@ function assertClientEntryId(id) {
         (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);
-    }
 }
 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/loadUserFilesServerSide.js

@@ -44,7 +44,7 @@ async function loadUserFilesServerSide(pageContext) {
     // TODO/v1-release: remove
     Object.assign(pageContextAddendum, {
         _getPageAssets: async () => {
-            (0, utils_js_1.assertWarning)(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preload', {
+            (0, utils_js_1.assertWarning)(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preloading', {
                 onlyOnce: true,
                 showStackTrace: true
             });