Skip to content

Commit 8693073

Browse files
committed
chore: rm redundant react-router-dom
1 parent f2b7b72 commit 8693073

File tree

6 files changed

+589
-520
lines changed

6 files changed

+589
-520
lines changed

package.json

-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"react-dom": "^19.0.0",
3939
"react-helmet-async": "^2.0.5",
4040
"react-router": "^7.1.1",
41-
"react-router-dom": "^7.1.1",
4241
"reflect-metadata": "^0.2.2",
4342
"universal-cookie-express": "^7.2.2",
4443
"url-join": "^5.0.0",
@@ -76,7 +75,6 @@
7675
"@types/node": "^22.10.2",
7776
"@types/react": "^19.0.2",
7877
"@types/react-dom": "^19.0.2",
79-
"@types/react-router-dom": "^5.3.3",
8078
"@types/require-from-string": "^1.2.3",
8179
"@types/serve-favicon": "^2.5.7",
8280
"@types/uuid": "^10.0.0",

src/client/components/@shared/app/layout/index.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Suspense } from 'react'
2-
import { Outlet, ScrollRestoration } from 'react-router-dom'
3-
import { Link } from 'react-router-dom'
2+
import { Outlet, Link, ScrollRestoration } from 'react-router'
43
import { Loader } from '@shared/loader'
54
import { useLayout } from './layout.hook'
65

src/client/index.tsx

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
import { createBrowserRouter, RouterProvider } from 'react-router-dom'
1+
import { createBrowserRouter, RouterProvider } from 'react-router'
22
import { App, routes } from '@shared/app'
3-
import { Loader } from '@shared/loader'
43
import { bootstrap } from 'client/utils'
54
import { basename } from 'src/common'
65

76
const AppContainer = () => (
87
<App nonce={window.nonce}>
9-
<RouterProvider
10-
router={createBrowserRouter(routes, { basename })}
11-
fallbackElement={<Loader />}
12-
/>
8+
<RouterProvider router={createBrowserRouter(routes, { basename })} />
139
</App>
1410
)
1511

src/server/middleware/render/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ChunkExtractor } from '@loadable/server'
22
import { renderToString } from 'react-dom/server'
33
import type { HelmetServerState } from 'react-helmet-async'
44
import type { NextFunction, Request, Response } from 'express'
5-
import { createStaticRouter, StaticRouterProvider, createStaticHandler } from 'react-router-dom'
5+
import { createStaticRouter, StaticRouterProvider, createStaticHandler } from 'react-router'
66
import { getApp, getHtml, getStats } from './render.util'
77
import { createFetchRequest } from 'server/utils'
88
import { basename, logger } from 'src/common'

src/server/middleware/render/render.util.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { FC } from 'react'
22
import { join, resolve } from 'path'
3-
import type { RouteObject } from 'react-router-dom'
3+
import type { RouteObject } from 'react-router'
44
import requireFromString from 'require-from-string'
55
import type { ServerResponse } from 'webpack-dev-middleware'
66
import type { ChunkExtractorOptions } from '@loadable/server'

0 commit comments

Comments
 (0)