vike 0.4.203-commit-1b14559 → 0.4.204

package/dist/cjs/client/server-routing-runtime/utils.js

@@ -22,7 +22,6 @@ __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/assertSingleInstance.js"), exports);
 __exportStar(require("../../shared/hooks/executeHook.js"), exports);
 __exportStar(require("../../utils/checkType.js"), exports); // Only used by Server Routing (not needed for Client Routing)
-__exportStar(require("../../utils/getCurrentUrl.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
 __exportStar(require("../../utils/hasProp.js"), exports);
 __exportStar(require("../../utils/isCallable.js"), exports);

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.203-commit-1b14559';
+exports.PROJECT_VERSION = '0.4.204';

package/dist/cjs/utils/parseUrl.js

@@ -24,9 +24,9 @@ function parseUrl(url, baseServer) {
     (0, assert_js_1.assert)(isUrl(url), url);
     (0, assert_js_1.assert)(baseServer.startsWith('/'));
     // Hash
-    const [urlWithoutHash, ...hashList] = url.split('#');
+    const [urlWithoutHash, ...h] = url.split('#');
     (0, assert_js_1.assert)(urlWithoutHash !== undefined);
-    const hashOriginal = ['', ...hashList].join('#') || null;
+    const hashOriginal = ['', ...h].join('#') || null;
     (0, assert_js_1.assert)(hashOriginal === null || hashOriginal.startsWith('#'));
     const hash = hashOriginal === null ? '' : decodeSafe(hashOriginal.slice(1));
     // Search
@@ -111,14 +111,14 @@ function getPathnameAbsoluteWithBase(url, baseServer) {
         const baseURI = typeof window !== 'undefined' ? window?.document?.baseURI : undefined;
         let base;
         if (baseURI) {
-            const baseURIPathaname = parseOrigin(baseURI.split('?')[0]).pathname;
+            const baseURIPathaname = parseOrigin(baseURI.split('?')[0].split('#')[0]).pathname;
             base = baseURIPathaname;
         }
         else {
             base = baseServer;
         }
         const pathnameAbsoluteWithBase = resolveUrlPathnameRelative(url, base);
-        return { protocol: null, origin: null, pathnameAbsoluteWithBase: pathnameAbsoluteWithBase };
+        return { protocol: null, origin: null, pathnameAbsoluteWithBase };
     }
 }
 function parseOrigin(url) {

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

@@ -3,7 +3,8 @@ export { onPopStateBegin };
 export { saveScrollPosition };
 export { initHistoryState };
 export { monkeyPatchHistoryAPI };
-import { assert, assertUsage, getCurrentUrl, getGlobalObject, hasProp, isObject } from './utils.js';
+import { getCurrentUrl } from '../shared/getCurrentUrl.js';
+import { assert, assertUsage, getGlobalObject, hasProp, isObject } from './utils.js';
 initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
 const globalObject = getGlobalObject('history.ts', { previous: getHistoryInfo() });
 // `window.history.state === null` when:

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

@@ -1,21 +1,30 @@
 // Code adapted from https://github.com/HenrikJoreteg/internal-nav-helper/blob/5199ec5448d0b0db7ec63cf76d88fa6cad878b7d/src/index.js#L11-L29
 export { initOnLinkClick };
 import { assert } from './utils.js';
-import { skipLink } from './skipLink.js';
+import { isSameAsCurrentUrl, skipLink } from './skipLink.js';
 import { renderPageClientSide } from './renderPageClientSide.js';
+import { scrollToHashOrTop } from './setScrollPosition.js';
 function initOnLinkClick() {
-    document.addEventListener('click', handler);
+    document.addEventListener('click', onClick);
 }
-async function handler(ev) {
+async function onClick(ev) {
     if (!isNormalLeftClick(ev))
         return;
     const linkTag = findLinkTag(ev.target);
     if (!linkTag)
         return;
-    const url = linkTag.getAttribute('href');
+    const href = linkTag.getAttribute('href');
+    // Workaround for Firefox bug: clicking on a hash link that doesn't change the current URL causes Firefox to erroneously set `window.history.state = null` without firing any signal that we can detect.
+    // - https://github.com/vikejs/vike/issues/1962
+    // - https://github.com/sveltejs/kit/issues/8725
+    if (href?.includes('#') && isSameAsCurrentUrl(href)) {
+        ev.preventDefault();
+        scrollToHashOrTop(href.split('#')[1]);
+        return;
+    }
     if (skipLink(linkTag))
         return;
-    assert(url);
+    assert(href);
     ev.preventDefault();
     let scrollTarget;
     {
@@ -25,7 +34,7 @@ async function handler(ev) {
     }
     await renderPageClientSide({
         scrollTarget,
-        urlOriginal: url,
+        urlOriginal: href,
         isBackwardNavigation: false
     });
 }

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

@@ -1,8 +1,9 @@
 export { navigate };
 export { reload };
+import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 import { firstRenderStartPromise, renderPageClientSide } from './renderPageClientSide.js';
-import { assertClientRouting, getCurrentUrl } from './utils.js';
+import { assertClientRouting } from './utils.js';
 assertClientRouting();
 /** Programmatically navigate to a new page.
  *

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

@@ -5,6 +5,7 @@ function normalizeUrlArgument(url, fnName) {
     const errMsg = `[${fnName}(url)] Invalid URL ${url}`;
     assertUsage(isUrl(url), errMsg);
     if (url.startsWith(location.origin)) {
+        // Use normalizeClientSideUrl() instead?
         url = url.slice(location.origin.length);
     }
     assertUsage(url.startsWith('/') || isUrlPathnameRelative(url), 

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

@@ -2,7 +2,7 @@ export { renderPageClientSide };
 export { getRenderCount };
 export { disableClientRouting };
 export { firstRenderStartPromise };
-import { assert, getCurrentUrl, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, executeHook, hasProp, augmentType, genPromise, isCallable } from './utils.js';
+import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, executeHook, hasProp, augmentType, genPromise, isCallable } from './utils.js';
 import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient } from './getPageContextFromHooks.js';
 import { createPageContext } from './createPageContext.js';
 import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache } from './prefetch.js';
@@ -19,6 +19,7 @@ import { browserNativeScrollRestoration_disable, setInitialRenderIsDone } from '
 import { getErrorPageId } from '../../shared/error-page.js';
 import { setPageContextCurrent } from './getPageContextCurrent.js';
 import { getRouteStringParameterList } from '../../shared/route/resolveRouteString.js';
+import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 const globalObject = getGlobalObject('renderPageClientSide.ts', (() => {
     const { promise: firstRenderStartPromise, resolve: firstRenderStartPromiseResolve } = genPromise();
     return {

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

@@ -1,9 +1,11 @@
 export { setScrollPosition };
 export { autoSaveScrollPosition };
+export { scrollToHashOrTop };
 export type { ScrollTarget };
 import { type ScrollPosition } from './history.js';
 type ScrollTarget = undefined | {
     preserveScroll: boolean;
 } | ScrollPosition;
 declare function setScrollPosition(scrollTarget: ScrollTarget): void;
+declare function scrollToHashOrTop(hash: null | string): void;
 declare function autoSaveScrollPosition(): void;

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

@@ -1,5 +1,6 @@
 export { setScrollPosition };
 export { autoSaveScrollPosition };
+export { scrollToHashOrTop };
 import { assert, onPageHide, sleep, throttle } from './utils.js';
 import { saveScrollPosition } from './history.js';
 function setScrollPosition(scrollTarget) {
@@ -10,22 +11,39 @@ function setScrollPosition(scrollTarget) {
     if (scrollTarget?.preserveScroll) {
         return;
     }
-    scrollToTopOrHash();
+    const hash = getUrlHash();
+    scrollToHashOrTop(hash);
 }
 // Replicates the browser's native behavior
-function scrollToTopOrHash() {
-    const hash = getUrlHash();
-    if (!hash || hash === 'top') {
-        setScroll({ x: 0, y: 0 });
+function scrollToHashOrTop(hash) {
+    if (!hash) {
+        scrollToTop();
     }
     else {
-        const hashTarget = document.getElementById(hash) || document.getElementsByName(hash)[0];
+        const id = decodeURIComponent(hash);
+        const hashTarget = document.getElementById(id) || document.getElementsByName(id)[0];
         if (hashTarget) {
             hashTarget.scrollIntoView();
+            // Is this standard? We just copied SvelteKit: https://github.com/sveltejs/kit/blob/94c45b9372a9ed2b80e21cdca3f235c45edaa5b0/packages/kit/src/runtime/client/client.js#L2132
+            hashTarget.focus();
+        }
+        else if (hash === 'top') {
+            scrollToTop();
         }
     }
 }
-/** Change the browser's scoll position, in a way that works during a repaint. */
+function scrollToTop() {
+    setScroll({ x: 0, y: 0 });
+}
+/**
+ * Change the browser's scroll position, in a way that works during a repaint.
+ *
+ * I don't remember exactly why I implemented this and what I meant with "repaint"
+ * - https://github.com/vikejs/vike/commit/fd70fadb0bcea8d922f961f1c88713994e0aaf34
+ * - I guess scrolling doesn't work during a page rendering? So we have to re-scroll until the scroll position is correct?
+ * - Do other frameworks implement this? SvelteKit doesn't seem to.
+ * - Let's remove it and see if users complain?
+ */
 function setScroll(scrollPosition) {
     const scroll = () => window.scrollTo(scrollPosition.x, scrollPosition.y);
     const done = () => window.scrollX === scrollPosition.x && window.scrollY === scrollPosition.y;

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

@@ -1,2 +1,4 @@
 export { skipLink };
+export { isSameAsCurrentUrl };
 declare function skipLink(linkTag: HTMLElement): boolean;
+declare function isSameAsCurrentUrl(href: string): boolean;

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

@@ -1,15 +1,17 @@
 export { skipLink };
+export { isSameAsCurrentUrl };
+import { normalizeClientSideUrl } from '../shared/normalizeClientSideUrl.js';
 import { getBaseServer } from './getBaseServer.js';
 import { assert, parseUrl, isBaseServer, isUrl, isUrlExternal } from './utils.js';
 function skipLink(linkTag) {
-    const url = linkTag.getAttribute('href');
-    return (url === null ||
-        !isUrl(url) ||
-        url === '' ||
-        isUrlExternal(url) ||
-        isHashUrl(url) ||
+    const href = linkTag.getAttribute('href');
+    return (href === null ||
+        !isUrl(href) ||
+        href === '' ||
+        isUrlExternal(href) ||
+        isSamePageHashLink(href) ||
         isNewTabLink(linkTag) ||
-        !hasBaseServer(url) ||
+        !hasBaseServer(href) ||
         // Purposely last because disableAutomaticLinkInterception will be removed in the next major release
         !isVikeLink(linkTag));
 }
@@ -29,20 +31,22 @@ function isNewTabLink(linkTag) {
     const rel = linkTag.getAttribute('rel');
     return target === '_blank' || target === '_external' || rel === 'external' || linkTag.hasAttribute('download');
 }
-function isHashUrl(url) {
-    if (url.startsWith('#')) {
-        return true;
-    }
-    const removeHash = (url) => url.split('#')[0];
-    if (url.includes('#') && removeHash(url) === removeHash(window.location.pathname)) {
+function isSamePageHashLink(href) {
+    if (href.includes('#') &&
+        normalizeClientSideUrl(href, { withoutHash: true }) ===
+            normalizeClientSideUrl(window.location.href, { withoutHash: true })) {
         return true;
     }
+    assert(!href.startsWith('#'));
     return false;
 }
-function hasBaseServer(url) {
+function isSameAsCurrentUrl(href) {
+    return normalizeClientSideUrl(href) === normalizeClientSideUrl(window.location.href);
+}
+function hasBaseServer(href) {
     const baseServer = getBaseServer();
     assert(isBaseServer(baseServer));
-    const { hasBaseServer } = parseUrl(url, baseServer);
+    const { hasBaseServer } = parseUrl(href, baseServer);
     return hasBaseServer;
 }
 function isDisableAutomaticLinkInterception() {

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

@@ -1,8 +1,6 @@
-export * from '../server-routing-runtime/utils.js';
 export * from '../../utils/assert.js';
 export * from '../../utils/assertSingleInstance.js';
 export * from '../../shared/hooks/executeHook.js';
-export * from '../../utils/getCurrentUrl.js';
 export * from '../../utils/getGlobalObject.js';
 export * from '../../utils/hasProp.js';
 export * from '../../utils/isBrowser.js';

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

@@ -2,13 +2,9 @@
 // We assume all runtime entries will load this utils.ts file
 import { onLoad } from './onLoad.js';
 onLoad();
-// We load the Server Routing utils: we tolerate the tiny amount of code that is only needed by Server Routing (only 1-2 lines).
-// We re-export some of the utils down below only to list the utils needed by Client Routing.
-export * from '../server-routing-runtime/utils.js';
 export * from '../../utils/assert.js';
 export * from '../../utils/assertSingleInstance.js';
 export * from '../../shared/hooks/executeHook.js';
-export * from '../../utils/getCurrentUrl.js';
 export * from '../../utils/getGlobalObject.js';
 export * from '../../utils/hasProp.js';
 export * from '../../utils/isBrowser.js';

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

@@ -1,7 +1,8 @@
-import { assertUsage, assertWarning, getCurrentUrl, objectAssign } from './utils.js';
+import { assertUsage, assertWarning, objectAssign } from './utils.js';
 import { getPageContextSerializedInHtml } from '../shared/getPageContextSerializedInHtml.js';
 import { getPageFilesAll } from '../../shared/getPageFiles.js';
 import { loadUserFilesClientSide } from '../shared/loadUserFilesClientSide.js';
+import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 export { getPageContext };
 const urlFirst = getCurrentUrl({ withoutHash: true });
 async function getPageContext() {

package/dist/esm/client/server-routing-runtime/utils.d.ts

@@ -2,7 +2,6 @@ export * from '../../utils/assert.js';
 export * from '../../utils/assertSingleInstance.js';
 export * from '../../shared/hooks/executeHook.js';
 export * from '../../utils/checkType.js';
-export * from '../../utils/getCurrentUrl.js';
 export * from '../../utils/getGlobalObject.js';
 export * from '../../utils/hasProp.js';
 export * from '../../utils/isCallable.js';

package/dist/esm/client/server-routing-runtime/utils.js

@@ -6,7 +6,6 @@ export * from '../../utils/assert.js';
 export * from '../../utils/assertSingleInstance.js';
 export * from '../../shared/hooks/executeHook.js';
 export * from '../../utils/checkType.js'; // Only used by Server Routing (not needed for Client Routing)
-export * from '../../utils/getCurrentUrl.js';
 export * from '../../utils/getGlobalObject.js';
 export * from '../../utils/hasProp.js';
 export * from '../../utils/isCallable.js';

package/dist/esm/client/shared/getCurrentUrl.js

@@ -0,0 +1,5 @@
+export { getCurrentUrl };
+import { normalizeClientSideUrl } from './normalizeClientSideUrl.js';
+function getCurrentUrl(options) {
+    return normalizeClientSideUrl(window.location.href, options);
+}

package/dist/esm/client/shared/normalizeClientSideUrl.d.ts

@@ -0,0 +1,5 @@
+export { normalizeClientSideUrl };
+/** Resolves relative URLs */
+declare function normalizeClientSideUrl(url: string, options?: {
+    withoutHash: true;
+}): `/${string}`;

package/dist/esm/client/shared/normalizeClientSideUrl.js

@@ -0,0 +1,11 @@
+export { normalizeClientSideUrl };
+import { assert, parseUrl } from './utils.js';
+/** Resolves relative URLs */
+function normalizeClientSideUrl(url, options) {
+    const { searchOriginal, hashOriginal, pathname } = parseUrl(url, '/');
+    let urlCurrent = `${pathname}${searchOriginal || ''}`;
+    if (!options?.withoutHash)
+        urlCurrent += hashOriginal || '';
+    assert(urlCurrent.startsWith('/'));
+    return urlCurrent;
+}

package/dist/esm/client/shared/utils.d.ts

@@ -1 +1,2 @@
 export * from '../../utils/assert.js';
+export * from '../../utils/parseUrl.js';

package/dist/esm/client/shared/utils.js

@@ -1 +1,2 @@
 export * from '../../utils/assert.js';
+export * from '../../utils/parseUrl.js';

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.203-commit-1b14559";
+export declare const PROJECT_VERSION: "0.4.204";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.203-commit-1b14559';
+export const PROJECT_VERSION = '0.4.204';

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

@@ -31,11 +31,11 @@ type UrlPublic = {
     /** The URL search parameters array, e.g. `{ fruit: ['apple', 'orange'] }` for `https://example.com?fruit=apple&fruit=orange` **/
     searchAll: Record<string, string[]>;
     /** The URL search parameterer string, e.g. `?details=yes` in `https://example.com/product/42?details=yes#reviews` */
-    searchOriginal: null | string;
+    searchOriginal: null | `?${string}`;
     /** The URL hash, e.g. `reviews` in `https://example.com/product/42?details=yes#reviews` */
     hash: string;
     /** The URL hash string, e.g. `#reviews` in `https://example.com/product/42?details=yes#reviews` */
-    hashOriginal: null | string;
+    hashOriginal: null | `#${string}`;
     /** @deprecated */
     hashString: null | string;
     /** @deprecated */

package/dist/esm/utils/parseUrl.js

@@ -20,9 +20,9 @@ function parseUrl(url, baseServer) {
     assert(isUrl(url), url);
     assert(baseServer.startsWith('/'));
     // Hash
-    const [urlWithoutHash, ...hashList] = url.split('#');
+    const [urlWithoutHash, ...h] = url.split('#');
     assert(urlWithoutHash !== undefined);
-    const hashOriginal = ['', ...hashList].join('#') || null;
+    const hashOriginal = ['', ...h].join('#') || null;
     assert(hashOriginal === null || hashOriginal.startsWith('#'));
     const hash = hashOriginal === null ? '' : decodeSafe(hashOriginal.slice(1));
     // Search
@@ -107,14 +107,14 @@ function getPathnameAbsoluteWithBase(url, baseServer) {
         const baseURI = typeof window !== 'undefined' ? window?.document?.baseURI : undefined;
         let base;
         if (baseURI) {
-            const baseURIPathaname = parseOrigin(baseURI.split('?')[0]).pathname;
+            const baseURIPathaname = parseOrigin(baseURI.split('?')[0].split('#')[0]).pathname;
             base = baseURIPathaname;
         }
         else {
             base = baseServer;
         }
         const pathnameAbsoluteWithBase = resolveUrlPathnameRelative(url, base);
-        return { protocol: null, origin: null, pathnameAbsoluteWithBase: pathnameAbsoluteWithBase };
+        return { protocol: null, origin: null, pathnameAbsoluteWithBase };
     }
 }
 function parseOrigin(url) {

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.203-commit-1b14559";
+    projectVersion: "0.4.204";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.203-commit-1b14559",
+  "version": "0.4.204",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

package/dist/cjs/utils/getCurrentUrl.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentUrl = getCurrentUrl;
-const parseUrl_js_1 = require("./parseUrl.js");
-const assert_js_1 = require("./assert.js");
-function getCurrentUrl(options) {
-    const url = window.location.href;
-    const { searchOriginal, hashOriginal, pathname } = (0, parseUrl_js_1.parseUrl)(url, '/');
-    let urlCurrent;
-    if (options?.withoutHash) {
-        urlCurrent = `${pathname}${searchOriginal || ''}`;
-    }
-    else {
-        urlCurrent = `${pathname}${searchOriginal || ''}${hashOriginal || ''}`;
-    }
-    (0, assert_js_1.assert)(urlCurrent.startsWith('/'));
-    return urlCurrent;
-}

package/dist/esm/utils/getCurrentUrl.js

@@ -1,16 +0,0 @@
-export { getCurrentUrl };
-import { parseUrl } from './parseUrl.js';
-import { assert } from './assert.js';
-function getCurrentUrl(options) {
-    const url = window.location.href;
-    const { searchOriginal, hashOriginal, pathname } = parseUrl(url, '/');
-    let urlCurrent;
-    if (options?.withoutHash) {
-        urlCurrent = `${pathname}${searchOriginal || ''}`;
-    }
-    else {
-        urlCurrent = `${pathname}${searchOriginal || ''}${hashOriginal || ''}`;
-    }
-    assert(urlCurrent.startsWith('/'));
-    return urlCurrent;
-}