vike 0.4.171 → 0.4.172-commit-ea2b76c

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

@@ -1,49 +1,89 @@
 export { logErrorHint };
-// For ./logErrorHint/*.spec.ts
-export { isCjsEsmError };
-export { isKnownError };
-export { getHint };
-import { assert, formatHintLog, isArray, isNotNullish, isObject, unique } from '../utils.js';
+// For ./logErrorHint/getErrorHint.spec.ts
+export { getErrorHint };
+import { assert, formatHintLog, isObject } from '../utils.js';
 import pc from '@brillout/picocolors';
-const knownErrors = [
+const hintDefault = 'The error could be a CJS/ESM issue, see https://vike.dev/broken-npm-package';
+const hintLinkPrefix = 'To fix this error, see ';
+const errorsMisc = [
     {
         errMsg: 'jsxDEV is not a function',
-        link: 'https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096'
-    },
-    {
-        errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
-        link: 'https://vike.dev/broken-npm-package#react-invalid-component'
+        link: 'https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096',
+        shouldMentionNodeModules: false
     },
     {
         // ```
         // Error [RollupError]: Could not resolve "../dist/client/assets.json" from "renderer/+onRenderHtml.tsx"
         // ```
         errMsg: 'assets.json',
-        link: 'https://vike.dev/getGlobalContext'
+        link: 'https://vike.dev/getGlobalContext',
+        shouldMentionNodeModules: false
+    }
+];
+const errorsReact = [
+    {
+        errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
+        link: 'https://vike.dev/broken-npm-package#react-invalid-component',
+        // The stack trace can be user-land while the import is coming from node_modules
+        shouldMentionNodeModules: false
     },
     {
+        // React's "Invalid hook call.", see https://github.com/vikejs/vike/discussions/1637#discussioncomment-9424712
+        errMsg: "Cannot read properties of null (reading 'useContext')"
+    }
+];
+const errorsCjsEsm_withPreciseLink = [
+    {
+        // `SyntaxError: Named export '${exportName}' not found. The requested module '${packageName}' is a CommonJS module, which may not support all module.exports as named exports.`
         errMsg: /Named export.*not found/i,
-        link: 'https://vike.dev/broken-npm-package#named-export-not-found'
+        link: 'https://vike.dev/broken-npm-package#named-export-not-found',
+        // It seems that this always points to an npm package import.
+        shouldMentionNodeModules: false
     }
 ];
+const errorsCjsEsm = [
+    { errMsg: 'ERR_UNSUPPORTED_DIR_IMPORT' },
+    { errMsg: 'ERR_REQUIRE_ESM' },
+    { errMsg: 'Must use import' },
+    { errMsg: /Cannot find \S+ '(\S+)' imported from (\S+)/ },
+    { errMsg: 'ERR_UNKNOWN_FILE_EXTENSION' },
+    { errMsg: /Unknown file extension "\S+" for (\S+)/ },
+    // `SyntaxError: Cannot use import statement outside a module`.
+    {
+        errMsg: 'Cannot use import statement',
+        // Since user code is always ESM, this error must always originate from an npm package.
+        shouldMentionNodeModules: false
+    },
+    { errMsg: 'is not exported' },
+    { errMsg: 'Cannot read properties of undefined' },
+    { errMsg: '.default is not' },
+    // Using CJS inside ESM modules.
+    { errMsg: 'require is not a function' },
+    { errMsg: 'exports is not defined' },
+    { errMsg: 'module is not defined' },
+    { errMsg: 'window is not defined' },
+    { errMsg: 'not defined in ES' },
+    { errMsg: "Unexpected token 'export'" }
+];
 function logErrorHint(error) {
     /* Collect errors for ./logErrorHint.spec.ts
     collectError(error)
     //*/
-    const hint = getHint(error);
+    const hint = getErrorHint(error);
     if (hint)
         logHint(hint);
 }
-function getHint(error) {
+function getErrorHint(error) {
     {
-        const link = isKnownError(error);
-        if (link)
-            return `To fix this error, see ${link}`;
-    }
-    const res = isCjsEsmError(error);
-    if (res) {
-        const hint = 'The error seems to be a CJS/ESM issue, see https://vike.dev/broken-npm-package';
-        return hint;
+        const knownErr = isKnownError(error);
+        if (knownErr) {
+            if (knownErr.link) {
+                return hintLinkPrefix + knownErr.link;
+            }
+            else {
+                return hintDefault;
+            }
+        }
     }
     return null;
 }
@@ -54,266 +94,42 @@ function logHint(hint) {
 }
 function isKnownError(error) {
     const anywhere = getAnywhere(error);
-    const knownErr = knownErrors.find((knownErorr) => {
-        return includes(anywhere, knownErorr.errMsg);
+    const knownErr = [
+        //
+        ...errorsMisc,
+        ...errorsReact,
+        ...errorsCjsEsm_withPreciseLink,
+        ...errorsCjsEsm
+    ].find((knownErorr) => {
+        if (!includesLowercase(anywhere, knownErorr.errMsg))
+            return false;
+        if (knownErorr.shouldMentionNodeModules !== false && !includesLowercase(anywhere, 'node_modules'))
+            return false;
+        return true;
     });
     if (!knownErr)
         return false;
-    return knownErr.link;
-}
-// `false` -> noop
-// `true` -> generic message
-// `'some-npm-package'` -> add some-npm-package to `ssr.noExternal`
-function isCjsEsmError(error) {
-    const res = check(error);
-    if (res === true || res === false)
-        return res;
-    const packageNames = normalizeRes(res);
-    if (packageNames === false)
-        return packageNames;
-    packageNames.forEach((packageName) => {
-        assert(!['vite', 'vike'].includes(packageName));
-    });
-    // We don't use this anymore: we could return `true` instead. Shall we remove returning a list of npm packages?
-    return packageNames;
-}
-function normalizeRes(res) {
-    let packageNames = isArray(res) ? res : [res];
-    packageNames = unique(packageNames.filter(isNotNullish).filter((packageName) => packageName !== '@brillout/import'));
-    if (packageNames.length === 0)
-        return false;
-    return packageNames;
+    return knownErr;
 }
-function check(error) {
-    const message = getErrMessage(error);
-    const anywhere = getAnywhere(error);
-    const packageName_stack1 = getPackageName_stack1(error);
-    const packageName_stack2 = getPackageName_stack2(error);
-    const isRelatedToNodeModules = !!packageName_stack1 || !!packageName_stack2 || includesNodeModules(message);
-    /*
-    const relatedNpmPackages = normalizeArray([
-      packageName_stack1 || null,
-      packageName_stack2 || null,
-      (message && extractFromNodeModulesPath(message)) || null
-    ])
-    */
-    // ERR_UNSUPPORTED_DIR_IMPORT
-    {
-        const packageName = parseNodeModulesPathMessage('ERR_UNSUPPORTED_DIR_IMPORT', anywhere);
-        if (packageName)
-            return packageName;
-    }
-    // ERR_UNKNOWN_FILE_EXTENSION
-    {
-        const packageName = parseUnkownFileExtensionMessage(anywhere);
-        if (packageName)
-            return packageName;
-    }
-    {
-        const packageName = parseNodeModulesPathMessage('ERR_UNKNOWN_FILE_EXTENSION', anywhere);
-        if (packageName)
-            return packageName;
+function includesLowercase(str, substr) {
+    if (substr instanceof RegExp) {
+        let { flags } = substr;
+        if (!flags.includes('i'))
+            flags += 'i';
+        const regex = new RegExp(substr.source, flags);
+        return regex.test(str);
     }
-    {
-        const packageName = parseNodeModulesPathMessage('is not exported', anywhere);
-        if (packageName)
-            return packageName;
-    }
-    // Using CJS inside ESM modules.
-    if (includes(anywhere, 'require is not a function') ||
-        includes(anywhere, 'exports is not defined') ||
-        includes(anywhere, 'module is not defined') ||
-        includes(anywhere, 'window is not defined') ||
-        includes(anywhere, 'not defined in ES')) {
-        if (packageName_stack1)
-            return packageName_stack1;
-    }
-    if (includes(anywhere, "Unexpected token 'export'")) {
-        if (packageName_stack2)
-            return packageName_stack2;
-        if (packageName_stack1)
-            return packageName_stack1;
-    }
-    // ERR_REQUIRE_ESM
-    if (includes(anywhere, 'ERR_REQUIRE_ESM')) {
-        /* The issue is the importer, not the importee.
-        if (relatedNpmPackages) return relatedNpmPackages
-         */
-        {
-            if (packageName_stack1)
-                return packageName_stack1;
-        }
-        if (isRelatedToNodeModules)
-            return true;
+    if (typeof substr === 'string') {
+        return str.toLowerCase().includes(substr.toLowerCase());
     }
-    /* The following two wrongfully match user land errors
-    {
-      const packageNames = parseNodeModulesPath('ERR_REQUIRE_ESM', anywhere)
-      if (packageNames) return packageNames
-    }
-    {
-      const packageNames = parseNodeModulesPath('Must use import', anywhere)
-      if (packageNames) return packageNames
-    }
-    */
-    // `SyntaxError: Named export '${exportName}' not found. The requested module '${packageName}' is a CommonJS module, which may not support all module.exports as named exports.`
-    {
-        const packageName = parseImportFrom(anywhere);
-        if (packageName)
-            return packageName;
-    }
-    if (includes(anywhere, 'Cannot read properties of undefined')) {
-        if (isRelatedToNodeModules) {
-            /* We return true because relatedNpmPackages points to the importer but the problematic npm package is the importee
-            if (relatedNpmPackages) return relatedNpmPackages
-            */
-            return true;
-        }
-    }
-    // ERR_MODULE_NOT_FOUND
-    {
-        const packageNames = parseCannotFindMessage(anywhere);
-        if (packageNames)
-            return packageNames;
-    }
-    if (
-    // `SyntaxError: Cannot use import statement outside a module`.
-    // Since user code is always ESM, this error must always originate from an npm package.
-    includes(anywhere, 'Cannot use import statement') ||
-        // `SyntaxError: Named export '${exportName}' not found. The requested module '${packageName}' is a CommonJS module, which may not support all module.exports as named exports.`
-        // It seems that this always points to an npm package import.
-        /Named export.*not found/i.test(anywhere)) {
-        /* We return true even if fromNodeModules is false because the errors always relate to npm packages.
-        if (fromNodeModules) return true
-        */
-        return true;
-    }
-    return false;
-}
-function parseCannotFindMessage(str) {
-    const match = /Cannot find \S+ '(\S+)' imported from (\S+)/.exec(str);
-    if (!match)
-        return false;
-    // const packageNameCannotFind = extractFromPath(match[1]!)
-    const packageNameFrom = extractFromPath(match[2]);
-    return normalizeArray([
-        // packageNameCannotFind,
-        packageNameFrom
-    ]);
-}
-function parseUnkownFileExtensionMessage(str) {
-    const match = /Unknown file extension "\S+" for (\S+)/.exec(str);
-    if (!match)
-        return false;
-    const filePath = match[1];
-    const packageName = extractFromPath(filePath);
-    return packageName;
-}
-function parseImportFrom(str) {
-    const match = /\bimport\b.*?\bfrom\b\s*?"(.+?)"/.exec(str);
-    if (!match)
-        return false;
-    const importPath = match[1];
-    const packageName = extractFromPath(importPath);
-    return packageName;
-}
-function parseNodeModulesPathMessage(begin, str) {
-    str = str.replaceAll('\\', '/');
-    const regex = new RegExp(`${begin}.*(node_modules\\/\\S+)`);
-    const match = regex.exec(str);
-    if (!match)
-        return false;
-    const importPath = match[1];
-    return extractFromNodeModulesPath(importPath);
-}
-function getPackageName_stack1(err) {
-    const errStack = getErrStack(err);
-    if (!errStack)
-        return false;
-    const firstLineStackTrace = errStack.split('\n').filter((line) => line.startsWith('    at '))[0];
-    if (!firstLineStackTrace)
-        return false;
-    return extractFromNodeModulesPath(firstLineStackTrace);
-}
-/** See https://github.com/brillout/repro_node-syntax-error#nodejs-behavior */
-function getPackageName_stack2(err) {
-    const errStack = getErrStack(err);
-    if (!errStack)
-        return false;
-    const firstLine = errStack.trim().split('\n')[0];
-    return extractFromNodeModulesPath(firstLine);
-}
-function extractFromPath(filePath) {
-    assert(filePath);
-    filePath = clean(filePath);
-    filePath = filePath.replaceAll('\\', '/');
-    let packageName;
-    if (!filePath.includes('node_modules/')) {
-        packageName = filePath;
-        if (packageName.startsWith('/'))
-            return null;
-        if (packageName.startsWith('.'))
-            return null;
-    }
-    else {
-        packageName = filePath.split('node_modules/').pop();
-        // This assert is fairly risk, we should eventually remove it
-        assert(!packageName.startsWith('.'));
-        // This assert is fairly risk, we should eventually remove it
-        assert(!packageName.startsWith('/'));
-    }
-    if (!packageName)
-        return null;
-    packageName = packageName.split('/').slice(0, 2).join('/');
-    if (!packageName.startsWith('@')) {
-        packageName = packageName.split('/')[0];
-    }
-    packageName = clean(packageName);
-    return packageName;
-}
-function clean(packageName) {
-    const b = ['"', "'", '(', ')'];
-    if (b.includes(packageName[0])) {
-        packageName = packageName.slice(1);
-    }
-    if (b.includes(packageName[packageName.length - 1])) {
-        packageName = packageName.slice(0, -1);
-    }
-    return packageName;
+    assert(false);
 }
-function extractFromNodeModulesPath(str) {
-    if (!includesNodeModules(str))
-        return false;
-    const packageName = extractFromPath(str);
-    assert(packageName);
-    return packageName;
-}
-function includes(str1, str2) {
-    if (!str1)
-        return false;
-    if (str2 instanceof RegExp) {
-        return str2.test(str1.toLowerCase());
-    }
-    if (typeof str2 === 'string') {
-        return str1.toLowerCase().includes(str2.toLowerCase());
-    }
-    return false;
-}
-function includesNodeModules(str) {
-    if (!str)
-        return false;
-    str = str.replaceAll('\\', '/');
-    if (!str.includes('node_modules/'))
-        return false;
-    if (str.includes('node_modules/vite/'))
-        return false;
-    return true;
-}
-function normalizeArray(arr) {
-    const arrNormalized = arr.filter(isNotNullish);
-    if (arrNormalized.length === 0)
-        return null;
-    return arrNormalized;
+function getAnywhere(error) {
+    const code = getErrCode(error);
+    const message = getErrMessage(error);
+    const stack = getErrStack(error);
+    const anywhere = [code, message, stack].filter(Boolean).join('\n');
+    return anywhere;
 }
 function getErrMessage(err) {
     if (!isObject(err))
@@ -342,13 +158,6 @@ function getErrStack(err) {
         return null;
     return err.stack;
 }
-function getAnywhere(error) {
-    const code = getErrCode(error);
-    const message = getErrMessage(error);
-    const stack = getErrStack(error);
-    const anywhere = [code, message, stack].filter(Boolean).join('\n');
-    return anywhere;
-}
 function collectError(err) {
     console.log([
         '{',

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;
@@ -37,6 +37,10 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
     documentHtml: string;
     pageContextSerialized: null;
     pageContext: {
+        urlOriginal: string;
+        headersOriginal?: unknown;
+        headers?: unknown;
+    } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
         _baseAssets: string | null;
@@ -49,23 +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;
-        urlOriginal: string;
-    } & 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.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        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[]>;
     } & {
@@ -84,6 +88,10 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
     documentHtml: string;
     pageContextSerialized: string;
     pageContext: {
+        urlOriginal: string;
+        headersOriginal?: unknown;
+        headers?: unknown;
+    } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
         _baseAssets: string | null;
@@ -96,23 +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;
-        urlOriginal: string;
-    } & 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.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        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[]>;
     } & {
@@ -132,6 +140,10 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
     documentHtml: string;
     pageContextSerialized: null;
     pageContext: {
+        urlOriginal: string;
+        headersOriginal?: unknown;
+        headers?: unknown;
+    } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
         _baseAssets: string | null;
@@ -144,23 +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;
-        urlOriginal: string;
-    } & 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.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        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[]>;
     } & {
@@ -179,6 +191,10 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
     documentHtml: string;
     pageContextSerialized: string;
     pageContext: {
+        urlOriginal: string;
+        headersOriginal?: unknown;
+        headers?: unknown;
+    } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
         _baseAssets: string | null;
@@ -191,23 +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;
-        urlOriginal: string;
-    } & 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.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        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[]>;
     } & {
@@ -226,14 +242,19 @@ 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);
         isClientSideNavigation: boolean;
     };
 }): {
+    urlOriginal: string;
+    headersOriginal?: unknown;
+    headers?: unknown;
+} & {
     _objectCreatedByVike: boolean;
     _baseServer: string;
     _baseAssets: string | null;
@@ -246,13 +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;
-    urlOriginal: string;
-} & 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[];