Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert yarn 4.6.0 upgrade #11907

Merged
merged 2 commits into from
Jan 17, 2025
+22 −22
Merged

Revert yarn 4.6.0 upgrade #11907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff630fb
Revert "chore(docs): Update yarn.lock (#11891)"
Tobbe Jan 17, 2025
e931ebe
Revert "[Chore] Update yarn to v4.6.0 (#11874)"
Tobbe Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/check_changesets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"@actions/exec": "1.1.1",
"@actions/github": "6.0.0"
},
"packageManager": "yarn@4.6.0"
"packageManager": "yarn@4.4.0"
}
2 changes: 1 addition & 1 deletion .github/actions/check_create_redwood_app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"@actions/core": "1.11.1",
"@actions/exec": "1.1.1"
},
"packageManager": "yarn@4.6.0"
"packageManager": "yarn@4.4.0"
}
2 changes: 1 addition & 1 deletion .github/actions/detect-changes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"@actions/core": "1.11.1",
"@actions/exec": "1.1.1"
},
"packageManager": "yarn@4.6.0"
"packageManager": "yarn@4.4.0"
}
2 changes: 1 addition & 1 deletion __fixtures__/fragment-test-project/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
"prisma": {
"seed": "yarn rw exec seed"
},
"packageManager": "yarn@4.6.0"
"packageManager": "yarn@4.1.1"
}
2 changes: 1 addition & 1 deletion __fixtures__/rsc-caching/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"prisma": {
"seed": "yarn rw exec seed"
},
"packageManager": "yarn@4.6.0",
"packageManager": "yarn@4.1.1",
"resolutions": {
"@apollo/client-react-streaming/superjson": "^1.12.2",
"react-is": "19.0.0-rc-f2df5694-20240916"
Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/test-project-rsa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"prisma": {
"seed": "yarn rw exec seed"
},
"packageManager": "yarn@4.6.0",
"packageManager": "yarn@4.1.1",
"resolutions": {
"@apollo/client-react-streaming/superjson": "^1.12.2",
"react-is": "19.0.0-rc-f2df5694-20240916"
Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/test-project-rsc-kitchen-sink/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"prisma": {
"seed": "yarn rw exec seed"
},
"packageManager": "yarn@4.6.0",
"packageManager": "yarn@4.1.1",
"resolutions": {
"@apollo/client-react-streaming/superjson": "^1.12.2",
"react-is": "19.0.0-rc-f2df5694-20240916"
Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/test-project/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"prisma": {
"seed": "yarn rw exec seed"
},
"packageManager": "yarn@4.6.0",
"packageManager": "yarn@4.4.0",
"resolutions": {
"@storybook/react-dom-shim@npm:7.6.17": "https://verdaccio.tobbe.dev/@storybook/react-dom-shim/-/react-dom-shim-8.0.8.tgz",
"react-is": "19.0.0-rc-f2df5694-20240916"
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@
"@types/react": "^18.2.55",
"typescript": "5.6.2"
},
"packageManager": "yarn@4.6.0"
"packageManager": "yarn@4.4.0"
}
4 changes: 2 additions & 2 deletions docs/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13611,11 +13611,11 @@ __metadata:

"typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>":
version: 5.6.2
resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>::version=5.6.2&hash=8c6c40"
resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>::version=5.6.2&hash=74658d"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10c0/94eb47e130d3edd964b76da85975601dcb3604b0c848a36f63ac448d0104e93819d94c8bdf6b07c00120f2ce9c05256b8b6092d23cf5cf1c6fa911159e4d572f
checksum: 10c0/e6c1662e4852e22fe4bbdca471dca3e3edc74f6f1df043135c44a18a7902037023ccb0abdfb754595ca9028df8920f2f8492c00fc3cbb4309079aae8b7de71cd
languageName: node
linkType: hard

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@
"yargs": "17.7.2",
"zx": "8.1.9"
},
"packageManager": "yarn@4.6.0",
"packageManager": "yarn@4.4.0",
"npmClient": "yarn"
}
4 changes: 2 additions & 2 deletions packages/cli/src/commands/upgrade.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ const dedupeDeps = async (task, { verbose }) => {
await execa('yarn', ['dedupe'], baseExecaArgsForDedupe)
} else {
// Redwood projects should not be using yarn 1.x as we specify a version of yarn in the package.json
// with "packageManager": "yarn@4.6.0" or similar.
// with "packageManager": "yarn@4.1.1" or similar.
// Although we could (and previous did) automatically run `npx yarn-deduplicate` here, that would require
// the user to have `npx` installed, which is not guaranteed and we do not wish to enforce that.
task.skip(
Expand All @@ -542,7 +542,7 @@ const dedupeDeps = async (task, { verbose }) => {
} catch (e) {
console.log(c.error(e.message))
throw new Error(
'Could not finish de-duplication. For yarn 1.x, please run `npx yarn-deduplicate`, or for yarn >= 3 run `yarn dedupe` before continuing',
'Could not finish de-duplication. For yarn 1.x, please run `npx yarn-deduplicate`, or for yarn 3 run `yarn dedupe` before continuing',
)
}
await yarnInstall({ verbose })
Expand Down
2 changes: 1 addition & 1 deletion packages/create-redwood-app/templates/js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"prisma": {
"seed": "yarn rw exec seed"
},
"packageManager": "yarn@4.6.0",
"packageManager": "yarn@4.4.0",
"resolutions": {
"@storybook/react-dom-shim@npm:7.6.17": "https://verdaccio.tobbe.dev/@storybook/react-dom-shim/-/react-dom-shim-8.0.8.tgz",
"react-is": "19.0.0-rc-f2df5694-20240916"
Expand Down
2 changes: 1 addition & 1 deletion packages/create-redwood-app/templates/ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"prisma": {
"seed": "yarn rw exec seed"
},
"packageManager": "yarn@4.6.0",
"packageManager": "yarn@4.4.0",
"resolutions": {
"@storybook/react-dom-shim@npm:7.6.17": "https://verdaccio.tobbe.dev/@storybook/react-dom-shim/-/react-dom-shim-8.0.8.tgz",
"react-is": "19.0.0-rc-f2df5694-20240916"
Expand Down
4 changes: 2 additions & 2 deletions packages/create-redwood-rsc-app/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4115,11 +4115,11 @@ __metadata:

"typescript@patch:typescript@npm%3A^5.5.3#optional!builtin<compat/typescript>":
version: 5.6.2
resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>::version=5.6.2&hash=8c6c40"
resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>::version=5.6.2&hash=74658d"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10c0/94eb47e130d3edd964b76da85975601dcb3604b0c848a36f63ac448d0104e93819d94c8bdf6b07c00120f2ce9c05256b8b6092d23cf5cf1c6fa911159e4d572f
checksum: 10c0/e6c1662e4852e22fe4bbdca471dca3e3edc74f6f1df043135c44a18a7902037023ccb0abdfb754595ca9028df8920f2f8492c00fc3cbb4309079aae8b7de71cd
languageName: node
linkType: hard

Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29295,21 +29295,21 @@ __metadata:

"typescript@patch:typescript@npm%3A5.6.1-rc#optional!builtin<compat/typescript>":
version: 5.6.1-rc
resolution: "typescript@patch:typescript@npm%3A5.6.1-rc#optional!builtin<compat/typescript>::version=5.6.1-rc&hash=8c6c40"
resolution: "typescript@patch:typescript@npm%3A5.6.1-rc#optional!builtin<compat/typescript>::version=5.6.1-rc&hash=74658d"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10c0/9c6f8d864bc2efc964d1bfc94bf2e14f35cd2ad3df5e92d5304c8759674ba77ae927078a5fc06a527c087953615465dd5decc2d4d28ca8e13c11f9b29e068d93
checksum: 10c0/7849a6f82731f33d05dc9401252eeed78cec227aa9b23c316638c12c15ff7ec0903d62aa8718ea0ab5aad2e155a74edcd0c8053b8fdf8020bd1652720d89db7c
languageName: node
linkType: hard

"typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin<compat/typescript>":
version: 5.6.2
resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>::version=5.6.2&hash=8c6c40"
resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>::version=5.6.2&hash=74658d"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10c0/94eb47e130d3edd964b76da85975601dcb3604b0c848a36f63ac448d0104e93819d94c8bdf6b07c00120f2ce9c05256b8b6092d23cf5cf1c6fa911159e4d572f
checksum: 10c0/e6c1662e4852e22fe4bbdca471dca3e3edc74f6f1df043135c44a18a7902037023ccb0abdfb754595ca9028df8920f2f8492c00fc3cbb4309079aae8b7de71cd
languageName: node
linkType: hard

Expand Down
Loading