fix: use the correct runtime (i.e. webpack or turbopack) (#1079)

Author: vicb

.changeset/shy-brooms-trade.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+fix: use the correct runtime (i.e. webpack or turbopack)

examples/playground16/e2e/playwright.config.ts

@@ -1,3 +1,3 @@
 import { configurePlaywright } from "../../common/config-e2e";
 
-export default configurePlaywright("playground16");
+export default configurePlaywright("playground16", { useTurbopack: false });

examples/playground16/e2e/playwright.turbopack.config.ts

@@ -0,0 +1,3 @@
+import { configurePlaywright } from "../../common/config-e2e";
+
+export default configurePlaywright("playground16", { useTurbopack: true });

examples/playground16/open-next.turbopack.config.ts

@@ -0,0 +1,7 @@
+import config from "./open-next.config.js";
+
+export default {
+	...config,
+	// Override the build command to use Turbopack
+	buildCommand: "next build --turbopack",
+};

examples/playground16/package.json

@@ -12,6 +12,8 @@
 		"preview": "pnpm build:worker && pnpm preview:worker",
 		"e2e": "playwright test -c e2e/playwright.config.ts",
 		"e2e:dev": "playwright test -c e2e/playwright.dev.config.ts",
+		"build:worker-turbopack": "pnpm build:worker --openNextConfigPath open-next.turbopack.config.ts",
+		"e2e-turbopack": "playwright test -c e2e/playwright.turbopack.config.ts",
 		"cf-typegen": "wrangler types --env-interface CloudflareEnv"
 	},
 	"dependencies": {

packages/cloudflare/package.json

@@ -54,7 +54,7 @@
 	"dependencies": {
 		"@ast-grep/napi": "0.40.0",
 		"@dotenvx/dotenvx": "catalog:",
-		"@opennextjs/aws": "3.9.10",
+		"@opennextjs/aws": "3.9.11",
 		"cloudflare": "^4.4.1",
 		"enquirer": "^2.4.1",
 		"glob": "catalog:",

packages/cloudflare/src/cli/build/bundle-server.ts

@@ -4,6 +4,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 
 import { type BuildOptions, getPackagePath } from "@opennextjs/aws/build/helper.js";
+import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { ContentUpdater } from "@opennextjs/aws/plugins/content-updater.js";
 import { build, type Plugin } from "esbuild";
 
@@ -55,7 +56,7 @@ export async function bundleServer(buildOpts: BuildOptions, projectOpts: Project
 	const serverFiles = path.join(dotNextPath, "required-server-files.json");
 	const nextConfig = JSON.parse(fs.readFileSync(serverFiles, "utf-8")).config;
 
-	const useTurbopack = fs.existsSync(path.join(dotNextPath, "server/chunks/[turbopack]_runtime.js"));
+	const useTurbopack = buildHelper.getBundlerRuntime(buildOpts) === "turbopack";
 
 	console.log(`\x1b[35m⚙️ Bundling the OpenNext server...\n\x1b[0m`);
 

packages/cloudflare/src/cli/build/open-next/createServerBundle.ts

@@ -205,7 +205,7 @@ async function generateBundle(
 		awsPatches.patchUnstableCacheForISR,
 		awsPatches.patchUseCacheForISR,
 		awsPatches.patchNextServer,
-		awsPatches.patchEnvVars,
+		awsPatches.getEnvVarsPatch(options),
 		awsPatches.patchBackgroundRevalidation,
 		awsPatches.patchNodeEnvironment,
 		// Cloudflare specific patches