vike 0.4.237 → 0.4.238-commit-5762291

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

@@ -58,17 +58,7 @@ function getRenderHook(pageContext) {
     }
     if (!hookFound) {
         const hookName = pageContext._globalContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
-        (0, utils_js_1.assertUsage)(false, [
-            `No ${hookName}() hook found, see https://vike.dev/${hookName}`,
-            /*
-            'See https://vike.dev/render-modes for more information.',
-            [
-              // 'Loaded config files (none of them define the onRenderHtml() hook):',
-              'Loaded server-side page files (none of them `export { render }`):',
-              ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
-            ].join('\n')
-            */
-        ].join(' '));
+        (0, utils_js_1.assertUsage)(false, `No ${hookName}() hook found, see https://vike.dev/${hookName}`);
     }
     return hookFound;
 }

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;
-}

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

@@ -1,45 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPageConfigsLazyServerSideAndExecHook = loadPageConfigsLazyServerSideAndExecHook;
+exports.loadPageConfigsLazyServerSide = loadPageConfigsLazyServerSide;
 const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
 const resolveVikeConfigPublic_js_1 = require("../../../shared/page-configs/resolveVikeConfigPublic.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
 const utils_js_1 = require("../utils.js");
 const getPageAssets_js_1 = require("./getPageAssets.js");
-const debugPageFiles_js_1 = require("./debugPageFiles.js");
 const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig.js");
 const analyzePage_js_1 = require("./analyzePage.js");
-const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
+const loadAndParseVirtualFilePageEntry_js_1 = require("../../../shared/page-configs/loadAndParseVirtualFilePageEntry.js");
 const execHookServer_js_1 = require("./execHookServer.js");
 const getCacheControl_js_1 = require("./getCacheControl.js");
-async function loadPageConfigsLazyServerSideAndExecHook(pageContext) {
-    const pageContextAddendum = await loadPageConfigsLazyServerSide(pageContext);
-    (0, utils_js_1.objectAssign)(pageContext, pageContextAddendum);
+const csp_js_1 = require("../csp.js");
+async function loadPageConfigsLazyServerSide(pageContext) {
+    (0, utils_js_1.objectAssign)(pageContext, {
+        _pageConfig: (0, findPageConfig_js_1.findPageConfig)(pageContext._globalContext._pageConfigs, pageContext.pageId),
+    });
+    // Load the page's + files
+    (0, utils_js_1.updateType)(pageContext, await loadPageUserFiles(pageContext));
+    // Resolve new computed pageContext properties
+    (0, utils_js_1.updateType)(pageContext, await resolvePageContext(pageContext));
+    // Execute +onCreatePageContext
     await (0, execHookServer_js_1.execHookServer)('onCreatePageContext', pageContext);
     return pageContext;
 }
-// TODO/now: define new function resolveAfterLoad() ?
-async function loadPageConfigsLazyServerSide(pageContext) {
-    const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._globalContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig ?
-    const globalContext = pageContext._globalContext;
-    const [{ pageFilesLoaded, configPublicPageLazy }] = await Promise.all([
-        loadPageConfigFiles(pageContext._globalContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
-        (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
-            sharedPageFilesAlreadyLoaded: true,
-        }),
-    ]);
-    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._globalContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
-    const isV1Design = !!pageConfig;
+async function resolvePageContext(pageContext) {
+    const { isHtmlOnly, clientEntries, clientDependencies } = (0, analyzePage_js_1.analyzePage)(pageContext);
     const passToClient = [];
     const errMsgSuffix = ' should be an array of strings.';
+    const isV1Design = !!pageContext._pageConfig;
     if (!isV1Design) {
-        configPublicPageLazy.exportsAll.passToClient?.forEach((e) => {
+        pageContext.exportsAll.passToClient?.forEach((e) => {
             (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsgSuffix}`);
             passToClient.push(...e.exportValue);
         });
     }
     else {
-        configPublicPageLazy.from.configsCumulative.passToClient?.values.forEach((v) => {
+        pageContext.from.configsCumulative.passToClient?.values.forEach((v) => {
             const { value, definedAt } = v;
             const errMsg = `+passToClient value defined at ${definedAt}${errMsgSuffix}`;
             //*/ TO-DO/next-major-release: remove the passToClient once setting from the public API
@@ -59,16 +56,14 @@ async function loadPageConfigsLazyServerSide(pageContext) {
             passToClient.push(...valS);
         });
     }
-    const pageContextAddendum = {};
-    (0, utils_js_1.objectAssign)(pageContextAddendum, configPublicPageLazy);
-    (0, utils_js_1.objectAssign)(pageContextAddendum, {
-        Page: configPublicPageLazy.exports.Page,
+    (0, utils_js_1.objectAssign)(pageContext, await (0, csp_js_1.resolvePageContextCspNone)(pageContext));
+    (0, utils_js_1.objectAssign)(pageContext, {
+        Page: pageContext.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
-        _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath),
-        headersResponse: resolveHeadersResponse(pageContext, pageContextAddendum),
+        headersResponse: resolveHeadersResponse(pageContext),
     });
-    (0, utils_js_1.objectAssign)(pageContextAddendum, {
+    (0, utils_js_1.objectAssign)(pageContext, {
         __getPageAssets: async () => {
             if ('_pageAssets' in pageContext) {
                 return pageContext._pageAssets;
@@ -81,14 +76,14 @@ async function loadPageConfigsLazyServerSide(pageContext) {
         },
     });
     // TO-DO/next-major-release: remove
-    Object.assign(pageContextAddendum, {
+    Object.assign(pageContext, {
         _getPageAssets: async () => {
             (0, utils_js_1.assertWarning)(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preloading', {
                 onlyOnce: true,
                 showStackTrace: true,
             });
             const pageAssetsOldFormat = [];
-            (await pageContextAddendum.__getPageAssets()).forEach((p) => {
+            (await pageContext.__getPageAssets()).forEach((p) => {
                 if (p.assetType === 'script' && p.isEntry) {
                     pageAssetsOldFormat.push({
                         src: p.src,
@@ -107,35 +102,40 @@ async function loadPageConfigsLazyServerSide(pageContext) {
             return pageAssetsOldFormat;
         },
     });
-    (0, debugPageFiles_js_1.debugPageFiles)({
-        pageContext,
-        isHtmlOnly,
-        isClientRouting,
-        pageFilesLoaded,
-        pageFilesClientSide,
-        pageFilesServerSide,
-        clientEntries,
-        clientDependencies,
-    });
-    return pageContextAddendum;
+    return pageContext;
+}
+async function loadPageUserFiles(pageContext) {
+    const [{ configPublicPageLazy }] = await Promise.all([
+        loadPageUserFiles_v1Design(pageContext),
+        (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
+            sharedPageFilesAlreadyLoaded: true,
+        }),
+    ]);
+    (0, utils_js_1.objectAssign)(pageContext, configPublicPageLazy);
+    return pageContext;
 }
-async function loadPageConfigFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
-    const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
-    const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
+async function loadPageUserFiles_v1Design(pageContext) {
+    const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageContext._pageFilesAll, pageContext.pageId);
+    const isDev = !pageContext._globalContext._isProduction;
+    const pageConfigLoaded = !pageContext._pageConfig
+        ? null
+        : await (0, loadAndParseVirtualFilePageEntry_js_1.loadAndParseVirtualFilePageEntry)(pageContext._pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const configPublicPageLazy = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const configPublicPageLazy = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazyLoaded)(pageFilesServerSide, pageConfigLoaded, pageContext._globalContext._pageConfigGlobal);
     return {
         configPublicPageLazy,
         pageFilesLoaded: pageFilesServerSide,
     };
 }
-function resolveHeadersResponse(pageContext, pageContextAddendum) {
-    const headersResponse = mergeHeaders(pageContextAddendum.config.headersResponse);
+// TODO/now: move all response headers code to headersResponse.ts
+function resolveHeadersResponse(pageContext) {
+    const headersResponse = mergeHeaders(pageContext.config.headersResponse);
     if (!headersResponse.get('Cache-Control')) {
         const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._globalContext._pageConfigs);
         if (cacheControl)
             headersResponse.set('Cache-Control', cacheControl);
     }
+    (0, csp_js_1.addCspHeader)(pageContext, headersResponse);
     return headersResponse;
 }
 function mergeHeaders(headersList = []) {

package/dist/cjs/node/runtime/renderPage/{renderPageAlreadyRouted.js → renderPageAfterRoute.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.renderPageAlreadyRouted = renderPageAlreadyRouted;
+exports.renderPageAfterRoute = renderPageAfterRoute;
 exports.prerenderPage = prerenderPage;
 const error_page_js_1 = require("../../../shared/error-page.js");
 const renderHtml_js_1 = require("../html/renderHtml.js");
@@ -19,8 +19,7 @@ const preparePageContextForPublicUsageServer_js_1 = require("./preparePageContex
 const execHookGuard_js_1 = require("../../../shared/route/execHookGuard.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
-// TODO/now: rename?
-async function renderPageAlreadyRouted(pageContext) {
+async function renderPageAfterRoute(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the
     //  - ID of the error page `_error.page.js`.
@@ -29,7 +28,7 @@ async function renderPageAlreadyRouted(pageContext) {
     (0, utils_js_1.assert)(isError ===
         (pageContext.pageId ===
             (0, error_page_js_1.getErrorPageId)(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs)));
-    (0, utils_js_1.augmentType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSideAndExecHook)(pageContext));
+    (0, utils_js_1.updateType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
     if (!isError) {
         await (0, execHookGuard_js_1.execHookGuard)(pageContext, (pageContext) => (0, preparePageContextForPublicUsageServer_js_1.preparePageContextForPublicUsageServer)(pageContext));
     }

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderPage = renderPage;
 exports.renderPage_addAsyncHookwrapper = renderPage_addAsyncHookwrapper;
-const renderPageAlreadyRouted_js_1 = require("./renderPage/renderPageAlreadyRouted.js");
+const renderPageAfterRoute_js_1 = require("./renderPage/renderPageAfterRoute.js");
 const createPageContextServerSide_js_1 = require("./renderPage/createPageContextServerSide.js");
 const index_js_1 = require("../../shared/route/index.js");
 const utils_js_1 = require("./utils.js");
@@ -24,7 +24,10 @@ const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithou
 const loadPageConfigsLazyServerSide_js_1 = require("./renderPage/loadPageConfigsLazyServerSide.js");
 const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.js");
 const getVikeConfigError_js_1 = require("../shared/getVikeConfigError.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', { httpRequestsCount: 0 });
+const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
+    httpRequestsCount: 0,
+    asyncHookWrapper: getFallbackAsyncHookWrapper(),
+});
 // `renderPage()` calls `renderPageNominal()` while ensuring that errors are `console.error(err)` instead of `throw err`, so that Vike never triggers a server shut down. (Throwing an error in an Express.js middleware shuts down the whole Express.js server.)
 async function renderPage(pageContextInit) {
     (0, assertArguments_js_1.assertArguments)(...arguments);
@@ -37,19 +40,21 @@ async function renderPage(pageContextInit) {
     const httpRequestId = getRequestId();
     const urlOriginalPretty = (0, utils_js_1.getUrlPretty)(pageContextInit.urlOriginal);
     logHttpRequest(urlOriginalPretty, httpRequestId);
-    const { pageContextReturn } = await asyncHookWrapper(httpRequestId, () => renderPagePrepare(pageContextInit, httpRequestId));
+    const { pageContextReturn } = await globalObject.asyncHookWrapper(httpRequestId, () => renderPagePrepare(pageContextInit, httpRequestId));
     logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn);
     (0, utils_js_1.checkType)(pageContextReturn);
     (0, utils_js_1.assert)(pageContextReturn.httpResponse);
     return pageContextReturn;
 }
-// Fallback wrapper if node:async_hooks isn't available
-let asyncHookWrapper = async (_httpRequestId, ret) => ({
-    pageContextReturn: await ret(),
-});
 // Add node:async_hooks wrapper
 function renderPage_addAsyncHookwrapper(wrapper) {
-    asyncHookWrapper = wrapper;
+    globalObject.asyncHookWrapper = wrapper;
+}
+// Fallback wrapper if node:async_hooks isn't available
+function getFallbackAsyncHookWrapper() {
+    return async (_httpRequestId, ret) => ({
+        pageContextReturn: await ret(),
+    });
 }
 async function renderPagePrepare(pageContextInit, httpRequestId) {
     // Invalid config
@@ -153,7 +158,7 @@ async function renderPageAlreadyPrepared(pageContextBegin, globalContext, httpRe
 async function renderPageOnError(errNominalPage, pageContextBegin, pageContextNominalPageBegin, globalContext, httpRequestId, pageContextsFromRewrite) {
     (0, utils_js_1.assert)(pageContextNominalPageBegin);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextNominalPageBegin, 'urlOriginal', 'string'));
-    const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextBegin, errNominalPage, pageContextNominalPageBegin);
+    const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextBegin, errNominalPage);
     // Handle `throw redirect()` and `throw render()` while rendering nominal page
     if ((0, abort_js_1.isAbortError)(errNominalPage)) {
         const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextBegin, pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalContext);
@@ -178,7 +183,7 @@ async function renderPageOnError(errNominalPage, pageContextBegin, pageContextNo
     }
     let pageContextErrorPage;
     try {
-        pageContextErrorPage = await (0, renderPageAlreadyRouted_js_1.renderPageAlreadyRouted)(pageContextErrorPageInit);
+        pageContextErrorPage = await (0, renderPageAfterRoute_js_1.renderPageAfterRoute)(pageContextErrorPageInit);
     }
     catch (errErrorPage) {
         // Handle `throw redirect()` and `throw render()` while rendering error page
@@ -293,11 +298,11 @@ async function renderPageNominal(pageContext) {
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContext, 'pageId', 'string'));
     (0, utils_js_1.assert)(pageContext.errorWhileRendering === null);
     // Render
-    const pageContextAfterRender = await (0, renderPageAlreadyRouted_js_1.renderPageAlreadyRouted)(pageContext);
+    const pageContextAfterRender = await (0, renderPageAfterRoute_js_1.renderPageAfterRoute)(pageContext);
     (0, utils_js_1.assert)(pageContext === pageContextAfterRender);
     return pageContextAfterRender;
 }
-async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pageContextNominalPagePartial) {
+async function getPageContextErrorPageInit(pageContextBegin, errNominalPage) {
     const pageContext = forkPageContext(pageContextBegin);
     (0, utils_js_1.assert)(errNominalPage);
     (0, utils_js_1.objectAssign)(pageContext, {
@@ -305,9 +310,6 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
         errorWhileRendering: errNominalPage,
         routeParams: {},
     });
-    (0, utils_js_1.objectAssign)(pageContext, {
-        _debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR',
-    });
     (0, utils_js_1.assert)(pageContext.errorWhileRendering);
     return pageContext;
 }
@@ -423,7 +425,7 @@ pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalCont
             (0, utils_js_1.objectAssign)(pageContext, { pageId: errorPageId });
             (0, utils_js_1.objectAssign)(pageContext, pageContextAbort);
             (0, utils_js_1.objectAssign)(pageContext, pageContextErrorPageInit, true);
-            (0, utils_js_1.augmentType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSideAndExecHook)(pageContext));
+            (0, utils_js_1.updateType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext, false);
         }

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

@@ -64,7 +64,7 @@ __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
 __exportStar(require("../../utils/virtualFileId.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);
-__exportStar(require("../../utils/getTerminWidth.js"), exports);
+__exportStar(require("../../utils/getTerminalWidth.js"), exports);
 __exportStar(require("../../utils/truncateString.js"), exports);
 __exportStar(require("../../utils/formatHintLog.js"), exports);
 __exportStar(require("../../utils/joinEnglish.js"), exports);
@@ -75,8 +75,9 @@ __exportStar(require("../../utils/isVikeReactApp.js"), exports);
 __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
 __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/genPromise.js"), exports);
-__exportStar(require("../../utils/augmentType.js"), exports);
+__exportStar(require("../../utils/updateType.js"), exports);
 __exportStar(require("../../utils/changeEnumerable.js"), exports);
 __exportStar(require("../../utils/getViteRPC.js"), exports);
 __exportStar(require("../../utils/isRunnableDevEnvironment.js"), exports);
 __exportStar(require("../../utils/assertIsNotBrowser.js"), exports);
+__exportStar(require("../../utils/isNonRunnableDev.js"), exports);

package/dist/cjs/node/runtime-dev/createDevMiddleware.js

@@ -3,14 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDevMiddleware = createDevMiddleware;
 const vite_1 = require("vite");
 const prepareViteApiCall_js_1 = require("../api/prepareViteApiCall.js");
-const globalContext_js_1 = require("../runtime/globalContext.js");
 /*
  * Create server middleware for development with HMR and lazy-transpiling.
  *
  * https://vike.dev/createDevMiddleware
  */
 async function createDevMiddleware(options = {}) {
-    (0, globalContext_js_1.setGlobalContext_isProduction)(false, true);
     const optionsMod = {
         ...options,
         viteConfig: {

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

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.virtualFileIdGlobalEntryClientCR = exports.virtualFileIdGlobalEntryClientSR = exports.virtualFileIdGlobalEntryServer = void 0;
+exports.parseVirtualFileId = parseVirtualFileId;
+exports.generateVirtualFileId = generateVirtualFileId;
+const extractAssetsQuery_js_1 = require("./extractAssetsQuery.js");
+const utils_js_1 = require("./utils.js");
+(0, utils_js_1.assertIsNotBrowser)();
+// Global entries
+const virtualFileIdGlobalEntryServer = 
+//
+'virtual:vike:global-entry:server';
+exports.virtualFileIdGlobalEntryServer = virtualFileIdGlobalEntryServer;
+const virtualFileIdGlobalEntryClientSR = 
+//
+'virtual:vike:global-entry:client:server-routing';
+exports.virtualFileIdGlobalEntryClientSR = virtualFileIdGlobalEntryClientSR;
+const virtualFileIdGlobalEntryClientCR = 
+//
+'virtual:vike:global-entry:client:client-routing';
+exports.virtualFileIdGlobalEntryClientCR = virtualFileIdGlobalEntryClientCR;
+// Page entries
+const virtualFileIdPageEntryClient = 
+//
+'virtual:vike:page-entry:client:'; // ${pageId}
+const virtualFileIdPageEntryServer = 
+//
+'virtual:vike:page-entry:server:'; //  ${pageId}
+// Virtual ID prefixes
+const virtualFileIdPageEntryPrefix = 
+//
+'virtual:vike:page-entry:';
+const virtualFileIdGlobalEntryPrefix = 
+//
+'virtual:vike:global-entry:';
+const virtualFileIdGlobalEntries = [
+    virtualFileIdGlobalEntryServer,
+    virtualFileIdGlobalEntryClientCR,
+    virtualFileIdGlobalEntryClientSR,
+];
+(0, utils_js_1.assert)(virtualFileIdGlobalEntries.every((v) => 
+//
+v.startsWith(virtualFileIdGlobalEntryPrefix)));
+(0, utils_js_1.assert)([virtualFileIdPageEntryClient, virtualFileIdPageEntryServer].every((v) => 
+//
+v.startsWith(virtualFileIdPageEntryPrefix)));
+function parseVirtualFileId(id) {
+    id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
+    if (!id.startsWith(virtualFileIdGlobalEntryPrefix) && !id.startsWith(virtualFileIdPageEntryPrefix))
+        return false;
+    // Global entry
+    if (id.includes(virtualFileIdGlobalEntryPrefix)) {
+        (0, utils_js_1.assert)(virtualFileIdGlobalEntries.includes(id));
+        const isForClientSide = id !== virtualFileIdGlobalEntryServer;
+        const isClientRouting = id === virtualFileIdGlobalEntryClientCR;
+        return {
+            type: 'global-entry',
+            isForClientSide,
+            isClientRouting,
+        };
+    }
+    // Page entry
+    if (id.includes(virtualFileIdPageEntryPrefix)) {
+        (0, utils_js_1.assert)(id.startsWith(virtualFileIdPageEntryPrefix));
+        const idOriginal = id;
+        id = (0, extractAssetsQuery_js_1.extractAssetsRemoveQuery)(id);
+        const isExtractAssets = idOriginal !== id;
+        if (id.startsWith(virtualFileIdPageEntryClient)) {
+            (0, utils_js_1.assert)(isExtractAssets === false);
+            return {
+                type: 'page-entry',
+                pageId: id.slice(virtualFileIdPageEntryClient.length),
+                isForClientSide: true,
+                isExtractAssets,
+            };
+        }
+        if (id.startsWith(virtualFileIdPageEntryServer)) {
+            return {
+                type: 'page-entry',
+                pageId: id.slice(virtualFileIdPageEntryServer.length),
+                isForClientSide: false,
+                isExtractAssets,
+            };
+        }
+        (0, utils_js_1.assert)(false);
+    }
+    return false;
+}
+function generateVirtualFileId(args) {
+    if (args.type === 'global-entry') {
+        const { isForClientSide, isClientRouting } = args;
+        (0, utils_js_1.assert)(typeof isClientRouting === 'boolean');
+        if (!isForClientSide) {
+            return virtualFileIdGlobalEntryServer;
+        }
+        else if (isClientRouting) {
+            return virtualFileIdGlobalEntryClientCR;
+        }
+        else {
+            return virtualFileIdGlobalEntryClientSR;
+        }
+    }
+    if (args.type === 'page-entry') {
+        const { pageId, isForClientSide } = args;
+        (0, utils_js_1.assert)(typeof pageId === 'string');
+        const id = `${isForClientSide ? virtualFileIdPageEntryClient : virtualFileIdPageEntryServer}${pageId}`;
+        return id;
+    }
+    (0, utils_js_1.assert)(false);
+}