wrangler 3.80.1 → 3.80.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.80.1",
+  "version": "3.80.2",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -153,8 +153,8 @@
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/pages-shared": "^0.11.63"
+    "@cloudflare/pages-shared": "^0.11.63",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.20240925.0"

package/wrangler-dist/cli.js

@@ -157962,7 +157962,7 @@ var import_undici3 = __toESM(require_undici());
 
 // package.json
 var name = "wrangler";
-var version = "3.80.1";
+var version = "3.80.2";
 
 // src/user/index.ts
 init_import_meta_url();
@@ -210277,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 [];