From dec38b832236e1428f4795aad2d41548f6df3728 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 20 Sep 2024 00:17:17 +0200 Subject: [PATCH 1/3] rebase on main --- __fixtures__/test-project-rsc-kitchen-sink/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/__fixtures__/test-project-rsc-kitchen-sink/package.json b/__fixtures__/test-project-rsc-kitchen-sink/package.json index 55f9af76d186..a948311326f5 100644 --- a/__fixtures__/test-project-rsc-kitchen-sink/package.json +++ b/__fixtures__/test-project-rsc-kitchen-sink/package.json @@ -23,6 +23,7 @@ "packageManager": "yarn@4.1.1", "resolutions": { "@apollo/client-react-streaming/superjson": "^1.12.2", - "react-is": "19.0.0-rc-f2df5694-20240916" + "react-is": "19.0.0-rc-f2df5694-20240916", + "rollup": "4.21.3" } } From 9d5f81d1ad19e4fc2de52e862994fd6d909c91e8 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 20 Sep 2024 08:20:28 +0200 Subject: [PATCH 2/3] set rollup resolutions in more test projects --- __fixtures__/fragment-test-project/package.json | 5 ++++- __fixtures__/test-project/package.json | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/__fixtures__/fragment-test-project/package.json b/__fixtures__/fragment-test-project/package.json index f93f198eeb40..4dc19ba220bf 100644 --- a/__fixtures__/fragment-test-project/package.json +++ b/__fixtures__/fragment-test-project/package.json @@ -20,5 +20,8 @@ "prisma": { "seed": "yarn rw exec seed" }, - "packageManager": "yarn@4.1.1" + "packageManager": "yarn@4.1.1", + "resolutions": { + "rollup": "4.21.3" + } } diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json index cb8381d07232..f85fe4d8d896 100644 --- a/__fixtures__/test-project/package.json +++ b/__fixtures__/test-project/package.json @@ -23,6 +23,7 @@ "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" + "react-is": "19.0.0-rc-f2df5694-20240916", + "rollup": "4.21.3" } } From a9a6f816607255dc4945f01282d5ac3594a3b44d Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 20 Sep 2024 08:29:46 +0200 Subject: [PATCH 3/3] Set resolution in templates --- packages/create-redwood-app/templates/js/package.json | 3 ++- packages/create-redwood-app/templates/ts/package.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json index cb8381d07232..f85fe4d8d896 100644 --- a/packages/create-redwood-app/templates/js/package.json +++ b/packages/create-redwood-app/templates/js/package.json @@ -23,6 +23,7 @@ "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" + "react-is": "19.0.0-rc-f2df5694-20240916", + "rollup": "4.21.3" } } diff --git a/packages/create-redwood-app/templates/ts/package.json b/packages/create-redwood-app/templates/ts/package.json index cb8381d07232..f85fe4d8d896 100644 --- a/packages/create-redwood-app/templates/ts/package.json +++ b/packages/create-redwood-app/templates/ts/package.json @@ -23,6 +23,7 @@ "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" + "react-is": "19.0.0-rc-f2df5694-20240916", + "rollup": "4.21.3" } }