vike 0.4.144-commit-f7ab002 → 0.4.144-commit-7f5e99a

package/dist/cjs/__internal/index.js

@@ -1,9 +1,7 @@
 "use strict";
-// Internal functions of vike needed by other plugins are exported via this file
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPagesAndRoutes = exports.route = void 0;
 const index_js_1 = require("../shared/route/index.js");
-Object.defineProperty(exports, "route", { enumerable: true, get: function () { return index_js_1.route; } });
 const globalContext_js_1 = require("../node/runtime/globalContext.js");
 const nodeEnv_js_1 = require("../utils/nodeEnv.js");
 const assert_js_1 = require("../utils/assert.js");
@@ -29,3 +27,9 @@ async function getPagesAndRoutes() {
     };
 }
 exports.getPagesAndRoutes = getPagesAndRoutes;
+async function route(pageContext) {
+    const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
+    // Old interface
+    return { pageContextAddendum: pageContextFromRoute };
+}
+exports.route = route;

package/dist/cjs/node/plugin/plugins/commonConfig.js

@@ -18,9 +18,6 @@ function commonConfig() {
     return [
         {
             name: 'vike-commonConfig-1',
-            config: () => ({
-                appType: 'custom'
-            }),
             configResolved(config) {
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
             }

package/dist/cjs/node/plugin/plugins/devConfig/index.js

@@ -23,6 +23,7 @@ function devConfig() {
             apply,
             config() {
                 return {
+                    appType: 'custom',
                     optimizeDeps: {
                         exclude: [
                             // We exclude the vike client to be able to use `import.meta.glob()`

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.js

@@ -118,6 +118,7 @@ function getConfigValueSerialized(value, configName, definedAt) {
             serializationErrMsg = err.messageCore;
         }
         else {
+            // When a property getter throws an error
             console.error('Serialization error:');
             console.error(err);
             serializationErrMsg = 'see serialization error printed above';

package/dist/cjs/node/plugin/plugins/previewConfig.js

@@ -18,6 +18,7 @@ function previewConfig() {
         apply: 'serve',
         config(config) {
             return {
+                appType: 'custom',
                 build: {
                     outDir: (0, utils_js_1.resolveOutDir)(config)
                 }
@@ -28,6 +29,10 @@ function previewConfig() {
             configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
         },
         configurePreviewServer(server) {
+            /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
+               - This ugly hack to set appType for preview won't be need once https://github.com/vitejs/vite/pull/14855 is merged.
+            config.appType = 'mpa'
+            */
             (0, utils_js_1.markEnvAsPreview)();
             return () => {
                 assertDist();

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

@@ -371,7 +371,7 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
             enumerable: false,
             configurable: true
         });
-        (0, utils_js_1.assert)((0, utils_js_1.hasPropertyGetter)(pageContext, 'url'));
+        (0, utils_js_1.assert)((0, utils_js_1.isPropertyGetter)(pageContext, 'url'));
         (0, utils_js_1.assert)(pageContext.urlOriginal);
         pageContext._urlOriginalBeforeHook = pageContext.urlOriginal;
     });
@@ -410,7 +410,7 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
     prerenderContext.pageContexts = result.prerenderContext.pageContexts;
     prerenderContext.pageContexts.forEach((pageContext) => {
         // TODO/v1-release: remove
-        if (!(0, utils_js_1.hasPropertyGetter)(pageContext, 'url') && pageContext.url) {
+        if (pageContext.url && !(0, utils_js_1.isPropertyGetter)(pageContext, 'url')) {
             (0, utils_js_1.assertWarning)(false, msgPrefix +
                 ' provided pageContext.url but it should provide pageContext.urlOriginal instead, see https://vike.dev/migration/0.4.23', { onlyOnce: true });
             pageContext.urlOriginal = pageContext.url;
@@ -435,10 +435,9 @@ async function routeAndPrerender(prerenderContext, htmlFiles, prerenderPageIds,
     await Promise.all(prerenderContext.pageContexts.map((pageContext) => concurrencyLimit(async () => {
         const { urlOriginal } = pageContext;
         (0, utils_js_1.assert)(urlOriginal);
-        const routeResult = await (0, index_js_1.route)(pageContext);
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(routeResult.pageContextAddendum, '_pageId', 'null') ||
-            (0, utils_js_1.hasProp)(routeResult.pageContextAddendum, '_pageId', 'string'));
-        if (routeResult.pageContextAddendum._pageId === null) {
+        const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
+        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextFromRoute, '_pageId', 'null') || (0, utils_js_1.hasProp)(pageContextFromRoute, '_pageId', 'string'));
+        if (pageContextFromRoute._pageId === null) {
             let hookName;
             let hookFilePath;
             if (pageContext._providedByHook) {
@@ -455,13 +454,13 @@ async function routeAndPrerender(prerenderContext, htmlFiles, prerenderPageIds,
             }
             else {
                 // `prerenderHookFile` is `null` when the URL was deduced by the Filesytem Routing of `.page.js` files. The `onBeforeRoute()` can override Filesystem Routing; it is therefore expected that the deduced URL may not match any page.
-                (0, utils_js_1.assert)(routeResult.pageContextAddendum._routingProvidedByOnBeforeRouteHook);
+                (0, utils_js_1.assert)(pageContextFromRoute._routingProvidedByOnBeforeRouteHook);
                 // Abort since the URL doesn't correspond to any page
                 return;
             }
         }
-        (0, utils_js_1.assert)(routeResult.pageContextAddendum._pageId);
-        (0, utils_js_1.objectAssign)(pageContext, routeResult.pageContextAddendum);
+        (0, utils_js_1.assert)(pageContextFromRoute._pageId);
+        (0, utils_js_1.objectAssign)(pageContext, pageContextFromRoute);
         const { _pageId: pageId } = pageContext;
         (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageFilesServerSide_js_1.loadPageFilesServerSide)(pageContext));
         let usesClientRouter;

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

@@ -23,7 +23,7 @@ __exportStar(require("../../utils/objectAssign.js"), exports);
 __exportStar(require("../../utils/isObjectWithKeys.js"), exports);
 __exportStar(require("../../utils/isCallable.js"), exports);
 __exportStar(require("../../utils/getOutDirs.js"), exports);
-__exportStar(require("../../utils/hasPropertyGetter.js"), exports);
+__exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/filesystemPathHandling.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../shared/hooks/executeHook.js"), exports);

package/dist/cjs/node/runtime/html/serializePageContextClientSide.js

@@ -58,6 +58,7 @@ function serializePageContextClientSide(pageContext) {
                     msg = `${msg} Serialization error: ${err.messageCore}.`;
                 }
                 else {
+                    // When a property getter throws an error
                     console.warn('Serialization error:');
                     console.warn(err);
                     msg = `${msg} The serialization failed because of the error printed above.`;

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

@@ -246,8 +246,8 @@ async function renderPageNominal(pageContext) {
     }
     // Route
     {
-        const routeResult = await (0, index_js_1.route)(pageContext);
-        (0, utils_js_1.objectAssign)(pageContext, routeResult.pageContextAddendum);
+        const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
+        (0, utils_js_1.objectAssign)(pageContext, pageContextFromRoute);
         (0, utils_js_1.objectAssign)(pageContext, { is404: pageContext._pageId ? null : true });
         if (pageContext._pageId === null) {
             const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs);

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

@@ -44,7 +44,7 @@ __exportStar(require("../../utils/capitalizeFirstLetter.js"), exports);
 __exportStar(require("../../utils/debugGlob.js"), exports);
 __exportStar(require("../../utils/isEquivalentError.js"), exports);
 __exportStar(require("../../utils/styleFileRE.js"), exports);
-__exportStar(require("../../utils/hasPropertyGetter.js"), exports);
+__exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/debug.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);

package/dist/cjs/shared/addUrlComputedProps.js

@@ -6,24 +6,36 @@ const utils_js_1 = require("./utils.js");
 function addUrlComputedProps(pageContext, enumerable = true) {
     (0, utils_js_1.assert)(pageContext.urlOriginal);
     if ('urlPathname' in pageContext) {
-        (0, utils_js_1.assert)((0, utils_js_1.hasPropertyGetter)(pageContext, 'urlPathname'));
+        (0, utils_js_1.assert)(typeof pageContext.urlPathname === 'string');
+        /* If this assert() fails then it's most likely because Object.assign() was used instead of objectAssign(), i.e.:
+           ```js
+           // Add property getters such as pageContext.urlPathname to pageContext
+           addUrlComputedProps(pageContext)
+           // ❌ Breaks the property getters of pageContext set by addUrlComputedProps() such as pageContext.urlPathname
+           Object.assign(pageContext2, pageContext)
+           // ❌ Also breaks the property getters
+           const pageContext3 = { ...pageContext }
+           // ✅ Preserves property getters of pageContext (see objectAssign() implementation)
+           objectAssign(pageContext2, pageContext)
+           ```
+        */
+        (0, utils_js_1.assert)((0, utils_js_1.isPropertyGetter)(pageContext, 'urlPathname'));
     }
+    if ('urlParsed' in pageContext)
+        (0, utils_js_1.assert)((0, utils_js_1.isPropertyGetter)(pageContext, 'urlParsed'));
+    // TODO/v1-release: move pageContext.urlParsed to pageContext.url
+    if ('url' in pageContext)
+        (0, utils_js_1.assert)((0, utils_js_1.isPropertyGetter)(pageContext, 'url'));
     Object.defineProperty(pageContext, 'urlPathname', {
         get: urlPathnameGetter,
         enumerable,
         configurable: true
     });
-    // TODO/v1-release: move pageContext.urlParsed to pageContext.url
-    if ('url' in pageContext)
-        (0, utils_js_1.assert)((0, utils_js_1.hasPropertyGetter)(pageContext, 'url'));
     Object.defineProperty(pageContext, 'url', {
         get: urlGetter,
         enumerable: false,
         configurable: true
     });
-    if ('urlParsed' in pageContext) {
-        (0, utils_js_1.assert)((0, utils_js_1.hasPropertyGetter)(pageContext, 'urlParsed'));
-    }
     Object.defineProperty(pageContext, 'urlParsed', {
         get: urlParsedGetter,
         enumerable,
@@ -32,17 +44,17 @@ function addUrlComputedProps(pageContext, enumerable = true) {
 }
 exports.addUrlComputedProps = addUrlComputedProps;
 function getUrlParsed(pageContext) {
-    // We use a url handler function because the onBeforeRoute() hook may modify pageContext.urlOriginal (e.g. for i18n)
+    // We need a url handler function because the onBeforeRoute() hook may set pageContext.urlLogical (typically for i18n)
     let urlHandler = pageContext._urlHandler;
     if (!urlHandler) {
         urlHandler = (url) => url;
     }
-    const url = pageContext._urlRewrite ?? pageContext.urlOriginal;
-    (0, utils_js_1.assert)(url && typeof url === 'string');
-    const urlLogical = urlHandler(url);
+    let urlResolved = pageContext._urlRewrite ?? pageContext.urlLogical ?? pageContext.urlOriginal;
+    urlResolved = urlHandler(urlResolved);
     const baseServer = pageContext._baseServer;
+    (0, utils_js_1.assert)(urlResolved && typeof urlResolved === 'string');
     (0, utils_js_1.assert)(baseServer.startsWith('/'));
-    return (0, utils_js_1.parseUrl)(urlLogical, baseServer);
+    return (0, utils_js_1.parseUrl)(urlResolved, baseServer);
 }
 function urlPathnameGetter() {
     const { pathname } = getUrlParsed(this);

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

@@ -11,6 +11,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 async function executeOnBeforeRouteHook(onBeforeRouteHook, pageContext) {
     let hookReturn = onBeforeRouteHook.onBeforeRoute(pageContext);
     (0, resolveRouteFunction_js_1.assertSyncRouting)(hookReturn, `The onBeforeRoute() hook ${onBeforeRouteHook.hookFilePath}`);
+    // TODO/v1-release: make executeOnBeforeRouteHook() and route() sync
     hookReturn = await hookReturn;
     const errPrefix = `The onBeforeRoute() hook defined by ${onBeforeRouteHook.hookFilePath}`;
     (0, utils_js_1.assertUsage)(hookReturn === null ||
@@ -28,28 +29,25 @@ async function executeOnBeforeRouteHook(onBeforeRouteHook, pageContext) {
     if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'routeParams')) {
         (0, resolveRouteFunction_js_1.assertRouteParams)(hookReturn.pageContext, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { routeParams } }')} but routeParams should`);
     }
-    const pageContextAddendumHook = {};
+    const deprecatedReturn = (prop) => `${errPrefix} returned ${picocolors_1.default.cyan(`{ pageContext: { ${prop} } }`)} which is deprecated. Return ${picocolors_1.default.cyan('{ pageContext: { urlLogical } }')} instead.`;
     if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'url')) {
-        (0, utils_js_1.assertWarning)(false, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { url } }')} but ${picocolors_1.default.cyan('pageContext.url')} has been renamed to ${picocolors_1.default.cyan('pageContext.urlOriginal')}. Return ${picocolors_1.default.cyan('{ pageContext: { urlOriginal } }')} instead. (See https://vike.dev/migration/0.4.23 for more information.)`, { onlyOnce: true });
-        hookReturn.pageContext.urlOriginal = hookReturn.pageContext.url;
+        (0, utils_js_1.assertWarning)(false, deprecatedReturn('url'), { onlyOnce: true });
+        hookReturn.pageContext.urlLogical = hookReturn.pageContext.url;
         delete hookReturn.pageContext.url;
     }
     if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'urlOriginal')) {
-        (0, utils_js_1.assertUsageUrl)(hookReturn.pageContext.urlOriginal, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { urlOriginal } }')} but ${picocolors_1.default.cyan('urlOriginal')}`);
-        // Ugly workaround: ideally urlOriginal should be immutable.
-        //  - Instead of using pageContext._urlOriginalPristine, maybe we can keep pageContext.urlOriginal immutable while re-using `pageContext._urlRewrite`.
-        //  - Or better yet we rename pageContext._urlRewrite to pageContext.urlLogical and we allow the user to override pageContext.urlLogical, and we rename pageContext.urlOriginal => `pageContext.urlReal`.
-        //    - pageContext.urlReal / pageContext.urlLogical
-        //                         VS
-        //      pageContext.urlReal / pageContext.urlModified
-        //                         VS
-        //      pageContext.urlOriginal / pageContext.urlModified
-        (0, utils_js_1.objectAssign)(pageContextAddendumHook, { _urlOriginalPristine: pageContext.urlOriginal });
+        (0, utils_js_1.assertWarning)(false, deprecatedReturn('urlOriginal'), { onlyOnce: true });
+        hookReturn.pageContext.urlLogical = hookReturn.pageContext.urlOriginal;
+        delete hookReturn.pageContext.urlOriginal;
+    }
+    if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'urlLogical')) {
+        (0, utils_js_1.assertUsageUrl)(hookReturn.pageContext.urlLogical, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { urlLogical } }')} but ${picocolors_1.default.cyan('urlLogical')}`);
     }
     (0, assertPageContextProvidedByUser_js_1.assertPageContextProvidedByUser)(hookReturn.pageContext, {
         hookFilePath: onBeforeRouteHook.hookFilePath,
         hookName: 'onBeforeRoute'
     });
+    const pageContextAddendumHook = {};
     (0, utils_js_1.objectAssign)(pageContextAddendumHook, hookReturn.pageContext);
     return pageContextAddendumHook;
 }

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

@@ -38,7 +38,7 @@ async function route(pageContext) {
                     _routingProvidedByOnBeforeRouteHook: true,
                     _routeMatches: 'CUSTOM_ROUTE'
                 });
-                return { pageContextAddendum };
+                return pageContextAddendum;
             }
             // We already assign so that `pageContext.urlOriginal === pageContextAddendum.urlOriginal`; enabling the `onBeforeRoute()` hook to mutate `pageContext.urlOriginal` before routing.
             (0, utils_js_1.objectAssign)(pageContext, pageContextAddendum);
@@ -104,7 +104,7 @@ async function route(pageContext) {
             _pageId: null,
             routeParams: {}
         });
-        return { pageContextAddendum };
+        return pageContextAddendum;
     }
     {
         const { routeParams } = winner;
@@ -114,6 +114,6 @@ async function route(pageContext) {
             routeParams: winner.routeParams
         });
     }
-    return { pageContextAddendum };
+    return pageContextAddendum;
 }
 exports.route = route;

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

@@ -11,7 +11,7 @@ async function resolveRouteFunction(routeFunction, pageContext, routeDefinedAt)
     (0, addUrlComputedProps_js_1.assertPageContextUrlComputedProps)(pageContext);
     let result = routeFunction(pageContext);
     assertSyncRouting(result, `The Route Function ${routeDefinedAt}`);
-    // TODO/v1-release
+    // TODO/v1-release: make resolveRouteFunction() and route() sync
     //* We disallow asynchronous routing, because we need to check whether a link is a Vike link in a synchronous fashion before calling ev.preventDefault() in the 'click' event listener
     result = await result;
     //*/

package/dist/cjs/shared/utils.js

@@ -35,7 +35,7 @@ __exportStar(require("../utils/stringifyStringArray.js"), exports);
 __exportStar(require("../utils/filesystemPathHandling.js"), exports);
 __exportStar(require("../utils/cast.js"), exports);
 __exportStar(require("../utils/projectInfo.js"), exports);
-__exportStar(require("../utils/hasPropertyGetter.js"), exports);
+__exportStar(require("../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../utils/isPromise.js"), exports);
 __exportStar(require("../utils/checkType.js"), exports);
 __exportStar(require("../utils/objectEntries.js"), exports);

package/dist/cjs/utils/{hasPropertyGetter.js → isPropertyGetter.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasPropertyGetter = void 0;
-function hasPropertyGetter(obj, prop) {
+exports.isPropertyGetter = void 0;
+function isPropertyGetter(obj, prop) {
     const descriptor = Object.getOwnPropertyDescriptor(obj, prop);
     return !!descriptor && !('value' in descriptor) && !!descriptor.get;
 }
-exports.hasPropertyGetter = hasPropertyGetter;
+exports.isPropertyGetter = isPropertyGetter;

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.144-commit-f7ab002';
+const PROJECT_VERSION = '0.4.144-commit-7f5e99a';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/dist/esm/__internal/index.d.ts

@@ -1,8 +1,8 @@
-import { route, type PageRoutes } from '../shared/route/index.js';
-import { type PageFile } from '../shared/getPageFiles.js';
-import { PageConfigRuntime } from '../shared/page-configs/PageConfig.js';
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };
+import { route as routeInternal, type PageRoutes } from '../shared/route/index.js';
+import { type PageFile } from '../shared/getPageFiles.js';
+import { PageConfigRuntime } from '../shared/page-configs/PageConfig.js';
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel}
  * to compute some rewrite rules and extract { isr } configs.
@@ -15,3 +15,6 @@ declare function getPagesAndRoutes(): Promise<{
     pageConfigs: PageConfigRuntime[];
     allPageIds: string[];
 }>;
+declare function route(pageContext: Parameters<typeof routeInternal>[0]): Promise<{
+    pageContextAddendum: import("../shared/route/index.js").PageContextFromRoute;
+}>;

package/dist/esm/__internal/index.js

@@ -1,10 +1,10 @@
-// Internal functions of vike needed by other plugins are exported via this file
-import { route } from '../shared/route/index.js';
+// Internals needed by vite-plugin-vercel
+export { route, getPagesAndRoutes };
+import { route as routeInternal } from '../shared/route/index.js';
 import { getGlobalContext, initGlobalContext } from '../node/runtime/globalContext.js';
 import { setNodeEnvToProduction } from '../utils/nodeEnv.js';
 import { assert } from '../utils/assert.js';
 import { getRenderContext } from '../node/runtime/renderPage/renderPageAlreadyRouted.js';
-export { route, getPagesAndRoutes };
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel}
  * to compute some rewrite rules and extract { isr } configs.
@@ -25,3 +25,8 @@ async function getPagesAndRoutes() {
         allPageIds
     };
 }
+async function route(pageContext) {
+    const pageContextFromRoute = await routeInternal(pageContext);
+    // Old interface
+    return { pageContextAddendum: pageContextFromRoute };
+}

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

@@ -1,7 +1,6 @@
 export { createPageContext };
-declare function createPageContext<T extends {
+declare function createPageContext(urlOriginal: string): Promise<{
     urlOriginal: string;
-}>(pageContextBase?: T): Promise<{
     _objectCreatedByVike: boolean;
     _urlHandler: null;
     _urlRewrite: null;
@@ -13,6 +12,6 @@ declare function createPageContext<T extends {
     _allPageIds: string[];
     _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared/route/executeOnBeforeRouteHook.js").OnBeforeRouteHook | null;
-} & T & import("../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
+} & import("../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
     _urlRewrite: string | null;
 }>;

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

@@ -3,9 +3,9 @@ import { addUrlComputedProps } from '../../shared/addUrlComputedProps.js';
 import { getPageFilesAll } from '../../shared/getPageFiles.js';
 import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
 import { getBaseServer } from './getBaseServer.js';
-import { assert, isBaseServer, objectAssign, getGlobalObject } from './utils.js';
+import { assert, isBaseServer, getGlobalObject } from './utils.js';
 const globalObject = getGlobalObject('createPageContext.ts', {});
-async function createPageContext(pageContextBase) {
+async function createPageContext(urlOriginal) {
     if (!globalObject.pageFilesData) {
         globalObject.pageFilesData = await getPageFilesAll(true);
     }
@@ -16,6 +16,7 @@ async function createPageContext(pageContextBase) {
     // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
     const isProd = import.meta.env.PROD;
     const pageContext = {
+        urlOriginal,
         _objectCreatedByVike: true,
         _urlHandler: null,
         _urlRewrite: null,
@@ -29,7 +30,6 @@ async function createPageContext(pageContextBase) {
         _pageRoutes: pageRoutes,
         _onBeforeRouteHook: onBeforeRouteHook
     };
-    objectAssign(pageContext, pageContextBase);
     addUrlComputedProps(pageContext);
     return pageContext;
 }

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

@@ -1,9 +1,9 @@
 import { assertClientRouting } from '../../utils/assertRoutingType.js';
 assertClientRouting();
 import './pageFiles';
-import { useClientRouter } from './useClientRouter.js';
+import { installClientRouter } from './installClientRouter.js';
 import { onClientEntry_ClientRouting } from './utils.js';
 // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
 const isProd = import.meta.env.PROD;
 onClientEntry_ClientRouting(isProd);
-useClientRouter();
+installClientRouter();

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

@@ -21,7 +21,6 @@ declare function getPageContext(pageContext: {
 declare function getPageContextErrorPage(pageContext: {
     urlOriginal: string;
     _allPageIds: string[];
-    _isFirstRenderAttempt: boolean;
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
 } & PageContextPassThrough): Promise<PageContextAddendum>;

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

@@ -21,13 +21,11 @@ import { AbortRender, isAbortPageContext } from '../../shared/route/abort.js';
 const globalObject = getGlobalObject('router/getPageContext.ts', {});
 async function getPageContext(pageContext) {
     if (pageContext._isFirstRenderAttempt && navigationState.isFirstUrl(pageContext.urlOriginal)) {
-        assert(hasProp(pageContext, '_isFirstRenderAttempt', 'true'));
         const pageContextAddendum = await getPageContextFirstRender(pageContext);
         setPageContextInitHasClientData(pageContextAddendum);
         return pageContextAddendum;
     }
     else {
-        assert(hasProp(pageContext, '_isFirstRenderAttempt', 'false'));
         const pageContextAddendum = await getPageContextUponNavigation(pageContext);
         setPageContextInitHasClientData(pageContextAddendum);
         return pageContextAddendum;
@@ -185,8 +183,8 @@ async function onBeforeRenderClientOnlyExists(pageContext) {
     }
 }
 async function getPageContextFromRoute(pageContext) {
-    const routeResult = await route(pageContext);
-    const pageContextFromRoute = routeResult.pageContextAddendum;
+    const pageContextFromRoute = await route(pageContext);
+    // We'll be able to remove this once async route functions are deprecated (because we'll be able to skip link hijacking if a link doesn't match a route (because whether to call event.preventDefault() needs to be determined synchronously))
     if (!pageContextFromRoute._pageId) {
         const err = new Error('No routing match');
         markIs404(err);
@@ -202,8 +200,7 @@ function checkIf404(err) {
     return isObject(err) && err._is404 === true;
 }
 async function fetchPageContextFromServer(pageContext) {
-    const urlLogical = pageContext._urlRewrite ?? pageContext._urlOriginalPristine ?? pageContext.urlOriginal;
-    const pageContextUrl = getPageContextRequestUrl(urlLogical);
+    const pageContextUrl = getPageContextRequestUrl(pageContext._urlRewrite ?? pageContext.urlOriginal);
     const response = await fetch(pageContextUrl);
     {
         const contentType = response.headers.get('content-type');

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

@@ -1,5 +1,5 @@
 export { getPageId };
-declare function getPageId(url: string): Promise<{
+declare function getPageId(urlOriginal: string): Promise<{
     pageId: null;
     pageFilesAll: import("../../shared/getPageFiles/getPageFileObject.js").PageFile[];
     pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];

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

@@ -1,15 +1,12 @@
 export { getPageId };
 import { route } from '../../shared/route/index.js';
 import { createPageContext } from './createPageContext.js';
-async function getPageId(url) {
-    const pageContext = await createPageContext({ urlOriginal: url });
-    const routeContext = await route(pageContext);
+async function getPageId(urlOriginal) {
+    const pageContext = await createPageContext(urlOriginal);
     const pageFilesAll = pageContext._pageFilesAll;
     const pageConfigs = pageContext._pageConfigs;
-    if (!('pageContextAddendum' in routeContext)) {
-        return { pageId: null, pageFilesAll, pageConfigs };
-    }
-    const pageId = routeContext.pageContextAddendum._pageId;
+    const pageContextFromRoute = await route(pageContext);
+    const pageId = pageContextFromRoute._pageId;
     if (!pageId) {
         return { pageId: null, pageFilesAll, pageConfigs };
     }

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

@@ -1,7 +1,8 @@
-export { initHistoryState, getHistoryState, pushHistory, ScrollPosition, saveScrollPosition };
+export { initHistoryState, getHistoryState, pushHistory, ScrollPosition, saveScrollPosition, monkeyPatchHistoryPushState };
 type HistoryState = {
     timestamp?: number;
     scrollPosition?: null | ScrollPosition;
+    triggedBy?: 'user' | 'vike' | 'browser';
 };
 type ScrollPosition = {
     x: number;
@@ -11,3 +12,4 @@ declare function initHistoryState(): void;
 declare function getHistoryState(): HistoryState;
 declare function saveScrollPosition(): void;
 declare function pushHistory(url: string, overwriteLastHistoryEntry: boolean): void;
+declare function monkeyPatchHistoryPushState(): void;

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

@@ -1,10 +1,11 @@
-export { initHistoryState, getHistoryState, pushHistory, saveScrollPosition };
-import { assert, hasProp, isObject } from './utils.js';
-// Fill missing state information.
-//  - The very first render => `history.state` is uninitialized (`null`).
-//  - The vike app runs `location.hash = '#section'` => `history.state` is uninitialized (`null`).
-//  - The user clicks on an anchor link `<a href="#section">Section</a>` => `history.state` is uninitialized (`null`).
-//  - `history.state` set by an old vike version => state information may be incomplete. (E.g. `state.timestamp` was introduced for `pageContext.isBackwardNavigation` in `0.4.19`.)
+export { initHistoryState, getHistoryState, pushHistory, saveScrollPosition, monkeyPatchHistoryPushState };
+import { assert, assertUsage, hasProp, isObject } from './utils.js';
+// Fill missing state information:
+//  - `history.state` can uninitialized (i.e. `null`):
+//    - The very first render
+//    - The user's code runs `location.hash = '#section'`
+//    - The user clicks on an anchor link `<a href="#section">Section</a>` (Vike's `onLinkClick()` handler skips hash links).
+//  - State information may be incomplete if `history.state` is set by an old Vike version. (E.g. `state.timestamp` was introduced for `pageContext.isBackwardNavigation` in `0.4.19`.)
 function initHistoryState() {
     let state = window.history.state;
     if (!state) {
@@ -19,6 +20,9 @@ function initHistoryState() {
         hasModifications = true;
         state.scrollPosition = getScrollPosition();
     }
+    if (!('triggedBy' in state)) {
+        state.triggedBy = 'browser';
+    }
     assertState(state);
     if (hasModifications) {
         replaceHistoryState(state);
@@ -44,7 +48,7 @@ function saveScrollPosition() {
 function pushHistory(url, overwriteLastHistoryEntry) {
     if (!overwriteLastHistoryEntry) {
         const timestamp = getTimestamp();
-        pushHistoryState({ timestamp, scrollPosition: null }, url);
+        pushHistoryState({ timestamp, scrollPosition: null, triggedBy: 'vike' }, url);
     }
     else {
         replaceHistoryState(getHistoryState(), url);
@@ -69,3 +73,17 @@ function replaceHistoryState(state, url) {
 function pushHistoryState(state, url) {
     window.history.pushState(state, '', url);
 }
+function monkeyPatchHistoryPushState() {
+    const pushStateOriginal = history.pushState;
+    history.pushState = (stateFromUser = {}, ...rest) => {
+        assertUsage(null === stateFromUser || undefined === stateFromUser || isObject(stateFromUser), 'history.pushState(state) argument state must be an object');
+        const state = {
+            scrollPosition: getScrollPosition(),
+            timestamp: getTimestamp(),
+            ...stateFromUser,
+            // Don't allow user to overwrite triggedBy as it would break Vike's handling of the 'popstate' event
+            triggedBy: 'user'
+        };
+        return pushStateOriginal.apply(history, [state, ...rest]);
+    };
+}

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

@@ -0,0 +1,21 @@
+export { installClientRouter };
+export { disableClientRouting };
+export { isDisableAutomaticLinkInterception };
+export { renderPageClientSide };
+import { ScrollPosition } from './history.js';
+import { PageContextFromRewrite } from '../../shared/route/abort.js';
+declare function installClientRouter(): void;
+type RenderArgs = {
+    scrollTarget: ScrollTarget;
+    isBackwardNavigation: boolean | null;
+    urlOriginal?: string;
+    overwriteLastHistoryEntry?: boolean;
+    checkIfClientSideRenderable?: boolean;
+    pageContextsFromRewrite?: PageContextFromRewrite[];
+    redirectCount?: number;
+    isUserLandNavigation?: boolean;
+};
+declare function renderPageClientSide(renderArgs: RenderArgs): Promise<void>;
+type ScrollTarget = ScrollPosition | 'scroll-to-top-or-hash' | 'preserve-scroll';
+declare function isDisableAutomaticLinkInterception(): boolean;
+declare function disableClientRouting(err: unknown, log: boolean): void;