wrangler 3.35.0 → 3.36.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.35.0",
+  "version": "3.36.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",

package/wrangler-dist/cli.d.ts

@@ -2608,6 +2608,17 @@ declare interface PagesConfigFields {
     pages_build_output_dir?: string;
 }
 
+declare interface PagesConfigFields {
+    /**
+     * The directory of static assets to serve.
+     *
+     * The presence of this field in `wrangler.toml` indicates a Pages project,
+     * and will prompt the handling of the configuration file according to the
+     * Pages-specific validation rules.
+     */
+    pages_build_output_dir?: string;
+}
+
 declare interface PagesDeployOptions {
     /**
      * Path to static assets to deploy to Pages

package/wrangler-dist/cli.js

@@ -119652,7 +119652,7 @@ var import_node_assert2 = __toESM(require("node:assert"));
 var import_undici3 = __toESM(require_undici());
 
 // package.json
-var version = "3.35.0";
+var version = "3.36.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -120750,6 +120750,8 @@ async function login(props = { browser: true }) {
       __name(finish, "finish");
       (0, import_node_assert.default)(req.url, "This request doesn't have a URL");
       const { pathname, query } = import_node_url3.default.parse(req.url, true);
+      if (req.method !== "GET")
+        return res.end("OK");
       switch (pathname) {
         case "/oauth/callback": {
           let hasAuthCode = false;
@@ -121723,6 +121725,10 @@ var isRecord = /* @__PURE__ */ __name((value) => typeof value === "object" && va
 
 // src/config/validation.ts
 var ENGLISH = new Intl.ListFormat("en");
+function isPagesConfig(rawConfig) {
+  return rawConfig.pages_build_output_dir !== void 0;
+}
+__name(isPagesConfig, "isPagesConfig");
 function normalizeAndValidateConfig(rawConfig, configPath, args) {
   const diagnostics = new Diagnostics(
     `Processing ${configPath ? import_node_path7.default.relative(process.cwd(), configPath) : "wrangler"} configuration:`
@@ -121812,7 +121818,7 @@ function normalizeAndValidateConfig(rawConfig, configPath, args) {
         rawConfig
       );
       diagnostics.addChild(envDiagnostics);
-    } else {
+    } else if (!isPagesConfig(rawConfig)) {
       activeEnv = normalizeAndValidateEnvironment(
         envDiagnostics,
         configPath,
@@ -124236,8 +124242,8 @@ function readConfig(configPath, args) {
   } else if (configPath?.endsWith("json")) {
     rawConfig = parseJSONC(readFileSync5(configPath), configPath);
   }
-  const isPagesConfig = rawConfig.pages_build_output_dir !== void 0;
-  if (isPagesConfig && (configPath?.endsWith("json") || args.experimentalJsonConfig)) {
+  const isPagesConfig2 = rawConfig.pages_build_output_dir !== void 0;
+  if (isPagesConfig2 && (configPath?.endsWith("json") || args.experimentalJsonConfig)) {
     throw new UserError(
       `Pages doesn't currently support JSON formatted config \`${configPath ?? "wrangler.json"}\`. Please use wrangler.toml instead.`
     );
@@ -124253,7 +124259,7 @@ function readConfig(configPath, args) {
   if (diagnostics.hasErrors()) {
     throw new UserError(diagnostics.renderErrors());
   }
-  if (isPagesConfig) {
+  if (isPagesConfig2) {
     logger.debug(
       `Configuration file belonging to \u26A1\uFE0F Pages \u26A1\uFE0F project detected.`
     );
@@ -149740,6 +149746,10 @@ function Options13(yargs) {
     "log-level": {
       choices: ["debug", "info", "log", "warn", "error", "none"],
       describe: "Specify logging level"
+    },
+    "show-interactive-dev-session": {
+      describe: "Show interactive dev session (defaults to true if the terminal supports interactivity)",
+      type: "boolean"
     }
   });
 }
@@ -149771,7 +149781,8 @@ var Handler13 = /* @__PURE__ */ __name(async ({
   experimentalLocal,
   config,
   _: [_pages, _dev, ...remaining],
-  logLevel
+  logLevel,
+  showInteractiveDevSession
 }) => {
   if (logLevel) {
     logger.loggerLevel = logLevel;
@@ -150163,7 +150174,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates/ for
       },
       liveReload,
       forceLocal: true,
-      showInteractiveDevSession: void 0,
+      showInteractiveDevSession,
       testMode: false,
       watch: true
     }
@@ -162735,7 +162746,6 @@ async function createDeployment(accountId, workerName, versionTraffic, message)
           ([version_id, percentage]) => ({ version_id, percentage })
         ),
         annotations: {
-          "workers/triggered_by": "deployment",
           "workers/message": message
         }
       })
@@ -164288,8 +164298,11 @@ var CommandLineArgsError = class extends UserError {
 };
 __name(CommandLineArgsError, "CommandLineArgsError");
 function createCLIParser(argv) {
-  const experimentalGradualRollouts = argv.includes(
-    "--experimental-gradual-rollouts"
+  const experimentalGradualRollouts = (
+    // original flag -- using internal product name (Gradual Rollouts) -- kept for temp back-compat
+    argv.includes("--experimental-gradual-rollouts") || // new flag -- using external product name (Versions)
+    argv.includes("--experimental-versions") || // new flag -- shorthand
+    argv.includes("--x-versions")
   );
   const wrangler = yargs_default(argv).strict().showHelpOnFail(false).fail((msg, error2) => {
     if (!error2 || error2.name === "YError") {
@@ -164314,10 +164327,11 @@ function createCLIParser(argv) {
     alias: "j",
     describe: `Experimental: Support wrangler.json`,
     type: "boolean"
-  }).option("experimental-gradual-rollouts", {
-    describe: `Experimental: Support Gradual Rollouts`,
+  }).option("experimental-versions", {
+    describe: `Experimental: Support Worker Versions`,
     type: "boolean",
-    hidden: true
+    hidden: true,
+    alias: ["x-versions", "experimental-gradual-rollouts"]
   }).check((args) => {
     if (Object.keys(LOGGER_LEVELS).includes(args.logLevel)) {
       logger.loggerLevel = args.logLevel;
@@ -164690,7 +164704,9 @@ function createCLIParser(argv) {
     }
   );
   if (experimentalGradualRollouts) {
-    wrangler.command("versions", false, registerVersionsSubcommands);
+    wrangler.command("versions", false, (yargs) => {
+      return registerVersionsSubcommands(yargs.command(subHelp));
+    });
   }
   wrangler.exitProcess(false);
   return wrangler;
@@ -169168,6 +169184,9 @@ function devOptions(yargs) {
     describe: "Specify logging level",
     // Yargs requires this to type log-level properly
     default: "log"
+  }).option("show-interactive-dev-session", {
+    describe: "Show interactive dev session  (defaults to true if the terminal supports interactivity)",
+    type: "boolean"
   });
 }
 __name(devOptions, "devOptions");