@modern-js/runtime 2.5.0 → 2.7.0

package/dist/cjs/router/runtime/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,116 +16,66 @@ 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, {
+  deserializeErrors: () => deserializeErrors,
   getLocation: () => getLocation,
   getRouteComponents: () => getRouteComponents,
   renderRoutes: () => renderRoutes,
+  serializeErrors: () => serializeErrors,
   standardSlash: () => standardSlash,
   urlJoin: () => urlJoin
 });
 module.exports = __toCommonJS(utils_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
 var import_react_router_dom = require("react-router-dom");
+var import_nestedRoutes = require("@modern-js/utils/nestedRoutes");
+var import_remix_router = require("@modern-js/utils/remix-router");
 var import_DefaultNotFound = require("./DefaultNotFound");
-const renderNestedRoute = (nestedRoute, parent) => {
-  const { children, index, id, component, isRoot } = nestedRoute;
-  const Component = component;
-  const 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) {
-    const errorElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(nestedRoute.error, {});
-    routeProps.errorElement = errorElement;
-  }
-  let element;
-  if (Component) {
-    if (parent == null ? void 0 : parent.loading) {
-      const Loading = parent.loading;
-      if (isLoadableComponent(Component)) {
-        element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
-          fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {})
-        });
-      } else {
-        element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, {
-          fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {}),
-          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {})
-        });
-      }
-    } else if (isLoadableComponent(Component) || isRoot) {
-      element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {});
-    } else {
-      element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, {
-        fallback: null,
-        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {})
-      });
-    }
-  } else {
-    nestedRoute.loading = parent == null ? void 0 : parent.loading;
-  }
-  if (element) {
-    routeProps.element = element;
-  }
-  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, {
-    ...routeProps,
-    index: true
-  }, id) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
-    ...routeProps,
-    index: false,
-    children: childElements
-  }, id);
-  return routeElement;
-};
-function getRouteComponents(routes, globalApp) {
+var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts"));
+function getRouteComponents(routes, {
+  globalApp,
+  ssrMode
+}) {
   const Layout = ({ Component, ...props }) => {
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
-        ...props
-      });
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, {
-      Component,
-      ...props
-    });
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, { Component, ...props });
   };
   const routeElements = [];
   for (const route of routes) {
     if (route.type === "nested") {
-      const routeElement = renderNestedRoute(route);
+      const routeElement = (0, import_nestedRoutes.renderNestedRoute)(route, {
+        DeferredDataComponent: ssrMode === "stream" ? import_DeferredDataScripts.default : void 0
+      });
       routeElements.push(routeElement);
     } else {
-      const routeElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
-        path: route.path,
-        element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Layout, {
-          Component: route.component
-        })
-      }, route.path);
+      const routeElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        import_react_router_dom.Route,
+        {
+          path: route.path,
+          element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Layout, { Component: route.component })
+        },
+        route.path
+      );
       routeElements.push(routeElement);
     }
   }
-  routeElements.push(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
-    path: "*",
-    element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DefaultNotFound.DefaultNotFound, {})
-  }, "*"));
+  routeElements.push(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, { path: "*", element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DefaultNotFound.DefaultNotFound, {}) }, "*"));
   return routeElements;
 }
