wrangler 2.0.8 → 2.0.9

package/src/zones.ts

@@ -0,0 +1,73 @@
+import { fetchListResult } from "./cfetch";
+import type { Route } from "./config/environment";
+
+/**
+ * An object holding information about a zone for publishing.
+ */
+export interface Zone {
+  id: string;
+  host: string;
+}
+
+/**
+ * Try to compute the a zone ID and host name for one or more routes.
+ *
+ * When we're given a route, we do 2 things:
+ * - We try to extract a host from it
+ * - We try to get a zone id from the host
+ */
+export async function getZoneForRoute(route: Route): Promise<Zone | undefined> {
+  const host =
+    typeof route === "string"
+      ? getHostFromUrl(route)
+      : typeof route === "object"
+      ? "zone_name" in route
+        ? getHostFromUrl(route.zone_name)
+        : getHostFromUrl(route.pattern)
+      : undefined;
+  const id =
+    typeof route === "object" && "zone_id" in route
+      ? route.zone_id
+      : host
+      ? await getZoneIdFromHost(host)
+      : undefined;
+  return id && host ? { id, host } : undefined;
+}
+
+/**
+ * Given something that resembles a URL, try to extract a host from it.
+ */
+function getHostFromUrl(urlLike: string): string | undefined {
+  // strip leading * / *.
+  urlLike = urlLike.replace(/^\*(\.)?/g, "");
+
+  if (!(urlLike.startsWith("http://") || urlLike.startsWith("https://"))) {
+    urlLike = "http://" + urlLike;
+  }
+  return new URL(urlLike).host;
+}
+
+/**
+ * Given something that resembles a host, try to infer a zone id from it.
+ *
+ * It's hard to get a 'valid' domain from a string, so we don't even try to validate TLDs, etc.
+ * For each domain-like part of the host (e.g. w.x.y.z) try to get a zone id for it by
+ * lopping off subdomains until we get a hit from the API.
+ */
+export async function getZoneIdFromHost(host: string): Promise<string> {
+  const hostPieces = host.split(".");
+
+  while (hostPieces.length > 1) {
+    const zones = await fetchListResult<{ id: string }>(
+      `/zones`,
+      {},
+      new URLSearchParams({ name: hostPieces.join(".") })
+    );
+    if (zones.length > 0) {
+      return zones[0].id;
+    }
+    hostPieces.shift();
+  }
+
+  throw new Error(`Could not find zone for ${host}`);
+}

package/wrangler-dist/cli.js

@@ -116942,7 +116942,7 @@ var yargs_default = Yargs;
 
 // package.json
 var name = "wrangler";
