Various miniflare v5 changes

.changeset/consolidate-miniflare-persist-options.md

@@ -0,0 +1,16 @@
+---
+"miniflare": major
+---
+
+Consolidate persistence and temporary directory options
+
+The per-resource persistence options (`kvPersist`, `r2Persist`, `d1Persist`, `cachePersist`, `durableObjectsPersist`, `workflowsPersist`, `secretsStorePersist`, `analyticsEngineDatasetsPersist`, `streamPersist`, `imagesPersist`, and `helloWorldPersist`) have been removed, along with `defaultPersistRoot` and `defaultProjectTmpPath`. Persistence is now configured with two options:
+
+```js
+new Miniflare({
+	resourcePersistencePath: ".wrangler/state/v3",
+	resourceTmpPath: ".wrangler/tmp",
+});
+```
+
+When `resourcePersistencePath` is set, each resource persists to a subdirectory named after its plugin (e.g. `.wrangler/state/v3/kv`). When it is omitted, resources are ephemeral and their data is cleared on dispose. The `boolean`, `memory:`, `file:` and relative-path forms of the old per-resource options, the `.mf` default directory, and the `Miniflare.unsafeGetPersistPaths()` method have also been removed.

.changeset/drop-cache-warn-usage.md

@@ -0,0 +1,7 @@
+---
+"miniflare": major
+---
+
+Remove the `cacheWarnUsage` option
+
+The `cacheWarnUsage` Worker option, which logged a warning when cache operations were used, has been removed.

.changeset/drop-fetch-mock.md

@@ -0,0 +1,5 @@
+---
+"miniflare": major
+---
+
+Remove the `fetchMock` option and `createFetchMock` export

.changeset/drop-https-key-cert-path.md

@@ -0,0 +1,7 @@
+---
+"miniflare": major
+---
+
+Remove the `httpsKeyPath` and `httpsCertPath` options
+
+The `httpsKeyPath` and `httpsCertPath` options have been removed. To use a custom certificate, read the files and pass their contents via the existing `httpsKey` and `httpsCert` options.

.changeset/drop-runtime-stdio-and-structured-logs-option.md

@@ -0,0 +1,9 @@
+---
+"miniflare": major
+---
+
+Only support structured workerd logs
+
+The `handleRuntimeStdio` option (for handling the raw `workerd` stdout/stderr streams) and the `structuredWorkerdLogs` option (for toggling structured `workerd` logs) have been removed. Structured logging is now always enabled.
+
+To receive `workerd`'s output, use `handleStructuredLogs`, which is passed parsed structured log entries. When no `handleStructuredLogs` handler is provided, logs are written to the console by default (`warn`/`error` to stderr, everything else to stdout).

.changeset/drop-unsafe-sticky-blobs.md

@@ -0,0 +1,7 @@
+---
+"miniflare": major
+---
+
+Drop the `unsafeStickyBlobs` option
+
+This prevented blob files from being deleted when overwriting or deleting keys, and only existed to support the Durable Object isolated storage feature in `@cloudflare/vitest-pool-workers`, which was removed in 0.13.0. Blobs are now always cleaned up as expected.

.changeset/drop-wrapped-bindings.md

@@ -0,0 +1,5 @@
+---
+"miniflare": major
+---
+
+Remove the `wrappedBindings` option

.changeset/miniflare-container-engine-shared-option.md

@@ -0,0 +1,16 @@
+---
+"miniflare": major
+---
+
+Move `containerEngine` from a per-worker option to a top-level option
+
+`containerEngine` is now a top-level Miniflare option rather than a per-worker option, reflecting that it configures a single container engine for the whole Miniflare instance.
+
+```js
+new Miniflare({
+	containerEngine: "unix:///var/run/docker.sock",
+	workers: [{ name: "my-worker", script: "..." }],
+});
+```
+
+Previously it was set inside each worker's options.

.changeset/rename-cache-option-to-cache-api.md

@@ -0,0 +1,7 @@
+---
+"miniflare": major
+---
+
+Rename the `cache` Worker option to `cacheAPI`
+
+The boolean option controlling whether the Cache API caches anything has been renamed from `cache` to `cacheAPI`. This is to distinguish it from Workers Cache.

.changeset/vitest-pool-drop-sticky-blobs.md