-function renderRoutes(routesConfig) {
+function renderRoutes(routesConfig, ssrMode) {
   if (!routesConfig) {
     return null;
   }
@@ -131,7 +83,7 @@ function renderRoutes(routesConfig) {
   if (!routes) {
     return null;
   }
-  const routeElements = getRouteComponents(routes, globalApp);
+  const routeElements = getRouteComponents(routes, { globalApp, ssrMode });
   return routeElements;
 }
 function getLocation(serverContext) {
@@ -165,32 +117,58 @@ function standardSlash(str) {
   }
   return addr;
 }
-function createLoader(route) {
-  const { loader } = route;
-  if (loader) {
-    return (args) => {
-      if (typeof route.lazyImport === "function") {
-        route.lazyImport();
-      }
-      return loader(args);
-    };
-  } else {
-    return () => {
-      if (typeof route.lazyImport === "function") {
-        route.lazyImport();
-      }
-      return null;
-    };
+function serializeErrors(errors) {
+  if (!errors) {
+    return null;
   }
+  const entries = Object.entries(errors);
+  const serialized = {};
+  for (const [key, val] of entries) {
+    if ((0, import_remix_router.isRouteErrorResponse)(val)) {
+      serialized[key] = { ...val, __type: "RouteErrorResponse" };
+    } else if (val instanceof Error) {
+      serialized[key] = {
+        message: val.message,
+        stack: val.stack,
+        __type: "Error"
+      };
+    } else {
+      serialized[key] = val;
+    }
+  }
+  return serialized;
 }
-function isLoadableComponent(component) {
-  return component && component.displayName === "Loadable" && component.preload && typeof component.preload === "function";
+function deserializeErrors(errors) {
+  if (!errors) {
+    return null;
+  }
+  const entries = Object.entries(errors);
+  const serialized = {};
+  for (const [key, val] of entries) {
+    if (val && val.__type === "RouteErrorResponse") {
+      serialized[key] = new import_remix_router.ErrorResponse(
+        val.status,
+        val.statusText,
+        val.data,
+        val.internal === true
+      );
+    } else if (val && val.__type === "Error") {
+      const error = new Error(val.message);
+      error.stack = val.stack;
+      serialized[key] = error;
+    } else {
+      serialized[key] = val;
+    }
+  }
+  return serialized;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  deserializeErrors,
   getLocation,
   getRouteComponents,
   renderRoutes,
+  serializeErrors,
   standardSlash,
   urlJoin
 });

package/dist/cjs/router/runtime/withRouter.js

@@ -27,12 +27,15 @@ 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, {
-      ...props,
-      location,
-      params,
-      navigate
-    });
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      Component,
+      {
+        ...props,
+        location,
+        params,
+        navigate
+      }
+    );
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/{runtime-context.js → runtimeContext.js}

@@ -15,12 +15,12 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runtime_context_exports = {};
-__export(runtime_context_exports, {
+var runtimeContext_exports = {};
+__export(runtimeContext_exports, {
   RuntimeReactContext: () => RuntimeReactContext,
   ServerRouterContext: () => ServerRouterContext
 });
-module.exports = __toCommonJS(runtime_context_exports);
+module.exports = __toCommonJS(runtimeContext_exports);
 var import_react = require("react");
 const RuntimeReactContext = (0, import_react.createContext)({});
 const ServerRouterContext = (0, import_react.createContext)({});

package/dist/cjs/ssr/cli/babel-plugin-ssr-loader-id.js

@@ -13,6 +13,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/cli/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
 ));
@@ -60,6 +64,8 @@ var cli_default = () => ({
         return {
           source: {
             alias: {
+              // ensure that all packages use the same storage in @modern-js/utils/ssr
+              "@modern-js/utils/ssr": require.resolve("@modern-js/utils/ssr"),
               "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
             }
           },

package/dist/cjs/ssr/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
 ));
@@ -56,51 +60,33 @@ const ssr = (config) => ({
         return stringSSRHydrate();
         function stringSSRHydrate() {
           if (renderLevel === import_types.RenderLevel.CLIENT_RENDER || renderLevel === import_types.RenderLevel.SERVER_PREFETCH) {
-            ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-              context
-            }));
+            ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context }));
           } else if (renderLevel === import_types.RenderLevel.SERVER_RENDER) {
             if ((0, import_utils.isReact18)()) {
               (0, import_component.loadableReady)(() => {
-                let SSRApp = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_withCallback.WithCallback, {
-                  callback,
-                  children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-                    context: hydrateContext
-                  })
-                });
+                let SSRApp = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_withCallback.WithCallback, { callback, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context: hydrateContext }) });
                 SSRApp = (0, import_hoist_non_react_statics.default)(SSRApp, App);
                 ModernHydrate(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(SSRApp, {}));
               });
             } else {
               (0, import_component.loadableReady)(() => {
-                ModernHydrate(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-                  context: hydrateContext
-                }), callback);
+                ModernHydrate(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context: hydrateContext }), callback);
               });
             }
           } else {
             console.warn(
               `unknow render level: ${renderLevel}, execute render()`
             );
-            ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-              context
-            }));
+            ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context }));
           }
         }
         function streamSSRHydrate() {
           if (renderLevel === import_types.RenderLevel.SERVER_RENDER) {
-            let SSRApp = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_withCallback.WithCallback, {
-              callback,
-              children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-                context: hydrateContext
-              })
-            });
+            let SSRApp = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_withCallback.WithCallback, { callback, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context: hydrateContext }) });
             SSRApp = (0, import_hoist_non_react_statics.default)(SSRApp, App);
             ModernHydrate(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(SSRApp, {}));
           } else {
-            ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-              context
-            }));
+            ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context }));
           }
         }
       },

