wrangler 3.63.0 → 3.63.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.63.0",
+  "version": "3.63.1",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -151,8 +151,8 @@
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
-    "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/cli": "1.1.1",
+    "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/pages-shared": "^0.11.46",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },

package/wrangler-dist/cli.js

@@ -85870,7 +85870,7 @@ var require_view = __commonJS({
     var debug = require_src3()("express:view");
     var path72 = require("path");
     var fs26 = require("fs");
-    var dirname13 = path72.dirname;
+    var dirname14 = path72.dirname;
     var basename4 = path72.basename;
     var extname4 = path72.extname;
     var join16 = path72.join;
@@ -85910,7 +85910,7 @@ var require_view = __commonJS({
       for (var i = 0; i < roots.length && !path73; i++) {
         var root = roots[i];
         var loc = resolve19(root, name);
-        var dir = dirname13(loc);
+        var dir = dirname14(loc);
         var file = basename4(loc);
         path73 = this.resolve(dir, file);
       }
@@ -103142,9 +103142,9 @@ var require_command_exists = __commonJS({
       cleanInput = /* @__PURE__ */ __name(function(s) {
         var isPathName = /[\\]/.test(s);
         if (isPathName) {
-          var dirname13 = '"' + path72.dirname(s) + '"';
+          var dirname14 = '"' + path72.dirname(s) + '"';
           var basename4 = '"' + path72.basename(s) + '"';
-          return dirname13 + ":" + basename4;
+          return dirname14 + ":" + basename4;
         }
         return '"' + s + '"';
       }, "cleanInput");
@@ -152612,7 +152612,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.63.0";
+var version = "3.63.1";
 var package_default = {
   name: "wrangler",
   version,
@@ -152965,10 +152965,6 @@ var FunctionsBuildError = class extends UserError {
   }
 };
 __name(FunctionsBuildError, "FunctionsBuildError");
-function getFunctionsBuildWarning(functionsDirectory, suffix) {
-  return `Unexpected error building Functions directory: ${functionsDirectory}${suffix ? " - " + suffix : ""}`;
-}
-__name(getFunctionsBuildWarning, "getFunctionsBuildWarning");
 var FunctionsNoRoutesError = class extends UserError {
   constructor(message) {
     super(message);
@@ -176235,7 +176231,10 @@ var Handler4 = /* @__PURE__ */ __name(async (args) => {
   await printWranglerBanner();
   const config = readConfig(args.config, args);
   if (file && command2) {
-    return logger.error(`Error: can't provide both --command and --file.`);
+    throw createFatalError(
+      `Error: can't provide both --command and --file.`,
+      json
+    );
   }
   const isInteractive3 = process.stdout.isTTY;
   try {
@@ -176573,17 +176572,24 @@ async function pollUntilComplete(response, accountId, db) {
 }
 __name(pollUntilComplete, "pollUntilComplete");
 async function d1ApiPost(accountId, db, action, body) {
-  return await fetchResult(
-    `/accounts/${accountId}/d1/database/${db.uuid}/${action}`,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        ...db.internal_env ? { "x-d1-internal-env": db.internal_env } : {}
-      },
-      body: JSON.stringify(body)
+  try {
+    return await fetchResult(
+      `/accounts/${accountId}/d1/database/${db.uuid}/${action}`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          ...db.internal_env ? { "x-d1-internal-env": db.internal_env } : {}
+        },
+        body: JSON.stringify(body)
+      }
+    );
+  } catch (x2) {
+    if (x2 instanceof APIError) {
+      x2.preventReport();
     }
-  );
+    throw x2;
+  }
 }
 __name(d1ApiPost, "d1ApiPost");
 function logResult(r3) {
@@ -185042,6 +185048,11 @@ The Worker script should be named \`_worker.js\` and located in the build output
       }
     });
   } else if (usingWorkerScript) {
+    const watcher = (0, import_chokidar3.watch)([workerScriptPath], {
+      persistent: true,
+      ignoreInitial: true
+    });
+    let watchedBundleDependencies = [];
     scriptPath3 = workerScriptPath;
     let runBuild2 = /* @__PURE__ */ __name(async () => {
       await checkRawWorker(
@@ -185056,33 +185067,54 @@ The Worker script should be named \`_worker.js\` and located in the build output
         `./bundledWorker-${Math.random()}.mjs`
       );
       runBuild2 = /* @__PURE__ */ __name(async () => {
-        try {
-          await buildRawWorker({
-            workerScriptPath: usingWorkerDirectory ? (0, import_node_path50.join)(workerScriptPath, "index.js") : workerScriptPath,
-            outfile: scriptPath3,
-            directory: directory ?? ".",
-            nodejsCompatMode,
-            local: true,
-            sourcemap: true,
-            watch: false,
-            onEnd: () => scriptReadyResolve(),
-            defineNavigatorUserAgent
-          });
-        } catch (e3) {
-          logger.warn("Failed to bundle _worker.js.", e3);
+        const workerScriptDirectory = (0, import_node_path50.dirname)(workerScriptPath);
+        let currentBundleDependencies = [];
+        const bundle = await buildRawWorker({
+          workerScriptPath: usingWorkerDirectory ? (0, import_node_path50.join)(workerScriptPath, "index.js") : workerScriptPath,
+          outfile: scriptPath3,
+          directory: directory ?? ".",
+          nodejsCompatMode,
+          local: true,
+          sourcemap: true,
+          watch: false,
+          onEnd: () => scriptReadyResolve(),
+          defineNavigatorUserAgent
+        });
+        const bundleDependencies = Object.keys(bundle.dependencies).map((dep) => (0, import_node_path50.resolve)(workerScriptDirectory, dep)).filter(
+          (resolvedDep) => !resolvedDep.includes((0, import_node_path50.normalize)(singleWorkerScriptPath)) && !resolvedDep.includes((0, import_node_path50.normalize)("/.wrangler/")) && resolvedDep.includes((0, import_node_path50.resolve)(process.cwd()))
+        );
+        const bundleModules = bundle.modules.filter((module3) => !!module3.filePath).map(
+          (module3) => (0, import_node_path50.resolve)(workerScriptDirectory, module3.filePath)
+        );
+        currentBundleDependencies = [...bundleDependencies, ...bundleModules];
+        if (watchedBundleDependencies.length) {
+          watcher.unwatch(watchedBundleDependencies);
         }
+        watcher.add(currentBundleDependencies);
+        watchedBundleDependencies = [...currentBundleDependencies];
       }, "runBuild");
     }
-    await runBuild2();
-    (0, import_chokidar3.watch)([workerScriptPath], {
-      persistent: true,
-      ignoreInitial: true
-    }).on("all", async (event) => {
-      if (event === "unlink") {
-        return;
+    const debouncedRunBuild = debounce(async () => {
+      try {
+        await runBuild2();
+      } catch (e3) {
+        logger.warn(
+          `Failed to build ${singleWorkerScriptPath}. Continuing to serve the last successfully built version of the Worker.`
+        );
       }
+    }, 50);
+    try {
       await runBuild2();
-    });
+      watcher.on("all", async (eventName, path72) => {
+        logger.debug(`\u{1F300} "${eventName}" event detected at ${path72}.`);
+        if (eventName === "unlink") {
+          return;
+        }
+        debouncedRunBuild();
+      });
+    } catch (e3) {
+      throw new FatalError(`Failed to build ${singleWorkerScriptPath}.`);
+    }
   } else if (usingFunctions) {
     scriptPath3 = (0, import_node_path50.join)(
       getPagesTmpDir(),
@@ -185094,74 +185126,55 @@ The Worker script should be named \`_worker.js\` and located in the build output
     );
     logger.debug(`Compiling worker to "${scriptPath3}"...`);
     const onEnd = /* @__PURE__ */ __name(() => scriptReadyResolve(), "onEnd");
-    const watchedBundleDependencies = /* @__PURE__ */ new Set();
     const watcher = (0, import_chokidar3.watch)([functionsDirectory], {
       persistent: true,
       ignoreInitial: true
     });
-    try {
-      const buildFn = /* @__PURE__ */ __name(async () => {
-        const currentBundleDependencies = /* @__PURE__ */ new Set();
-        const bundle = await buildFunctions({
-          outfile: scriptPath3,
-          functionsDirectory,
-          sourcemap: true,
-          watch: false,
-          onEnd,
-          buildOutputDirectory: directory,
-          nodejsCompatMode,
-          local: true,
-          routesModule,
-          defineNavigatorUserAgent
-        });
-        for (const dep in bundle.dependencies) {
-          const resolvedDep = (0, import_node_path50.resolve)(functionsDirectory, dep);
-          if (!resolvedDep.includes((0, import_node_path50.normalize)("/functions/")) && !resolvedDep.includes((0, import_node_path50.normalize)("/.wrangler/")) && resolvedDep.includes((0, import_node_path50.resolve)(process.cwd()))) {
-            currentBundleDependencies.add(resolvedDep);
-            if (!watchedBundleDependencies.has(resolvedDep)) {
-              watchedBundleDependencies.add(resolvedDep);
-              watcher.add(resolvedDep);
-            }
-          }
-        }
-        for (const module3 of bundle.modules) {
-          if (module3.filePath) {
-            const resolvedDep = (0, import_node_path50.resolve)(functionsDirectory, module3.filePath);
-            currentBundleDependencies.add(resolvedDep);
-            if (!watchedBundleDependencies.has(resolvedDep)) {
-              watchedBundleDependencies.add(resolvedDep);
-              watcher.add(resolvedDep);
-            }
-          }
-        }
-        watchedBundleDependencies.forEach(async (path72) => {
-          if (!currentBundleDependencies.has(path72)) {
-            watchedBundleDependencies.delete(path72);
-            watcher.unwatch(path72);
-          }
-        });
-        await sendMetricsEvent("build pages functions");
-      }, "buildFn");
-      const debouncedBuildFn = debounce(async () => {
-        try {
-          await buildFn();
-        } catch (e3) {
-          if (e3 instanceof FunctionsNoRoutesError) {
-            logger.error(
-              getFunctionsNoRoutesWarning(functionsDirectory, "skipping")
-            );
-          } else if (e3 instanceof FunctionsBuildError) {
-            logger.error(
-              getFunctionsBuildWarning(functionsDirectory, e3.message)
-            );
-          } else {
-            logger.error(
-              `Error while attempting to build the Functions directory ${functionsDirectory}. Skipping to last successfully built version of Functions.
-${e3}`
-            );
-          }
+    let watchedBundleDependencies = [];
+    const buildFn = /* @__PURE__ */ __name(async () => {
+      let currentBundleDependencies = [];
+      const bundle = await buildFunctions({
+        outfile: scriptPath3,
+        functionsDirectory,
+        sourcemap: true,
+        watch: false,
+        onEnd,
+        buildOutputDirectory: directory,
+        nodejsCompatMode,
+        local: true,
+        routesModule,
+        defineNavigatorUserAgent
+      });
+      const bundleDependencies = Object.keys(bundle.dependencies).map((dep) => (0, import_node_path50.resolve)(functionsDirectory, dep)).filter(
+        (resolvedDep) => !resolvedDep.includes((0, import_node_path50.normalize)("/functions/")) && !resolvedDep.includes((0, import_node_path50.normalize)("/.wrangler/")) && resolvedDep.includes((0, import_node_path50.resolve)(process.cwd()))
+      );
+      const bundleModules = bundle.modules.filter((module3) => !!module3.filePath).map(
+        (module3) => (0, import_node_path50.resolve)(functionsDirectory, module3.filePath)
+      );
+      currentBundleDependencies = [...bundleDependencies, ...bundleModules];
+      if (watchedBundleDependencies.length) {
+        watcher.unwatch(watchedBundleDependencies);
+      }
+      watcher.add(currentBundleDependencies);
+      watchedBundleDependencies = [...currentBundleDependencies];
+      await sendMetricsEvent("build pages functions");
+    }, "buildFn");
+    const debouncedBuildFn = debounce(async () => {
+      try {
+        await buildFn();
+      } catch (e3) {
+        if (e3 instanceof FunctionsNoRoutesError) {
+          logger.warn(
+            `${getFunctionsNoRoutesWarning(functionsDirectory)}. Continuing to serve the last successfully built version of Functions.`
+          );
+        } else {
+          logger.warn(
+            `Failed to build Functions at ${functionsDirectory}. Continuing to serve the last successfully built version of Functions.`
+          );
         }
-      }, 50);
+      }
+    }, 50);
+    try {
       await buildFn();
       watcher.on("all", async (eventName, path72) => {
         logger.debug(`\u{1F300} "${eventName}" event detected at ${path72}.`);
@@ -185176,15 +185189,14 @@ ${e3}`
         usingFunctions = false;
       } else {
         throw new FatalError(
-          `Error while attempting to build the Functions directory ${functionsDirectory}
-${e3}`
+          `Failed to build Functions at ${functionsDirectory}.`
         );
       }
     }
   }
   if (!usingFunctions && !usingWorkerScript) {
     scriptReadyResolve();
-    logger.log("No functions. Shimming...");
+    logger.log("No Functions. Shimming...");
     scriptPath3 = (0, import_node_path50.resolve)(getBasePath(), "templates/pages-shim.ts");
   }
   await scriptReadyPromise;