From 943639667eed4836a698545c3d0831a1bd3b775c Mon Sep 17 00:00:00 2001
From: gonzaloriestra <14979109+gonzaloriestra@users.noreply.github.com>
Date: Sun, 30 Aug 2026 00:08:28 +0000
Subject: [PATCH 1/2] [Refactor] Use early returns in dev-server-2024 host
 function

Replace nested if statements in host() function with flat early
returns to simplify control flow and improve readability.
---
 .../node/vendor/dev_server/dev-server-2024.ts | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts b/packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts
index ca41e1ed138..cd067450c00 100644
--- a/packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts
+++ b/packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts
@@ -25,15 +25,19 @@ function host(projectName: string, options: HostOptions = {}): string {
 
   const prefix = (options.nonstandardHostPrefix || projectName).replace(/_/g, '-')
 
-  if (projectName === 'shopify') {
-    if (prefix.endsWith('-dev-api')) {
-      const shopName = prefix.replace('-dev-api', '')
-      return `${shopName}.dev-api.shop.dev`
-    }
-    if (!NON_SHOP_PREFIXES.includes(prefix)) {
-      return `${prefix}.my.shop.dev`
-    }
+  if (projectName !== 'shopify') {
+    return `${prefix}.shop.dev`
   }
+
+  if (prefix.endsWith('-dev-api')) {
+    const shopName = prefix.replace('-dev-api', '')
+    return `${shopName}.dev-api.shop.dev`
+  }
+
+  if (!NON_SHOP_PREFIXES.includes(prefix)) {
+    return `${prefix}.my.shop.dev`
+  }
+
   return `${prefix}.shop.dev`
 }
 

From 092a048d8e3f9698a442b3b76023f2df113a0efc Mon Sep 17 00:00:00 2001
From: gonzaloriestra <14979109+gonzaloriestra@users.noreply.github.com>
Date: Sun, 30 Aug 2026 00:26:23 +0000
Subject: [PATCH 2/2] [Refactor] Use early returns in dev-server-2024 host
 function

Replace nested if statements in host() function with flat early
returns to simplify control flow and improve readability.