wrangler 4.11.1 → 4.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.11.1",
+  "version": "4.12.1",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -55,14 +55,14 @@
     "esbuild": "0.25.2",
     "path-to-regexp": "6.3.0",
     "unenv": "2.0.0-rc.15",
-    "workerd": "1.20250410.0",
-    "miniflare": "4.20250410.1",
+    "workerd": "1.20250417.0",
+    "miniflare": "4.20250417.0",
     "@cloudflare/kv-asset-handler": "0.4.0"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
     "@cloudflare/types": "6.18.4",
-    "@cloudflare/workers-types": "^4.20250410.0",
+    "@cloudflare/workers-types": "^4.20250417.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.47.0",
@@ -84,7 +84,7 @@
     "@types/supports-color": "^8.1.1",
     "@types/ws": "^8.5.7",
     "@types/yargs": "^17.0.22",
-    "@vitest/ui": "~3.0.8",
+    "@vitest/ui": "~3.1.1",
     "@webcontainer/env": "^1.1.0",
     "chalk": "^5.2.0",
     "chokidar": "^4.0.1",
@@ -129,20 +129,20 @@
     "typescript": "^5.7.2",
     "undici": "^5.28.5",
     "update-check": "^1.5.4",
-    "vitest": "~3.0.8",
+    "vitest": "~3.1.1",
     "vitest-websocket-mock": "^0.4.0",
     "ws": "8.18.0",
     "xdg-app-paths": "^8.3.0",
     "xxhash-wasm": "^1.0.1",
     "yargs": "^17.7.2",
-    "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.13.28",
+    "@cloudflare/pages-shared": "^0.13.30",
+    "@cloudflare/cli": "1.1.1",
     "@cloudflare/workers-shared": "0.17.2",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20250410.0"
+    "@cloudflare/workers-types": "^4.20250417.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {

package/wrangler-dist/cli.js

@@ -81185,7 +81185,7 @@ var import_undici3 = __toESM(require_undici());
 
 // package.json
 var name = "wrangler";
-var version = "4.11.1";
+var version = "4.12.1";
 
 // src/environment-variables/misc-variables.ts
 init_import_meta_url();
@@ -90797,7 +90797,12 @@ async function getOauthToken(options33) {
         }
       }
     });
