fixup! fix(vitest-pool-workers): allow miniflare assets options to override wrangler assets options

petebacondarwin · petebacondarwin · commit d8a9ee7f7624 · 2025-05-15T18:13:22.000+01:00
diff --git a/fixtures/vitest-pool-workers-examples/misc/vitest.assets.config.ts b/fixtures/vitest-pool-workers-examples/misc/vitest.assets.config.ts
@@ -0,0 +1,22 @@
+import { defineWorkersProject } from "@cloudflare/vitest-pool-workers/config";
+
+export default defineWorkersProject({
+	test: {
+		name: "misc-assets",
+		include: ["test/assets.test.ts"],
+		poolOptions: {
+			workers: {
+				singleWorker: true,
+				miniflare: {
+					assets: {
+						directory: "./public",
+						binding: "ASSETS",
+					},
+				},
+				wrangler: {
+					configPath: "./wrangler.assets.jsonc",
+				},
+			},
+		},
+	},
+});
diff --git a/fixtures/vitest-pool-workers-examples/misc/vitest.config.ts b/fixtures/vitest-pool-workers-examples/misc/vitest.config.ts
@@ -7,18 +7,20 @@ export default defineWorkersProject({
 		"CONFIG_NESTED.DEFINED.THING": "[1,2,3]",
 	},
 	test: {
+		exclude: ["test/assets.test.ts"],
 		poolOptions: {
 			workers: {
 				singleWorker: true,
 				miniflare: {
-					assets: {
-						directory: "./public",
-						binding: "ASSETS",
-					},
 					kvNamespaces: ["KV_NAMESPACE"],
 					outboundService(request) {
 						return new Response(`fallthrough:${request.method} ${request.url}`);
 					},
+					serviceBindings: {
+						ASSETS(request) {
+							return new Response(`assets:${request.method} ${request.url}`);
+						},
+					},
 					workers: [
 						{
 							name: "other",
diff --git a/fixtures/vitest-pool-workers-examples/misc/wrangler.assets.jsonc b/fixtures/vitest-pool-workers-examples/misc/wrangler.assets.jsonc
@@ -0,0 +1,10 @@
+{
+	"$schema": "../node_modules/wrangler/config-schema.json",
+	"compatibility_date": "2024-01-01",
+	"assets": {
+		// This will be overridden by the assets config in vitest.config.ts
+		// See https://github.com/cloudflare/workers-sdk/issues/9130
+		"directory": "./does-not-exist",
+		"binding": "ASSETS",
+	},
+}
diff --git a/fixtures/vitest-pool-workers-examples/misc/wrangler.jsonc b/fixtures/vitest-pool-workers-examples/misc/wrangler.jsonc
@@ -14,10 +14,4 @@
 			},
 		],
 	},
-	"assets": {
-		// This will be overridden by the assets config in vitest.config.ts
-		// See https://github.com/cloudflare/workers-sdk/issues/9130
-		"directory": "./does-not-exist",
-		"binding": "ASSETS",
-	},
 }
diff --git a/fixtures/vitest-pool-workers-examples/package.json b/fixtures/vitest-pool-workers-examples/package.json
@@ -5,10 +5,10 @@
 	"scripts": {
 		"check:type": "node tsc-all.mjs",
 		"list": "vitest --config vitest.workers.config.ts list",
-		"test": "vitest --config vitest.workers.config.ts --reporter basic",
+		"test": "vitest --config vitest.workers.config.ts",
 		"test:ci": "run-script-os",
-		"test:ci:default": "vitest run --config vitest.workers.config.ts --reporter basic",
-		"test:ci:win32": "vitest run --config vitest.workers.config.ts --reporter basic --exclude test/sqlite-in-do.test.ts"
+		"test:ci:default": "vitest run --config vitest.workers.config.ts",
+		"test:ci:win32": "vitest run --config vitest.workers.config.ts --exclude test/sqlite-in-do.test.ts"
 	},
 	"devDependencies": {
 		"@cloudflare/vitest-pool-workers": "workspace:*",
diff --git a/fixtures/vitest-pool-workers-examples/vitest.workspace.ts b/fixtures/vitest-pool-workers-examples/vitest.workspace.ts
@@ -1 +1 @@
-export default ["*/vitest.config.*ts"];
+export default ["*/vitest.*config.*ts"];

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export default ["/vitest.config.ts"];`
	`1`	`+export default ["/vitest.config.*ts"];`