From d83cfb149df9f110d14d01394e1821dad963241d Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 27 Mar 2024 07:41:01 -0500 Subject: [PATCH 01/23] Move `@babel/core` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 197 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 140 insertions(+), 59 deletions(-) diff --git a/package.json b/package.json index e9402ec5e..6e4cf9562 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "examples/action-listener/*" ], "devDependencies": { + "@babel/core": "^7.24.3", "@typescript-eslint/eslint-plugin": "6.12.0", "@typescript-eslint/parser": "6.12.0", "eslint": "^7.25.0", @@ -42,7 +43,6 @@ "typescript": "^5.2.2" }, "resolutions": { - "@babel/core": "7.19.3", "@babel/code-frame": "7.18.6", "@babel/generator": "7.19.3", "@babel/helper-compilation-targets": "7.19.3", diff --git a/yarn.lock b/yarn.lock index 5ddd8f505..44881e2b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -179,13 +179,13 @@ __metadata: languageName: node linkType: hard -"@ampproject/remapping@npm:^2.1.0": - version: 2.2.0 - resolution: "@ampproject/remapping@npm:2.2.0" +"@ampproject/remapping@npm:^2.2.0": + version: 2.3.0 + resolution: "@ampproject/remapping@npm:2.3.0" dependencies: - "@jridgewell/gen-mapping": "npm:^0.1.0" - "@jridgewell/trace-mapping": "npm:^0.3.9" - checksum: 10/503a58d6e9d645a20debd34fa8df79fb435a79a34b1d487b9ff0be9f20712b1594ce21da16b63af7db8a6b34472212572e53a55613a5a6b3134b23fc74843d04 + "@jridgewell/gen-mapping": "npm:^0.3.5" + "@jridgewell/trace-mapping": "npm:^0.3.24" + checksum: 10/f3451525379c68a73eb0a1e65247fbf28c0cccd126d93af21c75fceff77773d43c0d4a2d51978fb131aff25b5f2cb41a9fe48cc296e61ae65e679c4f6918b0ab languageName: node linkType: hard @@ -317,26 +317,50 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.19.3": - version: 7.19.3 - resolution: "@babel/core@npm:7.19.3" +"@babel/core@npm:7.12.9": + version: 7.12.9 + resolution: "@babel/core@npm:7.12.9" dependencies: - "@ampproject/remapping": "npm:^2.1.0" - "@babel/code-frame": "npm:^7.18.6" - "@babel/generator": "npm:^7.19.3" - "@babel/helper-compilation-targets": "npm:^7.19.3" - "@babel/helper-module-transforms": "npm:^7.19.0" - "@babel/helpers": "npm:^7.19.0" - "@babel/parser": "npm:^7.19.3" - "@babel/template": "npm:^7.18.10" - "@babel/traverse": "npm:^7.19.3" - "@babel/types": "npm:^7.19.3" + "@babel/code-frame": "npm:^7.10.4" + "@babel/generator": "npm:^7.12.5" + "@babel/helper-module-transforms": "npm:^7.12.1" + "@babel/helpers": "npm:^7.12.5" + "@babel/parser": "npm:^7.12.7" + "@babel/template": "npm:^7.12.7" + "@babel/traverse": "npm:^7.12.9" + "@babel/types": "npm:^7.12.7" convert-source-map: "npm:^1.7.0" debug: "npm:^4.1.0" + gensync: "npm:^1.0.0-beta.1" + json5: "npm:^2.1.2" + lodash: "npm:^4.17.19" + resolve: "npm:^1.3.2" + semver: "npm:^5.4.1" + source-map: "npm:^0.5.0" + checksum: 10/a2c79790c38b95de1f540d26d0434c7bf8ce64c02c407f65b6bc5d9a84ada0769d2660612c16627493024e897a9b56aa2534f7213329a3c19e5ed9d39c6a0c03 + languageName: node + linkType: hard + +"@babel/core@npm:^7.0.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.5, @babel/core@npm:^7.16.0, @babel/core@npm:^7.18.6, @babel/core@npm:^7.23.0, @babel/core@npm:^7.24.3, @babel/core@npm:^7.8.0": + version: 7.24.3 + resolution: "@babel/core@npm:7.24.3" + dependencies: + "@ampproject/remapping": "npm:^2.2.0" + "@babel/code-frame": "npm:^7.24.2" + "@babel/generator": "npm:^7.24.1" + "@babel/helper-compilation-targets": "npm:^7.23.6" + "@babel/helper-module-transforms": "npm:^7.23.3" + "@babel/helpers": "npm:^7.24.1" + "@babel/parser": "npm:^7.24.1" + "@babel/template": "npm:^7.24.0" + "@babel/traverse": "npm:^7.24.1" + "@babel/types": "npm:^7.24.0" + convert-source-map: "npm:^2.0.0" + debug: "npm:^4.1.0" gensync: "npm:^1.0.0-beta.2" - json5: "npm:^2.2.1" - semver: "npm:^6.3.0" - checksum: 10/c9877e59e0666c90a084184c7f4518ddb2a4e5ebb7e277f81de7fb5c102bd4b814796f63c01cf61b4bb88e4c16809b4fd3692e64e0522e6bb44eeea93426bc01 + json5: "npm:^2.2.3" + semver: "npm:^6.3.1" + checksum: 10/3a7b9931fe0d93c500dcdb6b36f038b0f9d5090c048818e62aa8321c8f6e8ccc3d47373f0b40591c1fe3b13e5096bacabb1ade83f9f4d86f57878c39a9d1ade1 languageName: node linkType: hard @@ -627,6 +651,21 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/helper-module-transforms@npm:7.23.3" + dependencies: + "@babel/helper-environment-visitor": "npm:^7.22.20" + "@babel/helper-module-imports": "npm:^7.22.15" + "@babel/helper-simple-access": "npm:^7.22.5" + "@babel/helper-split-export-declaration": "npm:^7.22.6" + "@babel/helper-validator-identifier": "npm:^7.22.20" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10/583fa580f8e50e6f45c4f46aa76a8e49c2528deb84e25f634d66461b9a0e2420e13979b0a607b67aef67eaf8db8668eb9edc038b4514b16e3879fe09e8fd294b + languageName: node + linkType: hard + "@babel/helper-module-transforms@npm:^7.18.0, @babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.0": version: 7.19.0 resolution: "@babel/helper-module-transforms@npm:7.19.0" @@ -643,21 +682,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/helper-module-transforms@npm:7.23.3" - dependencies: - "@babel/helper-environment-visitor": "npm:^7.22.20" - "@babel/helper-module-imports": "npm:^7.22.15" - "@babel/helper-simple-access": "npm:^7.22.5" - "@babel/helper-split-export-declaration": "npm:^7.22.6" - "@babel/helper-validator-identifier": "npm:^7.22.20" - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 10/583fa580f8e50e6f45c4f46aa76a8e49c2528deb84e25f634d66461b9a0e2420e13979b0a607b67aef67eaf8db8668eb9edc038b4514b16e3879fe09e8fd294b - languageName: node - linkType: hard - "@babel/helper-optimise-call-expression@npm:^7.16.7, @babel/helper-optimise-call-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-optimise-call-expression@npm:7.18.6" @@ -881,14 +905,14 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.19.0": - version: 7.19.4 - resolution: "@babel/helpers@npm:7.19.4" +"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.24.1": + version: 7.24.1 + resolution: "@babel/helpers@npm:7.24.1" dependencies: - "@babel/template": "npm:^7.18.10" - "@babel/traverse": "npm:^7.19.4" - "@babel/types": "npm:^7.19.4" - checksum: 10/2a869b65de51974c0347df8a23ba82d1e5816fc2724fe22b2632750cfcf9e78f8333f210ee40e5cc90735e58f1e2f0676cdbe41af71147d85435d7a03e3ceec5 + "@babel/template": "npm:^7.24.0" + "@babel/traverse": "npm:^7.24.1" + "@babel/types": "npm:^7.24.0" + checksum: 10/82d3cdd3beafc4583f237515ef220bc205ced8b0540c6c6e191fc367a9589bd7304b8f9800d3d7574d4db9f079bd555979816b1874c86e53b3e7dd2032ad6c7c languageName: node linkType: hard @@ -921,6 +945,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.12.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1": + version: 7.24.1 + resolution: "@babel/parser@npm:7.24.1" + bin: + parser: ./bin/babel-parser.js + checksum: 10/561d9454091e07ecfec3828ce79204c0fc9d24e17763f36181c6984392be4ca6b79c8225f2224fdb7b1b3b70940e243368c8f83ac77ec2dc20f46d3d06bd6795 + languageName: node + linkType: hard + "@babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0": version: 7.23.6 resolution: "@babel/parser@npm:7.23.6" @@ -2995,6 +3028,17 @@ __metadata: languageName: node linkType: hard +"@babel/template@npm:^7.12.7, @babel/template@npm:^7.24.0": + version: 7.24.0 + resolution: "@babel/template@npm:7.24.0" + dependencies: + "@babel/code-frame": "npm:^7.23.5" + "@babel/parser": "npm:^7.24.0" + "@babel/types": "npm:^7.24.0" + checksum: 10/8c538338c7de8fac8ada691a5a812bdcbd60bd4a4eb5adae2cc9ee19773e8fb1a724312a00af9e1ce49056ffd3c3475e7287b5668cf6360bfb3f8ac827a06ffe + languageName: node + linkType: hard + "@babel/template@npm:^7.16.7, @babel/template@npm:^7.18.10, @babel/template@npm:^7.3.3": version: 7.18.10 resolution: "@babel/template@npm:7.18.10" @@ -6559,16 +6603,6 @@ __metadata: languageName: node linkType: hard -"@jridgewell/gen-mapping@npm:^0.1.0": - version: 0.1.1 - resolution: "@jridgewell/gen-mapping@npm:0.1.1" - dependencies: - "@jridgewell/set-array": "npm:^1.0.0" - "@jridgewell/sourcemap-codec": "npm:^1.4.10" - checksum: 10/ba76fae1d8ea52b181474518c705a8eac36405dfc836fb07e9c25730a84d29e05fd6d954f121057742639f3128a24ea45d205c9c989efd464d1114671c19fa6c - languageName: node - linkType: hard - "@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2": version: 0.3.2 resolution: "@jridgewell/gen-mapping@npm:0.3.2" @@ -6580,6 +6614,17 @@ __metadata: languageName: node linkType: hard +"@jridgewell/gen-mapping@npm:^0.3.5": + version: 0.3.5 + resolution: "@jridgewell/gen-mapping@npm:0.3.5" + dependencies: + "@jridgewell/set-array": "npm:^1.2.1" + "@jridgewell/sourcemap-codec": "npm:^1.4.10" + "@jridgewell/trace-mapping": "npm:^0.3.24" + checksum: 10/81587b3c4dd8e6c60252122937cea0c637486311f4ed208b52b62aae2e7a87598f63ec330e6cd0984af494bfb16d3f0d60d3b21d7e5b4aedd2602ff3fe9d32e2 + languageName: node + linkType: hard + "@jridgewell/resolve-uri@npm:3.1.0": version: 3.1.0 resolution: "@jridgewell/resolve-uri@npm:3.1.0" @@ -6601,13 +6646,20 @@ __metadata: languageName: node linkType: hard -"@jridgewell/set-array@npm:^1.0.0, @jridgewell/set-array@npm:^1.0.1": +"@jridgewell/set-array@npm:^1.0.1": version: 1.1.2 resolution: "@jridgewell/set-array@npm:1.1.2" checksum: 10/69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e languageName: node linkType: hard +"@jridgewell/set-array@npm:^1.2.1": + version: 1.2.1 + resolution: "@jridgewell/set-array@npm:1.2.1" + checksum: 10/832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10 + languageName: node + linkType: hard + "@jridgewell/source-map@npm:^0.3.2": version: 0.3.2 resolution: "@jridgewell/source-map@npm:0.3.2" @@ -6679,6 +6731,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/trace-mapping@npm:^0.3.24": + version: 0.3.25 + resolution: "@jridgewell/trace-mapping@npm:0.3.25" + dependencies: + "@jridgewell/resolve-uri": "npm:^3.1.0" + "@jridgewell/sourcemap-codec": "npm:^1.4.14" + checksum: 10/dced32160a44b49d531b80a4a2159dceab6b3ddf0c8e95a0deae4b0e894b172defa63d5ac52a19c2068e1fe7d31ea4ba931fbeec103233ecb4208953967120fc + languageName: node + linkType: hard + "@jridgewell/trace-mapping@npm:^0.3.7, @jridgewell/trace-mapping@npm:^0.3.9": version: 0.3.13 resolution: "@jridgewell/trace-mapping@npm:0.3.13" @@ -16113,7 +16175,7 @@ __metadata: languageName: node linkType: hard -"gensync@npm:^1.0.0-beta.2": +"gensync@npm:^1.0.0-beta.1, gensync@npm:^1.0.0-beta.2": version: 1.0.0-beta.2 resolution: "gensync@npm:1.0.0-beta.2" checksum: 10/17d8333460204fbf1f9160d067e1e77f908a5447febb49424b8ab043026049835c9ef3974445c57dbd39161f4d2b04356d7de12b2eecaa27a7a7ea7d871cbedd @@ -19419,7 +19481,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.1": +"json5@npm:^2.1.2, json5@npm:^2.2.0": version: 2.2.1 resolution: "json5@npm:2.2.1" bin: @@ -19428,6 +19490,15 @@ __metadata: languageName: node linkType: hard +"json5@npm:^2.2.3": + version: 2.2.3 + resolution: "json5@npm:2.2.3" + bin: + json5: lib/cli.js + checksum: 10/1db67b853ff0de3534085d630691d3247de53a2ed1390ba0ddff681ea43e9b3e30ecbdb65c5e9aab49435e44059c23dbd6fee8ee619419ba37465bb0dd7135da + languageName: node + linkType: hard + "jsonc-parser@npm:^3.2.0": version: 3.2.0 resolution: "jsonc-parser@npm:3.2.0" @@ -25509,6 +25580,7 @@ __metadata: version: 0.0.0-use.local resolution: "rtk-monorepo@workspace:." dependencies: + "@babel/core": "npm:^7.24.3" "@typescript-eslint/eslint-plugin": "npm:6.12.0" "@typescript-eslint/parser": "npm:6.12.0" eslint: "npm:^7.25.0" @@ -25837,6 +25909,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^5.4.1": + version: 5.7.2 + resolution: "semver@npm:5.7.2" + bin: + semver: bin/semver + checksum: 10/fca14418a174d4b4ef1fecb32c5941e3412d52a4d3d85165924ce3a47fbc7073372c26faf7484ceb4bbc2bde25880c6b97e492473dc7e9708fdfb1c6a02d546e + languageName: node + linkType: hard + "semver@npm:^6.0.0, semver@npm:^6.1.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.2.0, semver@npm:^6.3.0": version: 6.3.0 resolution: "semver@npm:6.3.0" @@ -26452,7 +26533,7 @@ __metadata: languageName: node linkType: hard -"source-map@npm:^0.5.7": +"source-map@npm:^0.5.0, source-map@npm:^0.5.7": version: 0.5.7 resolution: "source-map@npm:0.5.7" checksum: 10/9b4ac749ec5b5831cad1f8cc4c19c4298ebc7474b24a0acf293e2f040f03f8eeccb3d01f12aa0f90cf46d555c887e03912b83a042c627f419bda5152d89c5269 From 5e26783624bc4dc56facdc70888c9979ed1808ff Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 27 Mar 2024 07:44:04 -0500 Subject: [PATCH 02/23] Move `@babel/code-frame` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 36 ++++++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 6e4cf9562..b7b98478b 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "examples/action-listener/*" ], "devDependencies": { + "@babel/code-frame": "^7.24.2", "@babel/core": "^7.24.3", "@typescript-eslint/eslint-plugin": "6.12.0", "@typescript-eslint/parser": "6.12.0", @@ -43,7 +44,6 @@ "typescript": "^5.2.2" }, "resolutions": { - "@babel/code-frame": "7.18.6", "@babel/generator": "7.19.3", "@babel/helper-compilation-targets": "7.19.3", "@babel/traverse": "7.19.3", diff --git a/yarn.lock b/yarn.lock index 44881e2b5..12ba418fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -301,12 +301,22 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:7.18.6": - version: 7.18.6 - resolution: "@babel/code-frame@npm:7.18.6" +"@babel/code-frame@npm:7.12.11": + version: 7.12.11 + resolution: "@babel/code-frame@npm:7.12.11" + dependencies: + "@babel/highlight": "npm:^7.10.4" + checksum: 10/d243f0b1e475f5953ae452f70c0b4bd47a106df59733631b9ae36fb9ad1ae068c3a11d936ed22117084ec7439e843a4b75700922b507aac723ad84a257ae94f9 + languageName: node + linkType: hard + +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.8.3": + version: 7.24.2 + resolution: "@babel/code-frame@npm:7.24.2" dependencies: - "@babel/highlight": "npm:^7.18.6" - checksum: 10/195e2be3172d7684bf95cff69ae3b7a15a9841ea9d27d3c843662d50cdd7d6470fd9c8e64be84d031117e4a4083486effba39f9aef6bbb2c89f7f21bcfba33ba + "@babel/highlight": "npm:^7.24.2" + picocolors: "npm:^1.0.0" + checksum: 10/7db8f5b36ffa3f47a37f58f61e3d130b9ecad21961f3eede7e2a4ac2c7e4a5efb6e9d03a810c669bc986096831b6c0dfc2c3082673d93351b82359c1b03e0590 languageName: node linkType: hard @@ -916,14 +926,15 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/highlight@npm:7.18.6" +"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.24.2": + version: 7.24.2 + resolution: "@babel/highlight@npm:7.24.2" dependencies: - "@babel/helper-validator-identifier": "npm:^7.18.6" - chalk: "npm:^2.0.0" + "@babel/helper-validator-identifier": "npm:^7.22.20" + chalk: "npm:^2.4.2" js-tokens: "npm:^4.0.0" - checksum: 10/92d8ee61549de5ff5120e945e774728e5ccd57fd3b2ed6eace020ec744823d4a98e242be1453d21764a30a14769ecd62170fba28539b211799bbaf232bbb2789 + picocolors: "npm:^1.0.0" + checksum: 10/4555124235f34403bb28f55b1de58edf598491cc181c75f8afc8fe529903cb598cd52fe3bf2faab9bc1f45c299681ef0e44eea7a848bb85c500c5a4fe13f54f6 languageName: node linkType: hard @@ -11903,7 +11914,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^2.0.0, chalk@npm:^2.4.1": +"chalk@npm:^2.4.1, chalk@npm:^2.4.2": version: 2.4.2 resolution: "chalk@npm:2.4.2" dependencies: @@ -25580,6 +25591,7 @@ __metadata: version: 0.0.0-use.local resolution: "rtk-monorepo@workspace:." dependencies: + "@babel/code-frame": "npm:^7.24.2" "@babel/core": "npm:^7.24.3" "@typescript-eslint/eslint-plugin": "npm:6.12.0" "@typescript-eslint/parser": "npm:6.12.0" From 2f8b790b582538b4f8a0d8f5ad417158eaaff08e Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 27 Mar 2024 07:45:22 -0500 Subject: [PATCH 03/23] Move `@babel/generator` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index b7b98478b..b8d3585b7 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "devDependencies": { "@babel/code-frame": "^7.24.2", "@babel/core": "^7.24.3", + "@babel/generator": "^7.24.1", "@typescript-eslint/eslint-plugin": "6.12.0", "@typescript-eslint/parser": "6.12.0", "eslint": "^7.25.0", @@ -44,7 +45,6 @@ "typescript": "^5.2.2" }, "resolutions": { - "@babel/generator": "7.19.3", "@babel/helper-compilation-targets": "7.19.3", "@babel/traverse": "7.19.3", "@babel/types": "7.19.3", diff --git a/yarn.lock b/yarn.lock index 12ba418fd..86a96816d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -388,14 +388,15 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:7.19.3": - version: 7.19.3 - resolution: "@babel/generator@npm:7.19.3" +"@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.18.7, @babel/generator@npm:^7.19.3, @babel/generator@npm:^7.24.1, @babel/generator@npm:^7.5.0, @babel/generator@npm:^7.7.2": + version: 7.24.1 + resolution: "@babel/generator@npm:7.24.1" dependencies: - "@babel/types": "npm:^7.19.3" - "@jridgewell/gen-mapping": "npm:^0.3.2" + "@babel/types": "npm:^7.24.0" + "@jridgewell/gen-mapping": "npm:^0.3.5" + "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^2.5.1" - checksum: 10/7e486ef57f0874cc0ef7f923da81f33e178582bb765554db16ece003e71d0ecb38040208aed45e6d418c57cf4f6cbe69ed85ff90fbc9cdefd0573442b8813d04 + checksum: 10/c6160e9cd63d7ed7168dee27d827f9c46fab820c45861a5df56cd5c78047f7c3fc97c341e9ccfa1a6f97c87ec2563d9903380b5f92794e3540a6c5f99eb8f075 languageName: node linkType: hard @@ -6742,7 +6743,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.24": +"@jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25": version: 0.3.25 resolution: "@jridgewell/trace-mapping@npm:0.3.25" dependencies: @@ -25593,6 +25594,7 @@ __metadata: dependencies: "@babel/code-frame": "npm:^7.24.2" "@babel/core": "npm:^7.24.3" + "@babel/generator": "npm:^7.24.1" "@typescript-eslint/eslint-plugin": "npm:6.12.0" "@typescript-eslint/parser": "npm:6.12.0" eslint: "npm:^7.25.0" From 1b7bbd01016b8c2ab68ac7a0f3080a670c4013c6 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 27 Mar 2024 07:46:07 -0500 Subject: [PATCH 04/23] Move `@babel/helper-compilation-targets` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 77 +++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 65 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index b8d3585b7..0df5478cb 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "@babel/code-frame": "^7.24.2", "@babel/core": "^7.24.3", "@babel/generator": "^7.24.1", + "@babel/helper-compilation-targets": "^7.23.6", "@typescript-eslint/eslint-plugin": "6.12.0", "@typescript-eslint/parser": "6.12.0", "eslint": "^7.25.0", @@ -45,7 +46,6 @@ "typescript": "^5.2.2" }, "resolutions": { - "@babel/helper-compilation-targets": "7.19.3", "@babel/traverse": "7.19.3", "@babel/types": "7.19.3", "esbuild": "0.19.7", diff --git a/yarn.lock b/yarn.lock index 86a96816d..1bc9f1fa2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -320,13 +320,20 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.17.10, @babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.19.3, @babel/compat-data@npm:^7.19.4": +"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.17.10, @babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.19.4": version: 7.19.4 resolution: "@babel/compat-data@npm:7.19.4" checksum: 10/c1ae7e4ce406438c3ea1a110878518db872582f19da2f40ed49c4af455c3d69b3518a4462ae0f0b31db50abab23fec3d42d5e1f2cb68790fb4439ed3ed247bad languageName: node linkType: hard +"@babel/compat-data@npm:^7.23.5": + version: 7.24.1 + resolution: "@babel/compat-data@npm:7.24.1" + checksum: 10/d5460b99c07ff8487467c52f742a219c7e3bcdcaa2882456a13c0d0c8116405f0c85a651fb60511284dc64ed627a5e989f24c3cd6e71d07a9947e7c8954b433c + languageName: node + linkType: hard + "@babel/core@npm:7.12.9": version: 7.12.9 resolution: "@babel/core@npm:7.12.9" @@ -438,17 +445,16 @@ __metadata: languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:7.19.3": - version: 7.19.3 - resolution: "@babel/helper-compilation-targets@npm:7.19.3" +"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.16.7, @babel/helper-compilation-targets@npm:^7.17.10, @babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.2, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.19.0, @babel/helper-compilation-targets@npm:^7.19.3, @babel/helper-compilation-targets@npm:^7.23.6": + version: 7.23.6 + resolution: "@babel/helper-compilation-targets@npm:7.23.6" dependencies: - "@babel/compat-data": "npm:^7.19.3" - "@babel/helper-validator-option": "npm:^7.18.6" - browserslist: "npm:^4.21.3" - semver: "npm:^6.3.0" - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 10/91a599d2f27f991447bcd4b94d6bb8feef87c5e1b5c585b697f0f0ae947a10723d4a0dbfe922896b673c6e57c5560dbefa318bf6030339b9505c7583dc075b4e + "@babel/compat-data": "npm:^7.23.5" + "@babel/helper-validator-option": "npm:^7.23.5" + browserslist: "npm:^4.22.2" + lru-cache: "npm:^5.1.1" + semver: "npm:^6.3.1" + checksum: 10/05595cd73087ddcd81b82d2f3297aac0c0422858dfdded43d304786cf680ec33e846e2317e6992d2c964ee61d93945cbf1fa8ec80b55aee5bfb159227fb02cb9 languageName: node linkType: hard @@ -885,7 +891,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-option@npm:^7.22.15": +"@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5": version: 7.23.5 resolution: "@babel/helper-validator-option@npm:7.23.5" checksum: 10/537cde2330a8aede223552510e8a13e9c1c8798afee3757995a7d4acae564124fe2bf7e7c3d90d62d3657434a74340a274b3b3b1c6f17e9a2be1f48af29cb09e @@ -11512,7 +11518,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.16.6, browserslist@npm:^4.18.1, browserslist@npm:^4.20.3, browserslist@npm:^4.21.3, browserslist@npm:^4.21.4": +"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.16.6, browserslist@npm:^4.18.1, browserslist@npm:^4.20.3, browserslist@npm:^4.21.4": version: 4.21.4 resolution: "browserslist@npm:4.21.4" dependencies: @@ -11540,6 +11546,20 @@ __metadata: languageName: node linkType: hard +"browserslist@npm:^4.22.2": + version: 4.23.0 + resolution: "browserslist@npm:4.23.0" + dependencies: + caniuse-lite: "npm:^1.0.30001587" + electron-to-chromium: "npm:^1.4.668" + node-releases: "npm:^2.0.14" + update-browserslist-db: "npm:^1.0.13" + bin: + browserslist: cli.js + checksum: 10/496c3862df74565dd942b4ae65f502c575cbeba1fa4a3894dad7aa3b16130dc3033bc502d8848147f7b625154a284708253d9598bcdbef5a1e34cf11dc7bad8e + languageName: node + linkType: hard + "bser@npm:2.1.1": version: 2.1.1 resolution: "bser@npm:2.1.1" @@ -11814,6 +11834,13 @@ __metadata: languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001587": + version: 1.0.30001600 + resolution: "caniuse-lite@npm:1.0.30001600" + checksum: 10/4c52f83ed71bc5f6e443bd17923460f1c77915adc2c2aa79ddaedceccc690b5917054b0c41b79e9138cbbd9abcdc0db9e224e79e3e734e581dfec06505f3a2b4 + languageName: node + linkType: hard + "capital-case@npm:^1.0.4": version: 1.0.4 resolution: "capital-case@npm:1.0.4" @@ -14241,6 +14268,13 @@ __metadata: languageName: node linkType: hard +"electron-to-chromium@npm:^1.4.668": + version: 1.4.717 + resolution: "electron-to-chromium@npm:1.4.717" + checksum: 10/ec5df5f0731cd4b7e42d93ab9d17ac5c53bc6c6a0cd298af090c96717652cc8962a72094fd602aff3245eb839712ed7a2587f4e0d90a6bf7834f105a06fefa85 + languageName: node + linkType: hard + "elegant-spinner@npm:^1.0.1": version: 1.0.1 resolution: "elegant-spinner@npm:1.0.1" @@ -20122,6 +20156,15 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^5.1.1": + version: 5.1.1 + resolution: "lru-cache@npm:5.1.1" + dependencies: + yallist: "npm:^3.0.2" + checksum: 10/951d2673dcc64a7fb888bf3d13bc2fdf923faca97d89cdb405ba3dfff77e2b26e5798d405e78fcd7094c9e7b8b4dab2ddc5a4f8a11928af24a207b7c738ca3f8 + languageName: node + linkType: hard + "lru-cache@npm:^6.0.0": version: 6.0.0 resolution: "lru-cache@npm:6.0.0" @@ -25595,6 +25638,7 @@ __metadata: "@babel/code-frame": "npm:^7.24.2" "@babel/core": "npm:^7.24.3" "@babel/generator": "npm:^7.24.1" + "@babel/helper-compilation-targets": "npm:^7.23.6" "@typescript-eslint/eslint-plugin": "npm:6.12.0" "@typescript-eslint/parser": "npm:6.12.0" eslint: "npm:^7.25.0" @@ -30290,6 +30334,13 @@ __metadata: languageName: node linkType: hard +"yallist@npm:^3.0.2": + version: 3.1.1 + resolution: "yallist@npm:3.1.1" + checksum: 10/9af0a4329c3c6b779ac4736c69fae4190ac03029fa27c1aef4e6bcc92119b73dea6fe5db5fe881fb0ce2a0e9539a42cdf60c7c21eda04d1a0b8c082e38509efb + languageName: node + linkType: hard + "yallist@npm:^4.0.0": version: 4.0.0 resolution: "yallist@npm:4.0.0" From fa6d9f03d632c4b1c6a168c5baf3d2e4ffb09d16 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 27 Mar 2024 07:46:59 -0500 Subject: [PATCH 05/23] Move `@babel/traverse` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 97 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 63 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 0df5478cb..353c0c101 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "@babel/core": "^7.24.3", "@babel/generator": "^7.24.1", "@babel/helper-compilation-targets": "^7.23.6", + "@babel/traverse": "^7.24.1", "@typescript-eslint/eslint-plugin": "6.12.0", "@typescript-eslint/parser": "6.12.0", "eslint": "^7.25.0", @@ -46,7 +47,6 @@ "typescript": "^5.2.2" }, "resolutions": { - "@babel/traverse": "7.19.3", "@babel/types": "7.19.3", "esbuild": "0.19.7", "jest-snapshot": "29.3.1", diff --git a/yarn.lock b/yarn.lock index 1bc9f1fa2..20c9677a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -310,7 +310,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.8.3": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.8.3": version: 7.24.2 resolution: "@babel/code-frame@npm:7.24.2" dependencies: @@ -395,7 +395,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.18.7, @babel/generator@npm:^7.19.3, @babel/generator@npm:^7.24.1, @babel/generator@npm:^7.5.0, @babel/generator@npm:^7.7.2": +"@babel/generator@npm:^7.12.13, @babel/generator@npm:^7.12.5, @babel/generator@npm:^7.18.7, @babel/generator@npm:^7.24.1, @babel/generator@npm:^7.5.0, @babel/generator@npm:^7.7.2": version: 7.24.1 resolution: "@babel/generator@npm:7.24.1" dependencies: @@ -603,6 +603,16 @@ __metadata: languageName: node linkType: hard +"@babel/helper-function-name@npm:^7.12.13, @babel/helper-function-name@npm:^7.23.0": + version: 7.23.0 + resolution: "@babel/helper-function-name@npm:7.23.0" + dependencies: + "@babel/template": "npm:^7.22.15" + "@babel/types": "npm:^7.23.0" + checksum: 10/7b2ae024cd7a09f19817daf99e0153b3bf2bc4ab344e197e8d13623d5e36117ed0b110914bc248faa64e8ccd3e97971ec7b41cc6fd6163a2b980220c58dcdf6d + languageName: node + linkType: hard + "@babel/helper-function-name@npm:^7.16.7, @babel/helper-function-name@npm:^7.17.9, @babel/helper-function-name@npm:^7.18.9, @babel/helper-function-name@npm:^7.19.0": version: 7.19.0 resolution: "@babel/helper-function-name@npm:7.19.0" @@ -613,16 +623,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-function-name@npm:^7.23.0": - version: 7.23.0 - resolution: "@babel/helper-function-name@npm:7.23.0" - dependencies: - "@babel/template": "npm:^7.22.15" - "@babel/types": "npm:^7.23.0" - checksum: 10/7b2ae024cd7a09f19817daf99e0153b3bf2bc4ab344e197e8d13623d5e36117ed0b110914bc248faa64e8ccd3e97971ec7b41cc6fd6163a2b980220c58dcdf6d - languageName: node - linkType: hard - "@babel/helper-hoist-variables@npm:^7.16.7, @babel/helper-hoist-variables@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-hoist-variables@npm:7.18.6" @@ -632,6 +632,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-hoist-variables@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-hoist-variables@npm:7.22.5" + dependencies: + "@babel/types": "npm:^7.22.5" + checksum: 10/394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc + languageName: node + linkType: hard + "@babel/helper-member-expression-to-functions@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-member-expression-to-functions@npm:7.18.9" @@ -845,6 +854,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-split-export-declaration@npm:^7.12.13, @babel/helper-split-export-declaration@npm:^7.22.6": + version: 7.22.6 + resolution: "@babel/helper-split-export-declaration@npm:7.22.6" + dependencies: + "@babel/types": "npm:^7.22.5" + checksum: 10/e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921 + languageName: node + linkType: hard + "@babel/helper-split-export-declaration@npm:^7.16.7, @babel/helper-split-export-declaration@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-split-export-declaration@npm:7.18.6" @@ -854,15 +872,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.22.6": - version: 7.22.6 - resolution: "@babel/helper-split-export-declaration@npm:7.22.6" - dependencies: - "@babel/types": "npm:^7.22.5" - checksum: 10/e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921 - languageName: node - linkType: hard - "@babel/helper-string-parser@npm:^7.18.10": version: 7.18.10 resolution: "@babel/helper-string-parser@npm:7.18.10" @@ -954,7 +963,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.8, @babel/parser@npm:^7.19.3, @babel/parser@npm:^7.3.3": +"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.8, @babel/parser@npm:^7.3.3": version: 7.19.4 resolution: "@babel/parser@npm:7.19.4" bin: @@ -963,7 +972,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.12.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1": +"@babel/parser@npm:^7.12.13, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1": version: 7.24.1 resolution: "@babel/parser@npm:7.24.1" bin: @@ -3079,21 +3088,38 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:7.19.3": - version: 7.19.3 - resolution: "@babel/traverse@npm:7.19.3" +"@babel/traverse@npm:7.12.13": + version: 7.12.13 + resolution: "@babel/traverse@npm:7.12.13" dependencies: - "@babel/code-frame": "npm:^7.18.6" - "@babel/generator": "npm:^7.19.3" - "@babel/helper-environment-visitor": "npm:^7.18.9" - "@babel/helper-function-name": "npm:^7.19.0" - "@babel/helper-hoist-variables": "npm:^7.18.6" - "@babel/helper-split-export-declaration": "npm:^7.18.6" - "@babel/parser": "npm:^7.19.3" - "@babel/types": "npm:^7.19.3" + "@babel/code-frame": "npm:^7.12.13" + "@babel/generator": "npm:^7.12.13" + "@babel/helper-function-name": "npm:^7.12.13" + "@babel/helper-split-export-declaration": "npm:^7.12.13" + "@babel/parser": "npm:^7.12.13" + "@babel/types": "npm:^7.12.13" debug: "npm:^4.1.0" globals: "npm:^11.1.0" - checksum: 10/5402e303707927fd502be341878811a6db80e20143dfcd1e5db0894fba70fc4f132280feb8e81aca8daef8b3f964ef2514c278f530219faad135ab68eaf2279d + lodash: "npm:^4.17.19" + checksum: 10/370520727e28ac11c8789f60d7e26991a7e6760b7e4832c544fa7c7f6d94e089930eadc401aa04abc0d784564d023a26e389d06744498adc3d07d72edc16f505 + languageName: node + linkType: hard + +"@babel/traverse@npm:^7.0.0, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.18.8, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.24.1, @babel/traverse@npm:^7.7.2": + version: 7.24.1 + resolution: "@babel/traverse@npm:7.24.1" + dependencies: + "@babel/code-frame": "npm:^7.24.1" + "@babel/generator": "npm:^7.24.1" + "@babel/helper-environment-visitor": "npm:^7.22.20" + "@babel/helper-function-name": "npm:^7.23.0" + "@babel/helper-hoist-variables": "npm:^7.22.5" + "@babel/helper-split-export-declaration": "npm:^7.22.6" + "@babel/parser": "npm:^7.24.1" + "@babel/types": "npm:^7.24.0" + debug: "npm:^4.3.1" + globals: "npm:^11.1.0" + checksum: 10/b9b0173c286ef549e179f3725df3c4958069ad79fe5b9840adeb99692eb4a5a08db4e735c0f086aab52e7e08ec711cee9e7c06cb908d8035641d1382172308d3 languageName: node linkType: hard @@ -25639,6 +25665,7 @@ __metadata: "@babel/core": "npm:^7.24.3" "@babel/generator": "npm:^7.24.1" "@babel/helper-compilation-targets": "npm:^7.23.6" + "@babel/traverse": "npm:^7.24.1" "@typescript-eslint/eslint-plugin": "npm:6.12.0" "@typescript-eslint/parser": "npm:6.12.0" eslint: "npm:^7.25.0" From 686c91dc07bdeba365d948c5b525f9dfd7db8602 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 27 Mar 2024 07:47:23 -0500 Subject: [PATCH 06/23] Move `@babel/types` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 48 ++++++++++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 353c0c101..13c4652d2 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "@babel/generator": "^7.24.1", "@babel/helper-compilation-targets": "^7.23.6", "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0", "@typescript-eslint/eslint-plugin": "6.12.0", "@typescript-eslint/parser": "6.12.0", "eslint": "^7.25.0", @@ -47,7 +48,6 @@ "typescript": "^5.2.2" }, "resolutions": { - "@babel/types": "7.19.3", "esbuild": "0.19.7", "jest-snapshot": "29.3.1", "react-redux": "npm:8.0.2", diff --git a/yarn.lock b/yarn.lock index 20c9677a5..821715fa3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -872,27 +872,27 @@ __metadata: languageName: node linkType: hard -"@babel/helper-string-parser@npm:^7.18.10": - version: 7.18.10 - resolution: "@babel/helper-string-parser@npm:7.18.10" - checksum: 10/a126898b54f34b66f70a1bae13905079f568052c4ed99a0cfbf75fdb84b0cb95eaff757c274433695b3db0fed5aeb2944f67f4bf3e273923aad78b720064ae1c - languageName: node - linkType: hard - -"@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1": - version: 7.19.1 - resolution: "@babel/helper-validator-identifier@npm:7.19.1" - checksum: 10/30ecd53b7276970d59d65e68e147ea885f8812e50d06a59315dd1f12dc41467d29d6c56bf1fd02e91100f939cba378815b2c19f5d3604331a153aed9efcbd2a9 +"@babel/helper-string-parser@npm:^7.23.4": + version: 7.24.1 + resolution: "@babel/helper-string-parser@npm:7.24.1" + checksum: 10/04c0ede77b908b43e6124753b48bc485528112a9335f0a21a226bff1ace75bb6e64fab24c85cb4b1610ef3494dacd1cb807caeb6b79a7b36c43d48c289b35949 languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.22.20": +"@babel/helper-validator-identifier@npm:^7.12.11, @babel/helper-validator-identifier@npm:^7.22.20": version: 7.22.20 resolution: "@babel/helper-validator-identifier@npm:7.22.20" checksum: 10/df882d2675101df2d507b95b195ca2f86a3ef28cb711c84f37e79ca23178e13b9f0d8b522774211f51e40168bf5142be4c1c9776a150cddb61a0d5bf3e95750b languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.18.6": + version: 7.19.1 + resolution: "@babel/helper-validator-identifier@npm:7.19.1" + checksum: 10/30ecd53b7276970d59d65e68e147ea885f8812e50d06a59315dd1f12dc41467d29d6c56bf1fd02e91100f939cba378815b2c19f5d3604331a153aed9efcbd2a9 + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.16.7, @babel/helper-validator-option@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-validator-option@npm:7.18.6" @@ -3123,14 +3123,25 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:7.19.3": - version: 7.19.3 - resolution: "@babel/types@npm:7.19.3" +"@babel/types@npm:7.12.13": + version: 7.12.13 + resolution: "@babel/types@npm:7.12.13" + dependencies: + "@babel/helper-validator-identifier": "npm:^7.12.11" + lodash: "npm:^4.17.19" + to-fast-properties: "npm:^2.0.0" + checksum: 10/fc4ebc3fc2256cfad5f553b41df766a5dad5cc3c0bf2572b1b9617ff735de9874c6c2b3e0649422150c67e9258e4566164b7bc180b3d9ec73517fc20b951d647 + languageName: node + linkType: hard + +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.13, @babel/types@npm:^7.12.6, @babel/types@npm:^7.12.7, @babel/types@npm:^7.15.6, @babel/types@npm:^7.16.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.17.12, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.2, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.19.4, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": + version: 7.24.0 + resolution: "@babel/types@npm:7.24.0" dependencies: - "@babel/helper-string-parser": "npm:^7.18.10" - "@babel/helper-validator-identifier": "npm:^7.19.1" + "@babel/helper-string-parser": "npm:^7.23.4" + "@babel/helper-validator-identifier": "npm:^7.22.20" to-fast-properties: "npm:^2.0.0" - checksum: 10/f36576df66534ed4fb36e44e6e1cf335a1014f75294dc7160126e515081dbed90e5a8c351e9aad41225a0ff67c7f2d84bbaa41cfdae5f1e7d84cbc0cfcc19475 + checksum: 10/a0b4875ce2e132f9daff0d5b27c7f4c4fcc97f2b084bdc5834e92c9d32592778489029e65d99d00c406da612d87b72d7a236c0afccaa1435c028d0c94c9b6da4 languageName: node linkType: hard @@ -25666,6 +25677,7 @@ __metadata: "@babel/generator": "npm:^7.24.1" "@babel/helper-compilation-targets": "npm:^7.23.6" "@babel/traverse": "npm:^7.24.1" + "@babel/types": "npm:^7.24.0" "@typescript-eslint/eslint-plugin": "npm:6.12.0" "@typescript-eslint/parser": "npm:6.12.0" eslint: "npm:^7.25.0" From a1f4fdc9ce3a20c0d82d587b174a9425ce873526 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 27 Mar 2024 05:55:29 -0500 Subject: [PATCH 07/23] Replace all instances of `TypedUseSelectorHook` with `.withTypes` --- docs/tutorials/typescript.md | 5 ++--- docs/usage/migrating-rtk-2.md | 16 ++++++---------- docs/usage/migrating-to-modern-redux.mdx | 6 +++--- docs/usage/nextjs.mdx | 14 ++++++-------- docs/usage/usage-with-typescript.md | 4 ++-- 5 files changed, 19 insertions(+), 26 deletions(-) diff --git a/docs/tutorials/typescript.md b/docs/tutorials/typescript.md index ef621b06a..3076cabd6 100644 --- a/docs/tutorials/typescript.md +++ b/docs/tutorials/typescript.md @@ -76,13 +76,12 @@ Since these are actual variables, not types, it's important to define them in a ```ts title="app/hooks.ts" import { useDispatch, useSelector } from 'react-redux' -import type { TypedUseSelectorHook } from 'react-redux' import type { RootState, AppDispatch } from './store' // highlight-start // Use throughout your app instead of plain `useDispatch` and `useSelector` -export const useAppDispatch: () => AppDispatch = useDispatch -export const useAppSelector: TypedUseSelectorHook = useSelector +export const useAppDispatch = useDispatch.withTypes() +export const useAppSelector = useSelector.withTypes() // highlight-end ``` diff --git a/docs/usage/migrating-rtk-2.md b/docs/usage/migrating-rtk-2.md index bbdedaa9b..8ccb54c58 100644 --- a/docs/usage/migrating-rtk-2.md +++ b/docs/usage/migrating-rtk-2.md @@ -448,7 +448,6 @@ React Redux supports creating `hooks` (and `connect`) with a [custom context](ht import { createContext } from 'react' import { ReactReduxContextValue, - TypedUseSelectorHook, createDispatchHook, createSelectorHook, createStoreHook, @@ -458,10 +457,9 @@ import { AppStore, RootState, AppDispatch } from './store' // highlight-next-line const context = createContext(null as any) -export const useStore: () => AppStore = createStoreHook(context) -export const useDispatch: () => AppDispatch = createDispatchHook(context) -export const useSelector: TypedUseSelectorHook = - createSelectorHook(context) +export const useStore = createStoreHook(context).withTypes() +export const useDispatch = createDispatchHook(context).withTypes() +export const useSelector = createSelectorHook(context).withTypes() ``` In v9, the types now match the runtime behaviour. The context is typed to hold `ReactReduxContextValue | null`, and the hooks know that if they receive `null` they'll throw an error so it doesn't affect the return type. @@ -472,7 +470,6 @@ The above example now becomes: import { createContext } from 'react' import { ReactReduxContextValue, - TypedUseSelectorHook, createDispatchHook, createSelectorHook, createStoreHook, @@ -482,10 +479,9 @@ import { AppStore, RootState, AppDispatch } from './store' // highlight-next-line const context = createContext(null) -export const useStore: () => AppStore = createStoreHook(context) -export const useDispatch: () => AppDispatch = createDispatchHook(context) -export const useSelector: TypedUseSelectorHook = - createSelectorHook(context) +export const useStore = createStoreHook(context).withTypes() +export const useDispatch = createDispatchHook(context).withTypes() +export const useSelector = createSelectorHook(context).withTypes() ``` diff --git a/docs/usage/migrating-to-modern-redux.mdx b/docs/usage/migrating-to-modern-redux.mdx index 4241f2d22..442b8faed 100644 --- a/docs/usage/migrating-to-modern-redux.mdx +++ b/docs/usage/migrating-to-modern-redux.mdx @@ -1110,13 +1110,13 @@ Per [our standard TypeScript setup and usage guidelines](../tutorials/typescript First, set up the hooks: ```ts no-transpile title="src/app/hooks.ts" -import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux' +import { useDispatch, useSelector } from 'react-redux' import type { RootState, AppDispatch } from './store' // highlight-start // Use throughout your app instead of plain `useDispatch` and `useSelector` -export const useAppDispatch: () => AppDispatch = useDispatch -export const useAppSelector: TypedUseSelectorHook = useSelector +export const useAppDispatch = useDispatch.withTypes() +export const useAppSelector = useSelector.withTypes() // highlight-end ``` diff --git a/docs/usage/nextjs.mdx b/docs/usage/nextjs.mdx index 7d1c00b12..87bc531e8 100644 --- a/docs/usage/nextjs.mdx +++ b/docs/usage/nextjs.mdx @@ -135,14 +135,13 @@ export type AppDispatch = AppStore['dispatch'] // file: lib/hooks.ts import { useDispatch, useSelector, useStore } from 'react-redux' -import type { TypedUseSelectorHook } from 'react-redux' import type { RootState, AppDispatch, AppStore } from './store' // highlight-start // Use throughout your app instead of plain `useDispatch` and `useSelector` -export const useAppDispatch: () => AppDispatch = useDispatch -export const useAppSelector: TypedUseSelectorHook = useSelector -export const useAppStore: () => AppStore = useStore +export const useAppDispatch = useDispatch.withTypes() +export const useAppSelector = useSelector.withTypes() +export const useAppStore = useStore.withTypes() // highlight-end ``` @@ -330,14 +329,13 @@ export type AppDispatch = AppStore['dispatch'] // file: lib/hooks.ts noEmit import { useDispatch, useSelector, useStore } from 'react-redux' -import type { TypedUseSelectorHook } from 'react-redux' import type { RootState, AppDispatch, AppStore } from './store' // highlight-start // Use throughout your app instead of plain `useDispatch` and `useSelector` -export const useAppDispatch: () => AppDispatch = useDispatch -export const useAppSelector: TypedUseSelectorHook = useSelector -export const useAppStore: () => AppStore = useStore +export const useAppDispatch = useDispatch.withTypes() +export const useAppSelector = useSelector.withTypes() +export const useAppStore = useStore.withTypes() // highlight-end /* prettier-ignore */ diff --git a/docs/usage/usage-with-typescript.md b/docs/usage/usage-with-typescript.md index e7699875d..6d2dd1575 100644 --- a/docs/usage/usage-with-typescript.md +++ b/docs/usage/usage-with-typescript.md @@ -35,7 +35,7 @@ The basics of using `configureStore` are shown in [TypeScript Quick Start tutori ### Getting the `State` type -The easiest way of getting the `State` type is to define the root reducer in advance and extract its `ReturnType`. +The easiest way of getting the `State` type is to define the root reducer in advance and extract its `ReturnType`. It is recommended to give the type a different name like `RootState` to prevent confusion, as the type name `State` is usually overused. ```typescript @@ -89,7 +89,7 @@ const store = configureStore({ // highlight-start export type AppDispatch = typeof store.dispatch -export const useAppDispatch: () => AppDispatch = useDispatch // Export a hook that can be reused to resolve types +export const useAppDispatch = useDispatch.withTypes() // Export a hook that can be reused to resolve types // highlight-end export default store From ac70c339caead70b625d8070e82541581a43af74 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 27 Mar 2024 06:11:10 -0500 Subject: [PATCH 08/23] Bump `react-redux` to 9.1.0 --- package.json | 2 +- yarn.lock | 38 +++++++++----------------------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 13c4652d2..9e845129e 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "resolutions": { "esbuild": "0.19.7", "jest-snapshot": "29.3.1", - "react-redux": "npm:8.0.2", + "react-redux": "npm:9.1.0", "react": "npm:18.2.0", "react-dom": "npm:18.2.0", "resolve": "1.22.1", diff --git a/yarn.lock b/yarn.lock index 821715fa3..7f670c99e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8612,16 +8612,6 @@ __metadata: languageName: node linkType: hard -"@types/hoist-non-react-statics@npm:^3.3.1": - version: 3.3.1 - resolution: "@types/hoist-non-react-statics@npm:3.3.1" - dependencies: - "@types/react": "npm:*" - hoist-non-react-statics: "npm:^3.3.0" - checksum: 10/071e6d75a0ed9aa0e9ca2cc529a8c15bf7ac3e4a37aac279772ea6036fd0bf969b67fb627b65cfce65adeab31fec1e9e95b4dcdefeab075b580c0c7174206f63 - languageName: node - linkType: hard - "@types/html-minifier-terser@npm:^6.0.0": version: 6.1.0 resolution: "@types/html-minifier-terser@npm:6.1.0" @@ -17069,7 +17059,7 @@ __metadata: languageName: node linkType: hard -"hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1, hoist-non-react-statics@npm:^3.3.2": +"hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1": version: 3.3.2 resolution: "hoist-non-react-statics@npm:3.3.2" dependencies: @@ -24429,35 +24419,25 @@ __metadata: languageName: node linkType: hard -"react-redux@npm:8.0.2": - version: 8.0.2 - resolution: "react-redux@npm:8.0.2" +"react-redux@npm:9.1.0": + version: 9.1.0 + resolution: "react-redux@npm:9.1.0" dependencies: - "@babel/runtime": "npm:^7.12.1" - "@types/hoist-non-react-statics": "npm:^3.3.1" "@types/use-sync-external-store": "npm:^0.0.3" - hoist-non-react-statics: "npm:^3.3.2" - react-is: "npm:^18.0.0" use-sync-external-store: "npm:^1.0.0" peerDependencies: - "@types/react": ^16.8 || ^17.0 || ^18.0 - "@types/react-dom": ^16.8 || ^17.0 || ^18.0 - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - react-native: ">=0.59" - redux: ^4 + "@types/react": ^18.2.25 + react: ^18.0 + react-native: ">=0.69" + redux: ^5.0.0 peerDependenciesMeta: "@types/react": optional: true - "@types/react-dom": - optional: true - react-dom: - optional: true react-native: optional: true redux: optional: true - checksum: 10/aea73640041f110d6ee909c24f37128086e324b2857a8e428f76d6737622f2f3004b242191ef6d7e8bc2beb08c4f01698913fe7d2b68634e3fb218c3c97f5074 + checksum: 10/e2e5fe1c6965aedf3a80d7d5252ccbe6f231448cc1010ce19036fe8965f996cbafa2f81cacab77e54e75d6a14caa40540b8907459ef36af26b65c14f1bf89d80 languageName: node linkType: hard From d21e1491b5490b9b5e44edfc5433b4ab021b8100 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 27 Mar 2024 06:48:22 -0500 Subject: [PATCH 09/23] Fix nullable `react-redux` context references --- packages/toolkit/src/dynamicMiddleware/react/index.ts | 7 ++++++- .../toolkit/src/dynamicMiddleware/tests/react.test.tsx | 5 ++++- packages/toolkit/src/query/react/ApiProvider.tsx | 3 ++- packages/toolkit/src/query/tests/buildCreateApi.test.tsx | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/toolkit/src/dynamicMiddleware/react/index.ts b/packages/toolkit/src/dynamicMiddleware/react/index.ts index 83a819460..4851217c7 100644 --- a/packages/toolkit/src/dynamicMiddleware/react/index.ts +++ b/packages/toolkit/src/dynamicMiddleware/react/index.ts @@ -79,7 +79,12 @@ export const createDynamicMiddleware = < // @ts-ignore context === ReactReduxContext ? useDefaultDispatch - : createDispatchHook(context) + : createDispatchHook( + context as Context + > | null>, + ) function createDispatchWithMiddlewareHook< Middlewares extends Middleware[], >(...middlewares: Middlewares) { diff --git a/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx b/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx index 546c1077f..f72845eaa 100644 --- a/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx +++ b/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx @@ -89,7 +89,10 @@ describe('createReactDynamicMiddleware', () => { render(, { wrapper: ({ children }) => ( - + } + store={store2} + > {children} diff --git a/packages/toolkit/src/query/react/ApiProvider.tsx b/packages/toolkit/src/query/react/ApiProvider.tsx index a2d56f3ae..6e8811559 100644 --- a/packages/toolkit/src/query/react/ApiProvider.tsx +++ b/packages/toolkit/src/query/react/ApiProvider.tsx @@ -38,7 +38,8 @@ export function ApiProvider>(props: { setupListeners?: Parameters[1] | false context?: Context }) { - const context = props.context || ReactReduxContext + const context = (props.context || + ReactReduxContext) as Context const existingContext = useContext(context) if (existingContext) { throw new Error( diff --git a/packages/toolkit/src/query/tests/buildCreateApi.test.tsx b/packages/toolkit/src/query/tests/buildCreateApi.test.tsx index 9a443c935..305fbebc7 100644 --- a/packages/toolkit/src/query/tests/buildCreateApi.test.tsx +++ b/packages/toolkit/src/query/tests/buildCreateApi.test.tsx @@ -16,7 +16,7 @@ import { } from 'react-redux' import { setupApiStore, useRenderCounter } from '../../tests/utils/helpers' -const MyContext = React.createContext(null as any) +const MyContext = React.createContext(null) describe('buildCreateApi', () => { test('Works with all hooks provided', async () => { From 0bb100e9b15250e5a1fbb7597e864eedb7ff2d29 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 27 Mar 2024 07:28:31 -0500 Subject: [PATCH 10/23] Make parameter of `createDispatchWithMiddlewareHookFactory` nullable --- .../src/dynamicMiddleware/react/index.ts | 22 ++++++++----------- .../dynamicMiddleware/tests/react.test-d.ts | 2 +- .../dynamicMiddleware/tests/react.test.tsx | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/packages/toolkit/src/dynamicMiddleware/react/index.ts b/packages/toolkit/src/dynamicMiddleware/react/index.ts index 4851217c7..27fc179a1 100644 --- a/packages/toolkit/src/dynamicMiddleware/react/index.ts +++ b/packages/toolkit/src/dynamicMiddleware/react/index.ts @@ -54,9 +54,10 @@ interface ReactDynamicMiddlewareInstance< Dispatch extends ReduxDispatch = ReduxDispatch, > extends DynamicMiddlewareInstance { createDispatchWithMiddlewareHookFactory: ( - context?: Context< - ReactReduxContextValue> - >, + context?: Context + > | null>, ) => CreateDispatchWithMiddlewareHook createDispatchWithMiddlewareHook: CreateDispatchWithMiddlewareHook< State, @@ -71,20 +72,15 @@ export const createDynamicMiddleware = < const instance = cDM() const createDispatchWithMiddlewareHookFactory = ( // @ts-ignore - context: Context< - ReactReduxContextValue> - > = ReactReduxContext, + context: Context + > | null> = ReactReduxContext, ) => { const useDispatch = - // @ts-ignore context === ReactReduxContext ? useDefaultDispatch - : createDispatchHook( - context as Context - > | null>, - ) + : createDispatchHook(context) function createDispatchWithMiddlewareHook< Middlewares extends Middleware[], >(...middlewares: Middlewares) { diff --git a/packages/toolkit/src/dynamicMiddleware/tests/react.test-d.ts b/packages/toolkit/src/dynamicMiddleware/tests/react.test-d.ts index ed8955fd2..33eaae96d 100644 --- a/packages/toolkit/src/dynamicMiddleware/tests/react.test-d.ts +++ b/packages/toolkit/src/dynamicMiddleware/tests/react.test-d.ts @@ -15,7 +15,7 @@ const typedInstance = createDynamicMiddleware() declare const compatibleMiddleware: Middleware<{}, number, AppDispatch> declare const incompatibleMiddleware: Middleware<{}, string, AppDispatch> -declare const customContext: Context +declare const customContext: Context declare const addedMiddleware: Middleware<(n: 2) => 2> diff --git a/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx b/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx index f72845eaa..6ede027b3 100644 --- a/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx +++ b/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx @@ -71,7 +71,7 @@ describe('createReactDynamicMiddleware', () => { gDM().prepend(dynamicInstance.middleware).concat(staticMiddleware), }) - const context = React.createContext(null as any) + const context = React.createContext(null) const createDispatchWithMiddlewareHook = dynamicInstance.createDispatchWithMiddlewareHookFactory(context) From a9a20e4078df0dced5fbd305eb5fad1d6cfd81d3 Mon Sep 17 00:00:00 2001 From: EskiMojo14 Date: Fri, 29 Mar 2024 20:58:36 +0000 Subject: [PATCH 11/23] change ApiProvider context argument to match --- packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx | 5 +---- packages/toolkit/src/query/react/ApiProvider.tsx | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx b/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx index 6ede027b3..91fb57956 100644 --- a/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx +++ b/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx @@ -89,10 +89,7 @@ describe('createReactDynamicMiddleware', () => { render(, { wrapper: ({ children }) => ( - } - store={store2} - > + {children} diff --git a/packages/toolkit/src/query/react/ApiProvider.tsx b/packages/toolkit/src/query/react/ApiProvider.tsx index 6e8811559..11fd753d2 100644 --- a/packages/toolkit/src/query/react/ApiProvider.tsx +++ b/packages/toolkit/src/query/react/ApiProvider.tsx @@ -36,10 +36,9 @@ export function ApiProvider>(props: { children: any api: A setupListeners?: Parameters[1] | false - context?: Context + context?: Context }) { - const context = (props.context || - ReactReduxContext) as Context + const context = props.context || ReactReduxContext const existingContext = useContext(context) if (existingContext) { throw new Error( From 090bcb6a18234a2853931c25fb7a081c88bc3d68 Mon Sep 17 00:00:00 2001 From: EskiMojo14 Date: Fri, 29 Mar 2024 21:32:42 +0000 Subject: [PATCH 12/23] add custom context test for apiprovider --- .../src/query/tests/apiProvider.test.tsx | 95 ++++++++++++++++++- 1 file changed, 93 insertions(+), 2 deletions(-) diff --git a/packages/toolkit/src/query/tests/apiProvider.test.tsx b/packages/toolkit/src/query/tests/apiProvider.test.tsx index 80101a838..f6a4cea10 100644 --- a/packages/toolkit/src/query/tests/apiProvider.test.tsx +++ b/packages/toolkit/src/query/tests/apiProvider.test.tsx @@ -1,9 +1,21 @@ import { configureStore } from '@reduxjs/toolkit' -import { ApiProvider, createApi } from '@reduxjs/toolkit/query/react' +import { + ApiProvider, + buildCreateApi, + coreModule, + createApi, + reactHooksModule, +} from '@reduxjs/toolkit/query/react' import { fireEvent, render, waitFor } from '@testing-library/react' import { delay } from 'msw' import * as React from 'react' -import { Provider } from 'react-redux' +import type { ReactReduxContextValue } from 'react-redux' +import { + Provider, + createDispatchHook, + createSelectorHook, + createStoreHook, +} from 'react-redux' const api = createApi({ baseQuery: async (arg: any) => { @@ -70,4 +82,83 @@ describe('ApiProvider', () => { `[Error: Existing Redux context detected. If you already have a store set up, please use the traditional Redux setup.]`, ) }) + test('ApiProvider allows a custom context', async () => { + const customContext = React.createContext( + null, + ) + + const createApiWithCustomContext = buildCreateApi( + coreModule(), + reactHooksModule({ + hooks: { + useStore: createStoreHook(customContext), + useSelector: createSelectorHook(customContext), + useDispatch: createDispatchHook(customContext), + }, + }), + ) + + const customApi = createApiWithCustomContext({ + baseQuery: async (arg: any) => { + await delay(150) + return { data: arg?.body ? arg.body : null } + }, + endpoints: (build) => ({ + getUser: build.query({ + query: (arg) => arg, + }), + updateUser: build.mutation({ + query: (update) => ({ body: update }), + }), + }), + }) + + function User() { + const [value, setValue] = React.useState(0) + + const { isFetching } = customApi.endpoints.getUser.useQuery(1, { + skip: value < 1, + }) + + return ( +
+
{String(isFetching)}
+ +
+ ) + } + + const { getByText, getByTestId } = render( + + + , + ) + + await waitFor(() => + expect(getByTestId('isFetching').textContent).toBe('false'), + ) + fireEvent.click(getByText('Increment value')) + await waitFor(() => + expect(getByTestId('isFetching').textContent).toBe('true'), + ) + await waitFor(() => + expect(getByTestId('isFetching').textContent).toBe('false'), + ) + fireEvent.click(getByText('Increment value')) + // Being that nothing has changed in the args, this should never fire. + expect(getByTestId('isFetching').textContent).toBe('false') + + // won't throw if nested, because context is different + expect(() => + render( + null })}> + + child + + , + ), + ).not.toThrow() + }) }) From 0dcaff8f681dab009cdf03f8d6b602bfa500910d Mon Sep 17 00:00:00 2001 From: EskiMojo14 Date: Fri, 29 Mar 2024 21:35:50 +0000 Subject: [PATCH 13/23] remove unnecessary type param --- packages/toolkit/src/query/react/ApiProvider.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/toolkit/src/query/react/ApiProvider.tsx b/packages/toolkit/src/query/react/ApiProvider.tsx index 11fd753d2..2c42605a5 100644 --- a/packages/toolkit/src/query/react/ApiProvider.tsx +++ b/packages/toolkit/src/query/react/ApiProvider.tsx @@ -32,9 +32,9 @@ import type { Api } from '@reduxjs/toolkit/query' * conflict with each other - please use the traditional redux setup * in that case. */ -export function ApiProvider>(props: { +export function ApiProvider(props: { children: any - api: A + api: Api setupListeners?: Parameters[1] | false context?: Context }) { From 27b26348508d1daf5e436087f56c03c35c8d10ea Mon Sep 17 00:00:00 2001 From: EskiMojo14 Date: Sun, 31 Mar 2024 21:33:13 +0100 Subject: [PATCH 14/23] Release 2.2.3 --- packages/toolkit/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 74d0e24cb..8e41fe160 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@reduxjs/toolkit", - "version": "2.2.2", + "version": "2.2.3", "description": "The official, opinionated, batteries-included toolset for efficient Redux development", "author": "Mark Erikson ", "license": "MIT", From 833a0393b9a1c9ff24a92c1912dc8cc612b0df43 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Thu, 4 Apr 2024 22:17:31 -0500 Subject: [PATCH 15/23] Run CI jobs if `yarn.lock` changes --- .github/workflows/test-codegen.yml | 1 + .github/workflows/tests.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/test-codegen.yml b/.github/workflows/test-codegen.yml index defc741c8..a0760ee0f 100644 --- a/.github/workflows/test-codegen.yml +++ b/.github/workflows/test-codegen.yml @@ -22,6 +22,7 @@ jobs: filters: | codegen: - 'packages/rtk-query-codegen-openapi/**' + - 'yarn.lock' build: needs: changes diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e5b1cc426..42c692db7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,6 +20,7 @@ jobs: - 'packages/toolkit/**' - 'examples/publish-ci/**' - '.github/workflows/tests.yml' + - 'yarn.lock' build: needs: changes From 4ec60679111fba811be18bd95d56ecdce0ff43a0 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 10 Apr 2024 06:18:35 -0500 Subject: [PATCH 16/23] Remove `resolve` from `resolutions` field --- package.json | 1 - yarn.lock | 97 +++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 85 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 9e845129e..05d8d314d 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "react-redux": "npm:9.1.0", "react": "npm:18.2.0", "react-dom": "npm:18.2.0", - "resolve": "1.22.1", "@types/react": "npm:18.0.12", "@types/react-dom": "npm:18.0.5", "@types/inquirer": "npm:8.2.1", diff --git a/yarn.lock b/yarn.lock index 7f670c99e..f9d379b5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17939,7 +17939,16 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0": +"is-core-module@npm:^2.1.0, is-core-module@npm:^2.13.0": + version: 2.13.1 + resolution: "is-core-module@npm:2.13.1" + dependencies: + hasown: "npm:^2.0.0" + checksum: 10/d53bd0cc24b0a0351fb4b206ee3908f71b9bbf1c47e9c9e14e5f06d292af1663704d2abd7e67700d6487b2b7864e0d0f6f10a1edf1892864bdffcb197d1845a2 + languageName: node + linkType: hard + +"is-core-module@npm:^2.8.1": version: 2.10.0 resolution: "is-core-module@npm:2.10.0" dependencies: @@ -22244,7 +22253,7 @@ __metadata: languageName: node linkType: hard -"path-parse@npm:^1.0.7": +"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7": version: 1.0.7 resolution: "path-parse@npm:1.0.7" checksum: 10/49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a @@ -25362,29 +25371,93 @@ __metadata: languageName: node linkType: hard -"resolve@npm:1.22.1": - version: 1.22.1 - resolution: "resolve@npm:1.22.1" +"resolve@npm:1.17.0, resolve@npm:~1.17.0": + version: 1.17.0 + resolution: "resolve@npm:1.17.0" + dependencies: + path-parse: "npm:^1.0.6" + checksum: 10/74141da8c56192fd46f6aa887864f8fd74c1755425174526610cb775177278bb414c6f6feb3051ccd73d774d2ae124c6c97e463e30d7ffd9a87f7da202b851dd + languageName: node + linkType: hard + +"resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.3.2": + version: 1.22.8 + resolution: "resolve@npm:1.22.8" dependencies: - is-core-module: "npm:^2.9.0" + is-core-module: "npm:^2.13.0" path-parse: "npm:^1.0.7" supports-preserve-symlinks-flag: "npm:^1.0.0" bin: resolve: bin/resolve - checksum: 10/4adcfac33f0baf6fc46d6c3a11acfad5c9345eab8bb7280d65672dc40a9694ddab6d18be2feebccf6cfc581bedd7ebfa792f6bc86db1903a41d328c23161bd23 + checksum: 10/c473506ee01eb45cbcfefb68652ae5759e092e6b0fb64547feadf9736a6394f258fbc6f88e00c5ca36d5477fbb65388b272432a3600fa223062e54333c156753 languageName: node linkType: hard -"resolve@patch:resolve@npm%3A1.22.1#optional!builtin": - version: 1.22.1 - resolution: "resolve@patch:resolve@npm%3A1.22.1#optional!builtin::version=1.22.1&hash=c3c19d" +"resolve@npm:^2.0.0-next.3": + version: 2.0.0-next.5 + resolution: "resolve@npm:2.0.0-next.5" dependencies: - is-core-module: "npm:^2.9.0" + is-core-module: "npm:^2.13.0" path-parse: "npm:^1.0.7" supports-preserve-symlinks-flag: "npm:^1.0.0" bin: resolve: bin/resolve - checksum: 10/551dd500765cce767c583747f5f21ceb51d437f539b01aee96d6ec39eb2c68a8ff5d646b083d690fe428a81329856bc1bbdb094379b8df4b3f10e7e1f6aa3839 + checksum: 10/2d6fd28699f901744368e6f2032b4268b4c7b9185fd8beb64f68c93ac6b22e52ae13560ceefc96241a665b985edf9ffd393ae26d2946a7d3a07b7007b7d51e79 + languageName: node + linkType: hard + +"resolve@npm:~1.19.0": + version: 1.19.0 + resolution: "resolve@npm:1.19.0" + dependencies: + is-core-module: "npm:^2.1.0" + path-parse: "npm:^1.0.6" + checksum: 10/b0f326a85422ebc4db8524957990d49d89e028bd6c10f23f2e89db5ee923678c6c08eae596e594031a5cda20f1e19d4a371e22cd772907b0bcf3c932e2205753 + languageName: node + linkType: hard + +"resolve@patch:resolve@npm%3A1.17.0#optional!builtin, resolve@patch:resolve@npm%3A~1.17.0#optional!builtin": + version: 1.17.0 + resolution: "resolve@patch:resolve@npm%3A1.17.0#optional!builtin::version=1.17.0&hash=c3c19d" + dependencies: + path-parse: "npm:^1.0.6" + checksum: 10/02e87fe9233d169fdc5220572c7b8933c9e23323aaecfd5b8d0b106a7f09dc676dd4d380e66c72b1369489292bcb337b13aad28b480a1bde5a5c040ff16758ea + languageName: node + linkType: hard + +"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.10.1#optional!builtin, resolve@patch:resolve@npm%3A^1.12.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.0#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin": + version: 1.22.8 + resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" + dependencies: + is-core-module: "npm:^2.13.0" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10/f345cd37f56a2c0275e3fe062517c650bb673815d885e7507566df589375d165bbbf4bdb6aa95600a9bc55f4744b81f452b5a63f95b9f10a72787dba3c90890a + languageName: node + linkType: hard + +"resolve@patch:resolve@npm%3A^2.0.0-next.3#optional!builtin": + version: 2.0.0-next.5 + resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin::version=2.0.0-next.5&hash=c3c19d" + dependencies: + is-core-module: "npm:^2.13.0" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10/05fa778de9d0347c8b889eb7a18f1f06bf0f801b0eb4610b4871a4b2f22e220900cf0ad525e94f990bb8d8921c07754ab2122c0c225ab4cdcea98f36e64fa4c2 + languageName: node + linkType: hard + +"resolve@patch:resolve@npm%3A~1.19.0#optional!builtin": + version: 1.19.0 + resolution: "resolve@patch:resolve@npm%3A1.19.0#optional!builtin::version=1.19.0&hash=c3c19d" + dependencies: + is-core-module: "npm:^2.1.0" + path-parse: "npm:^1.0.6" + checksum: 10/eb8853b1b7b9ef25f0156304c7c21e2a0d2b2ce247169282542e76565f460986e10adbb770eeb2549c06197fb546b433906cbf3700a3232c567aaaaa53490b88 languageName: node linkType: hard From f5d4df4d10bb1f4f0d571e08e54f771d0a16e1ac Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 10 Apr 2024 06:19:15 -0500 Subject: [PATCH 17/23] Remove `type-fest` from `resolutions` field as it appears to be unused --- package.json | 1 - yarn.lock | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 05d8d314d..652f9b53d 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,6 @@ "docs/react-dom": "npm:17.0.2", "docs/@types/react-dom": "npm:17.0.11", "docs/@types/react": "npm:17.0.11", - "type-fest": "2.19.0", "console-testing-library@0.6.1": "patch:console-testing-library@npm%3A0.6.1#./.yarn/patches/console-testing-library-npm-0.6.1-4d9957d402.patch" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index f9d379b5e..e2b29e0e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28236,13 +28236,69 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:2.19.0": +"type-fest@npm:^0.16.0": + version: 0.16.0 + resolution: "type-fest@npm:0.16.0" + checksum: 10/fd8c47ccb90e9fe7bae8bfc0e116e200e096120200c1ab1737bf0bc9334b344dd4925f876ed698174ffd58cd179bb56a55467be96aedc22d5d72748eac428bc8 + languageName: node + linkType: hard + +"type-fest@npm:^0.20.2": + version: 0.20.2 + resolution: "type-fest@npm:0.20.2" + checksum: 10/8907e16284b2d6cfa4f4817e93520121941baba36b39219ea36acfe64c86b9dbc10c9941af450bd60832c8f43464974d51c0957f9858bc66b952b66b6914cbb9 + languageName: node + linkType: hard + +"type-fest@npm:^0.21.3": + version: 0.21.3 + resolution: "type-fest@npm:0.21.3" + checksum: 10/f4254070d9c3d83a6e573bcb95173008d73474ceadbbf620dd32d273940ca18734dff39c2b2480282df9afe5d1675ebed5499a00d791758748ea81f61a38961f + languageName: node + linkType: hard + +"type-fest@npm:^0.4.1": + version: 0.4.1 + resolution: "type-fest@npm:0.4.1" + checksum: 10/ee6c77378ab0e5b1cb5a408671b03e3edda52bbba6976dc10daf966e5919adbf9553eb597dd23ff3cdfbed7370e9641441a579369d9de94fe9cc12b14b29ccaf + languageName: node + linkType: hard + +"type-fest@npm:^0.6.0": + version: 0.6.0 + resolution: "type-fest@npm:0.6.0" + checksum: 10/9ecbf4ba279402b14c1a0614b6761bbe95626fab11377291fecd7e32b196109551e0350dcec6af74d97ced1b000ba8060a23eca33157091e642b409c2054ba82 + languageName: node + linkType: hard + +"type-fest@npm:^1.2.2": + version: 1.4.0 + resolution: "type-fest@npm:1.4.0" + checksum: 10/89875c247564601c2650bacad5ff80b859007fbdb6c9e43713ae3ffa3f584552eea60f33711dd762e16496a1ab4debd409822627be14097d9a17e39c49db591a + languageName: node + linkType: hard + +"type-fest@npm:^2.13.0, type-fest@npm:^2.5.0": version: 2.19.0 resolution: "type-fest@npm:2.19.0" checksum: 10/7bf9e8fdf34f92c8bb364c0af14ca875fac7e0183f2985498b77be129dc1b3b1ad0a6b3281580f19e48c6105c037fb966ad9934520c69c6434d17fd0af4eed78 languageName: node linkType: hard +"type-fest@npm:^3.0.0": + version: 3.13.1 + resolution: "type-fest@npm:3.13.1" + checksum: 10/9a8a2359ada34c9b3affcaf3a8f73ee14c52779e89950db337ce66fb74c3399776c697c99f2532e9b16e10e61cfdba3b1c19daffb93b338b742f0acd0117ce12 + languageName: node + linkType: hard + +"type-fest@npm:^4.9.0": + version: 4.15.0 + resolution: "type-fest@npm:4.15.0" + checksum: 10/8f897551877daa0df7bb17a21b6acd8a21ac5a0bdb14dbfd353b16013fed99f23c6d9c12a2c7685c8dededb4739ec8bfb120a914330f8b11a478a89758a11acc + languageName: node + linkType: hard + "type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" From ab7b8bfa24ea3d55c397454da3ce01efc1df0d49 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Fri, 12 Apr 2024 06:20:56 -0500 Subject: [PATCH 18/23] Move `react` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 652f9b53d..6bc92634e 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "eslint-plugin-react-hooks": "^4.2.0", "netlify-plugin-cache": "^1.0.3", "prettier": "^3.2.5", + "react": "^18.2.0", "release-it": "^14.12.5", "serve": "^14.2.0", "ts-node": "^10.9.2", @@ -51,7 +52,6 @@ "esbuild": "0.19.7", "jest-snapshot": "29.3.1", "react-redux": "npm:9.1.0", - "react": "npm:18.2.0", "react-dom": "npm:18.2.0", "@types/react": "npm:18.0.12", "@types/react-dom": "npm:18.0.5", diff --git a/yarn.lock b/yarn.lock index e2b29e0e5..cdd6df134 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24662,7 +24662,17 @@ __metadata: languageName: node linkType: hard -"react@npm:18.2.0": +"react@npm:17.0.2": + version: 17.0.2 + resolution: "react@npm:17.0.2" + dependencies: + loose-envify: "npm:^1.1.0" + object-assign: "npm:^4.1.1" + checksum: 10/ece60c31c1d266d132783aaaffa185d2e4c9b4db144f853933ec690cee1e0600c8929a1dd0a9e79323eea8e2df636c9a06d40f6cfdc9f797f65225433e67f707 + languageName: node + linkType: hard + +"react@npm:^18.1.0, react@npm:^18.2.0": version: 18.2.0 resolution: "react@npm:18.2.0" dependencies: @@ -25744,6 +25754,7 @@ __metadata: eslint-plugin-react-hooks: "npm:^4.2.0" netlify-plugin-cache: "npm:^1.0.3" prettier: "npm:^3.2.5" + react: "npm:^18.2.0" release-it: "npm:^14.12.5" serve: "npm:^14.2.0" ts-node: "npm:^10.9.2" From 59bad53b3d8a71c71d92622caeded72ffb3a6bc5 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Fri, 12 Apr 2024 06:21:59 -0500 Subject: [PATCH 19/23] Move `react-dom` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6bc92634e..f2d58a462 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "netlify-plugin-cache": "^1.0.3", "prettier": "^3.2.5", "react": "^18.2.0", + "react-dom": "^18.2.0", "release-it": "^14.12.5", "serve": "^14.2.0", "ts-node": "^10.9.2", @@ -52,7 +53,6 @@ "esbuild": "0.19.7", "jest-snapshot": "29.3.1", "react-redux": "npm:9.1.0", - "react-dom": "npm:18.2.0", "@types/react": "npm:18.0.12", "@types/react-dom": "npm:18.0.5", "@types/inquirer": "npm:8.2.1", diff --git a/yarn.lock b/yarn.lock index cdd6df134..2e7591ed3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24287,7 +24287,20 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:18.2.0": +"react-dom@npm:17.0.2": + version: 17.0.2 + resolution: "react-dom@npm:17.0.2" + dependencies: + loose-envify: "npm:^1.1.0" + object-assign: "npm:^4.1.1" + scheduler: "npm:^0.20.2" + peerDependencies: + react: 17.0.2 + checksum: 10/0b3836131a64da8b1c2c852cc28b09c21a738c33c7a8d6021ac20d5619d753c8ee5fff8f97c95f2fc33053e44c2cbce9657453e21c55900164e6e0c3e955e826 + languageName: node + linkType: hard + +"react-dom@npm:^18.1.0, react-dom@npm:^18.2.0": version: 18.2.0 resolution: "react-dom@npm:18.2.0" dependencies: @@ -25755,6 +25768,7 @@ __metadata: netlify-plugin-cache: "npm:^1.0.3" prettier: "npm:^3.2.5" react: "npm:^18.2.0" + react-dom: "npm:^18.2.0" release-it: "npm:^14.12.5" serve: "npm:^14.2.0" ts-node: "npm:^10.9.2" @@ -25911,6 +25925,16 @@ __metadata: languageName: node linkType: hard +"scheduler@npm:^0.20.2": + version: 0.20.2 + resolution: "scheduler@npm:0.20.2" + dependencies: + loose-envify: "npm:^1.1.0" + object-assign: "npm:^4.1.1" + checksum: 10/898917fa475386953d998add9107c04bf2c335eee86172833995dee126d12a68bee3c29edbd61fa0bcbcb8ee511c422eaab23b86b02f95aab26ecfaed8df5e64 + languageName: node + linkType: hard + "scheduler@npm:^0.23.0": version: 0.23.0 resolution: "scheduler@npm:0.23.0" From e17872ef19d41772b5dca3652c326cdca7755ae1 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Fri, 12 Apr 2024 07:18:04 -0500 Subject: [PATCH 20/23] Move `@types/react` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f2d58a462..cb2fd7140 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@babel/helper-compilation-targets": "^7.23.6", "@babel/traverse": "^7.24.1", "@babel/types": "^7.24.0", + "@types/react": "^18.2.77", "@typescript-eslint/eslint-plugin": "6.12.0", "@typescript-eslint/parser": "6.12.0", "eslint": "^7.25.0", @@ -53,7 +54,6 @@ "esbuild": "0.19.7", "jest-snapshot": "29.3.1", "react-redux": "npm:9.1.0", - "@types/react": "npm:18.0.12", "@types/react-dom": "npm:18.0.5", "@types/inquirer": "npm:8.2.1", "website/react": "npm:17.0.2", diff --git a/yarn.lock b/yarn.lock index 2e7591ed3..e9284c298 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9006,14 +9006,24 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:18.0.12": - version: 18.0.12 - resolution: "@types/react@npm:18.0.12" +"@types/react@npm:*, @types/react@npm:^18.0.12, @types/react@npm:^18.0.5, @types/react@npm:^18.2.77": + version: 18.2.77 + resolution: "@types/react@npm:18.2.77" + dependencies: + "@types/prop-types": "npm:*" + csstype: "npm:^3.0.2" + checksum: 10/80d7ad9cf13e15895a857c66f5b0c1ce758c1e7580a76936d8d1b19c71e4485fa4b35d762a1de98de4eb91506cbc8507582c9a979f357b6f5f75f86009d8ca07 + languageName: node + linkType: hard + +"@types/react@npm:17.0.11": + version: 17.0.11 + resolution: "@types/react@npm:17.0.11" dependencies: "@types/prop-types": "npm:*" "@types/scheduler": "npm:*" csstype: "npm:^3.0.2" - checksum: 10/b010b0d300555a8f70f0513b79d5c35400500cbada71303bbeb72167ddf6154803f92a2edab923c7460a2f1eaa430658b88953ca4a5fe08b276c3587ec91f4f7 + checksum: 10/392a9ff5303ef5fdc63419052b6ace974af5f27e1aad605264630a1e9226054abb2026269e334f29e6380fb63fd002bf065be67e34a3ee5d2d9041184ad11a39 languageName: node linkType: hard @@ -25754,6 +25764,7 @@ __metadata: "@babel/helper-compilation-targets": "npm:^7.23.6" "@babel/traverse": "npm:^7.24.1" "@babel/types": "npm:^7.24.0" + "@types/react": "npm:^18.2.77" "@typescript-eslint/eslint-plugin": "npm:6.12.0" "@typescript-eslint/parser": "npm:6.12.0" eslint: "npm:^7.25.0" From ae26c4bb3104eee54c7246850f140032d477f839 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Fri, 12 Apr 2024 07:29:37 -0500 Subject: [PATCH 21/23] Move `@types/react-dom` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index cb2fd7140..b7c5c0e09 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "@babel/traverse": "^7.24.1", "@babel/types": "^7.24.0", "@types/react": "^18.2.77", + "@types/react-dom": "^18.2.25", "@typescript-eslint/eslint-plugin": "6.12.0", "@typescript-eslint/parser": "6.12.0", "eslint": "^7.25.0", @@ -54,7 +55,6 @@ "esbuild": "0.19.7", "jest-snapshot": "29.3.1", "react-redux": "npm:9.1.0", - "@types/react-dom": "npm:18.0.5", "@types/inquirer": "npm:8.2.1", "website/react": "npm:17.0.2", "website/react-dom": "npm:17.0.2", diff --git a/yarn.lock b/yarn.lock index e9284c298..61e1d0172 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8965,12 +8965,12 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:18.0.5": - version: 18.0.5 - resolution: "@types/react-dom@npm:18.0.5" +"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.0.5, @types/react-dom@npm:^18.2.25": + version: 18.2.25 + resolution: "@types/react-dom@npm:18.2.25" dependencies: "@types/react": "npm:*" - checksum: 10/5e6f4091e4d2d5cb6337aed1c09306486c59d3b7fd7e25d054d6029673d3921d82203eb83f8f047a508fdeab895d73fe3f2f82158df6f7c611755a02e439f293 + checksum: 10/0e45856a2fdbf09e74632b132b3af773c6b18fc2ab0bd04595c9f2bcc0bb04d5e732ac8156d145b712dedab7484a8fe9dce5cf720a5437b5d26099c7060c7ba4 languageName: node linkType: hard @@ -25765,6 +25765,7 @@ __metadata: "@babel/traverse": "npm:^7.24.1" "@babel/types": "npm:^7.24.0" "@types/react": "npm:^18.2.77" + "@types/react-dom": "npm:^18.2.25" "@typescript-eslint/eslint-plugin": "npm:6.12.0" "@typescript-eslint/parser": "npm:6.12.0" eslint: "npm:^7.25.0" From 78c9b5d9b44fbb493a008255c81347ee6b4c0b7c Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Fri, 12 Apr 2024 07:34:15 -0500 Subject: [PATCH 22/23] Remove `@types/inquirer` from `resolutions` as it appears to be unused --- package.json | 1 - yarn.lock | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index b7c5c0e09..103adb231 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "esbuild": "0.19.7", "jest-snapshot": "29.3.1", "react-redux": "npm:9.1.0", - "@types/inquirer": "npm:8.2.1", "website/react": "npm:17.0.2", "website/react-dom": "npm:17.0.2", "website/@types/react-dom": "npm:17.0.11", diff --git a/yarn.lock b/yarn.lock index 61e1d0172..40818033f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8644,13 +8644,13 @@ __metadata: languageName: node linkType: hard -"@types/inquirer@npm:8.2.1": - version: 8.2.1 - resolution: "@types/inquirer@npm:8.2.1" +"@types/inquirer@npm:^7.3.1": + version: 7.3.3 + resolution: "@types/inquirer@npm:7.3.3" dependencies: "@types/through": "npm:*" - rxjs: "npm:^7.2.0" - checksum: 10/7cee20a39c41b85412b05390216b941b0034b250bd0ff0b2a403f23f5c82406836e020210a6619c81098cb92db7dae1c43e0e3d38bd3086010a9db0fcc7a2ed6 + rxjs: "npm:^6.4.0" + checksum: 10/1d273d569942086a44613969df4dceb0701bfe373f6bbddc2a625f16017e214dd49787ae292f74b604e57a706d5fe21923f9c8948b5fe406c8337ba8f78b7db1 languageName: node linkType: hard @@ -25825,7 +25825,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^6.3.3, rxjs@npm:^6.6.0, rxjs@npm:^6.6.2, rxjs@npm:^6.6.3": +"rxjs@npm:^6.3.3, rxjs@npm:^6.4.0, rxjs@npm:^6.6.0, rxjs@npm:^6.6.2, rxjs@npm:^6.6.3": version: 6.6.7 resolution: "rxjs@npm:6.6.7" dependencies: From 9654f747f8fe89ae6d14ac75c2b9d6778c9cd3fd Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Fri, 12 Apr 2024 07:39:12 -0500 Subject: [PATCH 23/23] Remove package `resolutions` related to `website` and `docs` --- package.json | 8 -------- yarn.lock | 53 +--------------------------------------------------- 2 files changed, 1 insertion(+), 60 deletions(-) diff --git a/package.json b/package.json index 103adb231..b1cb1bb66 100644 --- a/package.json +++ b/package.json @@ -55,14 +55,6 @@ "esbuild": "0.19.7", "jest-snapshot": "29.3.1", "react-redux": "npm:9.1.0", - "website/react": "npm:17.0.2", - "website/react-dom": "npm:17.0.2", - "website/@types/react-dom": "npm:17.0.11", - "website/@types/react": "npm:17.0.11", - "docs/react": "npm:17.0.2", - "docs/react-dom": "npm:17.0.2", - "docs/@types/react-dom": "npm:17.0.11", - "docs/@types/react": "npm:17.0.11", "console-testing-library@0.6.1": "patch:console-testing-library@npm%3A0.6.1#./.yarn/patches/console-testing-library-npm-0.6.1-4d9957d402.patch" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 40818033f..4a9ee9e13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9006,7 +9006,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:^18.0.12, @types/react@npm:^18.0.5, @types/react@npm:^18.2.77": +"@types/react@npm:*, @types/react@npm:^18.0, @types/react@npm:^18.0.12, @types/react@npm:^18.0.5, @types/react@npm:^18.2.77": version: 18.2.77 resolution: "@types/react@npm:18.2.77" dependencies: @@ -9016,17 +9016,6 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:17.0.11": - version: 17.0.11 - resolution: "@types/react@npm:17.0.11" - dependencies: - "@types/prop-types": "npm:*" - "@types/scheduler": "npm:*" - csstype: "npm:^3.0.2" - checksum: 10/392a9ff5303ef5fdc63419052b6ace974af5f27e1aad605264630a1e9226054abb2026269e334f29e6380fb63fd002bf065be67e34a3ee5d2d9041184ad11a39 - languageName: node - linkType: hard - "@types/resolve@npm:1.17.1": version: 1.17.1 resolution: "@types/resolve@npm:1.17.1" @@ -9061,13 +9050,6 @@ __metadata: languageName: node linkType: hard -"@types/scheduler@npm:*": - version: 0.16.1 - resolution: "@types/scheduler@npm:0.16.1" - checksum: 10/709f02113c64289a03b15b7ecd541b1846caa224dacaf506f93b6931ec88b8c33e435122303e54e4501eecc9671817e133c3e98377c3751d8e0eb5019bd2bd35 - languageName: node - linkType: hard - "@types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0": version: 7.5.6 resolution: "@types/semver@npm:7.5.6" @@ -24297,19 +24279,6 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:17.0.2": - version: 17.0.2 - resolution: "react-dom@npm:17.0.2" - dependencies: - loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - scheduler: "npm:^0.20.2" - peerDependencies: - react: 17.0.2 - checksum: 10/0b3836131a64da8b1c2c852cc28b09c21a738c33c7a8d6021ac20d5619d753c8ee5fff8f97c95f2fc33053e44c2cbce9657453e21c55900164e6e0c3e955e826 - languageName: node - linkType: hard - "react-dom@npm:^18.1.0, react-dom@npm:^18.2.0": version: 18.2.0 resolution: "react-dom@npm:18.2.0" @@ -24685,16 +24654,6 @@ __metadata: languageName: node linkType: hard -"react@npm:17.0.2": - version: 17.0.2 - resolution: "react@npm:17.0.2" - dependencies: - loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - checksum: 10/ece60c31c1d266d132783aaaffa185d2e4c9b4db144f853933ec690cee1e0600c8929a1dd0a9e79323eea8e2df636c9a06d40f6cfdc9f797f65225433e67f707 - languageName: node - linkType: hard - "react@npm:^18.1.0, react@npm:^18.2.0": version: 18.2.0 resolution: "react@npm:18.2.0" @@ -25937,16 +25896,6 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.20.2": - version: 0.20.2 - resolution: "scheduler@npm:0.20.2" - dependencies: - loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - checksum: 10/898917fa475386953d998add9107c04bf2c335eee86172833995dee126d12a68bee3c29edbd61fa0bcbcb8ee511c422eaab23b86b02f95aab26ecfaed8df5e64 - languageName: node - linkType: hard - "scheduler@npm:^0.23.0": version: 0.23.0 resolution: "scheduler@npm:0.23.0"