wrangler 4.21.2 → 4.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.21.2",
+  "version": "4.22.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -136,8 +136,8 @@
     "xxhash-wasm": "^1.0.1",
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/containers-shared": "0.2.2",
     "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/containers-shared": "0.2.2",
     "@cloudflare/pages-shared": "^0.13.51",
     "@cloudflare/workers-shared": "0.18.0",
     "@cloudflare/workers-tsconfig": "0.0.0"

package/wrangler-dist/cli.js

@@ -29486,7 +29486,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.21.2";
+    version = "4.22.0";
   }
 });
 
@@ -62914,7 +62914,7 @@ async function handleDeleteImageCommand(args, _config) {
             `Failed to delete image ${args.image}: ${gcResponse.status} ${gcResponse.statusText}`
           );
         }
-        await logger.log(`Deleted tag: ${args.image}`);
+        logger.log(`Deleted tag: ${args.image}`);
       }),
       { message: "Deleting", json: args.json }
     );
@@ -62922,21 +62922,24 @@ async function handleDeleteImageCommand(args, _config) {
     logger.log(`Error when removing image: ${error2}`);
   }
 }
-async function handleListImagesCommand(args, _config) {
+async function handleListImagesCommand(args, config) {
   try {
     return await promiseSpinner(
       getCreds().then(async (creds) => {
         const repos = await listRepos(creds);
-        const tags = [];
+        const responses = [];
+        const accountId = config.account_id || await getAccountId(config);
+        const accountIdPrefix = new RegExp(`^${accountId}/`);
+        const filter = new RegExp(args.filter ?? "");
         for (const repo of repos) {
           const stripped = repo.replace(/^\/+/, "");
-          const regex2 = new RegExp(args.filter ?? "");
-          if (regex2.test(stripped)) {
-            const repoTags = await listTags(stripped, creds);
-            tags.push({ name: stripped, tags: repoTags });
+          if (filter.test(stripped)) {
+            const tags = await listTags(stripped, creds);
+            const name2 = stripped.replace(accountIdPrefix, "");
+            responses.push({ name: name2, tags });
           }
         }
-        await ListTags(tags, false, args.json);
+        await ListTags(responses, false, args.json);
       }),
       { message: "Listing", json: args.json }
     );
@@ -62959,13 +62962,16 @@ async function ListTags(responses, digests = false, json = false) {
   if (json) {
     logger.log(JSON.stringify(responses, null, 2));
   } else {
-    const rows = responses.map((resp) => {
-      return {
-        REPOSITORY: resp.name,
-        TAG: resp.tags.join(" ")
-      };
-    }).flat();
-    logger.table(rows);
+    const rows = responses.flatMap((r7) => r7.tags.map((t7) => [r7.name, t7]));
+    const headers = ["REPOSITORY", "TAG"];
+    const widths = new Array(headers.length).fill(0);
+    for (let i5 = 0; i5 < widths.length - 1; i5++) {
+      widths[i5] = rows.map((r7) => r7[i5].length).reduce((a5, b6) => Math.max(a5, b6), headers[i5].length);
+    }
+    logger.log(headers.map((h6, i5) => h6.padEnd(widths[i5], " ")).join("  "));
+    for (const row of rows) {
+      logger.log(row.map((v7, i5) => v7.padEnd(widths[i5], " ")).join("  "));
+    }
   }
 }
 async function listTags(repo, creds) {
@@ -63049,6 +63055,7 @@ var init_list = __esm({
     init_import_meta_url();
     init_containers_shared();
     init_logger();
+    init_user2();
     init_common();
     imagesCommand = /* @__PURE__ */ __name((yargs, scope) => {
       return yargs.command(
@@ -63802,18 +63809,26 @@ function observabilityToConfiguration(observability, existingObservabilityConfig
     }
   }
 }
+function containerAppToInstanceType(containerApp) {
+  if (containerApp.instance_type !== void 0) {
+    return containerApp.instance_type;
+  }
+  const configuration = containerApp.configuration;
+  if (configuration.disk === void 0 && configuration.vcpu === void 0 && configuration.memory === void 0 && configuration.memory_mib === void 0) {
+    return "dev" /* DEV */;
+  }
+}
 function containerAppToCreateApplication(containerApp, observability, existingApp, skipDefaults = false) {
   const observabilityConfiguration = observabilityToConfiguration(
     observability,
     existingApp?.configuration.observability
   );
+  const instanceType = containerAppToInstanceType(containerApp);
   const configuration = {
     ...containerApp.configuration,
-    observability: observabilityConfiguration
+    observability: observabilityConfiguration,
+    instance_type: instanceType
   };
-  if (containerApp.instance_type !== void 0) {
-    configuration.instance_type = containerApp.instance_type;
-  }
   if (containerApp.name === void 0) {
     throw new FatalError("Container application name failed to be set", 1, {
       telemetryMessage: true
@@ -64327,6 +64342,7 @@ var init_apply = __esm({
     __name(applicationToCreateApplication, "applicationToCreateApplication");
     __name(cleanupObservability, "cleanupObservability");
     __name(observabilityToConfiguration, "observabilityToConfiguration");
+    __name(containerAppToInstanceType, "containerAppToInstanceType");
     __name(containerAppToCreateApplication, "containerAppToCreateApplication");
     __name(isNumber, "isNumber");
     __name(createLine, "createLine");
@@ -89666,7 +89682,7 @@ var init_deployment_tails = __esm({
           new URLSearchParams({ env: environment })
         );
         const envDeployments = deployments.filter(
-          (d6) => d6.environment === environment
+          (d6) => d6.environment === environment && d6.latest_stage.name === "deploy" && d6.latest_stage.status === "success"
         );
         if (isUrl(deployment)) {
           const { hostname: deploymentHostname } = new URL(deployment);
@@ -153271,7 +153287,7 @@ function getAssetsOptions(args, config, overrides) {
   const directory = path59.resolve(assetsBasePath, assets.directory);
   if (!(0, import_node_fs32.existsSync)(directory)) {
     const sourceOfTruthMessage = args.assets ? '"--assets" command line argument' : '"assets.directory" field in your configuration file';
-    throw new UserError(
+    throw new NonExistentAssetsDirError(
       `The directory specified by the ${sourceOfTruthMessage} does not exist:
 ${directory}`,
       {
@@ -153357,7 +153373,7 @@ function errorOnLegacyPagesWorkerJSAsset(file, hasAssetsIgnoreFile) {
     }
   }
 }
-var import_node_assert22, import_node_fs32, import_promises35, path59, import_undici22, BULK_UPLOAD_CONCURRENCY2, MAX_UPLOAD_ATTEMPTS2, MAX_UPLOAD_GATEWAY_ERRORS2, MAX_DIFF_LINES2, syncAssets, buildAssetManifest, WORKER_JS_FILENAME;
+var import_node_assert22, import_node_fs32, import_promises35, path59, import_undici22, BULK_UPLOAD_CONCURRENCY2, MAX_UPLOAD_ATTEMPTS2, MAX_UPLOAD_GATEWAY_ERRORS2, MAX_DIFF_LINES2, syncAssets, buildAssetManifest, NonExistentAssetsDirError, WORKER_JS_FILENAME;
 var init_assets = __esm({
   "src/assets.ts"() {
     init_import_meta_url();
@@ -153610,6 +153626,11 @@ Ensure all assets in your assets directory "${dir}" conform with the Workers max
     __name(logAssetsUploadStatus, "logAssetsUploadStatus");
     __name(logReadFilesFromDirectory, "logReadFilesFromDirectory");
     __name(getAssetsBasePath, "getAssetsBasePath");
+    NonExistentAssetsDirError = class extends UserError {
+      static {
+        __name(this, "NonExistentAssetsDirError");
+      }
+    };
     __name(getAssetsOptions, "getAssetsOptions");
     __name(validateAssetsArgsAndConfig, "validateAssetsArgsAndConfig");
     WORKER_JS_FILENAME = "_worker.js";
@@ -178750,6 +178771,16 @@ async function getMiniflareOptionsFromConfig(args) {
     remoteProxyConnectionString,
     remoteBindingsEnabled
   );
+  let processedAssetOptions;
+  try {
+    processedAssetOptions = getAssetsOptions({ assets: void 0 }, config);
+  } catch (e7) {
+    const isNonExistentError = e7 instanceof NonExistentAssetsDirError;
+    if (!isNonExistentError) {
+      throw e7;
+    }
+  }
+  const assetOptions = processedAssetOptions ? buildAssetOptions({ assets: processedAssetOptions }) : {};
   const defaultPersistRoot = getMiniflarePersistRoot(options.persist);
   const serviceBindings = await getServiceBindings(bindings.services);
   const miniflareOptions = {
@@ -178762,7 +178793,8 @@ async function getMiniflareOptionsFromConfig(args) {
         serviceBindings: {
           ...serviceBindings,
           ...bindingOptions.serviceBindings
-        }
+        },
+        ...assetOptions
       },
       ...externalWorkers
     ],