fixup! pass run_worker_first via globalThis

Author: vicb

packages/cloudflare/src/api/overrides/asset-resolver/index.ts

@@ -18,7 +18,7 @@ const resolver: AssetResolver = {
 	async maybeGetAssetResult(event: InternalEvent) {
 		const { ASSETS } = getCloudflareContext().env;
 
-		if (!ASSETS || !isUserWorkerFirst(__CF_ASSETS_RUN_WORKER_FIRST__, event.rawPath)) {
+		if (!ASSETS || !isUserWorkerFirst(globalThis.__ASSETS_RUN_WORKER_FIRST__, event.rawPath)) {
 			// Only handle assets when the user worker runs first for the path
 			return undefined;
 		}
@@ -94,11 +94,3 @@ export function isUserWorkerFirst(runWorkerFirst: boolean | string[] | undefined
 }
 
 export default resolver;
-
-/* eslint-disable no-var */
-declare global {
-	// The configuration of `run_worker_first` for the assets.
-	// Replaced at built time.
-	var __CF_ASSETS_RUN_WORKER_FIRST__: boolean | string[] | undefined;
-}
-/* eslint-enable no-var */

packages/cloudflare/src/cli/build/build.ts

@@ -66,7 +66,7 @@ export async function build(
 	compileEnvFiles(options);
 
 	// Compile workerd init
-	compileInit(options);
+	compileInit(options, wranglerConfig);
 
 	// Compile image helpers
 	compileImages(options);
@@ -88,7 +88,7 @@ export async function build(
 
 	await compileDurableObjects(options);
 
-	await bundleServer(options, wranglerConfig);
+	await bundleServer(options);
 
 	if (!projectOpts.skipWranglerConfigCheck) {
 		await createWranglerConfigIfNotExistent(projectOpts);

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

@@ -6,7 +6,6 @@ import { fileURLToPath } from "node:url";
 import { type BuildOptions, getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { ContentUpdater } from "@opennextjs/aws/plugins/content-updater.js";
 import { build, type Plugin } from "esbuild";
-import type { Unstable_Config } from "wrangler";
 
 import { getOpenNextConfig } from "../../api/config.js";
 import { patchVercelOgLibrary } from "./patches/ast/patch-vercel-og-library.js";
@@ -45,7 +44,7 @@ const optionalDependencies = [
 /**
  * Bundle the Open Next server.
  */
-export async function bundleServer(buildOpts: BuildOptions, wranglerConfig: Unstable_Config): Promise<void> {
+export async function bundleServer(buildOpts: BuildOptions): Promise<void> {
 	copyPackageCliFiles(packageDistDir, buildOpts);
 
 	const { appPath, outputDir, monorepoRoot, debug } = buildOpts;
@@ -147,8 +146,6 @@ export async function bundleServer(buildOpts: BuildOptions, wranglerConfig: Unst
 			"process.env.TURBOPACK": "false",
 			// This define should be safe to use for Next 14.2+, earlier versions (13.5 and less) will cause trouble
 			"process.env.__NEXT_EXPERIMENTAL_REACT": `${needsExperimentalReact(nextConfig)}`,
-			// Pass `assets.run_worker_first` to the asset resolver
-			__CF_ASSETS_RUN_WORKER_FIRST__: JSON.stringify(wranglerConfig.assets?.run_worker_first ?? false),
 		},
 		banner: {
 			// We need to import them here, assigning them to `globalThis` does not work because node:timers use `globalThis` and thus create an infinite loop

packages/cloudflare/src/cli/build/open-next/compile-init.ts

@@ -4,11 +4,12 @@ import { fileURLToPath } from "node:url";
 import { loadConfig } from "@opennextjs/aws/adapters/config/util.js";
 import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
 import { build } from "esbuild";
+import type { Unstable_Config } from "wrangler";
 
 /**
  * Compiles the initialization code for the workerd runtime
  */
-export async function compileInit(options: BuildOptions) {
+export async function compileInit(options: BuildOptions, wranglerConfig: Unstable_Config) {
 	const currentDir = path.join(path.dirname(fileURLToPath(import.meta.url)));
 	const templatesDir = path.join(currentDir, "../../templates");
 	const initPath = path.join(templatesDir, "init.js");
@@ -27,6 +28,7 @@ export async function compileInit(options: BuildOptions) {
 		define: {
 			__BUILD_TIMESTAMP_MS__: JSON.stringify(Date.now()),
 			__NEXT_BASE_PATH__: JSON.stringify(basePath),
+			__ASSETS_RUN_WORKER_FIRST__: JSON.stringify(wranglerConfig.assets?.run_worker_first ?? false),
 		},
 	});
 }

packages/cloudflare/src/cli/templates/init.ts

@@ -94,8 +94,9 @@ function initRuntime() {
 
 	Object.assign(globalThis, {
 		Request: CustomRequest,
-		__BUILD_TIMESTAMP_MS__: __BUILD_TIMESTAMP_MS__,
-		__NEXT_BASE_PATH__: __NEXT_BASE_PATH__,
+		__BUILD_TIMESTAMP_MS__,
+		__NEXT_BASE_PATH__,
+		__ASSETS_RUN_WORKER_FIRST__,
 		// The external middleware will use the convertTo function of the `edge` converter
 		// by default it will try to fetch the request, but since we are running everything in the same worker
 		// we need to use the request as is.
@@ -146,5 +147,7 @@ declare global {
 	var __BUILD_TIMESTAMP_MS__: number;
 	// Next basePath
 	var __NEXT_BASE_PATH__: string;
+	// Value of `run_worker_first` for the asset binding
+	var __ASSETS_RUN_WORKER_FIRST__: boolean | string[] | undefined;
 }
 /* eslint-enable no-var */