fixes

Author: penalosa

packages/miniflare/src/index.ts

@@ -767,17 +767,17 @@ export class Miniflare {
 		});
 		// Add custom headers included in response to WebSocket upgrade requests
 		this.#webSocketExtraHeaders = new WeakMap();
-		// this.#webSocketServer.on("headers", (headers, req) => {
-		// 	const extra = this.#webSocketExtraHeaders.get(req);
-		// 	this.#webSocketExtraHeaders.delete(req);
-		// 	if (extra) {
-		// 		for (const [key, value] of extra) {
-		// 			if (!restrictedWebSocketUpgradeHeaders.includes(key.toLowerCase())) {
-		// 				headers.push(`${key}: ${value}`);
-		// 			}
-		// 		}
-		// 	}
-		// });
+		this.#webSocketServer.on("headers", (headers, req) => {
+			const extra = this.#webSocketExtraHeaders.get(req);
+			this.#webSocketExtraHeaders.delete(req);
+			if (extra) {
+				for (const [key, value] of extra) {
+					if (!restrictedWebSocketUpgradeHeaders.includes(key.toLowerCase())) {
+						headers.push(`${key}: ${value}`);
+					}
+				}
+			}
+		});
 
 		// Build path for temporary directory. We don't actually want to create this
 		// unless it's needed (i.e. we have Durable Objects enabled). This means we
@@ -1046,7 +1046,7 @@ export class Miniflare {
 				http.createServer(this.#handleLoopback),
 				/* grace */ 0
 			);
-			// server.on("upgrade", this.#handleLoopbackUpgrade);
+			server.on("upgrade", this.#handleLoopbackUpgrade);
 			server.listen(0, hostname, () => resolve(server));
 		});
 	}

packages/wrangler/src/__tests__/deploy.test.ts

@@ -10,7 +10,6 @@ import { http, HttpResponse } from "msw";
 import dedent from "ts-dedent";
 import { File } from "undici";
 import { vi } from "vitest";
-import * as checkCommand from "../check/commands";
 import {
 	printBundleSize,
 	printOffendingDependencies,

packages/wrangler/src/check/commands.ts

@@ -4,7 +4,7 @@ import events from "node:events";
 import { writeFile } from "node:fs/promises";
 import path from "path";
 import { log } from "@cloudflare/cli";
-import { spinner, spinnerWhile } from "@cloudflare/cli/interactive";
+import { spinnerWhile } from "@cloudflare/cli/interactive";
 import chalk from "chalk";
 import { Miniflare } from "miniflare";
 import { WebSocket } from "ws";

packages/wrangler/src/deploy/deploy.ts

@@ -3,7 +3,7 @@ import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { URLSearchParams } from "node:url";
 import { cancel } from "@cloudflare/cli";
-import { FormData, Response } from "undici";
+import { Response } from "undici";
 import { syncAssets } from "../assets";
 import { fetchListResult, fetchResult } from "../cfetch";
 import { configFileName, formatConfigSnippet } from "../config";
@@ -74,6 +74,7 @@ import type { PostQueueBody, PostTypedConsumerBody } from "../queues/client";
 import type { LegacyAssetPaths } from "../sites";
 import type { RetrieveSourceMapFunction } from "../sourcemap";
 import type { ApiVersion, Percentage, VersionId } from "../versions/types";
+import type { FormData } from "undici";
 
 type Props = {
 	config: Config;

packages/wrangler/src/deploy/index.ts

@@ -311,10 +311,6 @@ async function deployWorker(args: DeployArgs) {
 		);
 	}
 
-	if (args.outfile && args.outdir) {
-		throw new UserError("Cannot use `--outfile` and `--outdir` together");
-	}
-
 	if (config.workflows?.length) {
 		logger.once.warn("Workflows is currently in open beta.");
 	}

packages/wrangler/src/utils/friendly-validator-errors.ts

@@ -66,9 +66,9 @@ export async function helpIfErrorIsSizeOrScriptStartup(
 		await writeFile(profile, JSON.stringify(cpuProfile));
 		throw new UserError(dedent`
 			Your Worker failed validation because it exceeded startup limits.
-			To ensure fast responses, we place constraints on Worker startup—like how much CPU it can use, or how long it can take. Your Worker failed validation, which means it hit one of these startup limits. Try reducing the amount of work done during startup (outside the event handler), either by removing code or relocating it inside the event handler.
+			To ensure fast responses, there are constraints on Worker startup, such as how much CPU it can use, or how long it can take. Your Worker has hit one of these startup limits. Try reducing the amount of work done during startup (outside the event handler), either by removing code or relocating it inside the event handler.
 
-			A CPU Profile of your Worker's startup phase has been written to ${profile} Load it into the Chrome DevTools profiler (or directly in VSCode) to view a flamegraph.
+			A CPU Profile of your Worker's startup phase has been written to ${profile} - load it into the Chrome DevTools profiler (or directly in VSCode) to view a flamegraph.
 
 			Refer to https://developers.cloudflare.com/workers/platform/limits/#worker-startup-time for more details`);
 	}

packages/wrangler/src/versions/upload.ts

@@ -2,7 +2,6 @@ import assert from "node:assert";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { blue, gray } from "@cloudflare/cli/colors";
-import { FormData } from "undici";
 import {
 	getAssetsOptions,
 	syncAssets,
@@ -61,6 +60,7 @@ import type { Rule } from "../config/environment";
 import type { Entry } from "../deployment-bundle/entry";
 import type { CfPlacement, CfWorkerInit } from "../deployment-bundle/worker";
 import type { RetrieveSourceMapFunction } from "../sourcemap";
+import type { FormData } from "undici";
 
 type Props = {
 	config: Config;