chore: migrate react-diff-viewer to react-diff-viewer-continued for r…

…eact 18 upgrade (apache#22834)
PawankumarES · Feb 13, 2023 · 5f68e62 · 5f68e62
1 parent be5d192
commit 5f68e62
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 36 deletions.
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -164,7 +164,7 @@
     "react-checkbox-tree": "^1.8.0",
     "react-color": "^2.13.8",
     "react-datetime": "^3.2.0",
-    "react-diff-viewer": "^3.1.1",
+    "react-diff-viewer-continued": "^3.2.5",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
     "react-dom": "^16.13.0",

diff --git a/superset-frontend/plugins/plugin-chart-table/package.json b/superset-frontend/plugins/plugin-chart-table/package.json
@@ -28,8 +28,9 @@
   "dependencies": {
     "@react-icons/all-files": "^4.1.0",
     "@types/d3-array": "^2.9.0",
-    "@types/react-table": "^7.0.29",
     "@types/enzyme": "^3.10.5",
+    "@types/react-table": "^7.0.29",
+    "classnames": "^2.3.2",
     "d3-array": "^2.4.0",
     "match-sorter": "^6.3.0",
     "memoize-one": "^5.1.1",
@@ -41,10 +42,10 @@
     "@testing-library/react": "^11.2.0"
   },
   "peerDependencies": {
-    "@types/react": "*",
-    "@types/classnames": "*",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
+    "@types/classnames": "*",
+    "@types/react": "*",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"
   }

diff --git a/superset-frontend/src/dashboard/components/OverwriteConfirm/OverwriteConfirmModal.test.tsx b/superset-frontend/src/dashboard/components/OverwriteConfirm/OverwriteConfirmModal.test.tsx
@@ -29,7 +29,7 @@ import OverwriteConfirmModal from './OverwriteConfirmModal';
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);
 
-jest.mock('react-diff-viewer', () => () => (
+jest.mock('react-diff-viewer-continued', () => () => (
   <div data-test="mock-diff-viewer" />
 ));
 

diff --git a/superset-frontend/src/dashboard/components/OverwriteConfirm/OverwriteConfirmModal.tsx b/superset-frontend/src/dashboard/components/OverwriteConfirm/OverwriteConfirmModal.tsx
@@ -19,7 +19,7 @@
 import React, { useMemo, useCallback, RefObject, createRef } from 'react';
 import moment from 'moment';
 import { useDispatch } from 'react-redux';
-import ReactDiffViewer from 'react-diff-viewer';
+import ReactDiffViewer from 'react-diff-viewer-continued';
 import { useInView } from 'react-intersection-observer';
 import Modal from 'src/components/Modal';
 import Button from 'src/components/Button';