chore: upgrade react-router and export all react-router APIs

.changeset/rude-flowers-drum.md

@@ -0,0 +1,9 @@
+---
+'@modern-js/plugin-garfish': patch
+'@modern-js/runtime': patch
+'@modern-js/runtime-utils': patch
+'@modern-js/plugin-ssg': patch
+---
+
+chore: upgrade react-router and export all react-router APIs
+chore: 升级 react-router 相关依赖，并导出所有 react-router API

packages/cli/plugin-ssg/package.json

@@ -91,7 +91,7 @@
     "jest": "^29",
     "react": "^18",
     "react-dom": "^18",
-    "react-router-dom": "6.17.0",
+    "react-router-dom": "6.22.0",
     "typescript": "^5"
   },
   "sideEffects": false,

packages/runtime/plugin-garfish/package.json

@@ -106,7 +106,7 @@
     "jest-fetch-mock": "^3.0.3",
     "react": "^18",
     "react-dom": "^18",
-    "react-router-dom": "6.17.0",
+    "react-router-dom": "6.22.0",
     "typescript": "^5"
   },
   "sideEffects": false,

packages/runtime/plugin-runtime/src/router/runtime/index.ts

@@ -2,6 +2,8 @@ import { useRouteLoaderData as useRouteData } from '@modern-js/runtime-utils/rou
 import { routerPlugin } from './plugin';
 import type { SingleRouteConfig, RouterConfig } from './types';
 
+export * from '@modern-js/runtime-utils/router';
+
 export type { SingleRouteConfig, RouterConfig };
 export { renderRoutes } from './utils';
 
@@ -26,133 +28,3 @@ export {
 } from './routeModule';
 
 export type { LoaderFunction, LoaderFunctionArgs } from './types';
-
-// Note: Keep in sync with react-router-dom exports!
-export type {
-  // below are react-router-dom exports
-  FormEncType,
-  FormMethod,
-  GetScrollRestorationKeyFunction,
-  ParamKeyValuePair,
-  SubmitOptions,
-  URLSearchParamsInit,
-  FetcherWithComponents,
-  BrowserRouterProps,
-  HashRouterProps,
-  HistoryRouterProps,
-  FormProps,
-  ScrollRestorationProps,
-  SubmitFunction,
-
-  // below are react-router exports
-  ActionFunction,
-  ActionFunctionArgs,
-  AwaitProps,
-  unstable_Blocker,
-  unstable_BlockerFunction,
-  DataRouteMatch,
-  DataRouteObject,
-  Fetcher,
-  Hash,
-  IndexRouteObject,
-  IndexRouteProps,
-  JsonFunction,
-  LayoutRouteProps,
-  Location,
-  MemoryRouterProps,
-  NavigateFunction,
-  NavigateOptions,
-  NavigateProps,
-  Navigation,
-  Navigator,
-  NonIndexRouteObject,
-  OutletProps,
-  Params,
-  ParamParseKey,
-  Path,
-  PathMatch,
-  Pathname,
-  PathPattern,
-  PathRouteProps,
-  RedirectFunction,
-  RelativeRoutingType,
-  RouteMatch,
-  RouteObject,
-  RouteProps,
-  RouterProps,
-  RouterProviderProps,
-  RoutesProps,
-  Search,
-  ShouldRevalidateFunction,
-  To,
-} from '@modern-js/runtime-utils/router';
-
-// Note: Keep in sync with react-router-dom exports!
-export {
-  // Routers
-  createBrowserRouter,
-  createHashRouter,
-  createMemoryRouter,
-  RouterProvider,
-
-  // Router Components
-  BrowserRouter,
-  HashRouter,
-  MemoryRouter,
-  Router,
-
-  // Components
-  Await,
-  Form,
-  Navigate,
-  Outlet,
-  Route,
-  Routes,
-  ScrollRestoration,
-
-  // Hooks
-  useActionData,
-  useAsyncError,
-  useAsyncValue,
-  useBeforeUnload,
-  useFetcher,
-  useFetchers,
-  useFormAction,
-  useHref,
-  useInRouterContext,
-  useLinkClickHandler,
-  useLoaderData,
-  useLocation,
-  useMatch,
-  useMatches,
-  useNavigate,
-  useNavigation,
-  useNavigationType,
-  useOutlet,
-  useOutletContext,
-  useParams,
-  useResolvedPath,
-  useRevalidator,
-  useRouteError,
-  useRoutes,
-  useSearchParams,
-  useSubmit,
-  unstable_useViewTransitionState,
-
-  // Utilities
-  createRoutesFromChildren,
-  createRoutesFromElements,
-  createSearchParams,
-  generatePath,
-  isRouteErrorResponse,
-  matchPath,
-  matchRoutes,
-  renderMatches,
-  resolvePath,
-  createPath,
-  unstable_useBlocker,
-  unstable_usePrompt,
-  defer,
-  json,
-  redirect,
-} from '@modern-js/runtime-utils/router';

packages/toolkit/runtime-utils/package.json

@@ -159,8 +159,8 @@
     "@modern-js/utils": "workspace:*",
     "lru-cache": "^6.0.0",
     "serialize-javascript": "^6.0.0",
-    "react-router-dom": "6.17.0",
-    "@remix-run/router": "1.10.0",
+    "react-router-dom": "6.22.0",
+    "@remix-run/router": "1.15.0",
     "@swc/helpers": "0.5.3"
   },
   "peerDependencies": {

tests/e2e/builder/package.json

@@ -12,7 +12,7 @@
     "lodash": "^4.17.21",
     "react": "^18",
     "react-dom": "^18",
-    "react-router-dom": "6.17.0",
+    "react-router-dom": "6.22.0",
     "vue": "^3.3.4"
   },
   "devDependencies": {