fix merge conflict issues

Author: emily-shen

fixtures/vitest-pool-workers-examples/durable-objects/wrangler.jsonc

@@ -21,4 +21,7 @@
 			"new_sqlite_classes": ["SQLiteDurableObject"],
 		},
 	],
+	"exports": {
+		""
+	}
 }

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

@@ -1179,7 +1179,7 @@ export function getGlobalServices({
 	// tail above.
 	if (sharedOptions.unsafeObservability) {
 		services.push(
-			...getObservabilityServices(tmpPath, sharedOptions.defaultPersistRoot)
+			...getObservabilityServices(tmpPath, sharedOptions.resourcePersistencePath)
 		);
 	}
 

packages/miniflare/src/plugins/core/observability.ts

@@ -24,7 +24,7 @@ const OBSERVABILITY_STORAGE_SERVICE_NAME = "obs:storage";
 
 export function getObservabilityServices(
 	tmpPath: string,
-	defaultPersistRoot: string | undefined
+	resourcePersistencePath: string | undefined
 ): Service[] {
 	// The TraceStore DO is SQLite-backed, so it needs disk-backed storage (the
 	// in-memory option doesn't support SQL). Persist under `.wrangler/state` when
@@ -33,8 +33,7 @@ export function getObservabilityServices(
 	const storagePath = getPersistPath(
 		"observability",
 		tmpPath,
-		defaultPersistRoot,
-		undefined
+		resourcePersistencePath
 	);
 	mkdirSync(storagePath, { recursive: true });
 

packages/miniflare/test/index.spec.ts

@@ -2927,61 +2927,6 @@ test("Miniflare: workerd crash in handler => restart", async ({ expect }) => {
 	expect(await r4.text()).toBe("ok 2");
 });
 
-test("Miniflare: logs workerd restart failures", async ({ expect }) => {
-	const log = new TestLog();
-	const logError = vi.spyOn(log, "error").mockImplementation(() => {});
-	const handleRuntimeRestart = vi.fn();
-	let runtimeStarts = 0;
-	const options = {
-		log,
-		modules: true,
-		handleRuntimeStdio() {
-			runtimeStarts++;
-			if (runtimeStarts === 2) {
-				throw new Error("restart failed");
-			}
-		},
-		unsafeHandleRuntimeRestart: handleRuntimeRestart,
-		script: `
-			import { abortIsolate } from "cloudflare:workers";
-			export default {
-				fetch(request) {
-					if (new URL(request.url).searchParams.get("crash")) {
-						abortIsolate("test crash");
-					}
-					return new Response("ok");
-				},
-			}
-		`,
-	} satisfies MiniflareOptions;
-	const mf = new Miniflare(options);
-	useDispose(mf);
-
-	await mf.ready;
-	await expect(
-		mf.dispatchFetch("http://placeholder/?crash=1")
-	).rejects.toThrow();
-
-	await vi.waitFor(() => {
-		expect(logError).toHaveBeenCalledWith(
-			expect.objectContaining({
-				code: "ERR_RUNTIME_FAILURE",
-				message:
-					"The Workers runtime failed to restart after an unexpected crash.",
-			})
-		);
-	});
-	expect(handleRuntimeRestart).not.toHaveBeenCalled();
-	await expect(mf.ready).rejects.toMatchObject({
-		code: "ERR_RUNTIME_FAILURE",
-		message: "The Workers runtime failed to restart after an unexpected crash.",
-	});
-
-	await mf.setOptions(options);
-	const response = await mf.dispatchFetch("http://placeholder/");
-	expect(await response.text()).toBe("ok");
-});
-
 test("Miniflare: logs post-restart callback failures", async ({ expect }) => {
 	const log = new TestLog();
 	const logError = vi.spyOn(log, "error").mockImplementation(() => {});

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

@@ -63,7 +63,6 @@ describe("Images binding local transforms", () => {
 			modules: true,
 			script: WORKER_SCRIPT,
 			images: { binding: "IMAGES" },
-			imagesPersist: false,
 		} satisfies MiniflareOptions);
 	});