@modern-js/runtime 2.4.0 → 2.4.1-alpha.0

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

@@ -17,8 +17,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
-  getLoadableScripts: () => getLoadableScripts,
-  time: () => time
+  getLoadableScripts: () => getLoadableScripts
 });
 module.exports = __toCommonJS(utils_exports);
 function getLoadableScripts(extractor) {
@@ -29,18 +28,7 @@ function getLoadableScripts(extractor) {
   }
   return scripts.split("<\/script>").slice(0, 2).map((i) => `${i}<\/script>`).join("");
 }
-const getLatency = (hrtime) => {
-  const [s, ns] = process.hrtime(hrtime);
-  return s * 1e3 + ns / 1e6;
-};
-const time = () => {
-  const hrtime = process.hrtime();
-  return () => {
-    return getLatency(hrtime);
-  };
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getLoadableScripts,
-  time
+  getLoadableScripts
 });

package/dist/js/treeshaking/core/compatible.js

@@ -270,8 +270,8 @@ var createApp = function(param) {
                         }, {
                             onLast: function(param) {
                                 var context1 = param.context;
-                                var ref;
-                                return App2 === null || App2 === void 0 ? void 0 : (ref = App2.init) === null || ref === void 0 ? void 0 : ref.call(App2, context1);
+                                var _App2_init;
+                                return App2 === null || App2 === void 0 ? void 0 : (_App2_init = App2.init) === null || _App2_init === void 0 ? void 0 : _App2_init.call(App2, context1);
                             }
                         });
                     }