-var version = "2.0.8";
+var version = "2.0.9";
 var author = "wrangler@cloudflare.com";
 var description = "Command-line interface for all things Cloudflare Workers";
 var bin = {
@@ -117223,6 +117223,7 @@ function indexLocation(file, index) {
 
 // src/cfetch/internal.ts
 init_import_meta_url();
+var import_node_assert2 = __toESM(require("node:assert"));
 var import_undici2 = __toESM(require_undici());
 
 // src/environment-variables.ts
@@ -117940,6 +117941,13 @@ async function requireAuth(config) {
   }
   return accountId;
 }
+function requireApiToken() {
+  const authToken = getAPIToken();
+  if (!authToken) {
+    throw new Error("No API token found.");
+  }
+  return authToken;
+}
 
 // src/cfetch/internal.ts
 var getCloudflareAPIBaseURL = getEnvironmentVariableFactory({
@@ -117948,6 +117956,7 @@ var getCloudflareAPIBaseURL = getEnvironmentVariableFactory({
   defaultValue: "https://api.cloudflare.com/client/v4"
 });
 async function fetchInternal(resource, init = {}, queryParams, abortSignal) {
+  (0, import_node_assert2.default)(resource.startsWith("/"), `CF API fetch - resource path must start with a "/" but got "${resource}"`);
   await requireLoggedIn();
   const apiToken = requireApiToken();
   const headers = cloneHeaders(init.headers);
@@ -117994,13 +118003,6 @@ async function requireLoggedIn() {
     throw new Error("Not logged in.");
   }
 }
-function requireApiToken() {
-  const authToken = getAPIToken();
-  if (!authToken) {
-    throw new Error("No API token found.");
-  }
-  return authToken;
-}
 function addAuthorizationHeaderIfUnspecified(headers, apiToken) {
   if (!("Authorization" in headers)) {
     headers["Authorization"] = `Bearer ${apiToken}`;
@@ -119451,7 +119453,7 @@ var import_undici5 = __toESM(require_undici());
 
 // src/entry.ts
 init_import_meta_url();
-var import_node_assert2 = __toESM(require("node:assert"));
+var import_node_assert3 = __toESM(require("node:assert"));
 var import_node_fs4 = require("node:fs");
 var import_node_path10 = __toESM(require("node:path"));
 var esbuild = __toESM(require("esbuild"));
@@ -119528,8 +119530,8 @@ async function guessWorkerFormat(entryFile, entryWorkingDirectory, hint, tsconfi
   });
   const metafile = result.metafile;
   const entryPoints = Object.entries(metafile.outputs).filter(([_path, output]) => output.entryPoint !== void 0);
-  (0, import_node_assert2.default)(entryPoints.length > 0, `Cannot find entry-point "${entryFile}" in generated bundle.` + listEntryPoints(entryPoints));
-  (0, import_node_assert2.default)(entryPoints.length < 2, "More than one entry-point found for generated bundle." + listEntryPoints(entryPoints));
+  (0, import_node_assert3.default)(entryPoints.length > 0, `Cannot find entry-point "${entryFile}" in generated bundle.` + listEntryPoints(entryPoints));
+  (0, import_node_assert3.default)(entryPoints.length < 2, "More than one entry-point found for generated bundle." + listEntryPoints(entryPoints));
   let guessedWorkerFormat;
   const scriptExports = entryPoints[0][1].exports;
   if (scriptExports.length > 0) {
@@ -119623,7 +119625,7 @@ Did you mean to set the main field to${possiblePaths.length > 1 ? " one of" : ""
 
 // src/inspect.ts
 init_import_meta_url();
-var import_node_assert3 = __toESM(require("node:assert"));
+var import_node_assert4 = __toESM(require("node:assert"));
 var import_node_http3 = require("node:http");
 var import_node_os6 = __toESM(require("node:os"));
 var import_node_url8 = require("node:url");
@@ -120138,7 +120140,7 @@ function useInspector(props) {
     }
     function sendMessageToRemoteWebSocket(event) {
       try {
-        (0, import_node_assert3.default)(remoteWebSocket, "Trying to send a message to an undefined `remoteWebSocket`");
+        (0, import_node_assert4.default)(remoteWebSocket, "Trying to send a message to an undefined `remoteWebSocket`");
         remoteWebSocket.send(event.data);
       } catch (e2) {
         if (e2.message !== "WebSocket is not open: readyState 0 (CONNECTING)") {
@@ -120147,7 +120149,7 @@ function useInspector(props) {
       }
     }
     function sendMessageToLocalWebSocket(event) {
-      (0, import_node_assert3.default)(localWebSocket, "Trying to send a message to an undefined `localWebSocket`");
+      (0, import_node_assert4.default)(localWebSocket, "Trying to send a message to an undefined `localWebSocket`");
       localWebSocket.send(event.data);
     }
     if (localWebSocket && remoteWebSocket) {
@@ -120645,7 +120647,6 @@ function useLocalWorker({
 
 // src/dev/remote.tsx
 init_import_meta_url();
-var import_node_assert5 = __toESM(require("node:assert"));
 var import_promises4 = require("node:fs/promises");
 var import_node_path13 = __toESM(require("node:path"));
 var import_react5 = __toESM(require_react());
@@ -120656,7 +120657,7 @@ var import_node_url9 = require("node:url");
 var import_undici4 = __toESM(require_undici());
 async function sessionToken(account, ctx, abortSignal) {
   const { accountId } = account;
-  const initUrl = ctx.zone ? `/zones/${ctx.zone.id}/workers/edge-preview` : `/accounts/${accountId}/workers/subdomain/edge-preview`;
+  const initUrl = ctx.zone ? `/zones/${ctx.zone}/workers/edge-preview` : `/accounts/${accountId}/workers/subdomain/edge-preview`;
   const { exchange_url } = await fetchResult(initUrl, void 0, void 0, abortSignal);
   const { inspector_websocket, prewarm, token } = await (await (0, import_undici4.fetch)(exchange_url, { signal: abortSignal })).json();
   const { host } = new import_node_url9.URL(inspector_websocket);
@@ -120677,7 +120678,7 @@ function randomId2() {
 async function createPreviewToken(account, worker, ctx, abortSignal) {
   const { value, host, inspectorUrl, prewarmUrl } = await sessionToken(account, ctx, abortSignal);
   const { accountId } = account;
-  const scriptId = ctx.zone ? randomId2() : worker.name || host.split(".")[0];
+  const scriptId = worker.name || (ctx.zone ? randomId2() : host.split(".")[0]);
   const url3 = ctx.env && !ctx.legacyEnv ? `/accounts/${accountId}/workers/services/${scriptId}/environments/${ctx.env}/edge-preview` : `/accounts/${accountId}/workers/scripts/${scriptId}/edge-preview`;
   const mode = ctx.zone ? { routes: ["*/*"] } : { workers_dev: true };
   const formData = createWorkerUploadForm(worker);
@@ -120691,7 +120692,7 @@ async function createPreviewToken(account, worker, ctx, abortSignal) {
   }, void 0, abortSignal);
   return {
     value: preview_token,
-    host: ctx.zone ? ctx.zone.host : worker.name ? `${worker.name}.${host.split(".").slice(1).join(".")}` : host,
+    host: ctx.host ?? (worker.name ? `${worker.name}.${host.split(".").slice(1).join(".")}` : host),
     inspectorUrl,
     prewarmUrl
   };
@@ -120713,7 +120714,7 @@ async function createWorkerPreview(init, account, ctx, abortSignal) {
 
 // src/sites.tsx
 init_import_meta_url();
-var import_node_assert4 = __toESM(require("node:assert"));
+var import_node_assert5 = __toESM(require("node:assert"));
 var import_promises3 = require("node:fs/promises");
 var path13 = __toESM(require("node:path"));
 var import_ignore = __toESM(require_ignore());
@@ -120992,7 +120993,7 @@ async function syncAssets(accountId, scriptName, siteAssets, preview, dryRun) {
     logger.log("(Note: doing a dry run, not uploading or deleting anything.)");
     return { manifest: void 0, namespace: void 0 };
   }
-  (0, import_node_assert4.default)(accountId, "Missing accountId");
+  (0, import_node_assert5.default)(accountId, "Missing accountId");
   const title = `__${scriptName}-workers_sites_assets${preview ? "_preview" : ""}`;
   const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(title, accountId);
   const namespaceKeysResponse = await listKVNamespaceKeys(accountId, namespace);
@@ -121074,15 +121075,12 @@ function getAssetPaths(config, assetDirectory = config.site?.bucket, includePatt
 
 // src/dev/remote.tsx
 function Remote(props) {
-  (0, import_node_assert5.default)(props.accountId, "accountId is required");
-  (0, import_node_assert5.default)(props.apiToken, "apiToken is required");
   const previewToken = useWorker({
     name: props.name,
     bundle: props.bundle,
     format: props.format,
     modules: props.bundle ? props.bundle.modules : [],
     accountId: props.accountId,
-    apiToken: props.apiToken,
     bindings: props.bindings,
     assetPaths: props.assetPaths,
     port: props.port,
@@ -121091,7 +121089,8 @@ function Remote(props) {
     usageModel: props.usageModel,
     env: props.env,
     legacyEnv: props.legacyEnv,
-    zone: props.zone
+    zone: props.zone,
+    host: props.host
   });
   usePreviewServer({
     previewToken,
@@ -121114,7 +121113,6 @@ function useWorker(props) {
     format: format4,
     modules,
     accountId,
-    apiToken,
     bindings,
     assetPaths,
     compatibilityDate,
@@ -121124,6 +121122,7 @@ function useWorker(props) {
   } = props;
   const [token, setToken] = (0, import_react5.useState)();
   const startedRef = (0, import_react5.useRef)(false);
+  const accountIdRef = (0, import_react5.useRef)(accountId);
   (0, import_react5.useEffect)(() => {
     const abortController = new AbortController();
     async function start() {
@@ -121135,7 +121134,10 @@ function useWorker(props) {
       } else {
         logger.log("\u2394 Detected changes, restarted server.");
       }
-      const assets = await syncAssets(accountId, name2 + (!props.legacyEnv && props.env ? `-${props.env}` : ""), assetPaths, true, false);
+      accountIdRef.current = await requireAuth({
+        account_id: accountIdRef.current
+      });
+      const assets = await syncAssets(accountIdRef.current, name2 + (!props.legacyEnv && props.env ? `-${props.env}` : ""), assetPaths, true, false);
       const content = await (0, import_promises4.readFile)(bundle.path, "utf-8");
       const init = {
         name: name2,
@@ -121165,16 +121167,21 @@ function useWorker(props) {
         usage_model: usageModel
       };
       setToken(await createWorkerPreview(init, {
-        accountId,
-        apiToken
-      }, { env: props.env, legacyEnv: props.legacyEnv, zone: props.zone }, abortController.signal));
+        accountId: accountIdRef.current,
+        apiToken: requireApiToken()
+      }, {
+        env: props.env,
+        legacyEnv: props.legacyEnv,
+        zone: props.zone,
+        host: props.host
+      }, abortController.signal));
     }
     start().catch((err2) => {
       if (err2.code !== "ABORT_ERR") {
         if (err2.code === 10063) {
           const errorMessage = "Error: You need to register a workers.dev subdomain before running the dev command in remote mode";
           const solutionMessage = "You can either enable local mode by pressing l, or register a workers.dev subdomain here:";
-          const onboardingLink = `https://dash.cloudflare.com/${accountId}/workers/onboarding`;
+          const onboardingLink = `https://dash.cloudflare.com/${accountIdRef.current}/workers/onboarding`;
           logger.error(`${errorMessage}
 ${solutionMessage}
 ${onboardingLink}`);
@@ -121191,7 +121198,6 @@ ${onboardingLink}`);
     bundle,
     format4,
     accountId,
-    apiToken,
     port,
     assetPaths,
     compatibilityDate,
@@ -121201,7 +121207,8 @@ ${onboardingLink}`);
     modules,
     props.env,
     props.legacyEnv,
-    props.zone
+    props.zone,
+    props.host
   ]);
   return token;
 }
@@ -121390,7 +121397,6 @@ function useEsbuild({
 
 // src/dev/dev.tsx
 function DevImplementation(props) {
-  const apiToken = props.initialMode === "remote" ? getAPIToken() : void 0;
   const directory = useTmpDir();
   useCustomBuild(props.entry, props.build);
   if (props.public && props.entry.format === "service-worker") {
@@ -121420,12 +121426,10 @@ function DevImplementation(props) {
   const { isRawModeSupported } = (0, import_ink3.useStdin)();
   return isRawModeSupported ? /* @__PURE__ */ import_react7.default.createElement(InteractiveDevSession, {
     ...props,
-    bundle,
-    apiToken
+    bundle
   }) : /* @__PURE__ */ import_react7.default.createElement(DevSession, {
     ...props,
     bundle,
-    apiToken,
     local: props.initialMode === "local"
   });
 }
@@ -121475,7 +121479,6 @@ function DevSession(props) {
     bundle: props.bundle,
     format: props.entry.format,
     accountId: props.accountId,
-    apiToken: props.apiToken,
     bindings: props.bindings,
     assetPaths: props.assetPaths,
     public: props.public,
@@ -121488,7 +121491,8 @@ function DevSession(props) {
     usageModel: props.usageModel,
     env: props.env,
     legacyEnv: props.legacyEnv,
-    zone: props.zone
+    zone: props.zone,
+    host: props.host
   });
 }
 function useTmpDir() {
@@ -123605,7 +123609,10 @@ ${name2} is ${prettyBytes(filestat.size)} in size`);
       throw new FatalError(`Error: Pages only supports up to 20,000 files in a deployment. Ensure you have specified your build output directory correctly.`, 1);
     }
     const files2 = [...fileMap.values()];
-    const { jwt } = await fetchResult(`/accounts/${accountId}/pages/projects/${projectName}/upload-token`);
+    async function fetchJwt() {
+      return (await fetchResult(`/accounts/${accountId}/pages/projects/${projectName}/upload-token`)).jwt;
+    }
+    let jwt = await fetchJwt();
     const start = Date.now();
     const missingHashes = await fetchResult(`/pages/assets/check-missing`, {
       method: "POST",
@@ -123673,6 +123680,9 @@ ${name2} is ${prettyBytes(filestat.size)} in size`);
         } catch (e2) {
           if (attempts < MAX_UPLOAD_ATTEMPTS) {
             await new Promise((resolve11) => setTimeout(resolve11, attempts++ * 1e3));
+            if (e2.code === 8000013) {
+              jwt = await fetchJwt();
+            }
             return doUpload();
           } else {
             throw e2;
@@ -124265,6 +124275,32 @@ async function getMigrationsToUpload(scriptName, props) {
   return migrations;
 }
 
+// src/zones.ts
+init_import_meta_url();
+async function getZoneForRoute(route) {
+  const host = typeof route === "string" ? getHostFromUrl(route) : typeof route === "object" ? "zone_name" in route ? getHostFromUrl(route.zone_name) : getHostFromUrl(route.pattern) : void 0;
+  const id = typeof route === "object" && "zone_id" in route ? route.zone_id : host ? await getZoneIdFromHost(host) : void 0;
+  return id && host ? { id, host } : void 0;
+}
+function getHostFromUrl(urlLike) {
+  urlLike = urlLike.replace(/^\*(\.)?/g, "");
+  if (!(urlLike.startsWith("http://") || urlLike.startsWith("https://"))) {
+    urlLike = "http://" + urlLike;
+  }
+  return new URL(urlLike).host;
+}
+async function getZoneIdFromHost(host) {
+  const hostPieces = host.split(".");
+  while (hostPieces.length > 1) {
+    const zones = await fetchListResult(`/zones`, {}, new URLSearchParams({ name: hostPieces.join(".") }));
+    if (zones.length > 0) {
+      return zones[0].id;
+    }
+    hostPieces.shift();
+  }
+  throw new Error(`Could not find zone for ${host}`);
+}
+
 // src/publish.ts
 function sleep3(ms) {
   return new Promise((resolve11) => setTimeout(resolve11, ms));
@@ -124398,7 +124434,7 @@ async function publish(props) {
   const minify = props.minify ?? config.minify;
   const nodeCompat = props.nodeCompat ?? config.node_compat;
   if (nodeCompat) {
-    logger.warn("Enabling node.js compatibility mode for builtins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.");
+    logger.warn("Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.");
   }
   const scriptName = props.name;
   (0, import_node_assert9.default)(scriptName, 'You need to provide a name when publishing a worker. Either pass it as a cli arg with `--name <name>` or in your config file as `name = "<name>"`');
@@ -124411,7 +124447,7 @@ async function publish(props) {
   const destination = props.outDir ?? await import_tmp_promise2.default.dir({ unsafeCleanup: true });
   const envName = props.env ?? "production";
   const start = Date.now();
-  const notProd = !props.legacyEnv && props.env;
+  const notProd = Boolean(!props.legacyEnv && props.env);
   const workerName = notProd ? `${scriptName} (${envName})` : scriptName;
   const workerUrl = notProd ? `/accounts/${accountId}/workers/services/${scriptName}/environments/${envName}` : `/accounts/${accountId}/workers/scripts/${scriptName}`;
   let available_on_subdomain;
@@ -124539,13 +124575,7 @@ async function publish(props) {
   }
   logger.log("Uploaded", workerName, formatTime2(uploadMs));
   if (routesOnly.length > 0) {
-    deployments.push(fetchResult(`${workerUrl}/routes`, {
-      method: "PUT",
-      body: JSON.stringify(routesOnly.map((route) => typeof route !== "object" ? { pattern: route } : route)),
-      headers: {
-        "Content-Type": "application/json"
-      }
-    }).then(() => {
+    deployments.push(publishRoutes(routesOnly, { workerUrl, scriptName, notProd }).then(() => {
       if (routesOnly.length > 10) {
         return routesOnly.slice(0, 9).map((route) => renderRoute(route)).concat([`...and ${routesOnly.length - 10} more routes`]);
       }
@@ -124596,6 +124626,92 @@ ${onboardingLink}`);
     }
   }
 }
+async function publishRoutes(routes, {
+  workerUrl,
+  scriptName,
+  notProd
+}) {
+  try {
+    return await fetchResult(`${workerUrl}/routes`, {
+      method: "PUT",
+      body: JSON.stringify(routes.map((route) => typeof route !== "object" ? { pattern: route } : route)),
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+  } catch (e2) {
+    if (isAuthenticationError(e2)) {
+      return await publishRoutesFallback(routes, { scriptName, notProd });
+    } else {
+      throw e2;
+    }
+  }
+}
+async function publishRoutesFallback(routes, { scriptName, notProd }) {
+  if (notProd) {
+    throw new Error("Service environments combined with an API token that doesn't have 'All Zones' permissions is not supported.\nEither turn off service environments by setting `legacy_env = true`, creating an API token with 'All Zones' permissions, or logging in via OAuth");
+  }
+  logger.warn("The current authentication token does not have 'All Zones' permissions.\nFalling back to using the zone-based API endpoint to update each route individually.\nNote that there is no access to routes associated with zones that the API token does not have permission for.\nExisting routes for this Worker in such zones will not be deleted.");
+  const deployedRoutes = [];
+  const activeZones = /* @__PURE__ */ new Map();
+  const routesToDeploy = /* @__PURE__ */ new Map();
+  for (const route of routes) {
+    const zone = await getZoneForRoute(route);
+    if (zone) {
+      activeZones.set(zone.id, zone.host);
+      routesToDeploy.set(typeof route === "string" ? route : route.pattern, zone.id);
+    }
+  }
+  const allRoutes = /* @__PURE__ */ new Map();
+  const alreadyDeployedRoutes = /* @__PURE__ */ new Set();
+  for (const [zone, host] of activeZones) {
+    try {
+      for (const { pattern, script } of await fetchListResult(`/zones/${zone}/workers/routes`)) {
+        allRoutes.set(pattern, script);
+        if (script === scriptName) {
+          alreadyDeployedRoutes.add(pattern);
+        }
+      }
+    } catch (e2) {
+      if (isAuthenticationError(e2)) {
+        e2.notes.push({
+          text: `This could be because the API token being used does not have permission to access the zone "${host}" (${zone}).`
+        });
+      }
+      throw e2;
+    }
+  }
+  for (const [routePattern, zoneId] of routesToDeploy.entries()) {
+    if (allRoutes.has(routePattern)) {
+      const knownScript = allRoutes.get(routePattern);
+      if (knownScript === scriptName) {
+        alreadyDeployedRoutes.delete(routePattern);
+        continue;
+      } else {
+        throw new Error(`The route with pattern "${routePattern}" is already associated with another worker called "${knownScript}".`);
+      }
+    }
+    const { pattern } = await fetchResult(`/zones/${zoneId}/workers/routes`, {
+      method: "POST",
+      body: JSON.stringify({
+        pattern: routePattern,
+        script: scriptName
+      }),
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+    deployedRoutes.push(pattern);
+  }
+  if (alreadyDeployedRoutes.size) {
+    logger.warn("Previously deployed routes:\nThe following routes were already associated with this worker, and have not been deleted:\n" + [...alreadyDeployedRoutes.values()].map((route) => ` - "${route}"
+`) + "If these routes are not wanted then you can remove them in the dashboard.");
+  }
+  return deployedRoutes;
+}
+function isAuthenticationError(e2) {
+  return e2 instanceof ParseError && e2.code === 1e4;
+}
 
 // src/r2.ts
 init_import_meta_url();
@@ -124824,9 +124940,10 @@ function Accounts(props) {
 }
 async function getUserInfo() {
   const apiToken = getAPIToken();
+  const apiTokenFromEnv = getCloudflareAPITokenFromEnv();
   return apiToken ? {
     apiToken,
-    authType: "OAuth",
+    authType: apiTokenFromEnv ? "API" : "OAuth",
     email: await getEmail(),
     accounts: await getAccounts()
   } : void 0;
@@ -125037,7 +125154,10 @@ ${err2.message ?? err2}`);
     if (!isInsideGitProject && isGitInstalled) {
       const shouldInitGit = yesFlag || await confirm("Would you like to use git to manage this Worker?");
       if (shouldInitGit) {
-        await execa("git", ["init", "--initial-branch=main"], {
+        await execa("git", ["init"], {
+          cwd: creationDirectory
+        });
+        await execa("git", ["branch", "-m", "main"], {
           cwd: creationDirectory
         });
         await (0, import_promises10.writeFile)(import_node_path21.default.join(creationDirectory, ".gitignore"), readFileSync5(import_node_path21.default.join(__dirname, "../templates/gitignore")));
@@ -125378,35 +125498,21 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
     if (upstreamProtocol === "http") {
       logger.warn("Setting upstream-protocol to http is not currently implemented.\nIf this is required in your project, please add your use case to the following issue:\nhttps://github.com/cloudflare/wrangler2/issues/583.");
     }
-    const accountId = !args.local ? await requireAuth(config) : void 0;
-    function getHost(urlLike) {
-      urlLike = urlLike.replace(/^\*(\.)?/g, "");
-      if (!(urlLike.startsWith("http://") || urlLike.startsWith("https://"))) {
-        urlLike = "http://" + urlLike;
-      }
-      return new URL(urlLike).host;
-    }
-    async function getZoneId(host) {
-      const zones = await fetchResult(`/zones`, {}, new URLSearchParams({ name: host }));
-      return zones[0]?.id;
-    }
-    let zone;
+    let host = args.host || config.dev.host;
+    let zoneId;
     if (!args.local) {
-      const hostLike = args.host || config.dev.host || args.routes && args.routes[0] || config.route || config.routes && config.routes[0];
-      let zoneId = typeof hostLike === "object" && "zone_id" in hostLike ? hostLike.zone_id : void 0;
-      const host = typeof hostLike === "string" ? getHost(hostLike) : typeof hostLike === "object" ? "zone_name" in hostLike ? getHost(hostLike.zone_name) : getHost(hostLike.pattern) : void 0;
-      const hostPieces = typeof host === "string" ? host.split(".") : void 0;
-      while (!zoneId && hostPieces && hostPieces.length > 1) {
-        zoneId = await getZoneId(hostPieces.join("."));
-        hostPieces.shift();
-      }
-      if (host && !zoneId) {
-        throw new Error(`Could not find zone for ${hostLike}`);
-      }
-      zone = typeof zoneId === "string" && typeof host === "string" ? {
-        host,
-        id: zoneId
-      } : void 0;
+      if (host) {
+        zoneId = await getZoneIdFromHost(host);
+      }
+      const routes = args.routes || config.route || config.routes;
+      if (!zoneId && routes) {
+        const firstRoute = Array.isArray(routes) ? routes[0] : routes;
+        const zone = await getZoneForRoute(firstRoute);
+        if (zone) {
+          zoneId = zone.id;
+          host = zone.host;
+        }
+      }
     }
     const nodeCompat = args.nodeCompat ?? config.node_compat;
     if (nodeCompat) {
@@ -125453,7 +125559,8 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       name: getScriptName(args, config),
       entry,
       env: args.env,
-      zone,
+      zone: zoneId,
+      host,
       rules: getRules(config),
       legacyEnv: isLegacyEnv(config),
       minify: args.minify ?? config.minify,
@@ -125466,7 +125573,7 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       upstreamProtocol,
       localProtocol: args["local-protocol"] || config.dev.local_protocol,
       enableLocalPersistence: args["experimental-enable-local-persistence"] || false,
-      accountId,
+      accountId: config.account_id,
       assetPaths: getAssetPaths(config, args.site, args.siteInclude, args.siteExclude),
       port: args.port || config.dev.port || await getPorts({ port: DEFAULT_LOCAL_PORT }),
       ip: args.ip || config.dev.ip,
@@ -125739,6 +125846,7 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       rules: getRules(config),
       env: args.env,
       zone: void 0,
+      host: void 0,
       legacyEnv: isLegacyEnv(config),
       build: config.build || {},
       minify: void 0,