4 files changed, 35 insertions, 0 deletions
diff --git a/cli/dts/lib.deno.shared_globals.d.ts b/cli/dts/lib.deno.shared_globals.d.ts
index fc40bb54e..abf5e41fb 100644
--- a/cli/dts/lib.deno.shared_globals.d.ts
+++ b/cli/dts/lib.deno.shared_globals.d.ts
@@ -400,6 +400,17 @@ declare class ErrorEvent extends Event {
   constructor(type: string, eventInitDict?: ErrorEventInit);
 }
 
+interface PromiseRejectionEventInit extends EventInit {
+  promise: Promise<any>;
+  reason?: any;
+}
+
+declare class PromiseRejectionEvent extends Event {
+  readonly promise: Promise<any>;
+  readonly reason: any;
+  constructor(type: string, eventInitDict?: PromiseRejectionEventInit);
+}
+
 interface AbstractWorkerEventMap {
   "error": ErrorEvent;
 }
diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs
index bb46fe1b5..06cb1629b 100644
--- a/cli/tests/integration/run_tests.rs
+++ b/cli/tests/integration/run_tests.rs
@@ -2783,3 +2783,8 @@ itest!(followup_dyn_import_resolved {
   args: "run --unstable --allow-read followup_dyn_import_resolves/main.ts",
   output: "followup_dyn_import_resolves/main.ts.out",
 });
+
+itest!(unhandled_rejection {
+  args: "run --allow-read unhandled_rejection.js",
+  output: "unhandled_rejection.js.out",
+});
diff --git a/cli/tests/testdata/unhandled_rejection.js b/cli/tests/testdata/unhandled_rejection.js
new file mode 100644
index 000000000..352e861b4
--- /dev/null
+++ b/cli/tests/testdata/unhandled_rejection.js
@@ -0,0 +1,11 @@
+globalThis.addEventListener("unhandledrejection", (e) => {
+  console.log("unhandled rejection at:", e.promise, "reason:", e.reason);
+  e.preventDefault();
+});
+
+function Foo() {
+  this.bar = Promise.reject(new Error("bar not available"));
+}
+
+new Foo();
+Promise.reject();
diff --git a/cli/tests/testdata/unhandled_rejection.js.out b/cli/tests/testdata/unhandled_rejection.js.out
new file mode 100644
index 000000000..4c41795ce
--- /dev/null
+++ b/cli/tests/testdata/unhandled_rejection.js.out
@@ -0,0 +1,8 @@
+unhandled rejection at: Promise {
+  <rejected> Error: bar not available
+    at new Foo (file:///[WILDCARD]/testdata/unhandled_rejection.js:7:29)
+    at file:///[WILDCARD]/testdata/unhandled_rejection.js:10:1
+} reason: Error: bar not available
+    at new Foo (file:///[WILDCARD]/testdata/unhandled_rejection.js:7:29)
+    at file:///[WILDCARD]/testdata/unhandled_rejection.js:10:1
+unhandled rejection at: Promise { <rejected> undefined } reason: undefined