vike 0.4.241-commit-60b0676 → 0.4.242-commit-33026dc

package/dist/esm/node/vite/plugins/pluginReplaceConstantsGlobalThis.d.ts

@@ -1,4 +1,5 @@
 export { pluginReplaceConstantsGlobalThis };
+export type _LoadDeclareGlobal__VIKE__IS = never;
 import type { Plugin } from 'vite';
 declare global {
     /** Like `import.meta.env.DEV` but works for `node_modules/` packages with `ssr.external` */

package/dist/esm/shared/modifyUrlSameOrigin.js

@@ -1,12 +1,12 @@
 export { modifyUrlSameOrigin };
 // We don't move modifyUrlSameOrigin() to the modifyUrl.ts file because we plan to use modifyUrlSameOrigin() on the client-side:
 // https://github.com/vikejs/vike/blob/c5a2de5e85262771f97851767c00ac35da69c64b/packages/vike/client/runtime-client-routing/navigate.ts#L4
-import { createUrlFromComponents, isNotNullish_keyVal, parseUrl, objectFilter, assertUsageUrlPathnameAbsolute, } from './utils.js';
+import { createUrlFromComponents, isNotNullish_keyVal, parseUrl, objectFilter, assertUsageUrlPathAbsolute, } from './utils.js';
 function modifyUrlSameOrigin(url, modify) {
     const urlParsed = parseUrl(url, '/');
     // Pathname
     const pathname = modify.pathname ?? urlParsed.pathnameOriginal;
-    assertUsageUrlPathnameAbsolute(pathname, 'modify.pathname');
+    assertUsageUrlPathAbsolute(pathname, 'modify.pathname');
     // Search
     let search = modify.search === null ? '' : !modify.search ? urlParsed.searchOriginal : resolveSearch(urlParsed, modify.search);
     if (search === '?')

package/dist/esm/shared/route/abort.js

@@ -8,7 +8,7 @@ export { getPageContextFromAllRewrites };
 export { AbortRender };
 export { assertNoInfiniteAbortLoop };
 import { isUserHookError } from '../hooks/execHook.js';
-import { assert, assertInfo, assertUsage, assertUsageUrlPathnameAbsolute, assertUsageUrlRedirectTarget, assertWarning, checkType, hasProp, isBrowser, joinEnglish, objectAssign, truncateString, } from './utils.js';
+import { assert, assertInfo, assertUsage, assertUsageUrlPathAbsolute, assertUsageUrlRedirectTarget, assertWarning, checkType, hasProp, isBrowser, joinEnglish, objectAssign, truncateString, } from './utils.js';
 import pc from '@brillout/picocolors';
 /**
  * Abort the rendering of the current page, and redirect the user to another URL instead.
@@ -66,7 +66,7 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
     }
     if (typeof urlOrStatusCode === 'string') {
         const url = urlOrStatusCode;
-        assertUsageUrlPathnameAbsolute(url, getErrPrefix(abortCaller));
+        assertUsageUrlPathAbsolute(url, getErrPrefix(abortCaller));
         objectAssign(pageContextAbort, {
             _urlRewrite: url,
         });

package/dist/esm/shared/route/execHookOnBeforeRoute.js

@@ -1,6 +1,6 @@
 export { execHookOnBeforeRoute };
 import { assertPageContextProvidedByUser } from '../assertPageContextProvidedByUser.js';
-import { assertUsage, hasProp, isObjectWithKeys, objectAssign, assertWarning, assertUsageUrlPathnameAbsolute, joinEnglish, assert, } from './utils.js';
+import { assertUsage, hasProp, isObjectWithKeys, objectAssign, assertWarning, assertUsageUrlAbsolute, joinEnglish, assert, } from './utils.js';
 import { assertRouteParams, assertSyncRouting } from './resolveRouteFunction.js';
 import pc from '@brillout/picocolors';
 import { execHookDirectSync } from '../hooks/execHook.js';
@@ -65,8 +65,8 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
         delete hookReturn.pageContext.urlOriginal;
     }
     if (hasProp(hookReturn.pageContext, 'urlLogical')) {
-        assertUsageUrlPathnameAbsolute(
-        // We skip validation and type-cast instead of assertUsage() in order to save client-side KBs
+        assertUsageUrlAbsolute(
+        // We type-cast instead of assertUsage() validation in order to save client-side KBs
         hookReturn.pageContext.urlLogical, `${errPrefix} returned ${pc.cyan('{ pageContext: { urlLogical } }')} and ${pc.cyan('urlLogical')}`);
     }
     assertPageContextProvidedByUser(hookReturn.pageContext, {

package/dist/esm/types/index.d.ts

@@ -13,6 +13,7 @@ export type { VikeConfig } from '../node/vite/shared/resolveVikeConfigInternal.j
 export type { UrlPublic as Url } from '../utils/parseUrl.js';
 export type { InjectFilterEntry } from '../node/runtime/renderPage/html/injectAssets/getHtmlTags.js';
 export { defineConfig } from './defineConfig.js';
+export type { _LoadDeclareGlobal__VIKE__IS } from '../node/vite/plugins/pluginReplaceConstantsGlobalThis.js';
 import type { ConfigEnv } from './PageConfig.js';
 /** @deprecated Replace:
  *   `import type { Env } from 'vike/types'`

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.241-commit-60b0676";
+export declare const PROJECT_VERSION: "0.4.242-commit-33026dc";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.241-commit-60b0676';
+export const PROJECT_VERSION = '0.4.242-commit-33026dc';

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

@@ -1,5 +1,6 @@
 export { parseUrl };
-export { assertUsageUrlPathnameAbsolute };
+export { assertUsageUrlAbsolute };
+export { assertUsageUrlPathAbsolute };
 export { assertUsageUrlRedirectTarget };
 export { isUrl };
 export { isUri };
@@ -52,5 +53,6 @@ declare function isUrlRedirectTarget(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;
+declare function assertUsageUrlAbsolute(url: string, errPrefix: string): void;
+declare function assertUsageUrlPathAbsolute(url: string, errPrefix: string): void;
 declare function assertUsageUrlRedirectTarget(url: string, errPrefix: string, isUnresolved?: true): void;

package/dist/esm/utils/parseUrl.js

@@ -3,7 +3,8 @@
 //  - It doesn't support the tauri:// protocol
 // Unit tests at ./parseUrl.spec.ts
 export { parseUrl };
-export { assertUsageUrlPathnameAbsolute };
+export { assertUsageUrlAbsolute };
+export { assertUsageUrlPathAbsolute };
 export { assertUsageUrlRedirectTarget };
 export { isUrl };
 export { isUri };
@@ -135,7 +136,7 @@ function getBaseURI() {
     return baseURI;
 }
 function parseOrigin(url) {
-    if (!isUrlWithProtocol(url)) {
+    if (!isUrlWithWebProtocol(url)) {
         return { pathname: url, origin: null, protocol: null };
     }
     else {
@@ -181,7 +182,7 @@ function parseProtocol(uri) {
     }
     return { protocol, uriWithoutProtocol };
 }
-function isUrlProtocol(protocol) {
+function isWebUrlProtocol(protocol) {
     // Is there an alternative to having a blocklist?
     // - If the blocklist becomes too big, maybe use a allowlist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
     const blocklist = [
@@ -264,10 +265,16 @@ function createUrlFromComponents(origin, pathname, search, hash) {
 }
 function isUrl(url) {
     // parseUrl() works with these URLs
-    return isUrlWithProtocol(url) || url.startsWith('/') || isUrlRelative(url);
+    return isUrlAbsolute(url) || isUrlRelative(url);
 }
 function isUrlRedirectTarget(url) {
-    return url.startsWith('/') || isUri(url) || isUrlWithProtocol(url);
+    return isUrlAbsolute(url) || isUri(url);
+}
+function isUrlAbsolute(url) {
+    return isUrlPathAbsolute(url) || isUrlWithWebProtocol(url);
+}
+function isUrlPathAbsolute(url) {
+    return url.startsWith('/');
 }
 function isUrlRelative(url) {
     return ['.', '?', '#'].some((c) => url.startsWith(c)) || url === '';
@@ -288,9 +295,9 @@ URL with protocol.
 [Electron (`file://`)](https://github.com/vikejs/vike/issues/1557)
 [Capacitor](https://github.com/vikejs/vike/issues/1706)
  */
-function isUrlWithProtocol(url) {
+function isUrlWithWebProtocol(url) {
     const { protocol } = parseProtocol(url);
-    return !!protocol && isUrlProtocol(protocol);
+    return !!protocol && isWebUrlProtocol(protocol);
 }
 /*
 URIs that aren't URLs.
@@ -308,27 +315,23 @@ We need to treat URIs differently than URLs.
 */
 function isUri(uri) {
     const { protocol } = parseProtocol(uri);
-    return !!protocol && !isUrlProtocol(uri);
+    return !!protocol && !isWebUrlProtocol(protocol);
+}
+function assertUsageUrlAbsolute(url, errPrefix) {
+    assertUsage(isUrlAbsolute(url), getErrMsg(url, errPrefix, true));
 }
-function assertUsageUrlPathnameAbsolute(url, errPrefix) {
-    assertUsageUrl(url, errPrefix);
+function assertUsageUrlPathAbsolute(url, errPrefix) {
+    assertUsage(isUrlPathAbsolute(url), getErrMsg(url, errPrefix));
 }
 function assertUsageUrlRedirectTarget(url, errPrefix, isUnresolved) {
-    assertUsageUrl(url, errPrefix, { isRedirectTarget: isUnresolved ? 'unresolved' : true });
+    const errMsg = getErrMsg(url, errPrefix, true, isUnresolved);
+    assertUsage(isUrlRedirectTarget(url) || (isUnresolved && url === '*'), errMsg);
 }
-function assertUsageUrl(url, errPrefix, { isRedirectTarget } = {}) {
-    if (url.startsWith('/'))
-        return;
+function getErrMsg(url, errPrefix, allowProtocol, allowUri) {
     let errMsg = `${errPrefix} is ${pc.string(url)} but it should start with ${pc.string('/')}`;
-    if (isRedirectTarget) {
-        if (isUrlRedirectTarget(url))
-            return;
-        errMsg += ` or a protocol (${pc.string('http://')}, ${pc.string('mailto:')}, ...)`;
-        if (isRedirectTarget === 'unresolved') {
-            if (url === '*')
-                return;
-            errMsg += `, or be ${pc.string('*')}`;
-        }
-    }
-    assertUsage(false, errMsg);
+    if (allowProtocol)
+        errMsg += ` or a protocol (e.g. ${pc.string('http://')})`;
+    if (allowUri)
+        errMsg += `, or be ${pc.string('*')}`;
+    return errMsg;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.241-commit-60b0676",
+  "version": "0.4.242-commit-33026dc",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {