wrangler 4.24.1 → 4.24.3

package/wrangler-dist/cli.js

@@ -22064,29 +22064,46 @@ async function constructBuildCommand(options, configPath, logger4) {
 }
 function dockerBuild(dockerPath, options) {
   let errorHandled = false;
-  return new Promise((resolve24, reject) => {
-    const child = (0, import_child_process.spawn)(dockerPath, options.buildCmd, {
-      stdio: ["pipe", "inherit", "inherit"]
-    });
-    if (child.stdin !== null) {
-      child.stdin.write(options.dockerfile);
-      child.stdin.end();
+  let resolve24;
+  let reject;
+  const ready = new Promise((res, rej) => {
+    resolve24 = res;
+    reject = rej;
+  });
+  const child = (0, import_child_process.spawn)(dockerPath, options.buildCmd, {
+    stdio: ["pipe", "inherit", "inherit"],
+    // We need to set detached to true so that the child process
+    // will control all of its child processed and we can kill
+    // all of them in case we need to abort the build process
+    detached: true
+  });
+  if (child.stdin !== null) {
+    child.stdin.write(options.dockerfile);
+    child.stdin.end();
+  }
+  child.on("exit", (code) => {
+    if (code === 0) {
+      resolve24();
+    } else if (!errorHandled) {
+      errorHandled = true;
+      reject(new Error(`Build exited with code: ${code}`));
     }
-    child.on("exit", (code) => {
-      if (code === 0) {
-        resolve24();
-      } else if (!errorHandled) {
-        errorHandled = true;
-        reject(new Error(`Build exited with code: ${code}`));
-      }
-    });
-    child.on("error", (err) => {
-      if (!errorHandled) {
-        errorHandled = true;
-        reject(err);
-      }
-    });
   });
+  child.on("error", (err) => {
+    if (!errorHandled) {
+      errorHandled = true;
+      reject(err);
+    }
+  });
+  return {
+    abort: /* @__PURE__ */ __name(() => {
+      child.unref();
+      if (child.pid !== void 0) {
+        process.kill(-child.pid);
+      }
+    }, "abort"),
+    ready
+  };
 }
 async function buildImage(dockerPath, options, configPath) {
   const { buildCmd, dockerfile } = await constructBuildCommand(
@@ -22099,7 +22116,7 @@ async function buildImage(dockerPath, options, configPath) {
     },
     configPath
   );
-  await dockerBuild(dockerPath, { buildCmd, dockerfile });
+  return dockerBuild(dockerPath, { buildCmd, dockerfile });
 }
 var import_child_process, import_fs5, import_path5;
 var init_build = __esm({
@@ -22256,27 +22273,47 @@ var init_utils = __esm({
     import_fs6 = require("fs");
     import_path6 = __toESM(require("path"));
     init_inspect();
-    runDockerCmd = /* @__PURE__ */ __name(async (dockerPath, args, stdio) => {
+    runDockerCmd = /* @__PURE__ */ __name((dockerPath, args, stdio) => {
+      let aborted = false;
+      let resolve24;
+      let reject;
+      const ready = new Promise((res, rej) => {
+        resolve24 = res;
+        reject = rej;
+      });
       const child = (0, import_child_process3.spawn)(dockerPath, args, {
-        stdio: stdio ?? "inherit"
+        stdio: stdio ?? "inherit",
+        // We need to set detached to true so that the child process
+        // will control all of its child processed and we can kill
+        // all of them in case we need to abort the build process
+        detached: true
       });
       let errorHandled = false;
-      await new Promise((resolve24, reject) => {
-        child.on("close", (code) => {
-          if (code === 0) {
-            resolve24();
-          } else if (!errorHandled) {
-            errorHandled = true;
-            reject(new Error(`Docker command exited with code: ${code}`));
-          }
-        });
-        child.on("error", (err) => {
-          if (!errorHandled) {
-            errorHandled = true;
-            reject(new Error(`Docker command failed: ${err.message}`));
-          }
-        });
+      child.on("close", (code) => {
+        if (code === 0 || aborted) {
+          resolve24({ aborted });
+        } else if (!errorHandled) {
+          errorHandled = true;
+          reject(new Error(`Docker command exited with code: ${code}`));
+        }
+      });
+      child.on("error", (err) => {
+        if (!errorHandled) {
+          errorHandled = true;
+          reject(new Error(`Docker command failed: ${err.message}`));
+        }
       });
+      return {
+        abort: /* @__PURE__ */ __name(() => {
+          aborted = true;
+          child.unref();
+          if (child.pid !== void 0) {
+            process.kill(-child.pid);
+          }
+        }, "abort"),
+        ready,
+        then: /* @__PURE__ */ __name(async (resolve25, reject2) => ready.then(resolve25).catch(reject2), "then")
+      };
     }, "runDockerCmd");
     runDockerCmdWithOutput = /* @__PURE__ */ __name(async (dockerPath, args) => {
       return new Promise((resolve24, reject) => {
@@ -22383,16 +22420,27 @@ var init_types = __esm({
 // ../containers-shared/src/images.ts
 async function pullImage(dockerPath, options) {
   await dockerLoginManagedRegistry(dockerPath);
-  await runDockerCmd(dockerPath, [
+  const pull = runDockerCmd(dockerPath, [
     "pull",
     options.image,
     // All containers running on our platform need to be built for amd64 architecture, but by default docker pull seems to look for an image matching the host system, so we need to specify this here
     "--platform",
     "linux/amd64"
   ]);
-  await runDockerCmd(dockerPath, ["tag", options.image, options.imageTag]);
+  const ready = pull.ready.then(async ({ aborted }) => {
+    if (!aborted) {
+      await runDockerCmd(dockerPath, ["tag", options.image, options.imageTag]);
+    }
+  });
+  return {
+    abort: /* @__PURE__ */ __name(() => {
+      pull.abort();
+    }, "abort"),
+    ready
+  };
 }
-async function prepareContainerImagesForDev(dockerPath, containerOptions, configPath) {
+async function prepareContainerImagesForDev(dockerPath, containerOptions, configPath, onContainerImagePreparationStart, onContainerImagePreparationEnd) {
+  let aborted = false;
   if (process.platform === "win32") {
     throw new Error(
       "Local development with containers is currently not supported on Windows. You should use WSL instead. You can also set `enable_containers` to false if you do not need to develop the container part of your application."
@@ -22401,7 +22449,18 @@ async function prepareContainerImagesForDev(dockerPath, containerOptions, config
   await verifyDockerInstalled(dockerPath);
   for (const options of containerOptions) {
     if (isDockerfile(options.image, configPath)) {
-      await buildImage(dockerPath, options, configPath);
+      const build5 = await buildImage(dockerPath, options, configPath);
+      onContainerImagePreparationStart({
+        containerOptions: options,
+        abort: /* @__PURE__ */ __name(() => {
+          aborted = true;
+          build5.abort();
+        }, "abort")
+      });
+      await build5.ready;
+      onContainerImagePreparationEnd({
+        containerOptions: options
+      });
     } else {
       if (!isCloudflareRegistryLink(options.image)) {
         throw new Error(
@@ -22409,12 +22468,25 @@ async function prepareContainerImagesForDev(dockerPath, containerOptions, config
 To use an existing image from another repository, see https://developers.cloudflare.com/containers/image-management/#using-existing-images`
         );
       }
-      await pullImage(dockerPath, options);
+      const pull = await pullImage(dockerPath, options);
+      onContainerImagePreparationStart({
+        containerOptions: options,
+        abort: /* @__PURE__ */ __name(() => {
+          aborted = true;
+          pull.abort();
+        }, "abort")
+      });
+      await pull.ready;
+      onContainerImagePreparationEnd({
+        containerOptions: options
+      });
+    }
+    if (!aborted) {
+      await checkExposedPorts(dockerPath, options);
     }
-    await checkExposedPorts(dockerPath, options);
   }
 }
-async function resolveImageName(accountId, image) {
+function resolveImageName(accountId, image) {
   let url4;
   try {
     url4 = new URL(`http://${image}`);
@@ -29515,7 +29587,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.24.1";
+    version = "4.24.3";
   }
 });
 
@@ -60406,38 +60478,7 @@ var init_navigator_user_agent = __esm({
   }
 });
 
-// src/pages/utils.ts
-function isUrl(maybeUrl) {
-  if (!maybeUrl) {
-    return false;
-  }
-  try {
-    new URL(maybeUrl);
-    return true;
-  } catch (e7) {
-    return false;
-  }
-}
-function getPagesProjectRoot() {
-  const cwd2 = process.cwd();
-  if (projectRootCache !== void 0 && projectRootCacheCwd === cwd2) {
-    return projectRootCache;
-  }
-  const packagePath = findUpSync("package.json");
-  projectRootCache = packagePath ? import_node_path23.default.dirname(packagePath) : process.cwd();
-  projectRootCacheCwd = cwd2;
-  return projectRootCache;
-}
-function getPagesTmpDir() {
-  const projectRoot = getPagesProjectRoot();
-  if (tmpDirCache !== void 0 && tmpDirCacheProjectRoot === projectRoot) {
-    return tmpDirCache;
-  }
-  const tmpDir = getWranglerTmpDir(getPagesProjectRoot(), "pages");
-  tmpDirCache = tmpDir.path;
-  tmpDirCacheProjectRoot = projectRoot;
-  return tmpDirCache;
-}
+// src/utils/debounce.ts
 function debounce(fn2, delayMs = 100) {
   let crrTimeoutId;
   return () => {
@@ -60449,22 +60490,9 @@ function debounce(fn2, delayMs = 100) {
     }, delayMs);
   };
 }
-var import_node_path23, RUNNING_BUILDERS, CLEANUP_CALLBACKS, CLEANUP, projectRootCacheCwd, projectRootCache, tmpDirCacheProjectRoot, tmpDirCache;
-var init_utils3 = __esm({
-  "src/pages/utils.ts"() {
+var init_debounce = __esm({
+  "src/utils/debounce.ts"() {
     init_import_meta_url();
-    import_node_path23 = __toESM(require("path"));
-    init_find_up();
-    init_paths();
-    RUNNING_BUILDERS = [];
-    CLEANUP_CALLBACKS = [];
-    CLEANUP = /* @__PURE__ */ __name(() => {
-      CLEANUP_CALLBACKS.forEach((callback) => callback());
-      RUNNING_BUILDERS.forEach((builder) => builder.stop?.());
-    }, "CLEANUP");
-    __name(isUrl, "isUrl");
-    __name(getPagesProjectRoot, "getPagesProjectRoot");
-    __name(getPagesTmpDir, "getPagesTmpDir");
     __name(debounce, "debounce");
   }
 });
@@ -60487,8 +60515,8 @@ var init_BundlerController = __esm({
     init_use_esbuild();
     init_logger();
     init_navigator_user_agent();
-    init_utils3();
     init_paths();
+    init_debounce();
     init_BaseController();
     init_events();
     init_utils2();
@@ -62729,7 +62757,7 @@ async function buildAndMaybePush(args, pathToDocker, push, configPath, container
     await dockerBuild(pathToDocker, {
       buildCmd,
       dockerfile
-    });
+    }).ready;
     const inspectOutput = await dockerImageInspect(pathToDocker, {
       imageTag,
       formatString: "{{ .Size }} {{ len .RootFS.Layers }} {{json .RepoDigests}}"
@@ -63791,9 +63819,12 @@ function createApplicationToModifyApplication(req) {
     scheduling_policy: req.scheduling_policy
   };
 }
-function applicationToCreateApplication(application) {
+function applicationToCreateApplication(accountId, application) {
   const app = {
-    configuration: application.configuration,
+    configuration: {
+      ...application.configuration,
+      image: resolveImageName(accountId, application.configuration.image)
+    },
     constraints: application.constraints,
     max_instances: application.max_instances,
     name: application.name,
@@ -63835,7 +63866,7 @@ function containerAppToInstanceType(containerApp) {
     return "dev" /* DEV */;
   }
 }
-function containerAppToCreateApplication(containerApp, observability, existingApp, skipDefaults = false) {
+function containerAppToCreateApplication(accountId, containerApp, observability, existingApp, skipDefaults = false) {
   const observabilityConfiguration = observabilityToConfiguration(
     observability,
     existingApp?.configuration.observability
@@ -63854,7 +63885,11 @@ function containerAppToCreateApplication(containerApp, observability, existingAp
   const app = {
     ...containerApp,
     name: containerApp.name,
-    configuration,
+    configuration: {
+      ...configuration,
+      // De-sugar image name
+      image: resolveImageName(accountId, configuration.image)
+    },
     instances: containerApp.instances ?? 0,
     scheduling_policy: containerApp.scheduling_policy ?? "default" /* DEFAULT */,
     constraints: {
@@ -64049,7 +64084,9 @@ async function apply(args, config) {
       appConfigNoDefaults.configuration ??= {};
       appConfigNoDefaults.configuration.image = application.configuration.image;
     }
+    const accountId = config.account_id || await getAccountId(config);
     const appConfig = containerAppToCreateApplication(
+      accountId,
       appConfigNoDefaults,
       config.observability,
       application,
@@ -64057,7 +64094,7 @@ async function apply(args, config) {
     );
     if (application !== void 0 && application !== null) {
       const prevApp = sortObjectRecursive(
-        stripUndefined(applicationToCreateApplication(application))
+        stripUndefined(applicationToCreateApplication(accountId, application))
       );
       if (appConfigNoDefaults.scheduling_policy === void 0) {
         appConfig.scheduling_policy = prevApp.scheduling_policy;
@@ -64179,16 +64216,7 @@ async function apply(args, config) {
     s5.split("\n").map((line) => line.trim()).forEach((el) => {
       printLine(el, "  ");
     });
-    const accountId = config.account_id || await getAccountId(config);
-    const configToPush = {
-      ...appConfig,
-      configuration: {
-        ...appConfig.configuration,
-        // De-sugar image name. We do it here so that the user
-        // sees the simplified image name in diffs.
-        image: await resolveImageName(accountId, appConfig.configuration.image)
-      }
-    };
+    const configToPush = { ...appConfig };
     actions.push({
       action: "create",
       application: configToPush
@@ -64697,7 +64725,7 @@ function getDatabaseInfoFromConfig(config, name2) {
   return null;
 }
 var getDatabaseByNameOrBinding, getDatabaseInfoFromIdOrName;
-var init_utils4 = __esm({
+var init_utils3 = __esm({
   "src/d1/utils.ts"() {
     init_import_meta_url();
     init_cfetch();
@@ -65207,7 +65235,7 @@ function getMetricsConfig({
   return { enabled: true, deviceId };
 }
 function writeMetricsConfig(config) {
-  (0, import_node_fs12.mkdirSync)(import_node_path24.default.dirname(getMetricsConfigPath()), { recursive: true });
+  (0, import_node_fs12.mkdirSync)(import_node_path23.default.dirname(getMetricsConfigPath()), { recursive: true });
   (0, import_node_fs12.writeFileSync)(
     getMetricsConfigPath(),
     JSON.stringify(
@@ -65237,7 +65265,7 @@ function updateMetricsPermission(enabled) {
   writeMetricsConfig(config);
 }
 function getMetricsConfigPath() {
-  return import_node_path24.default.resolve(getGlobalWranglerConfigPath(), "metrics.json");
+  return import_node_path23.default.resolve(getGlobalWranglerConfigPath(), "metrics.json");
 }
 function getDeviceId(config) {
   const deviceId = config.deviceId ?? (0, import_node_crypto5.randomUUID)();
@@ -65246,13 +65274,13 @@ function getDeviceId(config) {
   }
   return deviceId;
 }
-var import_node_crypto5, import_node_fs12, import_node_path24, CURRENT_METRICS_DATE;
+var import_node_crypto5, import_node_fs12, import_node_path23, CURRENT_METRICS_DATE;
 var init_metrics_config = __esm({
   "src/metrics/metrics-config.ts"() {
     init_import_meta_url();
     import_node_crypto5 = require("crypto");
     import_node_fs12 = require("fs");
-    import_node_path24 = __toESM(require("path"));
+    import_node_path23 = __toESM(require("path"));
     init_misc_variables();
     init_global_wrangler_config_path();
     init_logger();
@@ -65773,7 +65801,7 @@ var init_bindings = __esm({
     init_cfetch();
     init_create();
     init_list();
-    init_utils4();
+    init_utils3();
     init_dialogs();
     init_errors();
     init_helpers4();
@@ -66229,18 +66257,18 @@ var require_command_exists2 = __commonJS({
 // src/deployment-bundle/capnp.ts
 function handleUnsafeCapnp(capnp) {
   if (capnp.compiled_schema) {
-    return (0, import_node_fs13.readFileSync)((0, import_node_path25.resolve)(capnp.compiled_schema));
+    return (0, import_node_fs13.readFileSync)((0, import_node_path24.resolve)(capnp.compiled_schema));
   }
   const { base_path, source_schemas } = capnp;
   const capnpSchemas = (source_schemas ?? []).map(
-    (x6) => (0, import_node_path25.resolve)(base_path, x6)
+    (x6) => (0, import_node_path24.resolve)(base_path, x6)
   );
   if (!(0, import_command_exists.sync)("capnp")) {
     throw new UserError(
       "The capnp compiler is required to upload capnp schemas, but is not present."
     );
   }
-  const srcPrefix = (0, import_node_path25.resolve)(base_path ?? ".");
+  const srcPrefix = (0, import_node_path24.resolve)(base_path ?? ".");
   const capnpProcess = (0, import_node_child_process3.spawnSync)("capnp", [
     "compile",
     "-o-",
@@ -66255,13 +66283,13 @@ function handleUnsafeCapnp(capnp) {
   }
   return capnpProcess.stdout;
 }
-var import_node_child_process3, import_node_fs13, import_node_path25, import_command_exists;
+var import_node_child_process3, import_node_fs13, import_node_path24, import_command_exists;
 var init_capnp = __esm({
   "src/deployment-bundle/capnp.ts"() {
     init_import_meta_url();
     import_node_child_process3 = require("child_process");
     import_node_fs13 = require("fs");
-    import_node_path25 = require("path");
+    import_node_path24 = require("path");
     import_command_exists = __toESM(require_command_exists2());
     init_errors();
     __name(handleUnsafeCapnp, "handleUnsafeCapnp");
@@ -66322,6 +66350,7 @@ function createWorkerUploadForm(worker) {
           jwt: assets.jwt,
           config: assetConfig
         },
+        ...annotations && { annotations },
         ...compatibility_date && { compatibility_date },
         ...compatibility_flags && { compatibility_flags }
       })
@@ -66619,14 +66648,14 @@ function createWorkerUploadForm(worker) {
   if (hasManifest && main2.type === "esm") {
     (0, import_node_assert13.default)(modules !== void 0);
     const subDirs = new Set(
-      modules.map((module3) => import_node_path26.default.posix.dirname(module3.name))
+      modules.map((module3) => import_node_path25.default.posix.dirname(module3.name))
     );
     for (const subDir of subDirs) {
       if (subDir === ".") {
         continue;
       }
-      const relativePath = import_node_path26.default.posix.relative(subDir, manifestModuleName);
-      const filePath = import_node_path26.default.posix.join(subDir, manifestModuleName);
+      const relativePath = import_node_path25.default.posix.relative(subDir, manifestModuleName);
+      const filePath = import_node_path25.default.posix.join(subDir, manifestModuleName);
       modules.push({
         name: filePath,
         filePath,
@@ -66743,13 +66772,13 @@ function createWorkerUploadForm(worker) {
   }
   return formData;
 }
-var import_node_assert13, import_node_fs14, import_node_path26, import_undici6, moduleTypeMimeType;
+var import_node_assert13, import_node_fs14, import_node_path25, import_undici6, moduleTypeMimeType;
 var init_create_worker_upload_form = __esm({
   "src/deployment-bundle/create-worker-upload-form.ts"() {
     init_import_meta_url();
     import_node_assert13 = __toESM(require("assert"));
     import_node_fs14 = require("fs");
-    import_node_path26 = __toESM(require("path"));
+    import_node_path25 = __toESM(require("path"));
     import_undici6 = __toESM(require_undici());
     init_errors();
     init_bindings();
@@ -66978,9 +67007,9 @@ async function* getFilesInFolder(dirPath) {
       continue;
     }
     if (file.isDirectory()) {
-      yield* await getFilesInFolder(path30.join(dirPath, file.name));
+      yield* await getFilesInFolder(path29.join(dirPath, file.name));
     } else {
-      yield path30.join(dirPath, file.name);
+      yield path29.join(dirPath, file.name);
     }
   }
 }
@@ -66988,11 +67017,11 @@ function hashFileContent(hasher, content) {
   return hasher.h64ToString(content).substring(0, 10);
 }
 function hashAsset(hasher, filePath, content) {
-  const extName = path30.extname(filePath) || "";
-  const baseName = path30.basename(filePath, extName);
-  const directory = path30.dirname(filePath);
+  const extName = path29.extname(filePath) || "";
+  const baseName = path29.basename(filePath, extName);
+  const directory = path29.dirname(filePath);
   const hash = hashFileContent(hasher, content);
-  return urlSafe(path30.join(directory, `${baseName}.${hash}${extName}`));
+  return urlSafe(path29.join(directory, `${baseName}.${hash}${extName}`));
 }
 async function createKVNamespaceIfNotAlreadyExisting(complianceConfig, title, accountId) {
   const namespaces = await listKVNamespaces(complianceConfig, accountId);
@@ -67033,7 +67062,7 @@ async function syncWorkersSite(complianceConfig, accountId, scriptName, siteAsse
   );
   const namespaceKeyInfoMap = new Map(namespaceKeysResponse.map((x6) => [x6.name, x6]));
   const namespaceKeys = new Set(namespaceKeysResponse.map((x6) => x6.name));
-  const assetDirectory = path30.join(
+  const assetDirectory = path29.join(
     siteAssets.baseDirectory,
     siteAssets.assetDirectory
   );
@@ -67062,7 +67091,7 @@ async function syncWorkersSite(complianceConfig, accountId, scriptName, siteAsse
   __name(logDiff, "logDiff");
   logger.info("Building list of assets to upload...");
   for await (const absAssetFile of getFilesInFolder(assetDirectory)) {
-    const assetFile = path30.relative(assetDirectory, absAssetFile);
+    const assetFile = path29.relative(assetDirectory, absAssetFile);
     if (!include(assetFile) || exclude2(assetFile)) {
       continue;
     }
@@ -67088,7 +67117,7 @@ async function syncWorkersSite(complianceConfig, accountId, scriptName, siteAsse
       skipCount++;
     }
     namespaceKeys.delete(assetKey);
-    const manifestKey = urlSafe(path30.relative(assetDirectory, absAssetFile));
+    const manifestKey = urlSafe(path29.relative(assetDirectory, absAssetFile));
     manifest[manifestKey] = assetKey;
   }
   if (uploadBucket.length > 0) {
@@ -67223,7 +67252,7 @@ function urlSafe(filePath) {
   return filePath.replace(/\\/g, "/");
 }
 function getSiteAssetPaths(config, assetDirectory, includePatterns = config.site?.include ?? [], excludePatterns = config.site?.exclude ?? []) {
-  const baseDirectory = assetDirectory ? process.cwd() : path30.resolve(path30.dirname(config.configPath ?? "wrangler.toml"));
+  const baseDirectory = assetDirectory ? process.cwd() : path29.resolve(path29.dirname(config.configPath ?? "wrangler.toml"));
   assetDirectory ??= config.site?.bucket;
   if (assetDirectory) {
     return {
@@ -67236,13 +67265,13 @@ function getSiteAssetPaths(config, assetDirectory, includePatterns = config.site
     return void 0;
   }
 }
-var import_node_assert15, import_promises9, path30, ALWAYS_IGNORE, HIDDEN_FILES_TO_INCLUDE, MAX_DIFF_LINES, MAX_BUCKET_SIZE2, MAX_BUCKET_KEYS, MAX_BATCH_OPERATIONS;
+var import_node_assert15, import_promises9, path29, ALWAYS_IGNORE, HIDDEN_FILES_TO_INCLUDE, MAX_DIFF_LINES, MAX_BUCKET_SIZE2, MAX_BUCKET_KEYS, MAX_BATCH_OPERATIONS;
 var init_sites = __esm({
   "src/sites.ts"() {
     init_import_meta_url();
     import_node_assert15 = __toESM(require("assert"));
     import_promises9 = require("fs/promises");
-    path30 = __toESM(require("path"));
+    path29 = __toESM(require("path"));
     init_workers_shared();
     init_source();
     init_xxhash_wasm();
@@ -75007,7 +75036,7 @@ async function aiFinetuneList(complianceConfig, accountId) {
   return results;
 }
 var listCatalogEntries, listFinetuneEntries;
-var init_utils5 = __esm({
+var init_utils4 = __esm({
   "src/ai/utils.ts"() {
     init_import_meta_url();
     init_cfetch();
@@ -75037,7 +75066,7 @@ var init_createFinetune = __esm({
     init_create_command();
     init_logger();
     init_user2();
-    init_utils5();
+    init_utils4();
     requiredAssets = ["adapter_config.json", "adapter_model.safetensors"];
     aiFineTuneCreateCommand = createCommand({
       metadata: {
@@ -75148,7 +75177,7 @@ var init_listCatalog = __esm({
     init_create_command();
     init_logger();
     init_user2();
-    init_utils5();
+    init_utils4();
     aiModelsCommand = createCommand({
       metadata: {
         description: "List catalog models",
@@ -75200,7 +75229,7 @@ var init_listFinetune = __esm({
     init_create_command();
     init_logger();
     init_user2();
-    init_utils5();
+    init_utils4();
     aiFineTuneListCommand = createCommand({
       metadata: {
         description: "List your finetune files",
@@ -77977,7 +78006,7 @@ var init_delete2 = __esm({
     init_dialogs();
     init_logger();
     init_user2();
-    init_utils4();
+    init_utils3();
     d1DeleteCommand = createCommand({
       metadata: {
         description: "Delete D1 database",
@@ -78285,7 +78314,7 @@ async function executeLocally({
   }
   const id = localDB.previewDatabaseUuid ?? localDB.uuid;
   const persistencePath = getLocalPersistencePath(persistTo, config);
-  const d1Persist = import_node_path27.default.join(persistencePath, "v3", "d1");
+  const d1Persist = import_node_path26.default.join(persistencePath, "v3", "d1");
   logger.log(
     `\u{1F300} Executing on local database ${name2} (${id}) from ${readableRelative(
       d1Persist
@@ -78566,13 +78595,13 @@ async function checkForSQLiteBinary(filename) {
     );
   }
 }
-var import_fs15, import_node_assert16, import_node_path27, import_md5_file, import_miniflare12, import_undici8, d1ExecuteCommand;
+var import_fs15, import_node_assert16, import_node_path26, import_md5_file, import_miniflare12, import_undici8, d1ExecuteCommand;
 var init_execute = __esm({
   "src/d1/execute.ts"() {
     init_import_meta_url();
     import_fs15 = require("fs");
     import_node_assert16 = __toESM(require("assert"));
-    import_node_path27 = __toESM(require("path"));
+    import_node_path26 = __toESM(require("path"));
     init_interactive();
     init_source();
     import_md5_file = __toESM(require_md5_file());
@@ -78589,7 +78618,7 @@ var init_execute = __esm({
     init_paths();
     init_user2();
     init_splitter();
-    init_utils4();
+    init_utils3();
     d1ExecuteCommand = createCommand({
       metadata: {
         description: "Execute a command or SQL file",
@@ -78742,7 +78771,7 @@ async function exportLocal(config, name2, output, tables, noSchema, noData) {
   }
   const id = localDB.previewDatabaseUuid ?? localDB.uuid;
   const persistencePath = getLocalPersistencePath(void 0, config);
-  const d1Persist = import_node_path28.default.join(persistencePath, "v3", "d1");
+  const d1Persist = import_node_path27.default.join(persistencePath, "v3", "d1");
   logger.log(
     `\u{1F300} Exporting local database ${name2} (${id}) from ${readableRelative(
       d1Persist
@@ -78856,12 +78885,12 @@ async function pollExport(s5, complianceConfig, accountId, db, dumpOptions, curr
     );
   }
 }
-var import_promises12, import_node_path28, import_miniflare13, import_undici9, d1ExportCommand;
+var import_promises12, import_node_path27, import_miniflare13, import_undici9, d1ExportCommand;
 var init_export = __esm({
   "src/d1/export.ts"() {
     init_import_meta_url();
     import_promises12 = __toESM(require("fs/promises"));
-    import_node_path28 = __toESM(require("path"));
+    import_node_path27 = __toESM(require("path"));
     init_interactive();
     init_source();
     import_miniflare13 = require("miniflare");
@@ -78875,7 +78904,7 @@ var init_export = __esm({
     init_parse();
     init_paths();
     init_user2();
-    init_utils4();
+    init_utils3();
     d1ExportCommand = createCommand({
       metadata: {
         description: "Export the contents or schema of your database as a .sql file",
@@ -78960,7 +78989,7 @@ var init_info = __esm({
     init_create_command();
     init_logger();
     init_user2();
-    init_utils4();
+    init_utils3();
     d1InfoCommand = createCommand({
       metadata: {
         description: "Get information about a D1 database, including the current database size and state",
@@ -79146,7 +79175,7 @@ var init_insights = __esm({
     init_create_command();
     init_logger();
     init_user2();
-    init_utils4();
+    init_utils3();
     cliOptionToGraphQLOption = {
       time: "queryDurationMs",
       reads: "rowsRead",
@@ -79477,7 +79506,7 @@ var init_apply2 = __esm({
     init_logger();
     init_constants4();
     init_execute();
-    init_utils4();
+    init_utils3();
     init_helpers6();
     d1MigrationsApplyCommand = createCommand({
       metadata: {
@@ -79664,7 +79693,7 @@ var init_create3 = __esm({
     init_errors();
     init_logger();
     init_constants4();
-    init_utils4();
+    init_utils3();
     init_helpers6();
     d1MigrationsCreateCommand = createCommand({
       metadata: {
@@ -79734,7 +79763,7 @@ var init_list3 = __esm({
     init_logger();
     init_user2();
     init_constants4();
-    init_utils4();
+    init_utils3();
     init_helpers6();
     d1MigrationsListCommand = createCommand({
       metadata: {
@@ -79851,12 +79880,12 @@ function getLocalISOString(date) {
   ).padStart(2, "0")}:${String(offsetAbs % 60).padStart(2, "0")}`;
 }
 var getBookmarkIdFromTimestamp, throwIfDatabaseIsAlpha, ISO_DATE_REG_EXP, convertTimestampToISO;
-var init_utils6 = __esm({
+var init_utils5 = __esm({
   "src/d1/timeTravel/utils.ts"() {
     init_import_meta_url();
     init_cfetch();
     init_errors();
-    init_utils4();
+    init_utils3();
     getBookmarkIdFromTimestamp = /* @__PURE__ */ __name(async (complianceConfig, accountId, databaseId, timestamp) => {
       const searchParams = new URLSearchParams();
       if (timestamp) {
@@ -79926,8 +79955,8 @@ var init_info2 = __esm({
     init_create_command();
     init_logger();
     init_user2();
-    init_utils4();
-    init_utils6();
+    init_utils3();
+    init_utils5();
     d1TimeTravelInfoCommand = createCommand({
       metadata: {
         description: "Retrieve information about a database at a specific point-in-time using Time Travel",
@@ -79991,8 +80020,8 @@ var init_restore = __esm({
     init_errors();
     init_logger();
     init_user2();
-    init_utils4();
-    init_utils6();
+    init_utils3();
+    init_utils5();
     d1TimeTravelRestoreCommand = createCommand({
       metadata: {
         description: "Restore a database back to a specific point-in-time",
@@ -80303,10 +80332,10 @@ var init_delete3 = __esm({
 
 // src/deployment-bundle/guess-worker-format.ts
 async function guessWorkerFormat(entryFile, entryWorkingDirectory, tsconfig) {
-  const parsedEntryPath = import_node_path29.default.parse(entryFile);
+  const parsedEntryPath = import_node_path28.default.parse(entryFile);
   if (parsedEntryPath.ext == ".py") {
     logger.warn(
-      `The entrypoint ${import_node_path29.default.relative(
+      `The entrypoint ${import_node_path28.default.relative(
         process.cwd(),
         entryFile
       )} defines a Python worker, support for Python workers is currently experimental. Python workers with a requirements.txt file can only be run locally and cannot be deployed.`
@@ -80331,7 +80360,7 @@ async function guessWorkerFormat(entryFile, entryWorkingDirectory, tsconfig) {
       guessedWorkerFormat = "modules";
     } else {
       logger.warn(
-        `The entrypoint ${import_node_path29.default.relative(
+        `The entrypoint ${import_node_path28.default.relative(
           process.cwd(),
           entryFile
         )} has exports like an ES Module, but hasn't defined a default export like a module worker normally would. Building the worker using "service-worker" format...`
@@ -80343,11 +80372,11 @@ async function guessWorkerFormat(entryFile, entryWorkingDirectory, tsconfig) {
   }
   return { format: guessedWorkerFormat, exports: exports2 };
 }
-var import_node_path29, esbuild2;
+var import_node_path28, esbuild2;
 var init_guess_worker_format = __esm({
   "src/deployment-bundle/guess-worker-format.ts"() {
     init_import_meta_url();
-    import_node_path29 = __toESM(require("path"));
+    import_node_path28 = __toESM(require("path"));
     esbuild2 = __toESM(require("esbuild"));
     init_logger();
     init_bundle();
@@ -80479,7 +80508,7 @@ ${migrateUrl}`
     projectRoot,
     configPath: config.configPath,
     format: format9,
-    moduleRoot: args.moduleRoot ?? config.base_dir ?? import_node_path30.default.dirname(paths.absolutePath),
+    moduleRoot: args.moduleRoot ?? config.base_dir ?? import_node_path29.default.dirname(paths.absolutePath),
     name: config.name ?? "worker",
     exports: exports2
   };
@@ -80519,11 +80548,11 @@ function getNpxEquivalent() {
       return "npx";
   }
 }
-var import_node_path30;
+var import_node_path29;
 var init_entry = __esm({
   "src/deployment-bundle/entry.ts"() {
     init_import_meta_url();
-    import_node_path30 = __toESM(require("path"));
+    import_node_path29 = __toESM(require("path"));
     init_esm2();
     init_config2();
     init_errors();
@@ -80625,20 +80654,20 @@ function getOutputFilePath() {
   const outputFileDirectoryFromEnv = getOutputFileDirectoryFromEnv();
   if (outputFileDirectoryFromEnv) {
     const date = (/* @__PURE__ */ new Date()).toISOString().replaceAll(":", "-").replace(".", "_").replace("T", "_").replace("Z", "");
-    return (0, import_node_path31.resolve)(
+    return (0, import_node_path30.resolve)(
       outputFileDirectoryFromEnv,
       `wrangler-output-${date}-${(0, import_node_crypto6.randomBytes)(3).toString("hex")}.json`
     );
   }
   return null;
 }
-var import_node_crypto6, import_node_fs18, import_node_path31, outputFilePath;
+var import_node_crypto6, import_node_fs18, import_node_path30, outputFilePath;
 var init_output = __esm({
   "src/output.ts"() {
     init_import_meta_url();
     import_node_crypto6 = require("crypto");
     import_node_fs18 = require("fs");
-    import_node_path31 = require("path");
+    import_node_path30 = require("path");
     init_misc_variables();
     init_filesystem();
     __name(writeOutput, "writeOutput");
@@ -80685,12 +80714,12 @@ var init_getRules = __esm({
 });
 
 // src/deploy/index.ts
-var import_node_assert17, import_node_path32, deployCommand;
+var import_node_assert17, import_node_path31, deployCommand;
 var init_deploy3 = __esm({
   "src/deploy/index.ts"() {
     init_import_meta_url();
     import_node_assert17 = __toESM(require("assert"));
-    import_node_path32 = __toESM(require("path"));
+    import_node_path31 = __toESM(require("path"));
     init_assets();
     init_config2();
     init_create_command();
@@ -80918,7 +80947,7 @@ var init_deploy3 = __esm({
             { telemetryMessage: true }
           );
         }
-        const projectRoot = config.userConfigPath && import_node_path32.default.dirname(config.userConfigPath);
+        const projectRoot = config.userConfigPath && import_node_path31.default.dirname(config.userConfigPath);
         const entry = await getEntry(args, config, "deploy");
         validateAssetsArgsAndConfig(args, config);
         const assetsOptions = getAssetsOptions(args, config);
@@ -83075,19 +83104,19 @@ async function downloadWorker(accountId, workerName) {
     config
   };
 }
-var import_promises13, import_node_path33, import_toml4, init;
+var import_promises13, import_node_path32, import_toml4, init;
 var init_init = __esm({
   "src/init.ts"() {
     init_import_meta_url();
     import_promises13 = require("fs/promises");
-    import_node_path33 = __toESM(require("path"));
+    import_node_path32 = __toESM(require("path"));
     import_toml4 = __toESM(require_toml());
     init_execa();
     init_utils2();
     init_cfetch();
     init_internal();
     init_create_command();
-    init_utils4();
+    init_utils3();
     init_misc_variables();
     init_errors();
     init_logger();
@@ -83161,13 +83190,13 @@ var init_init = __esm({
             }
             throw err;
           }
-          const creationDir = import_node_path33.default.join(process.cwd(), args.fromDash);
+          const creationDir = import_node_path32.default.join(process.cwd(), args.fromDash);
           await (0, import_promises13.mkdir)(creationDir, { recursive: true });
           const { modules, config } = await downloadWorker(
             accountId,
             args.fromDash
           );
-          await (0, import_promises13.mkdir)(import_node_path33.default.join(creationDir, "./src"), {
+          await (0, import_promises13.mkdir)(import_node_path32.default.join(creationDir, "./src"), {
             recursive: true
           });
           config.main = `src/${config.main}`;
@@ -83175,15 +83204,15 @@ var init_init = __esm({
           for (const files of createBatches(modules, 10)) {
             await Promise.all(
               files.map(async (file) => {
-                const filepath = import_node_path33.default.join(creationDir, `./src/${file.name}`);
-                const directory = (0, import_node_path33.dirname)(filepath);
+                const filepath = import_node_path32.default.join(creationDir, `./src/${file.name}`);
+                const directory = (0, import_node_path32.dirname)(filepath);
                 await (0, import_promises13.mkdir)(directory, { recursive: true });
                 await (0, import_promises13.writeFile)(filepath, file.stream());
               })
             );
           }
           await (0, import_promises13.writeFile)(
-            import_node_path33.default.join(creationDir, "wrangler.toml"),
+            import_node_path32.default.join(creationDir, "wrangler.toml"),
             import_toml4.default.stringify(config)
           );
         } else {
@@ -84349,13 +84378,64 @@ var init_cli3 = __esm({
   }
 });
 
+// src/pages/utils.ts
+function isUrl(maybeUrl) {
+  if (!maybeUrl) {
+    return false;
+  }
+  try {
+    new URL(maybeUrl);
+    return true;
+  } catch (e7) {
+    return false;
+  }
+}
+function getPagesProjectRoot() {
+  const cwd2 = process.cwd();
+  if (projectRootCache !== void 0 && projectRootCacheCwd === cwd2) {
+    return projectRootCache;
+  }
+  const packagePath = findUpSync("package.json");
+  projectRootCache = packagePath ? import_node_path33.default.dirname(packagePath) : process.cwd();
+  projectRootCacheCwd = cwd2;
+  return projectRootCache;
+}
+function getPagesTmpDir() {
+  const projectRoot = getPagesProjectRoot();
+  if (tmpDirCache !== void 0 && tmpDirCacheProjectRoot === projectRoot) {
+    return tmpDirCache;
+  }
+  const tmpDir = getWranglerTmpDir(getPagesProjectRoot(), "pages");
+  tmpDirCache = tmpDir.path;
+  tmpDirCacheProjectRoot = projectRoot;
+  return tmpDirCache;
+}
+var import_node_path33, RUNNING_BUILDERS, CLEANUP_CALLBACKS, CLEANUP, projectRootCacheCwd, projectRootCache, tmpDirCacheProjectRoot, tmpDirCache;
+var init_utils6 = __esm({
+  "src/pages/utils.ts"() {
+    init_import_meta_url();
+    import_node_path33 = __toESM(require("path"));
+    init_find_up();
+    init_paths();
+    RUNNING_BUILDERS = [];
+    CLEANUP_CALLBACKS = [];
+    CLEANUP = /* @__PURE__ */ __name(() => {
+      CLEANUP_CALLBACKS.forEach((callback) => callback());
+      RUNNING_BUILDERS.forEach((builder) => builder.stop?.());
+    }, "CLEANUP");
+    __name(isUrl, "isUrl");
+    __name(getPagesProjectRoot, "getPagesProjectRoot");
+    __name(getPagesTmpDir, "getPagesTmpDir");
+  }
+});
+
 // src/pages/index.ts
 var pagesNamespace, pagesFunctionsNamespace, pagesProjectNamespace, pagesDeploymentNamespace, pagesDownloadNamespace;
 var init_pages = __esm({
   "src/pages/index.ts"() {
     init_import_meta_url();
     init_create_command();
-    init_utils3();
+    init_utils6();
     pagesNamespace = createNamespace({
       metadata: {
         description: "\u26A1\uFE0F Configure Cloudflare Pages",
@@ -84810,7 +84890,7 @@ var init_buildWorker = __esm({
     init_errors();
     init_logger();
     init_paths();
-    init_utils3();
+    init_utils6();
     __name(buildWorkerFromFunctions, "buildWorkerFromFunctions");
     __name(buildRawWorker, "buildRawWorker");
     __name(produceWorkerBundleForWorkerJSDirectory, "produceWorkerBundleForWorkerJSDirectory");
@@ -84936,7 +85016,7 @@ var init_buildPlugin = __esm({
     init_bundle();
     init_module_collection();
     init_paths();
-    init_utils3();
+    init_utils6();
     init_buildWorker();
     __name(buildPluginFromFunctions, "buildPluginFromFunctions");
   }
@@ -85519,7 +85599,7 @@ var init_buildFunctions = __esm({
     init_filepath_routing();
     init_routes2();
     init_routes_transformation();
-    init_utils3();
+    init_utils6();
     __name(buildFunctions, "buildFunctions");
   }
 });
@@ -87622,7 +87702,7 @@ var init_deploy4 = __esm({
     init_buildWorker();
     init_routes_validation();
     init_upload();
-    init_utils3();
+    init_utils6();
     init_validate2();
     init_create_worker_bundle_contents();
     __name(deploy2, "deploy");
@@ -88048,7 +88128,7 @@ var init_deploy5 = __esm({
     init_errors3();
     init_projects();
     init_prompt_select_project();
-    init_utils3();
+    init_utils6();
     pagesDeploymentCreateCommand = createAlias({
       aliasOf: "wrangler pages deploy"
     });
@@ -89957,7 +90037,7 @@ var init_deployment_tails = __esm({
     init_user2();
     init_constants3();
     init_prompt_select_project();
-    init_utils3();
+    init_utils6();
     statusChoices = ["ok", "error", "canceled"];
     isStatusChoiceList = /* @__PURE__ */ __name((data) => data?.every((d6) => statusChoices.includes(d6)) ?? false, "isStatusChoiceList");
     pagesDeploymentTailCommand = createCommand({
@@ -90578,13 +90658,14 @@ var init_dev = __esm({
     init_metrics();
     init_navigator_user_agent();
     init_paths();
+    init_debounce();
     init_shell_quote();
     init_buildFunctions();
     init_constants3();
     init_errors3();
     init_buildWorker();
     init_routes_validation();
-    init_utils3();
+    init_utils6();
     DURABLE_OBJECTS_BINDING_REGEXP = new RegExp(
       /^(?<binding>[^=]+)=(?<className>[^@\s]+)(@(?<scriptName>.*)$)?$/
     );
@@ -147407,17 +147488,20 @@ var init_view2 = __esm({
             Message: version5.annotations?.["workers/message"] || BLANK_INPUT5
           })
         );
-        logRaw("------------------------------------------------------------");
-        const scriptInfo = {
-          Handlers: version5.resources.script.handlers.join(", ")
-        };
+        const scriptInfo = {};
+        if (version5.resources.script.handlers) {
+          scriptInfo.Handlers = version5.resources.script.handlers.join(", ");
+        }
         if (version5.resources.script_runtime.compatibility_date) {
           scriptInfo["Compatibility Date"] = version5.resources.script_runtime.compatibility_date;
         }
         if (version5.resources.script_runtime.compatibility_flags) {
           scriptInfo["Compatibility Flags"] = version5.resources.script_runtime.compatibility_flags.join(", ");
         }
-        logRaw(formatLabelledValues(scriptInfo));
+        if (Object.keys(scriptInfo).length > 0) {
+          logRaw("------------------------------------------------------------");
+          logRaw(formatLabelledValues(scriptInfo));
+        }
         const secrets = version5.resources.bindings.filter(
           (binding) => binding.type === "secret_text"
         );
@@ -174901,6 +174985,9 @@ var init_LocalRuntimeController = __esm({
       // If this doesn't match what is in config, trigger a rebuild.
       // Used for the rebuild hotkey
       #currentContainerBuildId;
+      // Used to store the information and abort handle for the
+      // current container that is being built
+      containerBeingBuilt;
       onBundleStart(_4) {
       }
       async #onBundleComplete(data, id) {
@@ -174927,8 +175014,20 @@ var init_LocalRuntimeController = __esm({
             await prepareContainerImagesForDev(
               this.#dockerPath,
               containerOptions,
-              data.config.config
+              data.config.config,
+              (buildStartEvent) => {
+                this.containerBeingBuilt = {
+                  ...buildStartEvent,
+                  abortRequested: false
+                };
+              },
+              () => {
+                this.containerBeingBuilt = void 0;
+              }
             );
+            if (this.containerBeingBuilt) {
+              this.containerBeingBuilt.abortRequested = false;
+            }
             this.#currentContainerBuildId = data.config.dev.containerBuildId;
             logger.log(source_default.dim("\u2394 Container image(s) ready"));
           }
@@ -174992,6 +175091,9 @@ var init_LocalRuntimeController = __esm({
             }
           });
         } catch (error2) {
+          if (this.containerBeingBuilt?.abortRequested && error2 instanceof Error && error2.message === "Build exited with code: 1") {
+            return;
+          }
           this.emitErrorEvent({
             type: "error",
             reason: "Error reloading local server",
@@ -175636,7 +175738,15 @@ function registerDevHotKeys(devEnv, args) {
       disabled: /* @__PURE__ */ __name(() => {
         return !devEnv.config.latestConfig?.dev?.enableContainers || !devEnv.config.latestConfig?.containers?.length;
       }, "disabled"),
-      handler: /* @__PURE__ */ __name(async () => {
+      handler: debounce(async () => {
+        devEnv.runtimes.forEach((runtime) => {
+          if (runtime instanceof LocalRuntimeController) {
+            if (runtime.containerBeingBuilt) {
+              runtime.containerBeingBuilt.abort();
+              runtime.containerBeingBuilt.abortRequested = true;
+            }
+          }
+        });
         const newContainerBuildId = (0, import_crypto7.randomUUID)().slice(0, 8);
         devEnv.runtimes.map(async (runtime) => {
           if (runtime instanceof LocalRuntimeController) {
@@ -175649,7 +175759,7 @@ function registerDevHotKeys(devEnv, args) {
             containerBuildId: newContainerBuildId
           }
         });
-      }, "handler")
+      }, 250)
     },
     {
       keys: ["l"],
@@ -175667,13 +175777,26 @@ function registerDevHotKeys(devEnv, args) {
       keys: ["c"],
       label: "clear console",
       handler: /* @__PURE__ */ __name(async () => {
-        logger.console("clear");
+        const someContainerIsBeingBuilt = devEnv.runtimes.some(
+          (runtime) => runtime instanceof LocalRuntimeController && runtime.containerBeingBuilt
+        );
+        if (!someContainerIsBeingBuilt) {
+          logger.console("clear");
+        }
       }, "handler")
     },
     {
       keys: ["x", "q", "ctrl+c"],
       label: "to exit",
       handler: /* @__PURE__ */ __name(async () => {
+        devEnv.runtimes.forEach((runtime) => {
+          if (runtime instanceof LocalRuntimeController) {
+            if (runtime.containerBeingBuilt) {
+              runtime.containerBeingBuilt.abort();
+              runtime.containerBeingBuilt.abortRequested = true;
+            }
+          }
+        });
         await devEnv.teardown();
       }, "handler")
     }
@@ -175689,6 +175812,7 @@ var init_hotkeys = __esm({
     init_cli_hotkeys();
     init_logger();
     init_open_in_browser();
+    init_debounce();
     init_inspect2();
     __name(registerDevHotKeys, "registerDevHotKeys");
   }