@modern-js/runtime 2.5.0 → 2.7.0

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

@@ -227,10 +227,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { jsx, jsxs } from "react/jsx-runtime";
+import { jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import serialize from "serialize-javascript";
-import { createStaticHandler, isRouteErrorResponse } 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";
@@ -298,45 +297,6 @@ function createFetchHeaders(requestHeaders) {
     }
     return headers;
 }
-function serializeErrors(errors) {
-    if (!errors) {
-        return null;
-    }
-    var entries = Object.entries(errors);
-    var serialized = {};
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = entries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], val = _step_value[1];
-            if (isRouteErrorResponse(val)) {
-                serialized[key] = _objectSpreadProps(_objectSpread({}, val), {
-                    __type: "RouteErrorResponse"
-                });
-            } else if (_instanceof(val, Error)) {
-                serialized[key] = {
-                    message: val.message,
-                    __type: "Error"
-                };
-            } else {
-                serialized[key] = val;
-            }
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    return serialized;
-}
 var routerPlugin = function(param) {
     var _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
     return {
@@ -346,7 +306,7 @@ var routerPlugin = function(param) {
                 init: function init(param, next) {
                     var context = param.context;
                     return _asyncToGenerator(function() {
-                        var request, baseUrl, _basename, routes, query, remixRequest, routerContext, router;
+                        var _context_ssrContext, request, ssrMode, baseUrl, _basename, routes, query, remixRequest, routerContext, router;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -358,10 +318,10 @@ var routerPlugin = function(param) {
                                             })
                                         ];
                                     }
-                                    request = context.ssrContext.request;
+                                    _context_ssrContext = context.ssrContext, request = _context_ssrContext.request, ssrMode = _context_ssrContext.mode;
                                     baseUrl = request.baseUrl;
                                     _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
-                                    routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(routesConfig));
+                                    routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(routesConfig, ssrMode));
                                     query = createStaticHandler(routes, {
                                         basename: _basename
                                     }).query;
@@ -403,29 +363,12 @@ var routerPlugin = function(param) {
                     var getRouteApp = function() {
                         return function(props) {
                             var _useContext = useContext(RuntimeReactContext), router = _useContext.router, routerContext = _useContext.routerContext;
-                            var data = {
-                                loaderData: routerContext.loaderData,
-                                actionData: routerContext.actionData,
-                                errors: serializeErrors(routerContext.errors)
-                            };
-                            var hydrateScript = "window.__staticRouterHydrationData = ".concat(serialize(data, {
-                                isJSON: true
-                            }), ";");
-                            return /* @__PURE__ */ jsxs(App, _objectSpreadProps(_objectSpread({}, props), {
-                                children: [
-                                    /* @__PURE__ */ jsx(StaticRouterProvider, {
-                                        router: router,
-                                        context: routerContext,
-                                        hydrate: false
-                                    }),
-                                    /* @__PURE__ */ jsx("script", {
-                                        suppressHydrationWarning: true,
-                                        id: "the-nonce",
-                                        dangerouslySetInnerHTML: {
-                                            __html: hydrateScript
-                                        }
-                                    })
-                                ]
+                            return /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
+                                children: /* @__PURE__ */ jsx(StaticRouterProvider, {
+                                    router: router,
+                                    context: routerContext,
+                                    hydrate: false
+                                })
                             }));
                         };
                     };

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

@@ -1,3 +1,11 @@
+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 _defineProperty(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -11,6 +19,40 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+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 _objectSpread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -77,70 +119,25 @@ function _objectWithoutPropertiesLoose(source, excluded) {
     }
     return target;
 }
+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 { jsx } from "react/jsx-runtime";
-import { Suspense } from "react";
 import { Route } from "react-router-dom";
+import { renderNestedRoute } from "@modern-js/utils/nestedRoutes";
+import { ErrorResponse, isRouteErrorResponse } from "@modern-js/utils/remix-router";
 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;
-};
-function getRouteComponents(routes, globalApp) {
+import DeferredDataScripts from "./DeferredDataScripts";
+function getRouteComponents(routes, param) {
+    var globalApp = param.globalApp, ssrMode = param.ssrMode;
     var Layout = function(_param) {
         var Component = _param.Component, props = _objectWithoutProperties(_param, [
             "Component"
@@ -159,7 +156,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: ssrMode === "stream" ? DeferredDataScripts : void 0
+                });
                 routeElements.push(routeElement);
             } else {
                 var routeElement1 = /* @__PURE__ */ jsx(Route, {
@@ -191,7 +190,7 @@ function getRouteComponents(routes, globalApp) {
     }, "*"));
     return routeElements;
 }
-function renderRoutes(routesConfig) {
+function renderRoutes(routesConfig, ssrMode) {
     if (!routesConfig) {
         return null;
     }
@@ -199,7 +198,10 @@ function renderRoutes(routesConfig) {
     if (!routes) {
         return null;
     }
-    var routeElements = getRouteComponents(routes, globalApp);
+    var routeElements = getRouteComponents(routes, {
+        globalApp: globalApp,
+        ssrMode: ssrMode
+    });
     return routeElements;
 }
 function getLocation(serverContext) {
@@ -236,25 +238,80 @@ function standardSlash(str) {
     }
     return addr;
 }
-function createLoader(route) {
-    var loader = route.loader;
-    if (loader) {
-        return function(args) {
-            if (typeof route.lazyImport === "function") {
-                route.lazyImport();
+function serializeErrors(errors) {
+    if (!errors) {
+        return null;
+    }
+    var entries = Object.entries(errors);
+    var serialized = {};
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = entries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], val = _step_value[1];
+            if (isRouteErrorResponse(val)) {
+                serialized[key] = _objectSpreadProps(_objectSpread({}, val), {
+                    __type: "RouteErrorResponse"
+                });
+            } else if (_instanceof(val, Error)) {
+                serialized[key] = {
+                    message: val.message,
+                    stack: val.stack,
+                    __type: "Error"
+                };
+            } else {
+                serialized[key] = val;
             }
-            return loader(args);
-        };
-    } else {
-        return function() {
-            if (typeof route.lazyImport === "function") {
-                route.lazyImport();
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
             }
-            return null;
-        };
+        }
     }
+    return serialized;
 }
-function isLoadableComponent(component) {
-    return component && component.displayName === "Loadable" && component.preload && typeof component.preload === "function";
+function deserializeErrors(errors) {
+    if (!errors) {
+        return null;
+    }
+    var entries = Object.entries(errors);
+    var serialized = {};
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = entries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], val = _step_value[1];
+            if (val && val.__type === "RouteErrorResponse") {
+                serialized[key] = new ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
+            } else if (val && val.__type === "Error") {
+                var error = new Error(val.message);
+                error.stack = val.stack;
+                serialized[key] = error;
+            } else {
+                serialized[key] = val;
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return serialized;
 }
-export { getLocation, getRouteComponents, renderRoutes, standardSlash, urlJoin };
+export { deserializeErrors, getLocation, getRouteComponents, renderRoutes, serializeErrors, standardSlash, urlJoin };

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

@@ -113,6 +113,8 @@ var cli_default = function() {
                     return {
                         source: {
                             alias: {
+                                // ensure that all packages use the same storage in @modern-js/utils/ssr
+                                "@modern-js/utils/ssr": require.resolve("@modern-js/utils/ssr"),
                                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
                             }
                         },

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

@@ -214,6 +214,7 @@ var ssr = function() {
                     var context = param.context;
                     var request = context.ssrContext.request;
                     context.ssrContext.request = formatServer(request);
+                    context.ssrContext.mode = config.mode;
                     return next({
                         context: context
                     });

package/dist/esm/ssr/prefetch.js

@@ -182,6 +182,7 @@ var prefetch = function() {
                                         loadersData: loadersData,
                                         initialData: context.initialData,
                                         i18nData: context.__i18nData__,
+                                        // todo: move to plugin state
                                         storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
                                     }
                                 ];

package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -1,4 +1,32 @@
-import serialize from "serialize-javascript";
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+import { serializeJson } from "@modern-js/utils/serialize";
 import { buildTemplate } from "./buildTemplate.share";
 function buildShellAfterTemplate(afterAppTemplate, options) {
     var injectSSRDataScript = function injectSSRDataScript(template) {
@@ -6,24 +34,23 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
         return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
         function buildSSRDataScript() {
             var ssrContext = options.ssrContext, renderLevel = options.renderLevel;
-            var request = ssrContext.request;
+            var request = ssrContext.request, enableUnsafeCtx = ssrContext.enableUnsafeCtx;
+            var unsafeContext = {
+                headers: request.headers
+            };
             var SSRData = {
                 context: {
-                    request: {
+                    request: _objectSpread({
                         params: request.params,
                         query: request.query,
                         pathname: request.pathname,
                         host: request.host,
-                        url: request.url,
-                        headers: request.headers,
-                        cookieMap: request.cookieMap
-                    }
+                        url: request.url
+                    }, enableUnsafeCtx ? unsafeContext : {})
                 },
                 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/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -100,6 +100,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
             var helmetData = ReactHelmet.renderStatic();
             return helmetData ? helmetReplace(headTemplate2, helmetData) : headTemplate2;
         },
+        // @TODO: prefetch scripts of lazy component
         injectCss
     ];
     var _ref = _slicedToArray(beforeEntryTemplate.match(HEAD_REG_EXP) || [], 1), tmp = _ref[0], headTemplate = tmp === void 0 ? "" : tmp;

package/dist/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/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/esm/ssr/serverRender/renderToString/entry.js

@@ -59,6 +59,21 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
 var __generator = this && this.__generator || function(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -156,8 +171,9 @@ 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 { serializeErrors } from "../../../router/runtime/utils";
 import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";
 import { time } from "../time";
@@ -167,19 +183,20 @@ import { reduce } from "./reduce";
 import * as loadableRenderer from "./loadable";
 import * as styledComponentRenderer from "./styledComponent";
 var buildTemplateData = function(context, data, renderLevel) {
-    var request = context.request;
+    var request = context.request, enableUnsafeCtx = context.enableUnsafeCtx;
+    var unsafeContext = {
+        headers: request.headers
+    };
     return {
         data: data,
         context: {
-            request: {
+            request: _objectSpread({
                 params: request.params,
                 query: request.query,
                 pathname: request.pathname,
                 host: request.host,
-                url: request.url,
-                headers: request.headers,
-                cookieMap: request.cookieMap
-            }
+                url: request.url
+            }, enableUnsafeCtx ? unsafeContext : {})
         },
         renderLevel: renderLevel
     };
@@ -220,7 +237,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,9 +269,14 @@ var Entry = /*#__PURE__*/ function() {
                                         ""
                                     ];
                                 }
+                                routerContext = context.routerContext;
+                                routerData = routerContext ? {
+                                    loaderData: routerContext.loaderData,
+                                    errors: serializeErrors(routerContext.errors)
+                                } : void 0;
                                 html = "";
                                 templateData = buildTemplateData(ssrContext, prefetchData, _this.result.renderLevel);
-                                SSRData = _this.getSSRDataScript(templateData);
+                                SSRData = _this.getSSRDataScript(templateData, routerData);
                                 _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                 try {
                                     for(_iterator = _this.fragments[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -379,11 +401,13 @@ var Entry = /*#__PURE__*/ function() {
         },
         {
             key: "getSSRDataScript",
-            value: function getSSRDataScript(templateData) {
+            value: function getSSRDataScript(templateData, routerData) {
+                var ssrDataScripts = "<script>window._SSR_DATA = ".concat(serializeJson(templateData), "</script>");
+                if (routerData) {
+                    ssrDataScripts += "\n<script>window._ROUTER_DATA = ".concat(serializeJson(routerData), "</script>");
+                }
                 return {
-                    SSRDataScript: "\n        <script>window._SSR_DATA = ".concat(serialize(templateData, {
-                        isJSON: true
-                    }), "</script>\n      ")
+                    SSRDataScript: ssrDataScripts
                 };
             }
         }

package/dist/esm/ssr/serverRender/time.worker.js

@@ -45,7 +45,7 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 function processHrtime(previousTimestamp) {
-    var now = new Date().getTime();
+    var now = /* @__PURE__ */ new Date().getTime();
     var clocktime = now * 1e-3;
     var seconds = Math.floor(clocktime);
     var nanoseconds = Math.floor(clocktime % 1 * 1e9);