@depup/wrangler 4.129.0-depup.0 → 4.135.0-depup.0

package/README.md

@@ -13,8 +13,8 @@ npm install @depup/wrangler
 
 | Field | Value |
 |-------|-------|
-| Original | [wrangler](https://www.npmjs.com/package/wrangler) @ 4.129.0 |
-| Processed | 2026-09-06 |
+| Original | [wrangler](https://www.npmjs.com/package/wrangler) @ 4.135.0 |
+| Processed | 2026-09-20 |
 | Smoke test | failed |
 | Deps updated | 4 |
 
@@ -25,7 +25,7 @@ npm install @depup/wrangler
 | blake3-wasm | 2.1.5 | ^3.0.0 |
 | esbuild | 0.28.1 | ^0.28.2 |
 | path-to-regexp | 6.3.0 | ^8.4.2 |
-| workerd | 1.20260903.1 | ^1.20260905.1 |
+| workerd | 1.20260918.1 | ^1.20260919.1 |
 
 ---
 

package/changes.json

@@ -13,10 +13,10 @@
       "to": "^8.4.2"
     },
     "workerd": {
-      "from": "1.20260903.1",
-      "to": "^1.20260905.1"
+      "from": "1.20260918.1",
+      "to": "^1.20260919.1"
     }
   },
-  "timestamp": "2026-09-06T01:01:14.039Z",
+  "timestamp": "2026-09-20T01:00:52.119Z",
   "totalUpdated": 4
 }

package/config-schema.json

@@ -928,28 +928,6 @@
           "markdownDescription": "Specifies Agent Memory namespace bindings that are bound to this Worker environment.\n\nNOTE: This field is not automatically inherited from the top level environment,\nand so must be specified in every named environment.",
           "default": []
         },
-        "websearch": {
-          "type": "object",
-          "properties": {
-            "binding": {
-              "type": "string",
-              "description": "The binding name used to refer to Web Search in the Worker.",
-              "markdownDescription": "The binding name used to refer to Web Search in the Worker."
-            },
-            "remote": {
-              "type": "boolean",
-              "description": "Whether the Web Search binding should be remote or not in local development",
-              "markdownDescription": "Whether the Web Search binding should be remote or not in local development"
-            }
-          },
-          "required": [
-            "binding"
-          ],
-          "additionalProperties": false,
-          "description": "Cloudflare Web Search binding. There is exactly one shared web corpus, so the binding is zero-config -- only the variable name is required, declared as a single object (not an array).\n\nNOTE: This field is not automatically inherited from the top level environment, and so must be specified in every named environment.",
-          "markdownDescription": "Cloudflare Web Search binding. There is exactly one shared web corpus, so the\nbinding is zero-config -- only the variable name is required, declared as a\nsingle object (not an array).\n\nNOTE: This field is not automatically inherited from the top level environment,\nand so must be specified in every named environment.",
-          "default": {}
-        },
         "hyperdrive": {
           "type": "array",
           "items": {
@@ -1508,8 +1486,8 @@
               },
               "remote": {
                 "type": "boolean",
-                "description": "Set to `true` to suppress the remote binding warning in local dev. Flagship bindings are always remote.",
-                "markdownDescription": "Set to `true` to suppress the remote binding warning in local dev. Flagship bindings are always remote."
+                "description": "Set to `true` to evaluate flags against the remote Flagship app during local dev, instead of the local simulator.",
+                "markdownDescription": "Set to `true` to evaluate flags against the remote Flagship app during local dev, instead of the local simulator."
               }
             },
             "required": [
@@ -2726,28 +2704,6 @@
           "markdownDescription": "Specifies Agent Memory namespace bindings that are bound to this Worker environment.\n\nNOTE: This field is not automatically inherited from the top level environment,\nand so must be specified in every named environment.",
           "default": []
         },
