Skip to content

Commit

Permalink
Merge pull request #7661 from blink1073/react-16.9
Browse files Browse the repository at this point in the history
Use consistent versions of React
  • Loading branch information
Steven Silvester committed Dec 20, 2019
2 parents 28cef06 + 3d82eaa commit aa09c52
Show file tree
Hide file tree
Showing 26 changed files with 65 additions and 38 deletions.
4 changes: 2 additions & 2 deletions dev_mode/package.json
Expand Up @@ -178,8 +178,8 @@
"@lumino/signaling": "^1.3.2",
"@lumino/virtualdom": "^1.2.1",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0",
"react-dom": "~16.12.0"
"react": "~16.9.0",
"react-dom": "~16.9.0"
},
"engines": {
"node": ">=6.11.5"
Expand Down
4 changes: 2 additions & 2 deletions examples/app/package.json
Expand Up @@ -39,8 +39,8 @@
"@jupyterlab/tooltip-extension": "^2.0.0-alpha.4",
"@jupyterlab/ui-components-extension": "^2.0.0-alpha.4",
"es6-promise": "~4.2.8",
"react": "~16.12.0",
"react-dom": "~16.12.0"
"react": "~16.9.0",
"react-dom": "~16.9.0"
},
"devDependencies": {
"css-loader": "~3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/application-extension/package.json
Expand Up @@ -41,7 +41,7 @@
"@jupyterlab/coreutils": "^4.0.0-alpha.4",
"@lumino/algorithm": "^1.2.1",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/apputils/package.json
Expand Up @@ -49,12 +49,12 @@
"@lumino/virtualdom": "^1.2.1",
"@lumino/widgets": "^1.9.4",
"@types/react": "~16.9.16",
"react": "~16.12.0",
"react-dom": "~16.12.0",
"react": "~16.9.0",
"react-dom": "~16.9.0",
"sanitize-html": "~1.20.1"
},
"devDependencies": {
"@types/react-dom": "^16.9.4",
"@types/react-dom": "~16.9.4",
"@types/sanitize-html": "^1.20.2",
"rimraf": "~3.0.0",
"typedoc": "^0.15.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/cells/package.json
Expand Up @@ -52,7 +52,7 @@
"@lumino/signaling": "^1.3.2",
"@lumino/virtualdom": "^1.2.1",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"@types/react": "~16.9.16",
Expand Down
2 changes: 1 addition & 1 deletion packages/codemirror/package.json
Expand Up @@ -46,7 +46,7 @@
"@lumino/signaling": "^1.3.2",
"@lumino/widgets": "^1.9.4",
"codemirror": "~5.49.2",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"@types/codemirror": "^0.0.76",
Expand Down
2 changes: 1 addition & 1 deletion packages/docmanager/package.json
Expand Up @@ -47,7 +47,7 @@
"@lumino/properties": "^1.1.4",
"@lumino/signaling": "^1.3.2",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/documentsearch/package.json
Expand Up @@ -44,7 +44,7 @@
"@lumino/signaling": "^1.3.2",
"@lumino/widgets": "^1.9.4",
"codemirror": "~5.49.2",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/extensionmanager/package.json
Expand Up @@ -39,7 +39,7 @@
"@jupyterlab/services": "^5.0.0-alpha.4",
"@jupyterlab/ui-components": "^2.0.0-alpha.4",
"@lumino/messaging": "^1.3.1",
"react": "~16.12.0",
"react": "~16.9.0",
"react-paginate": "^6.3.2",
"semver": "^6.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/filebrowser/package.json
Expand Up @@ -51,7 +51,7 @@
"@lumino/polling": "^1.0.1",
"@lumino/signaling": "^1.3.2",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/fileeditor/package.json
Expand Up @@ -42,7 +42,7 @@
"@lumino/coreutils": "^1.4.0",
"@lumino/messaging": "^1.3.1",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/help-extension/package.json
Expand Up @@ -43,7 +43,7 @@
"@jupyterlab/mainmenu": "^2.0.0-alpha.4",
"@jupyterlab/services": "^5.0.0-alpha.4",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/htmlviewer/package.json
Expand Up @@ -37,7 +37,7 @@
"@jupyterlab/docregistry": "^2.0.0-alpha.4",
"@lumino/coreutils": "^1.4.0",
"@lumino/signaling": "^1.3.2",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/json-extension/package.json
Expand Up @@ -40,14 +40,14 @@
"@lumino/coreutils": "^1.4.0",
"@lumino/messaging": "^1.3.1",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0",
"react-dom": "~16.12.0",
"react": "~16.9.0",
"react-dom": "~16.9.0",
"react-highlighter": "^0.4.3",
"react-json-tree": "^0.11.2"
},
"devDependencies": {
"@types/react": "~16.9.16",
"@types/react-dom": "^16.9.4",
"@types/react-dom": "~16.9.4",
"@types/react-highlighter": "^0.3.4",
"@types/react-json-tree": "^0.6.11",
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/launcher/package.json
Expand Up @@ -43,7 +43,7 @@
"@lumino/disposable": "^1.3.2",
"@lumino/properties": "^1.1.4",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"@types/react": "~16.9.16",
Expand Down
2 changes: 1 addition & 1 deletion packages/logconsole-extension/package.json
Expand Up @@ -46,7 +46,7 @@
"@lumino/coreutils": "^1.4.0",
"@lumino/signaling": "^1.3.2",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/notebook/package.json
Expand Up @@ -54,7 +54,7 @@
"@lumino/signaling": "^1.3.2",
"@lumino/virtualdom": "^1.2.1",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/running/package.json
Expand Up @@ -39,7 +39,7 @@
"@lumino/coreutils": "^1.4.0",
"@lumino/disposable": "^1.3.2",
"@lumino/signaling": "^1.3.2",
"react": "~16.12.0"
"react": "~16.9.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/settingeditor/package.json
Expand Up @@ -46,12 +46,12 @@
"@lumino/messaging": "^1.3.1",
"@lumino/signaling": "^1.3.2",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0",
"react-dom": "~16.12.0"
"react": "~16.9.0",
"react-dom": "~16.9.0"
},
"devDependencies": {
"@types/react": "~16.9.16",
"@types/react-dom": "^16.9.4",
"@types/react-dom": "~16.9.4",
"rimraf": "~3.0.0",
"typedoc": "^0.15.4",
"typescript": "~3.7.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/statusbar-extension/package.json
Expand Up @@ -50,7 +50,7 @@
},
"devDependencies": {
"@types/react": "~16.9.16",
"@types/react-dom": "^16.9.4",
"@types/react-dom": "~16.9.4",
"rimraf": "~3.0.0",
"typedoc": "^0.15.4",
"typescript": "~3.7.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/statusbar/package.json
Expand Up @@ -43,7 +43,7 @@
"@lumino/polling": "^1.0.1",
"@lumino/signaling": "^1.3.2",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0",
"react": "~16.9.0",
"typestyle": "^2.0.4"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-components/package.json
Expand Up @@ -41,7 +41,7 @@
"@lumino/messaging": "^1.3.1",
"@lumino/virtualdom": "^1.2.1",
"@lumino/widgets": "^1.9.4",
"react": "~16.12.0",
"react": "~16.9.0",
"typestyle": "^2.0.4"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/vdom/package.json
Expand Up @@ -42,12 +42,12 @@
"@lumino/messaging": "^1.3.1",
"@lumino/widgets": "^1.9.4",
"@nteract/transform-vdom": "^4.0.3",
"react": "~16.12.0",
"react-dom": "~16.12.0"
"react": "~16.9.0",
"react-dom": "~16.9.0"
},
"devDependencies": {
"@types/react": "~16.9.16",
"@types/react-dom": "^16.9.4",
"@types/react-dom": "~16.9.4",
"rimraf": "~3.0.0",
"typedoc": "^0.15.4",
"typescript": "~3.7.3"
Expand Down
2 changes: 1 addition & 1 deletion tests/package.json
Expand Up @@ -40,7 +40,7 @@
"expect.js": "~0.3.1",
"json-to-html": "~0.1.2",
"karma-babel-preprocessor": "^8.0.1",
"react": "~16.12.0",
"react": "~16.9.0",
"simulate-event": "~1.4.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion tests/test-apputils/package.json
Expand Up @@ -24,7 +24,7 @@
"chai": "^4.2.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"react": "~16.12.0",
"react": "~16.9.0",
"simulate-event": "~1.4.0",
"ts-jest": "^24.2.0"
},
Expand Down
33 changes: 30 additions & 3 deletions yarn.lock
Expand Up @@ -2912,7 +2912,7 @@
"@types/history" "*"
"@types/react" "*"

