@modern-js/plugin-router-v5 2.35.0 → 2.36.0

package/dist/cjs/cli/index.js

@@ -1,24 +1,29 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  routerPlugin: function() {
-    return routerPlugin;
-  },
-  default: function() {
-    return _default;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cli_exports = {};
+__export(cli_exports, {
+  default: () => cli_default,
+  routerPlugin: () => routerPlugin
 });
-const _utils = require("@modern-js/utils");
-require("./types");
+module.exports = __toCommonJS(cli_exports);
+var import_utils = require("@modern-js/utils");
+var import_types = require("./types");
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
 const routerPlugin = () => ({
@@ -33,8 +38,8 @@ const routerPlugin = () => ({
     return {
       config() {
         const appContext = api.useAppContext();
-        pluginsExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, "plugins");
-        routerExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, "router");
+        pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(appContext.internalDirectory, "plugins");
+        routerExportsUtils = (0, import_utils.createRuntimeExportsUtils)(appContext.internalDirectory, "router");
         return {
           source: {
             alias: {
@@ -61,9 +66,9 @@ const routerPlugin = () => ({
         const { entryName, isMainEntry } = entrypoint;
         const userConfig = api.useResolvedConfigContext();
         const { packageName } = api.useAppContext();
-        const runtimeConfig = (0, _utils.getEntryOptions)(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+        const runtimeConfig = (0, import_utils.getEntryOptions)(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
         runtimeConfigMap.set(entryName, runtimeConfig);
-        if ((0, _utils.isRouterV5)(userConfig)) {
+        if ((0, import_utils.isRouterV5)(userConfig)) {
           imports.push({
             value: "@modern-js/runtime/plugins",
             specifiers: [
@@ -85,7 +90,7 @@ const routerPlugin = () => ({
         const { serverRoutes } = api.useAppContext();
         const runtimeConfig = runtimeConfigMap.get(entryName);
         const userConfig = api.useResolvedConfigContext();
-        if ((0, _utils.isRouterV5)(userConfig)) {
+        if ((0, import_utils.isRouterV5)(userConfig)) {
           const serverBase = serverRoutes.filter((route) => route.entryName === entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
           plugins.push({
             name: PLUGIN_IDENTIFIER,
@@ -103,13 +108,16 @@ const routerPlugin = () => ({
       },
       addRuntimeExports() {
         const userConfig = api.useResolvedConfigContext();
-        if ((0, _utils.isRouterV5)(userConfig)) {
-          var _routerExportsUtils;
+        if ((0, import_utils.isRouterV5)(userConfig)) {
           pluginsExportsUtils.addExport(`export { default as router } from '@modern-js/plugin-router-v5/runtime'`);
-          (_routerExportsUtils = routerExportsUtils) === null || _routerExportsUtils === void 0 ? void 0 : _routerExportsUtils.addExport(`export * from '@modern-js/plugin-router-v5/runtime'`);
+          routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport(`export * from '@modern-js/plugin-router-v5/runtime'`);
         }
       }
     };
   }
 });
-const _default = routerPlugin;
+var cli_default = routerPlugin;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  routerPlugin
+});

package/dist/cjs/cli/types.js

@@ -1,4 +1,16 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/cjs/index.js

@@ -1,13 +1,40 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return _runtime.default;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+__export(src_exports, {
+  default: () => import_runtime.default
+});
+module.exports = __toCommonJS(src_exports);
+var import_runtime = __toESM(require("./runtime"));
+__reExport(src_exports, require("./runtime"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./runtime")
 });
-const _export_star = require("@swc/helpers/_/_export_star");
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _runtime = /* @__PURE__ */ _interop_require_default._(_export_star._(require("./runtime"), exports));

package/dist/cjs/runtime/DefaultNotFound.js

@@ -1,17 +1,28 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "DefaultNotFound", {
-  enumerable: true,
-  get: function() {
-    return DefaultNotFound;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var DefaultNotFound_exports = {};
+__export(DefaultNotFound_exports, {
+  DefaultNotFound: () => DefaultNotFound
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _jsxruntime = require("react/jsx-runtime");
-const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
-const DefaultNotFound = () => /* @__PURE__ */ (0, _jsxruntime.jsx)("div", {
+module.exports = __toCommonJS(DefaultNotFound_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+const DefaultNotFound = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
   style: {
     margin: "150px auto",
     textAlign: "center",
@@ -21,3 +32,7 @@ const DefaultNotFound = () => /* @__PURE__ */ (0, _jsxruntime.jsx)("div", {
   },
   children: "404"
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DefaultNotFound
+});

package/dist/cjs/runtime/hooks.js

@@ -1,12 +1,29 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "modifyRoutesHook", {
-  enumerable: true,
-  get: function() {
-    return modifyRoutesHook;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var hooks_exports = {};
+__export(hooks_exports, {
+  modifyRoutesHook: () => modifyRoutesHook
+});
+module.exports = __toCommonJS(hooks_exports);
+var import_plugin = require("@modern-js/plugin");
+const modifyRoutesHook = (0, import_plugin.createWaterfall)();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  modifyRoutesHook
 });
-const _plugin = require("@modern-js/plugin");
-const modifyRoutesHook = (0, _plugin.createWaterfall)();

package/dist/cjs/runtime/index.js

@@ -1,15 +1,33 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return _default;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var runtime_exports = {};
+__export(runtime_exports, {
+  default: () => runtime_default
+});
+module.exports = __toCommonJS(runtime_exports);
+var import_plugin = require("./plugin");
+__reExport(runtime_exports, require("react-router-dom"), module.exports);
+__reExport(runtime_exports, require("history"), module.exports);
+var runtime_default = import_plugin.routerPlugin;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("react-router-dom"),
+  ...require("history")
 });
-const _export_star = require("@swc/helpers/_/_export_star");
-const _plugin = require("./plugin");
-_export_star._(require("react-router-dom"), exports);
-_export_star._(require("history"), exports);
-const _default = _plugin.routerPlugin;

package/dist/cjs/runtime/plugin.js

@@ -1,44 +1,64 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "routerPlugin", {
-  enumerable: true,
-  get: function() {
-    return routerPlugin;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var plugin_exports = {};
+__export(plugin_exports, {
+  routerPlugin: () => routerPlugin
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
-const _jsxruntime = require("react/jsx-runtime");
-const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
-const _history = require("history");
-const _reactrouterdom = require("react-router-dom");
-const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
-const _runtime = require("@modern-js/runtime");
-const _runtimebrowser = require("@modern-js/utils/runtime-browser");
-const _utils = require("./utils");
-const _hooks = require("./hooks");
+module.exports = __toCommonJS(plugin_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_react = require("react");
+var import_history = require("history");
+var import_react_router_dom = require("react-router-dom");
+var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
+var import_runtime = require("@modern-js/runtime");
+var import_browser = require("@modern-js/runtime-utils/browser");
+var import_utils = require("./utils");
+var import_hooks = require("./hooks");
 const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} }) => {
-  var _routesConfig;
-  const originRoutes = ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.routes) || [];
-  const isBrow = (0, _runtime.isBrowser)();
+  const originRoutes = (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.routes) || [];
+  const isBrow = (0, import_runtime.isBrowser)();
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
   if (isBrow) {
-    window._SERVER_DATA = (0, _runtimebrowser.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
+    window._SERVER_DATA = (0, import_browser.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
   }
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
-      modifyRoutes: _hooks.modifyRoutesHook
+      modifyRoutes: import_hooks.modifyRoutesHook
     },
     setup: (api) => {
       return {
         init({ context }, next) {
           context.router = {
-            useRouteMatch: _reactrouterdom.useRouteMatch,
-            useLocation: _reactrouterdom.useLocation
+            useRouteMatch: import_react_router_dom.useRouteMatch,
+            useLocation: import_react_router_dom.useLocation
           };
           Object.defineProperty(context, "routes", {
             get() {
@@ -50,62 +70,60 @@ const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5His
           });
         },
         hoc: ({ App }, next) => {
-          var _routesConfig2;
           const getRouteApp = () => {
             if (isBrow) {
               var _window__SERVER_DATA;
               const baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
-              historyOptions.basename = baseUrl === "/" ? (0, _utils.urlJoin)(baseUrl, historyOptions.basename) : baseUrl;
-              const history = customHistory || (supportHtml5History ? (0, _history.createBrowserHistory)(historyOptions) : (0, _history.createHashHistory)(historyOptions));
+              historyOptions.basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, historyOptions.basename) : baseUrl;
+              const history = customHistory || (supportHtml5History ? (0, import_history.createBrowserHistory)(historyOptions) : (0, import_history.createHashHistory)(historyOptions));
               return (props) => {
                 const runner = api.useHookRunners();
                 routes = runner.modifyRoutes(originRoutes);
                 routesConfig && (routesConfig.routes = routes);
-                return /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Router, {
+                return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Router, {
                   history,
-                  children: createRoutes ? /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                  children: createRoutes ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
                     ...props,
                     Component: createRoutes()
-                  }) : /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                  }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
                     ...props,
-                    children: (0, _utils.renderRoutes)(routesConfig, props)
+                    children: (0, import_utils.renderRoutes)(routesConfig, props)
                   })
                 });
               };
             }
             return (props) => {
-              var _ssrContext, _ssrContext1, _request;
-              const runtimeContext = (0, _react.useContext)(_runtime.RuntimeReactContext);
+              const runtimeContext = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
               const { ssrContext } = runtimeContext;
-              const location1 = (0, _utils.getLocation)(ssrContext);
-              const routerContext = ((_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.redirection) || {};
-              const request = (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.request;
-              const baseUrl = (_request = request) === null || _request === void 0 ? void 0 : _request.baseUrl;
-              const basename = baseUrl === "/" ? (0, _utils.urlJoin)(baseUrl, historyOptions.basename) : baseUrl;
+              const location1 = (0, import_utils.getLocation)(ssrContext);
+              const routerContext = (ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.redirection) || {};
+              const request = ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.request;
+              const baseUrl = request === null || request === void 0 ? void 0 : request.baseUrl;
+              const basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, historyOptions.basename) : baseUrl;
               const runner = api.useHookRunners();
               const routes2 = runner.modifyRoutes(originRoutes);
               routesConfig && (routesConfig.routes = routes2);
-              return /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.StaticRouter, {
+              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.StaticRouter, {
                 basename: basename === "/" ? "" : basename,
                 location: location1,
                 context: routerContext,
-                children: createRoutes ? /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                children: createRoutes ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
                   ...props,
                   Component: createRoutes()
-                }) : /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
                   ...props,
-                  children: (0, _utils.renderRoutes)(routesConfig, props)
+                  children: (0, import_utils.renderRoutes)(routesConfig, props)
                 })
               });
             };
           };
           let RouteApp = getRouteApp();
           if (App) {
-            RouteApp = (0, _hoistnonreactstatics.default)(RouteApp, App);
+            RouteApp = (0, import_hoist_non_react_statics.default)(RouteApp, App);
           }
-          if ((_routesConfig2 = routesConfig) === null || _routesConfig2 === void 0 ? void 0 : _routesConfig2.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
-              App: (0, _hoistnonreactstatics.default)(RouteApp, routesConfig.globalApp)
+              App: (0, import_hoist_non_react_statics.default)(RouteApp, routesConfig.globalApp)
             });
           }
           return next({
@@ -116,3 +134,7 @@ const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5His
     }
   };
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  routerPlugin
+});

package/dist/cjs/runtime/utils.js

@@ -1,54 +1,52 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  renderRoutes: function() {
-    return renderRoutes;
-  },
-  getLocation: function() {
-    return getLocation;
-  },
-  urlJoin: function() {
-    return urlJoin;
-  },
-  standardSlash: function() {
-    return standardSlash;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  getLocation: () => getLocation,
+  renderRoutes: () => renderRoutes,
+  standardSlash: () => standardSlash,
+  urlJoin: () => urlJoin
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _jsxruntime = require("react/jsx-runtime");
-const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
-const _reactrouterdom = require("react-router-dom");
-const _DefaultNotFound = require("./DefaultNotFound");
+module.exports = __toCommonJS(utils_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_react_router_dom = require("react-router-dom");
+var import_DefaultNotFound = require("./DefaultNotFound");
 function renderRoutes(routesConfig, extraProps = {}) {
   if (!routesConfig) {
     return null;
   }
   const Layout = ({ Component, ...props }) => {
-    var _routesConfig;
-    const GlobalLayout = (_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp;
+    const GlobalLayout = routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp;
     if (!GlobalLayout) {
-      return /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
         ...props
       });
     }
-    return /* @__PURE__ */ (0, _jsxruntime.jsx)(GlobalLayout, {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, {
       Component,
       ...props
     });
   };
   const findMatchedRoute = (pathname) => {
-    var _routesConfig_routes, _routesConfig;
-    return (_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : (_routesConfig_routes = _routesConfig.routes) === null || _routesConfig_routes === void 0 ? void 0 : _routesConfig_routes.find((route) => {
-      const info = (0, _reactrouterdom.matchPath)(pathname, {
+    var _routesConfig_routes;
+    return routesConfig === null || routesConfig === void 0 ? void 0 : (_routesConfig_routes = routesConfig.routes) === null || _routesConfig_routes === void 0 ? void 0 : _routesConfig_routes.find((route) => {
+      const info = (0, import_react_router_dom.matchPath)(pathname, {
         path: route.path,
         exact: route.exact,
         sensitive: route.sensitive
@@ -56,18 +54,18 @@ function renderRoutes(routesConfig, extraProps = {}) {
       return Boolean(info);
     });
   };
-  return /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Route, {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
     path: "/",
     render: (props) => {
       const matchedRoute = findMatchedRoute(props.location.pathname);
       if (!matchedRoute) {
-        return /* @__PURE__ */ (0, _jsxruntime.jsx)(_DefaultNotFound.DefaultNotFound, {});
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DefaultNotFound.DefaultNotFound, {});
       }
-      return /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Route, {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
         path: matchedRoute.path,
         exact: matchedRoute.exact,
         sensitive: matchedRoute.sensitive,
-        render: (routeProps) => /* @__PURE__ */ (0, _jsxruntime.jsx)(Layout, {
+        render: (routeProps) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Layout, {
           Component: matchedRoute.component,
           ...routeProps,
           ...extraProps
@@ -77,9 +75,9 @@ function renderRoutes(routesConfig, extraProps = {}) {
   });
 }
 function getLocation(serverContext) {
-  var _serverContext, _url_replace, _url;
-  const { pathname, url } = ((_serverContext = serverContext) === null || _serverContext === void 0 ? void 0 : _serverContext.request) || {};
-  const cleanUrl = (_url = url) === null || _url === void 0 ? void 0 : (_url_replace = _url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
+  var _url_replace;
+  const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
+  const cleanUrl = url === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   const index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;
@@ -107,3 +105,10 @@ function standardSlash(str) {
   }
   return addr;
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getLocation,
+  renderRoutes,
+  standardSlash,
+  urlJoin
+});

package/dist/esm/cli/index.js

@@ -4,7 +4,7 @@ import { getEntryOptions, createRuntimeExportsUtils, isRouterV5 as isV5 } from "
 import "./types";
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
-export var routerPlugin = function() {
+var routerPlugin = function() {
   return {
     name: "@modern-js/plugin-router-v5",
     required: [
@@ -61,8 +61,8 @@ export var routerPlugin = function() {
             throw new Error("should enable runtime.router.mode for entry ".concat(entryName));
           }
           return {
-            entrypoint: entrypoint,
-            imports: imports
+            entrypoint,
+            imports
           };
         },
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
@@ -82,27 +82,30 @@ export var routerPlugin = function() {
             plugins.push({
               name: PLUGIN_IDENTIFIER,
               options: JSON.stringify(_object_spread_props(_object_spread({
-                serverBase: serverBase
+                serverBase
               }, runtimeConfig.router), {
                 routesConfig: fileSystemRoutes ? "{ ".concat(ROUTES_IDENTIFIER, ", globalApp: App }") : void 0
               })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
             });
           }
           return {
-            entrypoint: entrypoint,
-            plugins: plugins
+            entrypoint,
+            plugins
           };
         },
         addRuntimeExports: function addRuntimeExports() {
           var userConfig = api.useResolvedConfigContext();
           if (isV5(userConfig)) {
-            var _routerExportsUtils;
             pluginsExportsUtils.addExport("export { default as router } from '@modern-js/plugin-router-v5/runtime'");
-            (_routerExportsUtils = routerExportsUtils) === null || _routerExportsUtils === void 0 ? void 0 : _routerExportsUtils.addExport("export * from '@modern-js/plugin-router-v5/runtime'");
+            routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport("export * from '@modern-js/plugin-router-v5/runtime'");
           }
         }
       };
     }
   };
 };
-export default routerPlugin;
+var cli_default = routerPlugin;
+export {
+  cli_default as default,
+  routerPlugin
+};

package/dist/esm/cli/types.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/index.js

@@ -1,2 +1,5 @@
-export { default } from "./runtime";
+import { default as default2 } from "./runtime";
 export * from "./runtime";
+export {
+  default2 as default
+};

package/dist/esm/runtime/DefaultNotFound.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-export var DefaultNotFound = function() {
+var DefaultNotFound = function() {
   return /* @__PURE__ */ _jsx("div", {
     style: {
       margin: "150px auto",
@@ -11,3 +11,6 @@ export var DefaultNotFound = function() {
     children: "404"
   });
 };
+export {
+  DefaultNotFound
+};

package/dist/esm/runtime/hooks.js

@@ -1,3 +1,5 @@
 import { createWaterfall } from "@modern-js/plugin";
 var modifyRoutesHook = createWaterfall();
-export { modifyRoutesHook };
+export {
+  modifyRoutesHook
+};

package/dist/esm/runtime/index.js

@@ -1,4 +1,7 @@
 import { routerPlugin } from "./plugin";
-export default routerPlugin;
+var runtime_default = routerPlugin;
 export * from "react-router-dom";
 export * from "history";
+export {
+  runtime_default as default
+};

package/dist/esm/runtime/plugin.js

@@ -6,13 +6,12 @@ import { createBrowserHistory, createHashHistory } from "history";
 import { Router, StaticRouter, useRouteMatch, useLocation } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { RuntimeReactContext, isBrowser } from "@modern-js/runtime";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/browser";
 import { renderRoutes, getLocation, urlJoin } from "./utils";
 import { modifyRoutesHook } from "./hooks";
-export var routerPlugin = function(param) {
+var routerPlugin = function(param) {
   var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, customHistory = param.history, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, routesConfig = param.routesConfig, createRoutes = param.createRoutes, _param_historyOptions = param.historyOptions, historyOptions = _param_historyOptions === void 0 ? {} : _param_historyOptions;
-  var _routesConfig;
-  var originRoutes = ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.routes) || [];
+  var originRoutes = (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.routes) || [];
   var isBrow = isBrowser();
   var select = function(pathname) {
     return serverBase.find(function(baseUrl) {
@@ -33,8 +32,8 @@ export var routerPlugin = function(param) {
         init: function init(param2, next) {
           var context = param2.context;
           context.router = {
-            useRouteMatch: useRouteMatch,
-            useLocation: useLocation
+            useRouteMatch,
+            useLocation
           };
           Object.defineProperty(context, "routes", {
             get: function get() {
@@ -42,12 +41,11 @@ export var routerPlugin = function(param) {
             }
           });
           return next({
-            context: context
+            context
           });
         },
         hoc: function(param2, next) {
           var App = param2.App;
-          var _routesConfig2;
           var getRouteApp = function() {
             if (isBrow) {
               var _window__SERVER_DATA;
@@ -59,7 +57,7 @@ export var routerPlugin = function(param) {
                 routes = runner.modifyRoutes(originRoutes);
                 routesConfig && (routesConfig.routes = routes);
                 return /* @__PURE__ */ _jsx(Router, {
-                  history: history,
+                  history,
                   children: createRoutes ? /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
                     Component: createRoutes()
                   })) : /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
@@ -69,13 +67,12 @@ export var routerPlugin = function(param) {
               };
             }
             return function(props) {
-              var _ssrContext, _ssrContext1, _request;
               var runtimeContext = useContext(RuntimeReactContext);
               var ssrContext = runtimeContext.ssrContext;
               var _$location = getLocation(ssrContext);
-              var routerContext = ((_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.redirection) || {};
-              var request = (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.request;
-              var baseUrl2 = (_request = request) === null || _request === void 0 ? void 0 : _request.baseUrl;
+              var routerContext = (ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.redirection) || {};
+              var request = ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.request;
+              var baseUrl2 = request === null || request === void 0 ? void 0 : request.baseUrl;
               var basename = baseUrl2 === "/" ? urlJoin(baseUrl2, historyOptions.basename) : baseUrl2;
               var runner = api.useHookRunners();
               var routes2 = runner.modifyRoutes(originRoutes);
@@ -96,7 +93,7 @@ export var routerPlugin = function(param) {
           if (App) {
             RouteApp = hoistNonReactStatics(RouteApp, App);
           }
-          if ((_routesConfig2 = routesConfig) === null || _routesConfig2 === void 0 ? void 0 : _routesConfig2.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });
@@ -109,3 +106,6 @@ export var routerPlugin = function(param) {
     }
   };
 };
+export {
+  routerPlugin
+};

package/dist/esm/runtime/utils.js

@@ -3,7 +3,7 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Route, matchPath } from "react-router-dom";
 import { DefaultNotFound } from "./DefaultNotFound";
-export function renderRoutes(routesConfig) {
+function renderRoutes(routesConfig) {
   var extraProps = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
   if (!routesConfig) {
     return null;
@@ -12,18 +12,17 @@ export function renderRoutes(routesConfig) {
     var Component = _param.Component, props = _object_without_properties(_param, [
       "Component"
     ]);
-    var _routesConfig;
-    var GlobalLayout = (_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp;
+    var GlobalLayout = routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp;
     if (!GlobalLayout) {
       return /* @__PURE__ */ _jsx(Component, _object_spread({}, props));
     }
     return /* @__PURE__ */ _jsx(GlobalLayout, _object_spread({
-      Component: Component
+      Component
     }, props));
   };
   var findMatchedRoute = function(pathname) {
-    var _routesConfig_routes, _routesConfig;
-    return (_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : (_routesConfig_routes = _routesConfig.routes) === null || _routesConfig_routes === void 0 ? void 0 : _routesConfig_routes.find(function(route) {
+    var _routesConfig_routes;
+    return routesConfig === null || routesConfig === void 0 ? void 0 : (_routesConfig_routes = routesConfig.routes) === null || _routesConfig_routes === void 0 ? void 0 : _routesConfig_routes.find(function(route) {
       var info = matchPath(pathname, {
         path: route.path,
         exact: route.exact,
@@ -52,17 +51,17 @@ export function renderRoutes(routesConfig) {
     }
   });
 }
-export function getLocation(serverContext) {
-  var _serverContext, _url_replace, _url;
-  var _ref = ((_serverContext = serverContext) === null || _serverContext === void 0 ? void 0 : _serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
-  var cleanUrl = (_url = url) === null || _url === void 0 ? void 0 : (_url_replace = _url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
+function getLocation(serverContext) {
+  var _url_replace;
+  var _ref = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
+  var cleanUrl = url === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   var index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;
   }
   return cleanUrl.substring(index);
 }
-export var urlJoin = function() {
+var urlJoin = function() {
   for (var _len = arguments.length, parts = new Array(_len), _key = 0; _key < _len; _key++) {
     parts[_key] = arguments[_key];
   }
@@ -70,7 +69,7 @@ export var urlJoin = function() {
   var replace = new RegExp("".concat(separator, "{1,}"), "g");
   return standardSlash(parts.join(separator).replace(replace, separator));
 };
-export function standardSlash(str) {
+function standardSlash(str) {
   var addr = str;
   if (!addr || typeof addr !== "string") {
     return addr;
@@ -86,3 +85,9 @@ export function standardSlash(str) {
   }
   return addr;
 }
+export {
+  getLocation,
+  renderRoutes,
+  standardSlash,
+  urlJoin
+};

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

@@ -2,7 +2,7 @@ import { getEntryOptions, createRuntimeExportsUtils, isRouterV5 as isV5 } from "
 import "./types";
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-export const routerPlugin = () => ({
+const routerPlugin = () => ({
   name: "@modern-js/plugin-router-v5",
   required: [
     "@modern-js/runtime"
@@ -85,12 +85,15 @@ export const routerPlugin = () => ({
       addRuntimeExports() {
         const userConfig = api.useResolvedConfigContext();
         if (isV5(userConfig)) {
-          var _routerExportsUtils;
           pluginsExportsUtils.addExport(`export { default as router } from '@modern-js/plugin-router-v5/runtime'`);
-          (_routerExportsUtils = routerExportsUtils) === null || _routerExportsUtils === void 0 ? void 0 : _routerExportsUtils.addExport(`export * from '@modern-js/plugin-router-v5/runtime'`);
+          routerExportsUtils === null || routerExportsUtils === void 0 ? void 0 : routerExportsUtils.addExport(`export * from '@modern-js/plugin-router-v5/runtime'`);
         }
       }
     };
   }
 });
-export default routerPlugin;
+var cli_default = routerPlugin;
+export {
+  cli_default as default,
+  routerPlugin
+};

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

@@ -1 +0,0 @@
-export {};

package/dist/esm-node/index.js

@@ -1,2 +1,5 @@
-export { default } from "./runtime";
+import { default as default2 } from "./runtime";
 export * from "./runtime";
+export {
+  default2 as default
+};

package/dist/esm-node/runtime/DefaultNotFound.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-export const DefaultNotFound = () => /* @__PURE__ */ _jsx("div", {
+const DefaultNotFound = () => /* @__PURE__ */ _jsx("div", {
   style: {
     margin: "150px auto",
     textAlign: "center",
@@ -9,3 +9,6 @@ export const DefaultNotFound = () => /* @__PURE__ */ _jsx("div", {
   },
   children: "404"
 });
+export {
+  DefaultNotFound
+};

package/dist/esm-node/runtime/hooks.js

@@ -1,3 +1,5 @@
 import { createWaterfall } from "@modern-js/plugin";
 const modifyRoutesHook = createWaterfall();
-export { modifyRoutesHook };
+export {
+  modifyRoutesHook
+};

package/dist/esm-node/runtime/index.js

@@ -1,4 +1,7 @@
 import { routerPlugin } from "./plugin";
-export default routerPlugin;
+var runtime_default = routerPlugin;
 export * from "react-router-dom";
 export * from "history";
+export {
+  runtime_default as default
+};

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

@@ -4,12 +4,11 @@ import { createBrowserHistory, createHashHistory } from "history";
 import { Router, StaticRouter, useRouteMatch, useLocation } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { RuntimeReactContext, isBrowser } from "@modern-js/runtime";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/browser";
 import { renderRoutes, getLocation, urlJoin } from "./utils";
 import { modifyRoutesHook } from "./hooks";
-export const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} }) => {
-  var _routesConfig;
-  const originRoutes = ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.routes) || [];
+const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} }) => {
+  const originRoutes = (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.routes) || [];
   const isBrow = isBrowser();
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
@@ -38,7 +37,6 @@ export const routerPlugin = ({ serverBase = [], history: customHistory, supportH
           });
         },
         hoc: ({ App }, next) => {
-          var _routesConfig2;
           const getRouteApp = () => {
             if (isBrow) {
               var _window__SERVER_DATA;
@@ -62,13 +60,12 @@ export const routerPlugin = ({ serverBase = [], history: customHistory, supportH
               };
             }
             return (props) => {
-              var _ssrContext, _ssrContext1, _request;
               const runtimeContext = useContext(RuntimeReactContext);
               const { ssrContext } = runtimeContext;
               const location1 = getLocation(ssrContext);
-              const routerContext = ((_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.redirection) || {};
-              const request = (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.request;
-              const baseUrl = (_request = request) === null || _request === void 0 ? void 0 : _request.baseUrl;
+              const routerContext = (ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.redirection) || {};
+              const request = ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.request;
+              const baseUrl = request === null || request === void 0 ? void 0 : request.baseUrl;
               const basename = baseUrl === "/" ? urlJoin(baseUrl, historyOptions.basename) : baseUrl;
               const runner = api.useHookRunners();
               const routes2 = runner.modifyRoutes(originRoutes);
@@ -91,7 +88,7 @@ export const routerPlugin = ({ serverBase = [], history: customHistory, supportH
           if (App) {
             RouteApp = hoistNonReactStatics(RouteApp, App);
           }
-          if ((_routesConfig2 = routesConfig) === null || _routesConfig2 === void 0 ? void 0 : _routesConfig2.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });
@@ -104,3 +101,6 @@ export const routerPlugin = ({ serverBase = [], history: customHistory, supportH
     }
   };
 };
+export {
+  routerPlugin
+};

package/dist/esm-node/runtime/utils.js

@@ -1,13 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Route, matchPath } from "react-router-dom";
 import { DefaultNotFound } from "./DefaultNotFound";
-export function renderRoutes(routesConfig, extraProps = {}) {
+function renderRoutes(routesConfig, extraProps = {}) {
   if (!routesConfig) {
     return null;
   }
   const Layout = ({ Component, ...props }) => {
-    var _routesConfig;
-    const GlobalLayout = (_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp;
+    const GlobalLayout = routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp;
     if (!GlobalLayout) {
       return /* @__PURE__ */ _jsx(Component, {
         ...props
@@ -19,8 +18,8 @@ export function renderRoutes(routesConfig, extraProps = {}) {
     });
   };
   const findMatchedRoute = (pathname) => {
-    var _routesConfig_routes, _routesConfig;
-    return (_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : (_routesConfig_routes = _routesConfig.routes) === null || _routesConfig_routes === void 0 ? void 0 : _routesConfig_routes.find((route) => {
+    var _routesConfig_routes;
+    return routesConfig === null || routesConfig === void 0 ? void 0 : (_routesConfig_routes = routesConfig.routes) === null || _routesConfig_routes === void 0 ? void 0 : _routesConfig_routes.find((route) => {
       const info = matchPath(pathname, {
         path: route.path,
         exact: route.exact,
@@ -49,22 +48,22 @@ export function renderRoutes(routesConfig, extraProps = {}) {
     }
   });
 }
-export function getLocation(serverContext) {
-  var _serverContext, _url_replace, _url;
-  const { pathname, url } = ((_serverContext = serverContext) === null || _serverContext === void 0 ? void 0 : _serverContext.request) || {};
-  const cleanUrl = (_url = url) === null || _url === void 0 ? void 0 : (_url_replace = _url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
+function getLocation(serverContext) {
+  var _url_replace;
+  const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
+  const cleanUrl = url === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   const index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;
   }
   return cleanUrl.substring(index);
 }
-export const urlJoin = (...parts) => {
+const urlJoin = (...parts) => {
   const separator = "/";
   const replace = new RegExp(`${separator}{1,}`, "g");
   return standardSlash(parts.join(separator).replace(replace, separator));
 };
-export function standardSlash(str) {
+function standardSlash(str) {
   let addr = str;
   if (!addr || typeof addr !== "string") {
     return addr;
@@ -80,3 +79,9 @@ export function standardSlash(str) {
   }
   return addr;
 }
+export {
+  getLocation,
+  renderRoutes,
+  standardSlash,
+  urlJoin
+};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.35.0",
+  "version": "2.36.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -60,9 +60,9 @@
     "hoist-non-react-statics": "^3.3.2",
     "react-router-dom": "^5.3.4",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.35.0",
-    "@modern-js/utils": "2.35.0",
-    "@modern-js/types": "2.35.0"
+    "@modern-js/plugin": "2.36.0",
+    "@modern-js/types": "2.36.0",
+    "@modern-js/utils": "2.36.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -78,12 +78,13 @@
     "react-dom": "^18",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.35.0",
-    "@modern-js/core": "2.35.0",
-    "@modern-js/runtime": "2.35.0",
-    "@modern-js/utils": "2.35.0",
-    "@scripts/jest-config": "2.35.0",
-    "@scripts/build": "2.35.0"
+    "@modern-js/app-tools": "2.36.0",
+    "@modern-js/core": "2.36.0",
+    "@modern-js/runtime": "2.36.0",
+    "@modern-js/utils": "2.36.0",
+    "@modern-js/runtime-utils": "2.36.0",
+    "@scripts/build": "2.36.0",
+    "@scripts/jest-config": "2.36.0"
   },
   "sideEffects": false,
   "publishConfig": {