vike 0.4.236-commit-eab75f6 → 0.4.237-commit-85e89b1

package/dist/cjs/client/runtime-client-routing/globalContext.js

@@ -37,8 +37,8 @@ exports.getGlobalContextClientInternal = void 0;
 const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
 const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
 // @ts-ignore
-const virtualFileExports = __importStar(require("virtual:vike:entry:client:client-routing"));
-const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExports, true, addGlobalContext);
+const virtualFileExportsGlobalEntry = __importStar(require("virtual:vike:global-entry:client:client-routing"));
+const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExportsGlobalEntry, true, addGlobalContext);
 exports.getGlobalContextClientInternal = getGlobalContextClientInternal;
 async function addGlobalContext(globalContext) {
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);

package/dist/cjs/client/runtime-server-routing/globalContext.js

@@ -36,6 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalContextClientInternal = void 0;
 const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
 // @ts-ignore
-const virtualFileExports = __importStar(require("virtual:vike:entry:client:server-routing"));
-const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExports, false);
+const virtualFileExportsGlobalEntry = __importStar(require("virtual:vike:global-entry:client:server-routing"));
+const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExportsGlobalEntry, false);
 exports.getGlobalContextClientInternal = getGlobalContextClientInternal;

package/dist/cjs/client/shared/createGetGlobalContextClient.js

@@ -13,25 +13,23 @@ const globalObject = (0, utils_js_1.getGlobalObject)('createGetGlobalContextClie
         globalContextInitialPromiseResolve,
     };
 })());