@@ -289,7 +289,7 @@ var createApp = function(param) {
 };
 var bootstrap = function() {
     var _ref = _asyncToGenerator(function(BootApp, id, root, ReactDOM) {
-        var App, runner, context, runInit, isBrowser, ref, ref1, ssrData, loadersData, initialLoadersState, initialData, rootElement, ModernRender, ModernHydrate, isRedirectResponse, initialData1;
+        var App, runner, context, runInit, isBrowser, _ssrData_data, _ssrData_data1, ssrData, loadersData, initialLoadersState, initialData, rootElement, ModernRender, ModernHydrate, isRedirectResponse, initialData1;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -308,8 +308,8 @@ var bootstrap = function() {
                         }, {
                             onLast: function(param) {
                                 var context1 = param.context;
-                                var ref;
-                                return App === null || App === void 0 ? void 0 : (ref = App.init) === null || ref === void 0 ? void 0 : ref.call(App, context1);
+                                var _App_init;
+                                return App === null || App === void 0 ? void 0 : (_App_init = App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(App, context1);
                             }
                         });
                     };
@@ -331,7 +331,7 @@ var bootstrap = function() {
                         2
                     ];
                     ssrData = window._SSR_DATA;
-                    loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (ref = ssrData.data) === null || ref === void 0 ? void 0 : ref.loadersData) || {};
+                    loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
                     initialLoadersState = Object.keys(loadersData).reduce(function(res, key) {
                         var loaderData = loadersData[key];
                         if (loaderData.loading !== false) {
@@ -347,7 +347,7 @@ var bootstrap = function() {
                     }, ssrData ? {
                         ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
                     } : {}));
-                    context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (ref1 = ssrData.data) === null || ref1 === void 0 ? void 0 : ref1.initialData;
+                    context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
                     return [
                         4,
                         runInit(context)
@@ -430,6 +430,7 @@ var bootstrap = function() {
                             if (ssrContext) {
                                 ssrContext.res.statusCode = status;
                                 ssrContext.res.setHeader("Location", redirectUrl);
+                                ssrContext.redirection = ssrContext.redirection || {};
                                 ssrContext.redirection.status = status;
                                 ssrContext.redirection.url = redirectUrl;
                             }

package/dist/js/treeshaking/core/loader/loaderManager.js

@@ -293,7 +293,7 @@ var createLoader = function(id) {
 };
 var createLoaderManager = function(initialDataMap) {
     var managerOptions = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    var _skipStatic = managerOptions.skipStatic, skipStatic = _skipStatic === void 0 ? false : _skipStatic, _skipNonStatic = managerOptions.skipNonStatic, skipNonStatic = _skipNonStatic === void 0 ? false : _skipNonStatic;
+    var _managerOptions_skipStatic = managerOptions.skipStatic, skipStatic = _managerOptions_skipStatic === void 0 ? false : _managerOptions_skipStatic, _managerOptions_skipNonStatic = managerOptions.skipNonStatic, skipNonStatic = _managerOptions_skipNonStatic === void 0 ? false : _managerOptions_skipNonStatic;
     var loadersMap = /* @__PURE__ */ new Map();
     var getId = createGetId();
     var add = function(loaderFn, loaderOptions) {
@@ -342,7 +342,7 @@ var createLoaderManager = function(initialDataMap) {
     };
     var awaitPendingLoaders = function() {
         var _ref = _asyncToGenerator(function() {
-            var pendingLoaders, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, id, loader, promise;
+            var pendingLoaders, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, id, loader, promise;
             return __generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -350,7 +350,7 @@ var createLoaderManager = function(initialDataMap) {
                         _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                         try {
                             for(_iterator = loadersMap[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                _value = _slicedToArray(_step.value, 2), id = _value[0], loader = _value[1];
+                                _step_value = _slicedToArray(_step.value, 2), id = _step_value[0], loader = _step_value[1];
                                 promise = loader.promise;
                                 if (_instanceof(promise, Promise)) {
                                     pendingLoaders.push([

package/dist/js/treeshaking/core/loader/useLoader.js

@@ -120,10 +120,10 @@ var useLoader = function(loaderFn) {
         delete options._cache;
     }
     var load = useCallback(function(params) {
-        var ref, ref1, ref2, ref3, ref4;
+        var _unlistenLoaderChangeRef_current, _window__SSR_DATA_data_loadersData_id, _window__SSR_DATA, _window__SSR_DATA_data, _loaderRef_current;
         if (typeof params === "undefined") {
-            var ref5;
-            return (ref5 = loaderRef.current) === null || ref5 === void 0 ? void 0 : ref5.load();
+            var _loaderRef_current1;
+            return (_loaderRef_current1 = loaderRef.current) === null || _loaderRef_current1 === void 0 ? void 0 : _loaderRef_current1.load();
         }
         var id = loaderManager.add(function() {
             try {
@@ -139,26 +139,26 @@ var useLoader = function(loaderFn) {
             params: params
         }));
         loaderRef.current = loaderManager.get(id);
-        (ref = unlistenLoaderChangeRef.current) === null || ref === void 0 ? void 0 : ref.call(unlistenLoaderChangeRef);
+        (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
         if (isSSRRender) {
             return void 0;
         }
         if (options.skip) {
             return void 0;
         }
-        if (context._hydration && ((ref3 = window === null || window === void 0 ? void 0 : (ref1 = window._SSR_DATA) === null || ref1 === void 0 ? void 0 : (ref2 = ref1.data) === null || ref2 === void 0 ? void 0 : ref2.loadersData[id]) === null || ref3 === void 0 ? void 0 : ref3.error) === null) {
+        if (context._hydration && ((_window__SSR_DATA_data_loadersData_id = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.loadersData[id]) === null || _window__SSR_DATA_data_loadersData_id === void 0 ? void 0 : _window__SSR_DATA_data_loadersData_id.error) === null) {
             return void 0;
         }
         var res = loaderRef.current.load();
-        unlistenLoaderChangeRef.current = (ref4 = loaderRef.current) === null || ref4 === void 0 ? void 0 : ref4.onChange(function(_status, _result) {
+        unlistenLoaderChangeRef.current = (_loaderRef_current = loaderRef.current) === null || _loaderRef_current === void 0 ? void 0 : _loaderRef_current.onChange(function(_status, _result) {
             setResult(_result);
             if (_status === LoaderStatus.fulfilled) {
-                var ref;
-                options === null || options === void 0 ? void 0 : (ref = options.onSuccess) === null || ref === void 0 ? void 0 : ref.call(options, _result.data);
+                var _options_onSuccess;
+                options === null || options === void 0 ? void 0 : (_options_onSuccess = options.onSuccess) === null || _options_onSuccess === void 0 ? void 0 : _options_onSuccess.call(options, _result.data);
             }
             if (_status === LoaderStatus.rejected) {
-                var ref1;
-                options === null || options === void 0 ? void 0 : (ref1 = options.onError) === null || ref1 === void 0 ? void 0 : ref1.call(options, _result.error);
+                var _options_onError;
+                options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, _result.error);
             }
         });
         return res;
@@ -167,19 +167,19 @@ var useLoader = function(loaderFn) {
     ]);
     useEffect(function() {
         return function() {
-            var ref;
-            (ref = unlistenLoaderChangeRef.current) === null || ref === void 0 ? void 0 : ref.call(unlistenLoaderChangeRef);
+            var _unlistenLoaderChangeRef_current;
+            (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
         };
     }, []);
     useMemo(function() {
-        var _params;
-        var p = (_params = options.params) !== null && _params !== void 0 ? _params : loaderFn.id;
+        var _options_params;
+        var p = (_options_params = options.params) !== null && _options_params !== void 0 ? _options_params : loaderFn.id;
         invariant(typeof p !== "undefined" && p !== null, "Params is required in useLoader");
         load(p);
     }, [
         options.params
     ]);
-    var ref = _slicedToArray(useState(loaderRef.current.result), 2), result = ref[0], setResult = ref[1];
+    var _useState = _slicedToArray(useState(loaderRef.current.result), 2), result = _useState[0], setResult = _useState[1];
     return _objectSpreadProps(_objectSpread({}, result), {
         reload: load
     });

package/dist/js/treeshaking/document/Head.js

@@ -5,7 +5,7 @@ import { Scripts } from "./Scripts";
 import { Links } from "./Links";
 import { DOCUMENT_META_PLACEHOLDER } from "./constants";
 function Head(props) {
-    var ref = useContext(DocumentStructureContext), hasSetScripts = ref.hasSetScripts, hasSetLinks = ref.hasSetLinks;
+    var _useContext = useContext(DocumentStructureContext), hasSetScripts = _useContext.hasSetScripts, hasSetLinks = _useContext.hasSetLinks;
     var children = props.children;
     return /* @__PURE__ */ jsxs("head", {
         children: [

package/dist/js/treeshaking/document/Html.js

@@ -19,11 +19,11 @@ function findTargetElement(tag, children) {
     try {
         for(var _iterator = children[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var item = _step.value;
-            var ref;
+            var _item_props;
             if (tag === getEleType(item)) {
                 return item;
             }
-            if (item === null || item === void 0 ? void 0 : (ref = item.props) === null || ref === void 0 ? void 0 : ref.children) {
+            if (item === null || item === void 0 ? void 0 : (_item_props = item.props) === null || _item_props === void 0 ? void 0 : _item_props.children) {
                 nextChildren = nextChildren.concat(item.props.children);
             }
         }

package/dist/js/treeshaking/document/Root.js

@@ -4,7 +4,7 @@ import { DocumentContext } from "./DocumentContext";
 import { DOCUMENT_SSR_PLACEHOLDER } from "./constants";
 function Root(props) {
     var rootId = props.rootId, children = props.children;
-    var ref = useContext(DocumentContext), _templateParams = ref.templateParams, _mountId = _templateParams.mountId, mountId = _mountId === void 0 ? "root" : _mountId;
+    var _useContext = useContext(DocumentContext), _useContext_templateParams = _useContext.templateParams, _useContext_templateParams_mountId = _useContext_templateParams.mountId, mountId = _useContext_templateParams_mountId === void 0 ? "root" : _useContext_templateParams_mountId;
     return /* @__PURE__ */ jsxs("div", {
         id: "".concat(rootId || mountId),
         children: [
@@ -14,7 +14,7 @@ function Root(props) {
     });
 }
 function DefaultRoot(props) {
-    var ref = useContext(DocumentContext), _templateParams = ref.templateParams, _mountId = _templateParams.mountId, mountId = _mountId === void 0 ? "root" : _mountId;
+    var _useContext = useContext(DocumentContext), _useContext_templateParams = _useContext.templateParams, _useContext_templateParams_mountId = _useContext_templateParams.mountId, mountId = _useContext_templateParams_mountId === void 0 ? "root" : _useContext_templateParams_mountId;
     return /* @__PURE__ */ jsxs("div", {
         id: "".concat(mountId),
         children: [

package/dist/js/treeshaking/document/cli/index.js

@@ -184,10 +184,10 @@ import { DocumentContext } from "../DocumentContext";
 import { DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP, DOC_EXT, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, HTML_SEPARATOR } from "../constants";
 var debug = createDebugger("html_genarate");
 var getDocumenByEntryName = function getDocumenByEntryName(entrypoints, entryName, fallbackDir) {
-    var ref;
-    var entryDir = (ref = entrypoints.find(function(item) {
+    var _entrypoints_find;
+    var entryDir = (_entrypoints_find = entrypoints.find(function(item) {
         return item.entryName === entryName;
-    })) === null || ref === void 0 ? void 0 : ref.absoluteEntryDir;
+    })) === null || _entrypoints_find === void 0 ? void 0 : _entrypoints_find.absoluteEntryDir;
     var entryDirs = DOC_EXT.map(function(item) {
         return "".concat(entryDir).concat(path.sep).concat(DOCUMENT_FILE_NAME, ".").concat(item);
     });
@@ -223,7 +223,7 @@ var cli_default = function() {
                 }
                 return __generator(this, function(_state) {
                     documentEntry = function(entryName, templateParameters) {
-                        var ref = api.useAppContext(), entrypoints = ref.entrypoints, internalDirectory = ref.internalDirectory, appDirectory = ref.appDirectory;
+                        var _api_useAppContext = api.useAppContext(), entrypoints = _api_useAppContext.entrypoints, internalDirectory = _api_useAppContext.internalDirectory, appDirectory = _api_useAppContext.appDirectory;
                         var documentFilePath = getDocumenByEntryName(entrypoints, entryName, appDirectory);
                         if (!documentFilePath) {
                             return null;

package/dist/js/treeshaking/router/cli/index.js

@@ -54,8 +54,8 @@ import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@mod
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
 var isV5 = function(config) {
-    var ref, ref1;
-    return (config === null || config === void 0 ? void 0 : (ref = config.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.mode) === "react-router-5";
+    var _config_runtime, _config_runtime_router;
+    return (config === null || config === void 0 ? void 0 : (_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : (_config_runtime_router = _config_runtime.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
 };
 var cli_default = function() {
     return {

package/dist/js/treeshaking/router/runtime/fetch.js

@@ -0,0 +1,2 @@
+function installGlobals() {}
+export { installGlobals };

package/dist/js/treeshaking/router/runtime/fetch.node.js

@@ -0,0 +1,2 @@
+import { installGlobals } from "@remix-run/node";
+export { installGlobals };

package/dist/js/treeshaking/router/runtime/fetch.worker.js

@@ -0,0 +1,2 @@
+function installGlobals() {}
+export { installGlobals };

package/dist/js/treeshaking/router/runtime/plugin.js

@@ -68,7 +68,7 @@ function modifyRoutes(modifyFunction) {
     }
 }
 var routerPlugin = function(param) {
-    var _serverBase = param.serverBase, serverBase = _serverBase === void 0 ? [] : _serverBase, _supportHtml5History = param.supportHtml5History, supportHtml5History = _supportHtml5History === void 0 ? true : _supportHtml5History, _basename = param.basename, basename = _basename === void 0 ? "" : _basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
+    var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
     var select = function(pathname) {
         return serverBase.find(function(baseUrl) {
             return pathname.search(baseUrl) === 0;
@@ -98,10 +98,10 @@ var routerPlugin = function(param) {
                     }
                     var getRouteApp = function() {
                         return function(props) {
-                            var ref;
+                            var _window__SERVER_DATA;
                             beforeCreateRouter = true;
                             var routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(finalRouteConfig));
-                            var baseUrl = ((ref = window._SERVER_DATA) === null || ref === void 0 ? void 0 : ref.router.baseUrl) || select(location.pathname);
+                            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 router = supportHtml5History ? createBrowserRouter(routes, {
                                 basename: _basename

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

@@ -227,15 +227,16 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { jsx } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@remix-run/router";
+import serialize from "serialize-javascript";
+import { createStaticHandler, isRouteErrorResponse } from "@remix-run/router";
 import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { installGlobals } from "@remix-run/node";
 import { createRoutesFromElements } from "react-router-dom";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
+import { installGlobals } from "./fetch";
 installGlobals();
 function createFetchRequest(req) {
     var origin = "".concat(req.protocol, "://").concat(req.host);
@@ -252,8 +253,8 @@ function createFetchHeaders(requestHeaders) {
     var headers = new Headers();
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
-        for(var _iterator = Object.entries(requestHeaders)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _value = _slicedToArray(_step.value, 2), key = _value[0], values = _value[1];
+        for(var _iterator = Object.entries(requestHeaders || {})[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], values = _step_value[1];
             if (values) {
                 if (Array.isArray(values)) {
                     var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
@@ -297,8 +298,47 @@ 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 _basename = param.basename, basename = _basename === void 0 ? "" : _basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
+    var _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
     return {
         name: "@modern-js/plugin-router",
         setup: function() {
@@ -362,13 +402,30 @@ var routerPlugin = function(param) {
                     }
                     var getRouteApp = function() {
                         return function(props) {
-                            var ref = useContext(RuntimeReactContext), router = ref.router, routerContext = ref.routerContext;
-                            return /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
-                                children: /* @__PURE__ */ jsx(StaticRouterProvider, {
-                                    router: router,
-                                    context: routerContext,
-                                    nonce: "the-nonce"
-                                })
+                            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
+                                        }
+                                    })
+                                ]
                             }));
                         };
                     };

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

@@ -203,9 +203,9 @@ function renderRoutes(routesConfig) {
     return routeElements;
 }
 function getLocation(serverContext) {
-    var ref;
-    var ref1 = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = ref1.pathname, url = ref1.url;
-    var cleanUrl = (ref = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || ref === void 0 ? void 0 : ref.replace("https://", "");
+    var _url_replace;
+    var _ref = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
+    var cleanUrl = (_url_replace = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
     var index = (cleanUrl || "").indexOf(pathname);
     if (index === -1) {
         return pathname;

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

@@ -118,7 +118,7 @@ var cli_default = function() {
                         },
                         tools: {
                             webpackChain: function(chain, param) {
-                                var name = param.name, isServer = param.isServer, CHAIN_ID = param.CHAIN_ID;
+                                var name = param.name, isServer = param.isServer, isServiceWorker = param.isServiceWorker, CHAIN_ID = param.CHAIN_ID;
                                 var userConfig = api.useResolvedConfigContext();
                                 if (isUseSSRBundle(userConfig) && name !== "server" && hasStringSSREntry(userConfig)) {
                                     var LoadableWebpackPlugin = require("@loadable/webpack-plugin");
@@ -128,7 +128,7 @@ var cli_default = function() {
                                         }
                                     ]);
                                 }
-                                var modernVars = _defineProperty({}, "process.env.MODERN_TARGET", JSON.stringify(isServer ? "node" : "browser"));
+                                var modernVars = _defineProperty({}, "process.env.MODERN_TARGET", JSON.stringify(isServer || isServiceWorker ? "node" : "browser"));
                                 chain.plugin(CHAIN_ID.PLUGIN.DEFINE).tap(function(args) {
                                     var _args = _toArray(args), vars = _args[0], rest = _args.slice(1);
                                     return [
@@ -150,13 +150,13 @@ var cli_default = function() {
                     var entrypoint = param.entrypoint, imports = param.imports;
                     var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
                     var userConfig = api.useResolvedConfigContext();
-                    var ref = api.useAppContext(), packageName = ref.packageName, entrypoints = ref.entrypoints;
+                    var _api_useAppContext = api.useAppContext(), packageName = _api_useAppContext.packageName, entrypoints = _api_useAppContext.entrypoints;
                     pluginsExportsUtils.addExport("export { default as ssr } from '@modern-js/runtime/ssr'");
                     var ssrConfig = getEntryOptions(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
                     if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
-                        var ref1;
+                        var _runtimeConfig_router;
                         var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-                        if ((runtimeConfig === null || runtimeConfig === void 0 ? void 0 : (ref1 = runtimeConfig.router) === null || ref1 === void 0 ? void 0 : ref1.mode) === "react-router-5") {
+                        if ((runtimeConfig === null || runtimeConfig === void 0 ? void 0 : (_runtimeConfig_router = runtimeConfig.router) === null || _runtimeConfig_router === void 0 ? void 0 : _runtimeConfig_router.mode) === "react-router-5") {
                             throw new Error("router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'");
                         }
                         if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {

package/dist/js/treeshaking/ssr/index.js

@@ -188,7 +188,7 @@ var ssr = function(config) {
             return {
                 client: function() {
                     var _ref = _asyncToGenerator(function(param) {
-                        var App, context, ModernRender, ModernHydrate, ref, hydrateContext, callback, renderLevel;
+                        var App, context, ModernRender, ModernHydrate, _window__SSR_DATA, hydrateContext, callback, renderLevel;
                         function stringSSRHydrate() {
                             if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
                                 ModernRender(/* @__PURE__ */ jsx(App, {
@@ -248,7 +248,7 @@ var ssr = function(config) {
                             callback = function() {
                                 delete hydrateContext._hydration;
                             };
-                            renderLevel = (window === null || window === void 0 ? void 0 : (ref = window._SSR_DATA) === null || ref === void 0 ? void 0 : ref.renderLevel) || RenderLevel.CLIENT_RENDER;
+                            renderLevel = (window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : _window__SSR_DATA.renderLevel) || RenderLevel.CLIENT_RENDER;
                             if (isReact18() && config.mode === "stream") {
                                 return [
                                     2,
@@ -267,8 +267,8 @@ var ssr = function(config) {
                 }(),
                 init: function init(param, next) {
                     var context = param.context;
-                    var ref, ref1;
-                    var request = window === null || window === void 0 ? void 0 : (ref = window._SSR_DATA) === null || ref === void 0 ? void 0 : (ref1 = ref.context) === null || ref1 === void 0 ? void 0 : ref1.request;
+                    var _window__SSR_DATA, _window__SSR_DATA_context;
+                    var request = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_context = _window__SSR_DATA.context) === null || _window__SSR_DATA_context === void 0 ? void 0 : _window__SSR_DATA_context.request;
                     if (!request) {
                         context.ssrContext = _objectSpreadProps(_objectSpread({}, context.ssrContext), {
                             response: mockResp,
@@ -286,8 +286,8 @@ var ssr = function(config) {
                 },
                 pickContext: function(param, next) {
                     var context = param.context, pickedContext = param.pickedContext;
-                    var ref, ref1;
-                    var request = window === null || window === void 0 ? void 0 : (ref = window._SSR_DATA) === null || ref === void 0 ? void 0 : (ref1 = ref.context) === null || ref1 === void 0 ? void 0 : ref1.request;
+                    var _window__SSR_DATA, _window__SSR_DATA_context;
+                    var request = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_context = _window__SSR_DATA.context) === null || _window__SSR_DATA_context === void 0 ? void 0 : _window__SSR_DATA_context.request;
                     var initialData = context.initialData;
                     if (!request) {
                         return next({

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

@@ -220,7 +220,7 @@ var ssr = function() {
                 },
                 pickContext: function(param, next) {
                     var context = param.context, pickedContext = param.pickedContext;
-                    var ref = context === null || context === void 0 ? void 0 : context.ssrContext, request = ref.request, response = ref.response;
+                    var _ref = context === null || context === void 0 ? void 0 : context.ssrContext, request = _ref.request, response = _ref.response;
                     var initialData = context.initialData;
                     return next({
                         context: context,

package/dist/js/treeshaking/ssr/prefetch.js

@@ -132,7 +132,7 @@ var prefetch = function() {
             return [
                 2,
                 run(context.ssrContext.request.headers, /*#__PURE__*/ _asyncToGenerator(function() {
-                    var ref, ssrContext, loadableStats, extractor, loadersData;
+                    var _context_store, ssrContext, loadableStats, extractor, loadersData;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -182,7 +182,7 @@ var prefetch = function() {
                                         loadersData: loadersData,
                                         initialData: context.initialData,
                                         i18nData: context.__i18nData__,
-                                        storeState: context === null || context === void 0 ? void 0 : (ref = context.store) === null || ref === void 0 ? void 0 : ref.getState()
+                                        storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
                                     }
                                 ];
                         }