fix: upload compat date for static-asset only projects (#6705)

Author: emily-shen

.changeset/tame-ties-smash.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+feat: include compatability date in static-asset only uploads (experimental feature)

packages/wrangler/src/__tests__/deploy.test.ts

@@ -4315,7 +4315,10 @@ addEventListener('fetch', event => {});`
 			await mockAUSRequest(bodies);
 			mockSubDomainRequest();
 			mockUploadWorkerRequest({
-				expectedExperimentalAssets: true,
+				expectedExperimentalAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: {},
+				},
 				expectedType: "none",
 			});
 			await runWrangler("deploy --experimental-assets cli-assets");
@@ -4414,7 +4417,10 @@ addEventListener('fetch', event => {});`
 			);
 			mockSubDomainRequest();
 			mockUploadWorkerRequest({
-				expectedExperimentalAssets: true,
+				expectedExperimentalAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: {},
+				},
 				expectedType: "none",
 			});
 			await runWrangler("deploy");
@@ -4487,7 +4493,10 @@ addEventListener('fetch', event => {});`
 			await mockAUSRequest(bodies);
 			mockSubDomainRequest();
 			mockUploadWorkerRequest({
-				expectedExperimentalAssets: true,
+				expectedExperimentalAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: {},
+				},
 				expectedType: "none",
 			});
 			await runWrangler("deploy --config some/path/wrangler.toml");
@@ -4522,7 +4531,10 @@ addEventListener('fetch', event => {});`
 			await mockAUSRequest(bodies);
 			mockSubDomainRequest();
 			mockUploadWorkerRequest({
-				expectedExperimentalAssets: true,
+				expectedExperimentalAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: {},
+				},
 				expectedType: "none",
 			});
 			await runWrangler("deploy --config some/path/wrangler.toml");
@@ -4550,7 +4562,10 @@ addEventListener('fetch', event => {});`
 			await mockAUSRequest(bodies);
 			mockSubDomainRequest();
 			mockUploadWorkerRequest({
-				expectedExperimentalAssets: true,
+				expectedExperimentalAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: {},
+				},
 				expectedType: "none",
 			});
 			process.chdir("some/path");
@@ -4579,7 +4594,10 @@ addEventListener('fetch', event => {});`
 			// skips asset uploading since empty buckets returned
 			mockSubDomainRequest();
 			mockUploadWorkerRequest({
-				expectedExperimentalAssets: true,
+				expectedExperimentalAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: {},
+				},
 				expectedType: "none",
 			});
 			await runWrangler(
@@ -4614,7 +4632,10 @@ addEventListener('fetch', event => {});`
 			// skips asset uploading since empty buckets returned
 			mockSubDomainRequest();
 			mockUploadWorkerRequest({
-				expectedExperimentalAssets: true,
+				expectedExperimentalAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: {},
+				},
 				expectedType: "none",
 			});
 			await runWrangler("deploy");
@@ -4670,7 +4691,10 @@ addEventListener('fetch', event => {});`
 			);
 			mockSubDomainRequest();
 			mockUploadWorkerRequest({
-				expectedExperimentalAssets: true,
+				expectedExperimentalAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: {},
+				},
 				expectedType: "none",
 			});
 			await runWrangler("deploy");
