wrangler 3.80.0 → 3.80.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.80.0",
+  "version": "3.80.2",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -66,7 +66,7 @@
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.4",
     "@cloudflare/workers-shared": "0.5.4",
-    "miniflare": "3.20240925.0"
+    "miniflare": "3.20240925.1"
   },
   "devDependencies": {
     "@cloudflare/types": "^6.18.4",
@@ -151,9 +151,9 @@
     "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/pages-shared": "^0.11.62",
+    "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/pages-shared": "^0.11.63",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {

package/wrangler-dist/cli.js

@@ -156596,7 +156596,10 @@ ${message}
     logger.debug(`\u{1FAB5}  Writing logs to "${debugLogFilepath}"`);
     (0, import_signal_exit.default)(() => {
       if (hasSeenErrorMessage) {
-        console.warn(`\u{1FAB5}  Logs were written to "${debugLogFilepath}"`);
+        logger.console(
+          "warn",
+          `\u{1FAB5}  Logs were written to "${debugLogFilepath}"`
+        );
       }
     });
   }
@@ -156754,14 +156757,14 @@ var logger = new Logger();
 function logBuildWarnings(warnings) {
   const logs = (0, import_esbuild.formatMessagesSync)(warnings, { kind: "warning", color: true });
   for (const log2 of logs) {
-    console.warn(log2);
+    logger.console("warn", log2);
   }
 }
 __name(logBuildWarnings, "logBuildWarnings");
 function logBuildFailure(errors, warnings) {
   const logs = (0, import_esbuild.formatMessagesSync)(errors, { kind: "error", color: true });
   for (const log2 of logs) {
-    console.error(log2);
+    logger.console("error", log2);
   }
   logBuildWarnings(warnings);
 }
@@ -157959,7 +157962,7 @@ var import_undici3 = __toESM(require_undici());
 
 // package.json
 var name = "wrangler";
-var version = "3.80.0";
+var version = "3.80.2";
 
 // src/user/index.ts
 init_import_meta_url();
@@ -159550,7 +159553,7 @@ async function fetchWorker(resource, bodyInit = {}) {
     headers
   });
   if (!response.ok || !response.body) {
-    console.error(response.ok, response.body);
+    logger.error(response.ok, response.body);
     throw new Error(
       `Failed to fetch ${resource} - ${response.status}: ${response.statusText});`
     );
@@ -165305,6 +165308,7 @@ async function bundleWorker(entry, destination, {
     bundle,
     absWorkingDir: entry.directory,
     outdir: destination,
+    keepNames: true,
     entryNames: entryName || path14.parse(entryFile).name,
     ...isOutfile ? {
       outdir: void 0,
@@ -167587,9 +167591,8 @@ function buildAssetOptions(config) {
   if (config.assets) {
     return {
       assets: {
-        workerName: config.name,
-        path: config.assets.directory,
-        bindingName: config.assets.binding,
+        directory: config.assets.directory,
+        binding: config.assets.binding,
         routingConfig: config.assets.routingConfig,
         assetConfig: config.assets.assetConfig
       }
@@ -172764,7 +172767,8 @@ async function guessWorkerFormat(entryFile, entryWorkingDirectory, hint, tsconfi
     metafile: true,
     bundle: false,
     write: false,
-    ...tsconfig && { tsconfig }
+    ...tsconfig && { tsconfig },
+    logLevel: "silent"
   });
   const metafile = result.metafile;
   const { exports: exports2 } = getEntryPointFromMetafile(entryFile, metafile);
@@ -176364,7 +176368,6 @@ function registerDevHotKeys(devEnv, args) {
       keys: ["x", "q", "ctrl+c"],
       label: "to exit",
       handler: async () => {
-        unregisterHotKeys();
         await devEnv.teardown();
       }
     }
@@ -210274,36 +210277,54 @@ function writeDTSFile({
       throw error2;
     }
   }
-  let combinedTypeStrings = "";
-  if (formatType === "modules") {
-    combinedTypeStrings += `interface ${envInterface} {${envTypeStructure.map((value) => `
-	${value}`).join("")}
-}
-${modulesTypeStructure.join("\n")}`;
-  } else {
-    combinedTypeStrings += `export {};
-declare global {
-${envTypeStructure.map((value) => `	const ${value}`).join("\n")}
-}
-${modulesTypeStructure.join("\n")}`;
-  }
   const wranglerCommandUsed = ["wrangler", ...process.argv.slice(2)].join(" ");
   const typesHaveBeenFound = envTypeStructure.length || modulesTypeStructure.length;
   if (formatType === "modules" || typesHaveBeenFound) {
+    const { fileContent, consoleOutput } = generateTypeStrings(
+      formatType,
+      envInterface,
+      envTypeStructure,
+      modulesTypeStructure
+    );
     fs25.writeFileSync(
       path74,
       [
         `// Generated by Wrangler by running \`${wranglerCommandUsed}\``,
         "",
-        combinedTypeStrings
+        fileContent
       ].join("\n")
     );
     logger.log(`Generating project types...
 `);
-    logger.log(combinedTypeStrings);
+    logger.log(consoleOutput);
   }
 }
 __name(writeDTSFile, "writeDTSFile");
+function generateTypeStrings(formatType, envInterface, envTypeStructure, modulesTypeStructure) {
+  let baseContent = "";
+  let eslintDisable = "";
+  if (formatType === "modules") {
+    if (envTypeStructure.length === 0) {
+      eslintDisable = "// eslint-disable-next-line @typescript-eslint/no-empty-interface,@typescript-eslint/no-empty-object-type\n";
+    }
+    baseContent = `interface ${envInterface} {${envTypeStructure.map((value) => `
+	${value}`).join("")}
+}`;
+  } else {
+    baseContent = `export {};
+declare global {
+${envTypeStructure.map((value) => `	const ${value}`).join("\n")}
+}`;
+  }
+  const modulesContent = modulesTypeStructure.join("\n");
+  return {
+    fileContent: `${eslintDisable}${baseContent}
+${modulesContent}`,
+    consoleOutput: `${baseContent}
+${modulesContent}`
+  };
+}
+__name(generateTypeStrings, "generateTypeStrings");
 function readTsconfigTypes(tsconfigPath) {
   if (!fs25.existsSync(tsconfigPath)) {
     return [];
@@ -214195,10 +214216,15 @@ To learn more about Workers with assets, visit our documentation at https://deve
       () => startDev(args)
     );
     if (args.experimentalDevEnv) {
-      (0, import_node_assert24.default)(devInstance instanceof DevEnv);
-      await import_node_events3.default.once(devInstance, "teardown");
+      (0, import_node_assert24.default)(devInstance.devEnv !== void 0);
+      await import_node_events3.default.once(devInstance.devEnv, "teardown");
+      if (devInstance.teardownRegistryPromise) {
+        const teardownRegistry = await devInstance.teardownRegistryPromise;
+        await teardownRegistry(devInstance.devEnv.config.latestConfig?.name);
+      }
+      devInstance.unregisterHotKeys?.();
     } else {
-      (0, import_node_assert24.default)(!(devInstance instanceof DevEnv));
+      (0, import_node_assert24.default)(devInstance.devEnv === void 0);
       configFileWatcher = devInstance.configFileWatcher;
       assetsWatcher = devInstance.assetsWatcher;
       const { waitUntilExit } = devInstance.devReactElement;
@@ -214268,6 +214294,9 @@ async function startDev(args) {
   let configFileWatcher;
   let assetsWatcher;
   let rerender;
+  const devEnv = new DevEnv();
+  let teardownRegistryPromise;
+  let unregisterHotKeys;
   try {
     if (args.logLevel) {
       logger.loggerLevel = args.logLevel;
@@ -214300,7 +214329,6 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
       );
     }
     const configPath = args.config || args.script && findWranglerToml(import_node_path64.default.dirname(args.script));
-    const devEnv = new DevEnv();
     if (args.experimentalDevEnv) {
       void devEnv.proxy.ready.promise.then(({ url: url4 }) => {
         if (process.send && typeof vitest === "undefined") {
@@ -214314,13 +214342,9 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
         }
       });
       if (!args.disableDevRegistry) {
-        const teardownRegistryPromise = devRegistry(
+        teardownRegistryPromise = devRegistry(
           (registry) => updateDevEnvRegistry(devEnv, registry)
         );
-        devEnv.once("teardown", async () => {
-          const teardownRegistry = await teardownRegistryPromise;
-          await teardownRegistry(devEnv.config.latestConfig?.name);
-        });
         devEnv.runtimes.forEach((runtime) => {
           runtime.on(
             "reloadComplete",
@@ -214338,7 +214362,6 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
           );
         });
       }
-      let unregisterHotKeys;
       if (isInteractive() && args.showInteractiveDevSession !== false) {
         unregisterHotKeys = registerDevHotKeys(devEnv, args);
       }
@@ -214476,7 +214499,7 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
           offline: !args.remote
         }
       );
-      return devEnv;
+      return { devEnv, unregisterHotKeys, teardownRegistryPromise };
     } else {
       const projectRoot = configPath && import_node_path64.default.dirname(configPath);
       let config = readConfig(configPath, args);
@@ -214674,7 +214697,15 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
   } catch (e3) {
     await Promise.allSettled([
       configFileWatcher?.close(),
-      assetsWatcher?.close()
+      assetsWatcher?.close(),
+      devEnv.teardown(),
+      (async () => {
+        if (teardownRegistryPromise) {
+          const teardownRegistry = await teardownRegistryPromise;
+          await teardownRegistry(devEnv.config.latestConfig?.name);
+        }
+        unregisterHotKeys?.();
+      })()
     ]);
     throw e3;
   }
@@ -215565,6 +215596,11 @@ var BundlerController = class extends Controller {
   #assetsWatcher;
   async #ensureWatchingAssets(config) {
     await this.#assetsWatcher?.close();
+    const debouncedRefreshBundle = debounce(() => {
+      if (this.#currentBundle) {
+        this.emitBundleCompleteEvent(config, this.#currentBundle);
+      }
+    });
     if (config.assets?.directory) {
       this.#assetsWatcher = (0, import_chokidar7.watch)(config.assets.directory, {
         persistent: true,
@@ -215572,9 +215608,7 @@ var BundlerController = class extends Controller {
       }).on("all", async (eventName, filePath) => {
         const message = getAssetChangeMessage(eventName, filePath);
         logger.debug(`\u{1F300} ${message}...`);
-        if (this.#currentBundle) {
-          this.emitBundleCompleteEvent(config, this.#currentBundle);
-        }
+        debouncedRefreshBundle();
       });
     }
   }
@@ -215782,6 +215816,7 @@ async function resolveConfig(config, input) {
     triggers: await resolveTriggers(config, input),
     env: input.env,
     build: {
+      alias: input.build?.alias ?? config.alias,
       additionalModules: input.build?.additionalModules ?? [],
       processEntrypoint: Boolean(input.build?.processEntrypoint),
       bundle: input.build?.bundle ?? !config.no_bundle,
@@ -217244,8 +217279,9 @@ function deepFreeze(obj) {
 }
 __name(deepFreeze, "deepFreeze");
 function unstable_getMiniflareWorkerOptions(configPath, env7) {
+  const isJsonConfigFile = configPath.endsWith(".json") || configPath.endsWith(".jsonc");
   const config = readConfig(configPath, {
-    experimentalJsonConfig: true,
+    experimentalJsonConfig: isJsonConfigFile,
     env: env7
   });
   const modulesRules = config.rules.concat(DEFAULT_MODULE_RULES).map((rule) => ({
@@ -217289,12 +217325,15 @@ function unstable_getMiniflareWorkerOptions(configPath, env7) {
   }
   const legacyAssetPaths = config.legacy_assets ? getLegacyAssetPaths(config, void 0) : getSiteAssetPaths(config);
   const sitesOptions = buildSitesOptions({ legacyAssetPaths });
+  const processedAssetOptions = processAssetsArg({ assets: void 0 }, config);
+  const assetOptions = processedAssetOptions ? buildAssetOptions({ assets: processedAssetOptions }) : {};
   const workerOptions = {
     compatibilityDate: config.compatibility_date,
     compatibilityFlags: config.compatibility_flags,
     modulesRules,
     ...bindingOptions,
-    ...sitesOptions
+    ...sitesOptions,
+    ...assetOptions
   };
   return { workerOptions, define: config.define, main: config.main };
 }