vike 0.4.171 → 0.4.172-commit-ea2b76c

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

@@ -3,53 +3,95 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHint = exports.isKnownError = exports.isCjsEsmError = exports.logErrorHint = void 0;
+exports.getErrorHint = exports.logErrorHint = void 0;
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@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);
 }
 exports.logErrorHint = logErrorHint;
-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;
 }
-exports.getHint = getHint;
+exports.getErrorHint = getErrorHint;
 function logHint(hint) {
     hint = (0, utils_js_1.formatHintLog)(hint);
     hint = picocolors_1.default.bold(hint);
@@ -57,268 +99,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;
-}
-exports.isKnownError = isKnownError;
-// `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) => {
-        (0, utils_js_1.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;
-}
-exports.isCjsEsmError = isCjsEsmError;
-function normalizeRes(res) {
-    let packageNames = (0, utils_js_1.isArray)(res) ? res : [res];
-    packageNames = (0, utils_js_1.unique)(packageNames.filter(utils_js_1.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) {
-    (0, utils_js_1.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
-        (0, utils_js_1.assert)(!packageName.startsWith('.'));
-        // This assert is fairly risk, we should eventually remove it
-        (0, utils_js_1.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;
+    (0, utils_js_1.assert)(false);
 }
-function extractFromNodeModulesPath(str) {
-    if (!includesNodeModules(str))
-        return false;
-    const packageName = extractFromPath(str);
-    (0, utils_js_1.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(utils_js_1.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 (!(0, utils_js_1.isObject)(err))
@@ -347,13 +163,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/cjs/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.preparePageContextForUserConsumptionServerSide = void 0;
 const utils_js_1 = require("../utils.js");
 const sortPageContext_js_1 = require("../../../shared/sortPageContext.js");
-const addUrlComputedProps_js_1 = require("../../../shared/addUrlComputedProps.js");
+const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
 const addIs404ToPageProps_js_1 = require("../../../shared/addIs404ToPageProps.js");
 function preparePageContextForUserConsumptionServerSide(pageContext) {
-    (0, addUrlComputedProps_js_1.assertPageContextUrlComputedProps)(pageContext);
+    (0, getPageContextUrlComputed_js_1.assertPageContextUrl)(pageContext);
     (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(pageContext.routeParams));
     (0, utils_js_1.assert)('Page' in pageContext);
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(pageContext.pageExports));

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

@@ -9,7 +9,7 @@ const renderHtml_js_1 = require("../html/renderHtml.js");
 const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
 const utils_js_1 = require("../utils.js");
 const serializePageContextClientSide_js_1 = require("../html/serializePageContextClientSide.js");
-const addUrlComputedProps_js_1 = require("../../../shared/addUrlComputedProps.js");
+const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
 const globalContext_js_1 = require("../globalContext.js");
 const createHttpResponseObject_js_1 = require("./createHttpResponseObject.js");
 const loadUserFilesServerSide_js_1 = require("./loadUserFilesServerSide.js");
@@ -22,7 +22,6 @@ const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js
 const loadPageRoutes_js_1 = require("../../../shared/route/loadPageRoutes.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
-const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -109,9 +108,9 @@ async function prerender404Page(renderContext, pageContextInit_) {
         _debugRouteMatches: []
     };
     const pageContextInit = {
-        urlOriginal: '/fake-404-url', // A URL is needed for `applyViteHtmlTransform`
-        ...pageContextInit_
+        urlOriginal: '/fake-404-url' // A URL is needed for `applyViteHtmlTransform`
     };
+    (0, utils_js_1.objectAssign)(pageContextInit, pageContextInit_);
     {
         const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext);
         (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
@@ -120,15 +119,16 @@ async function prerender404Page(renderContext, pageContextInit_) {
     return prerenderPage(pageContext);
 }
 exports.prerender404Page = prerender404Page;
-function getPageContextInitEnhanced(pageContextInit, renderContext, { urlComputedPropsNonEnumerable = false, ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
+function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
     urlRewrite: null,
     urlHandler: null,
     isClientSideNavigation: false
 } } = {}) {
     (0, utils_js_1.assert)(pageContextInit.urlOriginal);
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    const pageContextInitEnhanced = {
-        ...pageContextInit,
+    const pageContextInitEnhanced = {};
+    (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextInit);
+    (0, utils_js_1.objectAssign)(pageContextInitEnhanced, {
         _objectCreatedByVike: true,
         // The following is defined on `pageContext` because we can eventually make these non-global (e.g. sot that two pages can have different includeAssetsImportedByServer settings)
         _baseServer: globalContext.baseServer,
@@ -145,8 +145,27 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { urlCompute
         _urlRewrite: urlRewrite,
         _urlHandler: urlHandler,
         isClientSideNavigation
-    };
-    (0, addUrlComputedProps_js_1.addUrlComputedProps)(pageContextInitEnhanced, !urlComputedPropsNonEnumerable);
+    });
+    // pageContext.urlParsed
+    const pageContextUrlComputed = (0, getPageContextUrlComputed_js_1.getPageContextUrlComputed)(pageContextInitEnhanced);
+    (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextUrlComputed);
+    // pageContext.headers
+    {
+        let headers;
+        if (pageContextInit.headersOriginal) {
+            headers = (0, utils_js_1.normalizeHeaders)(pageContextInit.headersOriginal);
+            (0, utils_js_1.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()
+            (0, utils_js_1.assertWarning)(false, 'Setting pageContextInit.headers is deprecated: set pageContextInit.headersOriginal instead, see https://vike.dev/headers', { onlyOnce: true });
+        }
+        else {
+            headers = null;
+        }
+        (0, utils_js_1.objectAssign)(pageContextInitEnhanced, { headers });
+    }
     return pageContextInitEnhanced;
 }
 exports.getPageContextInitEnhanced = getPageContextInitEnhanced;
@@ -156,7 +175,8 @@ async function getRenderContext() {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
     const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = await (0, getPageFiles_js_1.getPageFilesAll)(false, globalContext.isProduction);
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-    (0, assertV1Design_js_1.assertV1Design)(pageFilesAll.length > 0, pageConfigs, pageFilesAll);
+    // We assume assertV1Design() was already called at build-time
+    (0, utils_js_1.assert)(pageFilesAll.length === 0 || pageConfigs.length === 0);
     const renderContext = {
         pageFilesAll: pageFilesAll,
         pageConfigs,

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

@@ -205,7 +205,7 @@ function logHttpRequest(urlOriginal, httpRequestId) {
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(getRequestInfoMessage(urlOriginal), httpRequestId, 'info', clearErrors);
 }
 function getRequestInfoMessage(urlOriginal) {
-    return `HTTP request: ${picocolors_1.default.bold(urlOriginal)}`;
+    return `HTTP request: ${prettyUrl(urlOriginal)}`;
 }
 function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
     const statusCode = pageContextReturn.httpResponse?.statusCode ?? null;
@@ -221,7 +221,7 @@ function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
             //   - We should show `HTTP response ${urlOriginal} ERR` instead.
             //   - Maybe we can/should make the error available at pageContext.errorWhileRendering
             (0, utils_js_1.assert)(errorWhileRendering === null || errorWhileRendering === undefined);
-            msg = `HTTP response ${picocolors_1.default.bold(urlOriginal)} ${picocolors_1.default.dim('null')}`;
+            msg = `HTTP response ${prettyUrl(urlOriginal)} ${picocolors_1.default.dim('null')}`;
             // Erroneous value (it shoud sometimes be `false`) but it's fine as it doesn't seem to have much of an impact.
             isNominal = true;
         }
@@ -241,7 +241,7 @@ function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
                 const urlRedirect = headerRedirect[1];
                 urlOriginal = urlRedirect;
             }
-            msg = `HTTP ${type} ${picocolors_1.default.bold(urlOriginal)} ${color(statusCode ?? 'ERR')}`;
+            msg = `HTTP ${type} ${prettyUrl(urlOriginal)} ${color(statusCode ?? 'ERR')}`;
         }
     }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(msg, httpRequestId, isNominal ? 'info' : 'error');
@@ -289,12 +289,13 @@ async function renderPageNominal(pageContext) {
 async function getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPagePartial, renderContext, httpRequestId) {
     const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, renderContext, null, httpRequestId);
     (0, utils_js_1.assert)(errNominalPage);
-    const pageContext = {
-        ...pageContextInitEnhanced,
+    const pageContext = {};
+    (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
+    (0, utils_js_1.objectAssign)(pageContext, {
         is404: false,
         errorWhileRendering: errNominalPage,
         routeParams: {}
-    };
+    });
     (0, utils_js_1.objectAssign)(pageContext, {
         _debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR'
     });
@@ -346,7 +347,9 @@ function normalizeUrl(pageContextInit, httpRequestId) {
         return null;
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`URL normalized from ${picocolors_1.default.cyan(urlOriginal)} to ${picocolors_1.default.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
     const httpResponse = (0, createHttpResponseObject_js_1.createHttpResponseObjectRedirect)({ url: urlNormalized, statusCode: 301 }, pageContextInit.urlOriginal);
-    const pageContextHttpResponse = { ...pageContextInit, httpResponse };
+    const pageContextHttpResponse = {};
+    (0, utils_js_1.objectAssign)(pageContextHttpResponse, pageContextInit);
+    (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
 function getPermanentRedirect(pageContextInit, httpRequestId) {
@@ -381,7 +384,9 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
     }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirect defined by your config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
     const httpResponse = (0, createHttpResponseObject_js_1.createHttpResponseObjectRedirect)({ url: urlTarget, statusCode: 301 }, urlWithoutBase);
-    const pageContextHttpResponse = { ...pageContextInit, httpResponse };
+    const pageContextHttpResponse = {};
+    (0, utils_js_1.objectAssign)(pageContextHttpResponse, pageContextInit);
+    (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
 async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, 
@@ -397,11 +402,11 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
             (0, utils_js_1.assert)(abortCall);
             (0, utils_js_1.assertUsage)(errorPageId, `You called ${picocolors_1.default.cyan(abortCall)} but you didn't define an error page, make sure to define one https://vike.dev/error-page`);
             const pageContext = {
-                _pageId: errorPageId,
-                ...pageContextAbort,
-                ...pageContextErrorPageInit,
-                ...renderContext
+                _pageId: errorPageId
             };
+            (0, utils_js_1.objectAssign)(pageContext, pageContextAbort);
+            (0, utils_js_1.objectAssign)(pageContext, pageContextErrorPageInit);
+            (0, utils_js_1.objectAssign)(pageContext, renderContext);
             (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = (0, serializePageContextClientSide_js_1.serializePageContextClientSide)(pageContext);
@@ -422,10 +427,9 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
         return { pageContextReturn };
     }
     if (pageContextAbort._urlRedirect) {
-        const pageContextReturn = {
-            ...pageContextInit,
-            ...pageContextAbort
-        };
+        const pageContextReturn = {};
+        (0, utils_js_1.objectAssign)(pageContextReturn, pageContextInit);
+        (0, utils_js_1.objectAssign)(pageContextReturn, pageContextAbort);
         const httpResponse = (0, createHttpResponseObject_js_1.createHttpResponseObjectRedirect)(pageContextAbort._urlRedirect, (() => {
             const { pathname, searchOriginal } = pageContextNominalPageInit.urlParsed;
             const urlLogical = (0, utils_js_1.createUrlFromComponents)(null, pathname, searchOriginal, 
@@ -445,9 +449,12 @@ function checkBaseUrl(pageContextInit, httpRequestId) {
     const { urlWithoutPageContextRequestSuffix } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     const { hasBaseServer } = (0, utils_js_1.parseUrl)(urlWithoutPageContextRequestSuffix, baseServer);
     if (!hasBaseServer) {
-        (0, loggerRuntime_js_1.logRuntimeInfo)?.(`${getRequestInfoMessage(urlOriginal)} skipped because URL ${picocolors_1.default.bold(urlOriginal)} doesn't start with Base URL ${picocolors_1.default.bold(baseServer)} (https://vike.dev/base-url)`, httpRequestId, 'info');
+        (0, loggerRuntime_js_1.logRuntimeInfo)?.(`${getRequestInfoMessage(urlOriginal)} skipped because URL ${prettyUrl(urlOriginal)} doesn't start with Base URL ${prettyUrl(baseServer)} (https://vike.dev/base-url)`, httpRequestId, 'info');
         const pageContextHttpResponseNull = getPageContextHttpResponseNull(pageContextInit);
         return pageContextHttpResponseNull;
     }
     return null;
 }
+function prettyUrl(url) {
+    return picocolors_1.default.bold(decodeURI(url));
+}

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

@@ -68,3 +68,5 @@ __exportStar(require("../../utils/truncateString.js"), exports);
 __exportStar(require("../../utils/formatHintLog.js"), exports);
 __exportStar(require("../../utils/joinEnglish.js"), exports);
 __exportStar(require("../../utils/isArrayOfStrings.js"), exports);
+__exportStar(require("../../utils/escapeHtml.js"), exports);
+__exportStar(require("../../utils/normalizeHeaders.js"), exports);

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertV1Design = void 0;
-const helpers_js_1 = require("../../shared/page-configs/helpers.js");
 const utils_js_1 = require("./utils.js");
 function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
     const isV1Design = pageConfigs.length > 0;
@@ -11,10 +10,10 @@ function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
             (0, utils_js_1.assert)(pageFilesAll.length > 0);
             const indent = '- ';
             const filesV1 = (0, utils_js_1.unique)(pageConfigs
-                .map((p) => Object.values(p.configValues)
-                .map((c) => (0, helpers_js_1.getConfigValueFilePathToShowToUser)(c.definedAtData))
+                .map((p) => Object.values(p.configValueSources).map((sources) => sources
+                .map((c) => c.definedAtFilePath.filePathAbsoluteUserRootDir)
                 .filter(utils_js_1.isNotNullish)
-                .map((filePathToShowToUser) => indent + filePathToShowToUser))
+                .map((filePathToShowToUser) => indent + filePathToShowToUser)))
                 .flat(2));
             const filesOld = pageFilesAll.map((p) => indent + p.filePath);
             lines.push(...['V1 design files:', ...filesV1, 'Old design files:', ...filesOld]);