chore: remove router field in runtimeContext (#6497)

web-infra-dev · Nov 6, 2024 · fe9264a · fe9264a
1 parent 268d2a4
commit fe9264a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 48 deletions.
diff --git a/packages/runtime/plugin-runtime/src/core/context/runtime.ts b/packages/runtime/plugin-runtime/src/core/context/runtime.ts
@@ -42,17 +42,14 @@ export const ServerRouterContext = createContext({} as any);
 
 export interface TRuntimeContext extends Partial<BaseRuntimeContext> {
   initialData?: Record<string, unknown>;
+  isBrowser: boolean;
   context: TSSRContext;
   /** @deprecated use context.request field instead */
   request?: SSRServerContext['request'];
   /** @deprecated use context.response field instead */
   response?: SSRServerContext['response'];
   // store type
   store?: Store;
-  router?: {
-    navigate: Router['navigate'];
-    location: RouterState['location'];
-  };
   [key: string]: any;
 }
 

diff --git a/packages/runtime/plugin-runtime/src/router/runtime/plugin.node.tsx b/packages/runtime/plugin-runtime/src/router/runtime/plugin.node.tsx
@@ -180,27 +180,6 @@ export const routerPlugin = (
 
           return getRouteApp();
         },
-        pickContext: pickedContext => {
-          const { remixRouter } = pickedContext;
-
-          // remixRouter is not existed in conventional routes
-          if (!remixRouter) {
-            return pickedContext;
-          }
-
-          // only export partial common API from remix-router
-          const router = {
-            navigate: remixRouter.navigate,
-            get location() {
-              return remixRouter.state.location;
-            },
-          };
-
-          return {
-            ...pickedContext,
-            router,
-          };
-        },
       };
     },
   };

diff --git a/packages/runtime/plugin-runtime/src/router/runtime/plugin.tsx b/packages/runtime/plugin-runtime/src/router/runtime/plugin.tsx
@@ -194,29 +194,6 @@ export const routerPlugin = (
 
           return getRouteApp();
         },
-        pickContext: pickedContext => {
-          const { remixRouter } = pickedContext;
-
-          // two scenarios: 1. remixRouter is not existed in conventional routes;
-          // 2. useRuntimeContext can be called by users before hoc hooks execute
-          if (!remixRouter) {
-            return pickedContext;
-          }
-
-          // only export partial common API from remix-router
-          const router = {
-            ...pickedContext.router,
-            navigate: remixRouter.navigate,
-            get location() {
-              return remixRouter.state.location;
-            },
-          };
-
-          return {
-            ...pickedContext,
-            router,
-          };
-        },
       };
     },
   };