From 1fde49fae146c0f561aa700af4f1875e7ace08ab Mon Sep 17 00:00:00 2001
From: Tobbe Lundberg <tobbe@tlundberg.com>
Date: Wed, 6 Dec 2023 11:05:58 +0100
Subject: [PATCH 1/3] RSC: No need to patch Vite anymore, the patch has been
 upstreamed

---
 .../commands/experimental/setupRscHandler.js  | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/packages/cli/src/commands/experimental/setupRscHandler.js b/packages/cli/src/commands/experimental/setupRscHandler.js
index 8ecf0e1b3ffe..85c43db987b9 100644
--- a/packages/cli/src/commands/experimental/setupRscHandler.js
+++ b/packages/cli/src/commands/experimental/setupRscHandler.js
@@ -350,46 +350,6 @@ export const handler = async ({ force, verbose }) => {
           })
         },
       },
-      {
-        title: 'Patch vite',
-        task: async () => {
-          const vitePatchTemplate = fs.readFileSync(
-            path.resolve(
-              __dirname,
-              'templates',
-              'rsc',
-              'vite-npm-4.4.9-e845c1bbf8.patch.template'
-            ),
-            'utf-8'
-          )
-
-          const yarnPatchDir = path.join(rwPaths.base, '.yarn', 'patches')
-          const vitePatchPath = path.join(
-            yarnPatchDir,
-            'vite-npm-4.4.9-e845c1bbf8.patch'
-          )
-          writeFile(vitePatchPath, vitePatchTemplate, {
-            overwriteExisting: force,
-          })
-
-          const packageJsonPath = path.join(rwPaths.base, 'package.json')
-          const packageJson = JSON.parse(
-            fs.readFileSync(packageJsonPath, 'utf-8')
-          )
-          packageJson.resolutions = packageJson.resolutions || {}
-          packageJson.resolutions['vite@4.4.9'] =
-            'patch:vite@npm%3A4.4.9#./.yarn/patches/vite-npm-4.4.9-e845c1bbf8.patch'
-          writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2), {
-            overwriteExisting: true,
-          })
-
-          await execa('yarn install', {
-            stdio: 'ignore',
-            shell: true,
-            cwd: rwPaths.base,
-          })
-        },
-      },
       {
         task: () => {
           printTaskEpilogue(command, description, EXPERIMENTAL_TOPIC_ID)

From a6a8625e9eb92ff857807a5f1bd8f65f9ce1f82e Mon Sep 17 00:00:00 2001
From: Tobbe Lundberg <tobbe@tlundberg.com>
Date: Wed, 6 Dec 2023 11:07:37 +0100
Subject: [PATCH 2/3] Remove patch file

---
 .../vite-npm-4.4.9-e845c1bbf8.patch.template  | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 packages/cli/src/commands/experimental/templates/rsc/vite-npm-4.4.9-e845c1bbf8.patch.template

diff --git a/packages/cli/src/commands/experimental/templates/rsc/vite-npm-4.4.9-e845c1bbf8.patch.template b/packages/cli/src/commands/experimental/templates/rsc/vite-npm-4.4.9-e845c1bbf8.patch.template
deleted file mode 100644
index eb67d7906284..000000000000
--- a/packages/cli/src/commands/experimental/templates/rsc/vite-npm-4.4.9-e845c1bbf8.patch.template
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/dist/node/chunks/dep-df561101.js b/dist/node/chunks/dep-df561101.js
-index 1bc8674177fe73120171b22436e6104713c5d764..f0fee7b385868cb01c6d47b80d7f64a7368c0412 100644
---- a/dist/node/chunks/dep-df561101.js
-+++ b/dist/node/chunks/dep-df561101.js
-@@ -55890,12 +55890,12 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
-     };
-     urlStack = urlStack.concat(url);
-     const isCircular = (url) => urlStack.includes(url);
--    const { isProduction, resolve: { dedupe, preserveSymlinks }, root, } = server.config;
-+    const { isProduction, resolve: { dedupe, preserveSymlinks, conditions }, root, } = server.config;
-     const resolveOptions = {
-         mainFields: ['main'],
-         browserField: true,
-         conditions: [],
--        overrideConditions: ['production', 'development'],
-+        overrideConditions: [...conditions, 'production', 'development'],
-         extensions: ['.js', '.cjs', '.json'],
-         dedupe,
-         preserveSymlinks,

From 9675c864777025cc5a7c72ee3fab7d2e36925743 Mon Sep 17 00:00:00 2001
From: Tobbe Lundberg <tobbe@tlundberg.com>
Date: Wed, 6 Dec 2023 11:19:48 +0100
Subject: [PATCH 3/3] Get rid of unused import

---
 packages/cli/src/commands/experimental/setupRscHandler.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/cli/src/commands/experimental/setupRscHandler.js b/packages/cli/src/commands/experimental/setupRscHandler.js
index 85c43db987b9..bea2f5f431c6 100644
--- a/packages/cli/src/commands/experimental/setupRscHandler.js
+++ b/packages/cli/src/commands/experimental/setupRscHandler.js
@@ -1,7 +1,6 @@
 import fs from 'fs'
 import path from 'path'
 
-import execa from 'execa'
 import { Listr } from 'listr2'
 
 import { prettify } from '@redwoodjs/cli-helpers'