vike 0.4.171 → 0.4.172

package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js

@@ -0,0 +1,198 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serializeConfigValues = void 0;
+const assertIsNotProductionRuntime_js_1 = require("../../../utils/assertIsNotProductionRuntime.js");
+const utils_js_1 = require("../../../node/plugin/utils.js");
+const addImportStatement_js_1 = require("../../../node/plugin/plugins/importUserCode/addImportStatement.js");
+const transformFileImports_js_1 = require("../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transformFileImports.js");
+const helpers_js_1 = require("../helpers.js");
+const stringify_1 = require("@brillout/json-serializer/stringify");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
+const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
+// This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigs()
+// - vike/shared/page-configs/serialize/parsePageConfigs.ts
+// - parsePageConfigs() is loaded on both the client- and server-side.
+(0, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();
+function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspace) {
+    const lines = [];
+    tabspace += '  ';
+    Object.entries(pageConfig.configValuesComputed ?? {}).forEach(([configName, configValuesComputed]) => {
+        if (!isEnvMatch(configValuesComputed.configEnv))
+            return;
+        // Is there a use case for overriding computed values? If yes, then configValeSources has higher precedence
+        if (pageConfig.configValueSources[configName])
+            return;
+        const valueData = serializeWithJson(configValuesComputed.value, configName, null, importStatements);
+        const configValueBase = {
+            type: 'computed',
+            definedAtData: null
+        };
+        serializeConfigValue(configValueBase, valueData, configName, lines, tabspace);
+    });
+    Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
+        const configDef = pageConfig.configDefinitions[configName];
+        (0, utils_js_1.assert)(configDef);
+        if (!configDef.cumulative) {
+            const configValueSource = sources[0];
+            (0, utils_js_1.assert)(configValueSource);
+            (0, utils_js_1.assert)(sources.slice(1).every((s) => s.isOverriden === true));
+            if (!isEnvMatch(configValueSource.configEnv))
+                return;
+            const { valueData, definedAtFile } = serializeConfigValueSource(configValueSource, configName, importStatements);
+            const configValueBase = {
+                type: 'standard',
+                definedAtData: definedAtFile
+            };
+            serializeConfigValue(configValueBase, valueData, configName, lines, tabspace);
+        }
+        else {
+            const valueDataList = [];
+            const definedAtData = [];
+            sources
+                .filter((s) => !s.isOverriden)
+                .forEach((configValueSource) => {
+                if (!isEnvMatch(configValueSource.configEnv))
+                    return;
+                const { valueData, definedAtFile } = serializeConfigValueSource(configValueSource, configName, importStatements);
+                valueDataList.push(valueData);
+                definedAtData.push(definedAtFile);
+            });
+            if (valueDataList.length === 0)
+                return;
+            const configValueBase = {
+                type: 'cumulative',
+                definedAtData
+            };
+            serializeConfigValue(configValueBase, valueDataList, configName, lines, tabspace);
+        }
+    });
+    return lines;
+}
+exports.serializeConfigValues = serializeConfigValues;
+function serializeConfigValueSource(configValueSource, configName, importStatements) {
+    (0, utils_js_1.assert)(configValueSource.isOverriden === false);
+    let valueData;
+    if ('value' in configValueSource) {
+        valueData = serializeWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements);
+    }
+    else {
+        valueData = serializeWithImport(configValueSource, importStatements);
+    }
+    const definedAtFile = {
+        filePathToShowToUser: configValueSource.definedAtFilePath.filePathToShowToUser,
+        fileExportPathToShowToUser: configValueSource.definedAtFilePath.fileExportPathToShowToUser
+    };
+    return { valueData, definedAtFile };
+}
+function serializeConfigValue(configValueBase, valueData, configName, lines, tabspace) {
+    lineAdd(`[${JSON.stringify(configName)}]: {`);
+    {
+        tab();
+        lineAdd(`type: "${configValueBase.type}",`);
+        lineAdd(`definedAtData: ${JSON.stringify(configValueBase.definedAtData)},`);
+        lineAdd(`valueSerialized:`);
+        if (!Array.isArray(valueData)) {
+            serializeValueData(valueData);
+        }
+        else {
+            lineAppend(' [');
+            valueData.forEach(serializeValueData);
+            lineAppend(` ],`);
+        }
+        untab();
+    }
+    lineAdd('},');
+    return;
+    function serializeValueData(valueData) {
+        lineAppend(` {`);
+        tab();
+        lineAdd(`type: "${valueData.type}",`);
+        const valueProp = valueData.type !== 'plus-file' ? 'value' : 'exportValues';
+        lineAdd(`${valueProp}: ${valueData.valueAsJsCode},`);
+        untab();
+        lineAdd(`},`);
+    }
+    function lineAppend(str) {
+        const i = lines.length - 1;
+        lines[i] = lines[i] += str;
+    }
+    function lineAdd(str) {
+        lines.push(`${tabspace}${str}`);
+    }
+    function tab() {
+        tabspace += '  ';
+    }
+    function untab() {
+        tabspace = tabspace.slice(2);
+    }
+}
+function serializeWithImport(configValueSource, importStatements) {
+    (0, utils_js_1.assert)(!configValueSource.valueIsFilePath);
+    const { valueIsImportedAtRuntime, valueIsDefinedByPlusFile, definedAtFilePath } = configValueSource;
+    (0, utils_js_1.assert)(valueIsImportedAtRuntime);
+    const { filePathAbsoluteVite, fileExportName } = definedAtFilePath;
+    if (valueIsDefinedByPlusFile)
+        (0, utils_js_1.assert)(fileExportName === undefined);
+    const { importName } = (0, addImportStatement_js_1.addImportStatement)(importStatements, filePathAbsoluteVite, fileExportName || '*');
+    return {
+        type: valueIsDefinedByPlusFile ? 'plus-file' : 'pointer-import',
+        valueAsJsCode: importName
+    };
+}
+function serializeWithJson(value, configName, definedAtData, importStatements) {
+    const valueAsJsCode = valueToJson(value, configName, definedAtData, importStatements);
+    return {
+        type: 'js-serialized',
+        valueAsJsCode
+    };
+}
+function valueToJson(value, configName, definedAtData, importStatements) {
+    const valueName = `config${(0, utils_js_1.getPropAccessNotation)(configName)}`;
+    let configValueSerialized;
+    try {
+        configValueSerialized = (0, stringify_1.stringify)(value, {
+            valueName,
+            forbidReactElements: true,
+            replacer(_, value) {
+                if (typeof value === 'string') {
+                    const importData = (0, transformFileImports_js_1.parsePointerImportData)(value);
+                    if (importData) {
+                        const { importName } = (0, addImportStatement_js_1.addImportStatement)(importStatements, importData.importPath, importData.exportName);
+                        const replacement = [REPLACE_ME_BEFORE, importName, REPLACE_ME_AFTER].join('');
+                        return { replacement };
+                    }
+                }
+            }
+        });
+    }
+    catch (err) {
+        logJsonSerializeError(err, configName, definedAtData);
+        (0, utils_js_1.assert)(false);
+    }
+    configValueSerialized = configValueSerialized.replaceAll(`"${REPLACE_ME_BEFORE}`, '');
+    configValueSerialized = configValueSerialized.replaceAll(`${REPLACE_ME_AFTER}"`, '');
+    (0, utils_js_1.assert)(!configValueSerialized.includes(REPLACE_ME_BEFORE));
+    (0, utils_js_1.assert)(!configValueSerialized.includes(REPLACE_ME_AFTER));
+    return configValueSerialized;
+}
+function logJsonSerializeError(err, configName, definedAtData) {
+    /*
+    // import { isJsonSerializerError } from '@brillout/json-serializer/stringify'
+    let serializationErrMsg = ''
+    if (isJsonSerializerError(err)) {
+      serializationErrMsg = err.messageCore
+    } else {
+      // When a property getter throws an error
+      console.error('Serialization error:')
+      console.error(err)
+      serializationErrMsg = 'see serialization error printed above'
+    }
+    //*/
+    const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(definedAtData);
+    (0, utils_js_1.assert)(configValueFilePathToShowToUser);
+    (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined over a so-called "pointer import", see https://vike.dev/config#pointer-imports`);
+}

package/dist/cjs/shared/route/executeGuardHook.js

@@ -23,7 +23,7 @@ async function executeGuardHook(pageContext, prepareForUserConsumption) {
     const res = prepareForUserConsumption(pageContext);
     if (res)
         pageContextForUserConsumption = res;
-    const hookResult = await (0, executeHook_js_1.executeHook)(() => guard(pageContextForUserConsumption), hook);
+    const hookResult = await (0, executeHook_js_1.executeHook)(() => guard(pageContextForUserConsumption), hook, pageContext);
     (0, utils_js_1.assertUsage)(hookResult === undefined, `${errIntro} ${hook.hookFilePath} returns a value, but guard() shouldn't return any value`);
 }
 exports.executeGuardHook = executeGuardHook;

package/dist/cjs/shared/route/executeOnBeforeRouteHook.js

@@ -42,7 +42,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     let hookReturn = onBeforeRouteHook.hookFn(pageContext);
     (0, resolveRouteFunction_js_1.assertSyncRouting)(hookReturn, `The onBeforeRoute() hook ${onBeforeRouteHook.hookFilePath}`);
     // TODO/v1-release: make executeOnBeforeRouteHook() and route() sync
-    hookReturn = await (0, executeHook_js_1.executeHook)(() => hookReturn, onBeforeRouteHook);
+    hookReturn = await (0, executeHook_js_1.executeHook)(() => hookReturn, onBeforeRouteHook, pageContext);
     const errPrefix = `The onBeforeRoute() hook defined by ${onBeforeRouteHook.hookFilePath}`;
     (0, utils_js_1.assertUsage)(hookReturn === null ||
         hookReturn === undefined ||

package/dist/cjs/shared/route/index.js

@@ -11,7 +11,7 @@ if ((0, isBrowser_js_1.isBrowser)()) {
     (0, assertRoutingType_js_1.assertClientRouting)();
 }
 const utils_js_1 = require("./utils.js");
-const addUrlComputedProps_js_1 = require("../addUrlComputedProps.js");
+const getPageContextUrlComputed_js_1 = require("../getPageContextUrlComputed.js");
 const resolvePrecedence_js_1 = require("./resolvePrecedence.js");
 const resolveRouteString_js_1 = require("./resolveRouteString.js");
 const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
@@ -20,7 +20,7 @@ const debug_js_1 = require("./debug.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 async function route(pageContextForRoute) {
     (0, debug_js_1.debug)('Pages routes:', pageContextForRoute._pageRoutes);
-    (0, addUrlComputedProps_js_1.addUrlComputedProps)(pageContextForRoute);
+    (0, getPageContextUrlComputed_js_1.assertPageContextUrl)(pageContextForRoute);
     const pageContextFromRoute = {};
     // onBeforeRoute()
     const pageContextFromOnBeforeRouteHook = await (0, executeOnBeforeRouteHook_js_1.executeOnBeforeRouteHook)(pageContextForRoute);

package/dist/cjs/shared/route/loadPageRoutes.js

@@ -31,7 +31,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
             let pageRoute = null;
             {
                 const configName = 'route';
-                const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, configName);
+                const configValue = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, configName);
                 if (configValue) {
                     const route = configValue.value;
                     (0, utils_js_1.assert)(configValue.definedAtData);
@@ -47,7 +47,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
                     }
                     else {
                         (0, utils_js_1.assert)((0, utils_js_2.isCallable)(route));
-                        if ((0, getConfigValue_js_1.getConfigValue)(pageConfig, 'iKnowThePerformanceRisksOfAsyncRouteFunctions', 'boolean'))
+                        if ((0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'iKnowThePerformanceRisksOfAsyncRouteFunctions', 'boolean'))
                             (0, resolveRouteFunction_js_1.warnDeprecatedAllowKey)();
                         pageRoute = {
                             pageId,

package/dist/cjs/shared/route/resolveRouteFunction.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.warnDeprecatedAllowKey = exports.assertSyncRouting = exports.assertRouteParams = exports.resolveRouteFunction = void 0;
-const addUrlComputedProps_js_1 = require("../addUrlComputedProps.js");
+const getPageContextUrlComputed_js_1 = require("../getPageContextUrlComputed.js");
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 async function resolveRouteFunction(routeFunction, pageContext, routeDefinedAtString) {
-    (0, addUrlComputedProps_js_1.assertPageContextUrlComputedProps)(pageContext);
+    (0, getPageContextUrlComputed_js_1.assertPageContextUrl)(pageContext);
     let result = routeFunction(pageContext);
     assertSyncRouting(result, `The Route Function ${routeDefinedAtString}`);
     // TODO/v1-release: make resolveRouteFunction() and route() sync

package/dist/cjs/shared/sortPageContext.js

@@ -4,14 +4,10 @@ exports.sortPageContext = void 0;
 const utils_js_1 = require("./utils.js");
 // Sort `pageContext` keys alphabetically, in order to make reading `console.log(pageContext)` easier
 function sortPageContext(pageContext) {
-    const entries = Object.entries(pageContext);
-    for (const key in pageContext) {
+    let descriptors = Object.getOwnPropertyDescriptors(pageContext);
+    for (const key of Object.keys(pageContext))
         delete pageContext[key];
-    }
-    entries
-        .sort(([key1], [key2]) => (0, utils_js_1.compareString)(key1, key2))
-        .forEach(([key, val]) => {
-        pageContext[key] = val;
-    });
+    descriptors = Object.fromEntries(Object.entries(descriptors).sort(([key1], [key2]) => (0, utils_js_1.compareString)(key1, key2)));
+    Object.defineProperties(pageContext, descriptors);
 }
 exports.sortPageContext = sortPageContext;

package/dist/cjs/shared/utils.js

@@ -41,3 +41,5 @@ __exportStar(require("../utils/checkType.js"), exports);
 __exportStar(require("../utils/getValuePrintable.js"), exports);
 __exportStar(require("../utils/escapeRegex.js"), exports);
 __exportStar(require("../utils/isArray.js"), exports);
+__exportStar(require("../utils/changeEnumerable.js"), exports);
+__exportStar(require("../utils/objectDefineProperty.js"), exports);

package/dist/cjs/utils/assert.js

@@ -92,7 +92,7 @@ function assertWarning(condition, msg, { onlyOnce, showStackTrace }) {
     }
     globalObject.onBeforeLog?.();
     if (showStackTrace) {
-        const err = new Error(msg);
+        const err = (0, createErrorWithCleanStackTrace_js_1.createErrorWithCleanStackTrace)(msg, numberOfStackTraceLinesToRemove);
         globalObject.showStackTraceList.add(err);
         globalObject.logger(err, 'warn');
     }

package/dist/cjs/utils/assertNodeVersion.js

@@ -8,6 +8,6 @@ function assertNodeVersion() {
     if (!(0, isNodeJS_js_1.isNodeJS)())
         return;
     const version = process.versions.node;
-    (0, assertVersion_js_1.assertVersion)('Node.js', version, '16.0.0');
+    (0, assertVersion_js_1.assertVersion)('Node.js', version, '18.0.0');
 }
 exports.assertNodeVersion = assertNodeVersion;

package/dist/cjs/utils/changeEnumerable.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.changeEnumerable = void 0;
+/** Change enumerability of an object property. */
+function changeEnumerable(obj, prop, enumerable) {
+    const descriptor = Object.getOwnPropertyDescriptor(obj, prop);
+    Object.defineProperty(obj, prop, { ...descriptor, enumerable });
+}
+exports.changeEnumerable = changeEnumerable;

package/dist/cjs/utils/escapeHtml.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.escapeHtml = void 0;
+// Copied from https://stackoverflow.com/questions/6234773/can-i-escape-html-special-chars-in-javascript/6234804#6234804
+function escapeHtml(unsafeString) {
+    const safe = unsafeString
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#039;');
+    return safe;
+}
+exports.escapeHtml = escapeHtml;

package/dist/cjs/utils/getPropAccessNotation.js

@@ -2,9 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPropAccessNotation = void 0;
 function getPropAccessNotation(key) {
-    return isKeyDotNotationCompatible(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
+    return typeof key === 'string' && /^[a-z0-9\$_]+$/i.test(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
 }
 exports.getPropAccessNotation = getPropAccessNotation;
-function isKeyDotNotationCompatible(key) {
-    return /^[a-z0-9\$_]+$/i.test(key);
-}

package/dist/cjs/utils/hasProp.js

@@ -1,23 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasProp = void 0;
-// - https://2ality.com/2020/06/type-guards-assertion-functions-typescript.html
-// - https://www.typescriptlang.org/play?#code/GYVwdgxgLglg9mABDAzgFQJ4AcCmdgAUAbgIYA2IOAXIiWBgDSJTbWIDkARnHGTnewCUNUhRzIUibr35gA3AFgAUKEiwEEzLnzFylGnUbNWNdmBABbTjgBOQkXvGpE5q7cUrw0eElRa8hKL6tPRMLLimKFA2MGAA5vaIQU6SUTHxHqreGn6sOskGocYRHOAA1mBwAO5gickSiOWVNZle6r7oeYGOhUbhbGmxcYgAvKVgFdW1wlI8fHSIAN7KiMiExeIjW+OTNeyIgksrq4g2OFAgNkjRlMcAvsdnF1cb+EmOo9v9Hg9KyhAIKK0GhNKajRAAFgATMplCQUChbFACLltIQSEwzJZrHZBIJ-oCZAA6MhwOIEEj4v6eNQ+WgIpEEAFgAAmMHaIImzTAM3hiJsUEkzLZ7SOShOa0QTIQIp8hyelzAx1WUAAFjZqi4cFVEABRGwamwEdgAQQZArpADESDAyEJlHcgA
 const isCallable_js_1 = require("./isCallable.js");
 const isObject_js_1 = require("./isObject.js");
 const isArrayOfStrings_js_1 = require("./isArrayOfStrings.js");
 const isObjectOfStrings_js_1 = require("./isObjectOfStrings.js");
 const isArray_js_1 = require("./isArray.js");
-function hasProp(obj, prop, type = 'unknown') {
+function hasProp(obj, prop, type) {
     if (!(0, isObject_js_1.isObject)(obj))
         return false;
     if (!(prop in obj)) {
         return type === 'undefined';
     }
-    if (type === 'unknown') {
+    if (type === undefined) {
         return true;
     }
     const propValue = obj[prop];
+    if (type === 'undefined') {
+        return propValue === undefined;
+    }
     if (type === 'array') {
         return (0, isArray_js_1.isArray)(propValue);
     }
@@ -39,9 +40,6 @@ function hasProp(obj, prop, type = 'unknown') {
     if (type === 'null') {
         return propValue === null;
     }
-    if (type === 'undefined') {
-        return propValue === undefined;
-    }
     if (type === 'true') {
         return propValue === true;
     }

package/dist/cjs/utils/normalizeHeaders.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeHeaders = void 0;
+function normalizeHeaders(
+/* This type is precise, too precise which can be annoying: e.g. cannot pass a string[][] argument because it doesn't match the more precise [string,string][] type.
+headersOriginal ConstructorParameters<typeof Headers>[0]
+*/
+headersOriginal) {
+    const headersStandard = new Headers(headersOriginal);
+    const headers = Object.fromEntries(headersStandard.entries());
+    return headers;
+}
+exports.normalizeHeaders = normalizeHeaders;

package/dist/cjs/utils/objectAssign.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.objectAssign = void 0;
 // Same as Object.assign() but:
 //  - With type inference
-//  - Preserves property descriptors, which we need for preserving the getters added by addUrlComputedProps()
+//  - Preserves property descriptors, which we need for preserving the getters added by getPageContextUrlComputed()
 function objectAssign(obj, objAddendum) {
     if (objAddendum) {
         Object.defineProperties(obj, Object.getOwnPropertyDescriptors(objAddendum));

package/dist/cjs/utils/objectDefineProperty.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.objectDefineProperty = void 0;
+/** Like Object.defineProperty() but with type inference */
+function objectDefineProperty(obj, prop, { get, ...args }) {
+    Object.defineProperty(obj, prop, { ...args, get });
+}
+exports.objectDefineProperty = objectDefineProperty;

package/dist/cjs/utils/objectKeys.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.objectKeys = exports.objectFromEntries = exports.objectEntries = void 0;
+// export { forEach }
 // https://stackoverflow.com/questions/60141960/typescript-key-value-relation-preserving-object-entries-type/75337277#75337277
 /** Same as Object.entries() but with type inference */
 function objectEntries(obj) {
@@ -19,8 +20,11 @@ function objectKeys(obj) {
     return Object.keys(obj);
 }
 exports.objectKeys = objectKeys;
-/*
-function objectKeys2<T extends Record<string, unknown>>(obj: T): Array<keyof T> {
-  return Object.keys(obj)
+/* Not used yet, but can be quite useful.
+function forEach<Obj extends object>(
+  obj: Obj,
+  iterator: <Key extends keyof Obj>(key: Key, val: Obj[Key]) => void
+): void {
+  Object.entries(obj).forEach(([key, val]) => iterator(key as keyof Obj, val))
 }
-*/
+//*/

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.171';
+const PROJECT_VERSION = '0.4.172';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/client/client-routing-runtime/createPageContext.d.ts

@@ -5,12 +5,14 @@ declare function createPageContext(urlOriginal: string): Promise<{
     _urlHandler: null;
     _urlRewrite: null;
     _baseServer: string;
-    _pageFilesAll: import("../../shared/getPageFiles/getPageFileObject.js").PageFile[];
-    _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
+    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+    _pageConfigs: import("../../__internal/index.js").PageConfig[];
     _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
     _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-} & import("../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-    _urlRewrite: string | null;
+} & {
+    urlParsed: import("../../shared/getPageContextUrlComputed.js").Url;
+    urlPathname: string;
+    url: string;
 }>;

package/dist/esm/client/client-routing-runtime/createPageContext.js

@@ -1,9 +1,9 @@
 export { createPageContext };
-import { addUrlComputedProps } from '../../shared/addUrlComputedProps.js';
+import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
 import { getPageFilesAll } from '../../shared/getPageFiles.js';
 import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
 import { getBaseServer } from './getBaseServer.js';
-import { assert, isBaseServer, getGlobalObject } from './utils.js';
+import { assert, isBaseServer, getGlobalObject, objectAssign } from './utils.js';
 const globalObject = getGlobalObject('createPageContext.ts', {});
 async function createPageContext(urlOriginal) {
     if (!globalObject.pageFilesData) {
@@ -26,6 +26,7 @@ async function createPageContext(urlOriginal) {
         _pageRoutes: pageRoutes,
         _onBeforeRouteHook: onBeforeRouteHook
     };
-    addUrlComputedProps(pageContext);
+    const pageContextUrlComputed = getPageContextUrlComputed(pageContext);
+    objectAssign(pageContext, pageContextUrlComputed);
     return pageContext;
 }

package/dist/esm/client/client-routing-runtime/getPageContextFromHooks.js

@@ -10,7 +10,7 @@ import { preparePageContextForUserConsumptionClientSide } from '../shared/prepar
 import { removeBuiltInOverrides } from './getPageContext/removeBuiltInOverrides.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getPageConfig } from '../../shared/page-configs/helpers.js';
-import { getConfigValue } from '../../shared/page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValue.js';
 import { assertOnBeforeRenderHookReturn } from '../../shared/assertOnBeforeRenderHookReturn.js';
 import { executeGuardHook } from '../../shared/route/executeGuardHook.js';
 import { AbortRender, isAbortPageContext } from '../../shared/route/abort.js';
@@ -32,7 +32,9 @@ async function getPageContextFromHooks_isHydration(pageContext) {
         _hasPageContextFromServer: true
     };
     for (const hookName of ['data', 'onBeforeRender']) {
-        const pageContextForHook = { ...pageContext, ...pageContextFromHooks };
+        const pageContextForHook = {};
+        objectAssign(pageContextForHook, pageContext);
+        objectAssign(pageContextForHook, pageContextFromHooks);
         if (hookClientOnlyExists(hookName, pageContextForHook)) {
             const pageContextFromHook = await executeHookClientSide(hookName, pageContextForHook);
             Object.assign(pageContextFromHooks, pageContextFromHook);
@@ -45,6 +47,9 @@ async function getPageContextFromHooks_isNotHydration(pageContext, isErrorPage)
         isHydration: false,
         _hasPageContextFromClient: false
     };
+    const pageContextForCondition = {};
+    objectAssign(pageContextForCondition, pageContext);
+    objectAssign(pageContextForCondition, pageContextFromHooks);
     let hasPageContextFromServer = false;
     // If pageContextInit has some client data or if one of the hooks guard(), data() or onBeforeRender() is server-side
     // only, then we need to fetch pageContext from the server.
@@ -53,7 +58,7 @@ async function getPageContextFromHooks_isNotHydration(pageContext, isErrorPage)
     // For the error page, we cannot fetch pageContext from the server because the pageContext JSON request is based on the URL
     !isErrorPage &&
         // true if pageContextInit has some client data or at least one of the data() and onBeforeRender() hooks is server-side only:
-        (await hasPageContextServer({ ...pageContext, ...pageContextFromHooks }))) {
+        (await hasPageContextServer(pageContextForCondition))) {
         const res = await fetchPageContextFromServer(pageContext);
         if ('is404ServerSideRouted' in res)
             return { is404ServerSideRouted: true };
@@ -70,11 +75,10 @@ async function getPageContextFromHooks_isNotHydration(pageContext, isErrorPage)
     // Note: for the error page, we also execute the client-side data() and onBeforeRender() hooks, but maybe we
     // shouldn't? The server-side does it as well (but maybe it shouldn't).
     for (const hookName of ['guard', 'data', 'onBeforeRender']) {
-        const pageContextForHook = {
-            _hasPageContextFromServer: hasPageContextFromServer,
-            ...pageContext,
-            ...pageContextFromHooks
-        };
+        const pageContextForHook = {};
+        objectAssign(pageContextForHook, { _hasPageContextFromServer: hasPageContextFromServer });
+        objectAssign(pageContextForHook, pageContext);
+        objectAssign(pageContextForHook, pageContextFromHooks);
         if (hookName === 'guard') {
             if (!isErrorPage &&
                 // We don't need to call guard() on the client-side if we fetch pageContext from the server side. (Because the `${url}.pageContext.json` HTTP request will already trigger the routing and guard() hook on the server-side.)
@@ -108,7 +112,7 @@ async function executeHookClientSide(hookName, pageContext) {
         return null;
     }
     const pageContextForUserConsumption = preparePageContextForUserConsumptionClientSide(pageContext, true);
-    const hookResult = await executeHook(() => hook.hookFn(pageContextForUserConsumption), hook);
+    const hookResult = await executeHook(() => hook.hookFn(pageContextForUserConsumption), hook, pageContext);
     const pageContextFromHook = {};
     if (hookName === 'onBeforeRender') {
         assertOnBeforeRenderHookReturn(hookResult, hook.hookFilePath);
@@ -165,7 +169,7 @@ async function hookServerOnlyExists(hookName, pageContext) {
     if (pageContext._pageConfigs.length > 0) {
         // V1
         const pageConfig = getPageConfig(pageContext._pageId, pageContext._pageConfigs);
-        const hookEnv = getConfigValue(pageConfig, `${hookName}Env`)?.value ?? {};
+        const hookEnv = getConfigValueRuntime(pageConfig, `${hookName}Env`)?.value ?? {};
         assert(isObject(hookEnv));
         return !!hookEnv.server && !hookEnv.client;
     }
@@ -189,7 +193,7 @@ function hookClientOnlyExists(hookName, pageContext) {
     if (pageContext._pageConfigs.length > 0) {
         // V1
         const pageConfig = getPageConfig(pageContext._pageId, pageContext._pageConfigs);
-        const hookEnv = getConfigValue(pageConfig, `${hookName}Env`)?.value ?? {};
+        const hookEnv = getConfigValueRuntime(pageConfig, `${hookName}Env`)?.value ?? {};
         assert(isObject(hookEnv));
         return !!hookEnv.client && !hookEnv.server;
     }
@@ -221,7 +225,7 @@ async function fetchPageContextFromServer(pageContext) {
     }
     // Is there a reason for having two different properties? Can't we use only one property? I guess/think the isServerSideError property was an attempt (a bad idea really) for rendering the error page even though an error occured on the server-side (which is a bad idea because the added complexity is non-negligible while the added value is minuscule since the error page usually doesn't have any (meaningful / server-side) hooks).
     if ('serverSideError' in pageContextFromServer || isServerSideError in pageContextFromServer) {
-        throw getProjectError(`The pageContext object couldn't be fetched from the server as an error occurred on the server-side. Check your server logs.`);
+        throw getProjectError(`pageContext couldn't be fetched from server: an error occurred on the server-side (see your server logs)`);
     }
     assert(hasProp(pageContextFromServer, '_pageId', 'string'));
     processPageContextFromServer(pageContextFromServer);

package/dist/esm/client/client-routing-runtime/installClientRouter.js

@@ -7,22 +7,30 @@ import { onLinkClick } from './onLinkClick.js';
 import { setupNativeScrollRestoration } from './scrollRestoration.js';
 import { autoSaveScrollPosition } from './setScrollPosition.js';
 async function installClientRouter() {
-    setupNativeScrollRestoration();
-    initHistoryState();
-    autoSaveScrollPosition();
-    monkeyPatchHistoryPushState();
-    // First initial render
+    // Init navigation history and scroll restoration
+    initHistoryAndScroll();
+    // Render initial page
+    const renderPromise = render();
+    // Intercept <a> clicks
+    onLinkClick();
+    // Preserve stack track
+    await renderPromise;
+}
+function render() {
     assert(getRenderCount() === 0);
-    const promise = renderPageClientSide({
+    const renderPromise = renderPageClientSide({
         scrollTarget: 'preserve-scroll',
         isBackwardNavigation: null,
         isClientSideNavigation: false
     });
     assert(getRenderCount() === 1);
-    // Intercept <a> links
-    onLinkClick();
+    return renderPromise;
+}
+function initHistoryAndScroll() {
+    setupNativeScrollRestoration();
+    initHistoryState();
+    autoSaveScrollPosition();
+    monkeyPatchHistoryPushState();
     // Handle back-/forward navigation
     onBrowserHistoryNavigation();
-    // Only for full stack straces
-    await promise;
 }