@@ -4741,7 +4765,7 @@ addEventListener('fetch', event => {});`
 			);
 		});
 
-		it("should be able to upload a user worker with ASSETS binding", async () => {
+		it("should be able to upload a user worker with ASSETS binding and config", async () => {
 			const assets = [
 				{ filePath: "file-1.txt", content: "Content of file-1" },
 				{ filePath: "boop/file-2.txt", content: "Content of file-2" },
@@ -4750,14 +4774,55 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource({ format: "js" });
 			writeWranglerToml({
 				main: "index.js",
-				experimental_assets: { directory: "assets", binding: "ASSETS" },
+				compatibility_date: "2024-09-27",
+				compatibility_flags: ["nodejs_compat"],
+				experimental_assets: {
+					directory: "assets",
+					binding: "ASSETS",
+					html_handling: "none",
+					not_found_handling: "404-page",
+				},
 			});
 			await mockAUSRequest();
 			mockSubDomainRequest();
 			mockUploadWorkerRequest({
-				expectedExperimentalAssets: true,
+				expectedExperimentalAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: { html_handling: "none", not_found_handling: "404-page" },
+				},
 				expectedBindings: [{ name: "ASSETS", type: "assets" }],
 				expectedMainModule: "index.js",
+				expectedCompatibilityDate: "2024-09-27",
+				expectedCompatibilityFlags: ["nodejs_compat"],
+			});
+			await runWrangler("deploy");
+		});
+
+		it("should be able to upload an asset-only project", async () => {
+			const assets = [
+				{ filePath: "file-1.txt", content: "Content of file-1" },
+				{ filePath: "boop/file-2.txt", content: "Content of file-2" },
+			];
+			writeAssets(assets);
+			writeWorkerSource({ format: "js" });
+			writeWranglerToml({
+				compatibility_date: "2024-09-27",
+				compatibility_flags: ["nodejs_compat"],
+				experimental_assets: {
+					directory: "assets",
+					html_handling: "none",
+				},
+			});
+			await mockAUSRequest();
+			mockSubDomainRequest();
+			mockUploadWorkerRequest({
+				expectedExperimentalAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: { html_handling: "none" },
+				},
+				expectedCompatibilityDate: "2024-09-27",
+				expectedCompatibilityFlags: ["nodejs_compat"],
+				expectedMainModule: undefined,
 			});
 			await runWrangler("deploy");
 		});

packages/wrangler/src/__tests__/helpers/mock-upload-worker.ts

@@ -3,6 +3,7 @@ import { createFetchResult, msw } from "./msw";
 import { serialize, toString } from "./serialize-form-data-entry";
 import type { WorkerMetadata } from "../../deployment-bundle/create-worker-upload-form";
 import type { CfWorkerInit } from "../../deployment-bundle/worker";
+import type { AssetConfig } from "@cloudflare/workers-shared";
 import type { HttpResponseResolver } from "msw";
 
 /** Create a mock handler for the request to upload a worker script. */
@@ -28,7 +29,10 @@ export function mockUploadWorkerRequest(
 		tag?: string;
 		expectedDispatchNamespace?: string;
 		expectedScriptName?: string;
-		expectedExperimentalAssets?: boolean;
+		expectedExperimentalAssets?: {
+			jwt: string;
+			config: AssetConfig;
+		};
 		useOldUploadApi?: boolean;
 		expectedObservability?: CfWorkerInit["observability"];
 	} = {}
@@ -107,10 +111,7 @@ export function mockUploadWorkerRequest(
 			expect(metadata.limits).toEqual(expectedLimits);
 		}
 		if ("expectedExperimentalAssets" in options) {
-			expect(metadata.assets).toEqual({
-				jwt: "<<aus-completion-token>>",
-				config: {},
-			});
+			expect(metadata.assets).toEqual(expectedExperimentalAssets);
 		}
 		if ("expectedObservability" in options) {
 			expect(metadata.observability).toEqual(expectedObservability);
@@ -155,7 +156,11 @@ export function mockUploadWorkerRequest(
 	const {
 		available_on_subdomain = true,
 		expectedEntry,
-		expectedMainModule = "index.js",
+		expectedExperimentalAssets,
+		// Allow setting expectedMainModule to undefined to test static-asset only uploads
+		expectedMainModule = expectedExperimentalAssets
+			? options.expectedMainModule
+			: "index.js",
 		expectedType = "esm",
 		expectedBindings,
 		expectedModules = {},

packages/wrangler/src/deployment-bundle/create-worker-upload-form.ts

@@ -201,6 +201,8 @@ export function createWorkerUploadForm(worker: CfWorkerInit): FormData {
 					jwt: experimental_assets.jwt,
 					config: assetConfig,
 				},
+				...(compatibility_date && { compatibility_date }),
+				...(compatibility_flags && { compatibility_flags }),
 			})
 		);
 		return formData;