@modern-js/runtime 2.4.1-beta.0 → 2.5.0-alpha.0

package/dist/esm/router/index.node.js

@@ -0,0 +1,4 @@
+import { routerPlugin } from "./runtime/plugin.node";
+import { routerPlugin as routerPlugin2 } from "./runtime/plugin.node";
+export * from "./runtime";
+export { routerPlugin2 as default, routerPlugin as router };

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

@@ -0,0 +1,158 @@
+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";
+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() {
+        var activeDeferreds = (staticContext === null || staticContext === void 0 ? void 0 : staticContext.activeDeferreds) || [];
+        var _ROUTER_DATA = {
+            loaderData: staticContext === null || staticContext === void 0 ? void 0 : staticContext.loaderData
+        };
+        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
+        ];
+    }, []);
+    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_default = DeferredDataScripts;
+export { DeferredDataScripts_default as default };

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

@@ -0,0 +1,7 @@
+import { routerPlugin } from "./plugin";
+var runtime_default = routerPlugin;
+import { modifyRoutes } from "./plugin";
+export * from "./withRouter";
+import { Form, Outlet, useAsyncError, useAsyncValue, isRouteErrorResponse, useBeforeUnload, useFormAction, useHref, useLocation, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useSearchParams, useSubmit, unstable_useBlocker, unstable_usePrompt } from "react-router-dom";
+import { defer } from "@modern-js/utils/remix-router";
+export { Form, Outlet, runtime_default as default, defer, isRouteErrorResponse, modifyRoutes, unstable_useBlocker, unstable_usePrompt, useAsyncError, useAsyncValue, useBeforeUnload, useFormAction, useHref, useLocation, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useSearchParams, useSubmit };

package/dist/{js/treeshaking → esm}/router/runtime/plugin.js

@@ -103,10 +103,13 @@ var routerPlugin = function(param) {
                             var routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(finalRouteConfig));
                             var baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
                             var _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
+                            var hydrationData = window._ROUTER_DATA;
                             var router = supportHtml5History ? createBrowserRouter(routes, {
-                                basename: _basename
+                                basename: _basename,
+                                hydrationData: hydrationData
                             }) : createHashRouter(routes, {
-                                basename: _basename
+                                basename: _basename,
+                                hydrationData: hydrationData
                             });
                             return /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
                                 children: /* @__PURE__ */ jsx(RouterProvider, {

package/dist/{js/treeshaking → esm}/router/runtime/plugin.node.js

@@ -229,7 +229,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import { jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@remix-run/router";
+import { createStaticHandler } from "@modern-js/utils/remix-router";
 import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "react-router-dom";
@@ -367,7 +367,7 @@ var routerPlugin = function(param) {
                                 children: /* @__PURE__ */ jsx(StaticRouterProvider, {
                                     router: router,
                                     context: routerContext,
-                                    nonce: "the-nonce"
+                                    hydrate: false
                                 })
                             }));
                         };

package/dist/{js/treeshaking → esm}/router/runtime/utils.js

@@ -26,30 +26,6 @@ function _objectSpread(target) {
     }
     return target;
 }