-        "websearch": {
-          "type": "object",
-          "properties": {
-            "binding": {
-              "type": "string",
-              "description": "The binding name used to refer to Web Search in the Worker.",
-              "markdownDescription": "The binding name used to refer to Web Search in the Worker."
-            },
-            "remote": {
-              "type": "boolean",
-              "description": "Whether the Web Search binding should be remote or not in local development",
-              "markdownDescription": "Whether the Web Search binding should be remote or not in local development"
-            }
-          },
-          "required": [
-            "binding"
-          ],
-          "additionalProperties": false,
-          "description": "Cloudflare Web Search binding. There is exactly one shared web corpus, so the binding is zero-config -- only the variable name is required, declared as a single object (not an array).\n\nNOTE: This field is not automatically inherited from the top level environment, and so must be specified in every named environment.",
-          "markdownDescription": "Cloudflare Web Search binding. There is exactly one shared web corpus, so the\nbinding is zero-config -- only the variable name is required, declared as a\nsingle object (not an array).\n\nNOTE: This field is not automatically inherited from the top level environment,\nand so must be specified in every named environment.",
-          "default": {}
-        },
         "hyperdrive": {
           "type": "array",
           "items": {
@@ -3306,8 +3262,8 @@
               },
               "remote": {
                 "type": "boolean",
-                "description": "Set to `true` to suppress the remote binding warning in local dev. Flagship bindings are always remote.",
-                "markdownDescription": "Set to `true` to suppress the remote binding warning in local dev. Flagship bindings are always remote."
+                "description": "Set to `true` to evaluate flags against the remote Flagship app during local dev, instead of the local simulator.",
+                "markdownDescription": "Set to `true` to evaluate flags against the remote Flagship app during local dev, instead of the local simulator."
               }
             },
             "required": [
@@ -3609,6 +3565,31 @@
           "description": "The Durable Objects being renamed.",
           "markdownDescription": "The Durable Objects being renamed."
         },
