Skip to content

Commit d41430d

Browse files
rvsiarvsia
committed
Update to React17
1 parent d2cc279 commit d41430d

File tree

13 files changed

+281
-144
lines changed

13 files changed

+281
-144
lines changed

‎config/jest.setup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { configure } from 'enzyme';
2-
import Adapter from 'enzyme-adapter-react-16';
2+
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
33

44
configure({ adapter: new Adapter() });
55
Element.prototype.scrollTo = () => {};

‎packages/ant-component-mapper/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"@data-driven-forms/react-form-renderer": "*",
3535
"@semantic-release/git": "^7.0.5",
3636
"@semantic-release/npm": "^5.1.1",
37+
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
3738
"antd": "^4.2.0",
3839
"babel-core": "^7.0.0-bridge.0",
3940
"babel-eslint": "9.x",
@@ -42,15 +43,14 @@
4243
"babel-plugin-lodash": "^3.3.4",
4344
"css-loader": "^1.0.1",
4445
"enzyme": "^3.7.0",
45-
"enzyme-adapter-react-16": "^1.7.0",
4646
"enzyme-to-json": "^3.3.4",
4747
"glob": "^7.1.6",
4848
"html-webpack-plugin": "^3.2.0",
4949
"mini-css-extract-plugin": "^0.4.4",
5050
"node-sass": "^4.10.0",
5151
"prop-types": "^15.6.2",
52-
"react": "^16.13.0",
53-
"react-dom": "^16.13.0",
52+
"react": "^17.0.2",
53+
"react-dom": "^17.0.2",
5454
"regenerator-runtime": "^0.12.1",
5555
"resolve-url-loader": "^3.0.0",
5656
"sass-loader": "^7.1.0",
@@ -72,8 +72,8 @@
7272
"peerDependencies": {
7373
"@data-driven-forms/react-form-renderer": ">=3.2.1",
7474
"antd": "^4.2.0",
75-
"react": ">=16.13.0",
76-
"react-dom": ">=16.13.0"
75+
"react": "^16.13.1 || ^17.0.2",
76+
"react-dom": "^16.13.1 || ^17.0.2"
7777
},
7878
"dependencies": {
7979
"@data-driven-forms/common": "*",

‎packages/blueprint-component-mapper/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"html-webpack-plugin": "^3.2.0",
4848
"mini-css-extract-plugin": "^0.4.4",
4949
"node-sass": "^4.10.0",
50-
"react": "^16.13.1",
51-
"react-dom": "^16.13.1",
50+
"react": "^17.0.2",
51+
"react-dom": "^17.0.2",
5252
"regenerator-runtime": "^0.12.1",
5353
"resolve-url-loader": "^3.0.0",
5454
"sass-loader": "^7.1.0",

‎packages/carbon-component-mapper/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"@semantic-release/git": "^7.0.5",
3939
"@semantic-release/npm": "^5.1.1",
4040
"@types/carbon-components-react": "^7.10.9",
41+
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
4142
"babel-core": "^7.0.0-bridge.0",
4243
"babel-eslint": "9.x",
4344
"babel-jest": "^23.6.0",
@@ -49,14 +50,13 @@
4950
"clsx": "^1.1.1",
5051
"css-loader": "^1.0.1",
5152
"enzyme": "^3.7.0",
52-
"enzyme-adapter-react-16": "^1.7.0",
5353
"enzyme-to-json": "^3.3.4",
5454
"glob": "^7.1.6",
5555
"html-webpack-plugin": "^3.2.0",
5656
"mini-css-extract-plugin": "^0.4.4",
5757
"node-sass": "^4.10.0",
58-
"react": "^16.13.1",
59-
"react-dom": "^16.13.1",
58+
"react": "^17.0.2",
59+
"react-dom": "^17.0.2",
6060
"regenerator-runtime": "^0.12.1",
6161
"resolve-url-loader": "^3.0.0",
6262
"sass-loader": "^7.1.0",

‎packages/common/config/jest.setup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import { configure } from 'enzyme';
2-
import Adapter from 'enzyme-adapter-react-16';
2+
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
33

44
configure({ adapter: new Adapter() });

‎packages/common/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@
2626
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
2727
"@babel/preset-env": "^7.1.6",
2828
"@babel/preset-react": "^7.0.0",
29+
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
2930
"babel-core": "^7.0.0-bridge.0",
3031
"babel-eslint": "9.x",
3132
"babel-jest": "^23.6.0",
3233
"babel-loader": "^8.0.4",
3334
"babel-plugin-lodash": "^3.3.4",
3435
"css-loader": "^1.0.1",
3536
"enzyme": "^3.7.0",
36-
"enzyme-adapter-react-16": "^1.7.0",
3737
"enzyme-to-json": "^3.3.4",
3838
"html-webpack-plugin": "^3.2.0",
3939
"mini-css-extract-plugin": "^0.4.4",
4040
"node-sass": "^4.10.0",
41-
"react": "^16.13.1",
42-
"react-dom": "^16.13.1",
41+
"react": "^17.0.2",
42+
"react-dom": "^17.0.2",
4343
"regenerator-runtime": "^0.12.1",
4444
"resolve-url-loader": "^3.0.0",
4545
"sass-loader": "^7.1.0",
@@ -58,7 +58,7 @@
5858
"prop-types": "^15.7.2"
5959
},
6060
"peerDependencies": {
61-
"react": ">=16.13.1",
62-
"react-dom": ">=16.13.1"
61+
"react": "^16.13.1 || ^17.0.2",
62+
"react-dom": "^16.13.1 || ^17.0.2"
6363
}
6464
}

