@modern-js/runtime 2.56.3-alpha.0 → 2.57.1-alpha.0

package/dist/cjs/core/browser/hydrate.js

@@ -97,7 +97,9 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
           });
         } else {
           (0, import_component.loadableReady)(() => {
-            ModernHydrate(App, callback).then((root) => {
+            ModernHydrate(/* @__PURE__ */ import_react.default.cloneElement(App, {
+              _internal_context: hydrateContext
+            }), callback).then((root) => {
               resolve(root);
             });
           });

package/dist/cjs/core/browser/index.js

@@ -64,14 +64,11 @@ function isClientArgs(id) {
 async function render(App, id) {
   const runner = (0, import_runner.getGlobalRunner)();
   const context = (0, import_runtime.getInitialContext)(runner);
-  const runInit = (_context) => runner.init({
-    context: _context
-  }, {
-    onLast: ({ context: context1 }) => {
-      const init = (0, import_context.getGlobalAppInit)();
-      return init === null || init === void 0 ? void 0 : init(context1);
-    }
-  });
+  const runBeforeRender = async (context2) => {
+    await runner.beforeRender(context2);
+    const init = (0, import_context.getGlobalAppInit)();
+    return init === null || init === void 0 ? void 0 : init(context2);
+  };
   if (isClientArgs(id)) {
     var _ssrData_data, _ssrData_data1;
     const ssrData = getSSRData();
@@ -88,12 +85,14 @@ async function render(App, id) {
       loaderManager: (0, import_loaderManager.createLoaderManager)(initialLoadersState, {
         skipStatic: true
       }),
+      // garfish plugin params
+      _internalRouterBaseName: App.props.basename,
       ...ssrData ? {
         ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
       } : {}
     });
     context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
-    const initialData = await runInit(context);
+    const initialData = await runBeforeRender(context);
     if (initialData) {
       context.initialData = initialData;
     }

package/dist/cjs/core/compatible.js

@@ -65,53 +65,38 @@ const createApp = ({ plugins, runtime, props: globalProps }) => {
         ...props
       }) : child));
     };
-    const HOCApp = runner.hoc({
-      App: WrapperComponent,
-      config: globalProps || {}
-    }, {
-      onLast: ({ App: App2 }) => {
-        const WrapComponent = ({ _internal_context, ...props }) => {
-          let contextValue = _internal_context;
-          if (!(contextValue === null || contextValue === void 0 ? void 0 : contextValue.runner)) {
-            contextValue = getInitialContext(runner);
-            runner.init({
-              context: contextValue
-            }, {
-              onLast: ({ context: context1 }) => {
-                var _getGlobalAppInit;
-                return (_getGlobalAppInit = (0, import_context.getGlobalAppInit)()) === null || _getGlobalAppInit === void 0 ? void 0 : _getGlobalAppInit(context1);
-              }
-            });
-          }
-          const mergedProps = {
-            ...props,
-            ...globalProps
-          };
-          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_runtime.RuntimeReactContext.Provider, {
-            value: contextValue,
-            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, {
-              ...mergedProps
-            })
-          });
-        };
-        return WrapComponent;
+    const WrapperApp = runner.wrapRoot(WrapperComponent);
+    const WrapComponent = ({ _internal_context, ...props }) => {
+      let contextValue = _internal_context;
+      if (!(contextValue === null || contextValue === void 0 ? void 0 : contextValue.runner)) {
+        var _getGlobalAppInit;
+        contextValue = getInitialContext(runner);
+        runner === null || runner === void 0 ? void 0 : runner.beforeRender(contextValue);
+        (_getGlobalAppInit = (0, import_context.getGlobalAppInit)()) === null || _getGlobalAppInit === void 0 ? void 0 : _getGlobalAppInit(contextValue);
       }
-    });
-    return HOCApp;
+      const mergedProps = {
+        ...props,
+        ...globalProps
+      };
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_runtime.RuntimeReactContext.Provider, {
+        value: contextValue,
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(WrapperApp, {
+          ...mergedProps
+        })
+      });
+    };
+    return WrapComponent;
   };
 };
 const bootstrap = async (BootApp, id, root, ReactDOM) => {
   const App = BootApp;
   const runner = (0, import_runner.getGlobalRunner)();
   const context = getInitialContext(runner);
-  const runInit = (_context) => runner.init({
-    context: _context
-  }, {
-    onLast: ({ context: context1 }) => {
-      const init = (0, import_context.getGlobalAppInit)();
-      return init === null || init === void 0 ? void 0 : init(context1);
-    }
-  });
+  const runBeforeRender = async (context2) => {
+    await runner.beforeRender(context2);
+    const init = (0, import_context.getGlobalAppInit)();
+    return init === null || init === void 0 ? void 0 : init(context2);
+  };
   if (!id) {
     return /* @__PURE__ */ import_react.default.createElement(App, {
       _internal_context: context
@@ -140,7 +125,7 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
         } : {}
       });
       context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
-      const initialData = await runInit(context);
+      const initialData = await runBeforeRender(context);
       if (initialData) {
         context.initialData = initialData;
       }
@@ -200,16 +185,11 @@ const useRuntimeContext = () => {
   var _context_ssrContext, _context_ssrContext1;
   const context = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
   const pickedContext = {
-    initialData: context.initialData,
+    ...context,
     request: (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.request,
     response: (_context_ssrContext1 = context.ssrContext) === null || _context_ssrContext1 === void 0 ? void 0 : _context_ssrContext1.response
   };
-  const memoizedContext = (0, import_react.useMemo)(() => context.runner.pickContext({
-    context,
-    pickedContext
-  }, {
-    onLast: ({ pickedContext: pickedContext2 }) => pickedContext2
-  }), [
+  const memoizedContext = (0, import_react.useMemo)(() => context.runner.pickContext(pickedContext), [
     context
   ]);
   return memoizedContext;

package/dist/cjs/core/plugin/base.js

@@ -18,23 +18,34 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var base_exports = {};
 __export(base_exports, {
+  RuntimeConfigContext: () => RuntimeConfigContext,
   createRuntime: () => createRuntime,
-  runtime: () => runtime
+  runtime: () => runtime,
+  useRuntimeConfigContext: () => useRuntimeConfigContext
 });
 module.exports = __toCommonJS(base_exports);
 var import_plugin = require("@modern-js/plugin");
-const hoc = (0, import_plugin.createPipeline)();
-const init = (0, import_plugin.createAsyncPipeline)();
-const pickContext = (0, import_plugin.createPipeline)();
+const RuntimeConfigContext = (0, import_plugin.createContext)({});
+const useRuntimeConfigContext = () => RuntimeConfigContext.use().value;
+const wrapRoot = (0, import_plugin.createWaterfall)();
+const beforeRender = (0, import_plugin.createAsyncInterruptWorkflow)();
+const pickContext = (0, import_plugin.createWaterfall)();
+const modifyRuntimeConfig = (0, import_plugin.createSyncParallelWorkflow)();
 const runtimeHooks = {
-  hoc,
-  init,
-  pickContext
+  beforeRender,
+  wrapRoot,
+  pickContext,
+  modifyRuntimeConfig
 };
-const createRuntime = () => (0, import_plugin.createManager)(runtimeHooks);
+const runtimePluginAPI = {
+  useRuntimeConfigContext
+};
+const createRuntime = () => (0, import_plugin.createManager)(runtimeHooks, runtimePluginAPI);
 const runtime = createRuntime();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  RuntimeConfigContext,
   createRuntime,
-  runtime
+  runtime,
+  useRuntimeConfigContext
 });

package/dist/cjs/core/plugin/index.js

@@ -23,19 +23,25 @@ __export(plugin_exports, {
   registerPlugin: () => registerPlugin
 });
 module.exports = __toCommonJS(plugin_exports);
-var import_merge = require("../utils/merge");
+var import_merge = require("@modern-js/runtime-utils/merge");
 var import_base = require("./base");
 var import_runner = require("./runner");
 __reExport(plugin_exports, require("./base"), module.exports);
+function setupConfigContext() {
+  const runner = (0, import_runner.getGlobalRunner)();
+  const configs = runner.modifyRuntimeConfig();
+  import_base.RuntimeConfigContext.set((0, import_merge.merge)({}, ...configs));
+}
 function registerPlugin(internalPlugins, runtimeConfig, customRuntime) {
   const { plugins = [] } = runtimeConfig || {};
   (customRuntime || import_base.runtime).usePlugin(...internalPlugins, ...plugins);
   const runner = (customRuntime || import_base.runtime).init();
   (0, import_runner.setGlobalRunner)(runner);
+  setupConfigContext();
   return runner;
 }
 function mergeConfig(config, ...otherConfig) {
-  return (0, import_merge.merge)(config, ...otherConfig);
+  return (0, import_merge.merge)({}, config, ...otherConfig);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/core/react/index.js

@@ -24,26 +24,19 @@ module.exports = __toCommonJS(react_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_context = require("../context");
 var import_runner = require("../plugin/runner");
-function createRoot(UserApp, config) {
+function createRoot(UserApp) {
   const App = UserApp || (0, import_context.getGlobalApp)();
   const runner = (0, import_runner.getGlobalRunner)();
-  const HOCApp = runner.hoc({
-    App,
-    config: config || {}
-  }, {
-    onLast: ({ App: App2 }) => {
-      const WrapComponent = ({ _internal_context, ...props }) => {
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_context.RuntimeReactContext.Provider, {
-          value: _internal_context,
-          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, {
-            ...props
-          })
-        });
-      };
-      return WrapComponent;
-    }
-  });
-  return HOCApp;
+  const WrapperApp = runner.wrapRoot(App);
+  const WrapComponent = ({ _internal_context, ...props }) => {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_context.RuntimeReactContext.Provider, {
+      value: _internal_context,
+      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(WrapperApp, {
+        ...props
+      })
+    });
+  };
+  return WrapComponent;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/core/server/requestHandler.js

@@ -30,7 +30,7 @@ var import_loaderManager = require("../loader/loaderManager");
 var import_utils = require("./utils");
 var import_constants = require("./constants");
 function createSSRContext(request, options) {
-  const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, staticGenerate, logger, metrics, reporter } = options;
+  const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, logger, metrics, reporter } = options;
   const { nonce } = config;
   const { entryName, route } = resource;
   const cookie = request.headers.get("cookie");
@@ -39,7 +39,7 @@ function createSSRContext(request, options) {
   const query = (0, import_request.parseQuery)(request);
   const headersData = (0, import_request.parseHeaders)(request);
   const url = new URL(request.url);
-  const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries, staticGenerate);
+  const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
   const ssrMode = (0, import_utils.getSSRMode)(ssrConfig);
   const loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
   return {
@@ -59,6 +59,7 @@ function createSSRContext(request, options) {
       params,
       headers: headersData,
       host: url.host,
+      url: request.url,
       raw: request
     },
     response: {
@@ -83,14 +84,14 @@ const createRequestHandler = async (handleRequest) => {
     const runner = (0, import_runner.getGlobalRunner)();
     const { routeManifest } = options.resource;
     const context = (0, import_runtime.getInitialContext)(runner, false, routeManifest);
-    const runInit = (_context) => runner.init({
-      context: _context
-    }, {
-      onLast: ({ context: context1 }) => {
-        const init = (0, import_context.getGlobalAppInit)();
-        return init === null || init === void 0 ? void 0 : init(context1);
+    const runBeforeRender = async (context2) => {
+      const result = await runner.beforeRender(context2);
+      if (typeof Response !== "undefined" && result instanceof Response) {
+        return result;
       }
-    });
+      const init = (0, import_context.getGlobalAppInit)();
+      return init === null || init === void 0 ? void 0 : init(context2);
+    };
     const responseProxy = {
       headers: {},
       code: -1
@@ -125,7 +126,7 @@ const createRequestHandler = async (handleRequest) => {
       }
       return void 0;
     };
-    const initialData = await runInit(context);
+    const initialData = await runBeforeRender(context);
     context.initialData = initialData;
     const redirectResponse = getRedirectResponse(initialData);
     if (redirectResponse) {

package/dist/cjs/core/server/stream/shared.js

@@ -69,11 +69,11 @@ function createRenderStreaming(createReadableStreamFromElement) {
     const headersData = (0, import_request.parseHeaders)(request);
     return (0, import_node.run)(headersData, async () => {
       const end = (0, import_time.time)();
-      const { runtimeContext, config, resource, staticGenerate } = options;
+      const { runtimeContext, config, resource } = options;
       const onError = (0, import_tracer.createOnError)(options.onError);
       const onTiming = (0, import_tracer.createOnTiming)(options.onTiming);
       const { htmlTemplate, entryName } = resource;
-      const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries, staticGenerate);
+      const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
       const rootElement = import_react.default.cloneElement(serverRoot, {
         _internal_context: Object.assign(runtimeContext, {
           ssr: true

package/dist/cjs/core/server/string/index.js

@@ -51,14 +51,14 @@ const renderString = async (request, serverRoot, options) => {
   const headersData = (0, import_request.parseHeaders)(request);
   return (0, import_node.run)(headersData, async () => {
     var _runtimeContext_ssrContext;
-    const { resource, runtimeContext, config, onError, onTiming, staticGenerate } = options;
+    const { resource, runtimeContext, config, onError, onTiming } = options;
     const tracer = {
       onError: (0, import_tracer.createOnError)(onError),
       onTiming: (0, import_tracer.createOnTiming)(onTiming)
     };
     const routerContext = runtimeContext.routerContext;
     const { htmlTemplate, entryName, loadableStats, routeManifest } = resource;
-    const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries, staticGenerate);
+    const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
     const chunkSet = {
       renderLevel: import_constants2.RenderLevel.CLIENT_RENDER,
       ssrScripts: "",
@@ -71,6 +71,7 @@ const renderString = async (request, serverRoot, options) => {
       chunkSet.renderLevel = import_constants2.RenderLevel.SERVER_PREFETCH;
     } catch (e) {
       chunkSet.renderLevel = import_constants2.RenderLevel.CLIENT_RENDER;
+      tracer.onError(import_tracer.SSRErrors.PRERENDER, e);
     }
     const collectors = [
       new import_styledComponent.StyledCollector(chunkSet),

package/dist/cjs/core/server/utils.js

@@ -63,14 +63,11 @@ function serializeErrors(errors) {
   }
   return serialized;
 }
-function getSSRConfigByEntry(entryName, ssr, ssrByEntries, staticGenerate) {
-  if (staticGenerate) {
-    return true;
-  }
+function getSSRConfigByEntry(entryName, ssr, ssrByEntries) {
   if (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[entryName]) {
     return ssrByEntries[entryName];
   }
-  return ssr;
+  return ssr || true;
 }
 function getSSRMode(ssrConfig) {
   if (typeof ssrConfig === "boolean") {

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

@@ -28,6 +28,7 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_router = require("@modern-js/runtime-utils/router");
 var import_parsed = require("@modern-js/runtime-utils/parsed");
+var import_merge = require("@modern-js/runtime-utils/merge");
 var import_context = require("../../core/context");
 var import_core = require("../../core");
 var import_hooks = require("./hooks");
@@ -45,23 +46,17 @@ function modifyRoutes(modifyFunction) {
     console.error("It is not allowed to modify routes config after create router.");
   }
 }
-const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename = "", routesConfig, createRoutes }) => {
-  const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
-  let routes = [];
-  finalRouteConfig = {
-    routes: (0, import_context.getGlobalRoutes)(),
-    globalApp: (0, import_context.getGlobalLayoutApp)(),
-    ...routesConfig
-  };
-  window._SERVER_DATA = (0, import_parsed.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
+const routerPlugin = (userConfig = {}) => {
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
       modifyRoutes: import_hooks.modifyRoutes
     },
     setup: (api) => {
+      let routes = [];
+      window._SERVER_DATA = (0, import_parsed.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
       return {
-        init({ context }, next) {
+        beforeRender(context) {
           context.router = {
             useMatches: import_router.useMatches,
             useLocation: import_router.useLocation,
@@ -72,24 +67,26 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
               return routes;
             }
           });
-          return next({
-            context
-          });
         },
-        hoc: ({ App, config }, next) => {
+        wrapRoot: (App) => {
+          const pluginConfig = api.useRuntimeConfigContext();
+          const { serverBase = [], supportHtml5History = true, basename = "", routesConfig, createRoutes } = (0, import_merge.merge)(pluginConfig.router || {}, userConfig);
+          const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
+          finalRouteConfig = {
+            routes: (0, import_context.getGlobalRoutes)(),
+            globalApp: (0, import_context.getGlobalLayoutApp)(),
+            ...routesConfig
+          };
           if (!finalRouteConfig.routes && !createRoutes) {
-            return next({
-              App,
-              config
-            });
+            return App;
           }
           const getRouteApp = () => {
             const useCreateRouter = (props) => {
-              var _config_router, _window__SERVER_DATA;
-              const baseUrl = ((config === null || config === void 0 ? void 0 : (_config_router = config.router) === null || _config_router === void 0 ? void 0 : _config_router.basename) || ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname)).replace(/^\/*/, "/");
+              var _window__SERVER_DATA;
+              const runtimeContext = (0, import_react.useContext)(import_core.RuntimeReactContext);
+              const baseUrl = (runtimeContext._internalRouterBaseName || ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname)).replace(/^\/*/, "/");
               const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
               let hydrationData = window._ROUTER_DATA;
-              const runtimeContext = (0, import_react.useContext)(import_core.RuntimeReactContext);
               const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
               return (0, import_react.useMemo)(() => {
                 if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
@@ -126,7 +123,8 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
                   get() {
                     return router;
                   },
-                  configurable: true
+                  configurable: true,
+                  enumerable: true
                 });
                 return router;
               }, [
@@ -145,33 +143,24 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
               });
             };
           };
-          const RouteApp = getRouteApp();
-          return next({
-            App: RouteApp,
-            config
-          });
+          return getRouteApp();
         },
-        pickContext: ({ context, pickedContext }, next) => {
-          const { remixRouter } = context;
+        pickContext: (pickedContext) => {
+          const { remixRouter } = pickedContext;
           if (!remixRouter) {
-            return next({
-              context,
-              pickedContext
-            });
+            return pickedContext;
           }
           const router = {
+            ...pickedContext.router,
             navigate: remixRouter.navigate,
             get location() {
               return remixRouter.state.location;
             }
           };
-          return next({
-            context,
-            pickedContext: {
-              ...pickedContext,
-              router
-            }
-          });
+          return {
+            ...pickedContext,
+            router
+          };
         }
       };
     }

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

@@ -40,6 +40,7 @@ var import_router2 = require("@modern-js/runtime-utils/router");
 var import_node = require("@modern-js/runtime-utils/node");
 var import_time = require("@modern-js/runtime-utils/time");
 var import_constants = require("@modern-js/utils/universal/constants");
+var import_merge = require("@modern-js/runtime-utils/merge");
 var import_common = require("../../common");
 var import_core = require("../../core");
 var import_context = require("../../core/context");
@@ -56,25 +57,26 @@ function createRemixReuqest(request) {
     signal: controller.signal
   });
 }
-const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
+const routerPlugin = (userConfig = {}) => {
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
       modifyRoutes: import_hooks.modifyRoutes
     },
     setup: (api) => {
-      const finalRouteConfig = {
-        routes: (0, import_context.getGlobalRoutes)(),
-        globalApp: (0, import_context.getGlobalLayoutApp)(),
-        ...routesConfig
-      };
+      let finalRouteConfig = {};
       return {
-        async init({ context }, next) {
+        async beforeRender(context, interrupt) {
           var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1;
+          const pluginConfig = api.useRuntimeConfigContext();
+          const { basename = "", routesConfig, createRoutes } = (0, import_merge.merge)(pluginConfig.router || {}, userConfig);
+          finalRouteConfig = {
+            routes: (0, import_context.getGlobalRoutes)(),
+            globalApp: (0, import_context.getGlobalLayoutApp)(),
+            ...routesConfig
+          };
           if (!finalRouteConfig.routes && !createRoutes) {
-            return next({
-              context
-            });
+            return;
           }
           const { request, mode: ssrMode, nonce, loaderFailureMode = "errorBoundary" } = context.ssrContext;
           const { baseUrl } = request;
@@ -103,7 +105,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           const cost = end();
           (_context_ssrContext1 = context.ssrContext) === null || _context_ssrContext1 === void 0 ? void 0 : (_context_ssrContext_onTiming = _context_ssrContext1.onTiming) === null || _context_ssrContext_onTiming === void 0 ? void 0 : _context_ssrContext_onTiming.call(_context_ssrContext1, import_constants.LOADER_REPORTER_NAME, cost);
           if (routerContext instanceof Response) {
-            return routerContext;
+            return interrupt(routerContext);
           }
           if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && loaderFailureMode === "clientRender") {
             routerContext.statusCode = 200;
@@ -113,20 +115,15 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           context.remixRouter = router;
           context.routerContext = routerContext;
           context.routes = routes;
-          return next({
-            context
-          });
         },
-        hoc: ({ App, config }, next) => {
+        wrapRoot: (App) => {
           if (!finalRouteConfig) {
-            return next({
-              App,
-              config
-            });
+            return App;
           }
           const getRouteApp = () => {
             return () => {
-              const { remixRouter, routerContext, ssrContext } = (0, import_react.useContext)(import_core.RuntimeReactContext);
+              const context = (0, import_react.useContext)(import_core.RuntimeReactContext);
+              const { remixRouter, routerContext, ssrContext } = context;
               const { nonce, mode } = ssrContext;
               return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
                 children: [
@@ -135,6 +132,8 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
                     context: routerContext,
                     hydrate: false
                   }),
+                  mode === "stream" && // ROUTER_DATA will inject in `packages/runtime/plugin-runtime/src/core/server/string/ssrData.ts` in string ssr
+                  // So we can inject it only when streaming ssr
                   /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DeferredDataScripts.default, {
                     nonce,
                     context: routerContext
@@ -144,19 +143,12 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
               });
             };
           };
-          const RouteApp = getRouteApp();
-          return next({
-            App: RouteApp,
-            config
-          });
+          return getRouteApp();
         },
-        pickContext: ({ context, pickedContext }, next) => {
-          const { remixRouter } = context;
+        pickContext: (pickedContext) => {
+          const { remixRouter } = pickedContext;
           if (!remixRouter) {
-            return next({
-              context,
-              pickedContext
-            });
+            return pickedContext;
           }
           const router = {
             navigate: remixRouter.navigate,
@@ -164,13 +156,10 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
               return remixRouter.state.location;
             }
           };
-          return next({
-            context,
-            pickedContext: {
-              ...pickedContext,
-              router
-            }
-          });
+          return {
+            ...pickedContext,
+            router
+          };
         }
       };
     }