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

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

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -97,11 +80,12 @@ const routerPlugin = ({
               const baseUrl = ((_a = window._SERVER_DATA) == null ? void 0 : _a.router.baseUrl) || select(location.pathname);
               const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
               const router = supportHtml5History ? (0, import_react_router_dom.createBrowserRouter)(routes, { basename: _basename }) : (0, import_react_router_dom.createHashRouter)(routes, { basename: _basename });
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadProps(__spreadValues({}, props), {
+              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+                ...props,
                 children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.RouterProvider, {
                   router
                 })
-              }));
+              });
             };
           };
           const RouteApp = getRouteApp();

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

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -38,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var plugin_node_exports = {};
 __export(plugin_node_exports, {
   createFetchHeaders: () => createFetchHeaders,
@@ -67,6 +30,7 @@ __export(plugin_node_exports, {
 module.exports = __toCommonJS(plugin_node_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
+var import_serialize_javascript = __toESM(require("serialize-javascript"));
 var import_router = require("@remix-run/router");
 var import_server = require("react-router-dom/server");
 var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
@@ -101,6 +65,26 @@ function createFetchHeaders(requestHeaders) {
   }
   return headers;
 }
+function serializeErrors(errors) {
+  if (!errors) {
+    return null;
+  }
+  const entries = Object.entries(errors);
+  const serialized = {};
+  for (const [key, val] of entries) {
+    if ((0, import_router.isRouteErrorResponse)(val)) {
+      serialized[key] = { ...val, __type: "RouteErrorResponse" };
+    } else if (val instanceof Error) {
+      serialized[key] = {
+        message: val.message,
+        __type: "Error"
+      };
+    } else {
+      serialized[key] = val;
+    }
+  }
+  return serialized;
+}
 const routerPlugin = ({
   basename = "",
   routesConfig,
@@ -110,30 +94,28 @@ const routerPlugin = ({
     name: "@modern-js/plugin-router",
     setup: () => {
       return {
-        init(_0, _1) {
-          return __async(this, arguments, function* ({ context }, next) {
-            if (!routesConfig && !createRoutes) {
-              return next({ context });
-            }
-            const { request } = context.ssrContext;
-            const baseUrl = request.baseUrl;
-            const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
-            const routes = createRoutes ? createRoutes() : (0, import_react_router_dom.createRoutesFromElements)((0, import_utils.renderRoutes)(routesConfig));
-            const { query } = (0, import_router.createStaticHandler)(routes, {
-              basename: _basename
-            });
-            const remixRequest = createFetchRequest(request);
-            const routerContext = yield query(remixRequest);
-            if (routerContext instanceof Response) {
-              return routerContext;
-            }
-            const router = (0, import_server.createStaticRouter)(routes, routerContext);
-            context.router = router;
-            context.routerContext = routerContext;
-            context.routes = routes;
-            context.routeManifest = context.ssrContext.routeManifest;
+        async init({ context }, next) {
+          if (!routesConfig && !createRoutes) {
             return next({ context });
+          }
+          const { request } = context.ssrContext;
+          const baseUrl = request.baseUrl;
+          const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
+          const routes = createRoutes ? createRoutes() : (0, import_react_router_dom.createRoutesFromElements)((0, import_utils.renderRoutes)(routesConfig));
+          const { query } = (0, import_router.createStaticHandler)(routes, {
+            basename: _basename
           });
+          const remixRequest = createFetchRequest(request);
+          const routerContext = await query(remixRequest);
+          if (routerContext instanceof Response) {
+            return routerContext;
+          }
+          const router = (0, import_server.createStaticRouter)(routes, routerContext);
+          context.router = router;
+          context.routerContext = routerContext;
+          context.routes = routes;
+          context.routeManifest = context.ssrContext.routeManifest;
+          return next({ context });
         },
         hoc: ({ App }, next) => {
           if (!routesConfig) {
@@ -142,13 +124,30 @@ const routerPlugin = ({
           const getRouteApp = () => {
             return (props) => {
               const { router, routerContext } = (0, import_react.useContext)(import_core.RuntimeReactContext);
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadProps(__spreadValues({}, props), {
-                children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_server.StaticRouterProvider, {
-                  router,
-                  context: routerContext,
-                  nonce: "the-nonce"
-                })
-              }));
+              const data = {
+                loaderData: routerContext.loaderData,
+                actionData: routerContext.actionData,
+                errors: serializeErrors(routerContext.errors)
+              };
+              const hydrateScript = `window.__staticRouterHydrationData = ${(0, import_serialize_javascript.default)(
+                data,
+                { isJSON: true }
+              )};`;
+              return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(App, {
+                ...props,
+                children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_server.StaticRouterProvider, {
+                    router,
+                    context: routerContext,
+                    hydrate: false
+                  }),
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
+                    suppressHydrationWarning: true,
+                    id: "the-nonce",
+                    dangerouslySetInnerHTML: { __html: hydrateScript }
+                  })
+                ]
+              });
             };
           };
           const RouteApp = getRouteApp();

package/dist/{js/node → cjs}/router/runtime/utils.js

@@ -1,36 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -108,24 +79,28 @@ const renderNestedRoute = (nestedRoute, parent) => {
   const childElements = children == null ? void 0 : children.map((childRoute) => {
     return renderNestedRoute(childRoute, nestedRoute);
   });
-  const routeElement = index ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, __spreadProps(__spreadValues({}, routeProps), {
+  const routeElement = index ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
+    ...routeProps,
     index: true
-  }), id) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, __spreadProps(__spreadValues({}, routeProps), {
+  }, id) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
+    ...routeProps,
     index: false,
     children: childElements
-  }), id);
+  }, id);
   return routeElement;
 };
 function getRouteComponents(routes, globalApp) {
-  const Layout = (_a) => {
-    var _b = _a, { Component } = _b, props = __objRest(_b, ["Component"]);
+  const Layout = ({ Component, ...props }) => {
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, __spreadValues({}, props));
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
+        ...props
+      });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, __spreadValues({
-      Component
-    }, props));
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, {
+      Component,
+      ...props
+    });
   };
   const routeElements = [];
   for (const route of routes) {

package/dist/{js/node → cjs}/router/runtime/withRouter.js

@@ -1,24 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -44,11 +27,12 @@ const withRouter = (Component) => {
     const location = (0, import_react_router_dom.useLocation)();
     const params = (0, import_react_router_dom.useParams)();
     const navigate = (0, import_react_router_dom.useNavigate)();
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, __spreadProps(__spreadValues({}, props), {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
+      ...props,
       location,
       params,
       navigate
-    }));
+    });
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/{js/node → cjs}/ssr/cli/index.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -78,9 +64,9 @@ var cli_default = () => ({
             }
           },
           tools: {
-            webpackChain: (chain, { name, isServer, isServiceWorker, CHAIN_ID }) => {
+            webpackChain: (chain, { isServer, isServiceWorker, CHAIN_ID }) => {
               const userConfig = api.useResolvedConfigContext();
-              if ((0, import_utils.isUseSSRBundle)(userConfig) && name !== "server" && hasStringSSREntry(userConfig)) {
+              if ((0, import_utils.isUseSSRBundle)(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
                 const LoadableWebpackPlugin = require("@loadable/webpack-plugin");
                 chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
                   { filename: import_utils.LOADABLE_STATS_FILE }
@@ -94,7 +80,10 @@ var cli_default = () => ({
               chain.plugin(CHAIN_ID.PLUGIN.DEFINE).tap((args) => {
                 const [vars, ...rest] = args;
                 return [
-                  __spreadValues(__spreadValues({}, vars), modernVars),
+                  {
+                    ...vars,
+                    ...modernVars
+                  },
                   ...rest
                 ];
               });

package/dist/{js/node → cjs}/ssr/index.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -39,26 +22,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var ssr_exports = {};
 __export(ssr_exports, {
   default: () => ssr_default,
@@ -77,11 +40,12 @@ const ssr = (config) => ({
   setup: () => {
     const mockResp = (0, import_utils.mockResponse)();
     return {
-      client: (_0) => __async(void 0, [_0], function* ({ App, context, ModernRender, ModernHydrate }) {
+      client: async ({ App, context, ModernRender, ModernHydrate }) => {
         var _a;
-        const hydrateContext = __spreadProps(__spreadValues({}, context), {
+        const hydrateContext = {
+          ...context,
           _hydration: true
-        });
+        };
         const callback = () => {
           delete hydrateContext._hydration;
         };
@@ -139,15 +103,16 @@ const ssr = (config) => ({
             }));
           }
         }
-      }),
+      },
       init({ context }, next) {
         var _a, _b;
         const request = (_b = (_a = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _a.context) == null ? void 0 : _b.request;
         if (!request) {
-          context.ssrContext = __spreadProps(__spreadValues({}, context.ssrContext), {
+          context.ssrContext = {
+            ...context.ssrContext,
             response: mockResp,
             request: (0, import_utils.formatClient)({})
-          });
+          };
           return next({ context });
         }
         context.ssrContext.response = mockResp;
@@ -161,18 +126,20 @@ const ssr = (config) => ({
         if (!request) {
           return next({
             context,
-            pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
+            pickedContext: {
+              ...pickedContext,
               initialData
-            })
+            }
           });
         }
         return next({
           context,
-          pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
+          pickedContext: {
+            ...pickedContext,
             initialData,
             request,
             response: mockResp
-          })
+          }
         });
       }
     };

package/dist/{js/node → cjs}/ssr/index.node.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -39,26 +22,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var index_node_exports = {};
 __export(index_node_exports, {
   default: () => index_node_default,
@@ -72,14 +35,14 @@ const ssr = (config = {}) => ({
   name: "@modern-js/plugin-ssr",
   setup: () => {
     return {
-      server: (_0) => __async(void 0, [_0], function* ({ App, context }) {
-        const html = yield (0, import_serverRender.default)({
+      server: async ({ App, context }) => {
+        const html = await (0, import_serverRender.default)({
           context,
           App,
           config
         });
         return html;
-      }),
+      },
       init({ context }, next) {
         const { request } = context.ssrContext;
         context.ssrContext.request = (0, import_utils.formatServer)(request);
@@ -90,11 +53,12 @@ const ssr = (config = {}) => ({
         const { initialData } = context;
         return next({
           context,
-          pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
+          pickedContext: {
+            ...pickedContext,
             initialData,
             request,
             response
-          })
+          }
         });
       }
     };

package/dist/cjs/ssr/prefetch.js

@@ -0,0 +1,68 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var prefetch_exports = {};
+__export(prefetch_exports, {
+  default: () => prefetch_default
+});
+module.exports = __toCommonJS(prefetch_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_server = require("react-dom/server");
+var import_ssr = require("@modern-js/utils/ssr");
+var import_server2 = require("@loadable/server");
+const prefetch = async (App, context) => (0, import_ssr.run)(context.ssrContext.request.headers, async () => {
+  var _a;
+  const { ssrContext } = context;
+  const { loadableStats } = ssrContext;
+  if (loadableStats) {
+    const extractor = new import_server2.ChunkExtractor({
+      stats: loadableStats,
+      entrypoints: [ssrContext.entryName].filter(Boolean)
+    });
+    (0, import_server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+      context
+    })));
+  } else {
+    (0, import_server.renderToStaticMarkup)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+      context
+    }));
+  }
+  if (!context.loaderManager.hasPendingLoaders()) {
+    return {
+      initialData: context.initialData,
+      i18nData: context.__i18nData__
+    };
+  }
+  const loadersData = await context.loaderManager.awaitPendingLoaders();
+  Object.keys(loadersData).forEach((id) => {
+    const data = loadersData[id];
+    if (data._error) {
+      ssrContext.logger.error("App Prefetch Loader", data._error);
+      ssrContext.metrics.emitCounter("app.prefetch.loader.error", 1);
+      delete data._error;
+    }
+  });
+  return {
+    loadersData,
+    initialData: context.initialData,
+    i18nData: context.__i18nData__,
+    storeState: (_a = context == null ? void 0 : context.store) == null ? void 0 : _a.getState()
+  };
+});
+var prefetch_default = prefetch;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});