bug: merge existing and blitz turbo config (#4323)

* do not oveeride existing config * Create calm-deers-sin.md * Update packages/blitz-next/src/index-server.ts
blitz-js · Apr 17, 2024 · 5e61a16 · 5e61a16
1 parent 7755546
commit 5e61a16
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/.changeset/calm-deers-sin.md b/.changeset/calm-deers-sin.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"blitz": patch
+---
+
+bug: merge existing and custom blitz turbo configs
diff --git a/packages/blitz-next/src/index-server.ts b/packages/blitz-next/src/index-server.ts
@@ -306,8 +306,22 @@ export function withBlitz(nextConfig: BlitzConfig = {}): NextConfig {
   })
 
   if (process.env.TURBOPACK) {
-    ;(config as any).experimental = {
-      turbo: installTurboConfig(),
+    const blitzTurboConfig = installTurboConfig()
+    config.experimental = {
+      ...config.experimental,
+      turbo: {
+        loaders: {
+          ...config.experimental?.turbo?.loaders,
+        },
+        resolveAlias: {
+          ...config.experimental?.turbo?.resolveAlias,
+          ...blitzTurboConfig.resolveAlias,
+        },
+        rules: {
+          ...config.experimental?.turbo?.rules,
+          ...blitzTurboConfig.rules,
+        },
+      },
     }
   }