From 063224cf717a744c531f18f85a3b6f5b6c9de70c Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Mon, 23 Sep 2024 07:58:27 +0200 Subject: [PATCH] Revert "fix(rsc): Set a yarn resolution for rollup 4.21.3 (#11592)" This reverts commit 3fc9a4565253156e42c761a257e4f3b52fd0cb34. --- __fixtures__/fragment-test-project/package.json | 5 +---- __fixtures__/test-project-rsc-kitchen-sink/package.json | 3 +-- __fixtures__/test-project/package.json | 3 +-- packages/create-redwood-app/templates/js/package.json | 3 +-- packages/create-redwood-app/templates/ts/package.json | 3 +-- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/__fixtures__/fragment-test-project/package.json b/__fixtures__/fragment-test-project/package.json index 4dc19ba220bf..f93f198eeb40 100644 --- a/__fixtures__/fragment-test-project/package.json +++ b/__fixtures__/fragment-test-project/package.json @@ -20,8 +20,5 @@ "prisma": { "seed": "yarn rw exec seed" }, - "packageManager": "yarn@4.1.1", - "resolutions": { - "rollup": "4.21.3" - } + "packageManager": "yarn@4.1.1" } diff --git a/__fixtures__/test-project-rsc-kitchen-sink/package.json b/__fixtures__/test-project-rsc-kitchen-sink/package.json index a948311326f5..55f9af76d186 100644 --- a/__fixtures__/test-project-rsc-kitchen-sink/package.json +++ b/__fixtures__/test-project-rsc-kitchen-sink/package.json @@ -23,7 +23,6 @@ "packageManager": "yarn@4.1.1", "resolutions": { "@apollo/client-react-streaming/superjson": "^1.12.2", - "react-is": "19.0.0-rc-f2df5694-20240916", - "rollup": "4.21.3" + "react-is": "19.0.0-rc-f2df5694-20240916" } } diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json index f85fe4d8d896..cb8381d07232 100644 --- a/__fixtures__/test-project/package.json +++ b/__fixtures__/test-project/package.json @@ -23,7 +23,6 @@ "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", - "rollup": "4.21.3" + "react-is": "19.0.0-rc-f2df5694-20240916" } } diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json index f85fe4d8d896..cb8381d07232 100644 --- a/packages/create-redwood-app/templates/js/package.json +++ b/packages/create-redwood-app/templates/js/package.json @@ -23,7 +23,6 @@ "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", - "rollup": "4.21.3" + "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 f85fe4d8d896..cb8381d07232 100644 --- a/packages/create-redwood-app/templates/ts/package.json +++ b/packages/create-redwood-app/templates/ts/package.json @@ -23,7 +23,6 @@ "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", - "rollup": "4.21.3" + "react-is": "19.0.0-rc-f2df5694-20240916" } }