@modern-js/runtime 2.5.0-alpha.0 → 2.6.0

package/dist/cjs/ssr/serverRender/renderToString/entry.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -28,7 +32,7 @@ __export(entry_exports, {
 module.exports = __toCommonJS(entry_exports);
 var import_react = __toESM(require("react"));
 var import_server = __toESM(require("react-dom/server"));
-var import_serialize = require("@modern-js/utils/serialize");
+var import_serialize_javascript = __toESM(require("serialize-javascript"));
 var import_react_helmet = __toESM(require("react-helmet"));
 var import_helmet = __toESM(require("../helmet"));
 var import_types = require("../types");
@@ -38,11 +42,13 @@ var import_template = require("./template");
 var import_reduce = require("./reduce");
 var loadableRenderer = __toESM(require("./loadable"));
 var styledComponentRenderer = __toESM(require("./styledComponent"));
-const buildTemplateData = (context, data, routerData, renderLevel) => {
-  const { request } = context;
+const buildTemplateData = (context, data, renderLevel) => {
+  const { request, enableUnsafeCtx } = context;
+  const unsafeContext = {
+    headers: request.headers
+  };
   return {
     data,
-    routerData,
     context: {
       request: {
         params: request.params,
@@ -50,8 +56,7 @@ const buildTemplateData = (context, data, routerData, renderLevel) => {
         pathname: request.pathname,
         host: request.host,
         url: request.url,
-        headers: request.headers,
-        cookieMap: request.cookieMap
+        ...enableUnsafeCtx ? unsafeContext : {}
       }
     },
     renderLevel
@@ -97,15 +102,10 @@ class Entry {
     if ((_c = ssrContext.redirection) == null ? void 0 : _c.url) {
       return "";
     }
-    const { routerContext } = context;
-    const routerData = routerContext != null ? routerContext : {
-      loaderData: routerContext.loaderData
-    };
     let html = "";
     const templateData = buildTemplateData(
       ssrContext,
       prefetchData,
-      routerData,
       this.result.renderLevel
     );
     const SSRData = this.getSSRDataScript(templateData);
@@ -168,7 +168,9 @@ class Entry {
   getSSRDataScript(templateData) {
     return {
       SSRDataScript: `
-        <script>window._SSR_DATA = ${(0, import_serialize.serializeJson)(templateData)}<\/script>
+        <script>window._SSR_DATA = ${(0, import_serialize_javascript.default)(templateData, {
+        isJSON: true
+      })}</script>
       `
     };
   }

package/dist/cjs/ssr/serverRender/renderToString/index.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/ssr/serverRender/renderToString/loadable.js

@@ -58,7 +58,7 @@ const toHtml = (jsx, renderer, next) => {
       }
       chunksMap[fileType] += `<script src="${v.url}" ${props.join(
         " "
-      )}><\/script>`;
+      )}></script>`;
     } else if (fileType === "css") {
       chunksMap[fileType] += `<link href="${v.url}" rel="stylesheet" />`;
     }

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

@@ -21,7 +21,7 @@ __export(time_worker_exports, {
 });
 module.exports = __toCommonJS(time_worker_exports);
 function processHrtime(previousTimestamp) {
-  const now = new Date().getTime();
+  const now = (/* @__PURE__ */ new Date()).getTime();
   const clocktime = now * 1e-3;
   let seconds = Math.floor(clocktime);
   let nanoseconds = Math.floor(clocktime % 1 * 1e9);

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

@@ -26,7 +26,7 @@ function getLoadableScripts(extractor) {
   if (!check(scripts)) {
     return "";
   }
-  return scripts.split("<\/script>").slice(0, 2).map((i) => `${i}<\/script>`).join("");
+  return scripts.split("</script>").slice(0, 2).map((i) => `${i}</script>`).join("");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/ssr/utils.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
@@ -24,6 +34,7 @@ __export(utils_exports, {
   mockResponse: () => mockResponse
 });
 module.exports = __toCommonJS(utils_exports);
+var import_cookie = __toESM(require("cookie"));
 const isReact18 = () => process.env.IS_REACT18 === "true";
 const formatServer = (request) => {
   const {
@@ -33,6 +44,7 @@ const formatServer = (request) => {
   } = request.headers || {};
   return {
     cookie,
+    cookieMap: import_cookie.default.parse(cookie || "") || {},
     userAgent,
     referer,
     ...request
@@ -46,15 +58,15 @@ const getQuery = () => window.location.search.substring(1).split("&").reduce((re
   return res;
 }, {});
 const formatClient = (request) => {
-  var _a, _b;
+  var _a;
   return {
     params: request.params || {},
     host: request.host || location.host,
     pathname: request.pathname || location.pathname,
     headers: request.headers || {},
-    cookieMap: request.cookieMap || {},
-    cookie: ((_a = request.headers) == null ? void 0 : _a.cookie) || document.cookie,
-    userAgent: ((_b = request.headers) == null ? void 0 : _b["user-agent"]) || navigator.userAgent,
+    cookieMap: import_cookie.default.parse(document.cookie || "") || {},
+    cookie: document.cookie || "",
+    userAgent: ((_a = request.headers) == null ? void 0 : _a["user-agent"]) || navigator.userAgent,
     referer: request.referer || document.referrer,
     query: request.query || getQuery(),
     url: location.href

package/dist/cjs/state/index.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/state/plugins.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

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

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/state/runtime/plugin.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -70,13 +74,7 @@ const state = (config) => ({
       hoc({ App }, next) {
         const getStateApp = (props) => {
           const context = (0, import_react.useContext)(import_core.RuntimeReactContext);
-          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react2.Provider, {
-            store: context.store,
-            config: storeConfig,
-            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-              ...props
-            })
-          });
+          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react2.Provider, { store: context.store, config: storeConfig, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { ...props }) });
         };
         return next({
           App: (0, import_hoist_non_react_statics.default)(getStateApp, App)

package/dist/esm/cli/index.js

@@ -154,7 +154,11 @@ var cli_default = function() {
                         runtimeByEntries: {},
                         source: {
                             alias: {
-                                "styled-components": require.resolve("styled-components")
+                                /**
+               * twin.macro inserts styled-components into the code during the compilation process
+               * But it will not be installed under the user project.
+               * So need to add alias
+               */ "styled-components": require.resolve("styled-components")
                             },
                             globalVars: {
                                 "process.env.IS_REACT18": process.env.IS_REACT18

package/dist/esm/common.js

@@ -1,6 +1,4 @@
 var isBrowser = function() {
     return typeof window !== "undefined" && window.name !== "nodejs";
 };
-var JSX_SHELL_STREAM_END_MARK = "<!--<?- SHELL_STREAM_END ?>-->";
-var ESCAPED_SHELL_STREAM_END_MARK = "&lt;!--&lt;?- SHELL_STREAM_END ?&gt;--&gt;";
-export { ESCAPED_SHELL_STREAM_END_MARK, JSX_SHELL_STREAM_END_MARK, isBrowser };
+export { isBrowser };

package/dist/esm/core/app-config.js

@@ -1,6 +1,8 @@
 var APP_CONFIG_SYMBOL = "config";
 var getConfig = function(Component) {
-    return Component[APP_CONFIG_SYMBOL];
+    return(// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
+    Component[APP_CONFIG_SYMBOL]);
 };
 var defineConfig = function(Component, config) {
     Component[APP_CONFIG_SYMBOL] = config;

package/dist/esm/core/compatible.js

@@ -419,11 +419,13 @@ var bootstrap = function() {
                         isBrowser: false,
                         loaderManager: createLoaderManager({}, {
                             skipNonStatic: id.staticGenerate,
+                            // if not static generate, only non-static loader can exec on prod env
                             skipStatic: process.env.NODE_ENV === "production" && !id.staticGenerate
                         })
                     });
                     isRedirectResponse = function(result) {
-                        if (typeof Response !== "undefined" && _instanceof(result, Response) && result.status >= 300 && result.status <= 399) {
+                        if (typeof Response !== "undefined" && // fix: ssg workflow doesn't inject Web Response
+                        _instanceof(result, Response) && result.status >= 300 && result.status <= 399) {
                             var status = result.status;
                             var redirectUrl = result.headers.get("Location") || "/";
                             var ssrContext = context.ssrContext;

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

@@ -266,6 +266,7 @@ var createLoader = function(id) {
             reloading: hasLoaded && status === 1 /* loading */ ,
             data: data,
             error: _instanceof(error, Error) ? "".concat(error.message) : error,
+            // redundant fields for ssr log
             _error: error
         };
     };
@@ -306,7 +307,8 @@ var createLoaderManager = function(initialDataMap) {
             var skipExec = ignoreNonStatic || ignoreStatic;
             loader = createLoader(id, typeof initialDataMap[id] !== "undefined" ? initialDataMap[id] : {
                 data: loaderOptions.initialData
-            }, loaderFn, skipExec);
+            }, loaderFn, // Todo whether static loader is exec when CSR
+            skipExec);
             loadersMap.set(id, loader);
         }
         return id;

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

@@ -285,6 +285,7 @@ var cli_default = function() {
                                                     ],
                                                     outfile: htmlOutputFile,
                                                     platform: "node",
+                                                    // change esbuild use the rootDir tsconfig.json as default to tempTsConfigFile
                                                     tsconfig: tempTsConfigFile,
                                                     target: "es6",
                                                     loader: {
@@ -370,7 +371,8 @@ var cli_default = function() {
                                     tools: {
                                         htmlPlugin: function(options, entry) {
                                             var hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : _objectSpread({}, options === null || options === void 0 ? void 0 : options.templateParameters);
-                                            var templateContent = documentEntry(entry.entryName, hackParameters);
+                                            var templateContent = documentEntry(entry.entryName, // options,
+                                            hackParameters);
                                             var documentHtmlOptions = templateContent ? {
                                                 templateContent: templateContent,
                                                 inject: false

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

@@ -50,13 +50,9 @@ function _objectSpreadProps(target, source) {
     }
     return target;
 }
-import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS, isRouterV5 as isV5 } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
-var isV5 = function(config) {
-    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 {
         name: "@modern-js/plugin-router",

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

@@ -1,7 +1,6 @@
 import { routerPlugin } from "./plugin";
 var runtime_default = routerPlugin;
 import { modifyRoutes } from "./plugin";
+export * from "react-router-dom";
 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 };
+export { runtime_default as default, modifyRoutes };

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

@@ -103,13 +103,10 @@ 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,
-                                hydrationData: hydrationData
+                                basename: _basename
                             }) : createHashRouter(routes, {
-                                basename: _basename,
-                                hydrationData: hydrationData
+                                basename: _basename
                             });
                             return /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
                                 children: /* @__PURE__ */ jsx(RouterProvider, {

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

@@ -227,9 +227,10 @@ 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 "@modern-js/utils/remix-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 { createRoutesFromElements } from "react-router-dom";
@@ -297,6 +298,45 @@ 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 {
@@ -363,12 +403,29 @@ var routerPlugin = function(param) {
                     var getRouteApp = function() {
                         return function(props) {
                             var _useContext = useContext(RuntimeReactContext), router = _useContext.router, routerContext = _useContext.routerContext;
-                            return /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
-                                children: /* @__PURE__ */ jsx(StaticRouterProvider, {
-                                    router: router,
-                                    context: routerContext,
-                                    hydrate: false
-                                })
+                            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/esm/router/runtime/utils.js

@@ -26,6 +26,30 @@ 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);
@@ -54,10 +78,68 @@ 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";
-import DeferredDataScripts from "./DeferredDataScripts";
+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) {
     var Layout = function(_param) {
         var Component = _param.Component, props = _objectWithoutProperties(_param, [
@@ -77,9 +159,7 @@ 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, {
-                    DeferredDataComponent: DeferredDataScripts
-                });
+                var routeElement = renderNestedRoute(route);
                 routeElements.push(routeElement);
             } else {
                 var routeElement1 = /* @__PURE__ */ jsx(Route, {
@@ -156,4 +236,25 @@ 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/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()
                                     }
                                 ];