@modern-js/runtime 2.56.2 → 2.57.0

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

@@ -3,28 +3,20 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import { jsx as _jsx } from "react/jsx-runtime";
 import { RuntimeReactContext, getGlobalApp } from "../context";
 import { getGlobalRunner } from "../plugin/runner";
-function createRoot(UserApp, config) {
+function createRoot(UserApp) {
   var App = UserApp || getGlobalApp();
   var runner = getGlobalRunner();
-  var HOCApp = runner.hoc({
-    App,
-    config: config || {}
-  }, {
-    onLast: function(param) {
-      var App2 = param.App;
-      var WrapComponent = function(_param) {
-        var _internal_context = _param._internal_context, props = _object_without_properties(_param, [
-          "_internal_context"
-        ]);
-        return /* @__PURE__ */ _jsx(RuntimeReactContext.Provider, {
-          value: _internal_context,
-          children: /* @__PURE__ */ _jsx(App2, _object_spread({}, props))
-        });
-      };
-      return WrapComponent;
-    }
-  });
-  return HOCApp;
+  var WrapperApp = runner.wrapRoot(App);
+  var WrapComponent = function(_param) {
+    var _internal_context = _param._internal_context, props = _object_without_properties(_param, [
+      "_internal_context"
+    ]);
+    return /* @__PURE__ */ _jsx(RuntimeReactContext.Provider, {
+      value: _internal_context,
+      children: /* @__PURE__ */ _jsx(WrapperApp, _object_spread({}, props))
+    });
+  };
+  return WrapComponent;
 }
 export {
   createRoot

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

@@ -13,7 +13,7 @@ import { createLoaderManager } from "../loader/loaderManager";
 import { getSSRConfigByEntry, getSSRMode } from "./utils";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants";
 function createSSRContext(request, options) {
-  var config = options.config, loaderContext = options.loaderContext, onError = options.onError, onTiming = options.onTiming, locals = options.locals, resource = options.resource, params = options.params, responseProxy = options.responseProxy, staticGenerate = options.staticGenerate, logger = options.logger, metrics = options.metrics, reporter = options.reporter;
+  var config = options.config, loaderContext = options.loaderContext, onError = options.onError, onTiming = options.onTiming, locals = options.locals, resource = options.resource, params = options.params, responseProxy = options.responseProxy, logger = options.logger, metrics = options.metrics, reporter = options.reporter;
   var nonce = config.nonce;
   var entryName = resource.entryName, route = resource.route;
   var cookie = request.headers.get("cookie");
@@ -22,7 +22,7 @@ function createSSRContext(request, options) {
   var query = parseQuery(request);
   var headersData = parseHeaders(request);
   var url = new URL(request.url);
-  var ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries, staticGenerate);
+  var ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   var ssrMode = getSSRMode(ssrConfig);
   var loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
   return {
@@ -66,7 +66,7 @@ var createRequestHandler = function() {
     return _ts_generator(this, function(_state) {
       requestHandler = function() {
         var _ref2 = _async_to_generator(function(request, options) {
-          var Root, runner, routeManifest, context, runInit, responseProxy, ssrContext, getRedirectResponse, initialData, redirectResponse, htmlTemplate, response;
+          var Root, runner, routeManifest, context, runBeforeRender, responseProxy, ssrContext, getRedirectResponse, initialData, redirectResponse, htmlTemplate, response;
           return _ts_generator(this, function(_state2) {
             switch (_state2.label) {
               case 0:
@@ -74,17 +74,36 @@ var createRequestHandler = function() {
                 runner = getGlobalRunner();
                 routeManifest = options.resource.routeManifest;
                 context = getInitialContext(runner, false, routeManifest);
-                runInit = function(_context) {
-                  return runner.init({
-                    context: _context
-                  }, {
-                    onLast: function(param) {
-                      var context1 = param.context;
-                      var init = getGlobalAppInit();
-                      return init === null || init === void 0 ? void 0 : init(context1);
-                    }
+                runBeforeRender = function() {
+                  var _ref3 = _async_to_generator(function(context2) {
+                    var result, init;
+                    return _ts_generator(this, function(_state3) {
+                      switch (_state3.label) {
+                        case 0:
+                          return [
+                            4,
+                            runner.beforeRender(context2)
+                          ];
+                        case 1:
+                          result = _state3.sent();
+                          if (typeof Response !== "undefined" && _instanceof(result, Response)) {
+                            return [
+                              2,
+                              result
+                            ];
+                          }
+                          init = getGlobalAppInit();
+                          return [
+                            2,
+                            init === null || init === void 0 ? void 0 : init(context2)
+                          ];
+                      }
+                    });
                   });
-                };
+                  return function runBeforeRender2(context2) {
+                    return _ref3.apply(this, arguments);
+                  };
+                }();
                 responseProxy = {
                   headers: {},
                   code: -1
@@ -120,7 +139,7 @@ var createRequestHandler = function() {
                 };
                 return [
                   4,
-                  runInit(context)
+                  runBeforeRender(context)
                 ];
               case 1:
                 initialData = _state2.sent();

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

@@ -39,16 +39,16 @@ function createRenderStreaming(createReadableStreamFromElement) {
         return [
           2,
           run(headersData, /* @__PURE__ */ _async_to_generator(function() {
-            var end, runtimeContext, config, resource, staticGenerate, onError, onTiming, htmlTemplate, entryName, ssrConfig, rootElement, stream;
+            var end, runtimeContext, config, resource, onError, onTiming, htmlTemplate, entryName, ssrConfig, rootElement, stream;
             return _ts_generator(this, function(_state2) {
               switch (_state2.label) {
                 case 0:
                   end = time();
-                  runtimeContext = options.runtimeContext, config = options.config, resource = options.resource, staticGenerate = options.staticGenerate;
+                  runtimeContext = options.runtimeContext, config = options.config, resource = options.resource;
                   onError = createOnError(options.onError);
                   onTiming = createOnTiming(options.onTiming);
                   htmlTemplate = resource.htmlTemplate, entryName = resource.entryName;
-                  ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries, staticGenerate);
+                  ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
                   rootElement = React.cloneElement(serverRoot, {
                     _internal_context: Object.assign(runtimeContext, {
                       ssr: true

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

@@ -25,18 +25,18 @@ var renderString = function() {
       return [
         2,
         run(headersData, /* @__PURE__ */ _async_to_generator(function() {
-          var _runtimeContext_ssrContext, resource, runtimeContext, config, onError, onTiming, staticGenerate, tracer, routerContext, htmlTemplate, entryName, loadableStats, routeManifest, ssrConfig, chunkSet, prefetchData, e, collectors, rootElement, html;
+          var _runtimeContext_ssrContext, resource, runtimeContext, config, onError, onTiming, tracer, routerContext, htmlTemplate, entryName, loadableStats, routeManifest, ssrConfig, chunkSet, prefetchData, e, collectors, rootElement, html;
           return _ts_generator(this, function(_state2) {
             switch (_state2.label) {
               case 0:
-                resource = options.resource, runtimeContext = options.runtimeContext, config = options.config, onError = options.onError, onTiming = options.onTiming, staticGenerate = options.staticGenerate;
+                resource = options.resource, runtimeContext = options.runtimeContext, config = options.config, onError = options.onError, onTiming = options.onTiming;
                 tracer = {
                   onError: createOnError(onError),
                   onTiming: createOnTiming(onTiming)
                 };
                 routerContext = runtimeContext.routerContext;
                 htmlTemplate = resource.htmlTemplate, entryName = resource.entryName, loadableStats = resource.loadableStats, routeManifest = resource.routeManifest;
-                ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries, staticGenerate);
+                ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
                 chunkSet = {
                   renderLevel: RenderLevel.CLIENT_RENDER,
                   ssrScripts: "",
@@ -66,6 +66,7 @@ var renderString = function() {
               case 3:
                 e = _state2.sent();
                 chunkSet.renderLevel = RenderLevel.CLIENT_RENDER;
+                tracer.onError(SSRErrors.PRERENDER, e);
                 return [
                   3,
                   4

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

@@ -58,14 +58,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/esm/router/cli/code/index.js

@@ -1,7 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, filterRoutesForServer, filterRoutesLoader } from "@modern-js/utils";
+import { cloneDeep } from "@modern-js/utils/lodash";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
 import * as templates from "./templates";
@@ -16,7 +17,7 @@ var generateCode = function() {
     }
     function _generateEntryCode() {
       _generateEntryCode = _async_to_generator(function(entrypoint) {
-        var entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry, metaName, _config_output, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile;
+        var entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry, metaName, _config_output, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, _$config, ssrByRouteIds, clonedRoutes, markedRoutes, routes, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, _config_output1, routesServerFile, filtedRoutesForServer, routesForServerLoaderMatches, code1, serverRoutesCode, serverLoaderCombined, serverLoaderFile;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -25,12 +26,12 @@ var generateCode = function() {
               if (!isAutoMount)
                 return [
                   3,
-                  11
+                  14
                 ];
               if (!(pageRoutesEntry || nestedRoutesEntry))
                 return [
                   3,
-                  11
+                  14
                 ];
               initialRoutes = [];
               nestedRoutes = null;
@@ -86,16 +87,19 @@ var generateCode = function() {
               }
               _state.label = 2;
             case 2:
+              _$config = api.useResolvedConfigContext();
+              ssrByRouteIds = _$config.server.ssrByRouteIds || [];
+              clonedRoutes = cloneDeep(initialRoutes);
+              markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
               return [
                 4,
                 hookRunners.modifyFileSystemRoutes({
                   entrypoint,
-                  routes: initialRoutes
+                  routes: markedRoutes
                 })
               ];
             case 3:
               routes = _state.sent().routes;
-              _$config = api.useResolvedConfigContext();
               ssr = getEntryOptions(entryName, isMainEntry, _$config.server.ssr, _$config.server.ssrByEntries, packageName);
               useSSG = isSSGEntry(_$config, entryName, entrypoints);
               if (ssr) {
@@ -138,11 +142,13 @@ var generateCode = function() {
               if (!(entrypoint.nestedRoutesEntry && isUseSSRBundle(_$config)))
                 return [
                   3,
-                  8
+                  10
                 ];
               routesServerFile = getServerLoadersFile(internalDirectory, entryName);
+              filtedRoutesForServer = filterRoutesForServer(routes);
+              routesForServerLoaderMatches = filterRoutesLoader(routes);
               code1 = templates.routesForServer({
-                routes
+                routesForServerLoaderMatches
               });
               return [
                 4,
@@ -156,26 +162,51 @@ var generateCode = function() {
               ];
             case 7:
               _state.sent();
-              _state.label = 8;
+              return [
+                4,
+                templates.fileSystemRoutes({
+                  metaName,
+                  routes: filtedRoutesForServer,
+                  ssrMode: useSSG ? "string" : mode,
+                  nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+                  entryName: entrypoint.entryName,
+                  internalDirectory,
+                  splitRouteChunks: _$config === null || _$config === void 0 ? void 0 : (_config_output1 = _$config.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks
+                })
+              ];
             case 8:
+              serverRoutesCode = _state.sent();
+              return [
+                4,
+                fs.outputFile(path.resolve(internalDirectory, "./".concat(entryName, "/routes.server.js")), serverRoutesCode, "utf8")
+              ];
+            case 9:
+              _state.sent();
+              _state.label = 10;
+            case 10:
               serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, _$config, appContext);
               if (!serverLoaderCombined)
                 return [
                   3,
-                  10
+                  12
                 ];
               serverLoaderFile = getServerCombinedModueFile(internalDirectory, entryName);
               return [
                 4,
                 fs.outputFile(serverLoaderFile, serverLoaderCombined)
               ];
-            case 9:
-              _state.sent();
-              _state.label = 10;
-            case 10:
-              fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code, "utf8");
-              _state.label = 11;
             case 11:
+              _state.sent();
+              _state.label = 12;
+            case 12:
+              return [
+                4,
+                fs.outputFile(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code, "utf8")
+              ];
+            case 13:
+              _state.sent();
+              _state.label = 14;
+            case 14:
               return [
                 2
               ];
@@ -208,6 +239,25 @@ var generateCode = function() {
     return _ref.apply(this, arguments);
   };
 }();
+function markRoutes(routes, routeIds) {
+  return routes.map(function(route) {
+    if (route.type !== "nested") {
+      return route;
+    }
+    if (route.children && route.children.length > 0) {
+      route.children = markRoutes(route.children, routeIds);
+    }
+    if (route.children && route.children.length > 0) {
+      route.inValidSSRRoute = route.children.every(function(child) {
+        var _child_inValidSSRRoute;
+        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
+      });
+    } else if (route.id) {
+      route.inValidSSRRoute = !routeIds.includes(route.id);
+    }
+    return route;
+  });
+}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME)), code, "utf8");
 }

package/dist/esm/router/cli/code/templates.js

@@ -9,7 +9,7 @@ import { ROUTE_MODULES } from "@modern-js/utils/universal/constants";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, TEMP_LOADERS_DIR } from "../constants";
 import { getPathWithoutExt, getServerLoadersFile, parseModule, replaceWithAlias } from "./utils";
 var routesForServer = function(param) {
-  var routes = param.routes;
+  var routesForServerLoaderMatches = param.routesForServerLoaderMatches;
   var loaders = [];
   var actions = [];
   var loadersMap = {};
@@ -51,7 +51,7 @@ var routesForServer = function(param) {
   var routesCode = "\n  export const routes = [\n  ";
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
   try {
-    for (var _iterator = routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+    for (var _iterator = routesForServerLoaderMatches[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var route = _step.value;
       if ("type" in route) {
         var keywords = [
@@ -136,13 +136,14 @@ var fileSystemRoutes = function() {
           importLazyCode = '\n    import { lazy } from "react";\n    import loadable, { lazy as loadableLazy } from "@'.concat(metaName, '/runtime/loadable"\n  ');
           rootLayoutCode = "";
           getDataLoaderPath = function(param2) {
-            var loaderId = param2.loaderId, clientData = param2.clientData, action = param2.action, inline = param2.inline, routeId = param2.routeId;
+            var loaderId = param2.loaderId, clientData = param2.clientData, action = param2.action, inline = param2.inline, routeId = param2.routeId, inValidSSRRoute = param2.inValidSSRRoute;
             if (!ssrMode) {
               return "";
             }
             var clientDataStr = clientData ? "&clientData=".concat(clientData) : "";
+            var retain = inValidSSRRoute !== null && inValidSSRRoute !== void 0 ? inValidSSRRoute : false;
             if (nestedRoutesEntry) {
-              return "?loaderId=".concat(loaderId).concat(clientDataStr, "&action=").concat(action ? slash(action) : action, "&inline=").concat(inline, "&routeId=").concat(routeId);
+              return "?loaderId=".concat(loaderId).concat(clientDataStr, "&action=").concat(action ? slash(action) : action, "&inline=").concat(inline, "&routeId=").concat(routeId, "&retain=").concat(retain);
             }
             return "";
           };
@@ -176,6 +177,7 @@ var fileSystemRoutes = function() {
                 loadersMap[loader] = {
                   loaderId,
                   routeId: route2.id,
+                  inValidSSRRoute: route2.inValidSSRRoute,
                   filePath: route2.data || route2.loader,
                   clientData: Boolean(route2.clientData),
                   route: route2,
@@ -316,7 +318,8 @@ var fileSystemRoutes = function() {
                     clientData: loaderInfo.clientData,
                     action: route1.action,
                     inline: loaderInfo.inline,
-                    routeId: loaderInfo.routeId
+                    routeId: loaderInfo.routeId,
+                    inValidSSRRoute: loaderInfo.inValidSSRRoute
                   }), '";\n');
                 } else {
                   importLoadersCode += "import { loader as ".concat(key, ' } from "').concat(slash(loaderInfo.filePath)).concat(getDataLoaderPath({
@@ -324,7 +327,8 @@ var fileSystemRoutes = function() {
                     clientData: loaderInfo.clientData,
                     action: false,
                     inline: loaderInfo.inline,
-                    routeId: route1.id
+                    routeId: route1.id,
+                    inValidSSRRoute: loaderInfo.inValidSSRRoute
                   }), '";\n');
                 }
               } else {
@@ -333,7 +337,8 @@ var fileSystemRoutes = function() {
                   clientData: loaderInfo.clientData,
                   action: false,
                   inline: loaderInfo.inline,
-                  routeId: loaderInfo.routeId
+                  routeId: loaderInfo.routeId,
+                  inValidSSRRoute: loaderInfo.inValidSSRRoute
                 }), '";\n');
               }
             }
@@ -496,7 +501,7 @@ var runtimeGlobalContext = function() {
           }
           return [
             2,
-            "".concat(imports.join("\n"), "\n\nimport { routes } from './routes.js';\n\nsetGlobalContext({\n  layoutApp,\n  routes,\n  appInit,\n  appConfig,\n});")
+            "".concat(imports.join("\n"), "\n\nimport { routes } from './routes';\n\nsetGlobalContext({\n  layoutApp,\n  routes,\n  appInit,\n  appConfig,\n});")
           ];
       }
     });

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

@@ -2,7 +2,8 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import path from "node:path";
+import { createRuntimeExportsUtils, filterRoutesForServer, fs, getEntryOptions, isRouterV5 as isV5, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";
@@ -14,6 +15,8 @@ var routerPlugin = function() {
       "@modern-js/runtime"
     ],
     setup: function(api) {
+      var nestedRoutes = {};
+      var nestedRoutesForServer = {};
       return {
         _internalRuntimePlugins: function _internalRuntimePlugins(param) {
           var entrypoint = param.entrypoint, plugins = param.plugins;
@@ -45,10 +48,10 @@ var routerPlugin = function() {
           };
         },
         checkEntryPoint: function checkEntryPoint(param) {
-          var path = param.path, entry = param.entry;
+          var path2 = param.path, entry = param.entry;
           return {
-            path,
-            entry: entry || isRouteEntry(path)
+            path: path2,
+            entry: entry || isRouteEntry(path2)
           };
         },
         config: function config() {
@@ -132,6 +135,47 @@ var routerPlugin = function() {
               }
             });
           })();
+        },
+        modifyFileSystemRoutes: function modifyFileSystemRoutes(param) {
+          var entrypoint = param.entrypoint, routes = param.routes;
+          return _async_to_generator(function() {
+            return _ts_generator(this, function(_state) {
+              nestedRoutes[entrypoint.entryName] = routes;
+              nestedRoutesForServer[entrypoint.entryName] = filterRoutesForServer(routes);
+              return [
+                2,
+                {
+                  entrypoint,
+                  routes
+                }
+              ];
+            });
+          })();
+        },
+        beforeGenerateRoutes: function beforeGenerateRoutes(param) {
+          var entrypoint = param.entrypoint, code = param.code;
+          return _async_to_generator(function() {
+            var distDirectory;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  distDirectory = api.useAppContext().distDirectory;
+                  return [
+                    4,
+                    fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutesForServer)
+                  ];
+                case 1:
+                  _state.sent();
+                  return [
+                    2,
+                    {
+                      entrypoint,
+                      code
+                    }
+                  ];
+              }
+            });
+          })();
         }
       };
     }

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

@@ -5,6 +5,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useMemo } from "react";
 import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation, useHref } from "@modern-js/runtime-utils/router";
 import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
+import { merge } from "@modern-js/runtime-utils/merge";
 import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
 import { RuntimeReactContext } from "../../core";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
@@ -22,28 +23,18 @@ function modifyRoutes(modifyFunction) {
     console.error("It is not allowed to modify routes config after create router.");
   }
 }
-var routerPlugin = function(param) {
-  var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
-  var select = function(pathname) {
-    return serverBase.find(function(baseUrl) {
-      return pathname.search(baseUrl) === 0;
-    }) || "/";
-  };
-  var routes = [];
-  finalRouteConfig = _object_spread({
-    routes: getGlobalRoutes(),
-    globalApp: getGlobalLayoutApp()
-  }, routesConfig);
-  window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
+var routerPlugin = function() {
+  var userConfig = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
       modifyRoutes: modifyRoutesHook
     },
     setup: function(api) {
+      var routes = [];
+      window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
       return {
-        init: function init(param2, next) {
-          var context = param2.context;
+        beforeRender: function beforeRender(context) {
           context.router = {
             useMatches,
             useLocation,
@@ -54,25 +45,29 @@ var routerPlugin = function(param) {
               return routes;
             }
           });
-          return next({
-            context
-          });
         },
-        hoc: function(param2, next) {
-          var App = param2.App, config = param2.config;
+        wrapRoot: function(App) {
+          var pluginConfig = api.useRuntimeConfigContext();
+          var _merge = merge(pluginConfig.router || {}, userConfig), _merge_serverBase = _merge.serverBase, serverBase = _merge_serverBase === void 0 ? [] : _merge_serverBase, _merge_supportHtml5History = _merge.supportHtml5History, supportHtml5History = _merge_supportHtml5History === void 0 ? true : _merge_supportHtml5History, _merge_basename = _merge.basename, basename = _merge_basename === void 0 ? "" : _merge_basename, routesConfig = _merge.routesConfig, createRoutes = _merge.createRoutes;
+          var select = function(pathname) {
+            return serverBase.find(function(baseUrl) {
+              return pathname.search(baseUrl) === 0;
+            }) || "/";
+          };
+          finalRouteConfig = _object_spread({
+            routes: getGlobalRoutes(),
+            globalApp: getGlobalLayoutApp()
+          }, routesConfig);
           if (!finalRouteConfig.routes && !createRoutes) {
-            return next({
-              App,
-              config
-            });
+            return App;
           }
           var getRouteApp = function() {
             var useCreateRouter = function(props) {
-              var _config_router, _window__SERVER_DATA;
-              var 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;
+              var runtimeContext = useContext(RuntimeReactContext);
+              var 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(/^\/*/, "/");
               var _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
               var hydrationData = window._ROUTER_DATA;
-              var runtimeContext = useContext(RuntimeReactContext);
               var getBlockNavState = runtimeContext.unstable_getBlockNavState;
               return useMemo(function() {
                 if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
@@ -111,7 +106,8 @@ var routerPlugin = function(param) {
                   get: function get() {
                     return router;
                   },
-                  configurable: true
+                  configurable: true,
+                  enumerable: true
                 });
                 return router;
               }, [
@@ -130,32 +126,21 @@ var routerPlugin = function(param) {
               });
             };
           };
-          var RouteApp = getRouteApp();
-          return next({
-            App: RouteApp,
-            config
-          });
+          return getRouteApp();
         },
-        pickContext: function(param2, next) {
-          var context = param2.context, pickedContext = param2.pickedContext;
-          var remixRouter = context.remixRouter;
+        pickContext: function(pickedContext) {
+          var remixRouter = pickedContext.remixRouter;
           if (!remixRouter) {
-            return next({
-              context,
-              pickedContext
-            });
+            return pickedContext;
           }
-          var router = {
+          var router = _object_spread_props(_object_spread({}, pickedContext.router), {
             navigate: remixRouter.navigate,
             get location() {
               return remixRouter.state.location;
             }
-          };
-          return next({
-            context,
-            pickedContext: _object_spread_props(_object_spread({}, pickedContext), {
-              router
-            })
+          });
+          return _object_spread_props(_object_spread({}, pickedContext), {
+            router
           });
         }
       };