Fix max asset count message (#6627)

* Fixes asset count error message to properly report count of assets * Error if > 20000 assets rather than >= 20000 Co-authored-by: Pete Bacon Darwin <[email protected]> --------- Co-authored-by: Pete Bacon Darwin <[email protected]>
cloudflare · Sep 6, 2024 · 5936282 · 5936282
1 parent c365e61
commit 5936282
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.changeset/khaki-brooms-matter.md b/.changeset/khaki-brooms-matter.md
@@ -0,0 +1,5 @@
+---
+"miniflare": patch
+---
+
+fix: Fixes max asset count error message to properly report count of assets
diff --git a/packages/miniflare/src/plugins/assets/index.ts b/packages/miniflare/src/plugins/assets/index.ts
@@ -179,14 +179,6 @@ const walk = async (dir: string) => {
 			if (filestat.isSymbolicLink() || filestat.isDirectory()) {
 				return;
 			} else {
-				if (counter >= MAX_ASSET_COUNT) {
-					throw new Error(
-						`Maximum number of assets exceeded.\n` +
-							`Cloudflare Workers supports up to ${MAX_ASSET_COUNT.toLocaleString()} assets in a version. We found ${counter.toLocaleString()} files in the specified assets directory "${dir}".\n` +
-							`Ensure your assets directory contains a maximum of ${MAX_ASSET_COUNT.toLocaleString()} files, and that you have specified your assets directory correctly.`
-					);
-				}
-
 				if (filestat.size > MAX_ASSET_SIZE) {
 					throw new Error(
 						`Asset too large.\n` +
@@ -210,6 +202,13 @@ const walk = async (dir: string) => {
 			}
 		})
 	);
+	if (counter > MAX_ASSET_COUNT) {
+		throw new Error(
+			`Maximum number of assets exceeded.\n` +
+				`Cloudflare Workers supports up to ${MAX_ASSET_COUNT.toLocaleString()} assets in a version. We found ${counter.toLocaleString()} files in the specified assets directory "${dir}".\n` +
+				`Ensure your assets directory contains a maximum of ${MAX_ASSET_COUNT.toLocaleString()} files, and that you have specified your assets directory correctly.`
+		);
+	}
 	return manifest;
 };