From 3d82eaa63e9a3fa338f617cd43bc5194628b474f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 19 Dec 2019 09:57:40 -0600 Subject: [PATCH] Use consistent versions of React --- dev_mode/package.json | 4 +-- examples/app/package.json | 4 +-- packages/application-extension/package.json | 2 +- packages/apputils/package.json | 6 ++-- packages/cells/package.json | 2 +- packages/codemirror/package.json | 2 +- packages/docmanager/package.json | 2 +- packages/documentsearch/package.json | 2 +- packages/extensionmanager/package.json | 2 +- packages/filebrowser/package.json | 2 +- packages/fileeditor/package.json | 2 +- packages/help-extension/package.json | 2 +- packages/htmlviewer/package.json | 2 +- packages/json-extension/package.json | 6 ++-- packages/launcher/package.json | 2 +- packages/logconsole-extension/package.json | 2 +- packages/notebook/package.json | 2 +- packages/running/package.json | 2 +- packages/settingeditor/package.json | 6 ++-- packages/statusbar-extension/package.json | 2 +- packages/statusbar/package.json | 2 +- packages/ui-components/package.json | 2 +- packages/vdom/package.json | 6 ++-- tests/package.json | 2 +- tests/test-apputils/package.json | 2 +- yarn.lock | 33 +++++++++++++++++++-- 26 files changed, 65 insertions(+), 38 deletions(-) diff --git a/dev_mode/package.json b/dev_mode/package.json index b9dc6921d0b0..c1b9200eb40f 100644 --- a/dev_mode/package.json +++ b/dev_mode/package.json @@ -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" diff --git a/examples/app/package.json b/examples/app/package.json index d746d34ba532..c60813535374 100644 --- a/examples/app/package.json +++ b/examples/app/package.json @@ -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", diff --git a/packages/application-extension/package.json b/packages/application-extension/package.json index d563bfa03b98..c2d8a8c86d1b 100644 --- a/packages/application-extension/package.json +++ b/packages/application-extension/package.json @@ -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", diff --git a/packages/apputils/package.json b/packages/apputils/package.json index 64a3fd6208d9..0a1849ef9622 100644 --- a/packages/apputils/package.json +++ b/packages/apputils/package.json @@ -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", diff --git a/packages/cells/package.json b/packages/cells/package.json index 6b6821d73125..714487a27066 100644 --- a/packages/cells/package.json +++ b/packages/cells/package.json @@ -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", diff --git a/packages/codemirror/package.json b/packages/codemirror/package.json index 5945592aba4e..e71f8b2935ec 100644 --- a/packages/codemirror/package.json +++ b/packages/codemirror/package.json @@ -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", diff --git a/packages/docmanager/package.json b/packages/docmanager/package.json index 5c0bf766085e..2bf6be86006d 100644 --- a/packages/docmanager/package.json +++ b/packages/docmanager/package.json @@ -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", diff --git a/packages/documentsearch/package.json b/packages/documentsearch/package.json index 3df0d024cce4..10e6bc7abcf9 100644 --- a/packages/documentsearch/package.json +++ b/packages/documentsearch/package.json @@ -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", diff --git a/packages/extensionmanager/package.json b/packages/extensionmanager/package.json index 2361510b2e87..b59e650f87a9 100644 --- a/packages/extensionmanager/package.json +++ b/packages/extensionmanager/package.json @@ -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" }, diff --git a/packages/filebrowser/package.json b/packages/filebrowser/package.json index b7a67c535484..907932ba3b9a 100644 --- a/packages/filebrowser/package.json +++ b/packages/filebrowser/package.json @@ -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", diff --git a/packages/fileeditor/package.json b/packages/fileeditor/package.json index 9a96ced2cd98..58d919c28b0f 100644 --- a/packages/fileeditor/package.json +++ b/packages/fileeditor/package.json @@ -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", diff --git a/packages/help-extension/package.json b/packages/help-extension/package.json index 79a7f34324dd..1565c4a0dda4 100644 --- a/packages/help-extension/package.json +++ b/packages/help-extension/package.json @@ -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", diff --git a/packages/htmlviewer/package.json b/packages/htmlviewer/package.json index 20eaec8963fc..159d335cca4a 100644 --- a/packages/htmlviewer/package.json +++ b/packages/htmlviewer/package.json @@ -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", diff --git a/packages/json-extension/package.json b/packages/json-extension/package.json index 182102c95a57..55e55d8d271c 100644 --- a/packages/json-extension/package.json +++ b/packages/json-extension/package.json @@ -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", diff --git a/packages/launcher/package.json b/packages/launcher/package.json index 4c4f5eb85d0e..bd27cd4147a0 100644 --- a/packages/launcher/package.json +++ b/packages/launcher/package.json @@ -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", diff --git a/packages/logconsole-extension/package.json b/packages/logconsole-extension/package.json index 9ef1f2567f58..d4e2e4e064c7 100644 --- a/packages/logconsole-extension/package.json +++ b/packages/logconsole-extension/package.json @@ -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", diff --git a/packages/notebook/package.json b/packages/notebook/package.json index 9448e534b8ab..954a6cdf0f7a 100644 --- a/packages/notebook/package.json +++ b/packages/notebook/package.json @@ -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", diff --git a/packages/running/package.json b/packages/running/package.json index 79ab9a581be3..268dce913648 100644 --- a/packages/running/package.json +++ b/packages/running/package.json @@ -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", diff --git a/packages/settingeditor/package.json b/packages/settingeditor/package.json index c2aa2f2cd8ed..5a519da75560 100644 --- a/packages/settingeditor/package.json +++ b/packages/settingeditor/package.json @@ -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" diff --git a/packages/statusbar-extension/package.json b/packages/statusbar-extension/package.json index f720eba734ba..5a26b0a58744 100644 --- a/packages/statusbar-extension/package.json +++ b/packages/statusbar-extension/package.json @@ -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" diff --git a/packages/statusbar/package.json b/packages/statusbar/package.json index 25d9a9cbd90b..f07488643b14 100644 --- a/packages/statusbar/package.json +++ b/packages/statusbar/package.json @@ -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": { diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json index 3515ba51a025..4b9c10a0e238 100644 --- a/packages/ui-components/package.json +++ b/packages/ui-components/package.json @@ -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": { diff --git a/packages/vdom/package.json b/packages/vdom/package.json index a141d3e63761..54d279c3cf8e 100644 --- a/packages/vdom/package.json +++ b/packages/vdom/package.json @@ -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" diff --git a/tests/package.json b/tests/package.json index 0be2a5d4cac3..2af304d7f435 100644 --- a/tests/package.json +++ b/tests/package.json @@ -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": { diff --git a/tests/test-apputils/package.json b/tests/test-apputils/package.json index e6328e3506dc..8e789e4f364d 100644 --- a/tests/test-apputils/package.json +++ b/tests/test-apputils/package.json @@ -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" }, diff --git a/yarn.lock b/yarn.lock index 0ba2ee19be94..8f8d53ef15ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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== @@ -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== @@ -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" @@ -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== @@ -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" @@ -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"