diff options
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | pnpm-lock.yaml | 22 | ||||
-rw-r--r-- | src/routes.tsx | 1 |
3 files changed, 12 insertions, 13 deletions
diff --git a/package.json b/package.json index 3f03de837..eed6be939 100644 --- a/package.json +++ b/package.json | |||
@@ -110,7 +110,7 @@ | |||
110 | "react-jss": "10.9.2", | 110 | "react-jss": "10.9.2", |
111 | "react-loader": "2.4.7", | 111 | "react-loader": "2.4.7", |
112 | "react-modal": "3.16.1", | 112 | "react-modal": "3.16.1", |
113 | "react-router-dom": "6.4.5", | 113 | "react-router-dom": "6.4.2", |
114 | "react-sortable-hoc": "2.0.0", | 114 | "react-sortable-hoc": "2.0.0", |
115 | "react-tooltip": "4.5.1", | 115 | "react-tooltip": "4.5.1", |
116 | "react-topbar-progress-indicator": "4.1.1", | 116 | "react-topbar-progress-indicator": "4.1.1", |
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index deecf380c..105cca0b3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml | |||
@@ -120,7 +120,7 @@ specifiers: | |||
120 | react-jss: 10.9.2 | 120 | react-jss: 10.9.2 |
121 | react-loader: 2.4.7 | 121 | react-loader: 2.4.7 |
122 | react-modal: 3.16.1 | 122 | react-modal: 3.16.1 |
123 | react-router-dom: 6.4.5 | 123 | react-router-dom: 6.4.2 |
124 | react-sortable-hoc: 2.0.0 | 124 | react-sortable-hoc: 2.0.0 |
125 | react-tooltip: 4.5.1 | 125 | react-tooltip: 4.5.1 |
126 | react-topbar-progress-indicator: 4.1.1 | 126 | react-topbar-progress-indicator: 4.1.1 |
@@ -208,7 +208,7 @@ dependencies: | |||
208 | react-jss: 10.9.2_react@17.0.2 | 208 | react-jss: 10.9.2_react@17.0.2 |
209 | react-loader: 2.4.7_sfoxds7t5ydpegc3knd667wn6m | 209 | react-loader: 2.4.7_sfoxds7t5ydpegc3knd667wn6m |
210 | react-modal: 3.16.1_sfoxds7t5ydpegc3knd667wn6m | 210 | react-modal: 3.16.1_sfoxds7t5ydpegc3knd667wn6m |
211 | react-router-dom: 6.4.5_sfoxds7t5ydpegc3knd667wn6m | 211 | react-router-dom: 6.4.2_sfoxds7t5ydpegc3knd667wn6m |
212 | react-sortable-hoc: 2.0.0_oxfzelaz5ynxsop2v2nu2h2m64 | 212 | react-sortable-hoc: 2.0.0_oxfzelaz5ynxsop2v2nu2h2m64 |
213 | react-tooltip: 4.5.1_sfoxds7t5ydpegc3knd667wn6m | 213 | react-tooltip: 4.5.1_sfoxds7t5ydpegc3knd667wn6m |
214 | react-topbar-progress-indicator: 4.1.1_react@17.0.2 | 214 | react-topbar-progress-indicator: 4.1.1_react@17.0.2 |
@@ -1992,8 +1992,8 @@ packages: | |||
1992 | '@octokit/openapi-types': 14.0.0 | 1992 | '@octokit/openapi-types': 14.0.0 |
1993 | dev: false | 1993 | dev: false |
1994 | 1994 | ||
1995 | /@remix-run/router/1.0.5: | 1995 | /@remix-run/router/1.0.2: |
1996 | resolution: {integrity: sha512-my0Mycd+jruq/1lQuO5LBB6WTlL/e8DTCYWp44DfMTDcXz8DcTlgF0ISaLsGewt+ctHN+yA8xMq3q/N7uWJPug==} | 1996 | resolution: {integrity: sha512-GRSOFhJzjGN+d4sKHTMSvNeUPoZiDHWmRnXfzaxrqe7dE/Nzlc8BiMSJdLDESZlndM7jIUrZ/F4yWqVYlI0rwQ==} |
1997 | engines: {node: '>=14'} | 1997 | engines: {node: '>=14'} |
1998 | dev: false | 1998 | dev: false |
1999 | 1999 | ||
@@ -10091,26 +10091,26 @@ packages: | |||
10091 | warning: 4.0.3 | 10091 | warning: 4.0.3 |
10092 | dev: false | 10092 | dev: false |
10093 | 10093 | ||
10094 | /react-router-dom/6.4.5_sfoxds7t5ydpegc3knd667wn6m: | 10094 | /react-router-dom/6.4.2_sfoxds7t5ydpegc3knd667wn6m: |
10095 | resolution: {integrity: sha512-a7HsgikBR0wNfroBHcZUCd9+mLRqZS8R5U1Z1mzLWxFXEkUT3vR1XXmSIVoVpxVX8Bar0nQYYYc9Yipq8dWwAA==} | 10095 | resolution: {integrity: sha512-yM1kjoTkpfjgczPrcyWrp+OuQMyB1WleICiiGfstnQYo/S8hPEEnVjr/RdmlH6yKK4Tnj1UGXFSa7uwAtmDoLQ==} |
10096 | engines: {node: '>=14'} | 10096 | engines: {node: '>=14'} |
10097 | peerDependencies: | 10097 | peerDependencies: |
10098 | react: '>=16.8' | 10098 | react: '>=16.8' |
10099 | react-dom: '>=16.8' | 10099 | react-dom: '>=16.8' |
10100 | dependencies: | 10100 | dependencies: |
10101 | '@remix-run/router': 1.0.5 | 10101 | '@remix-run/router': 1.0.2 |
10102 | react: 17.0.2 | 10102 | react: 17.0.2 |
10103 | react-dom: 17.0.2_react@17.0.2 | 10103 | react-dom: 17.0.2_react@17.0.2 |
10104 | react-router: 6.4.5_react@17.0.2 | 10104 | react-router: 6.4.2_react@17.0.2 |
10105 | dev: false | 10105 | dev: false |
10106 | 10106 | ||
10107 | /react-router/6.4.5_react@17.0.2: | 10107 | /react-router/6.4.2_react@17.0.2: |
10108 | resolution: {integrity: sha512-1RQJ8bM70YEumHIlNUYc6mFfUDoWa5EgPDenK/fq0bxD8DYpQUi/S6Zoft+9DBrh2xmtg92N5HMAJgGWDhKJ5Q==} | 10108 | resolution: {integrity: sha512-Rb0BAX9KHhVzT1OKhMvCDMw776aTYM0DtkxqUBP8dNBom3mPXlfNs76JNGK8wKJ1IZEY1+WGj+cvZxHVk/GiKw==} |
10109 | engines: {node: '>=14'} | 10109 | engines: {node: '>=14'} |
10110 | peerDependencies: | 10110 | peerDependencies: |
10111 | react: '>=16.8' | 10111 | react: '>=16.8' |
10112 | dependencies: | 10112 | dependencies: |
10113 | '@remix-run/router': 1.0.5 | 10113 | '@remix-run/router': 1.0.2 |
10114 | react: 17.0.2 | 10114 | react: 17.0.2 |
10115 | dev: false | 10115 | dev: false |
10116 | 10116 | ||
diff --git a/src/routes.tsx b/src/routes.tsx index e090012d8..04b6fa96f 100644 --- a/src/routes.tsx +++ b/src/routes.tsx | |||
@@ -51,7 +51,6 @@ class FerdiumRoutes extends Component<IProps> { | |||
51 | const errorProps = { error: routeProps.stores.globalError.error || {} }; | 51 | const errorProps = { error: routeProps.stores.globalError.error || {} }; |
52 | 52 | ||
53 | return ( | 53 | return ( |
54 | // @ts-expect-error Property 'encodeLocation' is missing in type 'HashHistory' but required in type 'History'. | ||
55 | <HistoryRouter history={history}> | 54 | <HistoryRouter history={history}> |
56 | <Routes> | 55 | <Routes> |
57 | <Route path="/auth" element={<AuthLayoutContainer {...routeProps} />}> | 56 | <Route path="/auth" element={<AuthLayoutContainer {...routeProps} />}> |