‎packages/mui-component-mapper/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@
3535
"@material-ui/styles": "^4.10.0",
3636
"@semantic-release/git": "^7.0.5",
3737
"@semantic-release/npm": "^5.1.1",
38+
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
3839
"babel-core": "^7.0.0-bridge.0",
3940
"babel-eslint": "9.x",
4041
"babel-jest": "^23.6.0",
4142
"babel-loader": "^8.0.4",
4243
"babel-plugin-lodash": "^3.3.4",
4344
"css-loader": "^1.0.1",
4445
"enzyme": "^3.7.0",
45-
"enzyme-adapter-react-16": "^1.7.0",
4646
"enzyme-to-json": "^3.3.4",
4747
"glob": "^7.1.6",
4848
"html-webpack-plugin": "^3.2.0",
4949
"mini-css-extract-plugin": "^0.4.4",
5050
"node-sass": "^4.10.0",
51-
"react": "^16.13.1",
52-
"react-dom": "^16.13.1",
51+
"react": "^17.0.2",
52+
"react-dom": "^17.0.2",
5353
"regenerator-runtime": "^0.12.1",
5454
"resolve-url-loader": "^3.0.0",
5555
"sass-loader": "^7.1.0",
@@ -67,8 +67,8 @@
6767
"@material-ui/icons": "^4.9.1",
6868
"@material-ui/styles": "^4.9.14",
6969
"prop-types": ">=15.7.2",
70-
"react": ">=16.13.1",
71-
"react-dom": ">=16.13.1"
70+
"react": "^16.13.1 || ^17.0.2",
71+
"react-dom": "^16.13.1 || ^17.0.2"
7272
},
7373
"dependencies": {
7474
"@data-driven-forms/common": "*",

‎packages/pf4-component-mapper/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@
3939
"@patternfly/react-icons": "^4.9.5",
4040
"@semantic-release/git": "^7.0.5",
4141
"@semantic-release/npm": "^5.1.1",
42+
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
4243
"babel-core": "^7.0.0-bridge.0",
4344
"babel-eslint": "9.x",
4445
"babel-jest": "^23.6.0",
4546
"babel-loader": "^8.0.4",
4647
"babel-plugin-lodash": "^3.3.4",
4748
"css-loader": "^1.0.1",
4849
"enzyme": "^3.7.0",
49-
"enzyme-adapter-react-16": "^1.7.0",
5050
"enzyme-to-json": "^3.3.4",
5151
"glob": "^7.1.6",
5252
"html-webpack-plugin": "^3.2.0",
5353
"mini-css-extract-plugin": "^0.4.4",
5454
"node-sass": "^4.10.0",
55-
"react": "^16.13.1",
56-
"react-dom": "^16.13.1",
55+
"react": "^17.0.2",
56+
"react-dom": "^17.0.2",
5757
"regenerator-runtime": "^0.12.1",
5858
"resolve-url-loader": "^3.0.0",
5959
"sass-loader": "^7.1.0",

‎packages/react-form-renderer/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@
3535
"@babel/preset-react": "^7.0.0",
3636
"@semantic-release/git": "^7.0.5",
3737
"@semantic-release/npm": "^5.1.1",
38+
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
3839
"babel-core": "^7.0.0-bridge.0",
3940
"babel-eslint": "9.x",
4041
"babel-jest": "^23.6.0",
4142
"babel-loader": "^8.0.4",
4243
"babel-plugin-lodash": "^3.3.4",
4344
"css-loader": "^1.0.1",
4445
"enzyme": "^3.7.0",
45-
"enzyme-adapter-react-16": "^1.7.0",
4646
"enzyme-to-json": "^3.3.4",
4747
"glob": "^7.1.6",
4848
"html-webpack-plugin": "^3.2.0",
4949
"mini-css-extract-plugin": "^0.4.4",
5050
"node-sass": "^4.10.0",
51-
"react": "^16.13.1",
52-
"react-dom": "^16.13.1",
51+
"react": "^17.0.2",
52+
"react-dom": "^17.0.2",
5353
"regenerator-runtime": "^0.12.1",
5454
"resolve-url-loader": "^3.0.0",
5555
"rollup": "^1.23.1",
@@ -79,8 +79,8 @@
7979
"react-final-form-arrays": "^3.1.1"
8080
},
8181
"peerDependencies": {
82-
"react": ">=16.13.1",
83-
"react-dom": ">=16.13.1"
82+
"react": "^16.13.1 || ^17.0.2",
83+
"react-dom": "^16.13.1 || ^17.0.2"
8484
},
8585
"postpublish": "export RELEASE_DEMO=true"
8686
}

‎packages/react-renderer-demo/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"dependencies": {
3030
"@actions/github": "^5.0.0",
3131
"@babel/plugin-proposal-class-properties": "^7.12.1",
32-
"@data-driven-forms/form-builder": "0.0.11-rc3",
32+
"@data-driven-forms/form-builder": "0.0.12-rc1",
3333
"@data-driven-forms/mui-component-mapper": "*",
3434
"@data-driven-forms/react-form-renderer": "*",
3535
"@material-ui/core": "^4.11.0",
@@ -51,9 +51,9 @@
5151
"prism-react-renderer": "^1.1.1",
5252
"prop-types": "^15.7.2",
5353
"raw-loader": "^4.0.2",
54-
"react": "^16.13.1",
54+
"react": "^17.0.2",
5555
"react-copy-to-clipboard": "^5.0.2",
56-
"react-dom": "^16.13.1",
56+
"react-dom": "^17.0.2",
5757
"react-github-buttons": "^0.5.0",
5858
"react-sticky-box": "^0.9.3",
5959
"terser-webpack-plugin": "^4.2.3"

0 commit comments

Comments
 (0)