vike 0.4.171-commit-bb72501 → 0.4.171-commit-f9548df

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

@@ -5,7 +5,7 @@ export { runPrerender_forceExit };
 import '../runtime/page-files/setup.js';
 import path from 'path';
 import { route } from '../../shared/route/index.js';
-import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, handleNodeEnv_prerender, pLimit, assertPathFilesystemAbsolute, isArray } from './utils.js';
+import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, handleNodeEnv_prerender, pLimit, assertPathFilesystemAbsolute, isArray, changeEnumerable } from './utils.js';
 import { prerenderPage, prerender404Page, getRenderContext, getPageContextInitEnhanced } from '../runtime/renderPage/renderPageAlreadyRouted.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'os';
@@ -19,7 +19,7 @@ import { getConfigValueFilePathToShowToUser } from '../../shared/page-configs/he
 import { getConfigValue } from '../../shared/page-configs/getConfigValue.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { isErrorPage } from '../../shared/error-page.js';
-import { addUrlComputedProps } from '../../shared/addUrlComputedProps.js';
+import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
 import { isAbortError } from '../../shared/route/abort.js';
 import { loadUserFilesServerSide } from '../runtime/renderPage/loadUserFilesServerSide.js';
 import { getHookFromPageConfig, getHookFromPageConfigGlobal, getHookTimeoutDefault, setIsPrerenderering } from '../../shared/hooks/getHook.js';
@@ -240,9 +240,9 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
             prerenderContext.pageContexts.push(pageContextNew);
             if (pageContext) {
                 objectAssign(pageContextNew, {
-                    _pageContextAlreadyProvidedByOnPrerenderHook: true,
-                    ...pageContext
+                    _pageContextAlreadyProvidedByOnPrerenderHook: true
                 });
+                objectAssign(pageContextNew, pageContext);
             }
         });
     })));
@@ -300,14 +300,11 @@ function createPageContext(urlOriginal, renderContext, prerenderContext) {
         _prerenderContext: prerenderContext
     };
     const pageContextInit = {
-        urlOriginal,
-        ...prerenderContext.pageContextInit
+        urlOriginal
     };
+    objectAssign(pageContextInit, prerenderContext.pageContextInit);
     {
-        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext, {
-            // We set `enumerable` to `false` to avoid computed URL properties from being iterated & copied in a onPrerenderStart() hook, e.g. /examples/i18n/
-            urlComputedPropsNonEnumerable: true
-        });
+        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext);
         objectAssign(pageContext, pageContextInitEnhanced);
     }
     return pageContext;
@@ -382,6 +379,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
         pageContext._urlOriginalBeforeHook = pageContext.urlOriginal;
     });
     const docLink = 'https://vike.dev/i18n#pre-rendering';
+    // Set `enumerable` to `false` to avoid computed URL properties from being iterated & copied in onPrerenderStart() hook, e.g. /examples/i18n/
+    const { restoreEnumerable, addPageContextComputedUrl } = makePageContextComputedUrlNonEnumerable(prerenderContext.pageContexts);
     let result = await executeHook(() => hookFn({
         pageContexts: prerenderContext.pageContexts,
         // TODO/v1-release: remove warning
@@ -393,6 +392,7 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
             return prerenderContext.pageContexts;
         }
     }), onPrerenderStartHook, null);
+    restoreEnumerable();
     if (result === null || result === undefined) {
         return;
     }
@@ -430,9 +430,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
                 hookName
             };
         }
-        // Restore as URL computed props are lost when user makes a pageContext copy
-        addUrlComputedProps(pageContext);
     });
