temp

Author: emily-shen

packages/miniflare/src/config/schema.ts

@@ -195,27 +195,24 @@ const MiniflareFlagshipBindingSchema = FlagshipBindingSchema.omit({
 	id: z.string(),
 });
 
-/**
- * AWS SigV4 credentials for miniflare's local S3-compatible R2 endpoint.
- * Local-only, so not in the shared config schema.
- */
-export const R2S3CredentialsSchema = z.object({
-	accessKeyId: z.string(),
-	secretAccessKey: z.string(),
-}) satisfies z.ZodType<S3Credentials>;
-
-export type R2S3Credentials = z.infer<typeof R2S3CredentialsSchema>;
-
 /**
  * Force name to be required. `s3Credentials` is a local-dev-only field (used to
  * expose the bucket via the S3-compatible endpoint), so it lives here rather
- * than in the shared config schema.
+ * than in the shared config schema. The credentials shape is inlined (rather
+ * than a named schema) to keep it out of the bundled public API surface;
+ * consumers derive the type from the R2 binding via `Extract<MiniflareBinding,
+ * { type: "r2" }>`.
  */
 const MiniflareR2BindingSchema = R2BindingSchema.omit({
 	name: true,
 }).extend({
 	name: z.string(),
-	s3Credentials: R2S3CredentialsSchema.optional(),
+	s3Credentials: z
+		.object({
+			accessKeyId: z.string(),
+			secretAccessKey: z.string(),
+		})
+		.optional() satisfies z.ZodType<S3Credentials | undefined>,
 });
 
 /**

packages/miniflare/src/plugins/r2/index.ts

@@ -22,7 +22,12 @@ import type {
 	Worker_Binding,
 	Worker_Binding_DurableObjectNamespaceDesignator,
 } from "../../runtime";
-import type { ParsedWorkerOptions, Plugin, R2S3Credentials } from "../shared";
+import type { MiniflareBinding, ParsedWorkerOptions, Plugin } from "../shared";
+
+/** Local-dev S3 credentials, derived from the parsed R2 binding. */
+type R2S3Credentials = NonNullable<
+	Extract<MiniflareBinding, { type: "r2" }>["s3Credentials"]
+>;
 
 export const R2_PLUGIN_NAME = "r2";
 const R2_STORAGE_SERVICE_NAME = `${R2_PLUGIN_NAME}:storage`;

packages/miniflare/src/plugins/shared/index.ts

@@ -267,5 +267,4 @@ export type {
 	ParsedLegacyConfig,
 	ParsedMiniflareWorkerConfig,
 	ParsedWorkerOptions,
-	R2S3Credentials,
 } from "../../config/schema";

packages/miniflare/test/index.spec.ts

@@ -2515,8 +2515,14 @@ test("Miniflare: manually triggered email handler - structured result", async ({
 	expect,
 }) => {
 	const mf = new Miniflare({
-		modules: true,
-		script: `
+		unsafeTriggerHandlers: true,
+		workers: [
+			{
+				config: {
+					type: "worker",
+					name: "",
+					compatibilityDate: "2025-05-01",
+					manifest: singleModuleManifest(`
 			import { EmailMessage } from "cloudflare:email";
 
 			export default {
@@ -2542,8 +2548,10 @@ test("Miniflare: manually triggered email handler - structured result", async ({
 						throw new Error("sensitive handler error");
 					}
 				}
-			}`,
-		unsafeTriggerHandlers: true,
+			}`),
+				},
+			},
+		],
 	});
 	useDispose(mf);
 
@@ -3581,16 +3589,24 @@ test("Miniflare: workerd crash during startup => ERR_RUNTIME_FAILURE", async ({
 	onTestFinished,
 }) => {
 	const mf = new Miniflare({
-		modules: true,
-		script: `
+		workers: [
+			{
+				config: {
+					type: "worker",
+					name: "",
+					compatibilityDate: "2025-05-01",
+					manifest: singleModuleManifest(`
 			import { abortIsolate } from "cloudflare:workers";
 			abortIsolate("crash!");
 			export default {
 				fetch(request) {
 					return new Response("ok");
 				},
 			}
-		`,
+		`),
+				},
+			},
+		],
 	});
 	// dispose() on a startup-failed instance propagates the same
 	// ERR_RUNTIME_FAILURE
