refactor: use the official version of react-router (#7612)

Author: yimingjfe

packages/runtime/plugin-runtime/package.json

@@ -94,13 +94,13 @@
     "./router": {
       "types": "./dist/types/router/index.d.ts",
       "jsnext:source": "./src/router/index.ts",
+      "react-server": {
+        "types": "./dist/types/router/runtime/rsc.d.ts",
+        "jsnext:source": "./src/router/runtime/rsc.ts",
+        "default": "./dist/esm/router/runtime/rsc.js"
+      },
       "default": "./dist/esm/router/index.js"
     },
-    "./router/rsc": {
-      "types": "./dist/types/router/runtime/rsc.d.ts",
-      "jsnext:source": "./src/router/runtime/rsc.ts",
-      "default": "./dist/esm/router/runtime/rsc.js"
-    },
     "./router/server": {
       "types": "./dist/types/router/runtime/server.d.ts",
       "jsnext:source": "./src/router/runtime/server.ts",
@@ -111,6 +111,11 @@
       "jsnext:source": "./src/router/internal.ts",
       "default": "./dist/esm/router/internal.js"
     },
+    "./routerHelper": {
+      "types": "./dist/types/router/helper.d.ts",
+      "jsnext:source": "./src/router/runtime/routerHelper.ts",
+      "default": "./dist/esm/router/runtime/routerHelper.js"
+    },
     "./loadable-bundler-plugin": {
       "types": "./dist/types/cli/ssr/loadable-bundler-plugin.d.ts",
       "jsnext:source": "./src/cli/ssr/loadable-bundler-plugin.ts",

packages/runtime/plugin-runtime/src/core/browser/hydrate.tsx

@@ -59,10 +59,7 @@ export function hydrateRoot(
 
   function stringSSRHydrate() {
     // client render and server prefetch use same logic
-    if (
-      renderLevel === RenderLevel.CLIENT_RENDER ||
-      renderLevel === RenderLevel.SERVER_PREFETCH
-    ) {
+    if (renderLevel === RenderLevel.CLIENT_RENDER) {
       return ModernRender(wrapRuntimeContextProvider(App, context));
     } else if (renderLevel === RenderLevel.SERVER_RENDER) {
       return new Promise<Root | HTMLElement>(resolve => {

packages/runtime/plugin-runtime/src/core/constants.ts

@@ -1,6 +1,5 @@
 export enum RenderLevel {
   CLIENT_RENDER = 0,
-  SERVER_PREFETCH = 1,
   SERVER_RENDER = 2,
 }
 

packages/runtime/plugin-runtime/src/router/cli/code/templates.ts

@@ -469,7 +469,7 @@ export const fileSystemRoutes = async ({
   await fs.writeJSON(loadersMapFile, loadersMap);
 
   const importRuntimeRouterCode = `
-    import { createShouldRevalidate, handleRouteModule,  handleRouteModuleError} from '@${metaName}/runtime/router';
+    import { createShouldRevalidate, handleRouteModule,  handleRouteModuleError} from '@${metaName}/runtime/routerHelper';
   `;
   const routeModulesCode = `
     if(typeof document !== 'undefined'){

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

@@ -10,12 +10,6 @@ export const useRouteLoaderData: typeof useRouteData = (routeId: string) => {
   return useRouteData(realRouteId);
 };
 
-export {
-  createShouldRevalidate,
-  handleRouteModule,
-  handleRouteModuleError,
-} from './routeModule';
-
 export * from './withRouter';
 
 export type { LoaderFunction, LoaderFunctionArgs } from './types';

packages/runtime/plugin-runtime/src/router/runtime/routeModule.ts renamed to packages/runtime/plugin-runtime/src/router/runtime/routerHelper.ts

@@ -224,7 +224,7 @@
     "@modern-js/utils": "workspace:*",
     "@swc/helpers": "^0.5.17",
     "lru-cache": "^10.4.3",
-    "react-router": "0.0.0-experimental-3f68c7c20",
+    "react-router": "7.8.2",
     "serialize-javascript": "^6.0.2"
   },
   "peerDependencies": {

packages/toolkit/runtime-utils/package.json

@@ -1 +1,2 @@
-export * from 'react-router/rsc';
+// Here import the server APIs for the react-router
+export * from 'react-router';