@modern-js/runtime 2.7.0 → 2.9.0

package/dist/esm/router/runtime/DeferredDataScripts.js

@@ -1,166 +1,4 @@
-function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
-    return arr2;
-}
-function _arrayWithHoles(arr) {
-    if (Array.isArray(arr)) return arr;
-}
-function _iterableToArrayLimit(arr, i) {
-    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
-    if (_i == null) return;
-    var _arr = [];
-    var _n = true;
-    var _d = false;
-    var _s, _e;
-    try {
-        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
-            _arr.push(_s.value);
-            if (i && _arr.length === i) break;
-        }
-    } catch (err) {
-        _d = true;
-        _e = err;
-    } finally{
-        try {
-            if (!_n && _i["return"] != null) _i["return"]();
-        } finally{
-            if (_d) throw _e;
-        }
-    }
-    return _arr;
-}
-function _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-}
-function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { Suspense, useEffect, useRef, useMemo, useContext } from "react";
-import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "react-router-dom";
-import { serializeJson } from "@modern-js/utils/serialize";
-import { JSX_SHELL_STREAM_END_MARK } from "../../common";
-import { serializeErrors } from "./utils";
-var setupFnStr = "function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};";
-var resolveFnStr = "function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};";
-var preResolvedFnStr = "function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resovle(e)};";
-var DeferredDataScripts = function() {
-    var context = useContext(DataRouterContext);
-    var staticContext = (context || {}).staticContext;
-    var hydratedRef = useRef(false);
-    useEffect(function() {
-        hydratedRef.current = true;
-    }, []);
-    var deferredScripts = useMemo(function() {
-        if (!staticContext) {
-            return null;
-        }
-        var activeDeferreds = staticContext.activeDeferreds || [];
-        var _ROUTER_DATA = {
-            loaderData: staticContext.loaderData,
-            errors: serializeErrors(staticContext.errors)
-        };
-        var initialScripts = [
-            "_ROUTER_DATA = ".concat(serializeJson(_ROUTER_DATA), ";"),
-            "_ROUTER_DATA.s = ".concat(setupFnStr),
-            "_ROUTER_DATA.r = ".concat(resolveFnStr),
-            "_ROUTER_DATA.p = ".concat(preResolvedFnStr)
-        ].join("\n");
-        var deferredDataScripts = [];
-        initialScripts += Object.entries(activeDeferreds).map(function(param) {
-            var _param = _slicedToArray(param, 2), routeId = _param[0], deferredData = _param[1];
-            var pendingKeys = new Set(deferredData.pendingKeys);
-            var deferredKeys = deferredData.deferredKeys;
-            var deferredKeyPromiseStr = deferredKeys.map(function(key) {
-                if (pendingKeys.has(key)) {
-                    deferredDataScripts.push(/* @__PURE__ */ jsx(DeferredDataScript, {
-                        data: deferredData.data[key],
-                        dataKey: key,
-                        routeId: routeId
-                    }, "".concat(routeId, " | ").concat(key)));
-                    return "".concat(JSON.stringify(key), ": _ROUTER_DATA.s(").concat(JSON.stringify(routeId), ",").concat(JSON.stringify(key), ") ");
-                } else {
-                    var trackedPromise = deferredData.data[key];
-                    if (typeof trackedPromise._error !== "undefined") {
-                        var error = {
-                            message: trackedPromise._error.message,
-                            stack: process.env.NODE_ENV !== "production" ? trackedPromise._error.stack : void 0
-                        };
-                        return "".concat(JSON.stringify(key), ": _ROUTER_DATA.p(").concat(void 0, ", ").concat(serializeJson(error), ")");
-                    } else {
-                        if (typeof trackedPromise._data === "undefined") {
-                            throw new Error("The deferred data for ".concat(key, " was not resolved, did you forget to return data from a deferred promise"));
-                        }
-                        return "".concat(JSON.stringify(key), ": _ROUTER_DATA.p(").concat(serializeJson(trackedPromise._data), ")");
-                    }
-                }
-            }).join(",\n");
-            return "Object.assign(_ROUTER_DATA.loaderData[".concat(JSON.stringify(routeId), "], {").concat(deferredKeyPromiseStr, "});");
-        }).join("\n");
-        return [
-            initialScripts,
-            deferredDataScripts
-        ];
-    }, []);
-    if (!deferredScripts) {
-        return null;
-    }
-    return /* @__PURE__ */ jsxs(Fragment, {
-        children: [
-            !hydratedRef.current && /* @__PURE__ */ jsx("script", {
-                async: true,
-                suppressHydrationWarning: true,
-                dangerouslySetInnerHTML: {
-                    __html: deferredScripts[0]
-                }
-            }),
-            !hydratedRef.current && deferredScripts[1],
-            JSX_SHELL_STREAM_END_MARK
-        ]
-    });
+var DeferredDataScripts_default = function() {
+    return null;
 };
-var DeferredDataScript = function(param) {
-    var data = param.data, routeId = param.routeId, dataKey = param.dataKey;
-    return /* @__PURE__ */ jsx(Suspense, {
-        children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ jsx(Await, {
-            resolve: data,
-            errorElement: /* @__PURE__ */ jsx(ErrorDeferredDataScript, {
-                routeId: routeId,
-                dataKey: dataKey
-            }),
-            children: function(data2) {
-                return /* @__PURE__ */ jsx("script", {
-                    async: true,
-                    suppressHydrationWarning: true,
-                    dangerouslySetInnerHTML: {
-                        __html: "_ROUTER_DATA.r(".concat(JSON.stringify(routeId), ", ").concat(JSON.stringify(dataKey), ", ").concat(serializeJson(data2), ");")
-                    }
-                });
-            }
-        }) : null
-    });
-};
-var ErrorDeferredDataScript = function(param) {
-    var routeId = param.routeId, dataKey = param.dataKey;
-    var error = useAsyncError();
-    return /* @__PURE__ */ jsx("script", {
-        suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: {
-            __html: "_ROUTER_DATA.r(".concat(JSON.stringify(routeId), ", ").concat(JSON.stringify(dataKey), ", ").concat(void 0, ", ").concat(serializeJson({
-                message: error.message,
-                stack: error.stack
-            }), ");")
-        }
-    });
-};
-var DeferredDataScripts_default = DeferredDataScripts;
 export { DeferredDataScripts_default as default };

package/dist/esm/router/runtime/DeferredDataScripts.node.js

@@ -0,0 +1,166 @@
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { Suspense, useEffect, useRef, useMemo, useContext } from "react";
+import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "react-router-dom";
+import { serializeJson } from "@modern-js/utils/serialize";
+import { JSX_SHELL_STREAM_END_MARK } from "../../common";
+import { serializeErrors } from "./utils";
+var setupFnStr = "function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};";
+var resolveFnStr = "function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};";
+var preResolvedFnStr = "function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resovle(e)};";
+var DeferredDataScripts = function() {
+    var context = useContext(DataRouterContext);
+    var staticContext = (context || {}).staticContext;
+    var hydratedRef = useRef(false);
+    useEffect(function() {
+        hydratedRef.current = true;
+    }, []);
+    var deferredScripts = useMemo(function() {
+        if (!staticContext) {
+            return null;
+        }
+        var activeDeferreds = staticContext.activeDeferreds || [];
+        var _ROUTER_DATA = {
+            loaderData: staticContext.loaderData,
+            errors: serializeErrors(staticContext.errors)
+        };
+        var initialScripts = [
+            "_ROUTER_DATA = ".concat(serializeJson(_ROUTER_DATA), ";"),
+            "_ROUTER_DATA.s = ".concat(setupFnStr),
+            "_ROUTER_DATA.r = ".concat(resolveFnStr),
+            "_ROUTER_DATA.p = ".concat(preResolvedFnStr)
+        ].join("\n");
+        var deferredDataScripts = [];
+        initialScripts += Object.entries(activeDeferreds).map(function(param) {
+            var _param = _slicedToArray(param, 2), routeId = _param[0], deferredData = _param[1];
+            var pendingKeys = new Set(deferredData.pendingKeys);
+            var deferredKeys = deferredData.deferredKeys;
+            var deferredKeyPromiseStr = deferredKeys.map(function(key) {
+                if (pendingKeys.has(key)) {
+                    deferredDataScripts.push(/* @__PURE__ */ jsx(DeferredDataScript, {
+                        data: deferredData.data[key],
+                        dataKey: key,
+                        routeId: routeId
+                    }, "".concat(routeId, " | ").concat(key)));
+                    return "".concat(JSON.stringify(key), ": _ROUTER_DATA.s(").concat(JSON.stringify(routeId), ",").concat(JSON.stringify(key), ") ");
+                } else {
+                    var trackedPromise = deferredData.data[key];
+                    if (typeof trackedPromise._error !== "undefined") {
+                        var error = {
+                            message: trackedPromise._error.message,
+                            stack: process.env.NODE_ENV !== "production" ? trackedPromise._error.stack : void 0
+                        };
+                        return "".concat(JSON.stringify(key), ": _ROUTER_DATA.p(").concat(void 0, ", ").concat(serializeJson(error), ")");
+                    } else {
+                        if (typeof trackedPromise._data === "undefined") {
+                            throw new Error("The deferred data for ".concat(key, " was not resolved, did you forget to return data from a deferred promise"));
+                        }
+                        return "".concat(JSON.stringify(key), ": _ROUTER_DATA.p(").concat(serializeJson(trackedPromise._data), ")");
+                    }
+                }
+            }).join(",\n");
+            return "Object.assign(_ROUTER_DATA.loaderData[".concat(JSON.stringify(routeId), "], {").concat(deferredKeyPromiseStr, "});");
+        }).join("\n");
+        return [
+            initialScripts,
+            deferredDataScripts
+        ];
+    }, []);
+    if (!deferredScripts) {
+        return null;
+    }
+    return /* @__PURE__ */ jsxs(Fragment, {
+        children: [
+            !hydratedRef.current && /* @__PURE__ */ jsx("script", {
+                async: true,
+                suppressHydrationWarning: true,
+                dangerouslySetInnerHTML: {
+                    __html: deferredScripts[0]
+                }
+            }),
+            !hydratedRef.current && deferredScripts[1],
+            JSX_SHELL_STREAM_END_MARK
+        ]
+    });
+};
+var DeferredDataScript = function(param) {
+    var data = param.data, routeId = param.routeId, dataKey = param.dataKey;
+    return /* @__PURE__ */ jsx(Suspense, {
+        children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ jsx(Await, {
+            resolve: data,
+            errorElement: /* @__PURE__ */ jsx(ErrorDeferredDataScript, {
+                routeId: routeId,
+                dataKey: dataKey
+            }),
+            children: function(data2) {
+                return /* @__PURE__ */ jsx("script", {
+                    async: true,
+                    suppressHydrationWarning: true,
+                    dangerouslySetInnerHTML: {
+                        __html: "_ROUTER_DATA.r(".concat(JSON.stringify(routeId), ", ").concat(JSON.stringify(dataKey), ", ").concat(serializeJson(data2), ");")
+                    }
+                });
+            }
+        }) : null
+    });
+};
+var ErrorDeferredDataScript = function(param) {
+    var routeId = param.routeId, dataKey = param.dataKey;
+    var error = useAsyncError();
+    return /* @__PURE__ */ jsx("script", {
+        suppressHydrationWarning: true,
+        dangerouslySetInnerHTML: {
+            __html: "_ROUTER_DATA.r(".concat(JSON.stringify(routeId), ", ").concat(JSON.stringify(dataKey), ", ").concat(void 0, ", ").concat(serializeJson({
+                message: error.message,
+                stack: error.stack
+            }), ");")
+        }
+    });
+};
+var DeferredDataScripts_node_default = DeferredDataScripts;
+export { DeferredDataScripts_node_default as default };

package/dist/esm/ssr/cli/index.js

@@ -61,7 +61,7 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 import path from "path";
-import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSingleEntry } from "@modern-js/utils";
+import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSSGEntry } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "ssr";
 var hasStringSSREntry = function(userConfig) {
     var isStreaming = function(ssr) {
@@ -165,8 +165,7 @@ var cli_default = function() {
                             throw new Error("You should switch to file-system based router to support streaming SSR.");
                         }
                     }
-                    var ssgConfig = userConfig.output.ssg;
-                    var useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[0]) === "function" || Boolean(ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[entryName]);
+                    var useSSG = isSSGEntry(userConfig, entryName, entrypoints);
                     ssrConfigMap.set(entryName, ssrConfig || useSSG);
                     if (ssrConfig || useSSG) {
                         imports.push({

package/dist/esm/ssr/serverRender/index.js

@@ -123,15 +123,20 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { isReact18 } from "../utils";
+import { CSS_CHUNKS_PLACEHOLDER } from "./utils";
 function serverRender(options) {
     return _serverRender.apply(this, arguments);
 }
 function _serverRender() {
     _serverRender = _asyncToGenerator(function(options) {
-        var pipe, html;
+        var _options_context_ssrContext, _options_context_ssrContext1, pipe, html;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    if ((_options_context_ssrContext = options.context.ssrContext) === null || _options_context_ssrContext === void 0 ? void 0 : _options_context_ssrContext.template) {
+                        ;
+                        options.context.ssrContext.template = (_options_context_ssrContext1 = options.context.ssrContext) === null || _options_context_ssrContext1 === void 0 ? void 0 : _options_context_ssrContext1.template.replace("</head>", "".concat(CSS_CHUNKS_PLACEHOLDER, "</head>"));
+                    }
                     if (!(isReact18() && options.config.mode === "stream")) return [
                         3,
                         2

package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -59,8 +59,8 @@ function _unsupportedIterableToArray(o, minLen) {
 import ReactHelmet from "react-helmet";
 import { matchRoutes } from "react-router-dom";
 import helmetReplace from "../helmet";
+import { CSS_CHUNKS_PLACEHOLDER } from "../utils";
 import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share";
-var CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
 function getHeadTemplate(beforeEntryTemplate, context) {
     var injectCss = function injectCss(headTemplate2) {
         return headTemplate2.replace(CSS_CHUNKS_PLACEHOLDER, getCssChunks());
@@ -71,7 +71,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
             }
             var routeAssets = routeManifest.routeAssets;
             var cssChunks = [];
-            var matches = matchRoutes(routes, routerContext.location);
+            var matches = matchRoutes(routes, routerContext.location, routerContext.basename);
             matches === null || matches === void 0 ? void 0 : matches.forEach(function(match, index) {
                 if (!index) {
                     return;

package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -175,12 +175,19 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { RenderLevel } from "../types";
+import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { getTemplates } from "./template";
+var ShellChunkStatus = /* @__PURE__ */ function(ShellChunkStatus2) {
+    ShellChunkStatus2[ShellChunkStatus2["IDLE"] = 0] = "IDLE";
+    ShellChunkStatus2[ShellChunkStatus2["START"] = 1] = "START";
+    ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 2] = "FINIESH";
+    return ShellChunkStatus2;
+}(ShellChunkStatus || {});
 function renderToPipe(rootElement, context, options) {
-    var isShellStream = true;
+    var shellChunkStatus = 0 /* IDLE */ ;
     var ssrContext = context.ssrContext;
     var forUserPipe = function() {
-        var _ref = _asyncToGenerator(function(stream) {
+        var _ref = _asyncToGenerator(function() {
             var renderToReadableStream, _getTemplates, shellAfter, shellBefore, readableOriginal, reader, injectableStream, err, _getTemplates1, shellAfter2, shellBefore2, fallbackHtml;
             return __generator(this, function(_state) {
                 switch(_state.label){
@@ -218,7 +225,7 @@ function renderToPipe(rootElement, context, options) {
                                 }
                                 function _push() {
                                     _push = _asyncToGenerator(function() {
-                                        var _ref, done, value;
+                                        var _ref, done, value, concatedChunk;
                                         return __generator(this, function(_state) {
                                             switch(_state.label){
                                                 case 0:
@@ -234,11 +241,17 @@ function renderToPipe(rootElement, context, options) {
                                                             2
                                                         ];
                                                     }
-                                                    if (isShellStream) {
-                                                        controller.enqueue(encodeForWebStream(shellBefore));
-                                                        controller.enqueue(value);
-                                                        controller.enqueue(encodeForWebStream(shellAfter));
-                                                        isShellStream = false;
+                                                    if (shellChunkStatus !== 2 /* FINIESH */ ) {
+                                                        concatedChunk = new TextDecoder().decode(value);
+                                                        if (shellChunkStatus === 0 /* IDLE */ ) {
+                                                            concatedChunk = "".concat(shellBefore).concat(concatedChunk);
+                                                            shellChunkStatus = 1 /* START */ ;
+                                                        }
+                                                        if (shellChunkStatus === 1 /* START */  && concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
+                                                            concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, shellAfter);
+                                                            shellChunkStatus = 2 /* FINIESH */ ;
+                                                        }
+                                                        controller.enqueue(encodeForWebStream(concatedChunk));
                                                     } else {
                                                         controller.enqueue(value);
                                                     }
@@ -256,7 +269,7 @@ function renderToPipe(rootElement, context, options) {
                         });
                         return [
                             2,
-                            readableOriginal(injectableStream).readableOriginal(stream)
+                            injectableStream
                         ];
                     case 3:
                         err = _state.sent();
@@ -274,11 +287,11 @@ function renderToPipe(rootElement, context, options) {
                 }
             });
         });
-        return function forUserPipe(stream) {
+        return function forUserPipe() {
             return _ref.apply(this, arguments);
         };
     }();
-    return forUserPipe;
+    return forUserPipe();
 }
 var encoder;
 function encodeForWebStream(thing) {

package/dist/esm/ssr/serverRender/utils.js

@@ -1,3 +1,4 @@
+var CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
 function getLoadableScripts(extractor) {
     var check = function(scripts2) {
         return (scripts2 || "").includes("__LOADABLE_REQUIRED_CHUNKS___ext");
@@ -10,4 +11,4 @@ function getLoadableScripts(extractor) {
         return "".concat(i, "</script>");
     }).join("");
 }
-export { getLoadableScripts };
+export { CSS_CHUNKS_PLACEHOLDER, getLoadableScripts };

package/dist/esm/state/runtime/index.js

@@ -1,5 +1,4 @@
 export * from "@modern-js-reduck/react";
-import { model, createStore } from "@modern-js-reduck/store";
 import { default as default2 } from "./plugin";
 export * from "./plugin";
-export { createStore, default2 as default, model };
+export { default2 as default };

package/dist/esm-node/cli/index.js

@@ -7,13 +7,14 @@ import Document from "../document/cli";
 var cli_default = () => ({
   name: "@modern-js/runtime",
   post: [
-    "@modern-js/plugin-router",
     "@modern-js/plugin-ssr",
-    "@modern-js/plugin-document",
     "@modern-js/plugin-state",
+    "@modern-js/plugin-router",
+    "@modern-js/plugin-document",
     "@modern-js/plugin-design-token"
   ],
-  usePlugins: [PluginState(), PluginSSR(), PluginRouter(), Document()],
+  // the order of runtime plugins is affected by runtime hooks, mainly `init` and `hoc` hooks
+  usePlugins: [PluginSSR(), PluginState(), PluginRouter(), Document()],
   setup: (api) => {
     return {
       config() {

package/dist/esm-node/router/runtime/DeferredDataScripts.js

@@ -1,148 +1,6 @@
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { Suspense, useEffect, useRef, useMemo, useContext } from "react";
-import {
-  Await,
-  UNSAFE_DataRouterContext as DataRouterContext,
-  useAsyncError
-} from "react-router-dom";
-import { serializeJson } from "@modern-js/utils/serialize";
-import { JSX_SHELL_STREAM_END_MARK } from "../../common";
-import { serializeErrors } from "./utils";
-const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};`;
-const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;
-const preResolvedFnStr = `function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resovle(e)};`;
-const DeferredDataScripts = () => {
-  const context = useContext(DataRouterContext);
-  const { staticContext } = context || {};
-  const hydratedRef = useRef(false);
-  useEffect(() => {
-    hydratedRef.current = true;
-  }, []);
-  const deferredScripts = useMemo(() => {
-    if (!staticContext) {
-      return null;
-    }
-    const activeDeferreds = staticContext.activeDeferreds || [];
-    const _ROUTER_DATA = {
-      loaderData: staticContext.loaderData,
-      errors: serializeErrors(staticContext.errors)
-    };
-    let initialScripts = [
-      `_ROUTER_DATA = ${serializeJson(_ROUTER_DATA)};`,
-      `_ROUTER_DATA.s = ${setupFnStr}`,
-      `_ROUTER_DATA.r = ${resolveFnStr}`,
-      `_ROUTER_DATA.p = ${preResolvedFnStr}`
-    ].join("\n");
-    const deferredDataScripts = [];
-    initialScripts += Object.entries(activeDeferreds).map(([routeId, deferredData]) => {
-      const pendingKeys = new Set(deferredData.pendingKeys);
-      const { deferredKeys } = deferredData;
-      const deferredKeyPromiseStr = deferredKeys.map((key) => {
-        if (pendingKeys.has(key)) {
-          deferredDataScripts.push(
-            /* @__PURE__ */ jsx(
-              DeferredDataScript,
-              {
-                data: deferredData.data[key],
-                dataKey: key,
-                routeId
-              },
-              `${routeId} | ${key}`
-            )
-          );
-          return `${JSON.stringify(key)}: _ROUTER_DATA.s(${JSON.stringify(
-            routeId
-          )},${JSON.stringify(key)}) `;
-        } else {
-          const trackedPromise = deferredData.data[key];
-          if (typeof trackedPromise._error !== "undefined") {
-            const error = {
-              message: trackedPromise._error.message,
-              stack: process.env.NODE_ENV !== "production" ? trackedPromise._error.stack : void 0
-            };
-            return `${JSON.stringify(
-              key
-            )}: _ROUTER_DATA.p(${void 0}, ${serializeJson(error)})`;
-          } else {
-            if (typeof trackedPromise._data === "undefined") {
-              throw new Error(
-                `The deferred data for ${key} was not resolved, did you forget to return data from a deferred promise`
-              );
-            }
-            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${serializeJson(
-              trackedPromise._data
-            )})`;
-          }
-        }
-      }).join(",\n");
-      return `Object.assign(_ROUTER_DATA.loaderData[${JSON.stringify(
-        routeId
-      )}], {${deferredKeyPromiseStr}});`;
-    }).join("\n");
-    return [initialScripts, deferredDataScripts];
-  }, []);
-  if (!deferredScripts) {
-    return null;
-  }
-  return /* @__PURE__ */ jsxs(Fragment, { children: [
-    !hydratedRef.current && /* @__PURE__ */ jsx(
-      "script",
-      {
-        async: true,
-        suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: { __html: deferredScripts[0] }
-      }
-    ),
-    !hydratedRef.current && deferredScripts[1],
-    JSX_SHELL_STREAM_END_MARK
-  ] });
+var DeferredDataScripts_default = () => {
+  return null;
 };
-const DeferredDataScript = ({
-  data,
-  routeId,
-  dataKey
-}) => {
-  return /* @__PURE__ */ jsx(Suspense, { children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ jsx(
-    Await,
-    {
-      resolve: data,
-      errorElement: /* @__PURE__ */ jsx(ErrorDeferredDataScript, { routeId, dataKey }),
-      children: (data2) => /* @__PURE__ */ jsx(
-        "script",
-        {
-          async: true,
-          suppressHydrationWarning: true,
-          dangerouslySetInnerHTML: {
-            __html: `_ROUTER_DATA.r(${JSON.stringify(
-              routeId
-            )}, ${JSON.stringify(dataKey)}, ${serializeJson(data2)});`
-          }
-        }
-      )
-    }
-  ) : null });
-};
-const ErrorDeferredDataScript = ({
-  routeId,
-  dataKey
-}) => {
-  const error = useAsyncError();
-  return /* @__PURE__ */ jsx(
-    "script",
-    {
-      suppressHydrationWarning: true,
-      dangerouslySetInnerHTML: {
-        __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(
-          dataKey
-        )}, ${void 0}, ${serializeJson({
-          message: error.message,
-          stack: error.stack
-        })});`
-      }
-    }
-  );
-};
-var DeferredDataScripts_default = DeferredDataScripts;
 export {
   DeferredDataScripts_default as default
 };