@@ -3605,9 +3621,14 @@ test("Miniflare: workerd crash during startup => ERR_RUNTIME_FAILURE", async ({
 test("Miniflare: workerd crash in handler => restart", async ({ expect }) => {
 	const runtimeRestarted = new DeferredPromise<void>();
 	const mf = new Miniflare({
-		modules: true,
 		unsafeHandleRuntimeRestart: () => runtimeRestarted.resolve(),
-		script: `
+		workers: [
+			{
+				config: {
+					type: "worker",
+					name: "",
+					compatibilityDate: "2025-05-01",
+					manifest: singleModuleManifest(`
 			import { abortIsolate } from "cloudflare:workers";
 			let counter = 1;
 			export default {
@@ -3618,7 +3639,10 @@ test("Miniflare: workerd crash in handler => restart", async ({ expect }) => {
 					return new Response(\`ok \${counter++}\`);
 				},
 			}
-		`,
+		`),
+				},
+			},
+		],
 	});
 	useDispose(mf);
 
@@ -3653,12 +3677,17 @@ test("Miniflare: logs post-restart callback failures", async ({ expect }) => {
 	const callbackCalled = new DeferredPromise<void>();
 	const mf = new Miniflare({
 		log,
-		modules: true,
 		async unsafeHandleRuntimeRestart() {
 			callbackCalled.resolve();
 			throw new Error("callback failed");
 		},
-		script: `
+		workers: [
+			{
+				config: {
+					type: "worker",
+					name: "",
+					compatibilityDate: "2025-05-01",
+					manifest: singleModuleManifest(`
 			import { abortIsolate } from "cloudflare:workers";
 			export default {
 				fetch(request) {
@@ -3668,7 +3697,10 @@ test("Miniflare: logs post-restart callback failures", async ({ expect }) => {
 					return new Response("ok");
 				},
 			}
-		`,
+		`),
+				},
+			},
+		],
 	});
 	useDispose(mf);
 

packages/miniflare/test/plugins/core/observability.spec.ts

@@ -2,7 +2,7 @@ import assert from "node:assert";
 import { Miniflare, type WorkerOptions } from "miniflare";
 import { describe, test } from "vitest";
 import { OBSERVABILITY_COLLECTOR_SERVICE_NAME } from "../../../src/plugins/core/constants";
-import { useDispose } from "../../test-shared";
+import { singleModuleManifest, useDispose } from "../../test-shared";
 
 // Local observability wiring.
 //
@@ -16,10 +16,12 @@ import { useDispose } from "../../test-shared";
 
 function plainWorker(script: string): WorkerOptions {
 	return {
-		name: "user",
-		modules: true,
-		compatibilityDate: "2026-06-01",
-		script,
+		config: {
+			type: "worker",
+			name: "user",
+			compatibilityDate: "2026-06-01",
+			manifest: singleModuleManifest(script),
+		},
 	};
 }
 
@@ -190,19 +192,25 @@ export default {
 
 function storeWorker(): WorkerOptions {
 	return {
-		name: "user",
-		modules: true,
-		compatibilityDate: "2026-06-01",
-		script: STORE_HARNESS,
-		// Bind the collector's internal TraceStore DO (cross-script) to seed it,
-		// and the collector service to read it back through the HTTP read API.
-		durableObjects: {
-			TRACE_STORE: {
-				className: "TraceStore",
-				scriptName: OBSERVABILITY_COLLECTOR_SERVICE_NAME,
+		config: {
+			type: "worker",
+			name: "user",
+			compatibilityDate: "2026-06-01",
+			manifest: singleModuleManifest(STORE_HARNESS),
+			// Bind the collector's internal TraceStore DO (cross-script) to seed it,
+			// and the collector service to read it back through the HTTP read API.
+			env: {
+				TRACE_STORE: {
+					type: "durable-object",
+					workerName: OBSERVABILITY_COLLECTOR_SERVICE_NAME,
+					exportName: "TraceStore",
+				},
+				WOBS: {
+					type: "worker",
+					workerName: OBSERVABILITY_COLLECTOR_SERVICE_NAME,
+				},
 			},
 		},
-		serviceBindings: { WOBS: { name: OBSERVABILITY_COLLECTOR_SERVICE_NAME } },
 	};
 }
 
@@ -396,12 +404,19 @@ const CAPTURE_WORKER = `export default {
 
 function captureWorker(): WorkerOptions {
 	return {
-		name: "user",
-		modules: true,
-		compatibilityDate: "2026-06-01",
-		script: CAPTURE_WORKER,
-		kvNamespaces: { CACHE: "cache-namespace" },
-		serviceBindings: { WOBS: { name: OBSERVABILITY_COLLECTOR_SERVICE_NAME } },
+		config: {
+			type: "worker",
+			name: "user",
+			compatibilityDate: "2026-06-01",
+			manifest: singleModuleManifest(CAPTURE_WORKER),
+			env: {
+				CACHE: { type: "kv", id: "cache-namespace" },
+				WOBS: {
+					type: "worker",
+					workerName: OBSERVABILITY_COLLECTOR_SERVICE_NAME,
+				},
+			},
+		},
 	};
 }
 
@@ -530,21 +545,30 @@ const UPSTREAM_WORKER = `export default {
 function multiWorkerSetup(): WorkerOptions[] {
 	return [
 		{
-			name: "upstream",
-			modules: true,
-			compatibilityDate: "2026-06-01",
-			script: UPSTREAM_WORKER,
-			serviceBindings: {
-				DOWNSTREAM: "downstream",
-				WOBS: { name: OBSERVABILITY_COLLECTOR_SERVICE_NAME },
+			config: {
+				type: "worker",
+				name: "upstream",
+				compatibilityDate: "2026-06-01",
+				manifest: singleModuleManifest(UPSTREAM_WORKER),
+				env: {
+					DOWNSTREAM: { type: "worker", workerName: "downstream" },
+					WOBS: {
+						type: "worker",
+						workerName: OBSERVABILITY_COLLECTOR_SERVICE_NAME,
+					},
+				},
 			},
 		},
 		{
-			name: "downstream",
-			modules: true,
-			compatibilityDate: "2026-06-01",
-			script: DOWNSTREAM_WORKER,
-			kvNamespaces: { CACHE: "cache-namespace" },
+			config: {
+				type: "worker",
+				name: "downstream",
+				compatibilityDate: "2026-06-01",
+				manifest: singleModuleManifest(DOWNSTREAM_WORKER),
+				env: {
+					CACHE: { type: "kv", id: "cache-namespace" },
+				},
+			},
 		},
 	];
 }
@@ -586,23 +610,32 @@ export default {
 	},
 };`;
 
-describe("unsafeObservability (workflows)", () => {
+// NOTE(miniflare v5 options-schema migration): Workflows support is temporarily
+// disabled during the config-format migration (the `workflow` binding type is not
+// yet in the new schema and the Workflows plugin is a no-op stub). Re-enable this
+// test once Workflows is re-implemented against the new config format.
+describe.skip("unsafeObservability (workflows)", () => {
 	test("captures the Workflows engine invocation, attributed to the workflow", async ({
 		expect,
 	}) => {
 		const mf = new Miniflare({
 			unsafeObservability: true,
-			name: "wf-user",
-			modules: true,
-			compatibilityDate: "2026-06-01",
-			script: WORKFLOW_CAPTURE_WORKER,
-			workflows: {
-				CAPTURE_WORKFLOW: {
-					className: "CaptureWorkflow",
-					name: "capture-workflow",
+			workers: [
+				{
+					config: {
+						type: "worker",
+						name: "wf-user",
+						compatibilityDate: "2026-06-01",
+						manifest: singleModuleManifest(WORKFLOW_CAPTURE_WORKER),
+						env: {
+							WOBS: {
+								type: "worker",
+								workerName: OBSERVABILITY_COLLECTOR_SERVICE_NAME,
+							},
+						},
+					},
 				},
-			},
-			serviceBindings: { WOBS: { name: OBSERVABILITY_COLLECTOR_SERVICE_NAME } },
+			],
 		});
 		useDispose(mf);
 

packages/miniflare/test/plugins/email/index.spec.ts

@@ -2372,9 +2372,8 @@ describe("EMAIL_PLUGIN.getServices", () => {
 			options: {
 				config: { env: { SEND_EMAIL: { type: "send-email" } } },
 			},
-			sharedOptions: {},
+			sharedOptions: { resourceTmpPath: projectTmpPath },
 			tmpPath: tmp,
-			resourceTmpPath: projectTmpPath,
 			workerNames: ["default"],
 			workerIndex: 0,
 		} as unknown as Parameters<typeof EMAIL_PLUGIN.getServices>[0]);

packages/miniflare/test/plugins/images/transform.spec.ts

@@ -1,6 +1,7 @@
 import { Miniflare } from "miniflare";
 import sharp from "sharp";
 import { afterAll, beforeAll, describe, test } from "vitest";
+import { singleModuleManifest } from "../../test-shared";
 import type { MiniflareOptions } from "miniflare";
 
 // A worker that runs env.IMAGES.input(...).transform(...).output(...) with
@@ -59,10 +60,17 @@ describe("Images binding local transforms", () => {
 			.toBuffer();
 
 		mf = new Miniflare({
-			compatibilityDate: "2025-04-01",
-			modules: true,
-			script: WORKER_SCRIPT,
-			images: { binding: "IMAGES" },
+			workers: [
+				{
+					config: {
+						type: "worker",
+						name: "",
+						compatibilityDate: "2025-04-01",
+						manifest: singleModuleManifest(WORKER_SCRIPT),
+						env: { IMAGES: { type: "images" } },
+					},
+				},
+			],
 		} satisfies MiniflareOptions);
 	});