wrangler 0.0.0-bd935cfd → 0.0.0-bdc121de

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-bd935cfd",
+  "version": "0.0.0-bdc121de",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -96,7 +96,7 @@
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.1",
-    "miniflare": "3.20240304.1"
+    "miniflare": "3.20240314.0"
   },
   "devDependencies": {
     "@cloudflare/ai": "^1.0.35",
@@ -187,7 +187,7 @@
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/pages-shared": "^0.11.18",
+    "@cloudflare/pages-shared": "^0.11.20",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {

package/wrangler-dist/cli.d.ts

@@ -755,8 +755,8 @@ attributes?: { name?: string, domain?: string }
  */
 declare function deploy({ directory, accountId, projectName, branch, skipCaching, commitMessage, commitHash, commitDirty, functionsDirectory: customFunctionsDirectory, bundle, }: PagesDeployOptions): Promise<{
     url: string;
-    environment: "production" | "preview";
     id: string;
+    environment: "production" | "preview";
     project_id: string;
     project_name: string;
     build_config: {
@@ -2597,6 +2597,28 @@ declare interface MultiCacheQueryOptions extends CacheQueryOptions_2 {
     cacheName?: 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 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
@@ -23077,7 +23099,7 @@ declare type ProxyWorkerOutgoingRequestBody = {
     args: Parameters<typeof console.debug>;
 };
 
-declare type RawConfig = Partial<ConfigFields<RawDevConfig>> & RawEnvironment & DeprecatedConfigFields & EnvironmentMap;
+declare type RawConfig = Partial<ConfigFields<RawDevConfig>> & PagesConfigFields & RawEnvironment & DeprecatedConfigFields & EnvironmentMap;
 
 declare type RawDevConfig = Partial<DevConfig>;
 

package/wrangler-dist/cli.js

@@ -118248,6 +118248,14 @@ var JsonFriendlyFatalError = class extends FatalError {
   }
 };
 __name(JsonFriendlyFatalError, "JsonFriendlyFatalError");
+function createFatalError(message, isJson, code) {
+  if (isJson) {
+    return new JsonFriendlyFatalError(JSON.stringify(message), code);
+  } else {
+    return new FatalError(`${message}`, code);
+  }
+}
+__name(createFatalError, "createFatalError");
 
 // src/logger.ts
 init_import_meta_url();
@@ -119644,7 +119652,7 @@ var import_node_assert2 = __toESM(require("node:assert"));
 var import_undici3 = __toESM(require_undici());
 
 // package.json
-var version = "0.0.0-bd935cfd";
+var version = "0.0.0-bdc121de";
 var package_default = {
   name: "wrangler",
   version,
@@ -120742,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;
@@ -121715,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:`
@@ -121764,16 +121778,25 @@ function normalizeAndValidateConfig(rawConfig, configPath, args) {
     rawConfig.keep_vars,
     "boolean"
   );
+  validateOptionalProperty(
+    diagnostics,
+    "",
+    "pages_build_output_dir",
+    rawConfig.pages_build_output_dir,
+    "string"
+  );
   const isLegacyEnv2 = typeof args["legacy-env"] === "boolean" ? args["legacy-env"] : rawConfig.legacy_env ?? true;
   if (!isLegacyEnv2) {
     diagnostics.warnings.push(
       "Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
     );
   }
+  const isDispatchNamespace = typeof args["dispatch-namespace"] === "string" && args["dispatch-namespace"].trim() !== "";
   const topLevelEnv = normalizeAndValidateEnvironment(
     diagnostics,
     configPath,
-    rawConfig
+    rawConfig,
+    isDispatchNamespace
   );
   const envName = args.env;
   (0, import_node_assert3.default)(envName === void 0 || typeof envName === "string");
@@ -121788,17 +121811,19 @@ function normalizeAndValidateConfig(rawConfig, configPath, args) {
         envDiagnostics,
         configPath,
         rawEnv,
+        isDispatchNamespace,
         envName,
         topLevelEnv,
         isLegacyEnv2,
         rawConfig
       );
       diagnostics.addChild(envDiagnostics);
-    } else {
+    } else if (!isPagesConfig(rawConfig)) {
       activeEnv = normalizeAndValidateEnvironment(
         envDiagnostics,
         configPath,
         {},
+        isDispatchNamespace,
         envName,
         topLevelEnv,
         isLegacyEnv2,
@@ -121823,6 +121848,10 @@ Consider adding an environment configuration section to the wrangler.toml file:
   }
   const config = {
     configPath,
+    pages_build_output_dir: normalizeAndValidatePagesBuildOutputDir(
+      configPath,
+      rawConfig.pages_build_output_dir
+    ),
     legacy_env: isLegacyEnv2,
     send_metrics: rawConfig.send_metrics,
     keep_vars: rawConfig.keep_vars,
@@ -121980,6 +122009,20 @@ function normalizeAndValidateBaseDirField(configPath, rawDir) {
   }
 }
 __name(normalizeAndValidateBaseDirField, "normalizeAndValidateBaseDirField");
+function normalizeAndValidatePagesBuildOutputDir(configPath, rawPagesDir) {
+  const configDir = import_node_path7.default.dirname(configPath ?? "wrangler.toml");
+  if (rawPagesDir !== void 0) {
+    if (typeof rawPagesDir === "string") {
+      const directory = import_node_path7.default.resolve(configDir);
+      return import_node_path7.default.resolve(directory, rawPagesDir);
+    } else {
+      return rawPagesDir;
+    }
+  } else {
+    return;
+  }
+}
+__name(normalizeAndValidatePagesBuildOutputDir, "normalizeAndValidatePagesBuildOutputDir");
 function normalizeAndValidateDev(diagnostics, rawDev, args) {
   (0, import_node_assert3.default)(typeof args === "object" && args !== null && !Array.isArray(args));
   const {
@@ -122430,7 +122473,7 @@ var validateTailConsumers = /* @__PURE__ */ __name((diagnostics, field, value) =
   }
   return isValid;
 }, "validateTailConsumers");
-function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, envName = "top level", topLevelEnv, isLegacyEnv2, rawConfig) {
+function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDispatchNamespace, envName = "top level", topLevelEnv, isLegacyEnv2, rawConfig) {
   deprecated(
     diagnostics,
     rawEnv,
@@ -122534,7 +122577,7 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, envNam
       topLevelEnv,
       rawEnv,
       "name",
-      isValidName,
+      isDispatchNamespace ? isString : isValidName,
       appendEnvName(envName),
       void 0
     ),
@@ -123998,6 +124041,196 @@ function normalizeAndValidateLimits(diagnostics, topLevelEnv, rawEnv) {
 }
 __name(normalizeAndValidateLimits, "normalizeAndValidateLimits");
 
+// src/config/validation-pages.ts
+init_import_meta_url();
+
+// src/config/config.ts
+init_import_meta_url();
+var defaultWranglerConfig = {
+  /*====================================================*/
+  /*      Fields supported by both Workers & Pages      */
+  /*====================================================*/
+  /* TOP-LEVEL ONLY FIELDS */
+  pages_build_output_dir: void 0,
+  send_metrics: void 0,
+  dev: {
+    ip: process.platform === "win32" ? "127.0.0.1" : "localhost",
+    port: void 0,
+    // the default of 8787 is set at runtime
+    inspector_port: void 0,
+    // the default of 9229 is set at runtime
+    local_protocol: "http",
+    upstream_protocol: "http",
+    host: void 0
+  },
+  /** INHERITABLE ENVIRONMENT FIELDS **/
+  name: void 0,
+  compatibility_date: void 0,
+  compatibility_flags: [],
+  limits: void 0,
+  placement: void 0,
+  /** NON-INHERITABLE ENVIRONMENT FIELDS **/
+  vars: {},
+  durable_objects: { bindings: [] },
+  kv_namespaces: [],
+  queues: {
+    producers: [],
+    consumers: []
+    // WORKERS SUPPORT ONLY!!
+  },
+  r2_buckets: [],
+  d1_databases: [],
+  vectorize: [],
+  hyperdrive: [],
+  services: [],
+  analytics_engine_datasets: [],
+  ai: void 0,
+  /*====================================================*/
+  /*           Fields supported by Workers only         */
+  /*====================================================*/
+  /* TOP-LEVEL ONLY FIELDS */
+  configPath: void 0,
+  legacy_env: true,
+  migrations: [],
+  site: void 0,
+  assets: void 0,
+  wasm_modules: void 0,
+  text_blobs: void 0,
+  data_blobs: void 0,
+  keep_vars: void 0,
+  /** INHERITABLE ENVIRONMENT FIELDS **/
+  account_id: void 0,
+  main: void 0,
+  find_additional_modules: void 0,
+  preserve_file_names: void 0,
+  base_dir: void 0,
+  workers_dev: void 0,
+  route: void 0,
+  routes: void 0,
+  tsconfig: void 0,
+  jsx_factory: "React.createElement",
+  jsx_fragment: "React.Fragment",
+  triggers: {
+    crons: []
+  },
+  usage_model: void 0,
+  rules: [],
+  build: { command: void 0, watch_dir: "./src", cwd: void 0 },
+  no_bundle: void 0,
+  minify: void 0,
+  node_compat: void 0,
+  dispatch_namespaces: [],
+  first_party_worker: void 0,
+  zone_id: void 0,
+  logfwdr: { bindings: [] },
+  logpush: void 0,
+  /** NON-INHERITABLE ENVIRONMENT FIELDS **/
+  define: {},
+  cloudchamber: {},
+  send_email: [],
+  constellation: [],
+  browser: void 0,
+  unsafe: {
+    bindings: void 0,
+    metadata: void 0
+  },
+  mtls_certificates: [],
+  tail_consumers: void 0
+};
+
+// src/config/validation-pages.ts
+var supportedPagesConfigFields = [
+  "pages_build_output_dir",
+  "name",
+  "compatibility_date",
+  "compatibility_flags",
+  "send_metrics",
+  "limits",
+  "placement",
+  "vars",
+  "durable_objects",
+  "kv_namespaces",
+  "queues",
+  // `producers` ONLY
+  "r2_buckets",
+  "d1_databases",
+  "vectorize",
+  "hyperdrive",
+  "services",
+  "analytics_engine_datasets",
+  "ai",
+  "dev",
+  // normalizeAndValidateConfig() sets this value
+  "configPath"
+];
+function validatePagesConfig(config, envNames) {
+  if (!config.pages_build_output_dir) {
+    throw new FatalError(`Attempting to validate Pages configuration file, but no "pages_build_output_dir" configuration key was found.
+		"pages_build_output_dir" is required for Pages projects.`);
+  }
+  const diagnostics = new Diagnostics(
+    `Running configuration file validation for Pages:`
+  );
+  validateMainField(config, diagnostics);
+  validatePagesEnvironmentNames(envNames, diagnostics);
+  validateUnsupportedFields(config, diagnostics);
+  return diagnostics;
+}
+__name(validatePagesConfig, "validatePagesConfig");
+function validateMainField(config, diagnostics) {
+  if (config.main !== void 0) {
+    diagnostics.errors.push(
+      `Configuration file cannot contain both both "main" and "pages_build_output_dir" configuration keys.
+			Please use "main" if you are deploying a Worker, or "pages_build_output_dir" if you are deploying a Pages project.`
+    );
+  }
+}
+__name(validateMainField, "validateMainField");
+function validatePagesEnvironmentNames(envNames, diagnostics) {
+  if (!envNames?.length)
+    return;
+  const unsupportedPagesEnvNames = envNames.filter(
+    (name) => name !== "preview" && name !== "production"
+  );
+  if (unsupportedPagesEnvNames.length > 0) {
+    diagnostics.errors.push(
+      `Configuration file contains environment names that are not supported by Pages projects:
+			${unsupportedPagesEnvNames.join()}.
+			The supported named-environments for Pages are "preview" and "production".`
+    );
+  }
+}
+__name(validatePagesEnvironmentNames, "validatePagesEnvironmentNames");
+function validateUnsupportedFields(config, diagnostics) {
+  const unsupportedFields = new Set(Object.keys(config));
+  for (const field of supportedPagesConfigFields) {
+    if (field === "queues" && config.queues?.consumers?.length) {
+      continue;
+    }
+    unsupportedFields.delete(field);
+  }
+  for (const field of unsupportedFields) {
+    if (config[field] === void 0 || JSON.stringify(config[field]) === JSON.stringify(defaultWranglerConfig[field])) {
+      unsupportedFields.delete(field);
+    }
+  }
+  if (unsupportedFields.size > 0) {
+    const fields = Array.from(unsupportedFields.keys());
+    fields.forEach((field) => {
+      if (field === "queues" && config.queues?.consumers?.length) {
+        diagnostics.errors.push(
+          `Configuration file for Pages projects does not support "queues.consumers"`
+        );
+      } else {
+        diagnostics.errors.push(
+          `Configuration file for Pages projects does not support "${field}"`
+        );
+      }
+    });
+  }
+}
+__name(validateUnsupportedFields, "validateUnsupportedFields");
+
 // src/config/index.ts
 function readConfig(configPath, args) {
   let rawConfig = {};
@@ -124009,6 +124242,12 @@ function readConfig(configPath, args) {
   } else if (configPath?.endsWith("json")) {
     rawConfig = parseJSONC(readFileSync5(configPath), configPath);
   }
+  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.`
+    );
+  }
   const { config, diagnostics } = normalizeAndValidateConfig(
     rawConfig,
     configPath,
@@ -124020,6 +124259,19 @@ function readConfig(configPath, args) {
   if (diagnostics.hasErrors()) {
     throw new UserError(diagnostics.renderErrors());
   }
+  if (isPagesConfig2) {
+    logger.debug(
+      `Configuration file belonging to \u26A1\uFE0F Pages \u26A1\uFE0F project detected.`
+    );
+    const envNames = rawConfig.env ? Object.keys(rawConfig.env) : [];
+    const pagesDiagnostics = validatePagesConfig(config, envNames);
+    if (pagesDiagnostics.hasWarnings()) {
+      logger.warn(pagesDiagnostics.renderWarnings());
+    }
+    if (pagesDiagnostics.hasErrors()) {
+      throw new UserError(pagesDiagnostics.renderErrors());
+    }
+  }
   const mainModule = "script" in args ? args.script : config.main;
   if (typeof mainModule === "string" && mainModule.endsWith(".py")) {
     config.no_bundle = true;
@@ -128768,10 +129020,12 @@ function createWorkerUploadForm(worker) {
     compatibility_date,
     compatibility_flags,
     keepVars,
+    keepSecrets,
     logpush,
     placement,
     tail_consumers,
-    limits
+    limits,
+    annotations
   } = worker;
   let { modules } = worker;
   const metadataBindings = [];
@@ -129015,6 +129269,15 @@ function createWorkerUploadForm(worker) {
       })
     );
   }
+  let keep_bindings = void 0;
+  if (keepVars) {
+    keep_bindings ??= [];
+    keep_bindings.push("plain_text", "json");
+  }
+  if (keepSecrets) {
+    keep_bindings ??= [];
+    keep_bindings.push("secret_text", "secret_key");
+  }
   const metadata = {
     ...main2.type !== "commonjs" ? { main_module: main2.name } : { body_part: main2.name },
     bindings: metadataBindings,
@@ -129023,11 +129286,12 @@ function createWorkerUploadForm(worker) {
     ...usage_model && { usage_model },
     ...migrations && { migrations },
     capnp_schema: capnpSchemaOutputFile,
-    ...keepVars && { keep_bindings: ["plain_text", "json"] },
+    ...keep_bindings && { keep_bindings },
     ...logpush !== void 0 && { logpush },
     ...placement && { placement },
     ...tail_consumers && { tail_consumers },
-    ...limits && { limits }
+    ...limits && { limits },
+    ...annotations && { annotations }
   };
   if (bindings.unsafe?.metadata !== void 0) {
     for (const key of Object.keys(bindings.unsafe.metadata)) {
@@ -134522,8 +134786,10 @@ ${grayBar} ${msg}`);
         }
         clearLoop();
       } else {
-        logUpdate2(`
+        if (msg) {
+          logUpdate2(`
 ${grayBar} ${msg}`);
+        }
         newline();
       }
     }
@@ -143784,6 +144050,9 @@ function deployOptions(yargs) {
   }).option("old-asset-ttl", {
     describe: "Expire old assets in given seconds rather than immediate deletion.",
     type: "number"
+  }).option("dispatch-namespace", {
+    describe: "Name of a dispatch namespace to deploy the Worker to (Workers for Platforms)",
+    type: "string"
   });
 }
 __name(deployOptions, "deployOptions");
@@ -143868,7 +144137,8 @@ async function deployHandler(args) {
     keepVars: args.keepVars,
     logpush: args.logpush,
     oldAssetTtl: args.oldAssetTtl,
-    projectRoot
+    projectRoot,
+    dispatchNamespace: args.dispatchNamespace
   });
 }
 __name(deployHandler, "deployHandler");
