Merge branch 'master' into ts-react-json-tree

This commit is contained in:
Nathan Bierema 2020-05-07 18:37:02 -04:00
commit 9b54144fbc
2 changed files with 6 additions and 6 deletions

View File

@ -60,8 +60,8 @@
"babel-loader": "^8.0.5",
"eslint-plugin-jest": "^23.9.0",
"jest": "^24.1.0",
"react": "^15.0.0 || ^16.0.0",
"react-test-renderer": "^16.0.0",
"react": "^16.3.0",
"react-test-renderer": "^16.3.0",
"rimraf": "^2.5.2",
"terser-webpack-plugin": "^1.2.1",
"typescript": "^3.8.3",
@ -69,8 +69,8 @@
"webpack-cli": "^3.2.0"
},
"peerDependencies": {
"@types/react": "^15.0.0 || ^16.0.0",
"react": "^15.0.0 || ^16.0.0"
"@types/react": "^16.3.0",
"react": "^16.3.0"
},
"dependencies": {
"prop-types": "^15.5.8",

View File

@ -14000,7 +14000,7 @@ react-style-proptype@^3.2.2:
dependencies:
prop-types "^15.5.4"
react-test-renderer@^16.0.0, react-test-renderer@^16.0.0-0, react-test-renderer@^16.4.0:
react-test-renderer@^16.0.0, react-test-renderer@^16.0.0-0, react-test-renderer@^16.3.0, react-test-renderer@^16.4.0:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz#de25ea358d9012606de51e012d9742e7f0deabc1"
integrity sha512-Sn2VRyOK2YJJldOqoh8Tn/lWQ+ZiKhyZTPtaO0Q6yNj+QDbmRkVFap6pZPy3YQk8DScRDfyqm/KxKYP9gCMRiQ==
@ -14047,7 +14047,7 @@ react-treebeard@^3.1.0:
shallowequal "^1.1.0"
velocity-react "^1.4.1"
"react@^15.0.0 || ^16.0.0", react@^16.0.0, react@^16.4.0, react@^16.4.2, react@^16.7.0:
react@^16.0.0, react@^16.3.0, react@^16.4.0, react@^16.4.2, react@^16.7.0:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==