@modern-js/runtime 3.9.1 → 3.9.3

package/dist/cjs/cli/template.server.js

@@ -141,8 +141,7 @@ function genHandlerCode({ mode, metaName, customServerEntry, srcDirectory, inter
         return `
       export * from '${realEntryPath}';
       export { default as requestHandler } from '${realEntryPath}'`;
-    }
-    {
+    } else {
         const entrySource = enableRsc ? SERVER_ENTRY_RSC : SERVER_ENTRY;
         const serverEntry = transformServerEntry(entrySource, {
             metaName: metaName || 'modern-js',

package/dist/cjs/core/browser/hydrate.js

@@ -59,7 +59,7 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
     if ('stream' === renderMode) return streamSSRHydrate();
     function streamSSRHydrate() {
         if (renderLevel !== external_constants_js_namespaceObject.RenderLevel.SERVER_RENDER) return ModernRender((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(App, context));
-        {
+        else {
             const SSRApp = ()=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_withCallback_js_namespaceObject.WithCallback, {
                     callback: callback,
                     children: App
@@ -70,19 +70,21 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
     return stringSSRHydrate();
     function stringSSRHydrate() {
         if (renderLevel === external_constants_js_namespaceObject.RenderLevel.CLIENT_RENDER) return ModernRender((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(App, context));
-        if (renderLevel === external_constants_js_namespaceObject.RenderLevel.SERVER_RENDER) return new Promise((resolve)=>{
-            (0, component_namespaceObject.loadableReady)(()=>{
-                const SSRApp = ()=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_withCallback_js_namespaceObject.WithCallback, {
-                        callback: callback,
-                        children: App
+        else {
+            if (renderLevel === external_constants_js_namespaceObject.RenderLevel.SERVER_RENDER) return new Promise((resolve)=>{
+                (0, component_namespaceObject.loadableReady)(()=>{
+                    const SSRApp = ()=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_withCallback_js_namespaceObject.WithCallback, {
+                            callback: callback,
+                            children: App
+                        });
+                    ModernHydrate((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(SSRApp, {}), hydrateContext)).then((root)=>{
+                        resolve(root);
                     });
-                ModernHydrate((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(SSRApp, {}), hydrateContext)).then((root)=>{
-                    resolve(root);
                 });
             });
-        });
-        console.warn(`unknow render level: ${renderLevel}, execute render()`);
-        return ModernRender((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(App, context));
+            console.warn(`unknow render level: ${renderLevel}, execute render()`);
+            return ModernRender((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(App, context));
+        }
     }
 }
 exports.hydrateRoot = __webpack_exports__.hydrateRoot;

package/dist/cjs/core/server/requestHandler.js

@@ -143,12 +143,14 @@ const createRequestHandler = async (handleRequest, createRequestOptions)=>{
             status: -1
         };
         const activeDeferreds = new Map();
+        const deferredScriptKeys = new Map();
         return node_namespaceObject.storage.run({
             headers: headersData,
             request,
             monitors: options.monitors,
             responseProxy,
             activeDeferreds,
+            deferredScriptKeys,
             serverPayload: void 0
         }, async ()=>{
             const Root = (0, external_react_index_js_namespaceObject.createRoot)();

package/dist/cjs/core/server/stream/beforeTemplate.js

@@ -54,8 +54,8 @@ const readAsset = async (chunk)=>{
 };
 const checkIsInline = (chunk, enableInline)=>{
     if ('production' !== process.env.NODE_ENV) return false;
-    if (enableInline instanceof RegExp) return enableInline.test(chunk);
-    return Boolean(enableInline);
+    else if (enableInline instanceof RegExp) return enableInline.test(chunk);
+    else return Boolean(enableInline);
 };
 async function buildShellBeforeTemplate(beforeAppTemplate, options) {
     const { config, runtimeContext, styledComponentsStyleTags, entryName } = options;
@@ -96,7 +96,7 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
             const styles = await Promise.all(cssChunks.map(async (chunk)=>{
                 const link = `<link href="${chunk}" rel="stylesheet" />`;
                 if ((0, external_utils_js_namespaceObject.checkIsNode)() && checkIsInline(chunk, inlineStyles)) return readAsset(chunk).then((content)=>`<style>${content}</style>`).catch((_)=>link);
-                return link;
+                else return link;
             }));
             return `${styles.join('')}`;
         }

package/dist/cjs/core/server/stream/createReadableStream.js

@@ -31,6 +31,7 @@ __webpack_require__.d(__webpack_exports__, {
     createReadableStreamFromElement: ()=>createReadableStreamFromElement
 });
 const external_stream_namespaceObject = require("stream");
+const external_string_decoder_namespaceObject = require("string_decoder");
 const node_namespaceObject = require("@modern-js/runtime-utils/node");
 const constants_namespaceObject = require("@modern-js/utils/universal/constants");
 const external_common_js_namespaceObject = require("../../../common.js");
@@ -38,6 +39,7 @@ const external_constants_js_namespaceObject = require("../../constants.js");
 const index_js_namespaceObject = require("../../context/index.js");
 const monitors_index_js_namespaceObject = require("../../context/monitors/index.js");
 const external_deferredScript_js_namespaceObject = require("./deferredScript.js");
+const external_deferredScriptOutputCoordinator_js_namespaceObject = require("./deferredScriptOutputCoordinator.js");
 const external_shared_js_namespaceObject = require("./shared.js");
 const external_template_js_namespaceObject = require("./template.js");
 const defaultExtender = {
@@ -86,7 +88,14 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                     entryName,
                     styledComponentsStyleTags
                 }).then(({ shellAfter, shellBefore })=>{
+                    const decoder = new external_string_decoder_namespaceObject.StringDecoder('utf8');
                     const pendingScripts = [];
+                    const outputState = {};
+                    let deferredResolversComplete = Promise.resolve();
+                    const writeReact = (content)=>{
+                        if (!outputState.coordinator) throw new Error("Deferred script coordinator is not ready");
+                        outputState.coordinator.writeReact(content);
+                    };
                     const body = new external_stream_namespaceObject.Transform({
                         transform (chunk, _encoding, callback) {
                             try {
@@ -98,17 +107,49 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                                         const beforeMark = concatedChunk.slice(0, markerIndex);
                                         const afterMark = concatedChunk.slice(markerIndex + external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK.length);
                                         shellChunkStatus = external_shared_js_namespaceObject.ShellChunkStatus.FINISH;
-                                        this.push(`${shellBefore}${beforeMark}${shellAfter}`);
-                                        if (afterMark) this.push(afterMark);
-                                        if (pendingScripts.length > 0) for (const s of pendingScripts)this.push(s);
+                                        writeReact(`${shellBefore}${beforeMark}${shellAfter}`);
+                                        if (afterMark) writeReact(afterMark);
+                                        if (outputState.coordinator) {
+                                            outputState.coordinator.markShellFinished();
+                                            for (const script of pendingScripts)outputState.coordinator.enqueueResolver(script);
+                                            pendingScripts.length = 0;
+                                        }
                                     }
-                                } else this.push(chunk);
+                                } else {
+                                    const decodedChunk = decoder.write(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+                                    writeReact(decodedChunk);
+                                }
                                 callback();
                             } catch (e) {
                                 e instanceof Error ? callback(e) : callback(new Error('Received unknown error when streaming'));
                             }
+                        },
+                        flush (callback) {
+                            try {
+                                writeReact(decoder.end());
+                            } catch (error) {
+                                callback(error instanceof Error ? error : new Error('Received unknown error when streaming'));
+                                return;
+                            }
+                            deferredResolversComplete.then(()=>{
+                                try {
+                                    outputState.coordinator?.finish();
+                                    callback();
+                                } catch (error) {
+                                    callback(error instanceof Error ? error : new Error('Received unknown error when streaming'));
+                                }
+                            }, (error)=>{
+                                callback(error instanceof Error ? error : new Error('Received unknown error when streaming'));
+                            });
                         }
                     });
+                    const coordinator = new external_deferredScriptOutputCoordinator_js_namespaceObject.DeferredScriptOutputCoordinator((content)=>{
+                        body.push(content);
+                    });
+                    outputState.coordinator = coordinator;
+                    body.once('close', ()=>{
+                        coordinator.abort();
+                    });
                     const passThrough = new external_stream_namespaceObject.PassThrough();
                     const stream = external_stream_namespaceObject.Readable.toWeb(body);
                     resolve(stream);
@@ -116,23 +157,25 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                     extenders.forEach((extender)=>{
                         if (extender.processStream) processedStream = extender.processStream(processedStream);
                     });
-                    reactStreamingPipe(passThrough);
-                    processedStream.pipe(body);
                     try {
                         const storageContext = node_namespaceObject.storage.useContext?.();
                         const activeDeferreds = storageContext?.activeDeferreds;
+                        const deferredScriptKeys = storageContext?.deferredScriptKeys;
                         const entries = activeDeferreds instanceof Map ? Array.from(activeDeferreds.entries()) : [];
                         if (entries.length > 0) {
                             const enqueueScript = (s)=>{
-                                if (shellChunkStatus === external_shared_js_namespaceObject.ShellChunkStatus.FINISH) body.write(s);
+                                if (!outputState.coordinator) throw new Error("Deferred script coordinator is not ready");
+                                if (shellChunkStatus === external_shared_js_namespaceObject.ShellChunkStatus.FINISH) outputState.coordinator.enqueueResolver(s);
                                 else pendingScripts.push(s);
                             };
-                            (0, external_deferredScript_js_namespaceObject.enqueueFromEntries)(entries, config.nonce, (s)=>enqueueScript(s));
+                            deferredResolversComplete = (0, external_deferredScript_js_namespaceObject.enqueueFromEntries)(entries, deferredScriptKeys, config.nonce, enqueueScript);
                         }
                     } catch (err) {
                         const monitors = (0, monitors_index_js_namespaceObject.getMonitors)();
                         monitors.error("cannot inject router data script", err);
                     }
+                    reactStreamingPipe(passThrough);
+                    processedStream.pipe(body);
                 });
             },
             onShellError (error) {

package/dist/cjs/core/server/stream/createReadableStream.worker.js

@@ -35,6 +35,7 @@ const node_namespaceObject = require("@modern-js/runtime-utils/node");
 const external_common_js_namespaceObject = require("../../../common.js");
 const external_constants_js_namespaceObject = require("../../constants.js");
 const external_deferredScript_js_namespaceObject = require("./deferredScript.js");
+const external_deferredScriptOutputCoordinator_js_namespaceObject = require("./deferredScriptOutputCoordinator.js");
 const external_shared_js_namespaceObject = require("./shared.js");
 const external_template_js_namespaceObject = require("./template.js");
 const createReadableStreamFromElement = async (request, rootElement, options)=>{
@@ -67,10 +68,13 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
         const { waitForAllReady } = (0, external_shared_js_namespaceObject.resolveStreamingMode)(request, forceStreamToString);
         if (waitForAllReady) await readableOriginal.allReady;
         const reader = readableOriginal.getReader();
+        let coordinator;
         const stream = new ReadableStream({
             start (controller) {
+                const decoder = new TextDecoder();
                 const pendingScripts = [];
                 let isClosed = false;
+                let deferredResolversComplete = Promise.resolve();
                 const safeEnqueue = (chunk)=>{
                     if (isClosed) return;
                     try {
@@ -87,38 +91,55 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                         } catch  {}
                     }
                 };
-                const flushPendingScripts = ()=>{
-                    for (const s of pendingScripts)safeEnqueue((0, external_shared_js_namespaceObject.encodeForWebStream)(s));
-                    pendingScripts.length = 0;
-                };
-                const enqueueScript = (script)=>{
-                    if (shellChunkStatus === external_shared_js_namespaceObject.ShellChunkStatus.FINISH) safeEnqueue((0, external_shared_js_namespaceObject.encodeForWebStream)(script));
-                    else pendingScripts.push(script);
-                };
+                coordinator = new external_deferredScriptOutputCoordinator_js_namespaceObject.DeferredScriptOutputCoordinator((content)=>{
+                    safeEnqueue((0, external_shared_js_namespaceObject.encodeForWebStream)(content));
+                });
                 const storageContext = node_namespaceObject.storage.useContext?.();
                 const activeDeferreds = storageContext?.activeDeferreds;
+                const deferredScriptKeys = storageContext?.deferredScriptKeys;
                 const entries = activeDeferreds instanceof Map ? Array.from(activeDeferreds.entries()) : [];
-                if (entries.length > 0) (0, external_deferredScript_js_namespaceObject.enqueueFromEntries)(entries, config.nonce, enqueueScript);
+                if (entries.length > 0) deferredResolversComplete = (0, external_deferredScript_js_namespaceObject.enqueueFromEntries)(entries, deferredScriptKeys, config.nonce, (script)=>{
+                    if (!coordinator) throw new Error("Deferred script coordinator is not ready");
+                    if (shellChunkStatus === external_shared_js_namespaceObject.ShellChunkStatus.FINISH) coordinator.enqueueResolver(script);
+                    else pendingScripts.push(script);
+                });
                 async function push() {
                     try {
                         const { done, value } = await reader.read();
-                        if (done) return void closeController();
+                        if (done) {
+                            const trailingText = decoder.decode();
+                            if (trailingText) coordinator?.writeReact(trailingText);
+                            await deferredResolversComplete;
+                            coordinator?.finish();
+                            closeController();
+                            return;
+                        }
                         if (isClosed) return;
                         if (shellChunkStatus !== external_shared_js_namespaceObject.ShellChunkStatus.FINISH) {
-                            chunkVec.push(new TextDecoder().decode(value));
+                            chunkVec.push(decoder.decode(value, {
+                                stream: true
+                            }));
                             const concatedChunk = chunkVec.join('');
                             const markerIndex = concatedChunk.indexOf(external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK);
                             if (-1 !== markerIndex) {
                                 const beforeMark = concatedChunk.slice(0, markerIndex);
                                 const afterMark = concatedChunk.slice(markerIndex + external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK.length);
                                 shellChunkStatus = external_shared_js_namespaceObject.ShellChunkStatus.FINISH;
-                                safeEnqueue((0, external_shared_js_namespaceObject.encodeForWebStream)(`${shellBefore}${beforeMark}${shellAfter}`));
-                                if (afterMark) safeEnqueue((0, external_shared_js_namespaceObject.encodeForWebStream)(afterMark));
-                                flushPendingScripts();
+                                coordinator?.writeReact(`${shellBefore}${beforeMark}${shellAfter}`);
+                                if (afterMark) coordinator?.writeReact(afterMark);
+                                coordinator?.markShellFinished();
+                                for (const script of pendingScripts)coordinator?.enqueueResolver(script);
+                                pendingScripts.length = 0;
                             }
-                        } else safeEnqueue(value);
+                        } else {
+                            const decodedChunk = decoder.decode(value, {
+                                stream: true
+                            });
+                            if (decodedChunk) coordinator?.writeReact(decodedChunk);
+                        }
                         if (!isClosed) push();
                     } catch (error) {
+                        coordinator?.abort();
                         if (!isClosed) {
                             isClosed = true;
                             try {
@@ -130,6 +151,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                 push();
             },
             cancel (reason) {
+                coordinator?.abort();
                 reader.cancel(reason).catch(()=>{});
             }
         });

package/dist/cjs/core/server/stream/deferredScript.js

@@ -78,24 +78,30 @@ function buildDeferredDataScript(nonce, args) {
     const nonceAttr = nonce ? ` nonce="${nonce}"` : '';
     return `<script async${nonceAttr} data-fn-name="r" data-script-src="modern-run-router-data-fn" data-fn-args='${escaped}' suppressHydrationWarning>${constants_js_namespaceObject.runRouterDataFnStr}</script>`;
 }
-function enqueueFromEntries(entries, nonce, emit) {
+function enqueueFromEntries(entries, deferredScriptKeys, nonce, emit) {
+    const pendingResolvers = [];
     entries.forEach(([routeId, value])=>{
         if (!isDeferredDataLike(value)) return;
-        const pendingKeys = new Set(value.pendingKeys ?? []);
-        pendingKeys.forEach((key)=>{
+        const serializedKeys = deferredScriptKeys ? deferredScriptKeys.get(routeId) ?? [] : value.pendingKeys ?? [];
+        serializedKeys.forEach((key)=>{
             const tracked = value.data?.[key];
-            if (isPromiseLike(tracked)) tracked.then((val)=>emit(buildDeferredDataScript(nonce, [
+            if (isPromiseLike(tracked)) pendingResolvers.push(Promise.resolve(tracked).then((val)=>{
+                emit(buildDeferredDataScript(nonce, [
                     routeId,
                     key,
                     val
-                ])), (err)=>emit(buildDeferredDataScript(nonce, [
+                ]));
+            }, (err)=>{
+                emit(buildDeferredDataScript(nonce, [
                     routeId,
                     key,
                     void 0,
                     toErrorInfo(err)
-                ])));
+                ]));
+            }));
         });
     });
+    return Promise.all(pendingResolvers).then(()=>void 0);
 }
 exports.buildDeferredDataScript = __webpack_exports__.buildDeferredDataScript;
 exports.enqueueFromEntries = __webpack_exports__.enqueueFromEntries;