vike 0.4.177-commit-51d612a → 0.4.178

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -12,7 +12,7 @@ const mergeScriptTags_js_1 = require("./mergeScriptTags.js");
 const globalContext_js_1 = require("../../globalContext.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const stamp = '__injectFilterEntry';
-function getHtmlTags(pageContext, injectToStream, injectFilter, pageAssets, viteDevScript) {
+function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript) {
     (0, utils_js_1.assert)([true, false].includes(pageContext._isHtmlOnly));
     const isHtmlOnly = pageContext._isHtmlOnly;
     const { isProduction } = (0, globalContext_js_1.getGlobalContext)();
@@ -88,11 +88,11 @@ function getHtmlTags(pageContext, injectToStream, injectFilter, pageAssets, vite
     // See https://github.com/vikejs/vike/pull/1271
     const positionJavaScriptEntry = (() => {
         if (pageContext._pageContextPromise) {
-            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time, because progressive hydration won't work.", { onlyOnce: true });
+            (0, utils_js_1.assertWarning)(!streamFromReactStreamingPackage, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time, because progressive hydration won't work.", { onlyOnce: true });
             // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/streaming#initial-data-after-stream-end
             return 'HTML_END';
         }
-        if (injectToStream) {
+        if (streamFromReactStreamingPackage && !streamFromReactStreamingPackage.hasStreamEnded()) {
             // If there is a stream then, in order to support progressive hydration, inject the JavaScript during the stream after React(/Vue/Solid/...) resolved the first suspense boundary
             return 'STREAM';
         }

package/dist/cjs/node/runtime/html/injectAssets/injectHtmlTags.js

@@ -1,23 +1,30 @@
 "use strict";
 // Unit tests at ./injectHtmlTags.spec.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectAtClosingTag = exports.injectAtOpeningTag = exports.createHtmlHeadIfMissing = exports.injectHtmlTags = void 0;
+exports.injectAtClosingTag = exports.injectAtOpeningTag = exports.createHtmlHeadIfMissing = exports.injectHtmlTagsUsingStream = exports.injectHtmlTags = void 0;
 const utils_js_1 = require("../../utils.js");
-const POSITIONS = ['HTML_BEGIN', 'HTML_END', 'STREAM'];
-function injectHtmlTags(htmlString, htmlTags, injectToStream) {
-    POSITIONS.forEach((position) => {
-        const htmlFragment = htmlTags
-            .filter((h) => h.position === position)
-            .map((h) => resolveHtmlTag(h.htmlTag))
-            .join('');
-        if (htmlFragment) {
-            htmlString = injectHtmlFragment(position, htmlFragment, htmlString, injectToStream);
-        }
-    });
+function injectHtmlTags(htmlString, htmlTags, position) {
+    const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === position));
+    if (htmlFragment) {
+        htmlString = injectHtmlFragment(position, htmlFragment, htmlString);
+    }
     return htmlString;
 }
 exports.injectHtmlTags = injectHtmlTags;
-function injectHtmlFragment(position, htmlFragment, htmlString, injectToStream) {
+async function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
+    const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === 'STREAM'));
+    if (htmlFragment) {
+        (0, utils_js_1.assert)(streamFromReactStreamingPackage);
+        (0, utils_js_1.assert)(!streamFromReactStreamingPackage.hasStreamEnded());
+        await streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });
+    }
+}
+exports.injectHtmlTagsUsingStream = injectHtmlTagsUsingStream;
+function joinHtmlTags(htmlTags) {
+    const htmlFragment = htmlTags.map((h) => resolveHtmlTag(h.htmlTag)).join('');
+    return htmlFragment;
+}
+function injectHtmlFragment(position, htmlFragment, htmlString) {
     if (position === 'HTML_BEGIN') {
         {
             const res = injectAtPaceholder(htmlFragment, htmlString, true);
@@ -42,11 +49,6 @@ function injectHtmlFragment(position, htmlFragment, htmlString, injectToStream)
         }
         return htmlString + '\n' + htmlFragment;
     }
-    if (position === 'STREAM') {
-        (0, utils_js_1.assert)(injectToStream);
-        injectToStream(htmlFragment, { flush: true });
-        return htmlString;
-    }
     (0, utils_js_1.assert)(false);
 }
 function resolveHtmlTag(htmlTag) {

package/dist/cjs/node/runtime/html/injectAssets.js

@@ -11,12 +11,13 @@ async function injectHtmlTagsToString(htmlParts, pageContext, injectFilter) {
     const viteDevScript = await (0, getViteDevScript_js_1.getViteDevScript)();
     const htmlTags = (0, getHtmlTags_js_1.getHtmlTags)(pageContext, null, injectFilter, pageAssets, viteDevScript);
     let htmlString = htmlPartsToString(htmlParts, pageAssets);
-    htmlString = injectToHtmlBegin(htmlString, htmlTags, null);
+    htmlString = injectToHtmlBegin(htmlString, htmlTags);
     htmlString = injectToHtmlEnd(htmlString, htmlTags);
+    (0, utils_js_1.assert)(htmlTags.filter((snippet) => snippet.position === 'STREAM').length === 0);
     return htmlString;
 }
 exports.injectHtmlTagsToString = injectHtmlTagsToString;
-function injectHtmlTagsToStream(pageContext, injectToStream, injectFilter) {
+function injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, injectFilter) {
     let htmlTags;
     return {
         injectAtStreamBegin,
@@ -25,9 +26,10 @@ function injectHtmlTagsToStream(pageContext, injectToStream, injectFilter) {
     async function injectAtStreamBegin(htmlPartsBegin) {
         const pageAssets = await pageContext.__getPageAssets();
         const viteDevScript = await (0, getViteDevScript_js_1.getViteDevScript)();
-        htmlTags = (0, getHtmlTags_js_1.getHtmlTags)(pageContext, injectToStream, injectFilter, pageAssets, viteDevScript);
+        htmlTags = (0, getHtmlTags_js_1.getHtmlTags)(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript);
         let htmlBegin = htmlPartsToString(htmlPartsBegin, pageAssets);
-        htmlBegin = injectToHtmlBegin(htmlBegin, htmlTags, injectToStream);
+        htmlBegin = injectToHtmlBegin(htmlBegin, htmlTags);
+        await (0, injectHtmlTags_js_1.injectHtmlTagsUsingStream)(htmlTags, streamFromReactStreamingPackage);
         return htmlBegin;
     }
     async function injectAtStreamEnd(htmlPartsEnd) {
@@ -40,16 +42,14 @@ function injectHtmlTagsToStream(pageContext, injectToStream, injectFilter) {
     }
 }
 exports.injectHtmlTagsToStream = injectHtmlTagsToStream;
-function injectToHtmlBegin(htmlBegin, htmlTags, injectToStream) {
-    const htmlTagsAtBegin = htmlTags.filter((snippet) => snippet.position !== 'HTML_END');
+function injectToHtmlBegin(htmlBegin, htmlTags) {
     // Ensure existence of `<head>`
     htmlBegin = (0, injectHtmlTags_js_1.createHtmlHeadIfMissing)(htmlBegin);
-    htmlBegin = (0, injectHtmlTags_js_1.injectHtmlTags)(htmlBegin, htmlTagsAtBegin, injectToStream);
+    htmlBegin = (0, injectHtmlTags_js_1.injectHtmlTags)(htmlBegin, htmlTags, 'HTML_BEGIN');
     return htmlBegin;
 }
 function injectToHtmlEnd(htmlEnd, htmlTags) {
-    const htmlTagsAtEnd = htmlTags.filter((snippet) => snippet.position === 'HTML_END');
-    htmlEnd = (0, injectHtmlTags_js_1.injectHtmlTags)(htmlEnd, htmlTagsAtEnd, null);
+    htmlEnd = (0, injectHtmlTags_js_1.injectHtmlTags)(htmlEnd, htmlTags, 'HTML_END');
     return htmlEnd;
 }
 async function resolvePageContextPromise(pageContext) {

package/dist/cjs/node/runtime/html/renderHtml.js

@@ -60,11 +60,11 @@ async function renderHtmlStream(streamOriginal, injectString, pageContext, onErr
         enableEagerStreaming: pageContext.enableEagerStreaming
     };
     if (injectString) {
-        let injectToStream = null;
-        if ((0, react_streaming_js_1.isStreamReactStreaming)(streamOriginal) && !streamOriginal.disabled) {
-            injectToStream = streamOriginal.injectToStream;
+        let streamFromReactStreamingPackage = null;
+        if ((0, react_streaming_js_1.isStreamFromReactStreamingPackage)(streamOriginal) && !streamOriginal.disabled) {
+            streamFromReactStreamingPackage = streamOriginal;
         }
-        const { injectAtStreamBegin, injectAtStreamEnd } = (0, injectAssets_js_1.injectHtmlTagsToStream)(pageContext, injectToStream, injectFilter);
+        const { injectAtStreamBegin, injectAtStreamEnd } = (0, injectAssets_js_1.injectHtmlTagsToStream)(pageContext, streamFromReactStreamingPackage, injectFilter);
         (0, utils_js_1.objectAssign)(opts, {
             injectStringAtBegin: async () => {
                 return await injectAtStreamBegin(injectString.htmlPartsBegin);

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

@@ -1,10 +1,10 @@
 "use strict";
 // Zero-config support for https://www.npmjs.com/package/react-streaming
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStreamFromReactStreaming = exports.streamReactStreamingToString = exports.isStreamReactStreaming = void 0;
+exports.getStreamOfReactStreamingPackage = exports.streamFromReactStreamingPackageToString = exports.isStreamFromReactStreamingPackage = void 0;
 const utils_js_1 = require("../../utils.js");
 const stream_js_1 = require("../stream.js");
-function streamReactStreamingToString(stream) {
+function streamFromReactStreamingPackageToString(stream) {
     if (stream.pipe) {
         return (0, stream_js_1.streamPipeNodeToString)(stream.pipe);
     }
@@ -13,19 +13,20 @@ function streamReactStreamingToString(stream) {
     }
     (0, utils_js_1.assert)(false);
 }
-exports.streamReactStreamingToString = streamReactStreamingToString;
-function isStreamReactStreaming(thing) {
+exports.streamFromReactStreamingPackageToString = streamFromReactStreamingPackageToString;
+function isStreamFromReactStreamingPackage(thing) {
     if ((0, utils_js_1.hasProp)(thing, 'injectToStream', 'function')) {
+        (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(thing, 'hasStreamEnded', 'function'), (0, utils_js_1.isVikeReactApp)()
+            ? //
+                'Update vike-react to its latest version'
+            : 'Update react-streaming to its latest version');
         return true;
     }
-    // TODO
-    //if( isStreamPipeNode
     return false;
 }
-exports.isStreamReactStreaming = isStreamReactStreaming;
-function getStreamFromReactStreaming(stream) {
+exports.isStreamFromReactStreamingPackage = isStreamFromReactStreamingPackage;
+function getStreamOfReactStreamingPackage(stream) {
     if (stream.pipe) {
-        // TODO
         return { __streamPipeNode: stream.pipe };
     }
     if (stream.readable) {
@@ -33,4 +34,4 @@ function getStreamFromReactStreaming(stream) {
     }
     (0, utils_js_1.assert)(false);
 }
-exports.getStreamFromReactStreaming = getStreamFromReactStreaming;
+exports.getStreamOfReactStreamingPackage = getStreamOfReactStreamingPackage;

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

@@ -354,9 +354,9 @@ async function processStream(streamOriginal, { injectStringAtBegin, injectString
 }
 exports.processStream = processStream;
 async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onFlush, onReadyToWrite }) {
-    if ((0, react_streaming_js_1.isStreamReactStreaming)(streamOriginal)) {
+    if ((0, react_streaming_js_1.isStreamFromReactStreamingPackage)(streamOriginal)) {
         debug(`onRenderHtml() hook returned ${picocolors_1.default.cyan('react-streaming')} result`);
-        const stream = (0, react_streaming_js_1.getStreamFromReactStreaming)(streamOriginal);
+        const stream = (0, react_streaming_js_1.getStreamOfReactStreamingPackage)(streamOriginal);
         streamOriginal = stream;
     }
     if (isStreamPipeNode(streamOriginal)) {
@@ -621,7 +621,7 @@ function isStream(something) {
         isStreamReadableNode(something) ||
         isStreamPipeNode(something) ||
         isStreamPipeWeb(something) ||
-        (0, react_streaming_js_1.isStreamReactStreaming)(something)) {
+        (0, react_streaming_js_1.isStreamFromReactStreamingPackage)(something)) {
         (0, utils_js_1.checkType)(something);
         return true;
     }
@@ -733,8 +733,8 @@ async function streamToString(stream) {
     if (isStreamPipeWeb(stream)) {
         return await streamPipeWebToString(getStreamPipeWeb(stream));
     }
-    if ((0, react_streaming_js_1.isStreamReactStreaming)(stream)) {
-        return await (0, react_streaming_js_1.streamReactStreamingToString)(stream);
+    if ((0, react_streaming_js_1.isStreamFromReactStreamingPackage)(stream)) {
+        return await (0, react_streaming_js_1.streamFromReactStreamingPackageToString)(stream);
     }
     (0, utils_js_1.assert)(false);
 }

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

@@ -70,3 +70,4 @@ __exportStar(require("../../utils/joinEnglish.js"), exports);
 __exportStar(require("../../utils/isArrayOfStrings.js"), exports);
 __exportStar(require("../../utils/escapeHtml.js"), exports);
 __exportStar(require("../../utils/normalizeHeaders.js"), exports);
+__exportStar(require("../../utils/isVikeReactApp.js"), exports);

package/dist/cjs/utils/isVikeReactApp.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVikeReactApp = void 0;
+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;
+}
+exports.isVikeReactApp = isVikeReactApp;

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.177-commit-51d612a';
+const PROJECT_VERSION = '0.4.178';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -3,7 +3,7 @@ export type { HtmlTag };
 export type { PreloadFilter };
 export type { InjectFilterEntry };
 import type { PageContextInjectAssets } from '../injectAssets.js';
-import type { InjectToStream } from '../stream/react-streaming.js';
+import type { StreamFromReactStreamingPackage } from '../stream/react-streaming.js';
 import type { PageAsset } from '../../renderPage/getPageAssets.js';
 type PreloadFilter = null | ((assets: InjectFilterEntry[]) => InjectFilterEntry[]);
 type PreloadFilterInject = false | 'HTML_BEGIN' | 'HTML_END';
@@ -28,4 +28,4 @@ type HtmlTag = {
 };
 declare function getHtmlTags(pageContext: {
     _isStream: boolean;
-} & PageContextInjectAssets, injectToStream: null | InjectToStream, injectFilter: PreloadFilter, pageAssets: PageAsset[], viteDevScript: string): HtmlTag[];
+} & PageContextInjectAssets, streamFromReactStreamingPackage: null | StreamFromReactStreamingPackage, injectFilter: PreloadFilter, pageAssets: PageAsset[], viteDevScript: string): HtmlTag[];

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js

@@ -7,7 +7,7 @@ import { mergeScriptTags } from './mergeScriptTags.js';
 import { getGlobalContext } from '../../globalContext.js';
 import pc from '@brillout/picocolors';
 const stamp = '__injectFilterEntry';
-function getHtmlTags(pageContext, injectToStream, injectFilter, pageAssets, viteDevScript) {
+function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript) {
     assert([true, false].includes(pageContext._isHtmlOnly));
     const isHtmlOnly = pageContext._isHtmlOnly;
     const { isProduction } = getGlobalContext();
@@ -83,11 +83,11 @@ function getHtmlTags(pageContext, injectToStream, injectFilter, pageAssets, vite
     // See https://github.com/vikejs/vike/pull/1271
     const positionJavaScriptEntry = (() => {
         if (pageContext._pageContextPromise) {
-            assertWarning(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time, because progressive hydration won't work.", { onlyOnce: true });
+            assertWarning(!streamFromReactStreamingPackage, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time, because progressive hydration won't work.", { onlyOnce: true });
             // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/streaming#initial-data-after-stream-end
             return 'HTML_END';
         }
-        if (injectToStream) {
+        if (streamFromReactStreamingPackage && !streamFromReactStreamingPackage.hasStreamEnded()) {
             // If there is a stream then, in order to support progressive hydration, inject the JavaScript during the stream after React(/Vue/Solid/...) resolved the first suspense boundary
             return 'STREAM';
         }

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

@@ -1,10 +1,13 @@
 export { injectHtmlTags };
+export { injectHtmlTagsUsingStream };
 export { createHtmlHeadIfMissing };
 export { injectAtOpeningTag };
 export { injectAtClosingTag };
+import type { StreamFromReactStreamingPackage } from '../stream/react-streaming.js';
 import type { HtmlTag } from './getHtmlTags.js';
-import type { InjectToStream } from '../stream/react-streaming.js';
-declare function injectHtmlTags(htmlString: string, htmlTags: HtmlTag[], injectToStream: null | InjectToStream): string;
+type Position = 'HTML_BEGIN' | 'HTML_END';
+declare function injectHtmlTags(htmlString: string, htmlTags: HtmlTag[], position: Position): string;
+declare function injectHtmlTagsUsingStream(htmlTags: HtmlTag[], streamFromReactStreamingPackage: null | StreamFromReactStreamingPackage): Promise<void>;
 declare function injectAtOpeningTag(tag: 'head' | 'html' | '!doctype', htmlString: string, htmlFragment: string): string;
 declare function injectAtClosingTag(tag: 'body' | 'html', htmlString: string, htmlFragment: string): string;
 declare function createHtmlHeadIfMissing(htmlString: string): string;

package/dist/esm/node/runtime/html/injectAssets/injectHtmlTags.js

@@ -1,24 +1,31 @@
 // Unit tests at ./injectHtmlTags.spec.ts
 export { injectHtmlTags };
+export { injectHtmlTagsUsingStream };
 export { createHtmlHeadIfMissing };
 // Only needed for unit tests
 export { injectAtOpeningTag };
 export { injectAtClosingTag };
 import { assert, assertUsage, slice } from '../../utils.js';
-const POSITIONS = ['HTML_BEGIN', 'HTML_END', 'STREAM'];
-function injectHtmlTags(htmlString, htmlTags, injectToStream) {
-    POSITIONS.forEach((position) => {
-        const htmlFragment = htmlTags
-            .filter((h) => h.position === position)
-            .map((h) => resolveHtmlTag(h.htmlTag))
-            .join('');
-        if (htmlFragment) {
-            htmlString = injectHtmlFragment(position, htmlFragment, htmlString, injectToStream);
-        }
-    });
+function injectHtmlTags(htmlString, htmlTags, position) {
+    const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === position));
+    if (htmlFragment) {
+        htmlString = injectHtmlFragment(position, htmlFragment, htmlString);
+    }
     return htmlString;
 }
-function injectHtmlFragment(position, htmlFragment, htmlString, injectToStream) {
+async function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
+    const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === 'STREAM'));
+    if (htmlFragment) {
+        assert(streamFromReactStreamingPackage);
+        assert(!streamFromReactStreamingPackage.hasStreamEnded());
+        await streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });
+    }
+}
+function joinHtmlTags(htmlTags) {
+    const htmlFragment = htmlTags.map((h) => resolveHtmlTag(h.htmlTag)).join('');
+    return htmlFragment;
+}
+function injectHtmlFragment(position, htmlFragment, htmlString) {
     if (position === 'HTML_BEGIN') {
         {
             const res = injectAtPaceholder(htmlFragment, htmlString, true);
@@ -43,11 +50,6 @@ function injectHtmlFragment(position, htmlFragment, htmlString, injectToStream)
         }
         return htmlString + '\n' + htmlFragment;
     }
-    if (position === 'STREAM') {
-        assert(injectToStream);
-        injectToStream(htmlFragment, { flush: true });
-        return htmlString;
-    }
     assert(false);
 }
 function resolveHtmlTag(htmlTag) {

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

@@ -5,7 +5,7 @@ export type { PageContextPromise };
 import type { PageAsset } from '../renderPage/getPageAssets.js';
 import type { HtmlPart } from './renderHtml.js';
 import { type PreloadFilter } from './injectAssets/getHtmlTags.js';
-import type { InjectToStream } from './stream/react-streaming.js';
+import type { StreamFromReactStreamingPackage } from './stream/react-streaming.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextSerialization } from './serializePageContextClientSide.js';
 type PageContextInjectAssets = {
@@ -27,7 +27,7 @@ declare function injectHtmlTagsToString(htmlParts: HtmlPart[], pageContext: Page
 }, injectFilter: PreloadFilter): Promise<string>;
 declare function injectHtmlTagsToStream(pageContext: PageContextInjectAssets & {
     _isStream: true;
-}, injectToStream: null | InjectToStream, injectFilter: PreloadFilter): {
+}, streamFromReactStreamingPackage: null | StreamFromReactStreamingPackage, injectFilter: PreloadFilter): {
     injectAtStreamBegin: (htmlPartsBegin: HtmlPart[]) => Promise<string>;
     injectAtStreamEnd: (htmlPartsEnd: HtmlPart[]) => Promise<string>;
 };

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

@@ -2,7 +2,7 @@ export { injectHtmlTagsToString };
 export { injectHtmlTagsToStream };
 import { assert, isCallable, isPromise } from '../utils.js';
 import { assertPageContextProvidedByUser } from '../../../shared/assertPageContextProvidedByUser.js';
-import { injectHtmlTags, createHtmlHeadIfMissing } from './injectAssets/injectHtmlTags.js';
+import { injectHtmlTags, createHtmlHeadIfMissing, injectHtmlTagsUsingStream } from './injectAssets/injectHtmlTags.js';
 import { getHtmlTags } from './injectAssets/getHtmlTags.js';
 import { getViteDevScript } from './injectAssets/getViteDevScript.js';
 async function injectHtmlTagsToString(htmlParts, pageContext, injectFilter) {
@@ -10,11 +10,12 @@ async function injectHtmlTagsToString(htmlParts, pageContext, injectFilter) {
     const viteDevScript = await getViteDevScript();
     const htmlTags = getHtmlTags(pageContext, null, injectFilter, pageAssets, viteDevScript);
     let htmlString = htmlPartsToString(htmlParts, pageAssets);
-    htmlString = injectToHtmlBegin(htmlString, htmlTags, null);
+    htmlString = injectToHtmlBegin(htmlString, htmlTags);
     htmlString = injectToHtmlEnd(htmlString, htmlTags);
+    assert(htmlTags.filter((snippet) => snippet.position === 'STREAM').length === 0);
     return htmlString;
 }
-function injectHtmlTagsToStream(pageContext, injectToStream, injectFilter) {
+function injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, injectFilter) {
     let htmlTags;
     return {
         injectAtStreamBegin,
@@ -23,9 +24,10 @@ function injectHtmlTagsToStream(pageContext, injectToStream, injectFilter) {
     async function injectAtStreamBegin(htmlPartsBegin) {
         const pageAssets = await pageContext.__getPageAssets();
         const viteDevScript = await getViteDevScript();
-        htmlTags = getHtmlTags(pageContext, injectToStream, injectFilter, pageAssets, viteDevScript);
+        htmlTags = getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript);
         let htmlBegin = htmlPartsToString(htmlPartsBegin, pageAssets);
-        htmlBegin = injectToHtmlBegin(htmlBegin, htmlTags, injectToStream);
+        htmlBegin = injectToHtmlBegin(htmlBegin, htmlTags);
+        await injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage);
         return htmlBegin;
     }
     async function injectAtStreamEnd(htmlPartsEnd) {
@@ -37,16 +39,14 @@ function injectHtmlTagsToStream(pageContext, injectToStream, injectFilter) {
         return htmlEnd;
     }
 }
-function injectToHtmlBegin(htmlBegin, htmlTags, injectToStream) {
-    const htmlTagsAtBegin = htmlTags.filter((snippet) => snippet.position !== 'HTML_END');
+function injectToHtmlBegin(htmlBegin, htmlTags) {
     // Ensure existence of `<head>`
     htmlBegin = createHtmlHeadIfMissing(htmlBegin);
-    htmlBegin = injectHtmlTags(htmlBegin, htmlTagsAtBegin, injectToStream);
+    htmlBegin = injectHtmlTags(htmlBegin, htmlTags, 'HTML_BEGIN');
     return htmlBegin;
 }
 function injectToHtmlEnd(htmlEnd, htmlTags) {
-    const htmlTagsAtEnd = htmlTags.filter((snippet) => snippet.position === 'HTML_END');
-    htmlEnd = injectHtmlTags(htmlEnd, htmlTagsAtEnd, null);
+    htmlEnd = injectHtmlTags(htmlEnd, htmlTags, 'HTML_END');
     return htmlEnd;
 }
 async function resolvePageContextPromise(pageContext) {

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

@@ -6,7 +6,7 @@ export { getHtmlString };
 import { assert, assertUsage, assertWarning, checkType, escapeHtml, hasProp, isHtml, isPromise, objectAssign } from '../utils.js';
 import { injectHtmlTagsToString, injectHtmlTagsToStream } from './injectAssets.js';
 import { processStream, isStream, streamToString } from './stream.js';
-import { isStreamReactStreaming } from './stream/react-streaming.js';
+import { isStreamFromReactStreamingPackage } from './stream/react-streaming.js';
 import { getGlobalContext } from '../globalContext.js';
 import pc from '@brillout/picocolors';
 function isDocumentHtml(something) {
@@ -57,11 +57,11 @@ async function renderHtmlStream(streamOriginal, injectString, pageContext, onErr
         enableEagerStreaming: pageContext.enableEagerStreaming
     };
     if (injectString) {
-        let injectToStream = null;
-        if (isStreamReactStreaming(streamOriginal) && !streamOriginal.disabled) {
-            injectToStream = streamOriginal.injectToStream;
+        let streamFromReactStreamingPackage = null;
+        if (isStreamFromReactStreamingPackage(streamOriginal) && !streamOriginal.disabled) {
+            streamFromReactStreamingPackage = streamOriginal;
         }
-        const { injectAtStreamBegin, injectAtStreamEnd } = injectHtmlTagsToStream(pageContext, injectToStream, injectFilter);
+        const { injectAtStreamBegin, injectAtStreamEnd } = injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, injectFilter);
         objectAssign(opts, {
             injectStringAtBegin: async () => {
                 return await injectAtStreamBegin(injectString.htmlPartsBegin);

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

@@ -1,25 +1,18 @@
-/// <reference types="node" resolution-mode="require"/>
-export { isStreamReactStreaming };
-export { streamReactStreamingToString };
-export { getStreamFromReactStreaming };
-export type { StreamReactStreaming };
-export type { InjectToStream };
+export { isStreamFromReactStreamingPackage };
+export { streamFromReactStreamingPackageToString };
+export { getStreamOfReactStreamingPackage };
+export type { StreamFromReactStreamingPackage };
+export type { StreamFromReactStreamingPackagePublic };
+import type { renderToStream } from 'react-streaming/server';
 import { StreamReadableWeb, StreamWritableNode } from '../stream.js';
-type InjectToStream = (chunk: unknown, options?: {
-    flush?: boolean;
-}) => void;
-type StreamReactStreaming = {
-    injectToStream: InjectToStream;
-    disabled?: boolean;
-} & ({
-    pipe: (writable: StreamWritableNode) => void;
-    readable: null;
-} | {
-    pipe: null;
-    readable: StreamReadableWeb;
-});
-declare function streamReactStreamingToString(stream: StreamReactStreaming): Promise<string>;
-declare function isStreamReactStreaming(thing: unknown): thing is StreamReactStreaming;
-declare function getStreamFromReactStreaming(stream: StreamReactStreaming): StreamReadableWeb | {
-    __streamPipeNode: (writable: import("stream").Writable) => void;
+type StreamFromReactStreamingPackagePublic = {
+    injectToStream: Function;
 };
+type StreamFromReactStreamingPackage = Awaited<ReturnType<typeof renderToStream>>;
+declare function streamFromReactStreamingPackageToString(stream: StreamFromReactStreamingPackage): Promise<string>;
+declare function isStreamFromReactStreamingPackage(thing: unknown): thing is StreamFromReactStreamingPackage;
+type Pipe = {
+    __streamPipeNode: (writable: StreamWritableNode) => void;
+};
+type Readable = StreamReadableWeb;
+declare function getStreamOfReactStreamingPackage(stream: StreamFromReactStreamingPackage): Pipe | Readable;

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)) {
@@ -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);
 }

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/projectInfo.d.ts

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.177-commit-51d612a";
+declare const PROJECT_VERSION: "0.4.178";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.177-commit-51d612a";
+    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-commit-51d612a';
+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-commit-51d612a",
+  "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",