fix: wrangler config not passed to cache population (#814)

Author: james-elicx

.changeset/icy-ends-roll.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+fix: wrangler config not passed to cache population

examples/overrides/d1-tag-next/package.json

@@ -7,8 +7,8 @@
 		"build": "next build",
 		"start": "next start",
 		"lint": "next lint",
-		"build:worker": "pnpm opennextjs-cloudflare build",
-		"preview:worker": "pnpm opennextjs-cloudflare preview",
+		"build:worker": "pnpm opennextjs-cloudflare build --skipWranglerConfigCheck",
+		"preview:worker": "pnpm opennextjs-cloudflare preview --config wrangler.e2e.jsonc",
 		"preview": "pnpm build:worker && pnpm preview:worker",
 		"e2e": "playwright test -c e2e/playwright.config.ts"
 	},

…les/overrides/d1-tag-next/wrangler.jsonc …overrides/d1-tag-next/wrangler.e2e.jsoncexamples/overrides/d1-tag-next/wrangler.jsonc renamed to examples/overrides/d1-tag-next/wrangler.e2e.jsonc examples/overrides/d1-tag-next/wrangler.jsonc renamed to examples/overrides/d1-tag-next/wrangler.e2e.jsonc

@@ -6,22 +6,22 @@
 	"compatibility_flags": ["nodejs_compat", "global_fetch_strictly_public"],
 	"assets": {
 		"directory": ".open-next/assets",
-		"binding": "ASSETS"
+		"binding": "ASSETS",
 	},
 	"vars": {
-		"APP_VERSION": "1.2.345"
+		"APP_VERSION": "1.2.345",
 	},
 	"kv_namespaces": [
 		{
 			"binding": "NEXT_INC_CACHE_KV",
-			"id": "<BINDING_ID>"
-		}
+			"id": "<BINDING_ID>",
+		},
 	],
 	"d1_databases": [
 		{
 			"binding": "NEXT_TAG_CACHE_D1",
 			"database_id": "NEXT_TAG_CACHE_D1",
-			"database_name": "NEXT_TAG_CACHE_D1"
-		}
-	]
+			"database_name": "NEXT_TAG_CACHE_D1",
+		},
+	],
 }

packages/cloudflare/src/cli/commands/populate-cache.ts

@@ -146,9 +146,14 @@ async function populateR2IncrementalCache(
 				quoteShellMeta(normalizePath(path.join(bucket, cacheKey))),
 				`--file ${quoteShellMeta(fullPath)}`,
 			],
-			// NOTE: R2 does not support the environment flag and results in the following error:
-			// Incorrect type for the 'cacheExpiry' field on 'HttpMetadata': the provided value is not of type 'date'.
-			{ target: populateCacheOptions.target, logging: "error" }
+			{
+				target: populateCacheOptions.target,
+				configPath: populateCacheOptions.configPath,
+				// R2 does not support the environment flag and results in the following error:
+				// Incorrect type for the 'cacheExpiry' field on 'HttpMetadata': the provided value is not of type 'date'.
+				environment: undefined,
+				logging: "error",
+			}
 		);
 	}
 	logger.info(`Successfully populated cache with ${assets.length} assets`);
@@ -193,7 +198,9 @@ async function populateKVIncrementalCache(
 		writeFileSync(chunkPath, JSON.stringify(kvMapping));
 
 		runWrangler(options, ["kv bulk put", quoteShellMeta(chunkPath), `--binding ${KV_CACHE_BINDING_NAME}`], {
-			...populateCacheOptions,
+			target: populateCacheOptions.target,
+			environment: populateCacheOptions.environment,
+			configPath: populateCacheOptions.configPath,
 			logging: "error",
 		});
 
@@ -222,7 +229,12 @@ function populateD1TagCache(
 			D1_TAG_BINDING_NAME,
 			`--command "CREATE TABLE IF NOT EXISTS revalidations (tag TEXT NOT NULL, revalidatedAt INTEGER NOT NULL, UNIQUE(tag) ON CONFLICT REPLACE);"`,
 		],
-		{ ...populateCacheOptions, logging: "error" }
+		{
+			target: populateCacheOptions.target,
+			environment: populateCacheOptions.environment,
+			configPath: populateCacheOptions.configPath,
+			logging: "error",
+		}
 	);
 
 	logger.info("\nSuccessfully created D1 table");

packages/cloudflare/src/cli/utils/run-wrangler.ts

@@ -11,6 +11,7 @@ export type WranglerTarget = "local" | "remote";
 type WranglerOptions = {
 	target?: WranglerTarget;
 	environment?: string;
+	configPath?: string;
 	logging?: "all" | "error";
 };
 
@@ -65,6 +66,7 @@ export function runWrangler(options: BuildOptions, args: string[], wranglerOpts:
 				[
 					...args,
 					wranglerOpts.environment && `--env ${wranglerOpts.environment}`,
+					wranglerOpts.configPath && `--config ${wranglerOpts.configPath}`,
 					wranglerOpts.target === "remote" && "--remote",
 					wranglerOpts.target === "local" && "--local",
 				].filter((v): v is string => !!v)