@modern-js/runtime 2.54.6 → 2.56.0

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/PrefetchLink.js

@@ -98,7 +98,7 @@ function _loadRouteModule() {
           return [
             4,
             Promise.all(chunkIds.map(function(chunkId) {
-              return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
+              return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(chunkId);
             }))
           ];
         case 2:

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

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

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

@@ -4,8 +4,8 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 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 hoistNonReactStatics from "hoist-non-react-statics";
 import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
+import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
 import { RuntimeReactContext } from "../../core";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
@@ -23,14 +23,17 @@ function modifyRoutes(modifyFunction) {
   }
 }
 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, _param_originalBaseUrl = param.originalBaseUrl, originalBaseUrl = _param_originalBaseUrl === void 0 ? "" : _param_originalBaseUrl, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
+  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 = routesConfig;
+  finalRouteConfig = _object_spread({
+    routes: getGlobalRoutes(),
+    globalApp: getGlobalLayoutApp()
+  }, routesConfig);
   window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
   return {
     name: "@modern-js/plugin-router",
@@ -57,7 +60,7 @@ var routerPlugin = function(param) {
         },
         hoc: function(param2, next) {
           var App = param2.App, config = param2.config;
-          if (!finalRouteConfig && !createRoutes) {
+          if (!finalRouteConfig.routes && !createRoutes) {
             return next({
               App,
               config
@@ -65,8 +68,8 @@ var routerPlugin = function(param) {
           }
           var getRouteApp = function() {
             var useCreateRouter = function(props) {
-              var _window__SERVER_DATA;
-              var baseUrl = originalBaseUrl || ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
+              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 _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
               var hydrationData = window._ROUTER_DATA;
               var runtimeContext = useContext(RuntimeReactContext);
@@ -122,23 +125,12 @@ var routerPlugin = function(param) {
             return function(props) {
               beforeCreateRouter = false;
               var router = useCreateRouter(props);
-              return /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
-                children: /* @__PURE__ */ _jsx(RouterProvider, {
-                  router
-                })
-              }));
+              return /* @__PURE__ */ _jsx(RouterProvider, {
+                router
+              });
             };
           };
           var RouteApp = getRouteApp();
-          if (App) {
-            RouteApp = hoistNonReactStatics(RouteApp, App);
-          }
-          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
-            return next({
-              App: hoistNonReactStatics(RouteApp, routesConfig.globalApp),
-              config
-            });
-          }
           return next({
             App: RouteApp,
             config

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

@@ -2,99 +2,52 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 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 { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useContext } from "react";
 import { createStaticHandler } from "@modern-js/runtime-utils/remix-router";
 import { createStaticRouter, StaticRouterProvider } from "@modern-js/runtime-utils/node/router";
-import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "@modern-js/runtime-utils/router";
 import { reporterCtx, createRequestContext } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { RuntimeReactContext } from "../../core";
+import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
 import { renderRoutes, urlJoin } from "./utils";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import DeferredDataScripts from "./DeferredDataScripts.node";
-function createFetchRequest(req) {
-  var origin = "".concat(req.protocol, "://").concat(req.host);
-  var url = new URL(req.originalUrl || req.url, origin);
+function createRemixReuqest(request) {
+  var method = "GET";
+  var headers = request.headers;
   var controller = new AbortController();
-  var init = {
-    method: req.method,
-    headers: createFetchHeaders(req.headers),
+  return new Request(request.url, {
+    method,
+    headers,
     signal: controller.signal
-  };
-  return new Request(url.href, init);
-}
-function createFetchHeaders(requestHeaders) {
-  var headers = new Headers();
-  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-  try {
-    for (var _iterator = Object.entries(requestHeaders || {})[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], values = _step_value[1];
-      if (values) {
-        if (Array.isArray(values)) {
-          var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
-          try {
-            for (var _iterator1 = values[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-              var value = _step1.value;
-              headers.append(key, value);
-            }
-          } catch (err) {
-            _didIteratorError1 = true;
-            _iteratorError1 = err;
-          } finally {
-            try {
-              if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-                _iterator1.return();
-              }
-            } finally {
-              if (_didIteratorError1) {
-                throw _iteratorError1;
-              }
-            }
-          }
-        } else {
-          headers.set(key, values);
-        }
-      }
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
-  }
-  return headers;
+  });
 }
 var routerPlugin = function(param) {
-  var _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, _param_originalBaseUrl = param.originalBaseUrl, originalBaseUrl = _param_originalBaseUrl === void 0 ? "" : _param_originalBaseUrl, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
+  var _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
       modifyRoutes: modifyRoutesHook
     },
     setup: function(api) {
+      var finalRouteConfig = _object_spread({
+        routes: getGlobalRoutes(),
+        globalApp: getGlobalLayoutApp()
+      }, routesConfig);
       return {
         init: function init(param2, next) {
           var context = param2.context;
           return _async_to_generator(function() {
-            var _context_ssrContext, _context_ssrContext1, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, _context_ssrContext2, reporter, serverTiming, requestContext, routes, runner, query, remixRequest, end, routerContext, cost, router;
+            var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1, _context_ssrContext2, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, reporter, requestContext, routes, runner, query, remixRequest, end, routerContext, cost, router;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
-                  if (!routesConfig && !createRoutes) {
+                  if (!finalRouteConfig.routes && !createRoutes) {
                     return [
                       2,
                       next({
@@ -102,14 +55,14 @@ var routerPlugin = function(param) {
                       })
                     ];
                   }
-                  _context_ssrContext1 = context.ssrContext, request = _context_ssrContext1.request, ssrMode = _context_ssrContext1.mode, nonce = _context_ssrContext1.nonce, _context_ssrContext_loaderFailureMode = _context_ssrContext1.loaderFailureMode, loaderFailureMode = _context_ssrContext_loaderFailureMode === void 0 ? "errorBoundary" : _context_ssrContext_loaderFailureMode;
-                  baseUrl = originalBaseUrl || request.baseUrl;
+                  _context_ssrContext2 = context.ssrContext, request = _context_ssrContext2.request, ssrMode = _context_ssrContext2.mode, nonce = _context_ssrContext2.nonce, _context_ssrContext_loaderFailureMode = _context_ssrContext2.loaderFailureMode, loaderFailureMode = _context_ssrContext_loaderFailureMode === void 0 ? "errorBoundary" : _context_ssrContext_loaderFailureMode;
+                  baseUrl = request.baseUrl;
                   _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
-                  _context_ssrContext2 = context.ssrContext, reporter = _context_ssrContext2.reporter, serverTiming = _context_ssrContext2.serverTiming;
+                  reporter = context.ssrContext.reporter;
                   requestContext = createRequestContext((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.loaderContext);
                   requestContext.set(reporterCtx, reporter);
                   routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
-                    routesConfig,
+                    routesConfig: finalRouteConfig,
                     ssrMode,
                     props: {
                       nonce
@@ -121,7 +74,7 @@ var routerPlugin = function(param) {
                   query = createStaticHandler(routes, {
                     basename: _basename
                   }).query;
-                  remixRequest = createFetchRequest(request);
+                  remixRequest = createRemixReuqest(context.ssrContext.request.raw);
                   end = time();
                   return [
                     4,
@@ -132,8 +85,7 @@ var routerPlugin = function(param) {
                 case 1:
                   routerContext = _state.sent();
                   cost = end();
-                  reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(LOADER_REPORTER_NAME, cost);
-                  serverTiming.addServeTiming(LOADER_REPORTER_NAME, cost);
+                  (_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, LOADER_REPORTER_NAME, cost);
                   if (_instanceof(routerContext, Response)) {
                     return [
                       2,
@@ -148,7 +100,6 @@ var routerPlugin = function(param) {
                   context.remixRouter = router;
                   context.routerContext = routerContext;
                   context.routes = routes;
-                  context.routeManifest = context.ssrContext.routeManifest;
                   return [
                     2,
                     next({
@@ -161,17 +112,17 @@ var routerPlugin = function(param) {
         },
         hoc: function(param2, next) {
           var App = param2.App, config = param2.config;
-          if (!routesConfig) {
+          if (!finalRouteConfig) {
             return next({
               App,
               config
             });
           }
           var getRouteApp = function() {
-            return function(props) {
+            return function() {
               var _useContext = useContext(RuntimeReactContext), remixRouter = _useContext.remixRouter, routerContext = _useContext.routerContext, ssrContext = _useContext.ssrContext;
               var nonce = ssrContext.nonce, mode = ssrContext.mode;
-              return /* @__PURE__ */ _jsxs(App, _object_spread_props(_object_spread({}, props), {
+              return /* @__PURE__ */ _jsxs(_Fragment, {
                 children: [
                   /* @__PURE__ */ _jsx(StaticRouterProvider, {
                     router: remixRouter,
@@ -184,16 +135,10 @@ var routerPlugin = function(param) {
                   }),
                   mode === "stream" && JSX_SHELL_STREAM_END_MARK
                 ]
-              }));
+              });
             };
           };
           var RouteApp = getRouteApp();
-          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
-            return next({
-              App: hoistNonReactStatics(RouteApp, routesConfig.globalApp),
-              config
-            });
-          }
           return next({
             App: RouteApp,
             config
@@ -228,7 +173,6 @@ var routerPlugin = function(param) {
 var modifyRoutes = function() {
 };
 export {
-  createFetchHeaders,
   modifyRoutes,
   routerPlugin
 };

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

@@ -1,4 +1,4 @@
-import { getEntryOptions, createRuntimeExportsUtils } from "@modern-js/utils";
+import { createRuntimeExportsUtils, getEntryOptions } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "state";
 var statePlugin = function() {
   return {
@@ -7,50 +7,19 @@ var statePlugin = function() {
       "@modern-js/runtime"
     ],
     setup: function(api) {
-      var stateConfigMap = /* @__PURE__ */ new Map();
-      var pluginsExportsUtils;
       return {
-        config: function config() {
-          var appContext = api.useAppContext();
-          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
-          return {
-            source: {
-              alias: {
-                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
-              }
-            }
-          };
-        },
-        modifyEntryImports: function modifyEntryImports(param) {
-          var entrypoint = param.entrypoint, imports = param.imports;
+        _internalRuntimePlugins: function _internalRuntimePlugins(param) {
+          var entrypoint = param.entrypoint, plugins = param.plugins;
           var _getEntryOptions;
           var entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry;
           var userConfig = api.useResolvedConfigContext();
-          var packageName = api.useAppContext().packageName;
+          var _api_useAppContext = api.useAppContext(), packageName = _api_useAppContext.packageName, metaName = _api_useAppContext.metaName;
           var stateConfig = (_getEntryOptions = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
-          stateConfigMap.set(entryName, stateConfig);
           if (stateConfig) {
-            imports.push({
-              value: "@modern-js/runtime/plugins",
-              specifiers: [
-                {
-                  imported: PLUGIN_IDENTIFIER
-                }
-              ]
-            });
-          }
-          return {
-            entrypoint,
-            imports
-          };
-        },
-        modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
-          var entrypoint = param.entrypoint, plugins = param.plugins;
-          var stateOptions = stateConfigMap.get(entrypoint.entryName);
-          if (stateOptions) {
             plugins.push({
               name: PLUGIN_IDENTIFIER,
-              options: "".concat(JSON.stringify(stateConfigMap.get(entrypoint.entryName)))
+              path: "@".concat(metaName, "/runtime/model"),
+              config: typeof stateConfig === "boolean" ? {} : stateConfig
             });
           }
           return {
@@ -59,7 +28,9 @@ var statePlugin = function() {
           };
         },
         addRuntimeExports: function addRuntimeExports() {
-          pluginsExportsUtils.addExport("export { default as state } from '@modern-js/runtime/model'");
+          var _api_useAppContext = api.useAppContext(), internalDirectory = _api_useAppContext.internalDirectory, metaName = _api_useAppContext.metaName;
+          var pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
+          pluginsExportsUtils.addExport("export { default as state } from '@".concat(metaName, "/runtime/model'"));
         }
       };
     }

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

@@ -5,7 +5,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import { createStore } from "@modern-js-reduck/store";
 import { Provider } from "@modern-js-reduck/react";
-import hoistNonReactStatics from "hoist-non-react-statics";
 import { immer, effects, autoActions, devtools } from "../plugins";
 import { RuntimeReactContext } from "../../core";
 import { isBrowser } from "../../common";
@@ -54,7 +53,7 @@ var getStoreConfig = function(config) {
   storeConfig.plugins = plugins;
   return storeConfig;
 };
-var state = function(config) {
+var statePlugin = function(config) {
   return {
     name: "@modern-js/plugin-state",
     setup: function() {
@@ -71,7 +70,7 @@ var state = function(config) {
             });
           };
           return next({
-            App: hoistNonReactStatics(getStateApp, App),
+            App: getStateApp,
             config: _$config
           });
         },
@@ -99,8 +98,9 @@ var state = function(config) {
     }
   };
 };
-var plugin_default = state;
+var plugin_default = statePlugin;
 export * from "../plugins";
 export {
-  plugin_default as default
+  plugin_default as default,
+  statePlugin
 };

package/dist/esm-node/cli/alias.js

@@ -0,0 +1,28 @@
+import path from "path";
+import { ENTRY_POINT_REGISTER_FILE_NAME } from "./constants";
+const builderPluginAlias = ({ entrypoints, internalDirectory, metaName }) => ({
+  name: "runtime:alias",
+  setup(api) {
+    api.modifyRsbuildConfig((userConfig, { mergeRsbuildConfig }) => {
+      const entrypointsAlias = {};
+      const mainEntrypointsAlias = {};
+      entrypoints.forEach((entrypoint) => {
+        entrypointsAlias[`@${metaName}/runtime/registry/${entrypoint.entryName}`] = path.join(internalDirectory, entrypoint.entryName, ENTRY_POINT_REGISTER_FILE_NAME);
+        if (entrypoint.isMainEntry) {
+          mainEntrypointsAlias[`@${metaName}/runtime/registry`] = path.join(internalDirectory, entrypoint.entryName, ENTRY_POINT_REGISTER_FILE_NAME);
+        }
+      });
+      return mergeRsbuildConfig(userConfig, {
+        source: {
+          alias: {
+            ...entrypointsAlias,
+            ...mainEntrypointsAlias
+          }
+        }
+      });
+    });
+  }
+});
+export {
+  builderPluginAlias
+};