+        "transferred_classes": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "from": {
+                "type": "string"
+              },
+              "from_script": {
+                "type": "string"
+              },
+              "to": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "from",
+              "from_script",
+              "to"
+            ],
+            "additionalProperties": false
+          },
+          "description": "The Durable Objects being transferred from another Worker.",
+          "markdownDescription": "The Durable Objects being transferred from another Worker."
+        },
         "deleted_classes": {
           "type": "array",
           "items": {
@@ -3988,6 +3969,19 @@
           "markdownDescription": "Whether query strings are removed from request URLs in logs and traces.",
           "default": false
         },
+        "issues": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "description": "Whether real-time Issues are enabled.",
+              "markdownDescription": "Whether real-time Issues are enabled."
+            }
+          },
+          "additionalProperties": false,
+          "description": "Real-time Issues settings for this Worker.",
+          "markdownDescription": "Real-time Issues settings for this Worker."
+        },
         "logs": {
           "type": "object",
           "properties": {
@@ -4106,16 +4100,19 @@
       "additionalProperties": false,
       "properties": {
         "logpush": {
-          "$ref": "#/definitions/interface-769040647-11843-22205-769040647-0-567642004818536"
+          "$ref": "#/definitions/interface-769040647-14205-24567-769040647-0-586662004818536"
         },
         "observability": {
-          "$ref": "#/definitions/interface-769040647-11843-22205-769040647-0-567642004818536"
+          "$ref": "#/definitions/interface-769040647-14205-24567-769040647-0-586662004818536"
         },
         "limits": {
-          "$ref": "#/definitions/interface-769040647-11843-22205-769040647-0-567642004818536"
+          "$ref": "#/definitions/interface-769040647-14205-24567-769040647-0-586662004818536"
+        },
+        "placement": {
+          "$ref": "#/definitions/interface-769040647-14205-24567-769040647-0-586662004818536"
         },
         "cache": {
-          "$ref": "#/definitions/interface-769040647-11843-22205-769040647-0-567642004818536"
+          "$ref": "#/definitions/interface-769040647-14205-24567-769040647-0-586662004818536"
         },
         "define": {
           "type": "object",
@@ -4658,28 +4655,6 @@
           "markdownDescription": "Specifies Agent Memory namespace bindings that are bound to this Worker environment.\n\nNOTE: This field is not automatically inherited from the top level environment,\nand so must be specified in every named environment.",
           "default": []
         },
-        "websearch": {
-          "type": "object",
-          "properties": {
-            "binding": {
-              "type": "string",
-              "description": "The binding name used to refer to Web Search in the Worker.",
-              "markdownDescription": "The binding name used to refer to Web Search in the Worker."
-            },
-            "remote": {
-              "type": "boolean",
-              "description": "Whether the Web Search binding should be remote or not in local development",
-              "markdownDescription": "Whether the Web Search binding should be remote or not in local development"
-            }
-          },
-          "required": [
-            "binding"
-          ],
-          "additionalProperties": false,
-          "description": "Cloudflare Web Search binding. There is exactly one shared web corpus, so the binding is zero-config -- only the variable name is required, declared as a single object (not an array).\n\nNOTE: This field is not automatically inherited from the top level environment, and so must be specified in every named environment.",
-          "markdownDescription": "Cloudflare Web Search binding. There is exactly one shared web corpus, so the\nbinding is zero-config -- only the variable name is required, declared as a\nsingle object (not an array).\n\nNOTE: This field is not automatically inherited from the top level environment,\nand so must be specified in every named environment.",
-          "default": {}
-        },
         "hyperdrive": {
           "type": "array",
           "items": {
@@ -5238,8 +5213,8 @@
               },
               "remote": {
                 "type": "boolean",
-                "description": "Set to `true` to suppress the remote binding warning in local dev. Flagship bindings are always remote.",
-                "markdownDescription": "Set to `true` to suppress the remote binding warning in local dev. Flagship bindings are always remote."
+                "description": "Set to `true` to evaluate flags against the remote Flagship app during local dev, instead of the local simulator.",
+                "markdownDescription": "Set to `true` to evaluate flags against the remote Flagship app during local dev, instead of the local simulator."
               }
             },
             "required": [
@@ -5416,10 +5391,10 @@
           "default": []
         }
       },
-      "description": "Configuration for Worker Previews.\n\nThis defines the settings used when creating Preview deployments. Previews are branches of your Worker's main instance used to test features during feature development outside of production.\n\nThe `previews` block contains any intentionally divergent configuration intended solely for Previews, including:\n- All non-inheritable properties (environment variables and bindings like KV, D1, R2, etc.)\n- Select inheritable properties: `logpush`, `observability`, `limits`, `cache`",
-      "markdownDescription": "Configuration for Worker Previews.\n\nThis defines the settings used when creating Preview deployments.\nPreviews are branches of your Worker's main instance used to test features\nduring feature development outside of production.\n\nThe `previews` block contains any intentionally divergent configuration intended solely for Previews, including:\n- All non-inheritable properties (environment variables and bindings like KV, D1, R2, etc.)\n- Select inheritable properties: `logpush`, `observability`, `limits`, `cache`"
+      "description": "Configuration for Worker Previews.\n\nThis defines the settings used when creating Preview deployments. Previews are branches of your Worker's main instance used to test features during feature development outside of production.\n\nThe `previews` block contains any intentionally divergent configuration intended solely for Previews, including:\n- All non-inheritable properties (environment variables and bindings like KV, D1, R2, etc.)\n- Select inheritable properties: `logpush`, `observability`, `limits`, `placement`, `cache`",
+      "markdownDescription": "Configuration for Worker Previews.\n\nThis defines the settings used when creating Preview deployments.\nPreviews are branches of your Worker's main instance used to test features\nduring feature development outside of production.\n\nThe `previews` block contains any intentionally divergent configuration intended solely for Previews, including:\n- All non-inheritable properties (environment variables and bindings like KV, D1, R2, etc.)\n- Select inheritable properties: `logpush`, `observability`, `limits`, `placement`, `cache`"
     },
-    "interface-769040647-11843-22205-769040647-0-567642004818536": {
+    "interface-769040647-14205-24567-769040647-0-586662004818536": {
       "type": "object",
       "properties": {
         "name": {
@@ -6020,6 +5995,14 @@
           "description": "The path to a Dockerfile, or an image URI for the Cloudflare registry.",
           "markdownDescription": "The path to a Dockerfile, or an image URI for the Cloudflare registry."
         },
+        "images": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/DurableObjectContainerImage"
+          },
+          "description": "Named images available to a Durable Object-managed container through `ctx.container.images` and `env.EXPERIMENTAL_CLOUDFLARE_CONTAINER_IMAGES[className]`.\n\nOnly supported when `scheduling_policy` is `\"durable_object\"`.",
+          "markdownDescription": "Named images available to a Durable Object-managed container through\n`ctx.container.images` and\n`env.EXPERIMENTAL_CLOUDFLARE_CONTAINER_IMAGES[className]`.\n\nOnly supported when `scheduling_policy` is `\"durable_object\"`."
+        },
         "image_build_context": {
           "type": "string",
           "description": "Build context of the application.",
@@ -6038,10 +6021,16 @@
           "description": "The class name of the Durable Object the container is connected to.",
           "markdownDescription": "The class name of the Durable Object the container is connected to."
         },
+        "observability": {
+          "$ref": "#/definitions/ContainerObservability",
+          "description": "Specify the observability behavior of this container application.\n\nWhen set, this overrides the root `observability` config for this container. Durable Object-managed Containers only support enabling or disabling logs. Their settings are application-wide, and omitted settings preserve the existing application rather than inheriting root Worker observability.",
+          "markdownDescription": "Specify the observability behavior of this container application.\n\nWhen set, this overrides the root `observability` config for this container.\nDurable Object-managed Containers only support enabling or disabling logs.\nTheir settings are application-wide, and omitted settings preserve the\nexisting application rather than inheriting root Worker observability."
+        },
         "scheduling_policy": {
           "type": "string",
           "enum": [
             "default",
+            "durable_object",
             "moon",
             "regional"
           ],
@@ -6226,12 +6215,86 @@
           "default": 0
         }
       },
-      "required": [
-        "image"
+      "additionalProperties": false
+    },
+    "DurableObjectContainerImage": {
+      "anyOf": [
+        {
+          "type": "object",
+          "properties": {
+            "dockerfile": {
+              "type": "string",
+              "description": "Path to the Dockerfile Wrangler builds and pushes.",
+              "markdownDescription": "Path to the Dockerfile Wrangler builds and pushes."
+            },
+            "build_context": {
+              "type": "string",
+              "description": "Build context, relative to the Wrangler configuration file. Defaults to the Dockerfile's directory.",
+              "markdownDescription": "Build context, relative to the Wrangler configuration file.\nDefaults to the Dockerfile's directory."
+            },
+            "build_vars": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "description": "Variables available to the image only while it is being built.",
+              "markdownDescription": "Variables available to the image only while it is being built."
+            }
+          },
+          "required": [
+            "dockerfile"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "image": {
+              "type": "string",
+              "description": "Digest-pinned image in the account's managed registry.",
+              "markdownDescription": "Digest-pinned image in the account's managed registry."
+            }
+          },
+          "required": [
+            "image"
+          ],
+          "additionalProperties": false
+        }
       ],
+      "description": "An image Wrangler prepares for a Durable Object-managed container.",
+      "markdownDescription": "An image Wrangler prepares for a Durable Object-managed container."
+    },
+    "ContainerObservability": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "If observability is enabled for this container application",
+          "markdownDescription": "If observability is enabled for this container application"
+        },
+        "logs": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        },
+        "target_instance_percentage": {
+          "type": "number",
+          "description": "Percentage of instances to target with application-level observability hot reloads. Mutually exclusive with `target_instance_count`.",
+          "markdownDescription": "Percentage of instances to target with application-level observability hot reloads.\nMutually exclusive with `target_instance_count`."
+        },
+        "target_instance_count": {
+          "type": "number",
+          "description": "Number of instances to target with application-level observability hot reloads. Mutually exclusive with `target_instance_percentage`.",
+          "markdownDescription": "Number of instances to target with application-level observability hot reloads.\nMutually exclusive with `target_instance_percentage`."
+        }
+      },
       "additionalProperties": false,
