@modern-js/runtime 2.54.5 → 2.55.0

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

@@ -0,0 +1,34 @@
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+var SSRTimings;
+(function(SSRTimings2) {
+  SSRTimings2["PRERENDER"] = "ssr-prerender";
+  SSRTimings2["RENDER_HTML"] = "ssr-render-html";
+  SSRTimings2["RENDER_SHELL"] = "ssr-render-shell";
+  SSRTimings2["USE_LOADER"] = "use-loader";
+})(SSRTimings || (SSRTimings = {}));
+var SSRErrors;
+(function(SSRErrors2) {
+  SSRErrors2["PRERENDER"] = "App Prerender";
+  SSRErrors2["USE_LOADER"] = "App run useLoader";
+  SSRErrors2["RENDER_HTML"] = "App Render To HTML";
+  SSRErrors2["RENDER_STREAM"] = "An error occurs during streaming SSR";
+  SSRErrors2["RENDER_SHELL"] = "An error occurs during streaming render shell";
+})(SSRErrors || (SSRErrors = {}));
+function createOnError(onError) {
+  return function(key, e) {
+    var error = _instanceof(e, Error) ? e : new Error("Unexpected Server Error");
+    error.name = key;
+    onError === null || onError === void 0 ? void 0 : onError(e);
+  };
+}
+function createOnTiming(onTiming) {
+  return function(key, cost) {
+    onTiming === null || onTiming === void 0 ? void 0 : onTiming(key, cost);
+  };
+}
+export {
+  SSRErrors,
+  SSRTimings,
+  createOnError,
+  createOnTiming
+};

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

@@ -0,0 +1,83 @@
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { isRouteErrorResponse } from "@modern-js/runtime-utils/remix-router";
+function attributesToString(attributes) {
+  return Object.entries(attributes).reduce(function(str, param) {
+    var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+    return value === void 0 ? str : "".concat(str, " ").concat(key, '="').concat(value, '"');
+  }, "");
+}
+function safeReplace(source, searchValue, replaceValue) {
+  return source.replace(searchValue, function() {
+    return replaceValue;
+  });
+}
+function checkIsNode() {
+  var _process_release;
+  return typeof process !== "undefined" && ((_process_release = process.release) === null || _process_release === void 0 ? void 0 : _process_release.name) === "node";
+}
+function serializeErrors(errors) {
+  if (!errors) {
+    return null;
+  }
+  var entries = Object.entries(errors);
+  var serialized = {};
+  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    for (var _iterator = entries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], val = _step_value[1];
+      if (isRouteErrorResponse(val)) {
+        serialized[key] = _object_spread_props(_object_spread({}, val), {
+          __type: "RouteErrorResponse"
+        });
+      } else if (_instanceof(val, Error)) {
+        serialized[key] = {
+          message: val.message,
+          stack: val.stack,
+          __type: "Error"
+        };
+      } else {
+        serialized[key] = val;
+      }
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+  return serialized;
+}
+function getSSRConfigByEntry(entryName, ssr, ssrByEntries, staticGenerate) {
+  if (staticGenerate) {
+    return true;
+  }
+  if (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[entryName]) {
+    return ssrByEntries[entryName];
+  }
+  return ssr;
+}
+function getSSRMode(ssrConfig) {
+  if (typeof ssrConfig === "boolean") {
+    return ssrConfig ? "string" : false;
+  }
+  return (ssrConfig === null || ssrConfig === void 0 ? void 0 : ssrConfig.mode) === "stream" ? "stream" : "string";
+}
+export {
+  attributesToString,
+  checkIsNode,
+  getSSRConfigByEntry,
+  getSSRMode,
+  safeReplace,
+  serializeErrors
+};

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