package/dist/cjs/ssr/index.node.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
 ));
@@ -46,6 +50,7 @@ const ssr = (config = {}) => ({
       init({ context }, next) {
         const { request } = context.ssrContext;
         context.ssrContext.request = (0, import_utils.formatServer)(request);
+        context.ssrContext.mode = config.mode;
         return next({ context });
       },
       pickContext: ({ context, pickedContext }, next) => {

package/dist/cjs/ssr/prefetch.js

@@ -33,13 +33,9 @@ const prefetch = async (App, context) => (0, import_ssr.run)(context.ssrContext.
       stats: loadableStats,
       entrypoints: [ssrContext.entryName].filter(Boolean)
     });
-    (0, import_server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-      context
-    })));
+    (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
-    }));
+    (0, import_server.renderToStaticMarkup)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context }));
   }
   if (!context.loaderManager.hasPendingLoaders()) {
     return {
@@ -60,6 +56,7 @@ const prefetch = async (App, context) => (0, import_ssr.run)(context.ssrContext.
     loadersData,
     initialData: context.initialData,
     i18nData: context.__i18nData__,
+    // todo: move to plugin state
     storeState: (_a = context == null ? void 0 : context.store) == null ? void 0 : _a.getState()
   };
 });

package/dist/cjs/ssr/react/nossr/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/react/prerender/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/renderToStream/buildTemplate.after.js

@@ -1,8 +1,6 @@
-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)
@@ -16,17 +14,13 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var buildTemplate_after_exports = {};
 __export(buildTemplate_after_exports, {
   buildShellAfterTemplate: () => buildShellAfterTemplate
 });
 module.exports = __toCommonJS(buildTemplate_after_exports);
-var import_serialize_javascript = __toESM(require("serialize-javascript"));
+var import_serialize = require("@modern-js/utils/serialize");
 var import_buildTemplate = require("./buildTemplate.share");
 function buildShellAfterTemplate(afterAppTemplate, options) {
   const callbacks = [injectSSRDataScript];
@@ -36,7 +30,10 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
     return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
     function buildSSRDataScript() {
       const { ssrContext, renderLevel } = options;
-      const { request } = ssrContext;
+      const { request, enableUnsafeCtx } = ssrContext;
+      const unsafeContext = {
+        headers: request.headers
+      };
       const SSRData = {
         context: {
           request: {
@@ -45,16 +42,13 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
             pathname: request.pathname,
             host: request.host,
             url: request.url,
-            headers: request.headers,
-            cookieMap: request.cookieMap
+            ...enableUnsafeCtx ? unsafeContext : {}
           }
         },
         renderLevel
       };
       return `
-      <script>window._SSR_DATA = ${(0, import_serialize_javascript.default)(SSRData, {
-        isJSON: true
-      })}<\/script>
+      <script>window._SSR_DATA = ${(0, import_serialize.serializeJson)(SSRData)}</script>
       `;
     }
   }

