vike 0.4.199-commit-3be497f → 0.4.199-commit-33e1230

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-3be497f';
+exports.PROJECT_VERSION = '0.4.199-commit-33e1230';

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

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

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

@@ -21,8 +21,7 @@ function initOnPopState() {
         const currentState = getState();
         globalObject.previousState = currentState;
         const scrollTarget = currentState.historyState?.scrollPosition || undefined;
-        const isUserLandPushStateNavigation = currentState.historyState?.triggeredBy === 'user';
-        const isHashNavigation = currentState.urlWithoutHash === previousState.urlWithoutHash;
+        const isHashNavigation = removeHash(currentState.url) === removeHash(previousState.url);
         const isBackwardNavigation = !currentState.historyState?.timestamp || !previousState.historyState?.timestamp
             ? null
             : currentState.historyState.timestamp < previousState.historyState.timestamp;
@@ -46,19 +45,19 @@ function initOnPopState() {
         // - Alternative: we completely take over hash navigation and reproduce the browser's native behavior upon hash navigation.
         //   - By using the `hashchange` event.
         //   - Problem: conflict if user wants to override the browser's default behavior? E.g. for smooth scrolling, or when using hashes for saving states of some fancy animations.
-        if (isHashNavigation && !isUserLandPushStateNavigation) {
+        if (isHashNavigation) {
             if (!isHashNavigationNew) {
                 setScrollPosition(scrollTarget);
             }
             return;
         }
         let abort;
-        globalObject.listeners.forEach(listener => {
-            abort || (abort = listener({ _experimental: { previousState } }));
+        globalObject.listeners.forEach((listener) => {
+            abort || (abort = listener({ previousState }));
         });
         if (abort)
             return;
-        await renderPageClientSide({ scrollTarget, isBackwardNavigation, isUserLandPushStateNavigation });
+        await renderPageClientSide({ scrollTarget, isBackwardNavigation });
     });
 }
 /** Control client-side navigation.
@@ -70,10 +69,13 @@ function onPopState(listener) {
 }
 function getState() {
     return {
-        urlWithoutHash: getCurrentUrl({ withoutHash: true }),
+        url: getCurrentUrl(),
         historyState: getHistoryState()
     };
 }
+function removeHash(url) {
+    return url.split('#')[0];
+}
 function updateState() {
     globalObject.previousState = getState();
 }

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

@@ -12,8 +12,6 @@ type RenderArgs = {
     overwriteLastHistoryEntry?: boolean;
     pageContextsFromRewrite?: PageContextFromRewrite[];
     redirectCount?: number;
-    /** Whether the navigation was triggered by the user land calling `history.pushState()` */
-    isUserLandPushStateNavigation?: boolean;
     isClientSideNavigation?: boolean;
 };
 declare function renderPageClientSide(renderArgs: RenderArgs): Promise<void>;

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

@@ -30,7 +30,7 @@ const globalObject = getGlobalObject('renderPageClientSide.ts', (() => {
 })());
 const { firstRenderStartPromise } = globalObject;
 async function renderPageClientSide(renderArgs) {
-    const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0, isUserLandPushStateNavigation, isClientSideNavigation = true } = renderArgs;
+    const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0, isClientSideNavigation = true } = renderArgs;
     let { scrollTarget } = renderArgs;
     const { previousPageContext } = globalObject;
     addLinkPrefetchHandlers_unwatch();
@@ -117,13 +117,6 @@ async function renderPageClientSide(renderArgs) {
                 redirectHard(urlOriginal);
                 return;
             }
-            const isSamePage = pageContextFromRoute.pageId &&
-                previousPageContext?.pageId &&
-                pageContextFromRoute.pageId === previousPageContext.pageId;
-            if (isUserLandPushStateNavigation && isSamePage) {
-                // Skip's Vike's rendering; let the user handle the navigation
-                return;
-            }
             // TODO/eventually: create helper assertPageContextFromHook()
             assert(!('urlOriginal' in pageContextFromRoute));
             objectAssign(pageContext, pageContextFromRoute);

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-3be497f";
+export declare const PROJECT_VERSION: "0.4.199-commit-33e1230";

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-3be497f';
+export const PROJECT_VERSION = '0.4.199-commit-33e1230';

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-3be497f";
+    projectVersion: "0.4.199-commit-33e1230";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.199-commit-3be497f",
+  "version": "0.4.199-commit-33e1230",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {