vike 0.4.197-commit-7d64995 → 0.4.197-commit-6410424

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.197-commit-7d64995';
+exports.PROJECT_VERSION = '0.4.197-commit-6410424';

package/dist/cjs/utils/parseUrl.js

@@ -7,12 +7,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseUrl = parseUrl;
-exports.assertUsageUrlPathname = assertUsageUrlPathname;
 exports.assertUsageUrlPathnameAbsolute = assertUsageUrlPathnameAbsolute;
 exports.assertUsageUrlRedirectTarget = assertUsageUrlRedirectTarget;
 exports.isUrl = isUrl;
 exports.isUri = isUri;
 exports.isUrlRedirectTarget = isUrlRedirectTarget;
+exports.isUrlPathnameRelative = isUrlPathnameRelative;
 exports.isUrlExternal = isUrlExternal;
 exports.isBaseServer = isBaseServer;
 exports.assertUrlComponents = assertUrlComponents;
@@ -297,16 +297,13 @@ function isUri(uri) {
     const { protocol } = parseProtocol(uri);
     return !!protocol && !isUrlProtocol(uri);
 }
-function assertUsageUrlPathname(url, errPrefix) {
-    assertUsageUrl(url, errPrefix, { allowRelative: true });
-}
 function assertUsageUrlPathnameAbsolute(url, errPrefix) {
     assertUsageUrl(url, errPrefix);
 }
 function assertUsageUrlRedirectTarget(url, errPrefix, isUnresolved) {
     assertUsageUrl(url, errPrefix, { isRedirectTarget: isUnresolved ? 'unresolved' : true });
 }
-function assertUsageUrl(url, errPrefix, { allowRelative, isRedirectTarget } = {}) {
+function assertUsageUrl(url, errPrefix, { isRedirectTarget } = {}) {
     if (url.startsWith('/'))
         return;
     let errMsg = `${errPrefix} is ${picocolors_1.default.string(url)} but it should start with ${picocolors_1.default.string('/')}`;
@@ -320,10 +317,5 @@ function assertUsageUrl(url, errPrefix, { allowRelative, isRedirectTarget } = {}
             errMsg += `, or be ${picocolors_1.default.string('*')}`;
         }
     }
-    if (allowRelative) {
-        if (isUrlPathnameRelative(url))
-            return;
-        errMsg += ', or be a relative URL';
-    }
     (0, assert_js_1.assertUsage)(false, errMsg);
 }

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

@@ -1,7 +1,8 @@
 export { navigate };
 export { reload };
+import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 import { firstRenderStartPromise, renderPageClientSide } from './renderPageClientSide.js';
-import { assertClientRouting, assertUsageUrlPathname, getCurrentUrl } from './utils.js';
+import { assertClientRouting, getCurrentUrl } from './utils.js';
 assertClientRouting();
 /** Programmatically navigate to a new page.
  *
@@ -12,7 +13,7 @@ assertClientRouting();
  * @param overwriteLastHistoryEntry - Don't create a new entry in the browser's history, instead let the new URL replace the current URL. (This effectively removes the current URL from the browser history).
  */
 async function navigate(url, { keepScrollPosition = false, overwriteLastHistoryEntry = false } = {}) {
-    assertUsageUrlPathname(url, '[navigate(url)] url');
+    normalizeUrlArgument(url, 'navigate');
     // If `hydrationCanBeAborted === false` (e.g. Vue) then we can apply navigate() only after hydration is done
     await firstRenderStartPromise;
     const scrollTarget = { preserveScroll: keepScrollPosition };

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

@@ -0,0 +1,2 @@
+export { normalizeUrlArgument };
+declare function normalizeUrlArgument(url: string, fnName: 'prefetch' | 'navigate'): string;

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

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

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

@@ -5,7 +5,7 @@ export { populatePageContextPrefetchCache };
 export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
-import { assert, assertClientRouting, assertUsage, assertUsageUrlPathname, assertWarning, checkIfClientRouting, getGlobalObject, hasProp, objectAssign } from './utils.js';
+import { assert, assertClientRouting, assertUsage, assertWarning, checkIfClientRouting, getGlobalObject, hasProp, objectAssign } from './utils.js';
 import { isErrorFetchingStaticAssets, loadUserFilesClientSide } from '../shared/loadUserFilesClientSide.js';
 import { skipLink } from './skipLink.js';
 import { disableClientRouting } from './renderPageClientSide.js';
@@ -17,6 +17,7 @@ import { getPageContextFromServerHooks } from './getPageContextFromHooks.js';
 import { getPageContextCurrent } from './getPageContextCurrent.js';
 import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings } from './prefetch/getPrefetchSettings.js';
 import pc from '@brillout/picocolors';
+import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 assertClientRouting();
 const globalObject = getGlobalObject('prefetch.ts', {
     linkPrefetchHandlerAdded: new WeakSet(),
@@ -28,7 +29,7 @@ const globalObject = getGlobalObject('prefetch.ts', {
 });
 function getPageContextPrefetched(pageContext) {
     const prefetchSettings = getPrefetchSettings(pageContext, null);
-    // TODO/pageContext-prefetch: we need linkTag to make this condition work
+    // TODO/pageContext-prefetch: I guess we need linkTag to make this condition work
     if (!prefetchSettings.pageContext)
         return null;
     const key = getCacheKey(pageContext.urlPathname);
@@ -59,13 +60,17 @@ async function prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge)
     const result = await getPageContextFromServerHooks(pageContextLink, false);
     setPageContextPrefetchCache(pageContextLink, result, resultMaxAge);
 }
-function populatePageContextPrefetchCache(pageContext, result) {
+function populatePageContextPrefetchCache(pageContext /*& PageContextExports*/, result) {
+    // TODO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use PageContextExports as it isn't available here.)
+    if (!isBrilloutDocpress())
+        return;
     setPageContextPrefetchCache(pageContext, result, null);
 }
 function setPageContextPrefetchCache(pageContext, result, resultMaxAge) {
     if (resultMaxAge === null)
         resultMaxAge = getResultMaxAge();
     const key = getCacheKey(pageContext.urlPathname);
+    assert(isBrilloutDocpress()); // Ensure this API isn't used by anyone else
     globalObject.prefetchedPageContexts[key] = {
         resultFetchedAt: Date.now(),
         resultMaxAge,
@@ -92,11 +97,10 @@ async function prefetch(url, options) {
     assertUsage(checkIfClientRouting(), 'prefetch() only works with Client Routing, see https://vike.dev/prefetch', {
         showStackTrace: true
     });
-    const errPrefix = '[prefetch(url)] url';
-    assertUsageUrlPathname(url, errPrefix);
+    url = normalizeUrlArgument(url, 'prefetch');
     const pageContextLink = await getPageContextLink(url);
     if (!pageContextLink?.pageId) {
-        assertWarning(false, `${errPrefix} ${pc.string(url)} ${noRouteMatch}`, {
+        assertWarning(false, `[prefetch(url)] ${pc.string(url)} ${noRouteMatch}`, {
             showStackTrace: true,
             onlyOnce: false
         });
@@ -234,3 +238,7 @@ function getCacheKey(url) {
     const key = url.split('#')[0];
     return key;
 }
+// TODO/pageContext-prefetch: remove
+function isBrilloutDocpress() {
+    return '_isBrilloutDocpress' in window;
+}

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.197-commit-7d64995";
+export declare const PROJECT_VERSION: "0.4.197-commit-6410424";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.197-commit-7d64995';
+export const PROJECT_VERSION = '0.4.197-commit-6410424';

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

@@ -1,10 +1,10 @@
 export { parseUrl };
-export { assertUsageUrlPathname };
 export { assertUsageUrlPathnameAbsolute };
 export { assertUsageUrlRedirectTarget };
 export { isUrl };
 export { isUri };
 export { isUrlRedirectTarget };
+export { isUrlPathnameRelative };
 export { isUrlExternal };
 export { isBaseServer };
 export { assertUrlComponents };
@@ -50,8 +50,8 @@ 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 isUrlExternal(url: string): boolean;
 declare function isUri(uri: string): boolean;
-declare function assertUsageUrlPathname(url: string, errPrefix: string): void;
 declare function assertUsageUrlPathnameAbsolute(url: string, errPrefix: string): void;
 declare function assertUsageUrlRedirectTarget(url: string, errPrefix: string, isUnresolved?: true): void;

package/dist/esm/utils/parseUrl.js

@@ -3,12 +3,12 @@
 //  - It doesn't support the tauri:// protocol
 // Unit tests at ./parseUrl.spec.ts
 export { parseUrl };
-export { assertUsageUrlPathname };
 export { assertUsageUrlPathnameAbsolute };
 export { assertUsageUrlRedirectTarget };
 export { isUrl };
 export { isUri };
 export { isUrlRedirectTarget };
+export { isUrlPathnameRelative };
 export { isUrlExternal };
 export { isBaseServer };
 export { assertUrlComponents };
@@ -293,16 +293,13 @@ function isUri(uri) {
     const { protocol } = parseProtocol(uri);
     return !!protocol && !isUrlProtocol(uri);
 }
-function assertUsageUrlPathname(url, errPrefix) {
-    assertUsageUrl(url, errPrefix, { allowRelative: true });
-}
 function assertUsageUrlPathnameAbsolute(url, errPrefix) {
     assertUsageUrl(url, errPrefix);
 }
 function assertUsageUrlRedirectTarget(url, errPrefix, isUnresolved) {
     assertUsageUrl(url, errPrefix, { isRedirectTarget: isUnresolved ? 'unresolved' : true });
 }
-function assertUsageUrl(url, errPrefix, { allowRelative, isRedirectTarget } = {}) {
+function assertUsageUrl(url, errPrefix, { isRedirectTarget } = {}) {
     if (url.startsWith('/'))
         return;
     let errMsg = `${errPrefix} is ${pc.string(url)} but it should start with ${pc.string('/')}`;
@@ -316,10 +313,5 @@ function assertUsageUrl(url, errPrefix, { allowRelative, isRedirectTarget } = {}
             errMsg += `, or be ${pc.string('*')}`;
         }
     }
-    if (allowRelative) {
-        if (isUrlPathnameRelative(url))
-            return;
-        errMsg += ', or be a relative URL';
-    }
     assertUsage(false, errMsg);
 }

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.197-commit-7d64995";
+    projectVersion: "0.4.197-commit-6410424";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.197-commit-7d64995",
+  "version": "0.4.197-commit-6410424",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {