From 19782c966b0bcc7a06c81899b144915371140ce9 Mon Sep 17 00:00:00 2001 From: Gregory Douglas Date: Wed, 11 Dec 2024 15:24:31 -0500 Subject: [PATCH 01/17] Update React to 18.3.1 in docs/demo packages --- packages/demo-app/package.json | 4 +-- packages/docs-app/package.json | 4 +-- packages/docs-theme/package.json | 4 +-- packages/landing-app/package.json | 4 +-- yarn.lock | 46 +++++++++++++++++++++++++------ 5 files changed, 46 insertions(+), 16 deletions(-) diff --git a/packages/demo-app/package.json b/packages/demo-app/package.json index d2257b3f73..65f4a0a029 100644 --- a/packages/demo-app/package.json +++ b/packages/demo-app/package.json @@ -26,8 +26,8 @@ "classnames": "^2.3.1", "lodash": "^4.17.21", "normalize.css": "^8.0.1", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "react-transition-group": "^4.4.5", "tslib": "~2.6.2" }, diff --git a/packages/docs-app/package.json b/packages/docs-app/package.json index 3d5187df06..ca8171eb6f 100644 --- a/packages/docs-app/package.json +++ b/packages/docs-app/package.json @@ -38,8 +38,8 @@ "monaco-editor": "^0.45.0", "normalize.css": "^8.0.1", "popper.js": "^1.16.1", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "react-transition-group": "^4.4.5", "tslib": "~2.6.2" }, diff --git a/packages/docs-theme/package.json b/packages/docs-theme/package.json index d2041fdb35..5228f7fce4 100644 --- a/packages/docs-theme/package.json +++ b/packages/docs-theme/package.json @@ -57,8 +57,8 @@ "@blueprintjs/node-build-scripts": "workspace:^", "@types/fuzzaldrin-plus": "~0.6.5", "npm-run-all": "^4.1.5", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "typescript": "~5.3.3", "webpack-cli": "^5.1.4" }, diff --git a/packages/landing-app/package.json b/packages/landing-app/package.json index 67244824dd..f1b8cd253e 100644 --- a/packages/landing-app/package.json +++ b/packages/landing-app/package.json @@ -19,8 +19,8 @@ "@blueprintjs/core": "workspace:^", "@blueprintjs/icons": "workspace:^", "classnames": "^2.3.1", - "react": "^16.14.0", - "react-dom": "^16.14.0" + "react": "^18.3.1", + "react-dom": "^18.3.1" }, "devDependencies": { "@blueprintjs/webpack-build-scripts": "workspace:^", diff --git a/yarn.lock b/yarn.lock index cf14e9dc44..741a327c83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -574,8 +574,8 @@ __metadata: lodash: "npm:^4.17.21" normalize.css: "npm:^8.0.1" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" react-transition-group: "npm:^4.4.5" tslib: "npm:~2.6.2" webpack-cli: "npm:^5.1.4" @@ -616,8 +616,8 @@ __metadata: normalize.css: "npm:^8.0.1" npm-run-all: "npm:^4.1.5" popper.js: "npm:^1.16.1" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" react-transition-group: "npm:^4.4.5" tslib: "npm:~2.6.2" webpack-cli: "npm:^5.1.4" @@ -651,8 +651,8 @@ __metadata: classnames: "npm:^2.3.1" fuzzaldrin-plus: "npm:^0.6.0" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" tslib: "npm:~2.6.2" typescript: "npm:~5.3.3" webpack-cli: "npm:^5.1.4" @@ -775,8 +775,8 @@ __metadata: copy-webpack-plugin: "npm:^12.0.2" npm-run-all: "npm:^4.1.5" raw-loader: "npm:^4.0.2" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" webpack: "npm:^5.90.0" webpack-dev-server: "npm:^4.15.1" languageName: unknown @@ -13810,6 +13810,18 @@ __metadata: languageName: node linkType: hard +"react-dom@npm:^18.3.1": + version: 18.3.1 + resolution: "react-dom@npm:18.3.1" + dependencies: + loose-envify: "npm:^1.1.0" + scheduler: "npm:^0.23.2" + peerDependencies: + react: ^18.3.1 + checksum: a752496c1941f958f2e8ac56239172296fcddce1365ce45222d04a1947e0cc5547df3e8447f855a81d6d39f008d7c32eab43db3712077f09e3f67c4874973e85 + languageName: node + linkType: hard + "react-fast-compare@npm:^3.0.1": version: 3.2.2 resolution: "react-fast-compare@npm:3.2.2" @@ -13924,6 +13936,15 @@ __metadata: languageName: node linkType: hard +"react@npm:^18.3.1": + version: 18.3.1 + resolution: "react@npm:18.3.1" + dependencies: + loose-envify: "npm:^1.1.0" + checksum: 283e8c5efcf37802c9d1ce767f302dd569dd97a70d9bb8c7be79a789b9902451e0d16334b05d73299b20f048cbc3c7d288bbbde10b701fa194e2089c237dbea3 + languageName: node + linkType: hard + "read-cache@npm:^1.0.0": version: 1.0.0 resolution: "read-cache@npm:1.0.0" @@ -14403,6 +14424,15 @@ __metadata: languageName: node linkType: hard +"scheduler@npm:^0.23.2": + version: 0.23.2 + resolution: "scheduler@npm:0.23.2" + dependencies: + loose-envify: "npm:^1.1.0" + checksum: 26383305e249651d4c58e6705d5f8425f153211aef95f15161c151f7b8de885f24751b377e4a0b3dd42cce09aad3f87a61dab7636859c0d89b7daf1a1e2a5c78 + languageName: node + linkType: hard + "schema-utils@npm:^0.3.0": version: 0.3.0 resolution: "schema-utils@npm:0.3.0" From eeb271bf94313722a639983347cc04c12e0120e0 Mon Sep 17 00:00:00 2001 From: Gregory Douglas Date: Wed, 11 Dec 2024 15:31:43 -0500 Subject: [PATCH 02/17] Update to React 18.3.1 in other packages --- packages/core/package.json | 4 ++-- packages/datetime/package.json | 4 ++-- packages/datetime2/package.json | 4 ++-- packages/icons/package.json | 4 ++-- packages/popover2/package.json | 4 ++-- packages/select/package.json | 4 ++-- packages/table-dev-app/package.json | 4 ++-- packages/table/package.json | 4 ++-- yarn.lock | 32 ++++++++++++++--------------- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 429be9b126..705c329f3b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -82,8 +82,8 @@ "karma": "^6.4.2", "mocha": "^10.2.0", "npm-run-all": "^4.1.5", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "react-test-renderer": "^16.14.0", "typescript": "~5.3.3", "webpack-cli": "^5.1.4" diff --git a/packages/datetime/package.json b/packages/datetime/package.json index f8bbd829d8..908b1384fd 100644 --- a/packages/datetime/package.json +++ b/packages/datetime/package.json @@ -68,9 +68,9 @@ "karma": "^6.4.2", "mocha": "^10.2.0", "npm-run-all": "^4.1.5", - "react": "^16.14.0", + "react": "^18.3.1", "react-day-picker": "patch:react-day-picker@npm%3A7.4.9#~/.yarn/patches/react-day-picker-npm-7.4.9-8853eff118.patch", - "react-dom": "^16.14.0", + "react-dom": "^18.3.1", "react-test-renderer": "^16.14.0", "typescript": "~5.3.3", "webpack-cli": "^5.1.4" diff --git a/packages/datetime2/package.json b/packages/datetime2/package.json index 137f7cef2a..8e1eb1e4d8 100644 --- a/packages/datetime2/package.json +++ b/packages/datetime2/package.json @@ -65,8 +65,8 @@ "karma": "^6.4.2", "mocha": "^10.2.0", "npm-run-all": "^4.1.5", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "typescript": "~5.3.3", "webpack-cli": "^5.1.4" }, diff --git a/packages/icons/package.json b/packages/icons/package.json index 79d1c603b2..6ac0ac8ca0 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -65,8 +65,8 @@ "handlebars": "^4.7.8", "mocha": "^10.2.0", "npm-run-all": "^4.1.5", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "react-test-renderer": "^16.14.0", "svg-parser": "^2.0.4", "typescript": "~5.3.3", diff --git a/packages/popover2/package.json b/packages/popover2/package.json index 48405fade0..7acfd35d0e 100644 --- a/packages/popover2/package.json +++ b/packages/popover2/package.json @@ -50,8 +50,8 @@ "devDependencies": { "@blueprintjs/node-build-scripts": "workspace:^", "npm-run-all": "^4.1.5", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "typescript": "~5.3.3" }, "repository": { diff --git a/packages/select/package.json b/packages/select/package.json index 2372d3cad6..b845b37817 100644 --- a/packages/select/package.json +++ b/packages/select/package.json @@ -62,8 +62,8 @@ "karma": "^6.4.2", "mocha": "^10.2.0", "npm-run-all": "^4.1.5", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "react-test-renderer": "^16.14.0", "typescript": "~5.3.3", "webpack-cli": "^5.1.4" diff --git a/packages/table-dev-app/package.json b/packages/table-dev-app/package.json index 84fa646333..b9fe207580 100644 --- a/packages/table-dev-app/package.json +++ b/packages/table-dev-app/package.json @@ -21,8 +21,8 @@ "classnames": "^2.3.1", "lodash": "^4.17.21", "normalize.css": "^8.0.1", - "react": "^16.14.0", - "react-dom": "^16.14.0" + "react": "^18.3.1", + "react-dom": "^18.3.1" }, "devDependencies": { "@blueprintjs/webpack-build-scripts": "workspace:^", diff --git a/packages/table/package.json b/packages/table/package.json index 18c6853947..644a1ad571 100644 --- a/packages/table/package.json +++ b/packages/table/package.json @@ -63,8 +63,8 @@ "karma": "^6.4.2", "mocha": "^10.2.0", "npm-run-all": "^4.1.5", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "react-test-renderer": "^16.14.0", "typescript": "~5.3.3", "webpack": "^5.90.0" diff --git a/yarn.lock b/yarn.lock index 741a327c83..88d5f34317 100644 --- a/yarn.lock +++ b/yarn.lock @@ -464,8 +464,8 @@ __metadata: mocha: "npm:^10.2.0" normalize.css: "npm:^8.0.1" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" react-popper: "npm:^2.3.0" react-test-renderer: "npm:^16.14.0" react-transition-group: "npm:^4.4.5" @@ -504,9 +504,9 @@ __metadata: karma: "npm:^6.4.2" mocha: "npm:^10.2.0" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" + react: "npm:^18.3.1" react-day-picker: "npm:^8.10.0" - react-dom: "npm:^16.14.0" + react-dom: "npm:^18.3.1" react-innertext: "npm:^1.1.5" tslib: "npm:~2.6.2" typescript: "npm:~5.3.3" @@ -539,9 +539,9 @@ __metadata: karma: "npm:^6.4.2" mocha: "npm:^10.2.0" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" + react: "npm:^18.3.1" react-day-picker: "patch:react-day-picker@npm%3A7.4.9#~/.yarn/patches/react-day-picker-npm-7.4.9-8853eff118.patch" - react-dom: "npm:^16.14.0" + react-dom: "npm:^18.3.1" react-test-renderer: "npm:^16.14.0" tslib: "npm:~2.6.2" typescript: "npm:~5.3.3" @@ -721,8 +721,8 @@ __metadata: handlebars: "npm:^4.7.8" mocha: "npm:^10.2.0" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" react-test-renderer: "npm:^16.14.0" svg-parser: "npm:^2.0.4" tslib: "npm:~2.6.2" @@ -849,8 +849,8 @@ __metadata: "@blueprintjs/node-build-scripts": "workspace:^" classnames: "npm:^2.3.1" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" tslib: "npm:~2.6.2" typescript: "npm:~5.3.3" peerDependencies: @@ -912,8 +912,8 @@ __metadata: karma: "npm:^6.4.2" mocha: "npm:^10.2.0" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" react-test-renderer: "npm:^16.14.0" tslib: "npm:~2.6.2" typescript: "npm:~5.3.3" @@ -958,8 +958,8 @@ __metadata: lodash: "npm:^4.17.21" normalize.css: "npm:^8.0.1" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" webpack: "npm:^5.90.0" webpack-dev-server: "npm:^4.15.1" languageName: unknown @@ -978,8 +978,8 @@ __metadata: karma: "npm:^6.4.2" mocha: "npm:^10.2.0" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" react-innertext: "npm:^1.1.5" react-test-renderer: "npm:^16.14.0" tslib: "npm:~2.6.2" From faac080d0681ae3efed49c1d61d98c2be4bdbf8d Mon Sep 17 00:00:00 2001 From: Gregory Douglas Date: Wed, 11 Dec 2024 17:03:27 -0500 Subject: [PATCH 03/17] Update React in test-commons and use enzyme-adapter-react-18 --- packages/test-commons/bootstrap.mjs | 4 +- packages/test-commons/package.json | 8 +- yarn.lock | 176 +++++++++------------------- 3 files changed, 62 insertions(+), 126 deletions(-) diff --git a/packages/test-commons/bootstrap.mjs b/packages/test-commons/bootstrap.mjs index 665bda44b8..b0c5b94515 100644 --- a/packages/test-commons/bootstrap.mjs +++ b/packages/test-commons/bootstrap.mjs @@ -2,8 +2,10 @@ * Copyright 2017 Palantir Technologies, Inc. All rights reserved. */ +import ReactEighteenAdapter from "@cfaester/enzyme-adapter-react-18"; import Enzyme from "enzyme"; -import Adapter from "enzyme-adapter-react-16"; + +const Adapter = ReactEighteenAdapter.default; Enzyme.configure({ adapter: new Adapter() }); diff --git a/packages/test-commons/package.json b/packages/test-commons/package.json index c6281c1d68..8a2015ab1a 100644 --- a/packages/test-commons/package.json +++ b/packages/test-commons/package.json @@ -18,9 +18,9 @@ "test": "exit 0" }, "dependencies": { + "@cfaester/enzyme-adapter-react-18": "^0.8.0", "chai": "^5.0.0", - "enzyme": "^3.11.0", - "enzyme-adapter-react-16": "^1.15.7" + "enzyme": "^3.11.0" }, "peerDependencies": { "react": ">=16.8", @@ -29,8 +29,8 @@ "devDependencies": { "@blueprintjs/node-build-scripts": "workspace:^", "npm-run-all": "^4.1.5", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "typescript": "~5.3.3" }, "repository": { diff --git a/yarn.lock b/yarn.lock index 88d5f34317..b284596218 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1000,12 +1000,12 @@ __metadata: resolution: "@blueprintjs/test-commons@workspace:packages/test-commons" dependencies: "@blueprintjs/node-build-scripts": "workspace:^" + "@cfaester/enzyme-adapter-react-18": "npm:^0.8.0" chai: "npm:^5.0.0" enzyme: "npm:^3.11.0" - enzyme-adapter-react-16: "npm:^1.15.7" npm-run-all: "npm:^4.1.5" - react: "npm:^16.14.0" - react-dom: "npm:^16.14.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" typescript: "npm:~5.3.3" peerDependencies: react: ">=16.8" @@ -1061,6 +1061,23 @@ __metadata: languageName: unknown linkType: soft +"@cfaester/enzyme-adapter-react-18@npm:^0.8.0": + version: 0.8.0 + resolution: "@cfaester/enzyme-adapter-react-18@npm:0.8.0" + dependencies: + enzyme-shallow-equal: "npm:^1.0.0" + function.prototype.name: "npm:^1.1.6" + has: "npm:^1.0.4" + react-is: "npm:^18.2.0" + react-shallow-renderer: "npm:^16.15.0" + peerDependencies: + enzyme: ^3.11.0 + react: ">=18" + react-dom: ">=18" + checksum: 06b2c8d741cfb36179fbc15b7403a56c95f0ff2c884556a9f6858594e5a11f70bf4e100b07ef78049435da6614a7e016558938674d9abe3fb2db776e9e7430a6 + languageName: node + linkType: hard + "@colors/colors@npm:1.5.0": version: 1.5.0 resolution: "@colors/colors@npm:1.5.0" @@ -3949,25 +3966,6 @@ __metadata: languageName: node linkType: hard -"airbnb-prop-types@npm:^2.16.0": - version: 2.16.0 - resolution: "airbnb-prop-types@npm:2.16.0" - dependencies: - array.prototype.find: "npm:^2.1.1" - function.prototype.name: "npm:^1.1.2" - is-regex: "npm:^1.1.0" - object-is: "npm:^1.1.2" - object.assign: "npm:^4.1.0" - object.entries: "npm:^1.1.2" - prop-types: "npm:^15.7.2" - prop-types-exact: "npm:^1.2.0" - react-is: "npm:^16.13.1" - peerDependencies: - react: ^0.14 || ^15.0.0 || ^16.0.0-alpha - checksum: c3666777bf9ee3a077ce79a02fcf79b7cf3123b11a626750826912e1f0f44772177e6667176558e10384f4501556f5e7eeb198231e9f61794864465167c8ee33 - languageName: node - linkType: hard - "ajv-formats@npm:^2.1.1": version: 2.1.1 resolution: "ajv-formats@npm:2.1.1" @@ -4362,18 +4360,6 @@ __metadata: languageName: node linkType: hard -"array.prototype.find@npm:^2.1.1": - version: 2.2.2 - resolution: "array.prototype.find@npm:2.2.2" - dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - es-shim-unscopables: "npm:^1.0.0" - checksum: 5008d3e6089f7047db1886d0dc2d75bdd342b886528dbca3c67920f18fd435dbc878b9c55243c96e18423d139d5ddb08cdbc8f95bd89ed4f2f53c63260eb444a - languageName: node - linkType: hard - "array.prototype.findlastindex@npm:^1.2.3": version: 1.2.3 resolution: "array.prototype.findlastindex@npm:1.2.3" @@ -6852,45 +6838,17 @@ __metadata: languageName: node linkType: hard -"enzyme-adapter-react-16@npm:^1.15.7": - version: 1.15.7 - resolution: "enzyme-adapter-react-16@npm:1.15.7" - dependencies: - enzyme-adapter-utils: "npm:^1.14.1" - enzyme-shallow-equal: "npm:^1.0.5" - has: "npm:^1.0.3" - object.assign: "npm:^4.1.4" - object.values: "npm:^1.1.5" - prop-types: "npm:^15.8.1" - react-is: "npm:^16.13.1" - react-test-renderer: "npm:^16.0.0-0" - semver: "npm:^5.7.0" - peerDependencies: - enzyme: ^3.0.0 - react: ^16.0.0-0 - react-dom: ^16.0.0-0 - checksum: 7cb69fcdc4bf2390ffe440cfa906c698b90d533032180b5b6ddf5ace1edac0e09a687b7f36706e1bba3b02a91585d8d5bd0317c237b5f5eab00bdb5512f330ee - languageName: node - linkType: hard - -"enzyme-adapter-utils@npm:^1.14.1": - version: 1.14.1 - resolution: "enzyme-adapter-utils@npm:1.14.1" +"enzyme-shallow-equal@npm:^1.0.0": + version: 1.0.7 + resolution: "enzyme-shallow-equal@npm:1.0.7" dependencies: - airbnb-prop-types: "npm:^2.16.0" - function.prototype.name: "npm:^1.1.5" - has: "npm:^1.0.3" - object.assign: "npm:^4.1.4" - object.fromentries: "npm:^2.0.5" - prop-types: "npm:^15.8.1" - semver: "npm:^5.7.1" - peerDependencies: - react: 0.13.x || 0.14.x || ^15.0.0-0 || ^16.0.0-0 - checksum: f07423c9181ed22fda4d761ec54aca6d9fb65d8b95da48c1471d39892f8af3d3fa54c971ed73a16acbc9a483ccda3a58f97a590bf95b4d5f77f99ae37c1ac8bb + hasown: "npm:^2.0.0" + object-is: "npm:^1.1.5" + checksum: 50bd80c62da4086a20f4c56c2333ab104f162f0d20db3a335406b5b6aa2b92a61eda67bed2248b52aecfc7992abfb368cf40fe5e35a66913b914668665b418c1 languageName: node linkType: hard -"enzyme-shallow-equal@npm:^1.0.1, enzyme-shallow-equal@npm:^1.0.5": +"enzyme-shallow-equal@npm:^1.0.1": version: 1.0.5 resolution: "enzyme-shallow-equal@npm:1.0.5" dependencies: @@ -8690,7 +8648,7 @@ __metadata: languageName: node linkType: hard -"has@npm:^1.0.3": +"has@npm:^1.0.3, has@npm:^1.0.4": version: 1.0.4 resolution: "has@npm:1.0.4" checksum: 82c1220573dc1f0a014a5d6189ae52a1f820f99dfdc00323c3a725b5002dcb7f04e44f460fea7af068474b2dd7c88cbe1846925c84017be9e31e1708936d305b @@ -9456,7 +9414,7 @@ __metadata: languageName: node linkType: hard -"is-regex@npm:^1.0.5, is-regex@npm:^1.1.0, is-regex@npm:^1.1.4": +"is-regex@npm:^1.0.5, is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" dependencies: @@ -12253,7 +12211,7 @@ __metadata: languageName: node linkType: hard -"object-is@npm:^1.0.2, object-is@npm:^1.1.2, object-is@npm:^1.1.5": +"object-is@npm:^1.0.2, object-is@npm:^1.1.5": version: 1.1.5 resolution: "object-is@npm:1.1.5" dependencies: @@ -12282,7 +12240,7 @@ __metadata: languageName: node linkType: hard -"object.entries@npm:^1.1.1, object.entries@npm:^1.1.2, object.entries@npm:^1.1.6": +"object.entries@npm:^1.1.1, object.entries@npm:^1.1.6": version: 1.1.7 resolution: "object.entries@npm:1.1.7" dependencies: @@ -12293,7 +12251,7 @@ __metadata: languageName: node linkType: hard -"object.fromentries@npm:^2.0.5, object.fromentries@npm:^2.0.6, object.fromentries@npm:^2.0.7": +"object.fromentries@npm:^2.0.6, object.fromentries@npm:^2.0.7": version: 2.0.7 resolution: "object.fromentries@npm:2.0.7" dependencies: @@ -12339,7 +12297,7 @@ __metadata: languageName: node linkType: hard -"object.values@npm:^1.1.0, object.values@npm:^1.1.1, object.values@npm:^1.1.5, object.values@npm:^1.1.6, object.values@npm:^1.1.7": +"object.values@npm:^1.1.0, object.values@npm:^1.1.1, object.values@npm:^1.1.6, object.values@npm:^1.1.7": version: 1.1.7 resolution: "object.values@npm:1.1.7" dependencies: @@ -13592,18 +13550,7 @@ __metadata: languageName: node linkType: hard -"prop-types-exact@npm:^1.2.0": - version: 1.2.0 - resolution: "prop-types-exact@npm:1.2.0" - dependencies: - has: "npm:^1.0.3" - object.assign: "npm:^4.1.0" - reflect.ownkeys: "npm:^0.2.0" - checksum: 71e186c5b982f72b8226f052b710ef6b87fff7275fcf5834b4913fa5b6c325c44be111488786fd3c4e422fb4bb4e91f3c7f35445366c9a4585405d3b02872587 - languageName: node - linkType: hard - -"prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": +"prop-types@npm:^15.6.2, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" dependencies: @@ -13796,20 +13743,6 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^16.14.0": - version: 16.14.0 - resolution: "react-dom@npm:16.14.0" - dependencies: - loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - prop-types: "npm:^15.6.2" - scheduler: "npm:^0.19.1" - peerDependencies: - react: ^16.14.0 - checksum: ca146e780631672a2d57c8d77775d38f394a6cd67db30c6af7964d0b3574ef7edccb1de8d592e990b98f4f5f8d1c8460b0691f04e7a45799962a51dcbaaa1371 - languageName: node - linkType: hard - "react-dom@npm:^18.3.1": version: 18.3.1 resolution: "react-dom@npm:18.3.1" @@ -13839,6 +13772,13 @@ __metadata: languageName: node linkType: hard +"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.2.0": + version: 18.3.1 + resolution: "react-is@npm:18.3.1" + checksum: f2f1e60010c683479e74c63f96b09fb41603527cd131a9959e2aee1e5a8b0caf270b365e5ca77d4a6b18aae659b60a86150bb3979073528877029b35aecd2072 + languageName: node + linkType: hard + "react-is@npm:^16.13.1, react-is@npm:^16.8.6": version: 16.13.1 resolution: "react-is@npm:16.13.1" @@ -13881,7 +13821,19 @@ __metadata: languageName: node linkType: hard -"react-test-renderer@npm:^16.0.0-0, react-test-renderer@npm:^16.14.0": +"react-shallow-renderer@npm:^16.15.0": + version: 16.15.0 + resolution: "react-shallow-renderer@npm:16.15.0" + dependencies: + object-assign: "npm:^4.1.1" + react-is: "npm:^16.12.0 || ^17.0.0 || ^18.0.0" + peerDependencies: + react: ^16.0.0 || ^17.0.0 || ^18.0.0 + checksum: c194d741792e86043a4ae272f7353c1cb9412bc649945c4220c6a101a6ea5410cceb3d65d5a4d750f11a24f7426e8eec7977e8a4e3ad5d3ee235ca2b18166fa8 + languageName: node + linkType: hard + +"react-test-renderer@npm:^16.14.0": version: 16.14.0 resolution: "react-test-renderer@npm:16.14.0" dependencies: @@ -13925,17 +13877,6 @@ __metadata: languageName: node linkType: hard -"react@npm:^16.14.0": - version: 16.14.0 - resolution: "react@npm:16.14.0" - dependencies: - loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - prop-types: "npm:^15.6.2" - checksum: df8faae43e01387013900e8f8fb3c4ce9935b7edbcbaa77e12999c913eb958000a0a8750bf9a0886dae0ad768dd4a4ee983752d5bade8d840adbe0ce890a2438 - languageName: node - linkType: hard - "react@npm:^18.3.1": version: 18.3.1 resolution: "react@npm:18.3.1" @@ -14073,13 +14014,6 @@ __metadata: languageName: node linkType: hard -"reflect.ownkeys@npm:^0.2.0": - version: 0.2.0 - resolution: "reflect.ownkeys@npm:0.2.0" - checksum: 169f20287ad33b76fc8b6932734b3e1469ee59f31d8357858e96718a6f71fa60d7a13f2fc4e9191e47c2a51e4183151290f3a35315ba461190d87b0593725557 - languageName: node - linkType: hard - "regenerator-runtime@npm:^0.11.0": version: 0.11.1 resolution: "regenerator-runtime@npm:0.11.1" @@ -14489,7 +14423,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.5.0, semver@npm:^5.7.0, semver@npm:^5.7.1": +"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.5.0": version: 5.7.2 resolution: "semver@npm:5.7.2" bin: From c2fe8e4d6495b7b12b4ed33538ef171078324338 Mon Sep 17 00:00:00 2001 From: Gregory Douglas Date: Wed, 11 Dec 2024 17:07:06 -0500 Subject: [PATCH 04/17] Update react-test-renderer to 18.3.1 --- packages/core/package.json | 2 +- packages/datetime/package.json | 2 +- packages/icons/package.json | 2 +- packages/select/package.json | 2 +- packages/table/package.json | 2 +- yarn.lock | 41 +++++++++++++--------------------- 6 files changed, 20 insertions(+), 31 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 705c329f3b..15112d101d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -84,7 +84,7 @@ "npm-run-all": "^4.1.5", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-test-renderer": "^16.14.0", + "react-test-renderer": "^18.3.1", "typescript": "~5.3.3", "webpack-cli": "^5.1.4" }, diff --git a/packages/datetime/package.json b/packages/datetime/package.json index 908b1384fd..4c2929231c 100644 --- a/packages/datetime/package.json +++ b/packages/datetime/package.json @@ -71,7 +71,7 @@ "react": "^18.3.1", "react-day-picker": "patch:react-day-picker@npm%3A7.4.9#~/.yarn/patches/react-day-picker-npm-7.4.9-8853eff118.patch", "react-dom": "^18.3.1", - "react-test-renderer": "^16.14.0", + "react-test-renderer": "^18.3.1", "typescript": "~5.3.3", "webpack-cli": "^5.1.4" }, diff --git a/packages/icons/package.json b/packages/icons/package.json index 6ac0ac8ca0..4040600320 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -67,7 +67,7 @@ "npm-run-all": "^4.1.5", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-test-renderer": "^16.14.0", + "react-test-renderer": "^18.3.1", "svg-parser": "^2.0.4", "typescript": "~5.3.3", "webpack-cli": "^5.1.4" diff --git a/packages/select/package.json b/packages/select/package.json index b845b37817..1d21b3f108 100644 --- a/packages/select/package.json +++ b/packages/select/package.json @@ -64,7 +64,7 @@ "npm-run-all": "^4.1.5", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-test-renderer": "^16.14.0", + "react-test-renderer": "^18.3.1", "typescript": "~5.3.3", "webpack-cli": "^5.1.4" }, diff --git a/packages/table/package.json b/packages/table/package.json index 644a1ad571..f415c0f4e0 100644 --- a/packages/table/package.json +++ b/packages/table/package.json @@ -65,7 +65,7 @@ "npm-run-all": "^4.1.5", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-test-renderer": "^16.14.0", + "react-test-renderer": "^18.3.1", "typescript": "~5.3.3", "webpack": "^5.90.0" }, diff --git a/yarn.lock b/yarn.lock index b284596218..1a86de1aad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -467,7 +467,7 @@ __metadata: react: "npm:^18.3.1" react-dom: "npm:^18.3.1" react-popper: "npm:^2.3.0" - react-test-renderer: "npm:^16.14.0" + react-test-renderer: "npm:^18.3.1" react-transition-group: "npm:^4.4.5" react-uid: "npm:^2.3.3" tslib: "npm:~2.6.2" @@ -542,7 +542,7 @@ __metadata: react: "npm:^18.3.1" react-day-picker: "patch:react-day-picker@npm%3A7.4.9#~/.yarn/patches/react-day-picker-npm-7.4.9-8853eff118.patch" react-dom: "npm:^18.3.1" - react-test-renderer: "npm:^16.14.0" + react-test-renderer: "npm:^18.3.1" tslib: "npm:~2.6.2" typescript: "npm:~5.3.3" webpack-cli: "npm:^5.1.4" @@ -723,7 +723,7 @@ __metadata: npm-run-all: "npm:^4.1.5" react: "npm:^18.3.1" react-dom: "npm:^18.3.1" - react-test-renderer: "npm:^16.14.0" + react-test-renderer: "npm:^18.3.1" svg-parser: "npm:^2.0.4" tslib: "npm:~2.6.2" typescript: "npm:~5.3.3" @@ -914,7 +914,7 @@ __metadata: npm-run-all: "npm:^4.1.5" react: "npm:^18.3.1" react-dom: "npm:^18.3.1" - react-test-renderer: "npm:^16.14.0" + react-test-renderer: "npm:^18.3.1" tslib: "npm:~2.6.2" typescript: "npm:~5.3.3" webpack-cli: "npm:^5.1.4" @@ -981,7 +981,7 @@ __metadata: react: "npm:^18.3.1" react-dom: "npm:^18.3.1" react-innertext: "npm:^1.1.5" - react-test-renderer: "npm:^16.14.0" + react-test-renderer: "npm:^18.3.1" tslib: "npm:~2.6.2" typescript: "npm:~5.3.3" webpack: "npm:^5.90.0" @@ -13772,14 +13772,14 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.2.0": +"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.2.0, react-is@npm:^18.3.1": version: 18.3.1 resolution: "react-is@npm:18.3.1" checksum: f2f1e60010c683479e74c63f96b09fb41603527cd131a9959e2aee1e5a8b0caf270b365e5ca77d4a6b18aae659b60a86150bb3979073528877029b35aecd2072 languageName: node linkType: hard -"react-is@npm:^16.13.1, react-is@npm:^16.8.6": +"react-is@npm:^16.13.1": version: 16.13.1 resolution: "react-is@npm:16.13.1" checksum: 33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1 @@ -13833,17 +13833,16 @@ __metadata: languageName: node linkType: hard -"react-test-renderer@npm:^16.14.0": - version: 16.14.0 - resolution: "react-test-renderer@npm:16.14.0" +"react-test-renderer@npm:^18.3.1": + version: 18.3.1 + resolution: "react-test-renderer@npm:18.3.1" dependencies: - object-assign: "npm:^4.1.1" - prop-types: "npm:^15.6.2" - react-is: "npm:^16.8.6" - scheduler: "npm:^0.19.1" + react-is: "npm:^18.3.1" + react-shallow-renderer: "npm:^16.15.0" + scheduler: "npm:^0.23.2" peerDependencies: - react: ^16.14.0 - checksum: 119e3ce5509c3443393ca750e39dd4ac9ee9ddfaafca58c9067b477447edc2badb75660b9fea7e9ddef012e37bbba427681cf6f8d3fde61b8054655a133bfbf5 + react: ^18.3.1 + checksum: c633558ef9af33bc68f0c4dbb5163a004c4fb9eade7bd0a7cfc0355fb367f36bd9d96533c90b7e85a146be6c525113a15f58683d269e0177ad77e2b04d4fe51c languageName: node linkType: hard @@ -14348,16 +14347,6 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.19.1": - version: 0.19.1 - resolution: "scheduler@npm:0.19.1" - dependencies: - loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - checksum: 9658932a73148a93d791c064b331d9690ddfecc4de25bcd6c9b89f5f1166e3d23d9c31c1595d66565e5ffbb34d47035cb14841aba6444bc266bfcd215cefe9c0 - languageName: node - linkType: hard - "scheduler@npm:^0.23.2": version: 0.23.2 resolution: "scheduler@npm:0.23.2" From 037b487173d034e4b9860692f9c8e5bad2222b0d Mon Sep 17 00:00:00 2001 From: Gregory Douglas Date: Wed, 11 Dec 2024 17:09:43 -0500 Subject: [PATCH 05/17] Upgrade @testing-library/react to latest --- packages/core/package.json | 2 +- yarn.lock | 118 ++++++------------------------------- 2 files changed, 20 insertions(+), 100 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 15112d101d..970d1f8628 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -75,7 +75,7 @@ "@blueprintjs/node-build-scripts": "workspace:^", "@blueprintjs/test-commons": "workspace:^", "@testing-library/dom": "^10.4.0", - "@testing-library/react": "^12.1.5", + "@testing-library/react": "^16.1.0", "@testing-library/user-event": "^13.5.0", "@types/use-sync-external-store": "0.0.6", "enzyme": "^3.11.0", diff --git a/yarn.lock b/yarn.lock index 1a86de1aad..532395abd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -455,7 +455,7 @@ __metadata: "@blueprintjs/test-commons": "workspace:^" "@popperjs/core": "npm:^2.11.8" "@testing-library/dom": "npm:^10.4.0" - "@testing-library/react": "npm:^12.1.5" + "@testing-library/react": "npm:^16.1.0" "@testing-library/user-event": "npm:^13.5.0" "@types/use-sync-external-store": "npm:0.0.6" classnames: "npm:^2.3.1" @@ -2793,33 +2793,23 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:^8.0.0": - version: 8.20.1 - resolution: "@testing-library/dom@npm:8.20.1" +"@testing-library/react@npm:^16.1.0": + version: 16.1.0 + resolution: "@testing-library/react@npm:16.1.0" dependencies: - "@babel/code-frame": "npm:^7.10.4" "@babel/runtime": "npm:^7.12.5" - "@types/aria-query": "npm:^5.0.1" - aria-query: "npm:5.1.3" - chalk: "npm:^4.1.0" - dom-accessibility-api: "npm:^0.5.9" - lz-string: "npm:^1.5.0" - pretty-format: "npm:^27.0.2" - checksum: 614013756706467f2a7f3f693c18377048c210ec809884f0f9be866f7d865d075805ad15f5d100e8a699467fdde09085bf79e23a00ea0a6ab001d9583ef15e5d - languageName: node - linkType: hard - -"@testing-library/react@npm:^12.1.5": - version: 12.1.5 - resolution: "@testing-library/react@npm:12.1.5" - dependencies: - "@babel/runtime": "npm:^7.12.5" - "@testing-library/dom": "npm:^8.0.0" - "@types/react-dom": "npm:<18.0.0" peerDependencies: - react: <18.0.0 - react-dom: <18.0.0 - checksum: 3c2433d2fdb6535261f62cd85d79657989cebd96f9072da03c098a1cfa56dec4dfec83d7c2e93633a3ccebdb178ea8578261533d11551600966edab77af00c8b + "@testing-library/dom": ^10.0.0 + "@types/react": ^18.0.0 || ^19.0.0 + "@types/react-dom": ^18.0.0 || ^19.0.0 + react: ^18.0.0 || ^19.0.0 + react-dom: ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + "@types/react-dom": + optional: true + checksum: 8451dcc76ba0d4f3504af78f2a4aacc13117691f4b7a3c279f3e047d5ea817ff686496ad53e7f65f6183112aef2be3f318af609b1f5d666eed42b1014d1c68d5 languageName: node linkType: hard @@ -3283,15 +3273,6 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:<18.0.0": - version: 17.0.22 - resolution: "@types/react-dom@npm:17.0.22" - dependencies: - "@types/react": "npm:^17" - checksum: 5b126c8bbed58cb667f1618962d0df79866bac975495e4c85e8b8a602082c5cf7e9ff3018689d4db4ebd5cfc98ef9f1e3c7804c820bcf6622b44eacfa6b65334 - languageName: node - linkType: hard - "@types/react-dom@npm:~16.9.24": version: 16.9.24 resolution: "@types/react-dom@npm:16.9.24" @@ -4217,15 +4198,6 @@ __metadata: languageName: node linkType: hard -"aria-query@npm:5.1.3": - version: 5.1.3 - resolution: "aria-query@npm:5.1.3" - dependencies: - deep-equal: "npm:^2.0.5" - checksum: edcbc8044c4663d6f88f785e983e6784f98cb62b4ba1e9dd8d61b725d0203e4cfca38d676aee984c31f354103461102a3d583aa4fbe4fd0a89b679744f4e5faf - languageName: node - linkType: hard - "aria-query@npm:5.3.0": version: 5.3.0 resolution: "aria-query@npm:5.3.0" @@ -6249,32 +6221,6 @@ __metadata: languageName: node linkType: hard -"deep-equal@npm:^2.0.5": - version: 2.2.2 - resolution: "deep-equal@npm:2.2.2" - dependencies: - array-buffer-byte-length: "npm:^1.0.0" - call-bind: "npm:^1.0.2" - es-get-iterator: "npm:^1.1.3" - get-intrinsic: "npm:^1.2.1" - is-arguments: "npm:^1.1.1" - is-array-buffer: "npm:^3.0.2" - is-date-object: "npm:^1.0.5" - is-regex: "npm:^1.1.4" - is-shared-array-buffer: "npm:^1.0.2" - isarray: "npm:^2.0.5" - object-is: "npm:^1.1.5" - object-keys: "npm:^1.1.1" - object.assign: "npm:^4.1.4" - regexp.prototype.flags: "npm:^1.5.0" - side-channel: "npm:^1.0.4" - which-boxed-primitive: "npm:^1.0.2" - which-collection: "npm:^1.0.1" - which-typed-array: "npm:^1.1.9" - checksum: 07b46a9a848efdab223abc7e3ba612ef9168d88970c3400df185d5840a30ca384749c996ae5d7af844d6b27c42587fb73a4445c63e38aac77c2d0ed9a63faa87 - languageName: node - linkType: hard - "deep-is@npm:^0.1.3, deep-is@npm:~0.1.3": version: 0.1.4 resolution: "deep-is@npm:0.1.4" @@ -6967,23 +6913,6 @@ __metadata: languageName: node linkType: hard -"es-get-iterator@npm:^1.1.3": - version: 1.1.3 - resolution: "es-get-iterator@npm:1.1.3" - dependencies: - call-bind: "npm:^1.0.2" - get-intrinsic: "npm:^1.1.3" - has-symbols: "npm:^1.0.3" - is-arguments: "npm:^1.1.1" - is-map: "npm:^2.0.2" - is-set: "npm:^2.0.2" - is-string: "npm:^1.0.7" - isarray: "npm:^2.0.5" - stop-iteration-iterator: "npm:^1.0.0" - checksum: ebd11effa79851ea75d7f079405f9d0dc185559fd65d986c6afea59a0ff2d46c2ed8675f19f03dce7429d7f6c14ff9aede8d121fbab78d75cfda6a263030bac0 - languageName: node - linkType: hard - "es-iterator-helpers@npm:^1.0.12": version: 1.0.15 resolution: "es-iterator-helpers@npm:1.0.15" @@ -9087,7 +9016,7 @@ __metadata: languageName: node linkType: hard -"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5": +"internal-slot@npm:^1.0.5": version: 1.0.6 resolution: "internal-slot@npm:1.0.6" dependencies: @@ -9135,7 +9064,7 @@ __metadata: languageName: node linkType: hard -"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1": +"is-arguments@npm:^1.0.4": version: 1.1.1 resolution: "is-arguments@npm:1.1.1" dependencies: @@ -9316,7 +9245,7 @@ __metadata: languageName: node linkType: hard -"is-map@npm:^2.0.1, is-map@npm:^2.0.2": +"is-map@npm:^2.0.1": version: 2.0.2 resolution: "is-map@npm:2.0.2" checksum: 119ff9137a37fd131a72fab3f4ab8c9d6a24b0a1ee26b4eff14dc625900d8675a97785eea5f4174265e2006ed076cc24e89f6e57ebd080a48338d914ec9168a5 @@ -9431,7 +9360,7 @@ __metadata: languageName: node linkType: hard -"is-set@npm:^2.0.1, is-set@npm:^2.0.2": +"is-set@npm:^2.0.1": version: 2.0.2 resolution: "is-set@npm:2.0.2" checksum: 5f8bd1880df8c0004ce694e315e6e1e47a3452014be792880bb274a3b2cdb952fdb60789636ca6e084c7947ca8b7ae03ccaf54c93a7fcfed228af810559e5432 @@ -15039,15 +14968,6 @@ __metadata: languageName: node linkType: hard -"stop-iteration-iterator@npm:^1.0.0": - version: 1.0.0 - resolution: "stop-iteration-iterator@npm:1.0.0" - dependencies: - internal-slot: "npm:^1.0.4" - checksum: c4158d6188aac510d9e92925b58709207bd94699e9c31186a040c80932a687f84a51356b5895e6dc72710aad83addb9411c22171832c9ae0e6e11b7d61b0dfb9 - languageName: node - linkType: hard - "stream-browserify@npm:^3.0.0": version: 3.0.0 resolution: "stream-browserify@npm:3.0.0" From 3495f3140c628657dadf08bc947d1bd7e7b49a9b Mon Sep 17 00:00:00 2001 From: Gregory Douglas Date: Wed, 11 Dec 2024 17:11:58 -0500 Subject: [PATCH 06/17] Update `@types/react` and `@types/react-dom` at root --- package.json | 6 +++--- yarn.lock | 32 ++++++++++++-------------------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 4d24c94332..ea0fcb4d88 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "@types/enzyme-adapter-react-16": "~1.0.9", "@types/mocha": "~10.0.6", "@types/node": "~20.11.6", - "@types/react": "~16.14.55", - "@types/react-dom": "~16.9.24", + "@types/react": "^18.3.12", + "@types/react-dom": "^18.3.1", "@types/react-transition-group": "~4.4.10", "@types/sinon": "~17.0.3", "@types/yargs": "~17.0.32", @@ -65,7 +65,7 @@ "yarn-deduplicate": "^6.0.2" }, "resolutions": { - "@types/react": "16.14.55" + "@types/react": "18.3.12" }, "engines": { "node": ">=20.11" diff --git a/yarn.lock b/yarn.lock index 532395abd3..6aed8e50ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -874,8 +874,8 @@ __metadata: "@types/enzyme-adapter-react-16": "npm:~1.0.9" "@types/mocha": "npm:~10.0.6" "@types/node": "npm:~20.11.6" - "@types/react": "npm:~16.14.55" - "@types/react-dom": "npm:~16.9.24" + "@types/react": "npm:^18.3.12" + "@types/react-dom": "npm:^18.3.1" "@types/react-transition-group": "npm:~4.4.10" "@types/sinon": "npm:~17.0.3" "@types/yargs": "npm:~17.0.32" @@ -3273,12 +3273,12 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:~16.9.24": - version: 16.9.24 - resolution: "@types/react-dom@npm:16.9.24" - dependencies: - "@types/react": "npm:^16" - checksum: 987ee2ba06e49064cbc498d6631c14634628558cf90c2efee4b53b0df96c24f54e5dc8a7794d28a92ef47ade39c6ac4fa79329dc8807cb508c6bbb3ab62b852d +"@types/react-dom@npm:^18.3.1": + version: 18.3.5 + resolution: "@types/react-dom@npm:18.3.5" + peerDependencies: + "@types/react": ^18.0.0 + checksum: b163d35a6b32a79f5782574a7aeb12a31a647e248792bf437e6d596e2676961c394c5e3c6e91d1ce44ae90441dbaf93158efb4f051c0d61e2612f1cb04ce4faa languageName: node linkType: hard @@ -3291,14 +3291,13 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:16.14.55": - version: 16.14.55 - resolution: "@types/react@npm:16.14.55" +"@types/react@npm:18.3.12": + version: 18.3.12 + resolution: "@types/react@npm:18.3.12" dependencies: "@types/prop-types": "npm:*" - "@types/scheduler": "npm:*" csstype: "npm:^3.0.2" - checksum: 392eb1fb22b606d00393722bad31a6fe7e01ea99585e807885dee13c88fc4f9db7d71928cb8d5ae0cf53c14bfd38908e5ad22826a81efcfcc4ffc4f6846f78ea + checksum: 8bae8d9a41619804561574792e29112b413044eb0d53746dde2b9720c1f9a59f71c895bbd7987cd8ce9500b00786e53bc032dced38cddf42910458e145675290 languageName: node linkType: hard @@ -3316,13 +3315,6 @@ __metadata: languageName: node linkType: hard -"@types/scheduler@npm:*": - version: 0.16.5 - resolution: "@types/scheduler@npm:0.16.5" - checksum: 625b63cd5dcaf6fb88fe03aa7c797f28cb121f03584126d4811b2d03f39bc3e238ce52cf7685ad8adfe8445d679934e6be47347723a6771ca2058c01f0c33760 - languageName: node - linkType: hard - "@types/semver@npm:^7.5.0": version: 7.5.4 resolution: "@types/semver@npm:7.5.4" From b1253c72da0fe51cf546a74ad763fd4d96d71eed Mon Sep 17 00:00:00 2001 From: Gregory Douglas Date: Thu, 9 Jan 2025 14:07:30 -0500 Subject: [PATCH 07/17] Remove deprecated ReactDOM methods from table-dev-app --- packages/table-dev-app/src/features.tsx | 83 ++++++++++++++----------- packages/table-dev-app/src/index.tsx | 10 +-- 2 files changed, 52 insertions(+), 41 deletions(-) diff --git a/packages/table-dev-app/src/features.tsx b/packages/table-dev-app/src/features.tsx index e423369bc2..83d068ff81 100644 --- a/packages/table-dev-app/src/features.tsx +++ b/packages/table-dev-app/src/features.tsx @@ -17,7 +17,7 @@ /* eslint-disable max-classes-per-file, react/display-name, react/jsx-no-bind, react/no-did-mount-set-state, sort-keys */ import * as React from "react"; -import * as ReactDOM from "react-dom"; +import * as ReactDOM from "react-dom/client"; import { Button, Classes, H4, Intent, Menu, MenuDivider, MenuItem } from "@blueprintjs/core"; import { @@ -40,7 +40,8 @@ import { } from "@blueprintjs/table"; import { Nav } from "./nav"; -ReactDOM.render(