From a99be39a3dd69eb1600c08bf26c8077b3fb679de Mon Sep 17 00:00:00 2001
From: Samuel Macleod <smacleod@cloudflare.com>
Date: Mon, 19 Feb 2024 11:51:07 +0000
Subject: [PATCH] Re-order loops

---
 .../templates/startDevWorker/ProxyWorker.ts   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/wrangler/templates/startDevWorker/ProxyWorker.ts b/packages/wrangler/templates/startDevWorker/ProxyWorker.ts
index 7b77fdce64a0..69f9e0adb093 100644
--- a/packages/wrangler/templates/startDevWorker/ProxyWorker.ts
+++ b/packages/wrangler/templates/startDevWorker/ProxyWorker.ts
@@ -306,20 +306,10 @@ function insertLiveReloadScript(
 function rewriteUrlRelatedHeaders(headers: Headers, from: URL, to: URL) {
 	const setCookie = headers.getAll("Set-Cookie");
 	headers.delete("Set-Cookie");
-	for (const cookie of setCookie) {
-		headers.append(
-			"Set-Cookie",
-			cookie.replace(
-				new RegExp(`Domain=${from.hostname}($|;|,)`),
-				`Domain=${to.hostname}$1`
-			)
-		);
-	}
 	headers.forEach((value, key) => {
 		if (
 			typeof value === "string" &&
-			value.includes(from.host) &&
-			key !== "set-cookie"
+			value.includes(from.host)
 		) {
 			headers.set(
 				key,
@@ -327,4 +317,13 @@ function rewriteUrlRelatedHeaders(headers: Headers, from: URL, to: URL) {
 			);
 		}
 	});
+	for (const cookie of setCookie) {
+		headers.append(
+			"Set-Cookie",
+			cookie.replace(
+				new RegExp(`Domain=${from.hostname}($|;|,)`),
+				`Domain=${to.hostname}$1`
+			)
+		);
+	}
 }