浏览代码

Upgrade to React 17

Thibault Derousseaux 4 年之前
父节点
当前提交
39592d10ab

+ 2 - 2
dev_mode/package.json

@@ -116,8 +116,8 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/virtualdom": "^1.7.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "dependencies": {
     "@jupyterlab/application": "~3.0.0-rc.6",

+ 2 - 2
examples/app/package.json

@@ -40,8 +40,8 @@
     "@jupyterlab/translation-extension": "^3.0.0-rc.6",
     "@jupyterlab/ui-components-extension": "^3.0.0-rc.6",
     "es6-promise": "~4.2.8",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "devDependencies": {
     "css-loader": "~3.2.0",

+ 2 - 2
examples/federated/core_package/package.json

@@ -107,8 +107,8 @@
     "@lumino/signaling": "^1.3.5",
     "@lumino/virtualdom": "^1.6.1",
     "@lumino/widgets": "^1.11.1",
-    "react": "~16.9.0",
-    "react-dom": "~16.9.0"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "dependencies": {
     "@jupyterlab/application": "^3.0.0-rc.6",

+ 2 - 2
jupyterlab/staging/package.json

@@ -116,8 +116,8 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/virtualdom": "^1.7.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "dependencies": {
     "@jupyterlab/application": "~3.0.0-rc.6",

+ 1 - 1
packages/application-extension/package.json

@@ -48,7 +48,7 @@
     "@lumino/coreutils": "^1.5.3",
     "@lumino/disposable": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",

+ 4 - 4
packages/apputils/package.json

@@ -61,17 +61,17 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/virtualdom": "^1.7.3",
     "@lumino/widgets": "^1.14.0",
-    "@types/react": "~16.9.48",
+    "@types/react": "^16.9.48",
     "buffer": "^5.6.0",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
     "sanitize-html": "~1.27.4",
     "url": "^0.11.0"
   },
   "devDependencies": {
     "@jupyterlab/testutils": "^3.0.0-rc.6",
     "@types/jest": "^26.0.10",
-    "@types/react-dom": "~16.9.8",
+    "@types/react-dom": "^16.9.8",
     "@types/sanitize-html": "^1.23.3",
     "jest": "^26.4.2",
     "rimraf": "~3.0.0",

+ 2 - 2
packages/cells/package.json

@@ -59,12 +59,12 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/virtualdom": "^1.7.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "@jupyterlab/testutils": "^3.0.0-rc.6",
     "@types/jest": "^26.0.10",
-    "@types/react": "~16.9.48",
+    "@types/react": "^16.9.48",
     "jest": "^26.4.2",
     "rimraf": "~3.0.0",
     "ts-jest": "^26.3.0",

+ 1 - 1
packages/codemirror/package.json

@@ -54,7 +54,7 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
     "codemirror": "~5.57.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "@jupyterlab/testutils": "^3.0.0-rc.6",

+ 1 - 1
packages/debugger-extension/package.json

@@ -66,7 +66,7 @@
     "@jupyterlab/testutils": "^3.0.0-rc.6",
     "@types/codemirror": "^0.0.97",
     "@types/jest": "^26.0.10",
-    "@types/react-dom": "~16.9.8",
+    "@types/react-dom": "^16.9.8",
     "jest": "^26.4.2",
     "jest-junit": "^11.1.0",
     "jest-raw-loader": "^1.0.1",

+ 2 - 2
packages/debugger/package.json

@@ -69,7 +69,7 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
     "codemirror": "~5.57.0",
-    "react": "~16.13.1",
+    "react": "^17.0.1",
     "vscode-debugprotocol": "^1.37.0"
   },
   "devDependencies": {
@@ -78,7 +78,7 @@
     "@jupyterlab/testutils": "^3.0.0-rc.6",
     "@types/codemirror": "^0.0.97",
     "@types/jest": "^26.0.10",
-    "@types/react-dom": "~16.9.8",
+    "@types/react-dom": "^16.9.8",
     "@types/text-encoding": "^0.0.35",
     "canvas": "^2.6.1",
     "jest": "^26.4.2",

+ 1 - 1
packages/docmanager/package.json

@@ -53,7 +53,7 @@
     "@lumino/properties": "^1.2.3",
     "@lumino/signaling": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "@jupyterlab/testutils": "^3.0.0-rc.6",

+ 1 - 1
packages/documentsearch/package.json

@@ -47,7 +47,7 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
     "codemirror": "~5.57.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",

+ 2 - 2
packages/extensionmanager-extension/examples/listings/package.json

@@ -39,8 +39,8 @@
     "@jupyterlab/tooltip-extension": "^2.0.2",
     "@jupyterlab/ui-components-extension": "^2.0.2",
     "es6-promise": "~4.2.8",
-    "react": "~16.9.0",
-    "react-dom": "~16.9.0"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "devDependencies": {
     "css-loader": "~3.2.0",

+ 1 - 1
packages/extensionmanager/package.json

@@ -45,7 +45,7 @@
     "@lumino/messaging": "^1.4.3",
     "@lumino/polling": "^1.3.3",
     "@lumino/signaling": "^1.4.3",
-    "react": "~16.13.1",
+    "react": "^17.0.1",
     "react-paginate": "^6.3.2",
     "semver": "^7.3.2"
   },

+ 1 - 1
packages/filebrowser/package.json

@@ -59,7 +59,7 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/virtualdom": "^1.7.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "@jupyterlab/testutils": "^3.0.0-rc.6",

+ 1 - 1
packages/fileeditor/package.json

@@ -49,7 +49,7 @@
     "@lumino/coreutils": "^1.5.3",
     "@lumino/messaging": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "@jupyterlab/testutils": "^3.0.0-rc.6",

+ 1 - 1
packages/help-extension/package.json

@@ -45,7 +45,7 @@
     "@jupyterlab/translation": "^3.0.0-rc.6",
     "@jupyterlab/ui-components": "^3.0.0-rc.6",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",

+ 1 - 1
packages/htmlviewer/package.json

@@ -39,7 +39,7 @@
     "@jupyterlab/ui-components": "^3.0.0-rc.6",
     "@lumino/coreutils": "^1.5.3",
     "@lumino/signaling": "^1.4.3",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",

+ 4 - 4
packages/json-extension/package.json

@@ -41,14 +41,14 @@
     "@lumino/coreutils": "^1.5.3",
     "@lumino/messaging": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
     "react-highlighter": "^0.4.3",
     "react-json-tree": "^0.12.1"
   },
   "devDependencies": {
-    "@types/react": "~16.9.48",
-    "@types/react-dom": "~16.9.8",
+    "@types/react": "^16.9.48",
+    "@types/react-dom": "^16.9.8",
     "@types/react-highlighter": "^0.3.4",
     "@types/react-json-tree": "^0.6.11",
     "rimraf": "~3.0.0",

+ 2 - 2
packages/launcher/package.json

@@ -44,10 +44,10 @@
     "@lumino/disposable": "^1.4.3",
     "@lumino/properties": "^1.2.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
-    "@types/react": "~16.9.48",
+    "@types/react": "^16.9.48",
     "rimraf": "~3.0.0",
     "typedoc": "0.17.0-3",
     "typescript": "~4.0.2"

+ 1 - 1
packages/logconsole-extension/package.json

@@ -47,7 +47,7 @@
     "@lumino/coreutils": "^1.5.3",
     "@lumino/signaling": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",

+ 1 - 1
packages/notebook/package.json

@@ -61,7 +61,7 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/virtualdom": "^1.7.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "@jupyterlab/testutils": "^3.0.0-rc.6",

+ 1 - 1
packages/property-inspector/package.json

@@ -40,7 +40,7 @@
     "@lumino/disposable": "^1.4.3",
     "@lumino/signaling": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",

+ 1 - 1
packages/running/package.json

@@ -41,7 +41,7 @@
     "@lumino/coreutils": "^1.5.3",
     "@lumino/disposable": "^1.4.3",
     "@lumino/signaling": "^1.4.3",
-    "react": "~16.13.1"
+    "react": "^17.0.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",

+ 4 - 4
packages/settingeditor/package.json

@@ -48,12 +48,12 @@
     "@lumino/messaging": "^1.4.3",
     "@lumino/signaling": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "devDependencies": {
-    "@types/react": "~16.9.48",
-    "@types/react-dom": "~16.9.8",
+    "@types/react": "^16.9.48",
+    "@types/react-dom": "^16.9.8",
     "rimraf": "~3.0.0",
     "typedoc": "0.17.0-3",
     "typescript": "~4.0.2"

+ 2 - 2
packages/statusbar-extension/package.json

@@ -50,8 +50,8 @@
     "@lumino/widgets": "^1.14.0"
   },
   "devDependencies": {
-    "@types/react": "~16.9.48",
-    "@types/react-dom": "~16.9.8",
+    "@types/react": "^16.9.48",
+    "@types/react-dom": "^16.9.8",
     "rimraf": "~3.0.0",
     "typedoc": "0.17.0-3",
     "typescript": "~4.0.2"

+ 1 - 1
packages/statusbar/package.json

@@ -50,7 +50,7 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
     "csstype": "~3.0.3",
-    "react": "~16.13.1",
+    "react": "^17.0.1",
     "typestyle": "^2.0.4"
   },
   "devDependencies": {

+ 4 - 7
packages/toc/package.json

@@ -38,9 +38,6 @@
     "test:debug:watch": "node --inspect-brk node_modules/.bin/jest --runInBand --watch",
     "watch": "tsc -b --watch"
   },
-  "resolutions": {
-    "@types/react": "~16.4.13"
-  },
   "dependencies": {
     "@jupyterlab/apputils": "^3.0.0-rc.6",
     "@jupyterlab/cells": "^3.0.0-rc.6",
@@ -57,16 +54,16 @@
     "@lumino/messaging": "^1.4.3",
     "@lumino/signaling": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.10.2",
     "@babel/preset-env": "^7.10.2",
     "@jupyterlab/testutils": "^3.0.0-rc.6",
     "@types/jest": "^26.0.10",
-    "@types/react": "~16.9.48",
-    "@types/react-dom": "~16.9.8",
+    "@types/react": "^16.9.48",
+    "@types/react-dom": "^16.9.8",
     "jest": "^26.4.2",
     "rimraf": "~3.0.0",
     "ts-jest": "^26.3.0",

+ 4 - 4
packages/ui-components/package.json

@@ -49,8 +49,8 @@
     "@lumino/signaling": "^1.4.3",
     "@lumino/virtualdom": "^1.7.3",
     "@lumino/widgets": "^1.14.0",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
     "typestyle": "^2.0.4"
   },
   "devDependencies": {
@@ -60,7 +60,7 @@
     "@storybook/addon-actions": "^6.0.19",
     "@storybook/react": "^6.0.19",
     "@types/jest": "^26.0.10",
-    "@types/react": "~16.9.48",
+    "@types/react": "^16.9.48",
     "@types/webpack-env": "^1.14.1",
     "awesome-typescript-loader": "^5.2.1",
     "babel-loader": "^8.0.6",
@@ -73,7 +73,7 @@
     "typescript": "~4.0.2"
   },
   "peerDependencies": {
-    "react": "~16.9.0"
+    "react": "^17.0.1"
   },
   "publishConfig": {
     "access": "public"

+ 4 - 4
packages/vdom/package.json

@@ -42,12 +42,12 @@
     "@lumino/messaging": "^1.4.3",
     "@lumino/widgets": "^1.14.0",
     "@nteract/transform-vdom": "^4.0.16-alpha.0",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "devDependencies": {
-    "@types/react": "~16.9.48",
-    "@types/react-dom": "~16.9.8",
+    "@types/react": "^16.9.48",
+    "@types/react-dom": "^16.9.8",
     "rimraf": "~3.0.0",
     "typedoc": "0.17.0-3",
     "typescript": "~4.0.2"

+ 32 - 7
yarn.lock

@@ -3262,7 +3262,7 @@
     "@types/react" "*"
     "@types/reactcss" "*"
 
-"@types/react-dom@~16.9.8":
+"@types/react-dom@^16.9.8":
   version "16.9.8"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
   integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==
@@ -3297,10 +3297,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@~16.9.48":
-  version "16.9.48"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.48.tgz#d3387329f070d1b1bc0ff4a54a54ceefd5a8485c"
-  integrity sha512-4ykBVswgYitPGMXFRxJCHkxJDU2rjfU3/zw67f8+dB7sNdVJXsrwqoYxz/stkAucymnEEbRPFmX7Ce5Mc/kJCw==
+"@types/react@*", "@types/react@^16.9.48":
+  version "16.9.53"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.53.tgz#40cd4f8b8d6b9528aedd1fff8fcffe7a112a3d23"
+  integrity sha512-4nW60Sd4L7+WMXH1D6jCdVftuW7j4Za6zdp6tJ33Rqv0nk1ZAmQKML9ZLD4H0dehA3FZxXR/GM8gXplf82oNGw==
   dependencies:
     "@types/prop-types" "*"
     csstype "^3.0.2"
@@ -12903,7 +12903,7 @@ react-docgen@^5.0.0:
     node-dir "^0.1.10"
     strip-indent "^3.0.0"
 
-react-dom@^16.8.3, react-dom@~16.13.1:
+react-dom@^16.8.3:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
   integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
@@ -12913,6 +12913,15 @@ react-dom@^16.8.3, react-dom@~16.13.1:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
+react-dom@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
+  integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    scheduler "^0.20.1"
+
 react-draggable@^4.0.3:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"
@@ -13054,7 +13063,7 @@ react-transition-group@^2.9.0:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
-react@^16.8.3, react@~16.13.1:
+react@^16.8.3:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
   integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
@@ -13063,6 +13072,14 @@ react@^16.8.3, react@~16.13.1:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
+react@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
+  integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
 reactcss@^1.2.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
@@ -13693,6 +13710,14 @@ scheduler@^0.19.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+scheduler@^0.20.1:
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
+  integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"