feat: make sure to add turbopack for next.js

BoundaryML · Feb 5, 2025 · e4e9830 · e4e9830
1 parent fe161f0
commit e4e9830
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 156 deletions.
diff --git a/integ-tests/react/package.json b/integ-tests/react/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev",
+    "dev": "next dev --turbo",
     "start": "next start",
     "lint": "next lint",
     "test": "jest",

diff --git a/typescript/nextjs-plugin/package.json b/typescript/nextjs-plugin/package.json
@@ -21,6 +21,7 @@
 		"access": "public"
 	},
 	"scripts": {
+		"dev": "tsc --watch",
 		"build": "tsc",
 		"format": "biome format --write .",
 		"lint": "biome check .",

diff --git a/typescript/nextjs-plugin/src/index.ts b/typescript/nextjs-plugin/src/index.ts
@@ -46,26 +46,36 @@ export function withBaml(bamlConfig: BamlNextConfig = {}) {
     // Default to new config (>= 14) if version can't be determined
     const majorVersion = nextVersion ? parseInt(nextVersion.split('.')[0], 10) : 14
     const useNewConfig = majorVersion >= 14
-    const turboConfig = {
-      ...nextConfig.experimental?.turbo,
-      rules: { '*.node': { loaders: ['nextjs-node-loader'], as: '*.js' } },
-    }
+    const isTurbo = Boolean(process.env.TURBOPACK === '1')
+
+    const turboConfig = isTurbo
+      ? {
+          ...(nextConfig.experimental?.turbo || {}),
+          rules: {
+            ...(nextConfig.experimental?.turbo?.rules || {}),
+            '*.node': { loaders: ['nextjs-node-loader'], as: '*.js' },
+          },
+        }
+      : undefined
 
     return {
       ...nextConfig,
       ...(useNewConfig
         ? {
             serverExternalPackages: [...((nextConfig as any)?.serverExternalPackages || []), '@boundaryml/baml'],
-            turbo: turboConfig,
+            experimental: {
+              ...(nextConfig.experimental || {}),
+              ...(isTurbo ? { turbo: turboConfig } : {}),
+            },
           }
         : {
             experimental: {
-              ...nextConfig.experimental,
+              ...(nextConfig.experimental || {}),
               serverComponentsExternalPackages: [
                 ...((nextConfig.experimental as any)?.serverComponentsExternalPackages || []),
                 '@boundaryml/baml',
               ],
-              turbo: turboConfig,
+              ...(isTurbo ? { turbo: turboConfig } : {}),
             },
           }),
       webpack: (config: Configuration, context: any) => {
@@ -81,19 +91,22 @@ export function withBaml(bamlConfig: BamlNextConfig = {}) {
           config.externals = [...(Array.isArray(config.externals) ? config.externals : []), '@boundaryml/baml']
         }
 
-        config.module = config.module || {}
-        config.module.rules = config.module.rules || []
-        config.module.rules.push({
-          test: /\.node$/,
-          use: [
-            {
-              loader: 'nextjs-node-loader',
-              options: {
-                outputPath: config.output?.path,
+        // Only add webpack rules if not using Turbo
+        if (!isTurbo) {
+          config.module = config.module || {}
+          config.module.rules = config.module.rules || []
+          config.module.rules.push({
+            test: /\.node$/,
+            use: [
+              {
+                loader: 'nextjs-node-loader',
+                options: {
+                  outputPath: config.output?.path,
+                },
               },
-            },
-          ],
-        })
+            ],
+          })
+        }
 
         return config
       },