vike 0.4.177 → 0.4.178

package/dist/esm/node/runtime/html/stream/react-streaming.js

@@ -1,10 +1,10 @@
 // Zero-config support for https://www.npmjs.com/package/react-streaming
-export { isStreamReactStreaming };
-export { streamReactStreamingToString };
-export { getStreamFromReactStreaming };
-import { assert, hasProp } from '../../utils.js';
+export { isStreamFromReactStreamingPackage };
+export { streamFromReactStreamingPackageToString };
+export { getStreamOfReactStreamingPackage };
+import { assert, assertUsage, hasProp, isVikeReactApp } from '../../utils.js';
 import { streamPipeNodeToString, streamReadableWebToString } from '../stream.js';
-function streamReactStreamingToString(stream) {
+function streamFromReactStreamingPackageToString(stream) {
     if (stream.pipe) {
         return streamPipeNodeToString(stream.pipe);
     }
@@ -13,17 +13,18 @@ function streamReactStreamingToString(stream) {
     }
     assert(false);
 }
-function isStreamReactStreaming(thing) {
+function isStreamFromReactStreamingPackage(thing) {
     if (hasProp(thing, 'injectToStream', 'function')) {
+        assertUsage(hasProp(thing, 'hasStreamEnded', 'function'), isVikeReactApp()
+            ? //
+                'Update vike-react to its latest version'
+            : 'Update react-streaming to its latest version');
         return true;
     }
-    // TODO
-    //if( isStreamPipeNode
     return false;
 }
-function getStreamFromReactStreaming(stream) {
+function getStreamOfReactStreamingPackage(stream) {
     if (stream.pipe) {
-        // TODO
         return { __streamPipeNode: stream.pipe };
     }
     if (stream.readable) {

package/dist/esm/node/runtime/html/stream.d.ts

@@ -30,7 +30,7 @@ export type { StreamWritableNode };
 export type { StreamPipeWeb };
 export type { StreamPipeNode };
 import { HtmlRender } from './renderHtml.js';
-import { StreamReactStreaming } from './stream/react-streaming.js';
+import { StreamFromReactStreamingPackagePublic } from './stream/react-streaming.js';
 import type { Readable as Readable_, Writable as Writable_ } from 'node:stream';
 type StreamReadableWeb = ReadableStream;
 type StreamReadableNode = Readable_;
@@ -39,7 +39,7 @@ type StreamWritableNode = Writable_;
 type StreamPipeWeb = (writable: StreamWritableWeb) => void;
 type StreamPipeNode = (writable: StreamWritableNode) => void;
 type StreamProviderNormalized = StreamReadableWeb | StreamReadableNode | StreamPipeWeb | StreamPipeNode;
-type StreamProviderAny = StreamProviderNormalized | StreamReactStreaming | StreamPipeWebWrapped | StreamPipeNodeWrapped;
+type StreamProviderAny = StreamProviderNormalized | StreamFromReactStreamingPackagePublic | StreamPipeWebWrapped | StreamPipeNodeWrapped;
 type StreamTypePatch = NodeJS.ReadableStream;
 declare function isStreamReadableWeb(thing: unknown): thing is StreamReadableWeb;
 declare function isStreamWritableWeb(thing: unknown): thing is StreamWritableWeb;

package/dist/esm/node/runtime/html/stream.js

@@ -20,7 +20,7 @@ export { streamPipeNodeToString };
 export { isStreamWritableWeb };
 export { isStreamWritableNode };
 import { assert, assertUsage, checkType, isObject, hasProp, objectAssign, capitalizeFirstLetter, assertWarning, isCallable, createDebugger, isBug } from '../utils.js';
-import { getStreamFromReactStreaming, isStreamReactStreaming, streamReactStreamingToString } from './stream/react-streaming.js';
+import { getStreamOfReactStreamingPackage, isStreamFromReactStreamingPackage, streamFromReactStreamingPackageToString } from './stream/react-streaming.js';
 import { import_ } from '@brillout/import';
 import pc from '@brillout/picocolors';
 const debug = createDebugger('vike:stream');
@@ -358,9 +358,9 @@ async function processStream(streamOriginal, { injectStringAtBegin, injectString
     }
 }
 async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onFlush, onReadyToWrite }) {
-    if (isStreamReactStreaming(streamOriginal)) {
+    if (isStreamFromReactStreamingPackage(streamOriginal)) {
         debug(`onRenderHtml() hook returned ${pc.cyan('react-streaming')} result`);
-        const stream = getStreamFromReactStreaming(streamOriginal);
+        const stream = getStreamOfReactStreamingPackage(streamOriginal);
         streamOriginal = stream;
     }
     if (isStreamPipeNode(streamOriginal)) {
@@ -380,7 +380,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             assert(writableOriginal);
             writableOriginal.write(chunk);
             if (debug.isActivated) {
-                debug('data written (Node.js Writable)', String(chunk));
+                debug('data written (Node.js Writable)', getChunkAsString(chunk));
             }
         };
         // For libraries such as https://www.npmjs.com/package/compression
@@ -453,7 +453,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             assert(writerOriginal);
             writerOriginal.write(encodeForWebStream(chunk));
             if (debug.isActivated) {
-                debug('data written (Web Writable)', String(chunk));
+                debug('data written (Web Writable)', getChunkAsString(chunk));
             }
         };
         // Web Streams have compression built-in
@@ -546,12 +546,12 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             !controllerProxyIsClosed) {
                 controllerProxy.enqueue(encodeForWebStream(chunk));
                 if (debug.isActivated) {
-                    debug('data written (Web Readable)', String(chunk));
+                    debug('data written (Web Readable)', getChunkAsString(chunk));
                 }
             }
             else {
                 if (debug.isActivated) {
-                    debug('data emitted but not written (Web Readable)', String(chunk));
+                    debug('data emitted but not written (Web Readable)', getChunkAsString(chunk));
                 }
             }
         };
@@ -573,7 +573,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             readableProxy.push(chunk);
             if (debug.isActivated) {
-                debug('data written (Node.js Readable)', String(chunk));
+                debug('data written (Node.js Readable)', getChunkAsString(chunk));
             }
         };
         // Readables don't have the notion of flushing
@@ -625,7 +625,7 @@ function isStream(something) {
         isStreamReadableNode(something) ||
         isStreamPipeNode(something) ||
         isStreamPipeWeb(something) ||
-        isStreamReactStreaming(something)) {
+        isStreamFromReactStreamingPackage(something)) {
         checkType(something);
         return true;
     }
@@ -730,8 +730,8 @@ async function streamToString(stream) {
     if (isStreamPipeWeb(stream)) {
         return await streamPipeWebToString(getStreamPipeWeb(stream));
     }
-    if (isStreamReactStreaming(stream)) {
-        return await streamReactStreamingToString(stream);
+    if (isStreamFromReactStreamingPackage(stream)) {
+        return await streamFromReactStreamingPackageToString(stream);
     }
     assert(false);
 }
@@ -787,3 +787,11 @@ function inferStreamName(stream) {
     }
     assert(false);
 }
+function getChunkAsString(chunk) {
+    try {
+        return new TextDecoder().decode(chunk);
+    }
+    catch (err) {
+        return String(chunk);
+    }
+}

package/dist/esm/node/runtime/utils.d.ts

@@ -51,3 +51,4 @@ export * from '../../utils/joinEnglish.js';
 export * from '../../utils/isArrayOfStrings.js';
 export * from '../../utils/escapeHtml.js';
 export * from '../../utils/normalizeHeaders.js';
+export * from '../../utils/isVikeReactApp.js';

package/dist/esm/node/runtime/utils.js

@@ -54,3 +54,4 @@ export * from '../../utils/joinEnglish.js';
 export * from '../../utils/isArrayOfStrings.js';
 export * from '../../utils/escapeHtml.js';
 export * from '../../utils/normalizeHeaders.js';
+export * from '../../utils/isVikeReactApp.js';

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

@@ -0,0 +1 @@
+export declare function isVikeReactApp(): boolean;

package/dist/esm/utils/isVikeReactApp.js

@@ -0,0 +1,5 @@
+export function isVikeReactApp() {
+    const g = globalThis;
+    // Set by vike-react https://github.com/vikejs/vike-react/blob/23e92434424f10e7e742b6bf587edee5aa8832df/packages/vike-react/src/renderer/onRenderHtml.tsx#L75
+    return !!g._isVikeReactApp;
+}

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

@@ -21,4 +21,4 @@ declare function parseUrl(url: string, baseServer: string): {
 declare function isBaseServer(baseServer: string): boolean;
 declare function assertUrlComponents(url: string, origin: string | null, pathname: string, searchOriginal: string | null, hashOriginal: string | null): void;
 declare function createUrlFromComponents(origin: string | null, pathname: string, searchOriginal: string | null, hashOriginal: string | null): string;
-declare function isUriWithProtocol(uri: string): boolean;
+declare function isUriWithProtocol(str: string): boolean;

package/dist/esm/utils/parseUrl.js

@@ -12,17 +12,9 @@ export { isUriWithProtocol };
 import { slice } from './slice.js';
 import { assert, assertUsage } from './assert.js';
 import pc from '@brillout/picocolors';
-const PROTOCOLS = [
-    'http://',
-    'https://',
-    // For [Tauri](https://tauri.app/)
-    'tauri://',
-    // For Electron: https://github.com/vikejs/vike/issues/1557
-    'file://'
-];
 function isParsable(url) {
     // `parseUrl()` works with these URLs
-    return (PROTOCOLS.some((p) => url.startsWith(p)) ||
+    return (isUrlWithProtocol(url) ||
         url.startsWith('/') ||
         url.startsWith('.') ||
         url.startsWith('?') ||
@@ -137,7 +129,8 @@ function getPathname(url, baseServer) {
     }
 }
 function parseOrigin(url) {
-    if (!PROTOCOLS.some((protocol) => url.startsWith(protocol))) {
+    if (!isUrlWithProtocol(url)) {
+        assert(!isUriWithProtocol(url));
         return { pathname: url, origin: null };
     }
     else {
@@ -235,7 +228,19 @@ function createUrlFromComponents(origin, pathname, searchOriginal, hashOriginal)
     const urlRecreated = `${origin || ''}${pathname}${searchOriginal || ''}${hashOriginal || ''}`;
     return urlRecreated;
 }
-function isUriWithProtocol(uri) {
+function isUriWithProtocol(str) {
     // https://en.wikipedia.org/wiki/List_of_URI_schemes
-    return /^[a-z0-9][a-z0-9\.\+\-]*:/i.test(uri);
+    // https://www.rfc-editor.org/rfc/rfc7595
+    // https://github.com/vikejs/vike/commit/886a99ff21e86a8ca699a25cee7edc184aa058e4#r143308934
+    // Examples:
+    //   http://
+    //   https://
+    //   tauri:// # [Tauri](https://tauri.app)
+    //   file:// # [Electron](https://github.com/vikejs/vike/issues/1557)
+    //   capacitor:// # [Capacitor](https://github.com/vikejs/vike/issues/1706)
+    return /^[a-z][a-z0-9\+\-]*:/i.test(str);
+}
+// Same as isUriWithProtocol() but with trailing :// which is needed for parseOrigin()
+function isUrlWithProtocol(str) {
+    return /^[a-z][a-z0-9\+\-]*:\/\//i.test(str);
 }

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.177";
+declare const PROJECT_VERSION: "0.4.178";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.177";
+    projectVersion: "0.4.178";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.177';
+const PROJECT_VERSION = '0.4.178';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.177",
+  "version": "0.4.178",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -138,7 +138,7 @@
     }
   },
   "peerDependencies": {
-    "react-streaming": ">=0.3.5",
+    "react-streaming": ">=0.3.36",
     "vite": ">=4.4.0"
   },
   "peerDependenciesMeta": {
@@ -209,7 +209,7 @@
     "es-module-lexer": "^1.4.1",
     "esbuild": "^0.19.10",
     "fast-glob": "^3.3.2",
-    "react-streaming": "^0.3.24",
+    "react-streaming": "^0.3.36",
     "rimraf": "^5.0.5",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",

package/dist/esm/node/runtime/html/injectAssets/getViteDevScripts.d.ts

@@ -1,2 +0,0 @@
-export { getViteDevScripts };
-declare function getViteDevScripts(): Promise<string>;