"@types/react-dom@^16.9.4":
"@types/react-dom@~16.9.4":
version "16.9.4"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df"
integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw==
Expand Down Expand Up @@ -12829,7 +12829,7 @@ react-docgen@^4.1.1:
node-dir "^0.1.10"
recast "^0.17.3"

react-dom@^16.8.3, react-dom@~16.12.0:
react-dom@^16.8.3:
version "16.12.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11"
integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==
Expand All @@ -12839,6 +12839,16 @@ react-dom@^16.8.3, react-dom@~16.12.0:
prop-types "^15.6.2"
scheduler "^0.18.0"

react-dom@~16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.15.0"

react-draggable@^4.0.3:
version "4.2.0"
resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.2.0.tgz#40cc5209082ca7d613104bf6daf31372cc0e1114"
Expand Down Expand Up @@ -12990,7 +13000,7 @@ react-transition-group@^2.9.0:
prop-types "^15.6.2"
react-lifecycles-compat "^3.0.4"

react@^16.8.3, react@~16.12.0:
react@^16.8.3:
version "16.12.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
Expand All @@ -12999,6 +13009,15 @@ react@^16.8.3, react@~16.12.0:
object-assign "^4.1.1"
prop-types "^15.6.2"

react@~16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"

read-cmd-shim@^1.0.1:
version "1.0.5"
resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
Expand Down Expand Up @@ -13659,6 +13678,14 @@ sax@^1.2.4, sax@~1.2.4:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==

scheduler@^0.15.0:
version "0.15.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"
integrity sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

scheduler@^0.18.0:
version "0.18.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"
Expand Down

0 comments on commit aa09c52

Please sign in to comment.