Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: migrate react-diff-viewer to react-diff-viewer-continued for react 18 upgrade #22834

Merged
merged 3 commits into from
Jan 26, 2023
Merged

chore: migrate react-diff-viewer to react-diff-viewer-continued for react 18 upgrade #22834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
180064c
chore: migrate react-diff-viewer to react-diff-viewer-continued for r…
Jan 23, 2023
14d2328
add classnames to plugin-chart-table
Jan 24, 2023
05887a6
Merge remote-tracking branch 'origin/master' into lily/add-react-diff…
Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 61 additions & 30 deletions superset-frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion superset-frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 4 additions & 3 deletions superset-frontend/plugins/plugin-chart-table/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/dashboard/components/OverwriteConfirm/OverwriteConfirmModal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
));

Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/dashboard/components/OverwriteConfirm/OverwriteConfirmModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down