Skip to content

Commit

Permalink
deps(react): Update to react 18.3.1 (#10748)
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh-Walker-GM committed Jun 7, 2024
1 parent 867f86c commit 13b4ae1
Show file tree
Hide file tree
Showing 25 changed files with 90 additions and 116 deletions.
1 change: 1 addition & 0 deletions .changesets/10748.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- deps(react): Update to react 18.3.1 (#10748) by @Josh-Walker-GM
4 changes: 0 additions & 4 deletions .github/actions/detect-changes/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ description: Determines what areas of the framework have been changed
outputs:
docs:
description: If *only* docs have changed
rsc:
description: If RSC-related changes have been made
ssr:
description: If SSR-related changes have been made

runs:
using: node20
Expand Down
8 changes: 0 additions & 8 deletions .github/actions/detect-changes/detectChanges.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,6 @@ async function main() {
// If there's no branch, we're not in a pull request.
if (!branch) {
core.setOutput('code', true)
core.setOutput('rsc', false)
core.setOutput('ssr', false)
return
}

Expand Down Expand Up @@ -270,22 +268,16 @@ async function main() {
'to running all tests.',
)
core.setOutput('code', true)
core.setOutput('rsc', true)
core.setOutput('ssr', true)
return
}

if (!codeChanges(changedFiles)) {
console.log('Only docs and/or changesets changes detected')
core.setOutput('code', false)
core.setOutput('rsc', false)
core.setOutput('ssr', false)
return
}

core.setOutput('code', true)
core.setOutput('rsc', rscChanged(changedFiles))
core.setOutput('ssr', ssrChanged(changedFiles))
}

main()
20 changes: 13 additions & 7 deletions .github/workflows/check-test-project-fixture.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,23 @@ jobs:

outputs:
code: ${{ steps.detect-changes.outputs.code }}
rsc: ${{ steps.detect-changes.outputs.rsc }}
ssr: ${{ steps.detect-changes.outputs.ssr }}

steps:
- uses: actions/checkout@v4
- name: Set up job
uses: ./.github/actions/set-up-job

- name: Enable Corepack
run: corepack enable

- name: ⬢ Set up Node.js
uses: actions/setup-node@v4
with:
set-up-yarn-cache: false
yarn-install-directory: ./.github/actions/detect-changes
build: false
node-version: 20

- name: 🐈 Yarn install
working-directory: ./.github/actions/detect-changes
run: yarn install --inline-builds
env:
GITHUB_TOKEN: ${{ github.token }}

- name: 🔍 Detect changes
id: detect-changes
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:

outputs:
code: ${{ steps.detect-changes.outputs.code }}
rsc: ${{ steps.detect-changes.outputs.rsc }}
ssr: ${{ steps.detect-changes.outputs.ssr }}

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions __fixtures__/test-project/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"@redwoodjs/router": "7.6.3",
"@redwoodjs/web": "7.6.3",
"humanize-string": "2.1.0",
"react": "18.2.0",
"react-dom": "18.2.0"
"react": "18.3.1",
"react-dom": "18.3.1"
},
"devDependencies": {
"@redwoodjs/vite": "7.6.3",
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"@mdx-js/react": "3.0.1",
"clsx": "2.1.1",
"prism-react-renderer": "2.3.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-player": "2.16.0"
},
"devDependencies": {
Expand Down
55 changes: 18 additions & 37 deletions docs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4170,20 +4170,13 @@ __metadata:
languageName: node
linkType: hard

"clsx@npm:2.1.1":
"clsx@npm:2.1.1, clsx@npm:^2.0.0":
version: 2.1.1
resolution: "clsx@npm:2.1.1"
checksum: 10c0/c4c8eb865f8c82baab07e71bfa8897c73454881c4f99d6bc81585aecd7c441746c1399d08363dc096c550cceaf97bd4ce1e8854e1771e9998d9f94c4fe075839
languageName: node
linkType: hard

"clsx@npm:^2.0.0":
version: 2.0.0
resolution: "clsx@npm:2.0.0"
checksum: 10c0/c09f43b3144a0b7826b6b11b6a111b2c7440831004eecc02d333533c5e58ef0aa5f2dce071d3b25fbb8c8ea97b45df96c74bcc1d51c8c2027eb981931107b0cd
languageName: node
linkType: hard

"collapse-white-space@npm:^2.0.0":
version: 2.1.0
resolution: "collapse-white-space@npm:2.1.0"
Expand Down Expand Up @@ -4959,8 +4952,8 @@ __metadata:
"@mdx-js/react": "npm:3.0.1"
clsx: "npm:2.1.1"
prism-react-renderer: "npm:2.3.1"
react: "npm:18.2.0"
react-dom: "npm:18.2.0"
react: "npm:18.3.1"
react-dom: "npm:18.3.1"
react-player: "npm:2.16.0"
typescript: "npm:5.4.5"
languageName: unknown
Expand Down Expand Up @@ -9382,7 +9375,7 @@ __metadata:
languageName: node
linkType: hard

"prism-react-renderer@npm:2.3.1":
"prism-react-renderer@npm:2.3.1, prism-react-renderer@npm:^2.3.0":
version: 2.3.1
resolution: "prism-react-renderer@npm:2.3.1"
dependencies:
Expand All @@ -9394,18 +9387,6 @@ __metadata:
languageName: node
linkType: hard

"prism-react-renderer@npm:^2.3.0":
version: 2.3.0
resolution: "prism-react-renderer@npm:2.3.0"
dependencies:
"@types/prismjs": "npm:^1.26.0"
clsx: "npm:^2.0.0"
peerDependencies:
react: ">=16.0.0"
checksum: 10c0/aa8fb176e156ebb1f8ca46d82966d37176f46545e03669ddab7d56479f915b41e95b02accc16af9e2e95c7fcd57ce6222d8eac08977c757d9c49c32c7b0e03ff
languageName: node
linkType: hard

"prismjs@npm:^1.29.0":
version: 1.29.0
resolution: "prismjs@npm:1.29.0"
Expand Down Expand Up @@ -9618,15 +9599,15 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:18.2.0":
version: 18.2.0
resolution: "react-dom@npm:18.2.0"
"react-dom@npm:18.3.1":
version: 18.3.1
resolution: "react-dom@npm:18.3.1"
dependencies:
loose-envify: "npm:^1.1.0"
scheduler: "npm:^0.23.0"
scheduler: "npm:^0.23.2"
peerDependencies:
react: ^18.2.0
checksum: 10c0/66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a
react: ^18.3.1
checksum: 10c0/a752496c1941f958f2e8ac56239172296fcddce1365ce45222d04a1947e0cc5547df3e8447f855a81d6d39f008d7c32eab43db3712077f09e3f67c4874973e85
languageName: node
linkType: hard

Expand Down Expand Up @@ -9762,12 +9743,12 @@ __metadata:
languageName: node
linkType: hard

"react@npm:18.2.0":
version: 18.2.0
resolution: "react@npm:18.2.0"
"react@npm:18.3.1":
version: 18.3.1
resolution: "react@npm:18.3.1"
dependencies:
loose-envify: "npm:^1.1.0"
checksum: 10c0/b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8
checksum: 10c0/283e8c5efcf37802c9d1ce767f302dd569dd97a70d9bb8c7be79a789b9902451e0d16334b05d73299b20f048cbc3c7d288bbbde10b701fa194e2089c237dbea3
languageName: node
linkType: hard

Expand Down Expand Up @@ -10201,12 +10182,12 @@ __metadata:
languageName: node
linkType: hard

"scheduler@npm:^0.23.0":
version: 0.23.0
resolution: "scheduler@npm:0.23.0"
"scheduler@npm:^0.23.2":
version: 0.23.2
resolution: "scheduler@npm:0.23.2"
dependencies:
loose-envify: "npm:^1.1.0"
checksum: 10c0/b777f7ca0115e6d93e126ac490dbd82642d14983b3079f58f35519d992fa46260be7d6e6cede433a92db70306310c6f5f06e144f0e40c484199e09c1f7be53dd
checksum: 10c0/26383305e249651d4c58e6705d5f8425f153211aef95f15161c151f7b8de885f24751b377e4a0b3dd42cce09aad3f87a61dab7636859c0d89b7daf1a1e2a5c78
languageName: node
linkType: hard

Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/auth0/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@babel/cli": "7.24.5",
"@babel/core": "^7.22.20",
"@types/react": "^18.2.55",
"react": "18.2.0",
"react": "18.3.1",
"typescript": "5.4.5",
"vitest": "1.6.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@babel/core": "^7.22.20",
"@types/netlify-identity-widget": "1.9.6",
"@types/react": "^18.2.55",
"react": "18.2.0",
"react": "18.3.1",
"typescript": "5.4.5",
"vitest": "1.6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/clerk/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@clerk/clerk-react": "4.31.1",
"@clerk/types": "3.64.1",
"@types/react": "^18.2.55",
"react": "18.2.0",
"react": "18.3.1",
"typescript": "5.4.5",
"vitest": "1.6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/dbAuth/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@types/react": "^18.2.55",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"react": "18.2.0",
"react": "18.3.1",
"typescript": "5.4.5"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/firebase/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"firebase": "10.12.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"react": "18.2.0",
"react": "18.3.1",
"typescript": "5.4.5"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/netlify/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@babel/core": "^7.22.20",
"@types/netlify-identity-widget": "1.9.6",
"@types/react": "^18.2.55",
"react": "18.2.0",
"react": "18.3.1",
"typescript": "5.4.5",
"vitest": "1.6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/supabase/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@babel/core": "^7.22.20",
"@supabase/supabase-js": "2.43.2",
"@types/react": "^18.2.55",
"react": "18.2.0",
"react": "18.3.1",
"typescript": "5.4.5",
"vitest": "1.6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/supertokens/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@babel/cli": "7.24.5",
"@babel/core": "^7.22.20",
"@types/react": "^18.2.55",
"react": "18.2.0",
"react": "18.3.1",
"supertokens-auth-react": "0.39.1",
"typescript": "5.4.5",
"vitest": "1.6.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"dependencies": {
"core-js": "3.37.1",
"react": "18.2.0"
"react": "18.3.1"
},
"devDependencies": {
"@redwoodjs/framework-tools": "7.6.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-redwood-app/templates/js/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@redwoodjs/forms": "7.6.3",
"@redwoodjs/router": "7.6.3",
"@redwoodjs/web": "7.6.3",
"react": "18.2.0",
"react-dom": "18.2.0"
"react": "18.3.1",
"react-dom": "18.3.1"
},
"devDependencies": {
"@redwoodjs/vite": "7.6.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-redwood-app/templates/ts/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@redwoodjs/forms": "7.6.3",
"@redwoodjs/router": "7.6.3",
"@redwoodjs/web": "7.6.3",
"react": "18.2.0",
"react-dom": "18.2.0"
"react": "18.3.1",
"react-dom": "18.3.1"
},
"devDependencies": {
"@redwoodjs/vite": "7.6.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/forms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"nodemon": "3.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"typescript": "5.4.5",
"vitest": "1.6.0"
},
"peerDependencies": {
"react": "18.2.0"
"react": "18.3.1"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
4 changes: 2 additions & 2 deletions packages/prerender/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"vitest": "1.6.0"
},
"peerDependencies": {
"react": "18.2.0",
"react-dom": "18.2.0"
"react": "18.3.1",
"react-dom": "18.3.1"
},
"externals": {
"react": "react",
Expand Down
8 changes: 4 additions & 4 deletions packages/router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
"@types/react-dom": "^18.2.19",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"tstyche": "1.1.0",
"typescript": "5.4.5"
},
"peerDependencies": {
"react": "18.2.0",
"react-dom": "18.2.0"
"react": "18.3.1",
"react-dom": "18.3.1"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
4 changes: 2 additions & 2 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
"peerDependencies": {
"@redwoodjs/project-config": "7.6.3",
"@redwoodjs/router": "7.6.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"storybook": "7.6.17"
},
"engines": {
Expand Down
Loading

0 comments on commit 13b4ae1

Please sign in to comment.