From 1939595a2db779be62869387ac15d27227229f86 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 10 Oct 2024 11:42:03 +0200
Subject: [PATCH] cli: refine vite Node.js polyfills

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/cli/src/lib/bundler/server.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index 34510f997f..bf67db5364 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -134,7 +134,6 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
     const { createHtmlPlugin: viteHtml } = require('vite-plugin-html');
     viteServer = await vite.createServer({
       define: {
-        global: 'window',
         'process.argv': JSON.stringify(process.argv),
         'process.env.APP_CONFIG': JSON.stringify(cliConfig.frontendAppConfigs),
         // This allows for conditional imports of react-dom/client, since there's no way
@@ -143,7 +142,23 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
       },
       plugins: [
         viteReact(),
-        viteNodePolyfills(),
+        viteNodePolyfills({
+          include: [
+            'buffer',
+            'events',
+            'os',
+            'process',
+            'querystring',
+            'stream',
+            'url',
+            'util',
+          ],
+          globals: {
+            global: true,
+            Buffer: true,
+            process: true,
+          },
+        }),
         viteYaml(),
         viteHtml({
           entry: paths.targetEntry,