@@ -3,23 +3,25 @@ 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 { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
+import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
 import { getServerLoadersFile, getServerCombinedModueFile } from "./utils";
 import { walk } from "./nestedRoutes";
 var generateCode = function() {
   var _ref = _async_to_generator(function(appContext, config, entrypoints, api) {
-    var internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, importsStatemets, oldVersion;
+    var internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, oldVersion;
     function generateEntryCode(entrypoint) {
       return _generateEntryCode.apply(this, arguments);
     }
     function _generateEntryCode() {
       _generateEntryCode = _async_to_generator(function(entrypoint) {
-        var entryName, isMainEntry, isAutoMount, fileSystemRoutes, _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, fileSystemRoutes, metaName, _config_output, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
               entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry, isAutoMount = entrypoint.isAutoMount, fileSystemRoutes = entrypoint.fileSystemRoutes;
+              metaName = api.useAppContext().metaName;
               if (!isAutoMount)
                 return [
                   3,
@@ -115,6 +117,7 @@ var generateCode = function() {
               return [
                 4,
                 templates.fileSystemRoutes({
+                  metaName,
                   routes,
                   ssrMode: useSSG ? "string" : mode,
                   nestedRoutesEntry: entrypoint.nestedRoutesEntry,
@@ -188,7 +191,6 @@ var generateCode = function() {
           hookRunners = api.useHookRunners();
           isV5 = isRouterV5(config);
           getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
-          importsStatemets = /* @__PURE__ */ new Map();
           oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
           return [
             4,
@@ -197,10 +199,7 @@ var generateCode = function() {
         case 1:
           _state.sent();
           return [
-            2,
-            {
-              importsStatemets
-            }
+            2
           ];
       }
     });
@@ -209,6 +208,10 @@ var generateCode = function() {
     return _ref.apply(this, arguments);
   };
 }();
+function generatorRegisterCode(internalDirectory, entryName, code) {
+  fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME)), code, "utf8");
+}
 export {
-  generateCode
+  generateCode,
+  generatorRegisterCode
 };

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

@@ -4,10 +4,10 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, getEntryOptions, isSSGEntry, slash } from "@modern-js/utils";
+import { findExists, formatImportPath, fs, getEntryOptions, isSSGEntry, slash } from "@modern-js/utils";
 import { ROUTE_MODULES } from "@modern-js/utils/universal/constants";
-import { TEMP_LOADERS_DIR } from "../constants";
-import { getServerLoadersFile } from "./utils";
+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 loaders = [];
@@ -120,11 +120,11 @@ var createMatchReg = function(keyword) {
 };
 var fileSystemRoutes = function() {
   var _ref = _async_to_generator(function(param) {
-    var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, _param_splitRouteChunks, splitRouteChunks, components, loadings, errors, loaders, loadersMap, configs, configsMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, routeStr, keywords, regs, newRouteStr, component, finalRoute, keywords1, routeStr1, regs1, newRouteStr1, importLoadingCode, importComponentsCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo, route1, importConfigsCode, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, _step_value1, key1, configPath, importRuntimeRouterCode, routeModulesCode;
+    var metaName, routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, _param_splitRouteChunks, splitRouteChunks, components, loadings, errors, loaders, loadersMap, configs, configsMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, routeStr, keywords, regs, newRouteStr, component, finalRoute, keywords1, routeStr1, regs1, newRouteStr1, importLoadingCode, importComponentsCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo, route1, importConfigsCode, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, _step_value1, key1, configPath, importRuntimeRouterCode, routeModulesCode;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory, _param_splitRouteChunks = param.splitRouteChunks, splitRouteChunks = _param_splitRouteChunks === void 0 ? true : _param_splitRouteChunks;
+          metaName = param.metaName, routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory, _param_splitRouteChunks = param.splitRouteChunks, splitRouteChunks = _param_splitRouteChunks === void 0 ? true : _param_splitRouteChunks;
           components = [];
           loadings = [];
           errors = [];
@@ -133,7 +133,7 @@ var fileSystemRoutes = function() {
           configs = [];
           configsMap = {};
           loadersMapFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "map.json");
-          importLazyCode = '\n    import { lazy } from "react";\n    import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"\n  ';
+          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;
@@ -384,7 +384,7 @@ var fileSystemRoutes = function() {
           ];
         case 2:
           _state.sent();
-          importRuntimeRouterCode = "\n    import { createShouldRevalidate, handleRouteModule,  handleRouteModuleError} from '@modern-js/runtime/router';\n  ";
+          importRuntimeRouterCode = "\n    import { createShouldRevalidate, handleRouteModule,  handleRouteModuleError} from '@".concat(metaName, "/runtime/router';\n  ");
           routeModulesCode = "\n    if(typeof document !== 'undefined'){\n      window.".concat(ROUTE_MODULES, " = {}\n    }\n  ");
           return [
             2,
@@ -410,8 +410,101 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
   }
   return null;
 }
+var runtimeGlobalContext = function() {
+  var _ref = _async_to_generator(function(param) {
+    var metaName, srcDirectory, nestedRoutesEntry, internalSrcAlias, globalApp, imports, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, _ref2, moduleExports, hasAppConfig, hasAppInit, layoutPath;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          metaName = param.metaName, srcDirectory = param.srcDirectory, nestedRoutesEntry = param.nestedRoutesEntry, internalSrcAlias = param.internalSrcAlias, globalApp = param.globalApp;
+          imports = [
+            "import { setGlobalContext } from '@".concat(metaName, "/runtime/context';")
+          ];
+          if (!nestedRoutesEntry)
+            return [
+              3,
+              4
+            ];
+          rootLayoutPath = path.join(nestedRoutesEntry, "layout");
+          rootLayoutFile = findExists([
+            ".js",
+            ".ts",
+            ".jsx",
+            ".tsx"
+          ].map(function(ext) {
+            return "".concat(rootLayoutPath).concat(ext);
+          }));
+          if (!rootLayoutFile)
+            return [
+              3,
+              3
+            ];
+          return [
+            4,
+            fs.readFile(rootLayoutFile)
+          ];
+        case 1:
+          rootLayoutBuffer = _state.sent();
+          rootLayout = rootLayoutBuffer.toString();
+          return [
+            4,
+            parseModule({
+              source: rootLayout.toString(),
+              filename: rootLayoutFile
+            })
+          ];
+        case 2:
+          _ref2 = _sliced_to_array.apply(void 0, [
+            _state.sent(),
+            2
+          ]), moduleExports = _ref2[1];
+          hasAppConfig = moduleExports.some(function(e) {
+            return e.n === APP_CONFIG_NAME;
+          });
+          hasAppInit = moduleExports.some(function(e) {
+            return e.n === APP_INIT_EXPORTED;
+          });
+          layoutPath = formatImportPath(getPathWithoutExt(replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias)));
+          if (hasAppConfig) {
+            imports.push("import { config as appConfig } from '".concat(layoutPath, "';"));
+          } else {
+            imports.push("let appConfig;");
+          }
+          if (hasAppInit) {
+            imports.push("import { init as appInit } from '".concat(layoutPath, "';"));
+          } else {
+            imports.push("let appInit;");
+          }
+          _state.label = 3;
+        case 3:
+          return [
+            3,
+            5
+          ];
+        case 4:
+          imports.push("let appConfig;");
+          imports.push("let appInit;");
+          _state.label = 5;
+        case 5:
+          if (globalApp) {
+            imports.push("import layoutApp from '".concat(formatImportPath(globalApp.replace(srcDirectory, internalSrcAlias)), "';"));
+          } else {
+            imports.push("let layoutApp;");
+          }
+          return [
+            2,
+            "".concat(imports.join("\n"), "\n\nimport { routes } from './routes.js';\n\nsetGlobalContext({\n  layoutApp,\n  routes,\n  appInit,\n  appConfig,\n});")
+          ];
+      }
+    });
+  });
+  return function runtimeGlobalContext2(_) {
+    return _ref.apply(this, arguments);
+  };
+}();
 export {
   fileSystemRoutes,
   routesForServer,
+  runtimeGlobalContext,
   ssrLoaderCombinedModule
 };

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

@@ -10,6 +10,8 @@ var FILE_SYSTEM_ROUTES_INDEX = "index";
 var FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
 var FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
 var FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
+var APP_CONFIG_NAME = "config";
+var APP_INIT_EXPORTED = "init";
 var NESTED_ROUTE = {
   LAYOUT_FILE: "layout",
   LAYOUT_CONFIG_FILE: "layout.config",
@@ -32,6 +34,8 @@ var NESTED_ROUTE = {
 };
 export {
   ACTION_EXPORT_NAME,
+  APP_CONFIG_NAME,
+  APP_INIT_EXPORTED,
   FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
   FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
   FILE_SYSTEM_ROUTES_FILE_NAME,

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

@@ -41,12 +41,10 @@ var modifyEntrypoints = function(entrypoints) {
         }))
       };
       if (isHasPages) {
-        entrypoint.entry = path.join(entrypoint.absoluteEntryDir, PAGES_DIR_NAME);
-        entrypoint.pageRoutesEntry = entrypoint.entry;
+        entrypoint.pageRoutesEntry = path.join(entrypoint.absoluteEntryDir, PAGES_DIR_NAME);
       }
       if (isHasNestedRoutes) {
-        entrypoint.entry = path.join(entrypoint.absoluteEntryDir, NESTED_ROUTES_DIR);
-        entrypoint.nestedRoutesEntry = entrypoint.entry;
+        entrypoint.nestedRoutesEntry = path.join(entrypoint.absoluteEntryDir, NESTED_ROUTES_DIR);
       }
     } else {
       throw Error("Custom entries with conventional routing not support use react router v5!");

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

@@ -4,42 +4,103 @@ import path from "path";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { modifyEntrypoints } from "./entry";
 import { isPageComponentFile } from "./code/utils";
+import * as templates from "./code/templates";
 var originEntrypoints = [];
 function handleModifyEntrypoints(api, entrypoints) {
   return _handleModifyEntrypoints.apply(this, arguments);
 }
 function _handleModifyEntrypoints() {
   _handleModifyEntrypoints = _async_to_generator(function(api, entrypoints) {
-    var config, newEntryPoints, appContext, resolvedConfig, generateCode;
+    var config;
+    return _ts_generator(this, function(_state) {
+      config = api.useResolvedConfigContext();
+      return [
+        2,
+        modifyEntrypoints(entrypoints, config)
+      ];
+    });
+  });
+  return _handleModifyEntrypoints.apply(this, arguments);
+}
+function handleGeneratorEntryCode(api, entrypoints) {
+  return _handleGeneratorEntryCode.apply(this, arguments);
+}
+function _handleGeneratorEntryCode() {
+  _handleGeneratorEntryCode = _async_to_generator(function(api, entrypoints) {
+    var appContext, internalDirectory, resolvedConfig, _ref, generatorRegisterCode, generateCode;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          config = api.useResolvedConfigContext();
-          newEntryPoints = modifyEntrypoints(entrypoints, config);
           appContext = api.useAppContext();
+          internalDirectory = api.useAppContext().internalDirectory;
           resolvedConfig = api.useResolvedConfigContext();
-          appContext.entrypoints = newEntryPoints;
-          originEntrypoints = cloneDeep(newEntryPoints);
           return [
             4,
             import("./code")
           ];
         case 1:
-          generateCode = _state.sent().generateCode;
+          _ref = _state.sent(), generatorRegisterCode = _ref.generatorRegisterCode, generateCode = _ref.generateCode;
+          originEntrypoints = cloneDeep(entrypoints);
           return [
             4,
             generateCode(appContext, resolvedConfig, entrypoints, api)
           ];
         case 2:
+          _state.sent();
+          return [
+            4,
+            Promise.all(entrypoints.map(function() {
+              var _ref2 = _async_to_generator(function(entrypoint) {
+                var _entrypoint_fileSystemRoutes, _tmp;
+                return _ts_generator(this, function(_state2) {
+                  switch (_state2.label) {
+                    case 0:
+                      if (!(entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry))
+                        return [
+                          3,
+                          2
+                        ];
+                      _tmp = [
+                        internalDirectory,
+                        entrypoint.entryName
+                      ];
+                      return [
+                        4,
+                        templates.runtimeGlobalContext({
+                          metaName: appContext.metaName,
+                          srcDirectory: appContext.srcDirectory,
+                          nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+                          internalSrcAlias: appContext.internalSrcAlias,
+                          globalApp: (_entrypoint_fileSystemRoutes = entrypoint.fileSystemRoutes) === null || _entrypoint_fileSystemRoutes === void 0 ? void 0 : _entrypoint_fileSystemRoutes.globalApp
+                        })
+                      ];
+                    case 1:
+                      generatorRegisterCode.apply(void 0, _tmp.concat([
+                        _state2.sent()
+                      ]));
+                      _state2.label = 2;
+                    case 2:
+                      return [
+                        2
+                      ];
+                  }
+                });
+              });
+              return function(entrypoint) {
+                return _ref2.apply(this, arguments);
+              };
+            }()))
+          ];
+        case 3:
           _state.sent();
           return [
             2,
-            newEntryPoints
+            entrypoints
           ];
       }
     });
   });
-  return _handleModifyEntrypoints.apply(this, arguments);
+  return _handleGeneratorEntryCode.apply(this, arguments);
 }
 function handleFileChange(api, e) {
   return _handleFileChange.apply(this, arguments);
@@ -99,5 +160,6 @@ function _handleFileChange() {
 }
 export {
   handleFileChange,
+  handleGeneratorEntryCode,
   handleModifyEntrypoints
 };

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

@@ -2,13 +2,11 @@ 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 { getEntryOptions, createRuntimeExportsUtils, isRouterV5 as isV5 } from "@modern-js/utils";
+import { createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
 import { isRouteEntry } from "./entry";
-import { handleFileChange, handleModifyEntrypoints } from "./handler";
+import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";
 import { handleFileChange as handleFileChange2, handleModifyEntrypoints as handleModifyEntrypoints2 } from "./handler";
-var PLUGIN_IDENTIFIER = "router";
-var ROUTES_IDENTIFIER = "routes";
 var routerPlugin = function() {
   return {
     name: "@modern-js/plugin-router",
@@ -16,9 +14,36 @@ var routerPlugin = function() {
       "@modern-js/runtime"
     ],
     setup: function(api) {
-      var runtimeConfigMap = /* @__PURE__ */ new Map();
-      var pluginsExportsUtils;
       return {
+        _internalRuntimePlugins: function _internalRuntimePlugins(param) {
+          var entrypoint = param.entrypoint, plugins = param.plugins;
+          var _getEntryOptions;
+          var _api_useAppContext = api.useAppContext(), packageName = _api_useAppContext.packageName, serverRoutes = _api_useAppContext.serverRoutes, metaName = _api_useAppContext.metaName;
+          var serverBase = serverRoutes.filter(function(route) {
+            return route.entryName === entrypoint.entryName;
+          }).map(function(route) {
+            return route.urlPath;
+          }).sort(function(a, b) {
+            return a.length - b.length > 0 ? -1 : 1;
+          });
+          var userConfig = api.useResolvedConfigContext();
+          var routerConfig = (_getEntryOptions = getEntryOptions(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
+          if (routerConfig && !isV5(userConfig)) {
+            plugins.push({
+              name: "router",
+              path: "@".concat(metaName, "/runtime/router"),
+              config: typeof routerConfig === "boolean" ? {
+                serverBase
+              } : _object_spread_props(_object_spread({}, routerConfig), {
+                serverBase
+              })
+            });
+          }
+          return {
+            entrypoint,
+            plugins
+          };
+        },
         checkEntryPoint: function checkEntryPoint(param) {
           var path = param.path, entry = param.entry;
           return {
@@ -27,8 +52,6 @@ var routerPlugin = function() {
           };
         },
         config: function config() {
-          var appContext = api.useAppContext();
-          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
           return {
             source: {
               include: [
@@ -38,10 +61,7 @@ var routerPlugin = function() {
                 /node_modules\/react-router/,
                 /node_modules\/react-router-dom/,
                 /node_modules\/@remix-run\/router/
-              ],
-              alias: {
-                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
-              }
+              ]
             }
           };
         },
@@ -68,64 +88,31 @@ var routerPlugin = function() {
             });
           })();
         },
-        modifyEntryImports: function modifyEntryImports(param) {
-          var entrypoint = param.entrypoint, imports = param.imports;
-          var entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry, fileSystemRoutes = entrypoint.fileSystemRoutes;
-          var userConfig = api.useResolvedConfigContext();
-          var packageName = api.useAppContext().packageName;
-          var runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-          runtimeConfigMap.set(entryName, runtimeConfig);
-          if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
-            if (!isV5(userConfig)) {
-              imports.push({
-                value: "@modern-js/runtime/plugins",
-                specifiers: [
-                  {
-                    imported: PLUGIN_IDENTIFIER
-                  }
-                ]
-              });
-            }
-          } else if (fileSystemRoutes) {
-            throw new Error("should enable runtime.router for entry ".concat(entryName));
-          }
-          return {
-            entrypoint,
-            imports
-          };
-        },
-        modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
-          var entrypoint = param.entrypoint, plugins = param.plugins;
-          var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
-          var serverRoutes = api.useAppContext().serverRoutes;
-          var userConfig = api.useResolvedConfigContext();
-          var runtimeConfig = runtimeConfigMap.get(entryName);
-          if (runtimeConfig.router && !isV5(userConfig)) {
-            var serverBase = serverRoutes.filter(function(route) {
-              return route.entryName === entryName;
-            }).map(function(route) {
-              return route.urlPath;
-            }).sort(function(a, b) {
-              return a.length - b.length > 0 ? -1 : 1;
-            });
-            plugins.push({
-              name: PLUGIN_IDENTIFIER,
-              options: JSON.stringify(_object_spread_props(_object_spread({
-                serverBase
-              }, runtimeConfig.router), {
-                routesConfig: fileSystemRoutes ? "{ ".concat(ROUTES_IDENTIFIER, ", globalApp: App }") : void 0
-              })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
+        generateEntryCode: function generateEntryCode(param) {
+          var entrypoints = param.entrypoints;
+          return _async_to_generator(function() {
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  return [
+                    4,
+                    handleGeneratorEntryCode(api, entrypoints)
+                  ];
+                case 1:
+                  _state.sent();
+                  return [
+                    2
+                  ];
+              }
             });
-          }
-          return {
-            entrypoint,
-            plugins
-          };
+          })();
         },
         addRuntimeExports: function addRuntimeExports() {
           var userConfig = api.useResolvedConfigContext();
+          var _api_useAppContext = api.useAppContext(), internalDirectory = _api_useAppContext.internalDirectory, metaName = _api_useAppContext.metaName;
+          var pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
           if (!isV5(userConfig)) {
-            pluginsExportsUtils.addExport("export { default as router } from '@modern-js/runtime/router'");
+            pluginsExportsUtils.addExport("export { default as router } from '@".concat(metaName, "/runtime/router'"));
           }
         },
         fileChange: function fileChange(e) {

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

@@ -20,5 +20,6 @@ export {
   handleRouteModuleError,
   modifyRoutes,
   renderRoutes,
+  routerPlugin,
   useRouteLoaderData
 };