wrangler 3.1.2 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "3.1.2",
+	"version": "3.3.0",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -103,7 +103,7 @@
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.16.3",
-		"miniflare": "3.20230628.0",
+		"miniflare": "3.20230717.0",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -114,7 +114,7 @@
 		"@cloudflare/eslint-config-worker": "*",
 		"@cloudflare/types": "^6.18.4",
 		"@cloudflare/workers-tsconfig": "*",
-		"@cloudflare/workers-types": "^4.20230511.0",
+		"@cloudflare/workers-types": "^4.20230717.0",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
 		"@types/better-sqlite3": "^7.6.0",

package/templates/middleware/loader-modules.ts

@@ -62,9 +62,11 @@ function getMaskedEnv(rawEnv: unknown) {
  */
 type MissingExportHandlers = Omit<
 	Required<ExportedHandler>,
-	"tail" | "trace" | "scheduled" | "queue" | "test" | "fetch"
+	"tail" | "trace" | "scheduled" | "queue" | "test" | "email" | "fetch"
 >;
 
+let registeredMiddleware = false;
+
 const facade: ExportedHandler<unknown> & MissingExportHandlers = {
 	...(worker.tail && {
 		tail: maskHandlerEnv(worker.tail),
@@ -81,13 +83,21 @@ const facade: ExportedHandler<unknown> & MissingExportHandlers = {
 	...(worker.test && {
 		test: maskHandlerEnv(worker.test),
 	}),
+	...(worker.email && {
+		email: maskHandlerEnv(worker.email),
+	}),
 
 	fetch(request, rawEnv, ctx) {
 		const env = getMaskedEnv(rawEnv);
 		// Get the chain of middleware from the worker object
 		if (worker.middleware && worker.middleware.length > 0) {
-			for (const middleware of worker.middleware) {
-				__facade_register__(middleware);
+			// Make sure we only register middleware once:
+			// https://github.com/cloudflare/workers-sdk/issues/2386#issuecomment-1614715911
+			if (!registeredMiddleware) {
+				registeredMiddleware = true;
+				for (const middleware of worker.middleware) {
+					__facade_register__(middleware);
+				}
 			}
 
 			const __facade_modules_dispatch__: Dispatcher = function (type, init) {

package/wrangler-dist/cli.js

@@ -119568,7 +119568,7 @@ var import_undici3 = __toESM(require_undici());
 var import_undici4 = __toESM(require_undici());
 
 // package.json
-var version = "3.1.2";
+var version = "3.3.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -119674,7 +119674,7 @@ var package_default = {
     "blake3-wasm": "^2.1.5",
     chokidar: "^3.5.3",
     esbuild: "0.16.3",
-    miniflare: "3.20230628.0",
+    miniflare: "3.20230717.0",
     nanoid: "^3.3.3",
     "path-to-regexp": "^6.2.0",
     selfsigned: "^2.0.1",
@@ -119685,7 +119685,7 @@ var package_default = {
     "@cloudflare/eslint-config-worker": "*",
     "@cloudflare/types": "^6.18.4",
     "@cloudflare/workers-tsconfig": "*",
-    "@cloudflare/workers-types": "^4.20230511.0",
+    "@cloudflare/workers-types": "^4.20230717.0",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.28.3",
     "@types/better-sqlite3": "^7.6.0",
@@ -124559,7 +124559,8 @@ async function bundleWorker(entry, destination, options14) {
     sourceMapMetadata: {
       tmpDir: tmpDir.path,
       entryDirectory: entry.directory
-    }
+    },
+    moduleCollector
   };
 }
 __name(bundleWorker, "bundleWorker");
@@ -128510,7 +128511,8 @@ async function traverseModuleGraph(entry, rules) {
     bundleType,
     stop: void 0,
     sourceMapPath: void 0,
-    sourceMapMetadata: void 0
+    sourceMapMetadata: void 0,
+    moduleCollector: void 0
   };
 }
 __name(traverseModuleGraph, "traverseModuleGraph");
@@ -137271,6 +137273,9 @@ function deleteOptions(yargs) {
   }).option("dry-run", {
     describe: "Don't actually delete",
     type: "boolean"
+  }).option("force", {
+    describe: "Delete even if doing so will break other Workers that depend on this one",
+    type: "boolean"
   }).option("legacy-env", {
     type: "boolean",
     describe: "Use legacy environments",
@@ -137298,14 +137303,18 @@ async function deleteHandler(args) {
     return;
   }
   (0, import_assert2.default)(accountId, "Missing accountId");
-  const confirmed = await confirm(
+  const confirmed = args.force || await confirm(
     `Are you sure you want to delete ${scriptName}? This action cannot be undone.`
   );
   if (confirmed) {
+    const needsForceDelete = args.force || await checkAndConfirmForceDeleteIfNecessary(scriptName, accountId);
+    if (needsForceDelete === null) {
+      return;
+    }
     await fetchResult(
       `/accounts/${accountId}/workers/services/${scriptName}`,
       { method: "DELETE" },
-      new URLSearchParams({ force: "true" })
+      new URLSearchParams({ force: needsForceDelete.toString() })
     );
     await deleteSiteNamespaceIfExisting(scriptName, accountId);
     logger.log("Successfully deleted", scriptName);
@@ -137325,6 +137334,82 @@ async function deleteSiteNamespaceIfExisting(scriptName, accountId) {
   }
 }
 __name(deleteSiteNamespaceIfExisting, "deleteSiteNamespaceIfExisting");
+function renderScriptName(details) {
+  let service;
+  let environment;
+  if ("script" in details) {
+    service = details.script;
+  } else {
+    service = details.service;
+    environment = details.environment;
+  }
+  return environment ? `${service} (${environment})` : service;
+}
+__name(renderScriptName, "renderScriptName");
+function isUsedAsServiceBinding(references) {
+  return (references.services?.incoming.length || 0) > 0;
+}
+__name(isUsedAsServiceBinding, "isUsedAsServiceBinding");
+function isUsedAsDurableObjectNamespace(references, scriptName) {
+  return (references.durable_objects?.filter((ref) => ref.service !== scriptName)?.length || 0) > 0;
+}
+__name(isUsedAsDurableObjectNamespace, "isUsedAsDurableObjectNamespace");
+function isUsedAsDispatchOutbound(references) {
+  return references.dispatch_outbounds?.length || 0;
+}
+__name(isUsedAsDispatchOutbound, "isUsedAsDispatchOutbound");
+function isUsedAsTailConsumer(tailProducers) {
+  return tailProducers.length > 0;
+}
+__name(isUsedAsTailConsumer, "isUsedAsTailConsumer");
+async function checkAndConfirmForceDeleteIfNecessary(scriptName, accountId) {
+  const references = await fetchResult(
+    `/accounts/${accountId}/workers/scripts/${scriptName}/references`
+  );
+  const tailProducers = await fetchResult(
+    `/accounts/${accountId}/workers/tails/by-consumer/${scriptName}`
+  );
+  const isDependentService = isUsedAsServiceBinding(references) || isUsedAsDurableObjectNamespace(references, scriptName) || isUsedAsDispatchOutbound(references) || isUsedAsTailConsumer(tailProducers);
+  if (!isDependentService)
+    return false;
+  const dependentMessages = [];
+  for (const serviceBindingReference of references.services?.incoming || []) {
+    const dependentScript = renderScriptName(serviceBindingReference);
+    dependentMessages.push(
+      `- Worker ${dependentScript} uses this Worker as a Service Binding`
+    );
+  }
+  for (const implementedDOBindingReference of references.durable_objects || []) {
+    if (implementedDOBindingReference.service === scriptName)
+      continue;
+    const dependentScript = renderScriptName(implementedDOBindingReference);
+    dependentMessages.push(
+      `- Worker ${dependentScript} has a binding to the Durable Object Namespace "${implementedDOBindingReference.durable_object_namespace_name}" implemented by this Worker`
+    );
+  }
+  for (const dispatchNamespaceOutboundReference of references.dispatch_outbounds || []) {
+    const dependentScript = renderScriptName(
+      dispatchNamespaceOutboundReference
+    );
+    dependentMessages.push(
+      `- Worker ${dependentScript} uses this Worker as an Outbound Worker for the Dynamic Dispatch Namespace "${dispatchNamespaceOutboundReference.namespace}"`
+    );
+  }
+  for (const consumingTail of tailProducers) {
+    const dependentScript = renderScriptName(consumingTail.producer);
+    dependentMessages.push(
+      `- Worker ${dependentScript} uses this Worker as a Tail Worker`
+    );
+  }
+  const extraConfirmed = await confirm(`${scriptName} is currently in use by other Workers:
+
+${dependentMessages.join("\n")}
+
+You can still delete this Worker, but doing so WILL BREAK the Workers that depend on it. This will cause unexpected failures, and cannot be undone.
+Are you sure you want to continue?`);
+  return extraConfirmed ? true : null;
+}
+__name(checkAndConfirmForceDeleteIfNecessary, "checkAndConfirmForceDeleteIfNecessary");
 
 // src/deploy/index.ts
 init_import_meta_url();
@@ -139561,7 +139646,8 @@ async function traverseAndBuildWorkerJSDirectory({
     resolvedEntryPointPath: bundleResult.resolvedEntryPointPath,
     bundleType: bundleResult.bundleType,
     stop: bundleResult.stop,
-    sourceMapPath: bundleResult.sourceMapPath
+    sourceMapPath: bundleResult.sourceMapPath,
+    moduleCollector: bundleResult.moduleCollector
   };
 }
 __name(traverseAndBuildWorkerJSDirectory, "traverseAndBuildWorkerJSDirectory");
@@ -141468,7 +141554,8 @@ async function deploy2({
         dependencies: {},
         stop: void 0,
         resolvedEntryPointPath: _workerPath,
-        bundleType: "esm"
+        bundleType: "esm",
+        moduleCollector: void 0
       };
     }
   }
@@ -148327,17 +148414,21 @@ function useEsbuild({
   testScheduled,
   experimentalLocal
 }) {
-  const [bundle, setBundle] = (0, import_react18.useState)();
+  const [bundleInfo, setBundleInfo] = (0, import_react18.useState)();
   const { exit } = (0, import_ink11.useApp)();
   (0, import_react18.useEffect)(() => {
     let stopWatching = void 0;
     function updateBundle() {
-      setBundle((previousBundle) => {
+      setBundleInfo((previousBundle) => {
         (0, import_node_assert14.default)(
           previousBundle,
           "Rebuild triggered with no previous build available"
         );
-        return { ...previousBundle, id: previousBundle.id + 1 };
+        previousBundle.bundle.modules = dedupeModulesByName([
+          ...previousBundle.bundle.modules,
+          ...previousBundle.moduleCollector?.modules ?? []
+        ]);
+        return { ...previousBundle, id: previousBundle.bundle.id + 1 };
       });
     }
     __name(updateBundle, "updateBundle");
@@ -148404,18 +148495,21 @@ function useEsbuild({
           void watcher.close();
         }, "stopWatching");
       }
-      setBundle({
-        id: 0,
-        entry,
-        path: bundleResult?.resolvedEntryPointPath ?? entry.file,
-        type: bundleResult?.bundleType ?? (entry.format === "modules" ? "esm" : "commonjs"),
-        modules: bundleResult ? bundleResult.modules : dedupeModulesByName([
-          ...traverseModuleGraphResult?.modules ?? [],
-          ...additionalModules
-        ]),
-        dependencies: bundleResult?.dependencies ?? {},
-        sourceMapPath: bundleResult?.sourceMapPath,
-        sourceMapMetadata: bundleResult?.sourceMapMetadata
+      setBundleInfo({
+        bundle: {
+          id: 0,
+          entry,
+          path: bundleResult?.resolvedEntryPointPath ?? entry.file,
+          type: bundleResult?.bundleType ?? (entry.format === "modules" ? "esm" : "commonjs"),
+          modules: bundleResult ? bundleResult.modules : dedupeModulesByName([
+            ...traverseModuleGraphResult?.modules ?? [],
+            ...additionalModules
+          ]),
+          dependencies: bundleResult?.dependencies ?? {},
+          sourceMapPath: bundleResult?.sourceMapPath,
+          sourceMapMetadata: bundleResult?.sourceMapMetadata
+        },
+        moduleCollector: bundleResult?.moduleCollector
       });
     }
     __name(build5, "build");
@@ -148452,7 +148546,7 @@ function useEsbuild({
     testScheduled,
     experimentalLocal
   ]);
-  return bundle;
+  return bundleInfo?.bundle;
 }
 __name(useEsbuild, "useEsbuild");
 
@@ -149510,8 +149604,9 @@ To run an edge preview session for your Worker, use ${import_chalk15.default.gre
         await watcher?.close();
       }
     };
-  } finally {
+  } catch (e2) {
     await watcher?.close();
+    throw e2;
   }
 }
 __name(startDev, "startDev");