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.

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

[core] Update to React 17 #1331

Merged
merged 5 commits into from
Apr 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ defaults: &defaults
REACT_DIST_TAG: << parameters.react-dist-tag >>
working_directory: /tmp/material-ui-x
docker:
- image: circleci/node:10
- image: circleci/node:12
# CircleCI has disabled the cache across forks for security reasons.
# Following their official statement, it was a quick solution, they
# are working on providing this feature back with appropriate security measures.
Expand Down
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
"prismjs": "^1.17.1",
"prop-types": "^15.7.2",
"raw-loader": "^1.0.0",
"react": "^16.13.0",
"react": "^17.0.2",
"react-docgen": "^5.0.0-beta.1",
"react-dom": "^16.13.0",
"react-is": "^16.13.0",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react-redux": "^7.1.1",
"react-router": "^5.0.0",
"react-router-dom": "^5.0.1",
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"@babel/register": "^7.10.5",
"@emotion/cache": "^11.1.3",
"@emotion/react": "^11.1.5",
"@eps1lon/enzyme-adapter-react-17": "^0.1.0",
"@material-ui/core": "^4.9.12",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.54",
Expand All @@ -60,7 +61,6 @@
"@types/chai": "^4.2.3",
"@types/chai-dom": "^0.0.10",
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^26.0.14",
"@types/mocha": "^8.0.3",
"@types/node": "^14.11.10",
Expand All @@ -81,10 +81,9 @@
"concurrently": "^6.0.0",
"cross-env": "^7.0.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^7.4.0",
"eslint-config-airbnb-typescript": "^12.3.1",
"eslint-config-prettier": "^7.1.0",
"eslint-config-prettier": "^8.1.0",
"eslint-import-resolver-webpack": "^0.12.2",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
Expand All @@ -109,8 +108,8 @@
"playwright": "^1.6.1",
"prettier": "^2.0.5",
"pretty-format-v24": "npm:pretty-format@24",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"rollup": "^2.28.2",
"rollup-plugin-cleaner": "^1.0.0",
"rollup-plugin-command": "^1.1.3",
Expand Down
1 change: 0 additions & 1 deletion packages/grid/data-grid/src/tests/layout.DataGrid.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,6 @@ describe('<DataGrid /> - Layout & Warnings', () => {
}).toErrorDev([
'The data grid component requires all rows to have a unique id property',
'The above error occurred in the <ForwardRef(GridComponent)> component',
'The above error occurred in the <ForwardRef(GridComponent)> component',
]);
expect((errorRef.current as any).errors).to.have.length(1);
expect((errorRef.current as any).errors[0].toString()).to.include(
Expand Down
20 changes: 10 additions & 10 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
"@material-ui/x-grid": "^4.0.0-alpha.24",
"@material-ui/x-grid-data-generator": "^4.0.0-alpha.24",
"@material-ui/x-license": "^4.0.0-alpha.21",
"react": "^16.13.1",
"react-is": "^16.13.1",
"react": "^17.0.2",
"react-is": "^17.0.2",
"rxjs": "^6.5.5",
"styled-components": "^5.1.0"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@storybook/addon-a11y": "^6.1.9",
"@storybook/addon-actions": "^6.1.9",
"@storybook/addon-a11y": "^6.2.2",
"@storybook/addon-actions": "^6.2.2",
"@storybook/addon-console": "^1.2.2",
"@storybook/addon-docs": "^6.1.9",
"@storybook/addon-essentials": "^6.1.9",
"@storybook/addon-storysource": "^6.1.9",
"@storybook/addon-viewport": "^6.1.9",
"@storybook/react": "^6.1.9",
"@storybook/theming": "^6.1.9",
"@storybook/addon-docs": "^6.2.2",
"@storybook/addon-essentials": "^6.2.2",
"@storybook/addon-storysource": "^6.2.2",
"@storybook/addon-viewport": "^6.2.2",
"@storybook/react": "^6.2.2",
"@storybook/theming": "^6.2.2",
"babel-loader": "^8.1.0",
"core-js": "^3.6.5",
"react-docgen-typescript-loader": "^3.7.2",
Expand Down
Loading