-function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
-    }
-    return keys;
-}
-function _objectSpreadProps(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
-}
 function _objectWithoutProperties(source, excluded) {
     if (source == null) return {};
     var target = _objectWithoutPropertiesLoose(source, excluded);
@@ -78,68 +54,10 @@ function _objectWithoutPropertiesLoose(source, excluded) {
     return target;
 }
 import { jsx } from "react/jsx-runtime";
-import { Suspense } from "react";
 import { Route } from "react-router-dom";
+import { renderNestedRoute } from "@modern-js/utils/nestedRoutes";
 import { DefaultNotFound } from "./DefaultNotFound";
-var renderNestedRoute = function(nestedRoute, parent) {
-    var children = nestedRoute.children, index = nestedRoute.index, id = nestedRoute.id, component = nestedRoute.component, isRoot = nestedRoute.isRoot;
-    var Component = component;
-    var routeProps = {
-        caseSensitive: nestedRoute.caseSensitive,
-        path: nestedRoute.path,
-        id: nestedRoute.id,
-        loader: createLoader(nestedRoute),
-        action: nestedRoute.action,
-        hasErrorBoundary: nestedRoute.hasErrorBoundary,
-        shouldRevalidate: nestedRoute.shouldRevalidate,
-        handle: nestedRoute.handle,
-        index: nestedRoute.index,
-        element: nestedRoute.element,
-        errorElement: nestedRoute.errorElement
-    };
-    if (nestedRoute.error) {
-        var errorElement = /* @__PURE__ */ jsx(nestedRoute.error, {});
-        routeProps.errorElement = errorElement;
-    }
-    var element;
-    if (Component) {
-        if (parent === null || parent === void 0 ? void 0 : parent.loading) {
-            var Loading = parent.loading;
-            if (isLoadableComponent(Component)) {
-                element = /* @__PURE__ */ jsx(Component, {
-                    fallback: /* @__PURE__ */ jsx(Loading, {})
-                });
-            } else {
-                element = /* @__PURE__ */ jsx(Suspense, {
-                    fallback: /* @__PURE__ */ jsx(Loading, {}),
-                    children: /* @__PURE__ */ jsx(Component, {})
-                });
-            }
-        } else if (isLoadableComponent(Component) || isRoot) {
-            element = /* @__PURE__ */ jsx(Component, {});
-        } else {
-            element = /* @__PURE__ */ jsx(Suspense, {
-                fallback: null,
-                children: /* @__PURE__ */ jsx(Component, {})
-            });
-        }
-    } else {
-        nestedRoute.loading = parent === null || parent === void 0 ? void 0 : parent.loading;
-    }
-    if (element) {
-        routeProps.element = element;
-    }
-    var childElements = children === null || children === void 0 ? void 0 : children.map(function(childRoute) {
-        return renderNestedRoute(childRoute, nestedRoute);
-    });
-    var routeElement = index ? /* @__PURE__ */ jsx(Route, _objectSpreadProps(_objectSpread({}, routeProps), {
-        index: true
-    }), id) : /* @__PURE__ */ jsx(Route, _objectSpreadProps(_objectSpread({}, routeProps), {
-        index: false,
-        children: childElements
-    }), id);
-    return routeElement;
-};
+import DeferredDataScripts from "./DeferredDataScripts";
 function getRouteComponents(routes, globalApp) {
     var Layout = function(_param) {
         var Component = _param.Component, props = _objectWithoutProperties(_param, [
@@ -159,7 +77,9 @@ function getRouteComponents(routes, globalApp) {
         for(var _iterator = routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var route = _step.value;
             if (route.type === "nested") {
-                var routeElement = renderNestedRoute(route);
+                var routeElement = renderNestedRoute(route, {
+                    DeferredDataComponent: DeferredDataScripts
+                });
                 routeElements.push(routeElement);
             } else {
                 var routeElement1 = /* @__PURE__ */ jsx(Route, {
@@ -236,25 +156,4 @@ function standardSlash(str) {
     }
     return addr;
 }
-function createLoader(route) {
-    var loader = route.loader;
-    if (loader) {
-        return function(args) {
-            if (typeof route.lazyImport === "function") {
-                route.lazyImport();
-            }
-            return loader(args);
-        };
-    } else {
-        return function() {
-            if (typeof route.lazyImport === "function") {
-                route.lazyImport();
-            }
-            return null;
-        };
-    }
-}
-function isLoadableComponent(component) {
-    return component && component.displayName === "Loadable" && component.preload && typeof component.preload === "function";
-}
 export { getLocation, getRouteComponents, renderRoutes, standardSlash, urlJoin };

package/dist/{js/treeshaking → esm}/ssr/cli/index.js

@@ -118,9 +118,9 @@ var cli_default = function() {
                         },
                         tools: {
                             webpackChain: function(chain, param) {
-                                var name = param.name, isServer = param.isServer, isServiceWorker = param.isServiceWorker, CHAIN_ID = param.CHAIN_ID;
+                                var isServer = param.isServer, isServiceWorker = param.isServiceWorker, CHAIN_ID = param.CHAIN_ID;
                                 var userConfig = api.useResolvedConfigContext();
-                                if (isUseSSRBundle(userConfig) && name !== "server" && hasStringSSREntry(userConfig)) {
+                                if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
                                     var LoadableWebpackPlugin = require("@loadable/webpack-plugin");
                                     chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
                                         {

package/dist/{js/treeshaking → esm}/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -1,4 +1,4 @@
-import serialize from "serialize-javascript";
+import { serializeJson } from "@modern-js/utils/serialize";
 import { buildTemplate } from "./buildTemplate.share";
 function buildShellAfterTemplate(afterAppTemplate, options) {
     var injectSSRDataScript = function injectSSRDataScript(template) {
@@ -21,9 +21,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
                 },
                 renderLevel: renderLevel
             };
-            return "\n      <script>window._SSR_DATA = ".concat(serialize(SSRData, {
-                isJSON: true
-            }), "</script>\n      ");
+            return "\n      <script>window._SSR_DATA = ".concat(serializeJson(SSRData), "</script>\n      ");
         }
     };
     var callbacks = [

package/dist/{js/treeshaking → esm}/ssr/serverRender/renderToStream/renderToPipe.js

@@ -59,13 +59,16 @@ function _objectSpreadProps(target, source) {
 }
 import { Transform } from "stream";
 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 joinChunk = function joinChunk() {
-        var before = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", chunk = arguments.length > 1 ? arguments[1] : void 0, after = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "";
-        return "".concat(before).concat(chunk.toString()).concat(after);
-    };
-    var isShellStream = true;
+    var shellChunkStatus = 0 /* IDLE */ ;
     var ssrContext = context.ssrContext;
     var forUserPipe = function(stream) {
         return new Promise(function(resolve) {
@@ -81,9 +84,17 @@ function renderToPipe(rootElement, context, options) {
                     var injectableTransform = new Transform({
                         transform: function transform(chunk, _encoding, callback) {
                             try {
-                                if (isShellStream) {
-                                    this.push(joinChunk(shellBefore, chunk, shellAfter));
-                                    isShellStream = false;
+                                if (shellChunkStatus !== 2 /* FINIESH */ ) {
+                                    var concatedChunk = chunk.toString();
+                                    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 */ ;
+                                    }
+                                    this.push(concatedChunk);
                                 } else {
                                     this.push(chunk);
                                 }

package/dist/{js/treeshaking → esm}/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -213,31 +213,45 @@ function renderToPipe(rootElement, context, options) {
                         reader = readableOriginal.getReader();
                         injectableStream = new ReadableStream({
                             start: function start(controller) {
-                                return _asyncToGenerator(function() {
-                                    var value;
-                                    return __generator(this, function(_state) {
-                                        switch(_state.label){
-                                            case 0:
-                                                return [
-                                                    4,
-                                                    reader.read()
-                                                ];
-                                            case 1:
-                                                value = _state.sent().value;
-                                                if (isShellStream) {
-                                                    controller.enqueue(encodeForWebStream(shellBefore));
-                                                    controller.enqueue(value);
-                                                    controller.enqueue(encodeForWebStream(shellAfter));
-                                                    isShellStream = false;
-                                                } else {
-                                                    controller.enqueue(value);
-                                                }
-                                                return [
-                                                    2
-                                                ];
-                                        }
+                                function push() {
+                                    return _push.apply(this, arguments);
+                                }
+                                function _push() {
+                                    _push = _asyncToGenerator(function() {
+                                        var _ref, done, value;
+                                        return __generator(this, function(_state) {
+                                            switch(_state.label){
+                                                case 0:
+                                                    return [
+                                                        4,
+                                                        reader.read()
+                                                    ];
+                                                case 1:
+                                                    _ref = _state.sent(), done = _ref.done, value = _ref.value;
+                                                    if (done) {
+                                                        controller.close();
+                                                        return [
+                                                            2
+                                                        ];
+                                                    }
+                                                    if (isShellStream) {
+                                                        controller.enqueue(encodeForWebStream(shellBefore));
+                                                        controller.enqueue(value);
+                                                        controller.enqueue(encodeForWebStream(shellAfter));
+                                                        isShellStream = false;
+                                                    } else {
+                                                        controller.enqueue(value);
+                                                    }
+                                                    push();
+                                                    return [
+                                                        2
+                                                    ];
+                                            }
+                                        });
                                     });
-                                })();
+                                    return _push.apply(this, arguments);
+                                }
+                                push();
                             }
                         });
                         return [

package/dist/{js/treeshaking → esm}/ssr/serverRender/renderToStream/template.js

@@ -48,11 +48,12 @@ import { buildShellAfterTemplate } from "./buildTemplate.after";
 import { buildShellBeforeTemplate } from "./bulidTemplate.before";
 var HTML_SEPARATOR = "<!--<?- html ?>-->";
 var getTemplates = function(context, renderLevel) {
-    var ssrContext = context.ssrContext;
+    var ssrContext = context.ssrContext, routerContext = context.routerContext;
     var _ref = _slicedToArray(ssrContext.template.split(HTML_SEPARATOR) || [], 2), tmp = _ref[0], beforeAppTemplate = tmp === void 0 ? "" : tmp, tmp1 = _ref[1], afterAppHtmlTemplate = tmp1 === void 0 ? "" : tmp1;
     var builtBeforeTemplate = buildShellBeforeTemplate(beforeAppTemplate, context);
     var builtAfterTemplate = buildShellAfterTemplate(afterAppHtmlTemplate, {
         ssrContext: ssrContext,
+        routerContext: routerContext,
         renderLevel: renderLevel
     });
     return {

package/dist/{js/treeshaking → esm}/ssr/serverRender/renderToString/entry.js

@@ -156,7 +156,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import React from "react";
 import ReactDomServer from "react-dom/server";
-import serialize from "serialize-javascript";
+import { serializeJson } from "@modern-js/utils/serialize";
 import ReactHelmet from "react-helmet";
 import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";
@@ -166,10 +166,11 @@ import { toFragments } from "./template";
 import { reduce } from "./reduce";
 import * as loadableRenderer from "./loadable";
 import * as styledComponentRenderer from "./styledComponent";
-var buildTemplateData = function(context, data, renderLevel) {
+var buildTemplateData = function(context, data, routerData, renderLevel) {
     var request = context.request;
     return {
         data: data,
+        routerData: routerData,
         context: {
             request: {
                 params: request.params,
@@ -220,7 +221,7 @@ var Entry = /*#__PURE__*/ function() {
             value: function renderToHtml(context) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var _ssrContext_redirection, _ssrContext_redirection1, _ssrContext_redirection2, ssrContext, prefetchData, html, templateData, SSRData, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, fragment, helmetData;
+                    var _ssrContext_redirection, _ssrContext_redirection1, _ssrContext_redirection2, ssrContext, prefetchData, routerContext, routerData, html, templateData, SSRData, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, fragment, helmetData;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -252,8 +253,12 @@ var Entry = /*#__PURE__*/ function() {
                                         ""
                                     ];
                                 }
+                                routerContext = context.routerContext;
+                                routerData = routerContext !== null && routerContext !== void 0 ? routerContext : {
+                                    loaderData: routerContext.loaderData
+                                };
                                 html = "";
-                                templateData = buildTemplateData(ssrContext, prefetchData, _this.result.renderLevel);
+                                templateData = buildTemplateData(ssrContext, prefetchData, routerData, _this.result.renderLevel);
                                 SSRData = _this.getSSRDataScript(templateData);
                                 _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                 try {
@@ -381,9 +386,7 @@ var Entry = /*#__PURE__*/ function() {
             key: "getSSRDataScript",
             value: function getSSRDataScript(templateData) {
                 return {
-                    SSRDataScript: "\n        <script>window._SSR_DATA = ".concat(serialize(templateData, {
-                        isJSON: true
-                    }), "</script>\n      ")
+                    SSRDataScript: "\n        <script>window._SSR_DATA = ".concat(serializeJson(templateData), "</script>\n      ")
                 };
             }
         }