From e931ebe94de7956e65946a02ce7be2a92e61b75c Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 17 Jan 2025 12:24:58 +0100 Subject: [PATCH] Revert "[Chore] Update yarn to v4.6.0 (#11874)" This reverts commit dcfb07738bb5760bb363cbb8da6ae9477d9c439d. --- .github/actions/check_changesets/package.json | 2 +- .github/actions/check_create_redwood_app/package.json | 2 +- .github/actions/detect-changes/package.json | 2 +- __fixtures__/fragment-test-project/package.json | 2 +- __fixtures__/rsc-caching/package.json | 2 +- __fixtures__/test-project-rsa/package.json | 2 +- __fixtures__/test-project-rsc-kitchen-sink/package.json | 2 +- __fixtures__/test-project/package.json | 2 +- docs/package.json | 2 +- package.json | 2 +- packages/cli/src/commands/upgrade.js | 4 ++-- packages/create-redwood-app/templates/js/package.json | 2 +- packages/create-redwood-app/templates/ts/package.json | 2 +- packages/create-redwood-rsc-app/yarn.lock | 4 ++-- yarn.lock | 8 ++++---- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/actions/check_changesets/package.json b/.github/actions/check_changesets/package.json index ca7e4db6cbeb..f5bc5aefadd9 100644 --- a/.github/actions/check_changesets/package.json +++ b/.github/actions/check_changesets/package.json @@ -6,5 +6,5 @@ "@actions/exec": "1.1.1", "@actions/github": "6.0.0" }, - "packageManager": "yarn@4.6.0" + "packageManager": "yarn@4.4.0" } diff --git a/.github/actions/check_create_redwood_app/package.json b/.github/actions/check_create_redwood_app/package.json index 16ac16253126..8af9fd0e890e 100644 --- a/.github/actions/check_create_redwood_app/package.json +++ b/.github/actions/check_create_redwood_app/package.json @@ -5,5 +5,5 @@ "@actions/core": "1.11.1", "@actions/exec": "1.1.1" }, - "packageManager": "yarn@4.6.0" + "packageManager": "yarn@4.4.0" } diff --git a/.github/actions/detect-changes/package.json b/.github/actions/detect-changes/package.json index e93b9776bb46..123df51ec572 100644 --- a/.github/actions/detect-changes/package.json +++ b/.github/actions/detect-changes/package.json @@ -5,5 +5,5 @@ "@actions/core": "1.11.1", "@actions/exec": "1.1.1" }, - "packageManager": "yarn@4.6.0" + "packageManager": "yarn@4.4.0" } diff --git a/__fixtures__/fragment-test-project/package.json b/__fixtures__/fragment-test-project/package.json index 09d2ecdef6a3..f93f198eeb40 100644 --- a/__fixtures__/fragment-test-project/package.json +++ b/__fixtures__/fragment-test-project/package.json @@ -20,5 +20,5 @@ "prisma": { "seed": "yarn rw exec seed" }, - "packageManager": "yarn@4.6.0" + "packageManager": "yarn@4.1.1" } diff --git a/__fixtures__/rsc-caching/package.json b/__fixtures__/rsc-caching/package.json index 71bed059c50c..f0f7a36ccc3a 100644 --- a/__fixtures__/rsc-caching/package.json +++ b/__fixtures__/rsc-caching/package.json @@ -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" diff --git a/__fixtures__/test-project-rsa/package.json b/__fixtures__/test-project-rsa/package.json index 4544983dee4b..f592e1193089 100644 --- a/__fixtures__/test-project-rsa/package.json +++ b/__fixtures__/test-project-rsa/package.json @@ -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" diff --git a/__fixtures__/test-project-rsc-kitchen-sink/package.json b/__fixtures__/test-project-rsc-kitchen-sink/package.json index 8c77c1b3b330..55f9af76d186 100644 --- a/__fixtures__/test-project-rsc-kitchen-sink/package.json +++ b/__fixtures__/test-project-rsc-kitchen-sink/package.json @@ -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" diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json index dacba0e60441..cb8381d07232 100644 --- a/__fixtures__/test-project/package.json +++ b/__fixtures__/test-project/package.json @@ -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" diff --git a/docs/package.json b/docs/package.json index c394a34182b4..d148efaac280 100644 --- a/docs/package.json +++ b/docs/package.json @@ -41,5 +41,5 @@ "@types/react": "^18.2.55", "typescript": "5.6.2" }, - "packageManager": "yarn@4.6.0" + "packageManager": "yarn@4.4.0" } diff --git a/package.json b/package.json index dd608de1b634..5793268de335 100644 --- a/package.json +++ b/package.json @@ -134,6 +134,6 @@ "yargs": "17.7.2", "zx": "8.1.9" }, - "packageManager": "yarn@4.6.0", + "packageManager": "yarn@4.4.0", "npmClient": "yarn" } diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js index 94853b79e36e..01bdda293c26 100644 --- a/packages/cli/src/commands/upgrade.js +++ b/packages/cli/src/commands/upgrade.js @@ -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( @@ -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 }) diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json index dacba0e60441..cb8381d07232 100644 --- a/packages/create-redwood-app/templates/js/package.json +++ b/packages/create-redwood-app/templates/js/package.json @@ -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" diff --git a/packages/create-redwood-app/templates/ts/package.json b/packages/create-redwood-app/templates/ts/package.json index dacba0e60441..cb8381d07232 100644 --- a/packages/create-redwood-app/templates/ts/package.json +++ b/packages/create-redwood-app/templates/ts/package.json @@ -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" diff --git a/packages/create-redwood-rsc-app/yarn.lock b/packages/create-redwood-rsc-app/yarn.lock index 658357200991..50c417b889e2 100644 --- a/packages/create-redwood-rsc-app/yarn.lock +++ b/packages/create-redwood-rsc-app/yarn.lock @@ -4115,11 +4115,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.5.3#optional!builtin": version: 5.6.2 - resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin::version=5.6.2&hash=8c6c40" + resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin::version=5.6.2&hash=74658d" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/94eb47e130d3edd964b76da85975601dcb3604b0c848a36f63ac448d0104e93819d94c8bdf6b07c00120f2ce9c05256b8b6092d23cf5cf1c6fa911159e4d572f + checksum: 10c0/e6c1662e4852e22fe4bbdca471dca3e3edc74f6f1df043135c44a18a7902037023ccb0abdfb754595ca9028df8920f2f8492c00fc3cbb4309079aae8b7de71cd languageName: node linkType: hard diff --git a/yarn.lock b/yarn.lock index a95d1921dfb2..ac74c032102c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -29295,21 +29295,21 @@ __metadata: "typescript@patch:typescript@npm%3A5.6.1-rc#optional!builtin": version: 5.6.1-rc - resolution: "typescript@patch:typescript@npm%3A5.6.1-rc#optional!builtin::version=5.6.1-rc&hash=8c6c40" + resolution: "typescript@patch:typescript@npm%3A5.6.1-rc#optional!builtin::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, typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin": version: 5.6.2 - resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin::version=5.6.2&hash=8c6c40" + resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin::version=5.6.2&hash=74658d" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/94eb47e130d3edd964b76da85975601dcb3604b0c848a36f63ac448d0104e93819d94c8bdf6b07c00120f2ce9c05256b8b6092d23cf5cf1c6fa911159e4d572f + checksum: 10c0/e6c1662e4852e22fe4bbdca471dca3e3edc74f6f1df043135c44a18a7902037023ccb0abdfb754595ca9028df8920f2f8492c00fc3cbb4309079aae8b7de71cd languageName: node linkType: hard