fix react compile error

element36-io · Apr 19, 2024 · 2e8f09c · 2e8f09c
1 parent 17b6d05
commit 2e8f09c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 33 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -3,36 +3,36 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@ant-design/icons": "~4.2.1",
-    "@testing-library/jest-dom": "~4.2.4",
-    "@testing-library/react": "~9.3.2",
-    "@testing-library/user-event": "~7.1.2",
-    "@types/history": "~4.7.6",
-    "@types/jest": "~24.0.0",
-    "@types/node": "~12.0.0",
-    "@types/react": "~16.9.0",
-    "@types/react-dom": "~16.9.0",
-    "@types/react-redux": "~7.1.9",
-    "@types/react-router-dom": "~5.1.5",
-    "@types/redux": "~3.6.0",
-    "@types/redux-thunk": "~2.1.0",
-    "antd": "~4.2.4",
-    "craco": "~0.0.3",
+    "@ant-design/icons": "^4.2.1",
+    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/react": "^9.3.2",
+    "@testing-library/user-event": "^7.1.2",
+    "@types/history": "^4.7.6",
+    "@types/jest": "^24.0.0",
+    "@types/node": "^12.0.0",
+    "@types/react": "^16.9.0",
+    "@types/react-dom": "^16.9.0",
+    "@types/react-redux": "^7.1.9",
+    "@types/react-router-dom": "^5.1.5",
+    "@types/redux": "^3.6.0",
+    "@types/redux-thunk": "^2.1.0",
+    "antd": "^4.2.4",
+    "craco": "^0.0.3",
     "craco-less": "1.16",
-    "history": "~4.10.1",
-    "js-base64": "~2.5.2",
-    "lodash": "~4.17.19",
-    "map-keys-deep-lodash": "~1.2.2",
-    "prettier": "~2.0.5",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1",
-    "react-json-tree": "~0.11.2",
-    "react-redux": "~7.2.0",
-    "react-router-dom": "~5.2.0",
+    "history": "^4.10.1",
+    "js-base64": "^2.5.2",
+    "lodash": "^4.17.19",
+    "map-keys-deep-lodash": "^1.2.2",
+    "prettier": "^2.0.5",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "react-json-tree": "^0.11.2",
+    "react-redux": "^7.2.0",
+    "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.1",
-    "redux": "~4.0.5",
-    "redux-thunk": "~2.3.0",
-    "redux-thunk-recursion-detect": "~1.1.4",
+    "redux": "^4.0.5",
+    "redux-thunk": "^2.3.0",
+    "redux-thunk-recursion-detect": "^1.1.4",
     "typescript": "~3.7.2"
   },
   "scripts": {
@@ -60,6 +60,6 @@
     ]
   },
   "devDependencies": {
-    "eslint-config-airbnb-typescript-prettier": "~2.1.1"
+    "eslint-config-airbnb-typescript-prettier": "^2.1.1"
   }
 }
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -18,7 +18,6 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { Route, Router } from 'react-router-dom';
 import history from './history';
-import { History } from 'history';
 import Pages from './routes/Pages';
 import { checkAuthentication } from './actions/auth';
 import { Store } from './types';
@@ -36,7 +35,7 @@ const App = ({ checkAuthenticationConnect, isAuthenticated }: Props) => {
 
   const app =
     isAuthenticated !== null ? (
-      <Router history={history as History<unknown>}>
+      <Router history={history}>
         <Route component={Pages} />
       </Router>
     ) : null;

diff --git a/frontend/src/history.tsx b/frontend/src/history.tsx
@@ -15,14 +15,14 @@
  */
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { createBrowserHistory, History } from 'history';
+import { createBrowserHistory, History,LocationState } from 'history';
 
 declare global {
   interface Window {
     dataLayer: any;
   }
 }
 
-const history: History<unknown> = createBrowserHistory();
+const history: History<undefined> = createBrowserHistory();
 
 export default history;