package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.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
 ));
@@ -37,6 +41,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       const helmetData = import_react_helmet.default.renderStatic();
       return helmetData ? (0, import_helmet.default)(headTemplate2, helmetData) : headTemplate2;
     },
+    // @TODO: prefetch scripts of lazy component
     injectCss
   ];
   const [headTemplate = ""] = beforeEntryTemplate.match(import_buildTemplate.HEAD_REG_EXP) || [];

package/dist/cjs/ssr/serverRender/renderToStream/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/renderToStream/renderToPipe.js

@@ -22,9 +22,16 @@ __export(renderToPipe_exports, {
 module.exports = __toCommonJS(renderToPipe_exports);
 var import_stream = require("stream");
 var import_types = require("../types");
+var import_common = require("../../../common");
 var import_template = require("./template");
+var ShellChunkStatus = /* @__PURE__ */ ((ShellChunkStatus2) => {
+  ShellChunkStatus2[ShellChunkStatus2["IDLE"] = 0] = "IDLE";
+  ShellChunkStatus2[ShellChunkStatus2["START"] = 1] = "START";
+  ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 2] = "FINIESH";
+  return ShellChunkStatus2;
+})(ShellChunkStatus || {});
 function renderToPipe(rootElement, context, options) {
-  let isShellStream = true;
+  let shellChunkStatus = 0 /* IDLE */;
   const { ssrContext } = context;
   const forUserPipe = (stream) => {
     return new Promise((resolve) => {
@@ -45,9 +52,20 @@ function renderToPipe(rootElement, context, options) {
           const injectableTransform = new import_stream.Transform({
             transform(chunk, _encoding, callback) {
               try {
-                if (isShellStream) {
-                  this.push(joinChunk(shellBefore, chunk, shellAfter));
-                  isShellStream = false;
+                if (shellChunkStatus !== 2 /* FINIESH */) {
+                  let concatedChunk = chunk.toString();
+                  if (shellChunkStatus === 0 /* IDLE */) {
+                    concatedChunk = `${shellBefore}${concatedChunk}`;
+                    shellChunkStatus = 1 /* START */;
+                  }
+                  if (shellChunkStatus === 1 /* START */ && concatedChunk.endsWith(import_common.ESCAPED_SHELL_STREAM_END_MARK)) {
+                    concatedChunk = concatedChunk.replace(
+                      import_common.ESCAPED_SHELL_STREAM_END_MARK,
+                      shellAfter
+                    );
+                    shellChunkStatus = 2 /* FINIESH */;
+                  }
+                  this.push(concatedChunk);
                 } else {
                   this.push(chunk);
                 }
@@ -90,9 +108,6 @@ function renderToPipe(rootElement, context, options) {
     });
   };
   return forUserPipe;
-  function joinChunk(before = "", chunk, after = "") {
-    return `${before}${chunk.toString()}${after}`;
-  }
 }
 var renderToPipe_default = renderToPipe;
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/ssr/serverRender/renderToStream/template.js

@@ -24,7 +24,7 @@ var import_buildTemplate = require("./buildTemplate.after");
 var import_bulidTemplate = require("./bulidTemplate.before");
 const HTML_SEPARATOR = "<!--<?- html ?>-->";
 const getTemplates = (context, renderLevel) => {
-  const { ssrContext } = context;
+  const { ssrContext, routerContext } = context;
   const [beforeAppTemplate = "", afterAppHtmlTemplate = ""] = ssrContext.template.split(HTML_SEPARATOR) || [];
   const builtBeforeTemplate = (0, import_bulidTemplate.buildShellBeforeTemplate)(
     beforeAppTemplate,
@@ -32,6 +32,7 @@ const getTemplates = (context, renderLevel) => {
   );
   const builtAfterTemplate = (0, import_buildTemplate.buildShellAfterTemplate)(afterAppHtmlTemplate, {
     ssrContext,
+    routerContext,
     renderLevel
   });
   return {