+    addPageContextComputedUrl(prerenderContext.pageContexts);
 }
 async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete) {
     const globalContext = getGlobalContext();
@@ -714,3 +713,23 @@ function assertIsNotAbort(err, urlOr404) {
     assert(abortCall);
     assertUsage(false, `${pc.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOr404} but ${pc.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
+function makePageContextComputedUrlNonEnumerable(pageContexts) {
+    change(false);
+    return { restoreEnumerable, addPageContextComputedUrl };
+    function restoreEnumerable() {
+        change(true);
+    }
+    function addPageContextComputedUrl(pageContexts) {
+        // Add URL computed props to the user-generated pageContext copies
+        pageContexts.forEach((pageContext) => {
+            const pageContextUrlComputed = getPageContextUrlComputed(pageContext);
+            objectAssign(pageContext, pageContextUrlComputed);
+        });
+    }
+    function change(enumerable) {
+        pageContexts.forEach((pageContext) => {
+            changeEnumerable(pageContext, 'urlPathname', enumerable);
+            changeEnumerable(pageContext, 'urlParsed', enumerable);
+        });
+    }
+}

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

@@ -13,3 +13,4 @@ export * from '../../utils/assertNodeEnv.js';
 export * from '../../utils/pLimit.js';
 export * from '../../utils/assertPathFilesystemAbsolute.js';
 export * from '../../utils/isArray.js';
+export * from '../../utils/changeEnumerable.js';

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

@@ -15,3 +15,4 @@ export * from '../../utils/assertNodeEnv.js';
 export * from '../../utils/pLimit.js';
 export * from '../../utils/assertPathFilesystemAbsolute.js';
 export * from '../../utils/isArray.js';
+export * from '../../utils/changeEnumerable.js';

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

@@ -63,13 +63,13 @@ function getRenderHook(pageContext) {
         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')
-          */
+            '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(' '));
     }
     return hookFound;

package/dist/esm/node/runtime/renderPage/loadUserFilesServerSide.d.ts

@@ -14,19 +14,11 @@ type PageContext_loadUserFilesServerSide = PageContextGetPageAssets & PageContex
 type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
 declare function loadUserFilesServerSide(pageContext: {
     _pageId: string;
-} & PageContext_loadUserFilesServerSide): Promise<{
+} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles/getExports.js").PageContextExports & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];
     _pageFilePathsLoaded: string[];
-    source: import("../../../shared/getPageFiles/getExports.js").Source;
-    sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-    from: import("../../../shared/getPageFiles/getExports.js").From;
-    config: Record<string, unknown>;
-    configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-    exports: Record<string, unknown>;
-    exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-    pageExports: Record<string, unknown>;
 } & {
     __getPageAssets: () => Promise<PageAsset[]>;
 }>;

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

@@ -10,7 +10,7 @@ import { getGlobalContext } from '../globalContext.js';
 import { loadConfigValues } from '../../../shared/page-configs/loadConfigValues.js';
 async function loadUserFilesServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext._pageId); // Make pageConfig globally available as pageContext._pageConfig?
-    const [{ pageFilesLoaded, pageConfigLoaded, ...pageContextExports }] = await Promise.all([
+    const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
         loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext._pageId, !getGlobalContext().isProduction),
         analyzePageClientSideInit(pageContext._pageFilesAll, pageContext._pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
@@ -35,8 +35,8 @@ async function loadUserFilesServerSide(pageContext) {
         });
     }
     const pageContextAddendum = {};
+    objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, {
-        ...pageContextExports,
         Page: pageContextExports.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
@@ -101,8 +101,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
     const pageContextExports = getPageContextExports(pageFilesServerSide, pageConfigLoaded);
     return {
-        ...pageContextExports,
-        pageFilesLoaded: pageFilesServerSide,
-        pageConfigLoaded
+        pageContextExports,
+        pageFilesLoaded: pageFilesServerSide
     };
 }

package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts

@@ -1,6 +1,6 @@
 export { preparePageContextForUserConsumptionServerSide };
 export type { PageContextForUserConsumptionServerSide };
-import { PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
+import { PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextExports } from '../../../shared/getPageFiles/getExports.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
@@ -9,7 +9,7 @@ type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal
     /** @deprecated */
     url: string;
     urlPathname: string;
-    urlParsed: PageContextUrlComputedPropsInternal['urlParsed'];
+    urlParsed: PageContextUrlInternal['urlParsed'];
     routeParams: Record<string, string>;
     Page: unknown;
     _pageId: string;

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

@@ -1,10 +1,10 @@
 export { preparePageContextForUserConsumptionServerSide };
 import { assert, isPlainObject, isObject } from '../utils.js';
 import { sortPageContext } from '../../../shared/sortPageContext.js';
-import { assertPageContextUrlComputedProps } from '../../../shared/addUrlComputedProps.js';
+import { assertPageContextUrl } from '../../../shared/getPageContextUrlComputed.js';
 import { addIs404ToPageProps } from '../../../shared/addIs404ToPageProps.js';
 function preparePageContextForUserConsumptionServerSide(pageContext) {
-    assertPageContextUrlComputedProps(pageContext);
+    assertPageContextUrl(pageContext);
     assert(isPlainObject(pageContext.routeParams));
     assert('Page' in pageContext);
     assert(isObject(pageContext.pageExports));

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -7,7 +7,7 @@ export type { RenderContext };
 export type { PageContextAfterRender };
 export type { PageContextInitEnhanced };
 import { type PageFile } from '../../../shared/getPageFiles.js';
-import { type PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
+import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import { HttpResponse } from './createHttpResponseObject.js';
 import { PageContext_loadUserFilesServerSide, type PageFiles } from './loadUserFilesServerSide.js';
 import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../../../shared/page-configs/PageConfig.js';
@@ -24,7 +24,7 @@ declare function renderPageAlreadyRouted<PageContext extends {
     routeParams: Record<string, string>;
     errorWhileRendering: null | Error;
     _httpRequestId: number;
-} & PageContextInitEnhanced & PageContextUrlComputedPropsInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
+} & PageContextInitEnhanced & PageContextUrlInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
 declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles & {
     routeParams: Record<string, string>;
     _pageId: string;
@@ -38,6 +38,8 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
     pageContextSerialized: null;
     pageContext: {
         urlOriginal: string;
+        headersOriginal?: unknown;
+        headers?: unknown;
     } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
@@ -51,25 +53,23 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _onBeforeRouteHook: Hook | null;
         _pageContextInit: {
             urlOriginal: string;
+            headersOriginal?: unknown;
+            headers?: unknown;
         };
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
+    } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles/getExports.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -89,6 +89,8 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
     pageContextSerialized: string;
     pageContext: {
         urlOriginal: string;
+        headersOriginal?: unknown;
+        headers?: unknown;
     } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
@@ -102,25 +104,23 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _onBeforeRouteHook: Hook | null;
         _pageContextInit: {
             urlOriginal: string;
+            headersOriginal?: unknown;
+            headers?: unknown;
         };
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
+    } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles/getExports.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -141,6 +141,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
     pageContextSerialized: null;
     pageContext: {
         urlOriginal: string;
+        headersOriginal?: unknown;
+        headers?: unknown;
     } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
@@ -154,25 +156,23 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _onBeforeRouteHook: Hook | null;
         _pageContextInit: {
             urlOriginal: string;
+            headersOriginal?: unknown;
+            headers?: unknown;
         };
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
+    } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles/getExports.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -192,6 +192,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
     pageContextSerialized: string;
     pageContext: {
         urlOriginal: string;
+        headersOriginal?: unknown;
+        headers?: unknown;
     } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
@@ -205,25 +207,23 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _onBeforeRouteHook: Hook | null;
         _pageContextInit: {
             urlOriginal: string;
+            headersOriginal?: unknown;
+            headers?: unknown;
         };
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
+    } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles/getExports.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -242,8 +242,9 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
 type PageContextInitEnhanced = ReturnType<typeof getPageContextInitEnhanced>;
 declare function getPageContextInitEnhanced(pageContextInit: {
     urlOriginal: string;
-}, renderContext: RenderContext, { urlComputedPropsNonEnumerable, ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
-    urlComputedPropsNonEnumerable?: boolean;
+    headersOriginal?: unknown;
+    headers?: unknown;
+}, renderContext: RenderContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
     ssr?: {
         urlRewrite: null | string;
         urlHandler: null | ((url: string) => string);
@@ -251,6 +252,8 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     };
 }): {
     urlOriginal: string;
+    headersOriginal?: unknown;
+    headers?: unknown;
 } & {
     _objectCreatedByVike: boolean;
     _baseServer: string;
@@ -264,12 +267,18 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     _onBeforeRouteHook: Hook | null;
     _pageContextInit: {
         urlOriginal: string;
+        headersOriginal?: unknown;
+        headers?: unknown;
     };
     _urlRewrite: string | null;
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
-} & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-    _urlRewrite: string | null;
+} & {
+    urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+    urlPathname: string;
+    url: string;
+} & {
+    headers: Record<string, string> | null;
 };
 type RenderContext = {
     pageFilesAll: PageFile[];

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

@@ -6,9 +6,9 @@ export { getRenderContext };
 import { getErrorPageId } from '../../../shared/error-page.js';
 import { getHtmlString } from '../html/renderHtml.js';
 import { getPageFilesAll } from '../../../shared/getPageFiles.js';
-import { assert, assertUsage, hasProp, objectAssign } from '../utils.js';
+import { assert, assertUsage, assertWarning, hasProp, normalizeHeaders, objectAssign } from '../utils.js';
 import { serializePageContextClientSide } from '../html/serializePageContextClientSide.js';
-import { addUrlComputedProps } from '../../../shared/addUrlComputedProps.js';
+import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
 import { getGlobalContext } from '../globalContext.js';
 import { createHttpResponseObject, createHttpResponsePageContextJson } from './createHttpResponseObject.js';
 import { loadUserFilesServerSide } from './loadUserFilesServerSide.js';
@@ -116,7 +116,7 @@ async function prerender404Page(renderContext, pageContextInit_) {
     objectAssign(pageContext, await loadUserFilesServerSide(pageContext));
     return prerenderPage(pageContext);
 }
-function getPageContextInitEnhanced(pageContextInit, renderContext, { urlComputedPropsNonEnumerable = false, ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
+function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
     urlRewrite: null,
     urlHandler: null,
     isClientSideNavigation: false
@@ -143,7 +143,26 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { urlCompute
         _urlHandler: urlHandler,
         isClientSideNavigation
     });
-    addUrlComputedProps(pageContextInitEnhanced, !urlComputedPropsNonEnumerable);
+    // pageContext.urlParsed
+    const pageContextUrlComputed = getPageContextUrlComputed(pageContextInitEnhanced);
+    objectAssign(pageContextInitEnhanced, pageContextUrlComputed);
+    // pageContext.headers
+    {
+        let headers;
+        if (pageContextInit.headersOriginal) {
+            headers = normalizeHeaders(pageContextInit.headersOriginal);
+            assertUsage(!('headers' in pageContextInit), "You're defining pageContextInit.headersOriginal as well as pageContextInit.headers but you should only define pageContextInit.headersOriginal instead, see https://vike.dev/headers");
+        }
+        else if (pageContextInit.headers) {
+            headers = pageContextInit.headers;
+            // TODO/next-major-release: assertUsage() instead of assertWarning()
+            assertWarning(false, 'Setting pageContextInit.headers is deprecated: set pageContextInit.headersOriginal instead, see https://vike.dev/headers', { onlyOnce: true });
+        }
+        else {
+            headers = null;
+        }
+        objectAssign(pageContextInitEnhanced, { headers });
+    }
     return pageContextInitEnhanced;
 }
 // TODO: remove getRenderContext() in favor of getGlobalObject() + reloadGlobalContext()

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

@@ -50,3 +50,4 @@ export * from '../../utils/formatHintLog.js';
 export * from '../../utils/joinEnglish.js';
 export * from '../../utils/isArrayOfStrings.js';
 export * from '../../utils/escapeHtml.js';
+export * from '../../utils/normalizeHeaders.js';

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

@@ -53,3 +53,4 @@ export * from '../../utils/formatHintLog.js';
 export * from '../../utils/joinEnglish.js';
 export * from '../../utils/isArrayOfStrings.js';
 export * from '../../utils/escapeHtml.js';
+export * from '../../utils/normalizeHeaders.js';

package/dist/esm/shared/{addUrlComputedProps.d.ts → getPageContextUrlComputed.d.ts}

@@ -1,9 +1,9 @@
-export { addUrlComputedProps };
-export { assertPageContextUrlComputedProps };
-export type { PageContextUrlComputedPropsInternal };
-export type { PageContextUrlComputedPropsClient };
-export type { PageContextUrlComputedPropsServer };
-export type { PageContextUrlSources };
+export { getPageContextUrlComputed };
+export { assertPageContextUrl };
+export type { PageContextUrlInternal };
+export type { PageContextUrlClient };
+export type { PageContextUrlServer };
+export type { PageContextUrlSource };
 export type { Url };
 type Url = {
     /** The URL origin, e.g. `https://example.com` of `https://example.com/product/42?details=yes#reviews` */
@@ -27,23 +27,24 @@ type Url = {
     /** @deprecated */
     searchString: null | string;
 };
-type PageContextUrlComputedPropsClient = {
+type PageContextUrlComputed = {
+    /** Parsed information about the current URL */
+    urlParsed: Url;
+    /** The URL pathname, e.g. `/product/42` of `https://example.com/product/42?details=yes#reviews` */
+    urlPathname: string;
     /** @deprecated */
     url: string;
+};
+type PageContextUrl = {
     /** The URL of the HTTP request */
     urlOriginal: string;
-    /** The URL pathname, e.g. `/product/42` of `https://example.com/product/42?details=yes#reviews` */
-    urlPathname: string;
-    /** Parsed information about the current URL */
-    urlParsed: Url;
-};
-/** For Vike internal use */
-type PageContextUrlComputedPropsInternal = PageContextUrlComputedPropsClient & {
+} & PageContextUrlComputed;
+type PageContextUrlInternal = PageContextUrl & {
     _urlRewrite: string | null;
 };
-type HashProps = 'hash' | 'hashString' | 'hashOriginal';
-type PageContextUrlComputedPropsServer = PageContextUrlComputedPropsClient & {
-    urlParsed: Omit<PageContextUrlComputedPropsClient['urlParsed'], HashProps> & {
+type PageContextUrlClient = PageContextUrl;
+type PageContextUrlServer = PageContextUrl & {
+    urlParsed: Omit<PageContextUrl['urlParsed'], HashProps> & {
         /** Only available on the client-side */
         hash: '';
         /** Only available on the client-side */
@@ -52,14 +53,15 @@ type PageContextUrlComputedPropsServer = PageContextUrlComputedPropsClient & {
         hashOriginal: null;
     };
 };
-declare function addUrlComputedProps<PageContext extends Record<string, unknown> & PageContextUrlSources>(pageContext: PageContext, enumerable?: boolean): asserts pageContext is PageContext & PageContextUrlComputedPropsInternal;
-type PageContextUrlSources = {
+type HashProps = 'hash' | 'hashString' | 'hashOriginal';
+declare function getPageContextUrlComputed(pageContext: PageContextUrlSource): PageContextUrlComputed;
+type PageContextUrlSource = {
     urlOriginal: string;
     urlLogical?: string;
     _urlRewrite: string | null;
     _baseServer: string;
     _urlHandler: null | ((url: string) => string);
 };
-declare function assertPageContextUrlComputedProps(pageContext: {
+declare function assertPageContextUrl(pageContext: {
     urlOriginal: string;
-} & PageContextUrlComputedPropsClient): void;
+} & PageContextUrlClient): void;