From 981478e90d22d8e619e5b055a5f19da7c65a4401 Mon Sep 17 00:00:00 2001
From: Tom Quist <tomquist@users.noreply.github.com>
Date: Tue, 12 May 2026 19:59:59 +0200
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#74969=20[jsdom?=
 =?UTF-8?q?]=20Omit=20numeric=20index=20signature=20from=20Window=20to=20f?=
 =?UTF-8?q?ix=20DOMWindow=20Infinity/NaN=20conflict=20by=20@tomquist?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 types/jsdom/index.d.ts     | 2 +-
 types/jsdom/jsdom-tests.ts | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/jsdom/index.d.ts b/types/jsdom/index.d.ts
index 4ef65a16cd615e..cf1c8a8312888d 100644
--- a/types/jsdom/index.d.ts
+++ b/types/jsdom/index.d.ts
@@ -186,7 +186,7 @@ export interface ResourcesOptions {
     interceptors?: Dispatcher.DispatcherComposeInterceptor[] | undefined;
 }
 
-export interface DOMWindow extends Omit<Window, "top" | "self" | "window"> {
+export interface DOMWindow extends Omit<Window, "top" | "self" | "window" | number> {
     [key: string]: any;
     [index: number]: any;
 
diff --git a/types/jsdom/jsdom-tests.ts b/types/jsdom/jsdom-tests.ts
index 72c06d22f3990c..fa55daff7a6a0a 100644
--- a/types/jsdom/jsdom-tests.ts
+++ b/types/jsdom/jsdom-tests.ts
@@ -24,6 +24,9 @@ domWindow.WebAssembly; // $ExpectType typeof WebAssembly
 domWindow.InputEvent.prototype; // $ExpectType InputEvent
 domWindow.external; // $ExpectType External
 
+domWindow["Infinity"]; // $ExpectType number
+domWindow["NaN"]; // $ExpectType number
+
 domWindow.FinalizationRegistry; // $ExpectType FinalizationRegistryConstructor
 domWindow.WeakRef; // $ExpectType WeakRefConstructor
 

From 5b8b3cdc7c82f3b424e9cbb18c229f40b6497cec Mon Sep 17 00:00:00 2001
From: Sean Massa <smassa@auditboard.com>
Date: Tue, 12 May 2026 13:40:25 -0500
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#74982=20@types?=
 =?UTF-8?q?/qunit=20-=20make=20callback=20required=20in=20todo=20and=20ski?=
 =?UTF-8?q?p=20test=20signatures=20by=20@smassa-auditboard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 types/qunit/index.d.ts          | 2 +-
 types/qunit/test/global-test.ts | 2 --
 types/qunit/test/module-test.ts | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/types/qunit/index.d.ts b/types/qunit/index.d.ts
index 53c68a6e7b911e..240fd60d1f62f1 100644
--- a/types/qunit/index.d.ts
+++ b/types/qunit/index.d.ts
@@ -593,7 +593,7 @@ declare global {
         }
 
         interface TodoFunction {
-            (name: string, callback?: TestFunctionCallback): void;
+            (name: string, callback: TestFunctionCallback): void;
             each: EachFunction;
         }
 
diff --git a/types/qunit/test/global-test.ts b/types/qunit/test/global-test.ts
index d85a3164108df5..2ccd392fbda7c1 100644
--- a/types/qunit/test/global-test.ts
+++ b/types/qunit/test/global-test.ts
@@ -21,8 +21,6 @@ QUnit.test.todo("todo test example", function(assert) {
     assert.ok(true, "this is a todo");
 });
 
-QUnit.test.todo("todo test example w/o callback");
-
 QUnit.test.only("only test example", function(assert) {
     assert.ok(true, "only this is called");
 });
diff --git a/types/qunit/test/module-test.ts b/types/qunit/test/module-test.ts
index 6dd69decf66ca7..c6d485d9afafd9 100644
--- a/types/qunit/test/module-test.ts
+++ b/types/qunit/test/module-test.ts
@@ -17,8 +17,6 @@ QUnit.module("basic tests for importing QUnit", function(hooks) {
         assert.ok(true, "this is a todo");
     });
 
-    QUnit.test.todo("todo test example w/o callback");
-
     QUnit.test.only("only test example", function(assert) {
         assert.ok(true, "only this is called");
     });