wrangler 3.88.0 → 3.89.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.88.0",
+  "version": "3.89.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -66,9 +66,9 @@
     "unenv": "npm:unenv-nightly@2.0.0-20241111-080453-894aa31",
     "workerd": "1.20241106.1",
     "xxhash-wasm": "^1.0.1",
+    "@cloudflare/kv-asset-handler": "0.3.4",
     "@cloudflare/workers-shared": "0.7.1",
-    "miniflare": "3.20241106.0",
-    "@cloudflare/kv-asset-handler": "0.3.4"
+    "miniflare": "3.20241106.1"
   },
   "devDependencies": {
     "@cloudflare/types": "6.18.4",
@@ -139,9 +139,9 @@
     "ws": "^8.18.0",
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
-    "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/pages-shared": "^0.11.68",
+    "@cloudflare/pages-shared": "^0.11.69",
+    "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {

package/wrangler-dist/cli.d.ts

@@ -1469,7 +1469,7 @@ declare type Entry = {
     /** A worker's entrypoint */
     file: string;
     /** A worker's directory. Usually where the wrangler.toml file is located */
-    directory: string;
+    projectRoot: string;
     /** Is this a module worker or a service worker? */
     format: CfScriptFormat;
     /** The directory that contains all of a `--no-bundle` worker's modules. Usually `${directory}/src`. Defaults to path.dirname(file) */
@@ -26059,7 +26059,7 @@ declare interface StartDevWorkerInput {
 
 declare type StartDevWorkerOptions = Omit<StartDevWorkerInput, "assets"> & {
     /** A worker's directory. Usually where the wrangler.toml file is located */
-    directory: string;
+    projectRoot: string;
     build: StartDevWorkerInput["build"] & {
         nodejsCompatMode: NodeJSCompatMode;
         format: CfScriptFormat;

package/wrangler-dist/cli.js

@@ -111718,7 +111718,7 @@ init_import_meta_url();
 
 // package.json
 var name = "wrangler";
-var version = "3.88.0";
+var version = "3.89.0";
 
 // src/pages/constants.ts
 var isWindows = process.platform === "win32";
@@ -116089,7 +116089,7 @@ var validateObservability = /* @__PURE__ */ __name((diagnostics, field, value) =
     "logs"
   ]) && isValid2;
   if (typeof val.logs === "object") {
-    isValid2 = validateRequiredProperty(
+    isValid2 = validateOptionalProperty(
       diagnostics,
       field,
       "logs.enabled",
@@ -126647,7 +126647,7 @@ async function findAdditionalModules(entry, rules, attachSourcemaps = false) {
     let pythonRequirements = "";
     try {
       pythonRequirements = await (0, import_promises8.readFile)(
-        import_node_path17.default.resolve(entry.directory, "requirements.txt"),
+        import_node_path17.default.resolve(entry.projectRoot, "requirements.txt"),
         "utf-8"
       );
     } catch (e4) {
@@ -126940,7 +126940,7 @@ async function bundleWorker(entry, destination, {
             path: require.resolve(aliasPath, {
               // From the esbuild alias docs: "Note that when an import path is substituted using an alias, the resulting import path is resolved in the working directory instead of in the directory containing the source file with the import path."
               // https://esbuild.github.io/api/#alias:~:text=Note%20that%20when%20an%20import%20path%20is%20substituted%20using%20an%20alias%2C%20the%20resulting%20import%20path%20is%20resolved%20in%20the%20working%20directory%20instead%20of%20in%20the%20directory%20containing%20the%20source%20file%20with%20the%20import%20path.
-              paths: [entry.directory]
+              paths: [entry.projectRoot]
             })
           };
         }
@@ -126951,7 +126951,7 @@ async function bundleWorker(entry, destination, {
     // Don't use entryFile here as the file may have been changed when applying the middleware
     entryPoints: [entry.file],
     bundle,
-    absWorkingDir: entry.directory,
+    absWorkingDir: entry.projectRoot,
     outdir: destination,
     keepNames: true,
     entryNames: entryName || path16.parse(entryFile).name,
@@ -127069,7 +127069,7 @@ You should export these objects from your entrypoint, ${relativePath}.`
     (_path) => _path.includes(".map")
   )[0];
   const resolvedEntryPointPath = path16.resolve(
-    entry.directory,
+    entry.projectRoot,
     entryPoint.relativePath
   );
   const modules = dedupeModulesByName([
@@ -127086,7 +127086,7 @@ You should export these objects from your entrypoint, ${relativePath}.`
     sourceMapPath,
     sourceMapMetadata: {
       tmpDir: tmpDir.path,
-      entryDirectory: entry.directory
+      entryDirectory: entry.projectRoot
     }
   };
 }
@@ -134075,7 +134075,7 @@ function buildWorkerFromFunctions({
 }) {
   const entry = {
     file: (0, import_node_path34.resolve)(getBasePath(), "templates/pages-template-worker.ts"),
-    directory: functionsDirectory,
+    projectRoot: functionsDirectory,
     format: "modules",
     moduleRoot: functionsDirectory,
     exports: []
@@ -134144,7 +134144,7 @@ function buildRawWorker({
 }) {
   const entry = {
     file: workerScriptPath,
-    directory: (0, import_node_path34.resolve)(directory),
+    projectRoot: (0, import_node_path34.resolve)(directory),
     format: "modules",
     moduleRoot: (0, import_node_path34.resolve)(directory),
     exports: []
@@ -134218,7 +134218,7 @@ async function produceWorkerBundleForWorkerJSDirectory({
   const additionalModules = await findAdditionalModules(
     {
       file: entrypoint,
-      directory: (0, import_node_path34.resolve)(workerJSDirectory),
+      projectRoot: (0, import_node_path34.resolve)(workerJSDirectory),
       format: "modules",
       moduleRoot: (0, import_node_path34.resolve)(workerJSDirectory),
       exports: []
@@ -134413,7 +134413,7 @@ function buildPluginFromFunctions({
 }) {
   const entry = {
     file: (0, import_node_path35.resolve)(getBasePath(), "templates/pages-template-plugin.ts"),
-    directory: functionsDirectory,
+    projectRoot: functionsDirectory,
     format: "modules",
     moduleRoot: functionsDirectory,
     exports: []
@@ -135709,7 +135709,7 @@ function runBuild({
     stopWatching = bundleResult?.stop;
     if (noBundle) {
       const watching = [import_node_path43.default.resolve(entry.moduleRoot)];
-      const watchPythonRequirements = getBundleType(entry.format, entry.file) === "python" ? import_node_path43.default.resolve(entry.directory, "requirements.txt") : void 0;
+      const watchPythonRequirements = getBundleType(entry.format, entry.file) === "python" ? import_node_path43.default.resolve(entry.projectRoot, "requirements.txt") : void 0;
       if (watchPythonRequirements) {
         watching.push(watchPythonRequirements);
       }
@@ -135785,7 +135785,7 @@ var BundlerController = class extends Controller {
     this.#customBuildAborter.abort();
     this.#customBuildAborter = new AbortController();
     const buildAborter = this.#customBuildAborter;
-    const relativeFile = import_path9.default.relative(config.directory, config.entrypoint) || ".";
+    const relativeFile = import_path9.default.relative(config.projectRoot, config.entrypoint) || ".";
     logger.log(`The file ${filePath} changed, restarting build...`);
     this.emitBundleStartEvent(config);
     try {
@@ -135806,7 +135806,7 @@ var BundlerController = class extends Controller {
       }
       const entry = {
         file: config.entrypoint,
-        directory: config.directory,
+        projectRoot: config.projectRoot,
         format: config.build.format,
         moduleRoot: config.build.moduleRoot,
         exports: config.build.exports
@@ -135856,7 +135856,7 @@ var BundlerController = class extends Controller {
         // This could potentially cause issues as we no longer have identical behaviour between dev and deploy?
         targetConsumer: "dev",
         local: !config.dev?.remote,
-        projectRoot: config.directory,
+        projectRoot: config.projectRoot,
         defineNavigatorUserAgent: isNavigatorDefined(
           config.compatibilityDate,
           config.compatibilityFlags
@@ -135935,7 +135935,7 @@ var BundlerController = class extends Controller {
     (0, import_assert3.default)(this.#tmpDir);
     const entry = {
       file: config.entrypoint,
-      directory: config.directory,
+      projectRoot: config.projectRoot,
       format: config.build.format,
       moduleRoot: config.build.moduleRoot,
       exports: config.build.exports
@@ -135970,7 +135970,7 @@ var BundlerController = class extends Controller {
         // startDevWorker only applies to "dev"
         targetConsumer: "dev",
         testScheduled: Boolean(config.dev?.testScheduled),
-        projectRoot: config.directory,
+        projectRoot: config.projectRoot,
         onStart: () => {
           this.emitBundleStartEvent(config);
         },
@@ -136026,7 +136026,7 @@ var BundlerController = class extends Controller {
   onConfigUpdate(event) {
     this.#tmpDir?.remove();
     try {
-      this.#tmpDir = getWranglerTmpDir(event.config.directory, "dev");
+      this.#tmpDir = getWranglerTmpDir(event.config.projectRoot, "dev");
     } catch (e4) {
       logger.error(
         "Failed to create temporary directory to store built files."
@@ -148458,17 +148458,17 @@ function resolveEntryWithScript(script) {
 }
 __name(resolveEntryWithScript, "resolveEntryWithScript");
 function resolveEntryWithMain(main2, configPath) {
-  const directory = import_path16.default.resolve(import_path16.default.dirname(configPath ?? "."));
-  const file = import_path16.default.resolve(directory, main2);
-  const relativePath = import_path16.default.relative(directory, file) || ".";
-  return { absolutePath: file, relativePath };
+  const projectRoot = import_path16.default.resolve(import_path16.default.dirname(configPath ?? "."));
+  const file = import_path16.default.resolve(projectRoot, main2);
+  const relativePath = import_path16.default.relative(projectRoot, file) || ".";
+  return { absolutePath: file, relativePath, projectRoot };
 }
 __name(resolveEntryWithMain, "resolveEntryWithMain");
 function resolveEntryWithEntryPoint(entryPoint, configPath) {
-  const directory = import_path16.default.resolve(import_path16.default.dirname(configPath ?? "."));
+  const projectRoot = import_path16.default.resolve(import_path16.default.dirname(configPath ?? "."));
   const file = import_path16.default.extname(entryPoint) ? import_path16.default.resolve(entryPoint) : import_path16.default.resolve(entryPoint, "index.js");
-  const relativePath = import_path16.default.relative(directory, file) || ".";
-  return { absolutePath: file, relativePath };
+  const relativePath = import_path16.default.relative(projectRoot, file) || ".";
+  return { absolutePath: file, relativePath, projectRoot };
 }
 __name(resolveEntryWithEntryPoint, "resolveEntryWithEntryPoint");
 function resolveEntryWithAssets() {
@@ -148480,7 +148480,6 @@ __name(resolveEntryWithAssets, "resolveEntryWithAssets");
 
 // src/deployment-bundle/entry.ts
 async function getEntry(args, config, command4) {
-  const directory = process.cwd();
   const entryPoint = config.site?.["entry-point"];
   let paths;
   if (args.script) {
@@ -148502,9 +148501,10 @@ async function getEntry(args, config, command4) {
     );
   }
   await runCustomBuild(paths.absolutePath, paths.relativePath, config.build);
+  const projectRoot = paths.projectRoot ?? process.cwd();
   const { format: format10, exports: exports2 } = await guessWorkerFormat(
     paths.absolutePath,
-    directory,
+    projectRoot,
     args.format ?? config.build?.upload?.format,
     config.tsconfig
   );
@@ -148530,7 +148530,7 @@ ${migrateUrl}`
   }
   return {
     file: paths.absolutePath,
-    directory,
+    projectRoot,
     format: format10,
     moduleRoot: args.moduleRoot ?? config.base_dir ?? import_node_path47.default.dirname(paths.absolutePath),
     name: config.name ?? "worker",
@@ -148847,7 +148847,7 @@ To learn more about Workers with assets, visit our documentation at https://deve
     await verifyWorkerMatchesCITag(
       accountId,
       name2,
-      import_node_path48.default.relative(entry.directory, config.configPath ?? "wrangler.toml")
+      import_node_path48.default.relative(entry.projectRoot, config.configPath ?? "wrangler.toml")
     );
   }
   const { sourceMapSize, versionId, workerTag, targets } = await deploy({
@@ -155016,7 +155016,13 @@ ${failureMessage}`,
     deployment_id: deploymentResponse.id,
     url: deploymentResponse.url,
     alias,
-    environment: deploymentResponse.environment
+    environment: deploymentResponse.environment,
+    production_branch: deploymentResponse.production_branch,
+    deployment_trigger: {
+      metadata: {
+        commit_hash: deploymentResponse.deployment_trigger?.metadata?.commit_hash ?? ""
+      }
+    }
   });
   await sendMetricsEvent("create pages deployment");
 }, "Handler");
@@ -155458,7 +155464,9 @@ async function Handler13({
     throw new FatalError("Must specify a project name or deployment.", 1);
   }
   const deployments2 = await fetchResult(
-    `/accounts/${accountId}/pages/projects/${projectName}/deployments`
+    `/accounts/${accountId}/pages/projects/${projectName}/deployments`,
+    {},
+    new URLSearchParams({ env: environment })
   );
   const envDeployments = deployments2.filter(
     (d2) => d2.environment === environment
@@ -155563,11 +155571,16 @@ function ListOptions4(yargs) {
     "project-name": {
       type: "string",
       description: "The name of the project you would like to list deployments for"
+    },
+    environment: {
+      type: "string",
+      choices: ["production", "preview"],
+      description: "Environment type to list deployments for"
     }
   });
 }
 __name(ListOptions4, "ListOptions");
-async function ListHandler4({ projectName }) {
+async function ListHandler4({ projectName, environment }) {
   const config = getConfigCache(PAGES_CONFIG_CACHE_FILENAME);
   const accountId = await requireAuth(config);
   projectName ??= config.project_name;
@@ -155579,7 +155592,9 @@ async function ListHandler4({ projectName }) {
     throw new FatalError("Must specify a project name.", 1);
   }
   const deployments2 = await fetchResult(
-    `/accounts/${accountId}/pages/projects/${projectName}/deployments`
+    `/accounts/${accountId}/pages/projects/${projectName}/deployments`,
+    {},
+    environment ? new URLSearchParams({ env: environment }) : new URLSearchParams({})
   );
   const titleCase = /* @__PURE__ */ __name((word) => word.charAt(0).toUpperCase() + word.slice(1), "titleCase");
   const shortSha = /* @__PURE__ */ __name((sha) => sha.slice(0, 7), "shortSha");
@@ -173848,7 +173863,7 @@ async function versionsUploadHandler(args) {
     await verifyWorkerMatchesCITag(
       accountId,
       name2,
-      import_node_path62.default.relative(entry.directory, config.configPath ?? "wrangler.toml")
+      import_node_path62.default.relative(entry.projectRoot, config.configPath ?? "wrangler.toml")
     );
   }
   if (!args.dryRun) {
@@ -175094,7 +175109,7 @@ async function resolveConfig(config, input) {
     compatibilityDate: getDevCompatibilityDate(config, input.compatibilityDate),
     compatibilityFlags: input.compatibilityFlags ?? config.compatibility_flags,
     entrypoint: entry.file,
-    directory: entry.directory,
+    projectRoot: entry.projectRoot,
     bindings,
     migrations: input.migrations ?? config.migrations,
     sendMetrics: input.sendMetrics ?? config.send_metrics,