-function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGlobalContext) {
+function createGetGlobalContextClient(virtualFileExportsGlobalEntry, isClientRouting, addGlobalContext) {
     (0, utils_js_1.assert)(globalObject.isClientRouting === undefined || globalObject.isClientRouting === isClientRouting);
     globalObject.isClientRouting = isClientRouting;
     // Eagerly call onCreateGlobalContext() hook
     getGlobalContext();
     return getGlobalContext;
     async function getGlobalContext() {
-        // Cache
-        if (globalObject.virtualFileExports &&
-            // Don't break HMR
-            globalObject.virtualFileExports === virtualFileExports) {
+        // HMR => virtualFileExportsGlobalEntry differ
+        if (globalObject.virtualFileExportsGlobalEntry === virtualFileExportsGlobalEntry) {
             const globalContext = await globalObject.globalContextPromise;
             return globalContext;
         }
         else {
-            globalObject.virtualFileExports = virtualFileExports;
+            globalObject.virtualFileExportsGlobalEntry = virtualFileExportsGlobalEntry;
         }
         // Create
-        const globalContextPromise = (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, undefined, async (globalContext) => {
+        const globalContextPromise = (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExportsGlobalEntry, globalObject, undefined, async (globalContext) => {
             const globalContextAddendum = {
                 /**
                  * Whether the environment is client-side or server-side / pre-rendering.

package/dist/cjs/node/api/preview.js

@@ -21,7 +21,7 @@ async function preview(options = {}) {
     (0, utils_js_2.onSetupPreview)();
     const { viteConfigFromUserEnhanced, viteConfigResolved } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'preview');
     if (viteConfigResolved.vitePluginServerEntry?.inject) {
-        const outDir = (0, getOutDirs_js_1.getOutDirs)(viteConfigResolved).outDirRoot;
+        const outDir = (0, getOutDirs_js_1.getOutDirs)(viteConfigResolved, undefined).outDirRoot;
         const { outServerIndex } = await (0, runtime_1.importServerProductionIndex)({ outDir });
         const outServerIndexRelative = node_path_1.default.relative(viteConfigResolved.root, outServerIndex);
         (0, utils_js_1.assertWarning)(false, `Never run ${picocolors_1.default.cyan('$ vike preview')} in production, run ${picocolors_1.default.cyan(`$ node ${outServerIndexRelative}`)} instead (or Bun/Deno).`, { onlyOnce: true });

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

@@ -53,7 +53,7 @@ const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 const getPageContextRequestUrl_js_1 = require("../../shared/getPageContextRequestUrl.js");
 const resolveRouteString_js_1 = require("../../shared/route/resolveRouteString.js");
 const getConfigValueRuntime_js_1 = require("../../shared/page-configs/getConfigValueRuntime.js");
-const loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
+const loadPageEntry_js_1 = require("../../shared/page-configs/loadPageEntry.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const abort_js_1 = require("../../shared/route/abort.js");
 const loadPageConfigsLazyServerSide_js_1 = require("../runtime/renderPage/loadPageConfigsLazyServerSide.js");
@@ -82,7 +82,7 @@ async function runPrerender(options = {}, trigger) {
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'build', 'production');
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-    const { outDirServer } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
+    const { outDirServer } = (0, getOutDirs_js_1.getOutDirs)(viteConfig, undefined);
     const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
@@ -212,7 +212,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
     // V1 design
     await Promise.all(globalContext._pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
         const hookName = 'onBeforePrerenderStart';
-        const pageConfigLoaded = await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, false);
+        const pageConfigLoaded = await (0, loadPageEntry_js_1.loadPageEntry)(pageConfig, false);
         const hook = (0, getHook_js_1.getHookFromPageConfig)(pageConfigLoaded, hookName);
         if (!hook)
             return;
@@ -590,7 +590,7 @@ async function writeFiles({ pageContext, htmlString, pageContextSerialized }, vi
 async function write(pageContext, fileType, fileContent, viteConfig, onPagePrerender, prerenderContext, logLevel) {
     const { urlOriginal } = pageContext;
     (0, utils_js_1.assert)(urlOriginal.startsWith('/'));
-    const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
+    const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(viteConfig, undefined);
     const { root } = viteConfig;
     let fileUrl;
     if (fileType === 'HTML') {

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

@@ -28,16 +28,16 @@ exports.updateUserFiles = updateUserFiles;
 //  - setGlobalContext_isProduction => setGlobalContext_isProductionEnvironment
 //  - sProductionEnvironment => sDevEnv
 // The core logic revolves around:
-// - virtualFileExports is the main requirement
+// - virtualFileExportsGlobalEntry is the main requirement
 // - In production: globalObject.buildEntry which is the production entry set by @brillout/vite-plugin-server-entry
-//   - loadBuildEntry() sets globalObject.buildEntry and then sets virtualFileExports
+//   - loadBuildEntry() sets globalObject.buildEntry and then sets virtualFileExportsGlobalEntry
 //   - With vike-server it's set at server start: @brillout/vite-plugin-server-entry injects `import './entry.mjs'` (the production entry generated by @brillout/vite-plugin-server-entry) as first line of code of dist/server/index.mjs while dist/server/entry.mjs calls setGlobalContext_buildEntry()
 //   - Without vike-server it's manually loaded here using importServerProductionEntry() which uses @brillout/vite-plugin-server-entry's autoImporter or crawler
 // - In development: globalObject.viteDevServer which is Vite's development server
-//   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExports
+//   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExportsGlobalEntry
 const utils_js_1 = require("./utils.js");
 const runtime_1 = require("@brillout/vite-plugin-server-entry/runtime");
-const virtualFileEntry_js_1 = require("../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../shared/virtualFileId.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
 const assertV1Design_js_1 = require("../shared/assertV1Design.js");
@@ -163,15 +163,14 @@ function setGlobalContext_isPrerendering() {
     globalObject.isPrerendering = true;
     setIsProduction(true);
 }
-// TODO/now: `rename tolerateContraditction tolerateContradiction`
-function setGlobalContext_isProduction(isProduction, tolerateContraditction = false) {
+function setGlobalContext_isProduction(isProduction, tolerateContradiction = false) {
     if (debug.isActivated)
-        debug('setGlobalContext_isProduction()', { isProduction, tolerateContraditction });
+        debug('setGlobalContext_isProduction()', { isProduction, tolerateContradiction });
     if (globalObject.isProduction === undefined) {
         setIsProduction(isProduction);
     }
     else {
-        (0, utils_js_1.assert)(globalObject.isProduction === isProduction || tolerateContraditction);
+        (0, utils_js_1.assert)(globalObject.isProduction === isProduction || tolerateContradiction);
     }
 }
 function getViteDevServer() {
@@ -278,7 +277,7 @@ async function loadBuildEntry(outDir) {
     assertBuildEntry(buildEntry);
     globalObject.assetsManifest = buildEntry.assetsManifest;
     globalObject.buildInfo = buildEntry.buildInfo;
-    await createGlobalContext(buildEntry.virtualFileExports);
+    await createGlobalContext(buildEntry.virtualFileExportsGlobalEntry);
 }
 // This is the production entry, see:
 // https://github.com/vikejs/vike/blob/798e5465dc3e3e6723b38b601a50350c0a006fb8/packages/vike/node/vite/plugins/pluginBuild/pluginBuildEntry.ts#L47
@@ -295,15 +294,15 @@ async function setGlobalContext_buildEntry(buildEntry) {
 }
 function assertBuildEntry(buildEntry) {
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildEntry));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'virtualFileExports', 'object'));
-    const { virtualFileExports } = buildEntry;
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'virtualFileExportsGlobalEntry', 'object'));
+    const { virtualFileExportsGlobalEntry } = buildEntry;
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'assetsManifest', 'object'));
     const { assetsManifest } = buildEntry;
     assertViteManifest(assetsManifest);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'buildInfo', 'object'));
     const { buildInfo } = buildEntry;
     assertBuildInfo(buildInfo);
-    (0, utils_js_1.checkType)({ virtualFileExports, assetsManifest, buildInfo });
+    (0, utils_js_1.checkType)({ virtualFileExportsGlobalEntry, assetsManifest, buildInfo });
 }
 function assertBuildInfo(buildInfo) {
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildInfo));
@@ -357,15 +356,15 @@ async function updateUserFiles() {
         viteDevServer !== globalObject.viteDevServer;
     const { viteDevServer } = globalObject;
     let hasError = false;
-    let virtualFileExports;
+    let virtualFileExportsGlobalEntry;
     let err;
     if (viteDevServer) {
         (0, utils_js_1.assert)(isRunnable(viteDevServer));
         /* We don't use runner.import() yet, because as of vite@7.0.6 (July 2025) runner.import() unexpectedly invalidates the module graph, which is a unexpected behavior that doesn't happen with ssrLoadModule()
         // Vite 6
         try {
-          virtualFileExports = await (viteDevServer.environments.ssr as RunnableDevEnvironment).runner.import(
-            'virtual:vike:entry:server',
+          virtualFileExportsGlobalEntry = await (viteDevServer.environments.ssr as RunnableDevEnvironment).runner.import(
+            'virtual:vike:global-entry:server',
           )
         } catch (err_) {
           hasError = true
@@ -374,7 +373,7 @@ async function updateUserFiles() {
         */
         // Vite 5
         try {
-            virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileEntry_js_1.virtualFileIdEntryServer);
+            virtualFileExportsGlobalEntry = await viteDevServer.ssrLoadModule(virtualFileId_js_1.virtualFileIdGlobalEntryServer);
         }
         catch (err_) {
             hasError = true;
@@ -387,10 +386,10 @@ async function updateUserFiles() {
                ```js
                assert(false)
                // This line breaks the HMR of regular (runnable) apps, even though (as per the assert() above) it's never run. It seems to be a Vite bug: handleHotUpdate() receives an empty `modules` list.
-               import('virtual:vike:entry:server')
+               import('virtual:vike:global-entry:server')
                ```
             */
-            virtualFileExports = await __VIKE__DYNAMIC_IMPORT('virtual:vike:entry:server');
+            virtualFileExportsGlobalEntry = await __VIKE__DYNAMIC_IMPORT('virtual:vike:global-entry:server');
         }
         catch (err_) {
             hasError = true;
@@ -401,12 +400,12 @@ async function updateUserFiles() {
         return { success: false };
     if (hasError)
         return onError(err);
-    virtualFileExports = virtualFileExports.default || virtualFileExports;
+    virtualFileExportsGlobalEntry = virtualFileExportsGlobalEntry.default || virtualFileExportsGlobalEntry;
     if ((0, getVikeConfigError_js_1.getVikeConfigErrorBuild)()) {
         return { success: false };
     }
     try {
-        await createGlobalContext(virtualFileExports);
+        await createGlobalContext(virtualFileExportsGlobalEntry);
     }
     catch (err_) {
         hasError = true;
@@ -418,10 +417,10 @@ async function updateUserFiles() {
         return onError(err);
     return onSuccess();
 }
-async function createGlobalContext(virtualFileExports) {
+async function createGlobalContext(virtualFileExportsGlobalEntry) {
     debug('createGlobalContext()');
     (0, utils_js_1.assert)(!(0, getVikeConfigError_js_1.getVikeConfigErrorBuild)());
-    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
+    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
     (0, assertV1Design_js_1.assertV1Design)(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);

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

@@ -32,41 +32,24 @@ const passToClientBuiltInPageContext = [
 const pageToClientBuiltInPageContextError = ['pageProps', 'is404', isServerSideError_js_1.isServerSideError];
 function getPageContextClientSerialized(pageContext, isHtmlJsonScript) {
     const passToClientPageContext = getPassToClientPageContext(pageContext);
-    const getObj = (passToClientEntry) => {
-        if (passToClientEntry.once)
-            return undefined; // pass it to client-side globalContext
-        return { obj: pageContext, objName: 'pageContext' };
-    };
-    const res = applyPassToClient(passToClientPageContext, getObj);
+    const res = applyPassToClient(passToClientPageContext, pageContext);
     const pageContextClient = res.objClient;
     const pageContextClientProps = res.objClientProps;
     if (pageContextClientProps.some((prop) => (0, propKeys_js_1.getPropVal)(pageContext._pageContextInit, prop))) {
         pageContextClient[pageContextInitIsPassedToClient_js_1.pageContextInitIsPassedToClient] = true;
     }
-    const pageContextClientSerialized = serializeObject(pageContextClient, passToClientPageContext, getObj, isHtmlJsonScript);
+    const pageContextClientSerialized = serializeObject(pageContextClient, passToClientPageContext, 'pageContext', isHtmlJsonScript);
     return pageContextClientSerialized;
 }
 function getGlobalContextClientSerialized(pageContext, isHtmlJsonScript) {
     const passToClient = pageContext._passToClient;
     const globalContext = pageContext._globalContext;
-    const getObj = ({ prop, once }) => {
-        if (once && (0, propKeys_js_1.getPropVal)(pageContext, prop)) {
-            (0, utils_js_1.assert)(typeof pageContext.isClientSideNavigation === 'boolean');
-            if (!pageContext.isClientSideNavigation) {
-                return { obj: pageContext, objName: 'pageContext' }; // pass it to client-side globalContext
-            }
-            else {
-                return undefined; // already passed to client-side
-            }
-        }
-        return { obj: globalContext, objName: 'globalContext' };
-    };
-    const res = applyPassToClient(passToClient, getObj);
+    const res = applyPassToClient(passToClient, globalContext);
     const globalContextClient = res.objClient;
-    const globalContextClientSerialized = serializeObject(globalContextClient, passToClient, getObj, isHtmlJsonScript);
+    const globalContextClientSerialized = serializeObject(globalContextClient, passToClient, 'globalContext', isHtmlJsonScript);
     return globalContextClientSerialized;
 }
-function serializeObject(obj, passToClient, getObj, isHtmlJsonScript) {
+function serializeObject(obj, passToClient, objName, isHtmlJsonScript) {
     let serialized;
     try {
         serialized = serializeValue(obj, isHtmlJsonScript);
@@ -75,15 +58,11 @@ function serializeObject(obj, passToClient, getObj, isHtmlJsonScript) {
         const h = (s) => picocolors_1.default.cyan(s);
         let hasWarned = false;
         const propsNonSerializable = [];
-        passToClient.forEach((entry) => {
-            const entryNormalized = normalizePassToClientEntry(entry);
-            const { prop } = entryNormalized;
+        passToClient.forEach((prop) => {
             const res = (0, propKeys_js_1.getPropVal)(obj, prop);
             if (!res)
                 return;
             const { value } = res;
-            const { objName } = getObj(entryNormalized) ?? {};
-            (0, utils_js_1.assert)(objName);
             const varName = `${objName}${(0, propKeys_js_1.getPropKeys)(prop).map(utils_js_1.getPropAccessNotation).join('')}`;
             try {
                 serializeValue(value, isHtmlJsonScript, varName);
@@ -193,15 +172,10 @@ function getPageContextClientSerializedAbort(pageContext, isHtmlJsonScript) {
     }
     return serializeValue(pageContext, isHtmlJsonScript);
 }
-function applyPassToClient(passToClient, getObj) {
+function applyPassToClient(passToClient, obj) {
     const objClient = {};
     const objClientProps = [];
-    passToClient.forEach((entry) => {
-        const entryNormalized = normalizePassToClientEntry(entry);
-        const { prop } = entryNormalized;
-        const { obj } = getObj(entryNormalized) ?? {};
-        if (!obj)
-            return;
+    passToClient.forEach((prop) => {
         // Get value from pageContext
         const res = (0, propKeys_js_1.getPropVal)(obj, prop);
         if (!res)
@@ -213,16 +187,3 @@ function applyPassToClient(passToClient, getObj) {
     });
     return { objClient, objClientProps };
 }
-function normalizePassToClientEntry(entry) {
-    let once;
-    let prop;
-    if (typeof entry === 'string') {
-        prop = entry;
-        once = false;
-    }
-    else {
-        prop = entry.prop;
-        once = entry.once ?? false;
-    }
-    return { prop, once };
-}

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

@@ -527,8 +527,8 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const closeStream = async () => {
             if (isClosed)
                 return;
-            isClosed = true;
             await onEnd(isCancel);
+            isClosed = true;
             controllerProxy.close();
         };
         let controllerProxy;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.analyzePage = analyzePage;
 const determineClientEntry_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide/determineClientEntry.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
-const virtualFilePageConfigLazy_js_1 = require("../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+const virtualFileId_js_1 = require("../../shared/virtualFileId.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const getConfigValueRuntime_js_1 = require("../../../shared/page-configs/getConfigValueRuntime.js");
 async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
@@ -17,14 +17,14 @@ async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
             clientEntries.push((0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
-            id: (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageConfig.pageId, true),
+            id: (0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId: pageConfig.pageId, isForClientSide: true }),
             onlyAssets: isClientRuntimeLoaded ? false : true,
             eagerlyImported: false,
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
         if (!globalContext._isProduction) {
             clientDependencies.push({
-                id: (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageConfig.pageId, false),
+                id: (0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId: pageConfig.pageId, isForClientSide: false }),
                 onlyAssets: true,
                 eagerlyImported: false,
             });

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

@@ -5,12 +5,9 @@ exports.createPageContextServerSideWithoutGlobalContext = createPageContextServe
 const utils_js_1 = require("../utils.js");
 const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
 const createPageContextShared_js_1 = require("../../../shared/createPageContextShared.js");
-function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
-    urlHandler: null,
-    isClientSideNavigation: false,
-}, }) {
+function createPageContextServerSide(pageContextInit, globalContext, args) {
     (0, utils_js_1.assert)(pageContextInit.urlOriginal);
-    const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
+    const pageContextCreated = createPageContext(pageContextInit, args.isPrerendering);
     (0, utils_js_1.objectAssign)(pageContextCreated, {
         _globalContext: globalContext,
         _pageFilesAll: globalContext._pageFilesAll, // TO-DO/next-major-release: remove
@@ -19,8 +16,8 @@ function createPageContextServerSide(pageContextInit, globalContext, { isPrerend
         _baseAssets: globalContext.baseAssets,
         _pageContextInit: pageContextInit,
         _urlRewrite: null,
-        _urlHandler: urlHandler,
-        isClientSideNavigation,
+        _urlHandler: args.ssr?.urlHandler ?? null,
+        isClientSideNavigation: args.ssr?.isClientSideNavigation ?? false,
     });
     (0, utils_js_1.objectAssign)(pageContextCreated, globalContext._vikeConfigPublicGlobal);
     // pageContext.urlParsed

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getManifestEntry = getManifestEntry;
 const utils_js_1 = require("../../utils.js");
-const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 function getManifestEntry(id, assetsManifest) {
     const debugInfo = getDebugInfo(id, assetsManifest);
@@ -14,7 +14,8 @@ function getManifestEntry(id, assetsManifest) {
         return { manifestEntry, manifestKey };
     }
     // Page code importer
-    if ((0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(id)) {
+    const virtualFile = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+    if (virtualFile && virtualFile.type === 'page-entry') {
         {
             const manifestKey = id;
             const manifestEntry = assetsManifest[manifestKey];
@@ -24,9 +25,9 @@ function getManifestEntry(id, assetsManifest) {
         }
         // Workaround for what seems to be a Vite bug when process.cwd() !== config.root
         //  - Manifest key is:
-        //       ../../virtual:vike:pageConfigLazy:client:/pages/index
+        //       ../../virtual:vike:page-entry:client:/pages/index
         //    But it should be this instead:
-        //      virtual:vike:pageConfigLazy:client:/pages/index
+        //      virtual:vike:page-entry:client:/pages/index
         //  - This workaround was implemented to support Vitest running /tests/*
         //    - I don't know whether end users actually need this workaround? (I'm not sure what the bug actually is.)
         const manifestKeyEnd = id;

package/dist/cjs/node/runtime/renderPage/getPageAssets/{retrieveAssetsDev.js → retrievePageAssetsDev.js}

@@ -1,15 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.retrieveAssetsDev = retrieveAssetsDev;
+exports.retrievePageAssetsDev = retrievePageAssetsDev;
+exports.setGetClientEntrySrcDev = setGetClientEntrySrcDev;
 const utils_js_1 = require("../../utils.js");
-const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
-async function retrieveAssetsDev(clientDependencies, viteDevServer) {
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('getPageAssets/retrievePageAssetsDev.ts', {
+    // We cannot define getClientEntrySrcDev() in this file because it depends on utils/requireResolve.ts which isn't available in production
+    getClientEntrySrcDev: null,
+});
+async function retrievePageAssetsDev(viteDevServer, clientDependencies, clientEntries) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.getClientEntrySrcDev(clientEntry, viteDevServer));
+    const assetUrls = await getAssetUrls(clientDependencies, viteDevServer);
+    return { clientEntriesSrc, assetUrls };
+}
+function setGetClientEntrySrcDev(getClientEntrySrcDev) {
+    globalObject.getClientEntrySrcDev = getClientEntrySrcDev;
+}
+async function getAssetUrls(clientDependencies, viteDevServer) {
     const assetUrls = new Set();
     await Promise.all(clientDependencies.map(async ({ id }) => {
         if (id.startsWith('@@vike'))
             return; // vike doesn't have any CSS
         (0, utils_js_1.assert)(id);
-        (0, utils_js_1.assert)(!(0, virtualFileEntry_js_1.isVirtualFileIdEntry)(id));
+        const virtualFile = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+        (0, utils_js_1.assert)(!virtualFile || virtualFile.type !== 'global-entry');
         const { moduleGraph } = viteDevServer;
         const [_, graphId] = await moduleGraph.resolveUrl(id);
         (0, utils_js_1.assert)(graphId, { id });
@@ -36,8 +50,9 @@ function collectCss(mod, styleUrls, visitedModules, importer) {
     if (visitedModules.has(mod.url))
         return;
     visitedModules.add(mod.url);
-    if ((0, virtualFileEntry_js_1.isVirtualFileIdEntry)(mod.id || mod.url))
-        return; // virtual:vike:entry:server dependency list includes all pages
+    const virtualFile = (0, virtualFileId_js_1.parseVirtualFileId)(mod.id || mod.url);
+    if (virtualFile && virtualFile.type === 'global-entry')
+        return; // virtual:vike:global-entry:server dependency list includes all pages
     if (isStyle(mod) && (!importer || !isStyle(importer))) {
         if (mod.url.startsWith('/')) {
             styleUrls.add(mod.url);

package/dist/cjs/node/runtime/renderPage/getPageAssets/{retrieveAssetsProd.js → retrievePageAssetsProd.js}

@@ -1,10 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.retrieveAssetsProd = retrieveAssetsProd;
+exports.retrievePageAssetsProd = retrievePageAssetsProd;
+exports.resolveIncludeAssetsImportedByServer = resolveIncludeAssetsImportedByServer;
 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, assetsManifest, includeAssetsImportedByServer) {
+function retrievePageAssetsProd(assetsManifest, clientDependencies, clientEntries, config) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => getClientEntrySrcProd(clientEntry, assetsManifest));
+    const assetUrls = getAssetsUrl(clientDependencies, assetsManifest, config);
+    return { clientEntriesSrc, assetUrls };
+}
+function getClientEntrySrcProd(clientEntry, assetsManifest) {
+    const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, assetsManifest);
+    (0, utils_js_1.assert)(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
+    let { file } = manifestEntry;
+    (0, utils_js_1.assert)(!file.startsWith('/'));
+    return '/' + file;
+}
+function getAssetsUrl(clientDependencies, assetsManifest, config) {
+    const includeAssetsImportedByServer = resolveIncludeAssetsImportedByServer(config);
     let assetUrls = new Set();
     (0, utils_js_1.assert)(assetsManifest);
     const visistedAssets = new Set();
@@ -58,3 +72,6 @@ function collectSingleStyle(assetUrls, assetsManifest) {
         assetUrls.add(`/${style.file}`);
     }
 }
+function resolveIncludeAssetsImportedByServer(config) {
+    return config.includeAssetsImportedByServer ?? true;
+}

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

@@ -1,17 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageAssets = getPageAssets;
-exports.setResolveClientEntriesDev = setResolveClientEntriesDev;
-exports.resolveIncludeAssetsImportedByServer = resolveIncludeAssetsImportedByServer;
-const utils_js_1 = require("../utils.js");
-const retrieveAssetsDev_js_1 = require("./getPageAssets/retrieveAssetsDev.js");
-const retrieveAssetsProd_js_1 = require("./getPageAssets/retrieveAssetsProd.js");
+const retrievePageAssetsProd_js_1 = require("./getPageAssets/retrievePageAssetsProd.js");
+const retrievePageAssetsDev_js_1 = require("./getPageAssets/retrievePageAssetsDev.js");
 const inferMediaType_js_1 = require("./inferMediaType.js");
-const getManifestEntry_js_1 = require("./getPageAssets/getManifestEntry.js");
 const sortPageAssetsForEarlyHintsHeader_js_1 = require("./getPageAssets/sortPageAssetsForEarlyHintsHeader.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('renderPage/getPageAssets.ts', {
-    resolveClientEntriesDev: null,
-});
+const utils_js_1 = require("../utils.js");
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
     const { _isProduction: isProduction } = globalContext;
@@ -19,8 +13,8 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const { assetUrls, clientEntriesSrc } = isDev
         ? !globalContext._viteDevServer
             ? await (0, utils_js_1.getViteRPC)().retrievePageAssetsDevRPC(clientDependencies, clientEntries)
-            : await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
-        : retrievePageAssetsProd(globalContext.assetsManifest, clientDependencies, clientEntries, resolveIncludeAssetsImportedByServer(globalContext.config));
+            : await (0, retrievePageAssetsDev_js_1.retrievePageAssetsDev)(globalContext._viteDevServer, clientDependencies, clientEntries)
+        : (0, retrievePageAssetsProd_js_1.retrievePageAssetsProd)(globalContext.assetsManifest, clientDependencies, clientEntries, globalContext.config);
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
         const { mediaType = null, assetType = null } = (0, inferMediaType_js_1.inferMediaType)(src) || {};
@@ -54,26 +48,3 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     await (0, sortPageAssetsForEarlyHintsHeader_js_1.sortPageAssetsForEarlyHintsHeader)(pageAssets, isProduction);
     return pageAssets;
 }
-async function retrievePageAssetsDev(viteDevServer, clientDependencies, clientEntries) {
-    const clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
-    const assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
-    return { clientEntriesSrc, assetUrls };
-}
-function retrievePageAssetsProd(assetsManifest, clientDependencies, clientEntries, includeAssetsImportedByServer) {
-    const clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
-    const assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(includeAssetsImportedByServer));
-    return { clientEntriesSrc, assetUrls };
-}
-function resolveClientEntriesProd(clientEntry, assetsManifest) {
-    const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, assetsManifest);
-    (0, utils_js_1.assert)(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
-    let { file } = manifestEntry;
-    (0, utils_js_1.assert)(!file.startsWith('/'));
-    return '/' + file;
-}
-function setResolveClientEntriesDev(resolveClientEntriesDev) {
-    globalObject.resolveClientEntriesDev = resolveClientEntriesDev;
-}
-function resolveIncludeAssetsImportedByServer(config) {
-    return config.includeAssetsImportedByServer ?? true;
-}