vike 0.4.167-commit-c08a6bb → 0.4.167-commit-aa83fde

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.167-commit-c08a6bb';
+const PROJECT_VERSION = '0.4.167-commit-aa83fde';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -3,6 +3,7 @@ type HistoryState = {
     timestamp?: number;
     scrollPosition?: null | ScrollPosition;
     triggeredBy?: 'user' | 'vike' | 'browser';
+    _isVikeEnhanced: true;
 };
 type ScrollPosition = {
     x: number;

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

@@ -1,6 +1,5 @@
 export { initHistoryState, getHistoryState, pushHistory, saveScrollPosition, monkeyPatchHistoryPushState };
-import { assert, assertUsage, getGlobalObject, hasProp, isObject } from './utils.js';
-const globalObject = getGlobalObject('history.ts', {});
+import { assert, assertUsage, hasProp, isObject } from './utils.js';
 // Fill missing state information:
 //  - `history.state` can uninitialized (i.e. `null`):
 //    - The very first render
@@ -8,9 +7,10 @@ const globalObject = getGlobalObject('history.ts', {});
 //    - 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() {
+    // No way found to add TypeScript types to `window.history.state`: https://github.com/microsoft/TypeScript/issues/36178
     let state = window.history.state;
     if (!state) {
-        state = {};
+        state = { _isVikeEnhanced: true };
     }
     let hasModifications = false;
     if (!('timestamp' in state)) {
@@ -49,7 +49,7 @@ function saveScrollPosition() {
 function pushHistory(url, overwriteLastHistoryEntry) {
     if (!overwriteLastHistoryEntry) {
         const timestamp = getTimestamp();
-        pushHistoryState({ timestamp, scrollPosition: null, triggeredBy: 'vike' }, url);
+        pushHistoryState({ timestamp, scrollPosition: null, triggeredBy: 'vike', _isVikeEnhanced: true }, url);
     }
     else {
         replaceHistoryState(getHistoryState(), url);
@@ -69,25 +69,29 @@ function assertState(state) {
     }
 }
 function replaceHistoryState(state, url) {
-    window.history.replaceState(state, '', url ?? /* Passing `undefined` chokes older Edge versions */ null);
+    const url_ = url ?? null; // Passing `undefined` chokes older Edge versions.
+    window.history.replaceState(state, '', url_);
 }
 function pushHistoryState(state, url) {
-    pushStateOriginal(state, '', url);
+    // Vike should call window.history.pushState() (and not the orignal `pushStateOriginal()`) so that other tools (e.g. user tracking) can listen to Vike's pushState() calls, see https://github.com/vikejs/vike/issues/1582.
+    window.history.pushState(state, '', url);
 }
 function monkeyPatchHistoryPushState() {
-    globalObject.pushStateOriginal = globalObject.pushStateOriginal ?? window.history.pushState;
-    window.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 triggeredBy as it would break Vike's handling of the 'popstate' event
-            triggeredBy: 'user'
-        };
-        return pushStateOriginal(state, ...rest);
+    const pushStateOriginal = window.history.pushState;
+    window.history.pushState = (stateOriginal = {}, ...rest) => {
+        assertUsage(stateOriginal === undefined || stateOriginal === null || isObject(stateOriginal), 'history.pushState(state) argument state must be an object');
+        const stateEnhanced = isVikeEnhanced(stateOriginal)
+            ? stateOriginal
+            : {
+                _isVikeEnhanced: true,
+                scrollPosition: getScrollPosition(),
+                timestamp: getTimestamp(),
+                triggeredBy: 'user',
+                ...stateOriginal
+            };
+        return pushStateOriginal(stateEnhanced, ...rest);
     };
 }
-function pushStateOriginal(...args) {
-    globalObject.pushStateOriginal.apply(history, args);
+function isVikeEnhanced(state) {
+    return isObject(state) && '_isVikeEnhanced' in state;
 }

package/dist/esm/utils/projectInfo.d.ts

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.167-commit-c08a6bb";
+declare const PROJECT_VERSION: "0.4.167-commit-aa83fde";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.167-commit-c08a6bb";
+    projectVersion: "0.4.167-commit-aa83fde";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.167-commit-c08a6bb';
+const PROJECT_VERSION = '0.4.167-commit-aa83fde';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.167-commit-c08a6bb",
+  "version": "0.4.167-commit-aa83fde",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",