Skip to content

Commit

Permalink
chore: Update mui and plugins versions (#3632)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lykoi18
Lykoi18 authored Jan 26, 2023
1 parent be4b12a commit 15f2d60
Show file tree
Hide file tree
Showing 19 changed files with 617 additions and 1,067 deletions.
2 changes: 1 addition & 1 deletion packages/dx-chart-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"jest-environment-jsdom": "^29.2.2",
"rollup": "^1.27.2",
"rollup-plugin-license": "^0.12.1",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.31.0",
"ts-jest": "^29.0.3",
"tslib": "^2.4.1",
"tslint": "^5.20.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"prettier": "^1.19.1",
"rollup": "^1.27.2",
"rollup-plugin-license": "^0.12.1",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.31.0",
"ts-jest": "^29.0.3",
"tslib": "^2.4.1",
"tslint": "^5.20.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-grid-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"jest": "^29.2.2",
"rollup": "^1.27.2",
"rollup-plugin-license": "^0.12.1",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.31.0",
"seamless-immutable": "^7.1.4",
"ts-jest": "^29.0.3",
"tslib": "^2.4.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/dx-react-chart-demos/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"@devexpress/dx-react-core": "4.0.2",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.4",
"@mui/material": "^5.0.4",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.6",
"@types/react": "^17.0.30",
"@types/react-dom": "^17.0.9",
"clsx": "^1.0.4",
Expand All @@ -61,7 +61,7 @@
"redux": "^4.0.4",
"regenerator-runtime": "^0.13.3",
"seamless-immutable": "^7.1.4",
"svg-sprite-loader": "^4.1.6",
"svg-sprite-loader": "^6.0.11",
"tslint": "^5.20.1",
"tslint-config-prettier": "^1.18.0",
"tslint-react": "^4.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/dx-react-chart-material-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
"@devexpress/dx-testing": "4.0.2",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.4",
"@mui/material": "^5.0.4",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.6",
"@rollup/plugin-node-resolve": "^7.1.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
"babel-core": "^7.0.0-bridge.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"rollup": "^1.27.2",
"rollup-plugin-babel": "^4.3.3",
"rollup-plugin-license": "^0.12.1",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.31.0",
"ts-jest": "^29.0.3",
"tslib": "^2.4.1",
"tslint": "^5.20.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"react-test-renderer": "^17.0.2",
"rollup": "^1.27.2",
"rollup-plugin-license": "^0.12.1",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.31.0",
"ts-jest": "^29.0.3",
"tslib": "^2.4.1",
"tslint": "^5.20.1",
Expand Down
7 changes: 4 additions & 3 deletions packages/dx-react-grid-demos/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@
"@devexpress/dx-react-grid-material-ui": "4.0.2",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.4",
"@mui/lab": "^5.0.0-alpha.51",
"@mui/material": "^5.0.4",
"@mui/icons-material": "^5.11.0",
"@mui/lab": "^5.0.0-alpha.117",
"@mui/material": "^5.11.6",
"@mui/x-date-pickers": "^5.0.15",
"@types/react": "^17.0.30",
"@types/react-dom": "^17.0.9",
"clsx": "^1.1.1",
Expand Down
6 changes: 3 additions & 3 deletions ...react-grid-demos/src/demo-sources/grid-editing/material-ui/detail-row-editing.partial.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import Edit from '@mui/icons-material/Edit';
import Cancel from '@mui/icons-material/Close';
import IconButton from '@mui/material/IconButton';
import MenuItem from '@mui/material/MenuItem';
import DatePicker from '@mui/lab/DatePicker';
import LocalizationProvider from '@mui/lab/LocalizationProvider';
import AdapterMoment from '@mui/lab/AdapterMoment';
import { DatePicker } from '@mui/x-date-pickers/DatePicker';
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';

// BLOCK:imports

Expand Down
6 changes: 3 additions & 3 deletions ...s/dx-react-grid-demos/src/demo-sources/grid-editing/material-ui/popup-editing.partial.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import DialogTitle from '@mui/material/DialogTitle';
import MuiGrid from '@mui/material/Grid';
// eslint-disable-next-line
import moment from 'moment';
import DatePicker from '@mui/lab/DatePicker';
import LocalizationProvider from '@mui/lab/LocalizationProvider';
import AdapterMoment from '@mui/lab/AdapterMoment';
import { DatePicker } from '@mui/x-date-pickers/DatePicker';
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
// BLOCK:imports

// BLOCK:dialog
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-grid-export/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"react-test-renderer": "^17.0.2",
"rollup": "^1.27.2",
"rollup-plugin-license": "^0.12.1",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.31.0",
"ts-jest": "^29.0.3",
"tslint": "^5.20.1",
"tslint-config-airbnb": "^5.11.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/dx-react-grid-material-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"@devexpress/dx-testing": "4.0.2",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.0",
"@mui/material": "^5.0.4",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.6",
"@rollup/plugin-node-resolve": "^7.1.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
"babel-core": "^7.0.0-bridge.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-grid/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"react-test-renderer": "^17.0.2",
"rollup": "^1.27.2",
"rollup-plugin-license": "^0.12.1",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.31.0",
"ts-jest": "^29.0.3",
"tslib": "^2.4.1",
"tslint": "^5.20.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/dx-react-scheduler-demos/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"@devexpress/dx-react-scheduler-material-ui": "4.0.2",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.4",
"@mui/lab": "^5.0.0-alpha.51",
"@mui/material": "^5.0.4",
"@mui/x-date-pickers": "^5.0.0-alpha.7",
"@mui/icons-material": "^5.11.0",
"@mui/lab": "^5.0.0-alpha.117",
"@mui/material": "^5.11.6",
"@mui/x-date-pickers": "^5.0.15",
"@types/react": "^17.0.30",
"@types/react-dom": "^17.0.9",
"clsx": "^1.0.4",
Expand Down
12 changes: 6 additions & 6 deletions packages/dx-react-scheduler-material-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
"@devexpress/dx-testing": "4.0.2",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.4",
"@mui/lab": "^5.0.0-alpha.51",
"@mui/material": "^5.0.4",
"@mui/x-date-pickers": "^5.0.0-alpha.7",
"@mui/icons-material": "^5.11.0",
"@mui/lab": "^5.0.0-alpha.117",
"@mui/material": "^5.11.6",
"@mui/x-date-pickers": "^5.0.15",
"@rollup/plugin-node-resolve": "^7.1.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
"babel-core": "^7.0.0-bridge.0",
Expand Down Expand Up @@ -107,9 +107,9 @@
"@emotion/react": ">=11.4.1",
"@emotion/styled": ">=11.3.0",
"@mui/icons-material": ">=5.0.0",
"@mui/lab": "^5.0.0-alpha.50",
"@mui/lab": "^5.0.0-alpha.117",
"@mui/material": ">=5.0.0",
"@mui/x-date-pickers": "^5.0.0-alpha.7",
"@mui/x-date-pickers": "^5.0.15",
"moment": "^2.24.0",
"react": ">=17.0.2"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/dx-react-scheduler-material-ui/src/templates/appointment/split-indicator.test.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ describe('Appointment', () => {
});
it('should pass rest props to the root element', () => {
const tree = shallow((
<SplitIndicator {...defaultProps} a={{ a: 1 }} />
<SplitIndicator {...defaultProps} data={{ a: 1 }} />
));

expect(tree.props().a)
expect(tree.props().data)
.toMatchObject({ a: 1 });
});
it('should pass className', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-scheduler-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"rollup-plugin-babel": "^4.3.3",
"rollup-plugin-license": "^0.12.1",
"rollup-plugin-modify": "^3.0.0",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.31.0",
"tslib": "^2.4.1",
"typescript": "^4.8.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-site/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"gatsby-plugin-react-helmet": "^3.1.22",
"gatsby-plugin-react-svg": "^3.0.0",
"gatsby-plugin-sass": "^2.1.29",
"gatsby-plugin-sharp": "^2.4.5",
"gatsby-plugin-sharp": "^3.15.0",
"gatsby-remark-external-links": "^0.0.4",
"gatsby-remark-images": "^3.1.44",
"gatsby-remark-prismjs": "^3.3.31",
Expand Down
Loading

0 comments on commit 15f2d60

Please sign in to comment.