From a325774ecb8272a9a0db34bb8ffa5ed52be62883 Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 19 Dec 2023 00:23:31 -0800 Subject: [PATCH 1/9] fix(crwa): don't pin types react in crwa web --- packages/create-redwood-app/templates/js/web/package.json | 4 ++-- packages/create-redwood-app/templates/ts/web/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/create-redwood-app/templates/js/web/package.json b/packages/create-redwood-app/templates/js/web/package.json index 490b3c48db21..3e5b008e1d99 100644 --- a/packages/create-redwood-app/templates/js/web/package.json +++ b/packages/create-redwood-app/templates/js/web/package.json @@ -18,8 +18,8 @@ "react-dom": "0.0.0-experimental-e5205658f-20230913" }, "devDependencies": { - "@types/react": "18.2.37", - "@types/react-dom": "18.2.15", + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15", "@redwoodjs/vite": "6.0.7" } } diff --git a/packages/create-redwood-app/templates/ts/web/package.json b/packages/create-redwood-app/templates/ts/web/package.json index 490b3c48db21..3e5b008e1d99 100644 --- a/packages/create-redwood-app/templates/ts/web/package.json +++ b/packages/create-redwood-app/templates/ts/web/package.json @@ -18,8 +18,8 @@ "react-dom": "0.0.0-experimental-e5205658f-20230913" }, "devDependencies": { - "@types/react": "18.2.37", - "@types/react-dom": "18.2.15", + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15", "@redwoodjs/vite": "6.0.7" } } From 14bcc4c70a44e6da0cb92d638a7d00901536275a Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 19 Dec 2023 11:44:31 -0800 Subject: [PATCH 2/9] remove react types from testing deps --- packages/testing/package.json | 2 -- yarn.lock | 2 -- 2 files changed, 4 deletions(-) diff --git a/packages/testing/package.json b/packages/testing/package.json index e1900250bfa7..56955f652f66 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -41,8 +41,6 @@ "@types/babel-core": "6.25.10", "@types/jest": "29.5.8", "@types/node": "20.10.4", - "@types/react": "18.2.37", - "@types/react-dom": "18.2.15", "@types/webpack": "5.28.5", "@types/webpack-env": "1.18.4", "babel-jest": "^29.7.0", diff --git a/yarn.lock b/yarn.lock index 6ff3c94b6a56..222685478510 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9436,8 +9436,6 @@ __metadata: "@types/babel-core": "npm:6.25.10" "@types/jest": "npm:29.5.8" "@types/node": "npm:20.10.4" - "@types/react": "npm:18.2.37" - "@types/react-dom": "npm:18.2.15" "@types/webpack": "npm:5.28.5" "@types/webpack-env": "npm:1.18.4" babel-jest: "npm:^29.7.0" From 3adc179d39f17e2a6f60b77de34873682d6905fa Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 19 Dec 2023 11:45:53 -0800 Subject: [PATCH 3/9] move types react deps in crwa up --- packages/create-redwood-app/templates/js/package.json | 4 +++- packages/create-redwood-app/templates/js/web/package.json | 2 -- packages/create-redwood-app/templates/ts/package.json | 4 +++- packages/create-redwood-app/templates/ts/web/package.json | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json index 25e637ddcff7..0449536d7055 100644 --- a/packages/create-redwood-app/templates/js/package.json +++ b/packages/create-redwood-app/templates/js/package.json @@ -7,7 +7,9 @@ ] }, "devDependencies": { - "@redwoodjs/core": "6.0.7" + "@redwoodjs/core": "6.0.7", + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15" }, "eslintConfig": { "extends": "@redwoodjs/eslint-config", diff --git a/packages/create-redwood-app/templates/js/web/package.json b/packages/create-redwood-app/templates/js/web/package.json index 3e5b008e1d99..7df732424038 100644 --- a/packages/create-redwood-app/templates/js/web/package.json +++ b/packages/create-redwood-app/templates/js/web/package.json @@ -18,8 +18,6 @@ "react-dom": "0.0.0-experimental-e5205658f-20230913" }, "devDependencies": { - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15", "@redwoodjs/vite": "6.0.7" } } diff --git a/packages/create-redwood-app/templates/ts/package.json b/packages/create-redwood-app/templates/ts/package.json index 25e637ddcff7..0449536d7055 100644 --- a/packages/create-redwood-app/templates/ts/package.json +++ b/packages/create-redwood-app/templates/ts/package.json @@ -7,7 +7,9 @@ ] }, "devDependencies": { - "@redwoodjs/core": "6.0.7" + "@redwoodjs/core": "6.0.7", + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15" }, "eslintConfig": { "extends": "@redwoodjs/eslint-config", diff --git a/packages/create-redwood-app/templates/ts/web/package.json b/packages/create-redwood-app/templates/ts/web/package.json index 3e5b008e1d99..7df732424038 100644 --- a/packages/create-redwood-app/templates/ts/web/package.json +++ b/packages/create-redwood-app/templates/ts/web/package.json @@ -18,8 +18,6 @@ "react-dom": "0.0.0-experimental-e5205658f-20230913" }, "devDependencies": { - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15", "@redwoodjs/vite": "6.0.7" } } From d93634c8eb2fb7bd8a65ab87aaf9e085bb6a951f Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Thu, 21 Dec 2023 16:29:31 -0800 Subject: [PATCH 4/9] settle on easier fix --- .../auth-providers/auth0/web/package.json | 2 +- .../azureActiveDirectory/web/package.json | 2 +- .../auth-providers/clerk/web/package.json | 2 +- .../auth-providers/dbAuth/web/package.json | 2 +- .../auth-providers/firebase/web/package.json | 2 +- .../auth-providers/netlify/web/package.json | 2 +- .../auth-providers/supabase/web/package.json | 2 +- .../supertokens/web/package.json | 2 +- .../templates/js/package.json | 4 +- .../templates/js/web/package.json | 2 + .../templates/ts/package.json | 4 +- .../templates/ts/web/package.json | 2 + packages/forms/package.json | 4 +- packages/router/package.json | 4 +- packages/studio/package.json | 4 +- packages/testing/package.json | 2 + packages/vite/package.json | 2 +- packages/web/package.json | 4 +- yarn.lock | 52 ++++++++++--------- 19 files changed, 52 insertions(+), 48 deletions(-) diff --git a/packages/auth-providers/auth0/web/package.json b/packages/auth-providers/auth0/web/package.json index b4a82997b3a5..f0ed959209c4 100644 --- a/packages/auth-providers/auth0/web/package.json +++ b/packages/auth-providers/auth0/web/package.json @@ -30,7 +30,7 @@ "@auth0/auth0-spa-js": "2.1.2", "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", - "@types/react": "18.2.37", + "@types/react": "^18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3" diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json index aa266eede2e7..c9dd940fe4e2 100644 --- a/packages/auth-providers/azureActiveDirectory/web/package.json +++ b/packages/auth-providers/azureActiveDirectory/web/package.json @@ -31,7 +31,7 @@ "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", "@types/netlify-identity-widget": "1.9.6", - "@types/react": "18.2.37", + "@types/react": "^18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3" diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json index 61545a11ba96..98341b92a11e 100644 --- a/packages/auth-providers/clerk/web/package.json +++ b/packages/auth-providers/clerk/web/package.json @@ -31,7 +31,7 @@ "@babel/core": "^7.22.20", "@clerk/clerk-react": "4.28.3", "@clerk/types": "3.60.0", - "@types/react": "18.2.37", + "@types/react": "^18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3" diff --git a/packages/auth-providers/dbAuth/web/package.json b/packages/auth-providers/dbAuth/web/package.json index 8e84d6804803..53a539bf238c 100644 --- a/packages/auth-providers/dbAuth/web/package.json +++ b/packages/auth-providers/dbAuth/web/package.json @@ -32,7 +32,7 @@ "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", "@simplewebauthn/typescript-types": "7.4.0", - "@types/react": "18.2.37", + "@types/react": "^18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3" diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json index 722cde65b5ad..d23373a6058b 100644 --- a/packages/auth-providers/firebase/web/package.json +++ b/packages/auth-providers/firebase/web/package.json @@ -29,7 +29,7 @@ "devDependencies": { "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", - "@types/react": "18.2.37", + "@types/react": "^18.2.37", "firebase": "10.6.0", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", diff --git a/packages/auth-providers/netlify/web/package.json b/packages/auth-providers/netlify/web/package.json index 1267e54b42bb..e5b03e7038c8 100644 --- a/packages/auth-providers/netlify/web/package.json +++ b/packages/auth-providers/netlify/web/package.json @@ -30,7 +30,7 @@ "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", "@types/netlify-identity-widget": "1.9.6", - "@types/react": "18.2.37", + "@types/react": "^18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3" diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json index 6d57ce6e4260..26a20599fbcb 100644 --- a/packages/auth-providers/supabase/web/package.json +++ b/packages/auth-providers/supabase/web/package.json @@ -29,7 +29,7 @@ "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", "@supabase/supabase-js": "2.39.0", - "@types/react": "18.2.37", + "@types/react": "^18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3" diff --git a/packages/auth-providers/supertokens/web/package.json b/packages/auth-providers/supertokens/web/package.json index c157378f9f64..3fdffc6939f7 100644 --- a/packages/auth-providers/supertokens/web/package.json +++ b/packages/auth-providers/supertokens/web/package.json @@ -29,7 +29,7 @@ "devDependencies": { "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", - "@types/react": "18.2.37", + "@types/react": "^18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "supertokens-auth-react": "0.34.0", diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json index 0449536d7055..25e637ddcff7 100644 --- a/packages/create-redwood-app/templates/js/package.json +++ b/packages/create-redwood-app/templates/js/package.json @@ -7,9 +7,7 @@ ] }, "devDependencies": { - "@redwoodjs/core": "6.0.7", - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15" + "@redwoodjs/core": "6.0.7" }, "eslintConfig": { "extends": "@redwoodjs/eslint-config", diff --git a/packages/create-redwood-app/templates/js/web/package.json b/packages/create-redwood-app/templates/js/web/package.json index 7df732424038..3e5b008e1d99 100644 --- a/packages/create-redwood-app/templates/js/web/package.json +++ b/packages/create-redwood-app/templates/js/web/package.json @@ -18,6 +18,8 @@ "react-dom": "0.0.0-experimental-e5205658f-20230913" }, "devDependencies": { + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15", "@redwoodjs/vite": "6.0.7" } } diff --git a/packages/create-redwood-app/templates/ts/package.json b/packages/create-redwood-app/templates/ts/package.json index 0449536d7055..25e637ddcff7 100644 --- a/packages/create-redwood-app/templates/ts/package.json +++ b/packages/create-redwood-app/templates/ts/package.json @@ -7,9 +7,7 @@ ] }, "devDependencies": { - "@redwoodjs/core": "6.0.7", - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15" + "@redwoodjs/core": "6.0.7" }, "eslintConfig": { "extends": "@redwoodjs/eslint-config", diff --git a/packages/create-redwood-app/templates/ts/web/package.json b/packages/create-redwood-app/templates/ts/web/package.json index 7df732424038..3e5b008e1d99 100644 --- a/packages/create-redwood-app/templates/ts/web/package.json +++ b/packages/create-redwood-app/templates/ts/web/package.json @@ -18,6 +18,8 @@ "react-dom": "0.0.0-experimental-e5205658f-20230913" }, "devDependencies": { + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15", "@redwoodjs/vite": "6.0.7" } } diff --git a/packages/forms/package.json b/packages/forms/package.json index ee69351d1c07..55c170bc735e 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -35,8 +35,8 @@ "@testing-library/react": "14.1.2", "@testing-library/user-event": "14.5.1", "@types/pascalcase": "1.0.3", - "@types/react": "18.2.37", - "@types/react-dom": "18.2.15", + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15", "graphql": "16.8.1", "jest": "29.7.0", "nodemon": "3.0.2", diff --git a/packages/router/package.json b/packages/router/package.json index 4775d98a80c9..a63e8078ea80 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -31,8 +31,8 @@ "devDependencies": { "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", - "@types/react": "18.2.37", - "@types/react-dom": "18.2.15", + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "react-dom": "0.0.0-experimental-e5205658f-20230913", diff --git a/packages/studio/package.json b/packages/studio/package.json index 7e2cfebbb189..9efca62b4f63 100644 --- a/packages/studio/package.json +++ b/packages/studio/package.json @@ -70,8 +70,8 @@ "@types/lodash": "4.14.201", "@types/mailparser": "^3", "@types/qs": "6.9.10", - "@types/react": "18.2.37", - "@types/react-dom": "18.2.15", + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15", "@types/react-grid-layout": "1", "@types/smtp-server": "^3", "@types/split2": "4.2.3", diff --git a/packages/testing/package.json b/packages/testing/package.json index 56955f652f66..4344def92588 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -41,6 +41,8 @@ "@types/babel-core": "6.25.10", "@types/jest": "29.5.8", "@types/node": "20.10.4", + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15", "@types/webpack": "5.28.5", "@types/webpack-env": "1.18.4", "babel-jest": "^29.7.0", diff --git a/packages/vite/package.json b/packages/vite/package.json index 7ea7b0706361..857821edec4c 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -88,7 +88,7 @@ "@babel/cli": "7.23.4", "@types/busboy": "^1", "@types/express": "4", - "@types/react": "18.2.37", + "@types/react": "^18.2.37", "@types/yargs-parser": "21.0.3", "glob": "10.3.10", "jest": "29.7.0", diff --git a/packages/web/package.json b/packages/web/package.json index d30f782c2a08..cc26f9ce495e 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -54,8 +54,8 @@ "@babel/core": "^7.22.20", "@testing-library/jest-dom": "6.1.5", "@testing-library/react": "14.1.2", - "@types/react": "18.2.37", - "@types/react-dom": "18.2.15", + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15", "jest": "29.7.0", "nodemon": "3.0.2", "react": "0.0.0-experimental-e5205658f-20230913", diff --git a/yarn.lock b/yarn.lock index 222685478510..47b673ca33ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8190,7 +8190,7 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.23.6" "@redwoodjs/auth": "npm:6.0.7" - "@types/react": "npm:18.2.37" + "@types/react": "npm:^18.2.37" core-js: "npm:3.34.0" jest: "npm:29.7.0" react: "npm:0.0.0-experimental-e5205658f-20230913" @@ -8243,7 +8243,7 @@ __metadata: "@babel/runtime-corejs3": "npm:7.23.6" "@redwoodjs/auth": "npm:6.0.7" "@types/netlify-identity-widget": "npm:1.9.6" - "@types/react": "npm:18.2.37" + "@types/react": "npm:^18.2.37" core-js: "npm:3.34.0" jest: "npm:29.7.0" react: "npm:0.0.0-experimental-e5205658f-20230913" @@ -8294,7 +8294,7 @@ __metadata: "@clerk/clerk-react": "npm:4.28.3" "@clerk/types": "npm:3.60.0" "@redwoodjs/auth": "npm:6.0.7" - "@types/react": "npm:18.2.37" + "@types/react": "npm:^18.2.37" core-js: "npm:3.34.0" jest: "npm:29.7.0" react: "npm:0.0.0-experimental-e5205658f-20230913" @@ -8369,7 +8369,7 @@ __metadata: "@redwoodjs/auth": "npm:6.0.7" "@simplewebauthn/browser": "npm:7.4.0" "@simplewebauthn/typescript-types": "npm:7.4.0" - "@types/react": "npm:18.2.37" + "@types/react": "npm:^18.2.37" core-js: "npm:3.34.0" jest: "npm:29.7.0" react: "npm:0.0.0-experimental-e5205658f-20230913" @@ -8416,7 +8416,7 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.23.6" "@redwoodjs/auth": "npm:6.0.7" - "@types/react": "npm:18.2.37" + "@types/react": "npm:^18.2.37" core-js: "npm:3.34.0" firebase: "npm:10.6.0" jest: "npm:29.7.0" @@ -8468,7 +8468,7 @@ __metadata: "@babel/runtime-corejs3": "npm:7.23.6" "@redwoodjs/auth": "npm:6.0.7" "@types/netlify-identity-widget": "npm:1.9.6" - "@types/react": "npm:18.2.37" + "@types/react": "npm:^18.2.37" core-js: "npm:3.34.0" jest: "npm:29.7.0" react: "npm:0.0.0-experimental-e5205658f-20230913" @@ -8518,7 +8518,7 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.23.6" "@supabase/supabase-js": "npm:2.39.0" - "@types/react": "npm:18.2.37" + "@types/react": "npm:^18.2.37" core-js: "npm:3.34.0" jest: "npm:29.7.0" react: "npm:0.0.0-experimental-e5205658f-20230913" @@ -8570,7 +8570,7 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.23.6" "@redwoodjs/auth": "npm:6.0.7" - "@types/react": "npm:18.2.37" + "@types/react": "npm:^18.2.37" core-js: "npm:3.34.0" jest: "npm:29.7.0" react: "npm:0.0.0-experimental-e5205658f-20230913" @@ -8961,8 +8961,8 @@ __metadata: "@testing-library/react": "npm:14.1.2" "@testing-library/user-event": "npm:14.5.1" "@types/pascalcase": "npm:1.0.3" - "@types/react": "npm:18.2.37" - "@types/react-dom": "npm:18.2.15" + "@types/react": "npm:^18.2.37" + "@types/react-dom": "npm:^18.2.15" core-js: "npm:3.34.0" graphql: "npm:16.8.1" jest: "npm:29.7.0" @@ -9259,8 +9259,8 @@ __metadata: "@babel/runtime-corejs3": "npm:7.23.6" "@reach/skip-nav": "npm:0.18.0" "@redwoodjs/auth": "npm:6.0.7" - "@types/react": "npm:18.2.37" - "@types/react-dom": "npm:18.2.15" + "@types/react": "npm:^18.2.37" + "@types/react-dom": "npm:^18.2.15" core-js: "npm:3.34.0" jest: "npm:29.7.0" react: "npm:0.0.0-experimental-e5205658f-20230913" @@ -9342,8 +9342,8 @@ __metadata: "@types/lodash": "npm:4.14.201" "@types/mailparser": "npm:^3" "@types/qs": "npm:6.9.10" - "@types/react": "npm:18.2.37" - "@types/react-dom": "npm:18.2.15" + "@types/react": "npm:^18.2.37" + "@types/react-dom": "npm:^18.2.15" "@types/react-grid-layout": "npm:1" "@types/smtp-server": "npm:^3" "@types/split2": "npm:4.2.3" @@ -9436,6 +9436,8 @@ __metadata: "@types/babel-core": "npm:6.25.10" "@types/jest": "npm:29.5.8" "@types/node": "npm:20.10.4" + "@types/react": "npm:^18.2.37" + "@types/react-dom": "npm:^18.2.15" "@types/webpack": "npm:5.28.5" "@types/webpack-env": "npm:1.18.4" babel-jest: "npm:^29.7.0" @@ -9477,7 +9479,7 @@ __metadata: "@swc/core": "npm:1.3.60" "@types/busboy": "npm:^1" "@types/express": "npm:4" - "@types/react": "npm:18.2.37" + "@types/react": "npm:^18.2.37" "@types/yargs-parser": "npm:21.0.3" "@vitejs/plugin-react": "npm:4.2.1" "@whatwg-node/server": "npm:0.9.18" @@ -9539,8 +9541,8 @@ __metadata: "@redwoodjs/auth": "npm:6.0.7" "@testing-library/jest-dom": "npm:6.1.5" "@testing-library/react": "npm:14.1.2" - "@types/react": "npm:18.2.37" - "@types/react-dom": "npm:18.2.15" + "@types/react": "npm:^18.2.37" + "@types/react-dom": "npm:^18.2.15" core-js: "npm:3.34.0" graphql: "npm:16.8.1" graphql-sse: "npm:2.4.0" @@ -12302,12 +12304,12 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:18.2.15, @types/react-dom@npm:^18.0.0": - version: 18.2.15 - resolution: "@types/react-dom@npm:18.2.15" +"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.15": + version: 18.2.18 + resolution: "@types/react-dom@npm:18.2.18" dependencies: "@types/react": "npm:*" - checksum: 70e86f15f69f89b8f179139ab2e8a8aa9765e742789f5dd5a46fec40d4300ada8fe3349cceda42b9964a018982d7ccb7d791b47f781966c992bfd37da909fbd3 + checksum: 74dba11a1b8156f3a763f3fca1fb4ec1dcd349153279b8bf79210024a69f994bf2cf0728198c047f8130c5318420ea56281b0a4ef84c8ae943cd9a0cac705220 languageName: node linkType: hard @@ -12329,14 +12331,14 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:18.2.37, @types/react@npm:>=16": - version: 18.2.37 - resolution: "@types/react@npm:18.2.37" +"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^18.2.37": + version: 18.2.45 + resolution: "@types/react@npm:18.2.45" dependencies: "@types/prop-types": "npm:*" "@types/scheduler": "npm:*" csstype: "npm:^3.0.2" - checksum: 79dd5d23da05bec54e7423ca17096e345eb8fd80a3bf8dd916bb5cdd60677d27c298523aa5b245d090fcc4ec100cfd58c1af4631fbac709d0a9d8be75f9d78a9 + checksum: 4cc650c47ffb88baac29fb7a74e842e4af4a55f437086ef70250fdc75f0a5f2fcf8adc272d05ab2e00b1de6e14613296881271caee037dadf9130fdeb498c59e languageName: node linkType: hard From 14fd55e249fca220f70164c10e6b9ab80024f8b7 Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Thu, 21 Dec 2023 16:58:27 -0800 Subject: [PATCH 5/9] udpate test project fixture --- __fixtures__/test-project/web/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json index c9eb5518fd81..b55713b98b89 100644 --- a/__fixtures__/test-project/web/package.json +++ b/__fixtures__/test-project/web/package.json @@ -21,8 +21,8 @@ }, "devDependencies": { "@redwoodjs/vite": "6.0.7", - "@types/react": "18.2.37", - "@types/react-dom": "18.2.15", + "@types/react": "^18.2.37", + "@types/react-dom": "^18.2.15", "autoprefixer": "^10.4.16", "postcss": "^8.4.32", "postcss-loader": "^7.3.3", From 74e231c6f9f0ac03b7d336f8186c74d2aa04a4e7 Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Wed, 7 Feb 2024 22:45:25 -0800 Subject: [PATCH 6/9] revert fixture for debugging --- __fixtures__/test-project/web/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json index 79079e31dc5f..7be5a1c808dd 100644 --- a/__fixtures__/test-project/web/package.json +++ b/__fixtures__/test-project/web/package.json @@ -21,8 +21,8 @@ }, "devDependencies": { "@redwoodjs/vite": "6.0.7", - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15", + "@types/react": "18.2.37", + "@types/react-dom": "18.2.15", "autoprefixer": "^10.4.17", "postcss": "^8.4.35", "postcss-loader": "^8.1.0", From d707644f39c4262e8c41d59e5dca3d704dadbfdc Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Thu, 8 Feb 2024 09:56:48 -0800 Subject: [PATCH 7/9] update react-types --- __fixtures__/test-project/web/package.json | 4 ++-- packages/auth-providers/auth0/web/package.json | 2 +- packages/auth-providers/azureActiveDirectory/web/package.json | 2 +- packages/auth-providers/clerk/web/package.json | 2 +- packages/auth-providers/dbAuth/web/package.json | 2 +- packages/auth-providers/firebase/web/package.json | 2 +- packages/auth-providers/netlify/web/package.json | 2 +- packages/auth-providers/supabase/web/package.json | 2 +- packages/auth-providers/supertokens/web/package.json | 2 +- packages/create-redwood-app/templates/js/web/package.json | 4 ++-- packages/create-redwood-app/templates/ts/web/package.json | 4 ++-- packages/forms/package.json | 4 ++-- packages/router/package.json | 4 ++-- packages/testing/package.json | 4 ++-- packages/vite/package.json | 2 +- packages/web/package.json | 4 ++-- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json index 7be5a1c808dd..f57f80d958ad 100644 --- a/__fixtures__/test-project/web/package.json +++ b/__fixtures__/test-project/web/package.json @@ -21,8 +21,8 @@ }, "devDependencies": { "@redwoodjs/vite": "6.0.7", - "@types/react": "18.2.37", - "@types/react-dom": "18.2.15", + "@types/react": "^18.2.55", + "@types/react-dom": "^18.2.19", "autoprefixer": "^10.4.17", "postcss": "^8.4.35", "postcss-loader": "^8.1.0", diff --git a/packages/auth-providers/auth0/web/package.json b/packages/auth-providers/auth0/web/package.json index a2ece286181b..cba077b05d8f 100644 --- a/packages/auth-providers/auth0/web/package.json +++ b/packages/auth-providers/auth0/web/package.json @@ -31,7 +31,7 @@ "@auth0/auth0-spa-js": "2.1.2", "@babel/cli": "7.23.9", "@babel/core": "^7.22.20", - "@types/react": "^18.2.37", + "@types/react": "^18.2.55", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3", "vitest": "1.2.2" diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json index 10373efdee6d..0b309a0357d8 100644 --- a/packages/auth-providers/azureActiveDirectory/web/package.json +++ b/packages/auth-providers/azureActiveDirectory/web/package.json @@ -32,7 +32,7 @@ "@babel/cli": "7.23.9", "@babel/core": "^7.22.20", "@types/netlify-identity-widget": "1.9.6", - "@types/react": "^18.2.37", + "@types/react": "^18.2.55", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3", "vitest": "1.2.2" diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json index d8ed96ff1f6e..16d862558610 100644 --- a/packages/auth-providers/clerk/web/package.json +++ b/packages/auth-providers/clerk/web/package.json @@ -32,7 +32,7 @@ "@babel/core": "^7.22.20", "@clerk/clerk-react": "4.30.3", "@clerk/types": "3.60.0", - "@types/react": "^18.2.37", + "@types/react": "^18.2.55", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3", "vitest": "1.2.2" diff --git a/packages/auth-providers/dbAuth/web/package.json b/packages/auth-providers/dbAuth/web/package.json index 47f2a183236c..9f9611fade96 100644 --- a/packages/auth-providers/dbAuth/web/package.json +++ b/packages/auth-providers/dbAuth/web/package.json @@ -33,7 +33,7 @@ "@babel/cli": "7.23.9", "@babel/core": "^7.22.20", "@simplewebauthn/typescript-types": "7.4.0", - "@types/react": "^18.2.37", + "@types/react": "^18.2.55", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3" diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json index 647a9bc82587..6060ff77e3ba 100644 --- a/packages/auth-providers/firebase/web/package.json +++ b/packages/auth-providers/firebase/web/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@babel/cli": "7.23.9", "@babel/core": "^7.22.20", - "@types/react": "^18.2.37", + "@types/react": "^18.2.55", "firebase": "10.7.0", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", diff --git a/packages/auth-providers/netlify/web/package.json b/packages/auth-providers/netlify/web/package.json index e82d5b6703d0..cc0f78dbf5ce 100644 --- a/packages/auth-providers/netlify/web/package.json +++ b/packages/auth-providers/netlify/web/package.json @@ -31,7 +31,7 @@ "@babel/cli": "7.23.9", "@babel/core": "^7.22.20", "@types/netlify-identity-widget": "1.9.6", - "@types/react": "^18.2.37", + "@types/react": "^18.2.55", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3", "vitest": "1.2.2" diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json index 3080f5e3129a..896f85535823 100644 --- a/packages/auth-providers/supabase/web/package.json +++ b/packages/auth-providers/supabase/web/package.json @@ -30,7 +30,7 @@ "@babel/cli": "7.23.9", "@babel/core": "^7.22.20", "@supabase/supabase-js": "2.39.0", - "@types/react": "^18.2.37", + "@types/react": "^18.2.55", "react": "0.0.0-experimental-e5205658f-20230913", "typescript": "5.3.3", "vitest": "1.2.2" diff --git a/packages/auth-providers/supertokens/web/package.json b/packages/auth-providers/supertokens/web/package.json index b3d8dd482595..5ad326dd6e2c 100644 --- a/packages/auth-providers/supertokens/web/package.json +++ b/packages/auth-providers/supertokens/web/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@babel/cli": "7.23.9", "@babel/core": "^7.22.20", - "@types/react": "^18.2.37", + "@types/react": "^18.2.55", "react": "0.0.0-experimental-e5205658f-20230913", "supertokens-auth-react": "0.34.0", "typescript": "5.3.3", diff --git a/packages/create-redwood-app/templates/js/web/package.json b/packages/create-redwood-app/templates/js/web/package.json index 77932ec0b860..489a42c622d1 100644 --- a/packages/create-redwood-app/templates/js/web/package.json +++ b/packages/create-redwood-app/templates/js/web/package.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@redwoodjs/vite": "6.0.7", - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15" + "@types/react": "^18.2.55", + "@types/react-dom": "^18.2.19" } } diff --git a/packages/create-redwood-app/templates/ts/web/package.json b/packages/create-redwood-app/templates/ts/web/package.json index 77932ec0b860..489a42c622d1 100644 --- a/packages/create-redwood-app/templates/ts/web/package.json +++ b/packages/create-redwood-app/templates/ts/web/package.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@redwoodjs/vite": "6.0.7", - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15" + "@types/react": "^18.2.55", + "@types/react-dom": "^18.2.19" } } diff --git a/packages/forms/package.json b/packages/forms/package.json index 3ba69f173498..8c0c5e5bcd25 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -37,8 +37,8 @@ "@testing-library/react": "14.1.2", "@testing-library/user-event": "14.5.2", "@types/pascalcase": "1.0.3", - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15", + "@types/react": "^18.2.55", + "@types/react-dom": "^18.2.19", "nodemon": "3.0.2", "react": "0.0.0-experimental-e5205658f-20230913", "react-dom": "0.0.0-experimental-e5205658f-20230913", diff --git a/packages/router/package.json b/packages/router/package.json index 64979ed61ea4..3e51d959abd3 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -32,8 +32,8 @@ "devDependencies": { "@babel/cli": "7.23.9", "@babel/core": "^7.22.20", - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15", + "@types/react": "^18.2.55", + "@types/react-dom": "^18.2.19", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "react-dom": "0.0.0-experimental-e5205658f-20230913", diff --git a/packages/testing/package.json b/packages/testing/package.json index 2f8a7477aa78..12f8bb0c4ed7 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -43,8 +43,8 @@ "@types/babel-core": "6.25.10", "@types/jest": "29.5.8", "@types/node": "20.11.10", - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15", + "@types/react": "^18.2.55", + "@types/react-dom": "^18.2.19", "@types/webpack": "5.28.5", "@types/webpack-env": "1.18.4", "babel-jest": "^29.7.0", diff --git a/packages/vite/package.json b/packages/vite/package.json index 4a5fd1e6f841..6704f290655f 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -95,7 +95,7 @@ "@types/busboy": "^1", "@types/cookie": "^0", "@types/express": "4", - "@types/react": "^18.2.37", + "@types/react": "^18.2.55", "@types/yargs-parser": "21.0.3", "glob": "10.3.10", "rollup": "3.29.4", diff --git a/packages/web/package.json b/packages/web/package.json index dc56c416646a..e0d040ae4311 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -55,8 +55,8 @@ "@babel/core": "^7.22.20", "@testing-library/jest-dom": "6.3.0", "@testing-library/react": "14.1.2", - "@types/react": "^18.2.37", - "@types/react-dom": "^18.2.15", + "@types/react": "^18.2.55", + "@types/react-dom": "^18.2.19", "jest": "29.7.0", "nodemon": "3.0.2", "react": "0.0.0-experimental-e5205658f-20230913", From 526d4b368e117bed0f50c0b3ba73bbb15d8fed9e Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Thu, 8 Feb 2024 10:03:46 -0800 Subject: [PATCH 8/9] yarn lock --- yarn.lock | 58 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/yarn.lock b/yarn.lock index 762ba390bb4f..1338aa76dd55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7537,7 +7537,7 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.23.9" "@redwoodjs/auth": "npm:6.0.7" - "@types/react": "npm:^18.2.37" + "@types/react": "npm:^18.2.55" core-js: "npm:3.35.1" react: "npm:0.0.0-experimental-e5205658f-20230913" typescript: "npm:5.3.3" @@ -7590,7 +7590,7 @@ __metadata: "@babel/runtime-corejs3": "npm:7.23.9" "@redwoodjs/auth": "npm:6.0.7" "@types/netlify-identity-widget": "npm:1.9.6" - "@types/react": "npm:^18.2.37" + "@types/react": "npm:^18.2.55" core-js: "npm:3.35.1" react: "npm:0.0.0-experimental-e5205658f-20230913" typescript: "npm:5.3.3" @@ -7640,7 +7640,7 @@ __metadata: "@clerk/clerk-react": "npm:4.30.3" "@clerk/types": "npm:3.60.0" "@redwoodjs/auth": "npm:6.0.7" - "@types/react": "npm:^18.2.37" + "@types/react": "npm:^18.2.55" core-js: "npm:3.35.1" react: "npm:0.0.0-experimental-e5205658f-20230913" typescript: "npm:5.3.3" @@ -7714,7 +7714,7 @@ __metadata: "@redwoodjs/auth": "npm:6.0.7" "@simplewebauthn/browser": "npm:7.4.0" "@simplewebauthn/typescript-types": "npm:7.4.0" - "@types/react": "npm:^18.2.37" + "@types/react": "npm:^18.2.55" core-js: "npm:3.35.1" jest: "npm:29.7.0" react: "npm:0.0.0-experimental-e5205658f-20230913" @@ -7761,7 +7761,7 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.23.9" "@redwoodjs/auth": "npm:6.0.7" - "@types/react": "npm:^18.2.37" + "@types/react": "npm:^18.2.55" core-js: "npm:3.35.1" firebase: "npm:10.7.0" jest: "npm:29.7.0" @@ -7813,7 +7813,7 @@ __metadata: "@babel/runtime-corejs3": "npm:7.23.9" "@redwoodjs/auth": "npm:6.0.7" "@types/netlify-identity-widget": "npm:1.9.6" - "@types/react": "npm:^18.2.37" + "@types/react": "npm:^18.2.55" core-js: "npm:3.35.1" react: "npm:0.0.0-experimental-e5205658f-20230913" typescript: "npm:5.3.3" @@ -7862,7 +7862,7 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.23.9" "@supabase/supabase-js": "npm:2.39.0" - "@types/react": "npm:^18.2.37" + "@types/react": "npm:^18.2.55" core-js: "npm:3.35.1" react: "npm:0.0.0-experimental-e5205658f-20230913" typescript: "npm:5.3.3" @@ -7915,7 +7915,7 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.23.9" "@redwoodjs/auth": "npm:6.0.7" - "@types/react": "npm:^18.2.37" + "@types/react": "npm:^18.2.55" core-js: "npm:3.35.1" react: "npm:0.0.0-experimental-e5205658f-20230913" supertokens-auth-react: "npm:0.34.0" @@ -8311,8 +8311,8 @@ __metadata: "@testing-library/react": "npm:14.1.2" "@testing-library/user-event": "npm:14.5.2" "@types/pascalcase": "npm:1.0.3" - "@types/react": "npm:^18.2.37" - "@types/react-dom": "npm:^18.2.15" + "@types/react": "npm:^18.2.55" + "@types/react-dom": "npm:^18.2.19" core-js: "npm:3.35.1" graphql: "npm:16.8.1" nodemon: "npm:3.0.2" @@ -8623,8 +8623,8 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.23.9" "@redwoodjs/auth": "npm:6.0.7" - "@types/react": "npm:^18.2.37" - "@types/react-dom": "npm:^18.2.15" + "@types/react": "npm:^18.2.55" + "@types/react-dom": "npm:^18.2.19" core-js: "npm:3.35.1" jest: "npm:29.7.0" react: "npm:0.0.0-experimental-e5205658f-20230913" @@ -8720,8 +8720,8 @@ __metadata: "@types/babel-core": "npm:6.25.10" "@types/jest": "npm:29.5.8" "@types/node": "npm:20.11.10" - "@types/react": "npm:^18.2.37" - "@types/react-dom": "npm:^18.2.15" + "@types/react": "npm:^18.2.55" + "@types/react-dom": "npm:^18.2.19" "@types/webpack": "npm:5.28.5" "@types/webpack-env": "npm:1.18.4" babel-jest: "npm:^29.7.0" @@ -8764,7 +8764,7 @@ __metadata: "@types/busboy": "npm:^1" "@types/cookie": "npm:^0" "@types/express": "npm:4" - "@types/react": "npm:^18.2.37" + "@types/react": "npm:^18.2.55" "@types/yargs-parser": "npm:21.0.3" "@vitejs/plugin-react": "npm:4.2.1" "@whatwg-node/fetch": "npm:0.9.16" @@ -8825,8 +8825,8 @@ __metadata: "@redwoodjs/auth": "npm:6.0.7" "@testing-library/jest-dom": "npm:6.3.0" "@testing-library/react": "npm:14.1.2" - "@types/react": "npm:^18.2.37" - "@types/react-dom": "npm:^18.2.15" + "@types/react": "npm:^18.2.55" + "@types/react-dom": "npm:^18.2.19" core-js: "npm:3.35.1" graphql: "npm:16.8.1" graphql-sse: "npm:2.5.2" @@ -11419,7 +11419,7 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.15": +"@types/react-dom@npm:^18.0.0": version: 18.2.18 resolution: "@types/react-dom@npm:18.2.18" dependencies: @@ -11428,7 +11428,16 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^18.2.37": +"@types/react-dom@npm:^18.2.19": + version: 18.2.19 + resolution: "@types/react-dom@npm:18.2.19" + dependencies: + "@types/react": "npm:*" + checksum: 88d7c6daa4659f661d0c97985d9fca492f24b421a34bb614dcd94c343aed7bea121463149e97fb01ecaa693be17b7d1542cf71ddb1705f3889a81eb2639a88aa + languageName: node + linkType: hard + +"@types/react@npm:*, @types/react@npm:>=16": version: 18.2.45 resolution: "@types/react@npm:18.2.45" dependencies: @@ -11439,6 +11448,17 @@ __metadata: languageName: node linkType: hard +"@types/react@npm:^18.2.55": + version: 18.2.55 + resolution: "@types/react@npm:18.2.55" + dependencies: + "@types/prop-types": "npm:*" + "@types/scheduler": "npm:*" + csstype: "npm:^3.0.2" + checksum: 6b1c73beafbbc582dc54ffd92b3779f6d850e8f6b5ce5d04b31e9498a3d77bfc416bb08f0d8d63ab4f4649ccd6639996472416871c01c74a528b16a55faeaf38 + languageName: node + linkType: hard + "@types/readdir-glob@npm:*": version: 1.1.5 resolution: "@types/readdir-glob@npm:1.1.5" From 31ab2048a250f2938abbcbc673a8bf2e7ae06815 Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Thu, 8 Feb 2024 10:04:08 -0800 Subject: [PATCH 9/9] yarn dedupe --- yarn.lock | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1338aa76dd55..f7e7db42b569 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11419,16 +11419,7 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:^18.0.0": - version: 18.2.18 - resolution: "@types/react-dom@npm:18.2.18" - dependencies: - "@types/react": "npm:*" - checksum: 74dba11a1b8156f3a763f3fca1fb4ec1dcd349153279b8bf79210024a69f994bf2cf0728198c047f8130c5318420ea56281b0a4ef84c8ae943cd9a0cac705220 - languageName: node - linkType: hard - -"@types/react-dom@npm:^18.2.19": +"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.19": version: 18.2.19 resolution: "@types/react-dom@npm:18.2.19" dependencies: @@ -11437,18 +11428,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:>=16": - version: 18.2.45 - resolution: "@types/react@npm:18.2.45" - dependencies: - "@types/prop-types": "npm:*" - "@types/scheduler": "npm:*" - csstype: "npm:^3.0.2" - checksum: 4cc650c47ffb88baac29fb7a74e842e4af4a55f437086ef70250fdc75f0a5f2fcf8adc272d05ab2e00b1de6e14613296881271caee037dadf9130fdeb498c59e - languageName: node - linkType: hard - -"@types/react@npm:^18.2.55": +"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^18.2.55": version: 18.2.55 resolution: "@types/react@npm:18.2.55" dependencies: