vike 0.4.204-commit-9a97c22 → 0.4.205

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.204-commit-9a97c22';
+exports.PROJECT_VERSION = '0.4.205';

package/dist/cjs/utils/parseUrl.js

@@ -12,7 +12,7 @@ exports.assertUsageUrlRedirectTarget = assertUsageUrlRedirectTarget;
 exports.isUrl = isUrl;
 exports.isUri = isUri;
 exports.isUrlRedirectTarget = isUrlRedirectTarget;
-exports.isUrlPathnameRelative = isUrlPathnameRelative;
+exports.isUrlRelative = isUrlRelative;
 exports.isUrlExternal = isUrlExternal;
 exports.isBaseServer = isBaseServer;
 exports.assertUrlComponents = assertUrlComponents;
@@ -24,19 +24,23 @@ function parseUrl(url, baseServer) {
     (0, assert_js_1.assert)(isUrl(url), url);
     (0, assert_js_1.assert)(baseServer.startsWith('/'));
     // Hash
-    const [urlWithoutHash, ...h] = url.split('#');
-    (0, assert_js_1.assert)(urlWithoutHash !== undefined);
-    const hashOriginal = ['', ...h].join('#') || null;
+    const { hashString: hashOriginal, withoutHash: urlWithoutHash } = extractHash(url);
     (0, assert_js_1.assert)(hashOriginal === null || hashOriginal.startsWith('#'));
     const hash = hashOriginal === null ? '' : decodeSafe(hashOriginal.slice(1));
     // Search
-    const [urlWithoutHashNorSearch, ...searchList] = urlWithoutHash.split('?');
-    (0, assert_js_1.assert)(urlWithoutHashNorSearch !== undefined);
-    const searchOriginal = ['', ...searchList].join('?') || null;
+    const { searchString: searchOriginal, withoutSearch: urlWithoutHashNorSearch } = extractSearch(urlWithoutHash);
     (0, assert_js_1.assert)(searchOriginal === null || searchOriginal.startsWith('?'));
+    let searchString = '';
+    if (searchOriginal !== null) {
+        searchString = searchOriginal;
+    }
+    else if (url.startsWith('#')) {
+        const baseURI = getBaseURI();
+        searchString = (baseURI && extractSearch(baseURI).searchString) || '';
+    }
     const search = {};
     const searchAll = {};
-    Array.from(new URLSearchParams(searchOriginal || '')).forEach(([key, val]) => {
+    Array.from(new URLSearchParams(searchString)).forEach(([key, val]) => {
         search[key] = val;
         searchAll[key] = [...(searchAll.hasOwnProperty(key) ? searchAll[key] : []), val];
     });
@@ -70,6 +74,16 @@ function parseUrl(url, baseServer) {
         hashOriginal
     };
 }
+function extractHash(url) {
+    const [withoutHash, ...parts] = url.split('#');
+    const hashString = ['', ...parts].join('#') || null;
+    return { hashString, withoutHash: withoutHash };
+}
+function extractSearch(url) {
+    const [withoutSearch, ...parts] = url.split('?');
+    const searchString = ['', ...parts].join('?') || null;
+    return { searchString, withoutSearch: withoutSearch };
+}
 function decodeSafe(urlComponent) {
     try {
         return decodeURIComponent(urlComponent);
@@ -106,13 +120,10 @@ function getPathnameAbsoluteWithBase(url, baseServer) {
     }
     else {
         // url is a relative path
-        // In the browser, this is the Base URL of the current URL.
-        // Safe access `window?.document?.baseURI` for users who shim `window` in Node.js
-        const baseURI = typeof window !== 'undefined' ? window?.document?.baseURI : undefined;
+        const baseURI = getBaseURI();
         let base;
         if (baseURI) {
-            const baseURIPathaname = parseOrigin(baseURI.split('?')[0].split('#')[0]).pathname;
-            base = baseURIPathaname;
+            base = parseOrigin(baseURI.split('?')[0].split('#')[0]).pathname;
         }
         else {
             base = baseServer;
@@ -121,6 +132,12 @@ function getPathnameAbsoluteWithBase(url, baseServer) {
         return { protocol: null, origin: null, pathnameAbsoluteWithBase };
     }
 }
+function getBaseURI() {
+    // In the browser, this is the Base URL of the current URL.
+    // Safe access `window?.document?.baseURI` for users who shim `window` in Node.js
+    const baseURI = typeof window !== 'undefined' ? window?.document?.baseURI : undefined;
+    return baseURI;
+}
 function parseOrigin(url) {
     if (!isUrlWithProtocol(url)) {
         return { pathname: url, origin: null, protocol: null };
@@ -251,16 +268,16 @@ function createUrlFromComponents(origin, pathname, search, hash) {
 }
 function isUrl(url) {
     // parseUrl() works with these URLs
-    return isUrlWithProtocol(url) || url.startsWith('/') || isUrlPathnameRelative(url);
+    return isUrlWithProtocol(url) || url.startsWith('/') || isUrlRelative(url);
 }
 function isUrlRedirectTarget(url) {
     return url.startsWith('/') || isUri(url) || isUrlWithProtocol(url);
 }
-function isUrlPathnameRelative(url) {
+function isUrlRelative(url) {
     return ['.', '?', '#'].some((c) => url.startsWith(c)) || url === '';
 }
 function isUrlExternal(url) {
-    return !url.startsWith('/') && !isUrlPathnameRelative(url);
+    return !url.startsWith('/') && !isUrlRelative(url);
 }
 /*
 URL with protocol.

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

@@ -1,5 +1,5 @@
 export { normalizeUrlArgument };
-import { assertUsage, isUrl, isUrlPathnameRelative } from './utils.js';
+import { assertUsage, isUrl, isUrlRelative } from './utils.js';
 function normalizeUrlArgument(url, fnName) {
     // Succinct error message to save client-side KBs
     const errMsg = `[${fnName}(url)] Invalid URL ${url}`;
@@ -8,7 +8,7 @@ function normalizeUrlArgument(url, fnName) {
         // Use normalizeClientSideUrl() instead?
         url = url.slice(location.origin.length);
     }
-    assertUsage(url.startsWith('/') || isUrlPathnameRelative(url), 
+    assertUsage(url.startsWith('/') || isUrlRelative(url), 
     // `errMsg` used the original `url` value
     errMsg);
     return url;

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

@@ -32,15 +32,18 @@ function isNewTabLink(linkTag) {
     return target === '_blank' || target === '_external' || rel === 'external' || linkTag.hasAttribute('download');
 }
 function isSamePageHashLink(href) {
+    if (href.startsWith('#'))
+        return true;
     if (href.includes('#') &&
         normalizeClientSideUrl(href, { withoutHash: true }) ===
             normalizeClientSideUrl(window.location.href, { withoutHash: true })) {
         return true;
     }
-    assert(!href.startsWith('#'));
     return false;
 }
 function isSameAsCurrentUrl(href) {
+    if (href.startsWith('#'))
+        return href === window.location.hash;
     return normalizeClientSideUrl(href) === normalizeClientSideUrl(window.location.href);
 }
 function hasBaseServer(href) {

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

@@ -2,6 +2,10 @@ export { normalizeClientSideUrl };
 import { assert, parseUrl } from './utils.js';
 /** Resolves relative URLs */
 function normalizeClientSideUrl(url, options) {
+    // This function doesn't work for `url === '#some-hash'` because `searchOriginal` is `null` even if window.location.href has a search string.
+    // - Thus the resolved absolute URL would be missing the search string.
+    // - It makes sense that `parseUrl()` returns `searchOriginal === null` since there isn't any search string in `url`.
+    assert(!url.startsWith('#'));
     const { searchOriginal, hashOriginal, pathname } = parseUrl(url, '/');
     let urlCurrent = `${pathname}${searchOriginal || ''}`;
     if (!options?.withoutHash)

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.204-commit-9a97c22";
+export declare const PROJECT_VERSION: "0.4.205";

package/dist/esm/utils/PROJECT_VERSION.js

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

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

@@ -4,7 +4,7 @@ export { assertUsageUrlRedirectTarget };
 export { isUrl };
 export { isUri };
 export { isUrlRedirectTarget };
-export { isUrlPathnameRelative };
+export { isUrlRelative };
 export { isUrlExternal };
 export { isBaseServer };
 export { assertUrlComponents };
@@ -50,7 +50,7 @@ declare function assertUrlComponents(url: string, origin: string | null, pathnam
 declare function createUrlFromComponents(origin: string | null, pathname: string, search: string | null, hash: string | null): string;
 declare function isUrl(url: string): boolean;
 declare function isUrlRedirectTarget(url: string): boolean;
-declare function isUrlPathnameRelative(url: string): boolean;
+declare function isUrlRelative(url: string): boolean;
 declare function isUrlExternal(url: string): boolean;
 declare function isUri(uri: string): boolean;
 declare function assertUsageUrlPathnameAbsolute(url: string, errPrefix: string): void;

package/dist/esm/utils/parseUrl.js

@@ -8,7 +8,7 @@ export { assertUsageUrlRedirectTarget };
 export { isUrl };
 export { isUri };
 export { isUrlRedirectTarget };
-export { isUrlPathnameRelative };
+export { isUrlRelative };
 export { isUrlExternal };
 export { isBaseServer };
 export { assertUrlComponents };
@@ -20,19 +20,23 @@ function parseUrl(url, baseServer) {
     assert(isUrl(url), url);
     assert(baseServer.startsWith('/'));
     // Hash
-    const [urlWithoutHash, ...h] = url.split('#');
-    assert(urlWithoutHash !== undefined);
-    const hashOriginal = ['', ...h].join('#') || null;
+    const { hashString: hashOriginal, withoutHash: urlWithoutHash } = extractHash(url);
     assert(hashOriginal === null || hashOriginal.startsWith('#'));
     const hash = hashOriginal === null ? '' : decodeSafe(hashOriginal.slice(1));
     // Search
-    const [urlWithoutHashNorSearch, ...searchList] = urlWithoutHash.split('?');
-    assert(urlWithoutHashNorSearch !== undefined);
-    const searchOriginal = ['', ...searchList].join('?') || null;
+    const { searchString: searchOriginal, withoutSearch: urlWithoutHashNorSearch } = extractSearch(urlWithoutHash);
     assert(searchOriginal === null || searchOriginal.startsWith('?'));
+    let searchString = '';
+    if (searchOriginal !== null) {
+        searchString = searchOriginal;
+    }
+    else if (url.startsWith('#')) {
+        const baseURI = getBaseURI();
+        searchString = (baseURI && extractSearch(baseURI).searchString) || '';
+    }
     const search = {};
     const searchAll = {};
-    Array.from(new URLSearchParams(searchOriginal || '')).forEach(([key, val]) => {
+    Array.from(new URLSearchParams(searchString)).forEach(([key, val]) => {
         search[key] = val;
         searchAll[key] = [...(searchAll.hasOwnProperty(key) ? searchAll[key] : []), val];
     });
@@ -66,6 +70,16 @@ function parseUrl(url, baseServer) {
         hashOriginal
     };
 }
+function extractHash(url) {
+    const [withoutHash, ...parts] = url.split('#');
+    const hashString = ['', ...parts].join('#') || null;
+    return { hashString, withoutHash: withoutHash };
+}
+function extractSearch(url) {
+    const [withoutSearch, ...parts] = url.split('?');
+    const searchString = ['', ...parts].join('?') || null;
+    return { searchString, withoutSearch: withoutSearch };
+}
 function decodeSafe(urlComponent) {
     try {
         return decodeURIComponent(urlComponent);
@@ -102,13 +116,10 @@ function getPathnameAbsoluteWithBase(url, baseServer) {
     }
     else {
         // url is a relative path
-        // In the browser, this is the Base URL of the current URL.
-        // Safe access `window?.document?.baseURI` for users who shim `window` in Node.js
-        const baseURI = typeof window !== 'undefined' ? window?.document?.baseURI : undefined;
+        const baseURI = getBaseURI();
         let base;
         if (baseURI) {
-            const baseURIPathaname = parseOrigin(baseURI.split('?')[0].split('#')[0]).pathname;
-            base = baseURIPathaname;
+            base = parseOrigin(baseURI.split('?')[0].split('#')[0]).pathname;
         }
         else {
             base = baseServer;
@@ -117,6 +128,12 @@ function getPathnameAbsoluteWithBase(url, baseServer) {
         return { protocol: null, origin: null, pathnameAbsoluteWithBase };
     }
 }
+function getBaseURI() {
+    // In the browser, this is the Base URL of the current URL.
+    // Safe access `window?.document?.baseURI` for users who shim `window` in Node.js
+    const baseURI = typeof window !== 'undefined' ? window?.document?.baseURI : undefined;
+    return baseURI;
+}
 function parseOrigin(url) {
     if (!isUrlWithProtocol(url)) {
         return { pathname: url, origin: null, protocol: null };
@@ -247,16 +264,16 @@ function createUrlFromComponents(origin, pathname, search, hash) {
 }
 function isUrl(url) {
     // parseUrl() works with these URLs
-    return isUrlWithProtocol(url) || url.startsWith('/') || isUrlPathnameRelative(url);
+    return isUrlWithProtocol(url) || url.startsWith('/') || isUrlRelative(url);
 }
 function isUrlRedirectTarget(url) {
     return url.startsWith('/') || isUri(url) || isUrlWithProtocol(url);
 }
-function isUrlPathnameRelative(url) {
+function isUrlRelative(url) {
     return ['.', '?', '#'].some((c) => url.startsWith(c)) || url === '';
 }
 function isUrlExternal(url) {
-    return !url.startsWith('/') && !isUrlPathnameRelative(url);
+    return !url.startsWith('/') && !isUrlRelative(url);
 }
 /*
 URL with protocol.

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

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

package/package.json

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