fix bundle controller race condition

cloudflare · Oct 10, 2024 · 4f0abde · 4f0abde
1 parent 8360415
commit 4f0abde
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/fixtures/entrypoints-rpc-tests/tests/entrypoints.spec.ts b/fixtures/entrypoints-rpc-tests/tests/entrypoints.spec.ts
@@ -857,8 +857,6 @@ test("should throw if binding to version of wrangler without entrypoints support
 			// Intentionally omitting `entrypointAddresses`
 		})
 	);
-	expect(response.status).toBe(200);
-	expect(await response.text()).toBe("null");
 
 	// Wait for error to be thrown
 	await waitFor(() => {

diff --git a/packages/wrangler/src/api/startDevWorker/BundlerController.ts b/packages/wrangler/src/api/startDevWorker/BundlerController.ts
@@ -253,8 +253,10 @@ export class BundlerController extends Controller<BundlerControllerEventMap> {
 			},
 			(cb) => {
 				const newBundle = cb(this.#currentBundle);
-				this.emitBundleCompleteEvent(config, newBundle);
-				this.#currentBundle = newBundle;
+				if (!buildAborter.signal.aborted) {
+					this.emitBundleCompleteEvent(config, newBundle);
+					this.#currentBundle = newBundle;
+				}
 			},
 			(err) => {
 				if (!buildAborter.signal.aborted) {