@@ -0,0 +1,7 @@
+---
+"@cloudflare/vitest-pool-workers": patch
+---
+
+Stop enabling Miniflare's removed `unsafeStickyBlobs` option
+
+The pool no longer sets the `unsafeStickyBlobs` Miniflare option, which has been removed. This option was only needed for the Durable Object isolated storage feature that was dropped in 0.13.0, so there is no change in behaviour.

.changeset/wrangler-unstable-worker-options-container-engine.md

@@ -0,0 +1,7 @@
+---
+"wrangler": minor
+---
+
+Remove `containerEngine` from the worker options returned by `unstable_getMiniflareWorkerOptions`
+
+`unstable_getMiniflareWorkerOptions` no longer includes `containerEngine` in the returned `workerOptions`, since the container engine is a Miniflare instance-wide setting rather than a per-worker one. Callers that build a Miniflare instance from these options should set `containerEngine` at the top level instead.

fixtures/unsafe-external-plugin/src/plugins/unsafe-service.ts

@@ -57,21 +57,15 @@ export const UNSAFE_SERVICE_PLUGIN: Plugin<
 			options?.map((binding) => [binding.name, new ProxyNodeBinding()]) ?? []
 		);
 	},
-	async getServices({
-		options,
-		tmpPath,
-		defaultPersistRoot,
-		unsafeStickyBlobs,
-	}) {
+	async getServices({ options, tmpPath, resourcePersistencePath }) {
 		if (!options || options.length === 0) {
 			return [];
 		}
 
 		const persistPath = getPersistPath(
 			UNSAFE_PLUGIN_NAME,
 			tmpPath,
-			defaultPersistRoot,
-			undefined
+			resourcePersistencePath
 		);
 
 		await fs.mkdir(persistPath, { recursive: true });
@@ -110,7 +104,7 @@ export const UNSAFE_SERVICE_PLUGIN: Plugin<
 						name: SharedBindings.MAYBE_SERVICE_LOOPBACK,
 						service: { name: SERVICE_LOOPBACK },
 					},
-					...getMiniflareObjectBindings(unsafeStickyBlobs),
+					...getMiniflareObjectBindings(),
 				],
 			},
 		} satisfies Service;

packages/miniflare/scripts/build.mjs

@@ -104,6 +104,7 @@ const localExplorerWorkerPath = path.join(
  */
 const fixtureBuilds = [
 	path.join(pkgRoot, "test/fixtures/unsafe-plugin/index.ts"),
+	path.join(pkgRoot, "test/fixtures/echo-plugin/index.ts"),
 ];
 
 /**

packages/miniflare/src/http/server.ts

@@ -1,8 +1,6 @@
-import fs from "node:fs/promises";
 import { CERT, KEY } from "./cert";
 import type { CORE_PLUGIN } from "../plugins";
 import type { HttpOptions, Socket_Https } from "../runtime";
-import type { Awaitable } from "../workers";
 import type { z } from "zod";
 
 export async function getEntrySocketHttpOptions(
@@ -11,15 +9,9 @@ export async function getEntrySocketHttpOptions(
 	let privateKey: string | undefined = undefined;
 	let certificateChain: string | undefined = undefined;
 
-	if (
-		(coreOpts.httpsKey || coreOpts.httpsKeyPath) &&
-		(coreOpts.httpsCert || coreOpts.httpsCertPath)
-	) {
-		privateKey = await valueOrFile(coreOpts.httpsKey, coreOpts.httpsKeyPath);
-		certificateChain = await valueOrFile(
-			coreOpts.httpsCert,
-			coreOpts.httpsCertPath
-		);
+	if (coreOpts.httpsKey && coreOpts.httpsCert) {
+		privateKey = coreOpts.httpsKey;
+		certificateChain = coreOpts.httpsCert;
 	} else if (coreOpts.https) {
 		privateKey = KEY;
 		certificateChain = CERT;
@@ -40,10 +32,3 @@ export async function getEntrySocketHttpOptions(
 		return { http: {} };
 	}
 }
-
-function valueOrFile(
-	value?: string,
-	filePath?: string
-): Awaitable<string | undefined> {
-	return value ?? (filePath && fs.readFile(filePath, "utf8"));
-}