-      "description": "Configuration for a container application",
-      "markdownDescription": "Configuration for a container application"
+      "description": "Configuration for a container application.",
+      "markdownDescription": "Configuration for a container application."
     },
     "LocalS3Credentials": {
       "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@depup/wrangler",
-  "version": "4.129.0-depup.0",
+  "version": "4.135.0-depup.0",
   "description": "Command-line interface for all things Cloudflare Workers (with updated dependencies)",
   "keywords": [
     "wrangler",
@@ -50,6 +50,11 @@
     "miniflare-dist",
     "wrangler-dist",
     "templates",
+    "!templates/__tests__",
+    "!templates/**/*.d.ts",
+    "!templates/new-worker*",
+    "!templates/startDevWorker",
+    "!templates/tsconfig*",
     "kv-asset-handler.js",
     "config-schema.json",
     "changes.json",
@@ -73,17 +78,17 @@
     "esbuild": "^0.28.2",
     "path-to-regexp": "^8.4.2",
     "unenv": "2.0.0-rc.24",
-    "workerd": "^1.20260905.1",
+    "workerd": "^1.20260919.1",
     "@cloudflare/kv-asset-handler": "0.5.0",
-    "miniflare": "5.20260903.0-alpha",
-    "@cloudflare/unenv-preset": "2.16.1"
+    "@cloudflare/unenv-preset": "2.16.1",
+    "miniflare": "5.20260918.0-alpha"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
     "@aws-sdk/s3-request-presigner": "^3.721.0",
     "@bomb.sh/tab": "^0.0.12",
     "@cloudflare/types": "6.18.4",
-    "@cloudflare/workers-types": "^5.20260903.1",
+    "@cloudflare/workers-types": "^5.20260918.1",
     "@cspotcode/source-map-support": "0.8.1",
     "@netlify/build-info": "10.5.1",
     "@sentry/node": "^7.86.0",
@@ -121,7 +126,6 @@
     "dotenv-expand": "^12.0.2",
     "empathic": "^2.0.0",
     "esprima": "4.0.1",
-    "execa": "^6.1.0",
     "get-port": "^7.0.0",
     "glob-to-regexp": "^0.4.1",
     "https-proxy-agent": "7.0.2",
@@ -144,11 +148,12 @@
     "resolve": "^1.22.8",
     "rosie-skills": "^0.8.1",
     "semiver": "^1.1.0",
-    "shell-quote": "^1.8.1",
+    "shell-quote": "^1.9.0",
     "signal-exit": "4.1.0",
     "smol-toml": "1.5.2",
     "supports-color": "^9.2.2",
     "timeago.js": "4.0.2",
+    "tinyexec": "^1.2.4",
     "tree-kill": "1.2.2",
     "ts-dedent": "^2.2.0",
     "ts-json-schema-generator": "^1.5.0",
@@ -163,25 +168,25 @@
     "yaml": "^2.8.1",
     "yargs": "^17.7.2",
     "zod": "4.4.3",
-    "@cloudflare/autoconfig": "0.4.2",
-    "@cloudflare/cli-shared-helpers": "0.1.27",
-    "@cloudflare/build-output-utils": "0.4.0",
-    "@cloudflare/config": "0.10.0",
-    "@cloudflare/containers-shared": "0.16.0",
-    "@cloudflare/deploy-helpers": "0.10.1",
+    "@cloudflare/autoconfig": "0.5.1",
+    "@cloudflare/build-output-utils": "0.6.0",
+    "@cloudflare/containers-shared": "0.17.0",
+    "@cloudflare/cli-shared-helpers": "0.1.34",
+    "@cloudflare/config": "0.15.0",
+    "@cloudflare/deploy-helpers": "0.13.0",
     "@cloudflare/pages-functions": "0.1.0",
-    "@cloudflare/pages-shared": "^0.13.176",
-    "@cloudflare/workers-auth": "0.6.8",
-    "@cloudflare/workflows-shared": "0.13.0",
-    "@cloudflare/shared-ast-primitives": "1.1.0",
-    "@cloudflare/workers-utils": "0.36.0",
-    "@cloudflare/runtime-types": "0.0.21",
-    "@cloudflare/remote-bindings": "0.0.19",
+    "@cloudflare/remote-bindings": "0.0.28",
+    "@cloudflare/runtime-types": "0.0.30",
+    "@cloudflare/workers-auth": "0.7.3",
     "@cloudflare/workers-shared": "0.19.9",
-    "@cloudflare/workers-tsconfig": "0.0.0"
+    "@cloudflare/shared-ast-primitives": "1.1.0",
+    "@cloudflare/workers-utils": "0.40.1",
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "@cloudflare/workflows-shared": "0.14.0",
+    "@cloudflare/pages-shared": "^0.13.185"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^5.20260903.1"
+    "@cloudflare/workers-types": "^5.20260918.1"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {
@@ -230,14 +235,14 @@
         "to": "^8.4.2"
       },
       "workerd": {
-        "from": "1.20260903.1",
-        "to": "^1.20260905.1"
+        "from": "1.20260918.1",
+        "to": "^1.20260919.1"
       }
     },
     "depsUpdated": 4,
     "originalPackage": "wrangler",
-    "originalVersion": "4.129.0",
-    "processedAt": "2026-09-06T01:01:39.174Z",
+    "originalVersion": "4.135.0",
+    "processedAt": "2026-09-20T01:01:11.778Z",
     "smokeTest": "failed"
   }
 }

