@modern-js/runtime 2.19.1 → 2.21.0

package/dist/cjs/exports/styled.js

@@ -6,23 +6,7 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => _default
 });
-const _styledcomponents = /* @__PURE__ */ _interop_require_default(_export_star(require("styled-components"), exports));
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _export_star = require("@swc/helpers/_/_export_star");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _styledcomponents = /* @__PURE__ */ _interop_require_default._(_export_star._(require("styled-components"), exports));
 const _default = _styledcomponents.default;

package/dist/cjs/router/index.js

@@ -13,22 +13,6 @@ _export(exports, {
   router: () => _runtime.default,
   default: () => _runtime.default
 });
-const _runtime = /* @__PURE__ */ _interop_require_default(_export_star(require("./runtime"), exports));
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+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/router/runtime/DefaultNotFound.js

@@ -6,13 +6,9 @@ Object.defineProperty(exports, "DefaultNotFound", {
   enumerable: true,
   get: () => 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"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
 const DefaultNotFound = () => /* @__PURE__ */ (0, _jsxruntime.jsx)("div", {
   style: {
     margin: "150px auto",

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

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "default", {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _react = require("react");
-const _reactrouterdom = require("react-router-dom");
+const _router = require("@modern-js/utils/runtime/router");
 const _runtimenode = require("@modern-js/utils/runtime-node");
 const _common = require("../../common");
 const _utils = require("./utils");
@@ -16,7 +16,7 @@ const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DA
 const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;
 const preResolvedFnStr = `function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};`;
 const DeferredDataScripts = () => {
-  const context = (0, _react.useContext)(_reactrouterdom.UNSAFE_DataRouterContext);
+  const context = (0, _react.useContext)(_router.UNSAFE_DataRouterContext);
   const { staticContext } = context || {};
   const hydratedRef = (0, _react.useRef)(false);
   (0, _react.useEffect)(() => {
@@ -91,7 +91,7 @@ const DeferredDataScripts = () => {
 };
 const DeferredDataScript = ({ data, routeId, dataKey }) => {
   return /* @__PURE__ */ (0, _jsxruntime.jsx)(_react.Suspense, {
-    children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Await, {
+    children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.Await, {
       resolve: data,
       errorElement: /* @__PURE__ */ (0, _jsxruntime.jsx)(ErrorDeferredDataScript, {
         routeId,
@@ -108,7 +108,7 @@ const DeferredDataScript = ({ data, routeId, dataKey }) => {
   });
 };
 const ErrorDeferredDataScript = ({ routeId, dataKey }) => {
-  const error = (0, _reactrouterdom.useAsyncError)();
+  const error = (0, _router.useAsyncError)();
   return /* @__PURE__ */ (0, _jsxruntime.jsx)("script", {
     suppressHydrationWarning: true,
     dangerouslySetInnerHTML: {

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

@@ -14,50 +14,11 @@ _export(exports, {
   Link: () => Link,
   NavLink: () => NavLink
 });
+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 _reactrouterdom = require("react-router-dom");
+const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
+const _router = require("@modern-js/utils/runtime/router");
 const _core = require("../../core");
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
 function composeEventHandlers(theirHandler, ourHandler) {
   return (event) => {
     theirHandler === null || theirHandler === void 0 ? void 0 : theirHandler(event);
@@ -158,7 +119,7 @@ const PrefetchPageLinks = ({ pathname }) => {
   const context = (0, _react.useContext)(_core.RuntimeReactContext);
   const { routeManifest, routes } = context;
   const { routeAssets } = routeManifest;
-  const matches = Array.isArray(routes) ? (0, _reactrouterdom.matchRoutes)(routes, pathname) : [];
+  const matches = Array.isArray(routes) ? (0, _router.matchRoutes)(routes, pathname) : [];
   if (Array.isArray(matches)) {
     matches === null || matches === void 0 ? void 0 : matches.forEach((match) => loadRouteModule(match.route, routeAssets));
   }
@@ -172,8 +133,8 @@ const PrefetchPageLinks = ({ pathname }) => {
   });
 };
 const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
-  const currentMatches = (0, _reactrouterdom.useMatches)();
-  const basename = (0, _reactrouterdom.useHref)("/");
+  const currentMatches = (0, _router.useMatches)();
+  const basename = (0, _router.useHref)("/");
   const dataHrefs = (0, _react.useMemo)(() => {
     return matches === null || matches === void 0 ? void 0 : matches.filter((match, index) => {
       if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
@@ -204,7 +165,7 @@ const createPrefetchLink = (Link2) => {
   return /* @__PURE__ */ _react.default.forwardRef(({ to, prefetch = "none", ...props }, forwardedRef) => {
     const isAbsolute = typeof to === "string" && ABSOLUTE_URL_REGEX.test(to);
     const [shouldPrefetch, prefetchHandlers] = usePrefetchBehavior(prefetch, props);
-    const resolvedPath = (0, _reactrouterdom.useResolvedPath)(to);
+    const resolvedPath = (0, _router.useResolvedPath)(to);
     const { pathname } = resolvedPath;
     return /* @__PURE__ */ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
       children: [
@@ -221,7 +182,7 @@ const createPrefetchLink = (Link2) => {
     });
   });
 };
-const Link = createPrefetchLink(_reactrouterdom.Link);
+const Link = createPrefetchLink(_router.Link);
 Link.displayName = "Link";
-const NavLink = createPrefetchLink(_reactrouterdom.NavLink);
+const NavLink = createPrefetchLink(_router.NavLink);
 NavLink.displayName = "NavLink";

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

@@ -16,87 +16,74 @@ _export(exports, {
   NavLink: () => _PrefetchLink.NavLink,
   useRouteLoaderData: () => useRouteLoaderData,
   // Routers
-  createBrowserRouter: () => _reactrouterdom.createBrowserRouter,
-  createHashRouter: () => _reactrouterdom.createHashRouter,
-  createMemoryRouter: () => _reactrouterdom.createMemoryRouter,
-  RouterProvider: () => _reactrouterdom.RouterProvider,
+  createBrowserRouter: () => _router.createBrowserRouter,
+  createHashRouter: () => _router.createHashRouter,
+  createMemoryRouter: () => _router.createMemoryRouter,
+  RouterProvider: () => _router.RouterProvider,
   // Router Components
-  BrowserRouter: () => _reactrouterdom.BrowserRouter,
-  HashRouter: () => _reactrouterdom.HashRouter,
-  MemoryRouter: () => _reactrouterdom.MemoryRouter,
-  Router: () => _reactrouterdom.Router,
+  BrowserRouter: () => _router.BrowserRouter,
+  HashRouter: () => _router.HashRouter,
+  MemoryRouter: () => _router.MemoryRouter,
+  Router: () => _router.Router,
   // Components
-  Await: () => _reactrouterdom.Await,
-  Form: () => _reactrouterdom.Form,
-  Navigate: () => _reactrouterdom.Navigate,
-  Outlet: () => _reactrouterdom.Outlet,
-  Route: () => _reactrouterdom.Route,
-  Routes: () => _reactrouterdom.Routes,
-  ScrollRestoration: () => _reactrouterdom.ScrollRestoration,
+  Await: () => _router.Await,
+  Form: () => _router.Form,
+  Navigate: () => _router.Navigate,
+  Outlet: () => _router.Outlet,
+  Route: () => _router.Route,
+  Routes: () => _router.Routes,
+  ScrollRestoration: () => _router.ScrollRestoration,
   // Hooks
-  useActionData: () => _reactrouterdom.useActionData,
-  useAsyncError: () => _reactrouterdom.useAsyncError,
-  useAsyncValue: () => _reactrouterdom.useAsyncValue,
-  useBeforeUnload: () => _reactrouterdom.useBeforeUnload,
-  useFetcher: () => _reactrouterdom.useFetcher,
-  useFetchers: () => _reactrouterdom.useFetchers,
-  useFormAction: () => _reactrouterdom.useFormAction,
-  useHref: () => _reactrouterdom.useHref,
-  useInRouterContext: () => _reactrouterdom.useInRouterContext,
-  useLinkClickHandler: () => _reactrouterdom.useLinkClickHandler,
-  useLoaderData: () => _reactrouterdom.useLoaderData,
-  useLocation: () => _reactrouterdom.useLocation,
-  useMatch: () => _reactrouterdom.useMatch,
-  useMatches: () => _reactrouterdom.useMatches,
-  useNavigate: () => _reactrouterdom.useNavigate,
-  useNavigation: () => _reactrouterdom.useNavigation,
-  useNavigationType: () => _reactrouterdom.useNavigationType,
-  useOutlet: () => _reactrouterdom.useOutlet,
-  useOutletContext: () => _reactrouterdom.useOutletContext,
-  useParams: () => _reactrouterdom.useParams,
-  useResolvedPath: () => _reactrouterdom.useResolvedPath,
-  useRevalidator: () => _reactrouterdom.useRevalidator,
-  useRouteError: () => _reactrouterdom.useRouteError,
-  useRoutes: () => _reactrouterdom.useRoutes,
-  useSearchParams: () => _reactrouterdom.useSearchParams,
-  useSubmit: () => _reactrouterdom.useSubmit,
+  useActionData: () => _router.useActionData,
+  useAsyncError: () => _router.useAsyncError,
+  useAsyncValue: () => _router.useAsyncValue,
+  useBeforeUnload: () => _router.useBeforeUnload,
+  useFetcher: () => _router.useFetcher,
+  useFetchers: () => _router.useFetchers,
+  useFormAction: () => _router.useFormAction,
+  useHref: () => _router.useHref,
+  useInRouterContext: () => _router.useInRouterContext,
+  useLinkClickHandler: () => _router.useLinkClickHandler,
+  useLoaderData: () => _router.useLoaderData,
+  useLocation: () => _router.useLocation,
+  useMatch: () => _router.useMatch,
+  useMatches: () => _router.useMatches,
+  useNavigate: () => _router.useNavigate,
+  useNavigation: () => _router.useNavigation,
+  useNavigationType: () => _router.useNavigationType,
+  useOutlet: () => _router.useOutlet,
+  useOutletContext: () => _router.useOutletContext,
+  useParams: () => _router.useParams,
+  useResolvedPath: () => _router.useResolvedPath,
+  useRevalidator: () => _router.useRevalidator,
+  useRouteError: () => _router.useRouteError,
+  useRoutes: () => _router.useRoutes,
+  useSearchParams: () => _router.useSearchParams,
+  useSubmit: () => _router.useSubmit,
   // Utilities
-  createRoutesFromChildren: () => _reactrouterdom.createRoutesFromChildren,
-  createRoutesFromElements: () => _reactrouterdom.createRoutesFromElements,
-  createSearchParams: () => _reactrouterdom.createSearchParams,
-  generatePath: () => _reactrouterdom.generatePath,
-  isRouteErrorResponse: () => _reactrouterdom.isRouteErrorResponse,
-  matchPath: () => _reactrouterdom.matchPath,
-  matchRoutes: () => _reactrouterdom.matchRoutes,
-  renderMatches: () => _reactrouterdom.renderMatches,
-  resolvePath: () => _reactrouterdom.resolvePath,
-  createPath: () => _reactrouterdom.createPath,
-  unstable_useBlocker: () => _reactrouterdom.unstable_useBlocker,
-  unstable_usePrompt: () => _reactrouterdom.unstable_usePrompt,
+  createRoutesFromChildren: () => _router.createRoutesFromChildren,
+  createRoutesFromElements: () => _router.createRoutesFromElements,
+  createSearchParams: () => _router.createSearchParams,
+  generatePath: () => _router.generatePath,
+  isRouteErrorResponse: () => _router.isRouteErrorResponse,
+  matchPath: () => _router.matchPath,
+  matchRoutes: () => _router.matchRoutes,
+  renderMatches: () => _router.renderMatches,
+  resolvePath: () => _router.resolvePath,
+  createPath: () => _router.createPath,
+  unstable_useBlocker: () => _router.unstable_useBlocker,
+  unstable_usePrompt: () => _router.unstable_usePrompt,
   defer: () => _router.defer,
   json: () => _router.json,
   redirect: () => _router.redirect
 });
-const _reactrouterdom = require("react-router-dom");
+const _export_star = require("@swc/helpers/_/_export_star");
+const _router = require("@modern-js/utils/runtime/router");
 const _plugin = require("./plugin");
-_export_star(require("./withRouter"), exports);
+_export_star._(require("./withRouter"), exports);
 const _PrefetchLink = require("./PrefetchLink");
-const _router = require("@modern-js/utils/runtime/router");
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
 const _default = _plugin.routerPlugin;
 const useRouteLoaderData = (routeId) => {
   const realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
-  return (0, _reactrouterdom.useRouteLoaderData)(realRouteId);
+  return (0, _router.useRouteLoaderData)(realRouteId);
 };

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

@@ -15,18 +15,14 @@ _export(exports, {
   modifyRoutes: () => modifyRoutes,
   routerPlugin: () => routerPlugin
 });
+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 _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
+const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
+const _router = require("@modern-js/utils/runtime/router");
+const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
 const _runtimebrowser = require("@modern-js/utils/runtime-browser");
 const _hooks = require("./hooks");
 const _utils = require("./utils");
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 let finalRouteConfig = {
   routes: []
 };
@@ -54,8 +50,8 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
       return {
         init({ context }, next) {
           context.router = {
-            useMatches: _reactrouterdom.useMatches,
-            useLocation: _reactrouterdom.useLocation
+            useMatches: _router.useMatches,
+            useLocation: _router.useLocation
           };
           Object.defineProperty(context, "routes", {
             get() {
@@ -76,7 +72,7 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
             return (props) => {
               var _window__SERVER_DATA;
               beforeCreateRouter = false;
-              routes = createRoutes ? createRoutes() : (0, _reactrouterdom.createRoutesFromElements)((0, _utils.renderRoutes)({
+              routes = createRoutes ? createRoutes() : (0, _router.createRoutesFromElements)((0, _utils.renderRoutes)({
                 routesConfig: finalRouteConfig,
                 props
               }));
@@ -91,16 +87,16 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
                   errors: (0, _utils.deserializeErrors)(hydrationData.errors)
                 };
               }
-              const router = supportHtml5History ? (0, _reactrouterdom.createBrowserRouter)(routes, {
+              const router = supportHtml5History ? (0, _router.createBrowserRouter)(routes, {
                 basename: _basename,
                 hydrationData
-              }) : (0, _reactrouterdom.createHashRouter)(routes, {
+              }) : (0, _router.createHashRouter)(routes, {
                 basename: _basename,
                 hydrationData
               });
               return /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
                 ...props,
-                children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.RouterProvider, {
+                children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.RouterProvider, {
                   router
                 })
               });

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

@@ -14,61 +14,18 @@ _export(exports, {
   routerPlugin: () => routerPlugin,
   modifyRoutes: () => modifyRoutes
 });
+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 _router = require("@modern-js/utils/runtime/router");
-const _server = require("react-router-dom/server");
-const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
-const _reactrouterdom = require("react-router-dom");
+const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
+const _remixrouter = require("@modern-js/utils/runtime/remix-router");
+const _router = require("@modern-js/utils/runtime-node/router");
+const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
+const _router1 = require("@modern-js/utils/runtime/router");
 const _core = require("../../core");
 const _utils = require("./utils");
 const _fetch = require("./fetch");
 const _hooks = require("./hooks");
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
 (0, _fetch.installGlobals)();
 function createFetchRequest(req) {
   const origin = `${req.protocol}://${req.host}`;
@@ -113,11 +70,11 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           const { request, mode: ssrMode } = context.ssrContext;
           const baseUrl = request.baseUrl;
           const _basename = baseUrl === "/" ? (0, _utils.urlJoin)(baseUrl, basename) : baseUrl;
-          const routes = createRoutes ? createRoutes() : (0, _reactrouterdom.createRoutesFromElements)((0, _utils.renderRoutes)({
+          const routes = createRoutes ? createRoutes() : (0, _router1.createRoutesFromElements)((0, _utils.renderRoutes)({
             routesConfig,
             ssrMode
           }));
-          const { query } = (0, _router.createStaticHandler)(routes, {
+          const { query } = (0, _remixrouter.createStaticHandler)(routes, {
             basename: _basename
           });
           const remixRequest = createFetchRequest(request);
@@ -125,7 +82,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           if (routerContext instanceof Response) {
             return routerContext;
           }
-          const router = (0, _server.createStaticRouter)(routes, routerContext);
+          const router = (0, _router.createStaticRouter)(routes, routerContext);
           context.router = router;
           context.routerContext = routerContext;
           context.routes = routes;
@@ -147,7 +104,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
               const { router, routerContext } = (0, _react.useContext)(_core.RuntimeReactContext);
               return /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
                 ...props,
-                children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_server.StaticRouterProvider, {
+                children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.StaticRouterProvider, {
                   router,
                   context: routerContext,
                   hydrate: false

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

@@ -2,17 +2,5 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-_export_star(require("react-router-dom/server"), exports);
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
+const _export_star = require("@swc/helpers/_/_export_star");
+_export_star._(require("@modern-js/utils/runtime-node/router"), exports);

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

@@ -18,17 +18,14 @@ _export(exports, {
   serializeErrors: () => serializeErrors,
   deserializeErrors: () => deserializeErrors
 });
+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 _react = /* @__PURE__ */ _interop_require_default._(require("react"));
 const _router = require("@modern-js/utils/runtime/router");
+const _remixrouter = require("@modern-js/utils/runtime/remix-router");
+const _nestedroutes = require("@modern-js/utils/runtime/nested-routes");
 const _DefaultNotFound = require("./DefaultNotFound");
-const _DeferredDataScripts = /* @__PURE__ */ _interop_require_default(require("./DeferredDataScripts"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _DeferredDataScripts = /* @__PURE__ */ _interop_require_default._(require("./DeferredDataScripts"));
 function getRouteComponents(routes, { globalApp, ssrMode, props }) {
   const Layout = ({ Component, ...props2 }) => {
     const GlobalLayout = globalApp;
@@ -45,13 +42,13 @@ function getRouteComponents(routes, { globalApp, ssrMode, props }) {
   const routeElements = [];
   for (const route of routes) {
     if (route.type === "nested") {
-      const routeElement = (0, _router.renderNestedRoute)(route, {
+      const routeElement = (0, _nestedroutes.renderNestedRoute)(route, {
         DeferredDataComponent: ssrMode === "stream" ? _DeferredDataScripts.default : void 0,
         props
       });
       routeElements.push(routeElement);
     } else {
-      const routeElement = /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Route, {
+      const routeElement = /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.Route, {
         path: route.path,
         element: /* @__PURE__ */ (0, _jsxruntime.jsx)(Layout, {
           Component: route.component
@@ -60,7 +57,7 @@ function getRouteComponents(routes, { globalApp, ssrMode, props }) {
       routeElements.push(routeElement);
     }
   }
-  routeElements.push(/* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Route, {
+  routeElements.push(/* @__PURE__ */ (0, _jsxruntime.jsx)(_router.Route, {
     path: "*",
     element: /* @__PURE__ */ (0, _jsxruntime.jsx)(_DefaultNotFound.DefaultNotFound, {})
   }, "*"));
@@ -144,7 +141,7 @@ function deserializeErrors(errors) {
   const serialized = {};
   for (const [key, val] of entries) {
     if (val && val.__type === "RouteErrorResponse") {
-      serialized[key] = new _router.ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
+      serialized[key] = new _remixrouter.ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
     } else if (val && val.__type === "Error") {
       const error = new Error(val.message);
       error.stack = val.stack;

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

@@ -6,19 +6,15 @@ Object.defineProperty(exports, "withRouter", {
   enumerable: true,
   get: () => withRouter
 });
+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");
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
+const _router = require("@modern-js/utils/runtime/router");
 const withRouter = (Component) => {
   return (props) => {
-    const location = (0, _reactrouterdom.useLocation)();
-    const params = (0, _reactrouterdom.useParams)();
-    const navigate = (0, _reactrouterdom.useNavigate)();
+    const location = (0, _router.useLocation)();
+    const params = (0, _router.useParams)();
+    const navigate = (0, _router.useNavigate)();
     return /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {
       ...props,
       location,