-    server.listen(8976, "localhost");
+    if (options33.callbackHost !== "localhost" || options33.callbackPort !== 8976) {
+      logger.log(
+        `Temporary login server listening on ${options33.callbackHost}:${options33.callbackPort}`
+      );
+    }
+    server.listen(options33.callbackPort, options33.callbackHost);
   });
   if (options33.browser) {
     logger.log(`Opening a link in your default browser: ${urlToOpen}`);
@@ -90808,7 +90813,11 @@ async function getOauthToken(options33) {
   return Promise.race([timerPromise, loginPromise]);
 }
 __name(getOauthToken, "getOauthToken");
-async function login(props = { browser: true }) {
+async function login(props = {
+  browser: true,
+  callbackHost: "localhost",
+  callbackPort: 8976
+}) {
   const authFromEnv = getAuthFromEnv();
   if (authFromEnv) {
     logger.error(
@@ -90827,7 +90836,9 @@ async function login(props = { browser: true }) {
     },
     granted: {
       url: "https://welcome.developers.workers.dev/wrangler-oauth-consent-granted"
-    }
+    },
+    callbackHost: props.callbackHost,
+    callbackPort: props.callbackPort
   });
   writeAuthConfigFile({
     oauth_token: oauth.token?.value ?? "",
@@ -92940,6 +92951,12 @@ function buildMiniflareBindingOptions(config) {
     hyperdrives: Object.fromEntries(
       bindings.hyperdrive?.map(hyperdriveEntry) ?? []
     ),
+    analyticsEngineDatasets: Object.fromEntries(
+      bindings.analytics_engine_datasets?.map((binding) => [
+        binding.binding,
+        { dataset: binding.dataset ?? "dataset" }
+      ]) ?? []
+    ),
     workflows: Object.fromEntries(bindings.workflows?.map(workflowEntry) ?? []),
     secretsStoreSecrets: Object.fromEntries(
       bindings.secrets_store_secrets?.map((binding) => [
@@ -93009,7 +93026,8 @@ function buildPersistOptions(localPersistencePath) {
       r2Persist: import_node_path15.default.join(v3Path, "r2"),
       d1Persist: import_node_path15.default.join(v3Path, "d1"),
       workflowsPersist: import_node_path15.default.join(v3Path, "workflows"),
-      secretsStorePersist: import_node_path15.default.join(v3Path, "secrets-store")
+      secretsStorePersist: import_node_path15.default.join(v3Path, "secrets-store"),
+      analyticsEngineDatasetsPersist: import_node_path15.default.join(v3Path, "analytics-engine")
     };
   }
 }
@@ -103485,7 +103503,6 @@ async function bundleWorker(entry, destination, {
   alias,
   define,
   checkFetch,
-  mockAnalyticsEngineDatasets,
   targetConsumer,
   testScheduled,
   inject: injectOption,
@@ -103500,16 +103517,6 @@ async function bundleWorker(entry, destination, {
   const tmpDir = getWranglerTmpDir(projectRoot, "bundle");
   const entryFile = entry.file;
   const middlewareToLoad = [];
-  if (targetConsumer === "dev" && mockAnalyticsEngineDatasets && mockAnalyticsEngineDatasets.length > 0) {
-    middlewareToLoad.push({
-      name: "mock-analytics-engine",
-      path: "templates/middleware/middleware-mock-analytics-engine.ts",
-      config: {
-        bindings: mockAnalyticsEngineDatasets.map(({ binding }) => binding)
-      },
-      supports: ["modules", "service-worker"]
-    });
-  }
   if (targetConsumer === "dev" && !process.env.WRANGLER_DISABLE_REQUEST_BODY_DRAINING) {
     middlewareToLoad.push({
       name: "ensure-req-body-drained",
@@ -110657,7 +110664,7 @@ function handleFailure(cb2) {
       await fillOpenAPIConfiguration(config, args.json);
       await cb2(args, config);
     } catch (err) {
-      if (!args.json) {
+      if (!args.json || !isNonInteractiveOrCI()) {
         throw err;
       }
       if (err instanceof ApiError) {
@@ -114002,6 +114009,208 @@ var cloudchamber = /* @__PURE__ */ __name((yargs, subHelp) => {
 
 // src/containers/index.ts
 init_import_meta_url();
+
+// src/containers/containers.ts
+init_import_meta_url();
+function deleteYargs(args) {
+  return args.positional("ID", {
+    describe: "id of the containers to delete",
+    type: "string"
+  });
+}
+__name(deleteYargs, "deleteYargs");
+async function deleteCommand2(deleteArgs, _config) {
+  await loadAccountSpinner(deleteArgs);
+  if (!deleteArgs.ID) {
+    throw new Error(
+      "You must provide an ID. Use 'wrangler containers list` to view your containers."
+    );
+  }
+  if (deleteArgs.json || !isInteractive2()) {
+    const container = await ApplicationsService.deleteApplication(
+      deleteArgs.ID
+    );
+    console.log(JSON.stringify(container, null, 4));
+    return;
+  }
+  startSection("Delete your container");
+  const yes = await inputPrompt({
+    question: "Are you sure that you want to delete these containers? The associated DO container will lose access to the containers.",
+    type: "confirm",
+    label: ""
+  });
+  if (!yes) {
+    cancel("The operation has been cancelled");
+    return;
+  }
+  const [, err] = await wrap2(
+    ApplicationsService.deleteApplication(deleteArgs.ID)
+  );
+  if (err) {
+    crash(
+      `There has been an internal error deleting your containers.
+ ${err.message}`
+    );
+    return;
+  }
+  endSection("Your container has been deleted");
+}
+__name(deleteCommand2, "deleteCommand");
+function infoYargs(args) {
+  return args.positional("ID", {
+    describe: "id of the containers to view",
+    type: "string"
+  });
+}
+__name(infoYargs, "infoYargs");
+async function infoCommand(infoArgs, _config) {
+  if (!infoArgs.ID) {
+    throw new Error(
+      "You must provide an ID. Use 'wrangler containers list` to view your containers."
+    );
+  }
+  if (infoArgs.json || !isInteractive2()) {
+    const application2 = ApplicationsService.getApplication(infoArgs.ID);
+    console.log(JSON.stringify(application2, null, 4));
+    return;
+  }
+  await loadAccountSpinner(infoArgs);
+  const [application, err] = await wrap2(
+    ApplicationsService.getApplication(infoArgs.ID)
+  );
+  if (err) {
+    crash(
+      `There has been an internal error requesting your containers.
+ ${err.message}`
+    );
+    return;
+  }
+  const details = flatDetails(application);
+  const applicationDetails = {
+    label: `${application.name} (${application.created_at})`,
+    details,
+    value: application.id
+  };
+  await inputPrompt({
+    type: "list",
+    question: "Container",
+    options: [applicationDetails],
+    label: "Exiting"
+  });
+}
+__name(infoCommand, "infoCommand");
+function listYargs(args) {
+  return args;
+}
+__name(listYargs, "listYargs");
+async function listCommand2(listArgs, config) {
+  if (listArgs.json || !isInteractive2()) {
+    const applications = await ApplicationsService.listApplications();
+    console.log(JSON.stringify(applications, null, 4));
+    return;
+  }
+  await listCommandHandle2(listArgs, config);
+}
+__name(listCommand2, "listCommand");
+function flatDetails(obj, indentLevel = 0) {
+  const indent = "  ".repeat(indentLevel);
+  return Object.entries(obj).reduce((acc, [key, value]) => {
+    if (value !== void 0 && value !== null && typeof value === "object" && !Array.isArray(value)) {
+      acc.push(`${indent}${key}:`);
+      acc.push(
+        ...flatDetails(value, indentLevel + 1)
+      );
+    } else if (value !== void 0) {
+      acc.push(`${indent}${key}: ${value}`);
+    }
+    return acc;
+  }, []);
+}
+__name(flatDetails, "flatDetails");
+async function listCommandHandle2(_args, _config) {
+  const keepListIter = true;
+  while (keepListIter) {
+    logRaw(gray(shapes.bar));
+    const { start, stop } = spinner();
+    start("Loading Containers");
+    const [applications, err] = await wrap2(
+      ApplicationsService.listApplications()
+    );
+    stop();
+    if (err) {
+      crash(
+        `There has been an internal error listing your containers.
+ ${err.message}`
+      );
+      return;
+    }
+    const applicationDetails = /* @__PURE__ */ __name((a5) => {
+      const details = flatDetails(a5);
+      return {
+        label: `${a5.name} (${a5.created_at})`,
+        details,
+        value: a5.id
+      };
+    }, "applicationDetails");
+    const application = await listContainersAndChoose(applications);
+    let refresh = false;
+    await inputPrompt({
+      type: "list",
+      question: "Containers",
+      helpText: "Hit enter to return to your containers or 'r' to refresh",
+      options: [applicationDetails(application)],
+      label: "going back",
+      onRefresh: /* @__PURE__ */ __name(async () => {
+        start("Refreshing application");
+        const app = await ApplicationsService.getApplication(application.id);
+        if (refresh) {
+          return [];
+        }
+        stop();
+        if (app) {
+          const details = applicationDetails(app);
+          details.label += ", last refresh: " + (/* @__PURE__ */ new Date()).toLocaleString();
+          return [details];
+        }
+        return app;
+      }, "onRefresh")
+    });
+    refresh = true;
+    stop();
+  }
+}
+__name(listCommandHandle2, "listCommandHandle");
+async function listContainersAndChoose(applications) {
+  const getLabels = /* @__PURE__ */ __name((a5) => {
+    const labels = a5.configuration.labels ?? [];
+    if (!labels || labels.length == 0) {
+      return [];
+    }
+    const out = labels.map((l6) => `        ${dim(l6.name)}: ${dim(l6.value)}`);
+    return `Labels:
+` + out.join(",\n");
+  }, "getLabels");
+  const application = await processArgument({}, "applicationId", {
+    type: "list",
+    question: "Your Containers",
+    helpText: "Get more information by selecting a container with the enter/return key",
+    options: applications.map((i5) => ({
+      label: i5.name,
+      value: i5.id,
+      details: [
+        `Id: ${dim(`${i5.id}`)}`,
+        `Instances: ${dim(`${i5.instances}`)}`,
+        `Image: ${dim(i5.configuration.image)}`,
+        ...getLabels(i5) ?? []
+      ]
+    })),
+    label: "container"
+  });
+  return applications.find((a5) => a5.id === application);
+}
+__name(listContainersAndChoose, "listContainersAndChoose");
+
+// src/containers/index.ts
 var containers = /* @__PURE__ */ __name((yargs, subHelp) => {
   return yargs.command(
     "build [PATH]",
@@ -114017,6 +114226,21 @@ var containers = /* @__PURE__ */ __name((yargs, subHelp) => {
     "images",
     "perform operations on images in your Cloudflare managed registry",
     (args) => imagesCommand(args).command(subHelp)
+  ).command(
+    "info [ID]",
+    "get information about a specific container",
+    (args) => infoYargs(args),
+    (args) => handleFailure(infoCommand)(args)
+  ).command(
+    "list",
+    "list containers",
+    (args) => listYargs(args),
+    (args) => handleFailure(listCommand2)(args)
+  ).command(
+    "delete [ID]",
+    "delete a container",
+    (args) => deleteYargs(args),
+    (args) => handleFailure(deleteCommand2)(args)
   );
 }, "containers");
 
@@ -119835,8 +120059,6 @@ function buildWorkerFromFunctions({
     sourcemap,
     watch: watch2,
     nodejsCompatMode,
-    // TODO: mock AE datasets in Pages functions for dev
-    mockAnalyticsEngineDatasets: [],
     define: {
       __FALLBACK_SERVICE__: JSON.stringify(fallbackService)
     },
@@ -119896,8 +120118,6 @@ function buildRawWorker({
     sourcemap,
     watch: watch2,
     nodejsCompatMode,
-    // TODO: mock AE datasets in Pages functions for dev
-    mockAnalyticsEngineDatasets: [],
     define: {},
     alias: {},
     doBindings: [],
@@ -120221,8 +120441,6 @@ function buildPluginFromFunctions({
       }
     ],
     checkFetch: local && checkFetch,
-    // TODO: mock AE datasets in Pages functions for dev
-    mockAnalyticsEngineDatasets: [],
     targetConsumer: local ? "dev" : "deploy",
     local,
     projectRoot: getPagesProjectRoot(),
@@ -144685,6 +144903,18 @@ var loginCommand = createCommand({
       array: true,
       type: "string",
       requiresArg: true
+    },
+    "callback-host": {
+      describe: "Use the ip or host address for the temporary login callback server.",
+      type: "string",
+      requiresArg: false,
+      default: "localhost"
+    },
+    "callback-port": {
+      describe: "Use the port for the temporary login callback server.",
+      type: "number",
+      requiresArg: false,
+      default: 8976
     }
   },
   async handler(args, { config }) {
@@ -144702,10 +144932,19 @@ var loginCommand = createCommand({
           `One of ${args.scopes} is not a valid authentication scope. Run "wrangler login --scopes-list" to see the valid scopes.`
         );
       }
-      await login({ scopes: args.scopes, browser: args.browser });
+      await login({
+        scopes: args.scopes,
+        browser: args.browser,
+        callbackHost: args.callbackHost,
+        callbackPort: args.callbackPort
+      });
       return;
     }
-    await login({ browser: args.browser });
+    await login({
+      browser: args.browser,
+      callbackHost: args.callbackHost,
+      callbackPort: args.callbackPort
+    });
     sendMetricsEvent("login user", {
       sendMetrics: config.send_metrics
     });
@@ -144753,6 +144992,12 @@ var whoamiCommand = createCommand({
 // src/utils/logPossibleBugMessage.ts
 init_import_meta_url();
 async function logPossibleBugMessage() {
+  if (process.versions.bun) {
+    logger.warn(
+      `Wrangler does not support the Bun runtime. Please try this command again using Node.js via \`npm\` or \`pnpm\`. Alternatively, make sure you're not passing the \`--bun\` flag when running \`bun run wrangler ...\``
+    );
+    return;
+  }
   logger.log(
     `${fgGreenColor}%s${resetColor}`,
     "If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
@@ -147854,7 +148099,6 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
         define: { ...config.define, ...props.defines },
         alias: { ...config.alias, ...props.alias },
         checkFetch: false,
-        mockAnalyticsEngineDatasets: [],
         // We want to know if the build is for development or publishing
         // This could potentially cause issues as we no longer have identical behaviour between dev and deploy?
         targetConsumer: "deploy",
@@ -151161,8 +151405,6 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
         define: { ...config.define, ...props.defines },
         checkFetch: false,
         alias: config.alias,
-        // We do not mock AE datasets when deploying
-        mockAnalyticsEngineDatasets: [],
         // We want to know if the build is for development or publishing
         // This could potentially cause issues as we no longer have identical behaviour between dev and deploy?
         targetConsumer: "deploy",
@@ -153421,7 +153663,6 @@ function runBuild({
   alias,
   noBundle,
   findAdditionalModules: findAdditionalModules2,
-  mockAnalyticsEngineDatasets,
   durableObjects,
   workflows,
   local,
@@ -153488,7 +153729,6 @@ function runBuild({
       workflowBindings: workflows,
       alias,
       define,
-      mockAnalyticsEngineDatasets,
       targetConsumer,
       testScheduled,
       plugins: [logBuildOutput(nodejsCompatMode, onStart, updateBundle)],
@@ -153619,7 +153859,6 @@ var BundlerController = class extends Controller {
           config.compatibilityDate,
           config.compatibilityFlags
         ),
-        mockAnalyticsEngineDatasets: bindings.analytics_engine_datasets ?? [],
         alias: config.build.alias,
         // We want to know if the build is for development or publishing
         // This could potentially cause issues as we no longer have identical behaviour between dev and deploy?
@@ -153731,7 +153970,6 @@ var BundlerController = class extends Controller {
         findAdditionalModules: config.build?.findAdditionalModules,
         durableObjects: bindings?.durable_objects ?? { bindings: [] },
         workflows: bindings?.workflows ?? [],
-        mockAnalyticsEngineDatasets: bindings.analytics_engine_datasets ?? [],
         local: !config.dev?.remote,
         // startDevWorker only applies to "dev"
         targetConsumer: "dev",

package/templates/middleware/middleware-mock-analytics-engine.d.ts

@@ -1,3 +0,0 @@
-declare module "config:middleware/mock-analytics-engine" {
-	export const bindings: string[];
-}

package/templates/middleware/middleware-mock-analytics-engine.ts

@@ -1,30 +0,0 @@
-/// <reference path="middleware-mock-analytics-engine.d.ts"/>
-
-import { bindings } from "config:middleware/mock-analytics-engine";
-import type { Middleware } from "./common";
-
-const bindingsEnv = Object.fromEntries(
-	bindings.map((binding) => [
-		binding,
-		{
-			writeDataPoint() {
-				// no op in dev
-			},
-		},
-	])
-) satisfies Record<string, AnalyticsEngineDataset>;
-
-const analyticsEngine: Middleware = async (
-	request,
-	env,
-	_ctx,
-	middlewareCtx
-) => {
-	// we're going to directly modify env so it maintains referential equality
-	for (const binding of bindings) {
-		env[binding] ??= bindingsEnv[binding];
-	}
-	return await middlewareCtx.next(request, env);
-};
-
-export default analyticsEngine;