Cherry-pick PR #45554 into release-4.4 (#45555)

Component commits: c9846f8 Restore HTMLDocument constructable value in DOM Don't touch anything else in the DOM. Co-authored-by: Nathan Shively-Sanders <nathansa@microsoft.com>
microsoft · Aug 23, 2021 · d2a46a0 · d2a46a0
1 parent a417917
commit d2a46a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts
@@ -6380,6 +6380,12 @@ interface HTMLDocument extends Document {
     removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
 }
 
+/** @deprecated */
+declare var HTMLDocument: {
+    prototype: HTMLDocument;
+    new(): HTMLDocument;
+};
+
 interface HTMLElementEventMap extends ElementEventMap, DocumentAndElementEventHandlersEventMap, GlobalEventHandlersEventMap {
 }
 
@@ -17181,7 +17187,6 @@ interface WindowEventMap extends GlobalEventHandlersEventMap, WindowEventHandler
 
 /** A window containing a DOM document; the document property points to the DOM document loaded in that window. */
 interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandlers, WindowEventHandlers, WindowLocalStorage, WindowOrWorkerGlobalScope, WindowSessionStorage {
-    HTMLDocument: Document;
     /** @deprecated This is a legacy alias of `navigator`. */
     readonly clientInformation: Navigator;
     /**
@@ -18246,7 +18251,6 @@ declare var Image: {
 declare var Option: {
     new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement;
 };
-declare var HTMLDocument: Document;
 /** @deprecated This is a legacy alias of `navigator`. */
 declare var clientInformation: Navigator;
 /**

diff --git a/tests/baselines/reference/intersectionsOfLargeUnions2.errors.txt b/tests/baselines/reference/intersectionsOfLargeUnions2.errors.txt
@@ -10,7 +10,7 @@ tests/cases/compiler/intersectionsOfLargeUnions2.ts(31,15): error TS2536: Type '
         interface ElementTagNameMap {
                   ~~~~~~~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier 'ElementTagNameMap'.
-!!! related TS6203 /.ts/lib.dom.d.ts:18258:6: 'ElementTagNameMap' was also declared here.
+!!! related TS6203 /.ts/lib.dom.d.ts:18263:6: 'ElementTagNameMap' was also declared here.
             [index: number]: HTMLElement
         }
 

diff --git a/tests/baselines/reference/mappedTypeRecursiveInference.types b/tests/baselines/reference/mappedTypeRecursiveInference.types