Update based on PR feedback

cloudflare · Dec 16, 2024 · e224fc2 · e224fc2
1 parent c2ce101
commit e224fc2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 95 deletions.
diff --git a/packages/wrangler/src/__tests__/deploy.test.ts b/packages/wrangler/src/__tests__/deploy.test.ts
@@ -4446,88 +4446,6 @@ addEventListener('fetch', event => {});`
 			`);
 		});
 
-		it("should warn when using smart placement with assets-first", async () => {
-			const assets = [
-				{ filePath: ".assetsignore", content: "*.bak\nsub-dir" },
-				{ filePath: "file-1.txt", content: "Content of file-1" },
-				{ filePath: "file-2.bak", content: "Content of file-2" },
-				{ filePath: "file-3.txt", content: "Content of file-3" },
-				{ filePath: "sub-dir/file-4.bak", content: "Content of file-4" },
-				{ filePath: "sub-dir/file-5.txt", content: "Content of file-5" },
-			];
-			writeAssets(assets, "assets");
-			writeWranglerConfig({
-				assets: {
-					directory: "assets",
-					experimental_serve_directly: true,
-				},
-				placement: {
-					mode: "smart",
-				},
-			});
-			const bodies: AssetManifest[] = [];
-			await mockAUSRequest(bodies);
-			mockSubDomainRequest();
-			mockUploadWorkerRequest({
-				expectedAssets: {
-					jwt: "<<aus-completion-token>>",
-					config: {
-						serve_directly: true,
-					},
-				},
-				expectedType: "none",
-			});
-
-			await runWrangler("deploy");
-
-			expect(std.warn).toMatchInlineSnapshot(`
-				"[33m▲ [43;33m[[43;30mWARNING[43;33m][0m [1mUsing assets with smart placement turned on may result in poor performance.[0m
-
-				"
-			`);
-		});
-
-		it("should warn when using smart placement with assets-first", async () => {
-			const assets = [
-				{ filePath: ".assetsignore", content: "*.bak\nsub-dir" },
-				{ filePath: "file-1.txt", content: "Content of file-1" },
-				{ filePath: "file-2.bak", content: "Content of file-2" },
-				{ filePath: "file-3.txt", content: "Content of file-3" },
-				{ filePath: "sub-dir/file-4.bak", content: "Content of file-4" },
-				{ filePath: "sub-dir/file-5.txt", content: "Content of file-5" },
-			];
-			writeAssets(assets, "assets");
-			writeWranglerConfig({
-				assets: {
-					directory: "assets",
-					experimental_serve_directly: true,
-				},
-				placement: {
-					mode: "smart",
-				},
-			});
-			const bodies: AssetManifest[] = [];
-			await mockAUSRequest(bodies);
-			mockSubDomainRequest();
-			mockUploadWorkerRequest({
-				expectedAssets: {
-					jwt: "<<aus-completion-token>>",
-					config: {
-						serve_directly: true,
-					},
-				},
-				expectedType: "none",
-			});
-
-			await runWrangler("deploy");
-
-			expect(std.warn).toMatchInlineSnapshot(`
-				"[33m▲ [43;33m[[43;30mWARNING[43;33m][0m [1mUsing assets with smart placement turned on may result in poor performance.[0m
-
-				"
-			`);
-		});
-
 		it("should warn if experimental_serve_directly=false but no binding is provided", async () => {
 			const assets = [
 				{ filePath: ".assetsignore", content: "*.bak\nsub-dir" },
@@ -4568,7 +4486,7 @@ addEventListener('fetch', event => {});`
 			`);
 		});
 
-		it("should error if an experimental_serve_directly is false without providing a user Worker", async () => {
+		it("should error if experimental_serve_directly is false and no user Worker is provided", async () => {
 			writeWranglerConfig({
 				assets: {
 					directory: "xyz",

diff --git a/packages/wrangler/src/__tests__/dev.test.ts b/packages/wrangler/src/__tests__/dev.test.ts
@@ -1726,7 +1726,7 @@ describe.sequential("wrangler dev", () => {
 			`);
 		});
 
-		it("should error if an experimental_serve_directly is false without providing a user Worker", async () => {
+		it("should error if experimental_serve_directly is false and no user Worker is provided", async () => {
 			writeWranglerConfig({
 				assets: { directory: "assets", experimental_serve_directly: false },
 			});

diff --git a/packages/wrangler/src/assets.ts b/packages/wrangler/src/assets.ts
@@ -444,17 +444,7 @@ export function validateAssetsArgsAndConfig(
 		);
 	}
 
-	// Smart placement turned on when using assets
-	if (
-		config?.placement?.mode === "smart" &&
-		config?.assets?.experimental_serve_directly
-	) {
-		logger.warn(
-			"Using assets with smart placement turned on may result in poor performance."
-		);
-	}
-
-	// User worker ahead of assets, but no assets binding provided
+	// User Worker ahead of assets, but no assets binding provided
 	if (
 		"legacy" in args
 			? args.assets?.assetConfig?.serve_directly === false &&