vike 0.4.199-commit-6991a96 → 0.4.199-commit-43cc34a

package/dist/cjs/node/client/router.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prefetch = exports.reload = exports.navigate = void 0;
+exports.onPopState = exports.prefetch = exports.reload = exports.navigate = void 0;
 const assert_js_1 = require("../../utils/assert.js");
 // `never` to ensure package.json#exports["./client/router"].types points to type defined by the client-side code
 const navigate = (() => warnNoEffect('navigate'));
@@ -9,6 +9,8 @@ const reload = (() => warnNoEffect('reload'));
 exports.reload = reload;
 const prefetch = (() => warnNoEffect('prefetch'));
 exports.prefetch = prefetch;
+const onPopState = (() => { });
+exports.onPopState = onPopState;
 function warnNoEffect(caller) {
     (0, assert_js_1.assertWarning)(false, `Calling ${caller}() on the server-side has no effect`, {
         showStackTrace: true,

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.199-commit-6991a96';
+exports.PROJECT_VERSION = '0.4.199-commit-43cc34a';

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

@@ -3,18 +3,16 @@ export { updateState };
 export { onPopState };
 declare function initOnPopState(): void;
 type Listener = (arg: {
-    _experimental: {
-        previousState: ReturnType<typeof getState>;
-    };
-}) => undefined | boolean;
+    previous: ReturnType<typeof getState>;
+}) => void | boolean;
 /** Control client-side navigation.
  *
  * https://vike.dev/onPopState
  */
 declare function onPopState(listener: Listener): void;
 declare function getState(): {
-    urlWithoutHash: string;
-    historyState: {
+    url: `/${string}`;
+    state: {
         timestamp: number;
         scrollPosition: null | import("./history.js").ScrollPosition;
         triggeredBy: "user" | "vike" | "browser";

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

@@ -17,14 +17,14 @@ function initOnPopState() {
     //     - `location.hash = 'some-hash'`
     // - The `event` argument of `window.addEventListener('popstate', (event) => /*...*/)` is useless: the History API doesn't provide the previous state (the popped state), see https://stackoverflow.com/questions/48055323/is-history-state-always-the-same-as-popstate-event-state
     window.addEventListener('popstate', async () => {
-        const { previousState } = globalObject;
-        const currentState = getState();
-        globalObject.previousState = currentState;
-        const scrollTarget = currentState.historyState?.scrollPosition || undefined;
-        const isHashNavigation = currentState.urlWithoutHash === previousState.urlWithoutHash;
-        const isBackwardNavigation = !currentState.historyState?.timestamp || !previousState.historyState?.timestamp
+        const previous = globalObject.previousState;
+        const current = getState();
+        globalObject.previousState = current;
+        const scrollTarget = current.state?.scrollPosition || undefined;
+        const isHashNavigation = removeHash(current.url) === removeHash(previous.url);
+        const isBackwardNavigation = !current.state?.timestamp || !previous.state?.timestamp
             ? null
-            : currentState.historyState.timestamp < previousState.historyState.timestamp;
+            : current.state.timestamp < previous.state.timestamp;
         // - `history.state === null` when:
         //   - Click on `<a href="#some-hash" />` (note that Vike's `initOnLinkClick()` handler skips hash links)
         //   - `location.hash = 'some-hash'`
@@ -53,7 +53,7 @@ function initOnPopState() {
         }
         let abort;
         globalObject.listeners.forEach((listener) => {
-            abort || (abort = listener({ _experimental: { previousState } }));
+            abort || (abort = listener({ previous }));
         });
         if (abort)
             return;
@@ -69,10 +69,13 @@ function onPopState(listener) {
 }
 function getState() {
     return {
-        urlWithoutHash: getCurrentUrl({ withoutHash: true }),
-        historyState: getHistoryState()
+        url: getCurrentUrl(),
+        state: getHistoryState()
     };
 }
+function removeHash(url) {
+    return url.split('#')[0];
+}
 function updateState() {
     globalObject.previousState = getState();
 }

package/dist/esm/node/client/router.d.ts

@@ -1,6 +1,8 @@
 export { navigate };
 export { reload };
 export { prefetch };
+export { onPopState };
 declare const navigate: never;
 declare const reload: never;
 declare const prefetch: never;
+declare const onPopState: never;

package/dist/esm/node/client/router.js

@@ -1,11 +1,13 @@
 export { navigate };
 export { reload };
 export { prefetch };
+export { onPopState };
 import { assertWarning } from '../../utils/assert.js';
 // `never` to ensure package.json#exports["./client/router"].types points to type defined by the client-side code
 const navigate = (() => warnNoEffect('navigate'));
 const reload = (() => warnNoEffect('reload'));
 const prefetch = (() => warnNoEffect('prefetch'));
+const onPopState = (() => { });
 function warnNoEffect(caller) {
     assertWarning(false, `Calling ${caller}() on the server-side has no effect`, {
         showStackTrace: true,

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.199-commit-6991a96";
+export declare const PROJECT_VERSION: "0.4.199-commit-43cc34a";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.199-commit-6991a96';
+export const PROJECT_VERSION = '0.4.199-commit-43cc34a';

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

@@ -1,4 +1,4 @@
 export { getCurrentUrl };
 declare function getCurrentUrl(options?: {
     withoutHash: true;
-}): string;
+}): `/${string}`;

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.199-commit-6991a96";
+    projectVersion: "0.4.199-commit-43cc34a";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.199-commit-6991a96",
+  "version": "0.4.199-commit-43cc34a",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {