chore: remove server data parse in convention routes

web-infra-dev · Dec 20, 2024 · af76f9e · af76f9e
1 parent 95b026d
commit af76f9e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 35 deletions.
diff --git a/packages/runtime/plugin-router-v5/src/runtime/plugin.tsx b/packages/runtime/plugin-router-v5/src/runtime/plugin.tsx
@@ -23,17 +23,6 @@ import {
 import { modifyRoutesHook } from './hooks';
 import { getLocation, renderRoutes, urlJoin } from './utils';
 
-declare global {
-  interface Window {
-    _SERVER_DATA?: {
-      router: {
-        baseUrl: string;
-        params: Record<string, string>;
-      };
-    };
-  }
-}
-
 export type SingleRouteConfig = RouteProps & {
   redirect?: string;
   routes?: SingleRouteConfig[];
@@ -115,19 +104,12 @@ export const routerPlugin = (userConfig: RouterConfig = {}): Plugin => {
 
           const select = (pathname: string) =>
             serverBase.find(baseUrl => pathname.search(baseUrl) === 0) || '/';
-          if (isBrow) {
-            window._SERVER_DATA = parsedJSONFromElement(
-              '__MODERN_SERVER_DATA__',
-            );
-          }
+
           const getRouteApp = () => {
             if (isBrow) {
               return (props: any) => {
                 const runtimeContext = useContext(RuntimeReactContext);
-                const baseUrl = (
-                  window._SERVER_DATA?.router.baseUrl ||
-                  select(location.pathname)
-                ).replace(/^\/*/, '/');
+                const baseUrl = select(location.pathname).replace(/^\/*/, '/');
                 const basename =
                   baseUrl === '/'
                     ? urlJoin(

diff --git a/packages/runtime/plugin-runtime/src/router/runtime/plugin.tsx b/packages/runtime/plugin-runtime/src/router/runtime/plugin.tsx
@@ -47,7 +47,6 @@ export const routerPlugin = (
     },
     setup: api => {
       let routes: RouteObject[] = [];
-      window._SERVER_DATA = parsedJSONFromElement('__MODERN_SERVER_DATA__');
       return {
         beforeRender(context) {
           // for garfish plugin to get basename,
@@ -98,9 +97,7 @@ export const routerPlugin = (
                * _internalRouterBaseName: garfish plugin params, priority
                * basename: modern config file config
                */
-              const baseUrl = (
-                window._SERVER_DATA?.router.baseUrl || select(location.pathname)
-              ).replace(/^\/*/, '/');
+              const baseUrl = select(location.pathname).replace(/^\/*/, '/');
               const _basename =
                 baseUrl === '/'
                   ? urlJoin(

diff --git a/packages/runtime/plugin-runtime/src/router/runtime/types.ts b/packages/runtime/plugin-runtime/src/router/runtime/types.ts
@@ -6,17 +6,6 @@ import type {
 } from '@modern-js/runtime-utils/router';
 import type { NestedRoute, PageRoute } from '@modern-js/types';
 
-declare global {
-  interface Window {
-    _SERVER_DATA?: {
-      router: {
-        baseUrl: string;
-        params: Record<string, string>;
-      };
-    };
-  }
-}
-
 export type SingleRouteConfig = RouteProps & {
   redirect?: string;
   routes?: SingleRouteConfig[];