vike 0.4.241 → 0.4.242-commit-4a9fae0

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 };
@@ -53,6 +54,10 @@ function parseUrl(url, baseServer) {
     const { hostname, port } = parseHost(host, url);
     // decode after setting href
     pathname = decodePathname(pathname);
+    /* Should it be `pathname` or `pathnameOriginal`? https://github.com/vikejs/vike/pull/2770
+    // pageContext.urlParsed.path
+    const path = pathname + (searchOriginal || '') + (hashOriginal || '')
+    */
     assert(pathname.startsWith('/'));
     return {
         href,
@@ -135,7 +140,7 @@ function getBaseURI() {
     return baseURI;
 }
 function parseOrigin(url) {
-    if (!isUrlWithProtocol(url)) {
+    if (!isUrlWithWebProtocol(url)) {
         return { pathname: url, origin: null, protocol: null };
     }
     else {
@@ -181,7 +186,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 +269,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 +299,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 +319,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/dist/esm/utils/unique.d.ts

@@ -1,2 +1 @@
-export { unique };
-declare function unique<T>(arr: T[]): T[];
+export declare function unique<T>(arr: T[]): T[];

package/dist/esm/utils/unique.js

@@ -1,4 +1,3 @@
-export { unique };
-function unique(arr) {
+export function unique(arr) {
     return Array.from(new Set(arr));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.241",
+  "version": "0.4.242-commit-4a9fae0",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -245,7 +245,7 @@
     "@types/picomatch": "^3.0.2",
     "@types/semver": "^7.5.8",
     "@types/source-map-support": "^0.5.10",
-    "react-streaming": "^0.4.3",
+    "react-streaming": "^0.4.10",
     "rimraf": "^5.0.5",
     "typescript": "^5.9.2",
     "vite": "^7.1.5"

package/dist/esm/node/vite/shared/isViteCliCall.d.ts

@@ -1,10 +0,0 @@
-export { isViteCliCall };
-export { getViteConfigFromCli };
-declare function isViteCliCall(): boolean;
-type ConfigFromCli = {
-    root: undefined | string;
-    configFile: undefined | string;
-} & Record<string, unknown> & {
-    build: Record<string, unknown>;
-};
-declare function getViteConfigFromCli(): null | ConfigFromCli;

package/dist/esm/node/vite/shared/isViteCliCall.js

@@ -1,81 +0,0 @@
-export { isViteCliCall };
-export { getViteConfigFromCli };
-import { assert, isObject, toPosixPath } from '../utils.js';
-import { cac } from 'cac';
-function isViteCliCall() {
-    let execPath = process.argv[1];
-    assert(execPath);
-    execPath = toPosixPath(execPath);
-    return (
-    // pnpm
-    execPath.endsWith('/bin/vite.js') ||
-        // npm & yarn
-        execPath.endsWith('/.bin/vite') ||
-        // Global install
-        execPath.endsWith('/bin/vite'));
-}
-function getViteConfigFromCli() {
-    if (!isViteCliCall())
-        return null;
-    // Copied and adapted from https://github.com/vitejs/vite/blob/8d0a9c1ab8ddd26973509ca230b29604e872e2cd/packages/vite/src/node/cli.ts#L137-L197
-    const cli = cac('vike:vite-simulation');
-    const desc = 'FAKE_CLI';
-    cli
-        .option('-c, --config <file>', desc)
-        .option('--base <path>', desc)
-        .option('-l, --logLevel <level>', desc)
-        .option('--clearScreen', desc)
-        .option('-d, --debug [feat]', desc)
-        .option('-f, --filter <filter>', desc)
-        .option('-m, --mode <mode>', desc);
-    cli
-        .command('build [root]', desc)
-        .option('--target <target>', desc)
-        .option('--outDir <dir>', desc)
-        .option('--assetsDir <dir>', desc)
-        .option('--assetsInlineLimit <number>', desc)
-        .option('--ssr [entry]', desc)
-        .option('--sourcemap', desc)
-        .option('--minify [minifier]', desc)
-        .option('--manifest [name]', desc)
-        .option('--ssrManifest [name]', desc)
-        .option('--force', desc)
-        .option('--emptyOutDir', desc)
-        .option('-w, --watch', desc)
-        .action((root, options) => {
-        assert(isObject(options));
-        const buildOptions = cleanOptions(options);
-        assert(root === undefined || typeof root === 'string');
-        assert(options.config === undefined || typeof options.config === 'string');
-        configFromCli = {
-            root,
-            base: options.base,
-            mode: options.mode,
-            configFile: options.config,
-            logLevel: options.logLevel,
-            clearScreen: options.clearScreen,
-            optimizeDeps: { force: options.force },
-            build: buildOptions,
-        };
-    });
-    let configFromCli = null;
-    cli.parse();
-    return configFromCli;
-    function cleanOptions(options) {
-        const ret = { ...options };
-        delete ret['--'];
-        delete ret.c;
-        delete ret.config;
-        delete ret.base;
-        delete ret.l;
-        delete ret.logLevel;
-        delete ret.clearScreen;
-        delete ret.d;
-        delete ret.debug;
-        delete ret.f;
-        delete ret.filter;
-        delete ret.m;
-        delete ret.mode;
-        return ret;
-    }
-}