@@ -145546,6 +145816,7 @@ function createWorkerBundleFormData(workerBundle) {
     compatibility_flags: void 0,
     usage_model: void 0,
     keepVars: void 0,
+    keepSecrets: void 0,
     logpush: void 0,
     placement: void 0,
     tail_consumers: void 0,
@@ -147062,6 +147333,27 @@ We looked for the Functions directory (${(0, import_node_path39.basename)(
   };
 }, "validateArgs");
 
+// src/pages/build-env.ts
+init_import_meta_url();
+function Options8(yargs) {
+  return yargs;
+}
+__name(Options8, "Options");
+var Handler8 = /* @__PURE__ */ __name(async (args) => {
+  const config = readConfig(void 0, {
+    ...args,
+    // eslint-disable-next-line turbo/no-undeclared-env-vars
+    env: process.env.PAGES_ENVIRONMENT
+  });
+  if (!config.pages_build_output_dir) {
+    throw new FatalError("No Pages config file found");
+  }
+  const textVars = Object.fromEntries(
+    Object.entries(config.vars).filter(([_3, v2]) => typeof v2 === "string")
+  );
+  logger.log(JSON.stringify(textVars));
+}, "Handler");
+
 // src/pages/deploy.tsx
 init_import_meta_url();
 var import_node_child_process4 = require("node:child_process");
@@ -147568,15 +147860,15 @@ var import_node_path40 = require("node:path");
 var import_mime2 = __toESM(require_mime2());
 var import_minimatch = __toESM(require_minimatch());
 init_hash();
-function Options8(yargs) {
+function Options9(yargs) {
   return yargs.positional("directory", {
     type: "string",
     demandOption: true,
     description: "The directory of static files to validate"
   });
 }
-__name(Options8, "Options");
-var Handler8 = /* @__PURE__ */ __name(async ({ directory }) => {
+__name(Options9, "Options");
+var Handler9 = /* @__PURE__ */ __name(async ({ directory }) => {
   if (!directory) {
     throw new FatalError("Must specify a directory.", 1);
   }
@@ -147649,7 +147941,7 @@ ${name} is ${prettyBytes(filestat.size, {
 }, "validate");
 
 // src/pages/upload.tsx
-function Options9(yargs) {
+function Options10(yargs) {
   return yargs.positional("directory", {
     type: "string",
     demandOption: true,
@@ -147665,8 +147957,8 @@ function Options9(yargs) {
     }
   });
 }
-__name(Options9, "Options");
-var Handler9 = /* @__PURE__ */ __name(async ({
+__name(Options10, "Options");
+var Handler10 = /* @__PURE__ */ __name(async ({
   directory,
   outputManifestPath,
   skipCaching
@@ -148483,7 +148775,7 @@ async function promptSelectProject({
 __name(promptSelectProject, "promptSelectProject");
 
 // src/pages/deploy.tsx
-function Options10(yargs) {
+function Options11(yargs) {
   return yargs.positional("directory", {
     type: "string",
     demandOption: true,
@@ -148530,8 +148822,8 @@ function Options10(yargs) {
     }
   });
 }
-__name(Options10, "Options");
-var Handler10 = /* @__PURE__ */ __name(async ({
+__name(Options11, "Options");
+var Handler11 = /* @__PURE__ */ __name(async ({
   _: _3,
   directory,
   projectName,
@@ -149020,7 +149312,7 @@ __name(createTail, "createTail");
 // src/pages/deployment-tails.ts
 var statusChoices = ["ok", "error", "canceled"];
 var isStatusChoiceList = /* @__PURE__ */ __name((data) => data?.every((d2) => statusChoices.includes(d2)) ?? false, "isStatusChoiceList");
-function Options11(yargs) {
+function Options12(yargs) {
   return yargs.positional("deployment", {
     type: "string",
     description: "(Optional) ID or URL of the deployment to tail. Specify by environment if deployment ID is unknown."
@@ -149071,8 +149363,8 @@ function Options11(yargs) {
     array: true
   });
 }
-__name(Options11, "Options");
-async function Handler11({
+__name(Options12, "Options");
+async function Handler12({
   deployment,
   projectName,
   environment,
@@ -149216,7 +149508,7 @@ async function Handler11({
     logger.log(`Connected to deployment ${deploymentId}, waiting for logs...`);
   }
 }
-__name(Handler11, "Handler");
+__name(Handler12, "Handler");
 
 // src/pages/deployments.tsx
 init_import_meta_url();
@@ -149313,7 +149605,8 @@ var BINDING_REGEXP = new RegExp(/^(?<binding>[^=]+)(?:=(?<ref>[^\s]+))?$/);
 var SERVICE_BINDING_REGEXP = new RegExp(
   /^(?<binding>[^=]+)=(?<service>[^@\s]+)(@(?<environment>.*)$)?$/
 );
-function Options12(yargs) {
+var DEFAULT_SCRIPT_PATH = "_worker.js";
+function Options13(yargs) {
   return yargs.positional("directory", {
     type: "string",
     demandOption: void 0,
@@ -149321,7 +149614,8 @@ function Options12(yargs) {
   }).positional("command", {
     type: "string",
     demandOption: void 0,
-    description: "The proxy command to run"
+    description: "The proxy command to run  [deprecated]"
+    // no official way to deprecate a positional argument
   }).options({
     local: {
       type: "boolean",
@@ -149363,12 +149657,14 @@ function Options12(yargs) {
     },
     proxy: {
       type: "number",
-      description: "The port to proxy (where the static assets are served)"
+      description: "The port to proxy (where the static assets are served)",
+      deprecated: true
     },
     "script-path": {
       type: "string",
-      default: "_worker.js",
-      description: "The location of the single Worker script if not using functions"
+      description: "The location of the single Worker script if not using functions  [default: _worker.js]",
+      // hacking in a fake default message here so we can detect when user is setting this and show a deprecation message
+      deprecated: true
     },
     bundle: {
       type: "boolean",
@@ -149456,11 +149752,15 @@ function Options12(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"
     }
   });
 }
-__name(Options12, "Options");
-var Handler12 = /* @__PURE__ */ __name(async ({
+__name(Options13, "Options");
+var Handler13 = /* @__PURE__ */ __name(async ({
   directory,
   compatibilityDate,
   compatibilityFlags,
@@ -149487,7 +149787,8 @@ var Handler12 = /* @__PURE__ */ __name(async ({
   experimentalLocal,
   config,
   _: [_pages, _dev, ...remaining],
-  logLevel
+  logLevel,
+  showInteractiveDevSession
 }) => {
   if (logLevel) {
     logger.loggerLevel = logLevel;
@@ -149500,6 +149801,13 @@ var Handler12 = /* @__PURE__ */ __name(async ({
   if (config) {
     throw new FatalError("Pages does not support wrangler.toml", 1);
   }
+  if (singleWorkerScriptPath !== void 0) {
+    logger.warn(
+      `\`--script-path\` is deprecated and will be removed in a future version of Wrangler.
+The Worker script should be named \`_worker.js\` and located in the build output directory of your project (specified with \`wrangler pages dev <directory>\`).`
+    );
+  }
+  singleWorkerScriptPath ??= DEFAULT_SCRIPT_PATH;
   const command2 = remaining;
   let proxyPort;
   if (directory !== void 0 && command2.length > 0) {
@@ -149508,6 +149816,11 @@ var Handler12 = /* @__PURE__ */ __name(async ({
       1
     );
   } else if (directory === void 0) {
+    logger.warn(
+      `Specifying a \`-- <command>\` or \`--proxy\` is deprecated and will be removed in a future version of Wrangler.
+Build your application to a directory and run the \`wrangler pages dev <directory>\` instead.
+This results in a more faithful emulation of production behavior.`
+    );
     proxyPort = await spawnProxyProcess({
       port: requestedProxyPort,
       command: command2
@@ -149879,7 +150192,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates/ for
       },
       liveReload,
       forceLocal: true,
-      showInteractiveDevSession: void 0,
+      showInteractiveDevSession,
       testMode: false,
       watch: true
     }
@@ -150074,8 +150387,8 @@ function pages(yargs) {
   return yargs.command(
     "dev [directory] [-- command..]",
     "\u{1F9D1}\u200D\u{1F4BB} Develop your full-stack Pages application locally",
-    Options12,
-    Handler12
+    Options13,
+    Handler13
   ).command(
     "functions",
     false,
@@ -150084,6 +150397,11 @@ function pages(yargs) {
       "Compile a folder of Cloudflare Pages Functions into a single Worker",
       Options7,
       Handler7
+    ).command(
+      "build-env",
+      "Render a list of environment variables from the config file",
+      Options8,
+      Handler8
     ).command(
       "optimize-routes [routesPath] [outputRoutesPath]",
       "Consolidate and optimize the route paths declared in _routes.json",
@@ -150108,11 +150426,11 @@ function pages(yargs) {
       "Delete a Cloudflare Pages project",
       DeleteOptions,
       DeleteHandler
-    ).command("upload [directory]", false, Options9, Handler9).command(
+    ).command("upload [directory]", false, Options10, Handler10).command(
       "validate [directory]",
       false,
-      Options8,
-      Handler8
+      Options9,
+      Handler9
     )
   ).command(
     "deployment",
@@ -150125,19 +150443,19 @@ function pages(yargs) {
     ).command(
       "create [directory]",
       "\u{1F199} Publish a directory of static assets as a Pages deployment",
-      Options10,
-      Handler10
+      Options11,
+      Handler11
     ).command(
       "tail [deployment]",
       "Start a tailing session for a project's deployment and livestream logs from your Functions",
-      Options11,
-      Handler11
+      Options12,
+      Handler12
     )
   ).command(
     ["deploy [directory]", "publish [directory]"],
     "\u{1F199} Deploy a directory of static assets as a Pages deployment",
-    Options10,
-    Handler10
+    Options11,
+    Handler11
   );
 }
 __name(pages, "pages");
@@ -151239,6 +151557,53 @@ async function putR2Sippy(accountId, bucketName, params, jurisdiction) {
   );
 }
 __name(putR2Sippy, "putR2Sippy");
+var actionsForEventCategories = {
+  object_create: ["PutObject", "CompleteMultipartUpload", "CopyObject"],
+  object_delete: ["DeleteObject", "LifecycleDeletion"]
+};
+function eventNotificationHeaders(apiCredentials) {
+  const headers = {
+    "Content-Type": "application/json"
+  };
+  if ("apiToken" in apiCredentials) {
+    headers["Authorization"] = `Bearer ${apiCredentials.apiToken}`;
+  } else {
+    headers["X-Auth-Key"] = apiCredentials.authKey;
+    headers["X-Auth-Email"] = apiCredentials.authEmail;
+  }
+  return headers;
+}
+__name(eventNotificationHeaders, "eventNotificationHeaders");
+async function putEventNotificationConfig(apiCredentials, accountId, bucketName, queueUUID, eventTypes, prefix, suffix) {
+  const headers = eventNotificationHeaders(apiCredentials);
+  let actions = [];
+  for (const et of eventTypes) {
+    actions = actions.concat(actionsForEventCategories[et]);
+  }
+  const body = {
+    rules: [{ prefix, suffix, actions }]
+  };
+  logger.log(
+    `Sending this configuration to "${bucketName}":
+${JSON.stringify(body)}`
+  );
+  return await fetchResult(
+    `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration/queues/${queueUUID}`,
+    { method: "PUT", body: JSON.stringify(body), headers }
+  );
+}
+__name(putEventNotificationConfig, "putEventNotificationConfig");
+async function deleteEventNotificationConfig(apiCredentials, accountId, bucketName, queueUUID) {
+  const headers = eventNotificationHeaders(apiCredentials);
+  logger.log(
+    `Disabling event notifications for "${bucketName}" to queue ${queueUUID}...`
+  );
+  return await fetchResult(
+    `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration/queues/${queueUUID}`,
+    { method: "DELETE", headers }
+  );
+}
+__name(deleteEventNotificationConfig, "deleteEventNotificationConfig");
 
 // src/r2/sippy.ts
 init_import_meta_url();
@@ -151918,6 +152283,94 @@ ${key} is ${prettyBytes(objectSize, {
         );
       }
     );
+    r2BucketYargs.command(
+      "event-notification",
+      "Manage event notifications for an R2 bucket",
+      (r2EvNotifyYargs) => {
+        return r2EvNotifyYargs.command(
+          "create <bucket>",
+          "Create new event notification configuration for an R2 bucket",
+          (yargs) => {
+            return yargs.positional("bucket", {
+              describe: "The name of the bucket for which notifications will be emitted",
+              type: "string",
+              demandOption: true
+            }).option("event-types", {
+              describe: "Specify the kinds of object events to emit notifications for. ex. '--event-types object_create object_delete'",
+              alias: "event-type",
+              choices: Object.keys(actionsForEventCategories),
+              demandOption: true,
+              requiresArg: true,
+              type: "array"
+            }).option("prefix", {
+              describe: "only actions on objects with this prefix will emit notifications",
+              requiresArg: false,
+              type: "string"
+            }).option("suffix", {
+              describe: "only actions on objects with this suffix will emit notifications",
+              type: "string"
+            }).option("queue", {
+              describe: "The ID of the queue to which event notifications will be sent. ex '--queue deadbeef-0123-4567-8910-abcdefgabcde'",
+              demandOption: true,
+              requiresArg: true,
+              type: "string"
+            });
+          },
+          async (args) => {
+            await printWranglerBanner();
+            const config = readConfig(args.config, args);
+            const accountId = await requireAuth(config);
+            const apiCreds = requireApiToken();
+            const {
+              bucket,
+              queue,
+              eventTypes,
+              prefix = "",
+              suffix = ""
+            } = args;
+            await putEventNotificationConfig(
+              apiCreds,
+              accountId,
+              `${bucket}`,
+              `${queue}`,
+              eventTypes,
+              `${prefix}`,
+              `${suffix}`
+            );
+            logger.log("Configuration created successfully!");
+          }
+        ).command(
+          "delete <bucket>",
+          "Delete event notification configuration for an R2 bucket and queue",
+          (yargs) => {
+            return yargs.positional("bucket", {
+              describe: "The name of the bucket for which notifications will be emitted",
+              type: "string",
+              demandOption: true
+            }).option("queue", {
+              describe: "The ID of the queue that is configured to receive notifications. ex '--queue deadbeef-0123-4567-8910-abcdefgabcde'",
+              demandOption: true,
+              requiresArg: true,
+              type: "string"
+            });
+          },
+          async (args) => {
+            await printWranglerBanner();
+            const config = readConfig(args.config, args);
+            const accountId = await requireAuth(config);
+            const apiCreds = requireApiToken();
+            const { bucket, queue } = args;
+            await deleteEventNotificationConfig(
+              apiCreds,
+              accountId,
+              `${bucket}`,
+              `${queue}`
+            );
+            logger.log("Configuration deleted successfully!");
+          }
+        );
+      }
+    );
     return r2BucketYargs;
   });
 }
@@ -151984,6 +152437,8 @@ async function createDraftWorker({
         usage_model: void 0,
         keepVars: false,
         // this doesn't matter since it's a new script anyway
+        keepSecrets: false,
+        // this doesn't matter since it's a new script anyway
         logpush: false,
         placement: void 0,
         tail_consumers: void 0,
@@ -161632,13 +162087,6 @@ async function tailHandler(args) {
       `Successfully created tail, expires at ${expiration.toLocaleString()}`
     );
   }
-  (0, import_signal_exit7.default)(async () => {
-    tail.terminate();
-    await deleteTail();
-    await sendMetricsEvent("end log stream", {
-      sendMetrics: config.send_metrics
-    });
-  });
   const printLog = args.format === "pretty" ? prettyPrintLogs : jsonPrintLogs;
   tail.on("message", printLog);
   while (tail.readyState !== tail.OPEN) {
@@ -161661,13 +162109,42 @@ async function tailHandler(args) {
   if (args.format === "pretty") {
     logger.log(`Connected to ${scriptDisplayName}, waiting for logs...`);
   }
-  tail.on("close", async () => {
+  const cancelPing = startWebSocketPing();
+  tail.on("close", exit6);
+  (0, import_signal_exit7.default)(exit6);
+  async function exit6() {
+    cancelPing();
     tail.terminate();
     await deleteTail();
     await sendMetricsEvent("end log stream", {
       sendMetrics: config.send_metrics
     });
-  });
+  }
+  __name(exit6, "exit");
+  function startWebSocketPing() {
+    const PING_MESSAGE = Buffer.from("wrangler tail ping");
+    const PING_INTERVAL = 1e4;
+    let waitingForPong = false;
+    const pingInterval = setInterval(() => {
+      if (waitingForPong) {
+        console.log(args.format);
+        throw createFatalError(
+          "Tail disconnected, exiting.",
+          args.format === "json",
+          1
+        );
+      }
+      waitingForPong = true;
+      tail.ping(PING_MESSAGE);
+    }, PING_INTERVAL);
+    tail.on("pong", (data) => {
+      if (data.equals(PING_MESSAGE)) {
+        waitingForPong = false;
+      }
+    });
+    return () => clearInterval(pingInterval);
+  }
+  __name(startWebSocketPing, "startWebSocketPing");
 }
 __name(tailHandler, "tailHandler");
 
@@ -162422,7 +162899,6 @@ async function createDeployment(accountId, workerName, versionTraffic, message)
           ([version_id, percentage]) => ({ version_id, percentage })
         ),
         annotations: {
-          "workers/triggered_by": "deployment",
           "workers/message": message
         }
       })
@@ -162910,6 +163386,7 @@ async function versionsListHandler(args) {
       Message: version3.annotations?.["workers/message"] || BLANK_INPUT2
     });
     logRaw(formattedVersion);
+    logRaw(``);
   }
 }
 __name(versionsListHandler, "versionsListHandler");
@@ -163061,7 +163538,7 @@ async function versionsUpload(props) {
       const { default_environment } = serviceMetaData;
       if (default_environment.script.last_deployed_from === "dash") {
         logger.warn(
-          `You are about to publish a Workers Service that was last published via the Cloudflare Dashboard.
+          `You are about to upload a Worker Version that was last published via the Cloudflare Dashboard.
 Edits that have been made via the dashboard will be overridden by your local code and config.`
         );
         if (!await confirm("Would you like to continue?")) {
@@ -163069,8 +163546,8 @@ Edits that have been made via the dashboard will be overridden by your local cod
         }
       } else if (default_environment.script.last_deployed_from === "api") {
         logger.warn(
-          `You are about to publish a Workers Service that was last updated via the script API.
-Edits that have been made via the script API will be overridden by your local code and config.`
+          `You are about to upload a Workers Version that was last updated via the API.
+Edits that have been made via the API will be overridden by your local code and config.`
         );
         if (!await confirm("Would you like to continue?")) {
           return;
@@ -163084,7 +163561,7 @@ Edits that have been made via the script API will be overridden by your local co
   }
   if (!(props.compatibilityDate || config.compatibility_date)) {
     const compatibilityDateStr = `${(/* @__PURE__ */ new Date()).getFullYear()}-${((/* @__PURE__ */ new Date()).getMonth() + 1 + "").padStart(2, "0")}-${((/* @__PURE__ */ new Date()).getDate() + "").padStart(2, "0")}`;
-    throw new UserError(`A compatibility_date is required when publishing. Add the following to your wrangler.toml file:.
+    throw new UserError(`A compatibility_date is required when uploading a Worker Version. Add the following to your wrangler.toml file:.
     \`\`\`
     compatibility_date = "${compatibilityDateStr}"
     \`\`\`
@@ -163093,7 +163570,6 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
   }
   const jsxFactory = props.jsxFactory || config.jsx_factory;
   const jsxFragment = props.jsxFragment || config.jsx_fragment;
-  const keepVars = props.keepVars || config.keep_vars;
   const minify = props.minify ?? config.minify;
   const legacyNodeCompat = props.nodeCompat ?? config.node_compat;
   if (legacyNodeCompat) {
@@ -163121,7 +163597,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
   const scriptName = props.name;
   if (!scriptName) {
     throw new UserError(
-      '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>"`'
+      'You need to provide a name when uploading a Worker Version. Either pass it as a cli arg with `--name <name>` or in your config file as `name = "<name>"`'
     );
   }
   if (config.site && !config.site.bucket) {
@@ -163273,11 +163749,18 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       compatibility_date: props.compatibilityDate ?? config.compatibility_date,
       compatibility_flags: compatibilityFlags,
       usage_model: config.usage_model,
-      keepVars,
+      keepVars: false,
+      // the wrangler.toml should be the source-of-truth for vars
+      keepSecrets: true,
+      // until wrangler.toml specifies secret bindings, we need to inherit from the previous Worker Version
       logpush: void 0,
       placement,
       tail_consumers: config.tail_consumers,
-      limits: config.limits
+      limits: config.limits,
+      annotations: {
+        "workers/message": props.message,
+        "workers/tag": props.tag
+      }
     };
     const bundleSizePromise = printBundleSize(
       { name: import_node_path46.default.basename(resolvedEntryPointPath), content },
@@ -163303,14 +163786,6 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       await ensureQueuesExist(config);
       try {
         const body = createWorkerUploadForm(worker);
-        body.set(
-          "annotations",
-          JSON.stringify({
-            "workers/message": props.message,
-            "workers/tag": props.tag,
-            "workers/triggered_by": "wrangler"
-          })
-        );
         const result = await fetchResult(
           workerUrl,
           {
@@ -163558,10 +164033,6 @@ function versionsUploadOptions(yargs) {
   }).option("dry-run", {
     describe: "Don't actually deploy",
     type: "boolean"
-  }).option("keep-vars", {
-    describe: "Stop wrangler from deleting vars that are not present in the wrangler.toml\nBy default Wrangler will remove all vars and replace them with those found in the wrangler.toml configuration.\nIf your development approach is to modify vars after deployment via the dashboard you may wish to set this flag.",
-    default: false,
-    type: "boolean"
   }).option("tag", {
     describe: "A tag for this Worker Gradual Rollouts Version",
     type: "string",
@@ -163618,7 +164089,7 @@ async function versionsUploadHandler(args) {
     outDir: args.outdir,
     dryRun: args.dryRun,
     noBundle: !(args.bundle ?? !config.no_bundle),
-    keepVars: args.keepVars,
+    keepVars: false,
     projectRoot,
     tag: args.tag,
     message: args.message
@@ -163980,8 +164451,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") {
@@ -164006,10 +164480,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;
@@ -164376,10 +164851,15 @@ function createCLIParser(argv) {
       } else {
         logger.log(version);
       }
+      logger.warn(
+        "`wrangler version` is deprecated and will be removed in a future major version. Please use `wrangler --version` instead."
+      );
     }
   );
   if (experimentalGradualRollouts) {
-    wrangler.command("versions", false, registerVersionsSubcommands);
+    wrangler.command("versions", false, (yargs) => {
+      return registerVersionsSubcommands(yargs.command(subHelp));
+    });
   }
   wrangler.exitProcess(false);
   return wrangler;
@@ -165846,7 +166326,7 @@ Update them to point to this script instead?`;
 __name(publishCustomDomains, "publishCustomDomains");
 async function deploy(props) {
   const { config, accountId, name } = props;
-  if (accountId && name) {
+  if (!props.dispatchNamespace && accountId && name) {
     try {
       const serviceMetaData = await fetchResult(
         `/accounts/${accountId}/workers/services/${name}`
@@ -165954,7 +166434,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
   const start = Date.now();
   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}`;
+  const workerUrl = props.dispatchNamespace ? `/accounts/${accountId}/workers/dispatch/namespaces/${props.dispatchNamespace}/scripts/${scriptName}` : notProd ? `/accounts/${accountId}/workers/services/${scriptName}/environments/${envName}` : `/accounts/${accountId}/workers/scripts/${scriptName}`;
   let available_on_subdomain = void 0;
   let deploymentId = null;
   const { format: format9 } = props.entry;
@@ -166128,6 +166608,8 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       compatibility_flags: compatibilityFlags,
       usage_model: config.usage_model,
       keepVars,
+      keepSecrets: keepVars,
+      // keepVars implies keepSecrets
       logpush: props.logpush !== void 0 ? props.logpush : config.logpush,
       placement,
       tail_consumers: config.tail_consumers,
@@ -166225,6 +166707,11 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
   (0, import_node_assert17.default)(accountId, "Missing accountId");
   const uploadMs = Date.now() - start;
   const deployments2 = [];
+  logger.log("Uploaded", workerName, formatTime3(uploadMs));
+  if (props.dispatchNamespace !== void 0) {
+    deployWfpUserWorker(props.dispatchNamespace, deploymentId);
+    return;
+  }
   if (deployToWorkersDev) {
     const userSubdomain = await getWorkersDevSubdomain(accountId);
     const scriptURL = props.legacyEnv || !props.env ? `${scriptName}.${userSubdomain}.workers.dev` : `${envName}.${scriptName}.${userSubdomain}.workers.dev`;
@@ -166293,7 +166780,6 @@ ${dashLink}`);
       }
     }
   }
-  logger.log("Uploaded", workerName, formatTime3(uploadMs));
   if (routesOnly.length > 0) {
     deployments2.push(
       publishRoutes(routesOnly, { workerUrl, scriptName, notProd }).then(() => {
@@ -166340,6 +166826,11 @@ ${dashLink}`);
   logger.log("Current Deployment ID:", deploymentId);
 }
 __name(deploy, "deploy");
+function deployWfpUserWorker(dispatchNamespace, deploymentId) {
+  logger.log("  Dispatch Namespace:", dispatchNamespace);
+  logger.log("Current Deployment ID:", deploymentId);
+}
+__name(deployWfpUserWorker, "deployWfpUserWorker");
 function helpIfErrorIsSizeOrScriptStartup2(err, dependencies) {
   if (errIsScriptSize2(err)) {
     printOffendingDependencies(dependencies);
@@ -167499,6 +167990,7 @@ async function createRemoteWorkerInit(props) {
     compatibility_flags: props.compatibilityFlags,
     usage_model: props.usageModel,
     keepVars: true,
+    keepSecrets: true,
     logpush: false,
     placement: void 0,
     // no placement in dev
@@ -168845,6 +169337,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");