package/templates/middleware/loader-sw.ts

@@ -10,18 +10,48 @@ import {
 
 export { __facade_register__, __facade_registerInternal__ };
 
-// Miniflare 2's `EventTarget` follows the spec and doesn't allow exceptions to
-// be caught by `dispatchEvent`. Instead it has a custom `ThrowingEventTarget`
-// class that rethrows errors from event listeners in `dispatchEvent`.
-// We'd like errors to be propagated to the top-level `addEventListener`, so
-// we'd like to use `ThrowingEventTarget`. Unfortunately, `ThrowingEventTarget`
-// isn't exposed on the global scope, but `WorkerGlobalScope` (which extends
-// `ThrowingEventTarget`) is. Therefore, we get at it in this nasty way.
-let __FACADE_EVENT_TARGET__: EventTarget;
-if ((globalThis as any).MINIFLARE) {
-	__FACADE_EVENT_TARGET__ = new (Object.getPrototypeOf(WorkerGlobalScope))();
-} else {
-	__FACADE_EVENT_TARGET__ = new EventTarget();
+const __FACADE_EVENT_TARGET__ = new EventTarget();
+const __facade_eventListenerErrors__ = new WeakMap<Event, unknown>();
+const __facade_eventListenerWrappers__ = new WeakMap<
+	EventListenerOrEventListenerObject,
+	EventListener
+>();
+
+// Facade events model runtime event delivery, so listener exceptions must
+// propagate even when EventTarget uses spec-compliant report-and-continue semantics.
+function __facade_getEventListenerWrapper__(
+	listener: EventListenerOrEventListenerObject
+): EventListener {
+	const existingWrapper = __facade_eventListenerWrappers__.get(listener);
+	if (existingWrapper !== undefined) {
+		return existingWrapper;
+	}
+
+	const wrapper: EventListener = function (this: EventTarget, event) {
+		try {
+			if (typeof listener === "function") {
+				listener.call(this, event);
+			} else {
+				listener.handleEvent(event);
+			}
+		} catch (error) {
+			__facade_eventListenerErrors__.set(event, error);
+			event.stopImmediatePropagation();
+		}
+	};
+	__facade_eventListenerWrappers__.set(listener, wrapper);
+	return wrapper;
+}
+
+function __facade_dispatchEvent__(event: Event): boolean {
+	const result = __FACADE_EVENT_TARGET__.dispatchEvent(event);
+	if (!__facade_eventListenerErrors__.has(event)) {
+		return result;
+	}
+
+	const error = __facade_eventListenerErrors__.get(event);
+	__facade_eventListenerErrors__.delete(event);
+	throw error;
 }
 
 function __facade_isSpecialEvent__(
@@ -37,7 +67,9 @@ globalThis.addEventListener = function (type, listener, options) {
 	if (__facade_isSpecialEvent__(type)) {
 		__FACADE_EVENT_TARGET__.addEventListener(
 			type,
-			listener as EventListenerOrEventListenerObject,
+			__facade_getEventListenerWrapper__(
+				listener as EventListenerOrEventListenerObject
+			),
 			options
 		);
 	} else {
@@ -48,7 +80,9 @@ globalThis.removeEventListener = function (type, listener, options) {
 	if (__facade_isSpecialEvent__(type)) {
 		__FACADE_EVENT_TARGET__.removeEventListener(
 			type,
-			listener as EventListenerOrEventListenerObject,
+			__facade_getEventListenerWrapper__(
+				listener as EventListenerOrEventListenerObject
+			),
 			options
 		);
 	} else {
@@ -57,7 +91,7 @@ globalThis.removeEventListener = function (type, listener, options) {
 };
 globalThis.dispatchEvent = function (event) {
 	if (__facade_isSpecialEvent__(event.type)) {
-		return __FACADE_EVENT_TARGET__.dispatchEvent(event);
+		return __facade_dispatchEvent__(event);
 	} else {
 		return __facade__originalDispatchEvent__(event);
 	}
@@ -184,7 +218,7 @@ __facade__originalAddEventListener__("fetch", (event) => {
 				noRetry() {},
 			});
 
-			__FACADE_EVENT_TARGET__.dispatchEvent(facadeEvent);
+			__facade_dispatchEvent__(facadeEvent);
 			event.waitUntil(Promise.all(facadeEvent[__facade_waitUntil__]));
 		}
 	};
@@ -195,7 +229,7 @@ __facade__originalAddEventListener__("fetch", (event) => {
 			passThroughOnException: ctx.passThroughOnException,
 		});
 
-		__FACADE_EVENT_TARGET__.dispatchEvent(facadeEvent);
+		__facade_dispatchEvent__(facadeEvent);
 		facadeEvent[__facade_dispatched__] = true;
 		event.waitUntil(Promise.all(facadeEvent[__facade_waitUntil__]));
 
@@ -224,6 +258,6 @@ __facade__originalAddEventListener__("scheduled", (event) => {
 		noRetry: event.noRetry.bind(event),
 	});
 
-	__FACADE_EVENT_TARGET__.dispatchEvent(facadeEvent);
+	__facade_dispatchEvent__(facadeEvent);
 	event.waitUntil(Promise.all(facadeEvent[__facade_waitUntil__]));
 });