From a3c7165529a1d21684a61ff2e520ee85c0799c2e Mon Sep 17 00:00:00 2001
From: Alexander <alexander.tarasyuk@outlook.com>
Date: Fri, 9 Aug 2019 07:29:02 +0300
Subject: [PATCH] revert lib/react16.d.ts

---
 .../callsOnComplexSignatures.symbols          | 10 ++++----
 .../checkJsxChildrenCanBeTupleType.symbols    | 18 +++++++-------
 ...ckJsxSubtleSkipContextSensitiveBug.symbols |  4 ++--
 ...SFXContextualTypeInferredCorrectly.symbols |  4 ++--
 ...fusableWithMultipleChildrenNoError.symbols | 12 +++++-----
 ...portForSideEffectsNonExtantNoError.symbols |  4 ++--
 .../reactDefaultPropsInferenceSuccess.symbols | 24 +++++++++----------
 .../reference/reactHOCSpreadprops.symbols     | 12 +++++-----
 .../reactReadonlyHOCAssignabilityReal.symbols | 12 +++++-----
 .../reactSFCAndFunctionResolvable.symbols     |  8 +++----
 ...eactTagNameComponentWithPropsNoOOM.symbols |  2 +-
 ...actTagNameComponentWithPropsNoOOM2.symbols |  4 ++--
 ...cateIsInstantiateInContextOfTarget.symbols |  4 ++--
 .../tsxNotUsingApparentTypeOfSFC.symbols      |  4 ++--
 ...psInferenceSucceedsOnIntersections.symbols |  8 +++----
 .../tsxSpreadDoesNotReportExcessProps.symbols | 12 +++++-----
 .../tsxStatelessComponentDefaultProps.symbols |  2 +-
 tests/lib/react16.d.ts                        |  9 +++++++
 18 files changed, 81 insertions(+), 72 deletions(-)

diff --git a/tests/baselines/reference/callsOnComplexSignatures.symbols b/tests/baselines/reference/callsOnComplexSignatures.symbols
index 8fe55cc964..4ce0b1292e 100644
--- a/tests/baselines/reference/callsOnComplexSignatures.symbols
+++ b/tests/baselines/reference/callsOnComplexSignatures.symbols
@@ -259,7 +259,7 @@ function test5() {
 >render : Symbol(render, Decl(callsOnComplexSignatures.tsx, 73, 18))
 >url : Symbol(url, Decl(callsOnComplexSignatures.tsx, 75, 20))
 >React : Symbol(React, Decl(callsOnComplexSignatures.tsx, 1, 6))
->ReactNode : Symbol(React.ReactNode, Decl(react16.d.ts, 213, 49))
+>ReactNode : Symbol(React.ReactNode, Decl(react16.d.ts, 216, 49))
 
         const Tag = url ? 'a' : 'button';
 >Tag : Symbol(Tag, Decl(callsOnComplexSignatures.tsx, 76, 13))
@@ -276,12 +276,12 @@ function test5() {
 >props : Symbol(props, Decl(callsOnComplexSignatures.tsx, 81, 17))
 >component : Symbol(component, Decl(callsOnComplexSignatures.tsx, 81, 25))
 >React : Symbol(React, Decl(callsOnComplexSignatures.tsx, 1, 6))
->ReactType : Symbol(React.ReactType, Decl(react16.d.ts, 111, 21))
+>ReactType : Symbol(React.ReactType, Decl(react16.d.ts, 112, 21))
 
         const Comp: React.ReactType = props.component;
 >Comp : Symbol(Comp, Decl(callsOnComplexSignatures.tsx, 82, 13))
 >React : Symbol(React, Decl(callsOnComplexSignatures.tsx, 1, 6))
->ReactType : Symbol(React.ReactType, Decl(react16.d.ts, 111, 21))
+>ReactType : Symbol(React.ReactType, Decl(react16.d.ts, 112, 21))
 >props.component : Symbol(component, Decl(callsOnComplexSignatures.tsx, 81, 25))
 >props : Symbol(props, Decl(callsOnComplexSignatures.tsx, 81, 17))
 >component : Symbol(component, Decl(callsOnComplexSignatures.tsx, 81, 25))
@@ -319,10 +319,10 @@ function test5() {
         var C: React.ComponentType<P1> | React.ComponentType<P2> = null as any;
 >C : Symbol(C, Decl(callsOnComplexSignatures.tsx, 98, 11))
 >React : Symbol(React, Decl(callsOnComplexSignatures.tsx, 1, 6))
->ComponentType : Symbol(React.ComponentType, Decl(react16.d.ts, 116, 60))
+>ComponentType : Symbol(React.ComponentType, Decl(react16.d.ts, 117, 60))
 >P1 : Symbol(P1, Decl(callsOnComplexSignatures.tsx, 87, 24))
 >React : Symbol(React, Decl(callsOnComplexSignatures.tsx, 1, 6))
->ComponentType : Symbol(React.ComponentType, Decl(react16.d.ts, 116, 60))
+>ComponentType : Symbol(React.ComponentType, Decl(react16.d.ts, 117, 60))
 >P2 : Symbol(P2, Decl(callsOnComplexSignatures.tsx, 91, 9))
 
         const a = <C p={true} />;
diff --git a/tests/baselines/reference/checkJsxChildrenCanBeTupleType.symbols b/tests/baselines/reference/checkJsxChildrenCanBeTupleType.symbols
index eafc057b78..05c7042ad1 100644
--- a/tests/baselines/reference/checkJsxChildrenCanBeTupleType.symbols
+++ b/tests/baselines/reference/checkJsxChildrenCanBeTupleType.symbols
@@ -10,16 +10,16 @@ interface ResizablePanelProps {
   children: [React.ReactNode, React.ReactNode]
 >children : Symbol(ResizablePanelProps.children, Decl(checkJsxChildrenCanBeTupleType.tsx, 4, 31))
 >React : Symbol(React, Decl(checkJsxChildrenCanBeTupleType.tsx, 2, 6))
->ReactNode : Symbol(React.ReactNode, Decl(react16.d.ts, 213, 49))
+>ReactNode : Symbol(React.ReactNode, Decl(react16.d.ts, 216, 49))
 >React : Symbol(React, Decl(checkJsxChildrenCanBeTupleType.tsx, 2, 6))
->ReactNode : Symbol(React.ReactNode, Decl(react16.d.ts, 213, 49))
+>ReactNode : Symbol(React.ReactNode, Decl(react16.d.ts, 216, 49))
 }
 
 class ResizablePanel extends React.Component<
 >ResizablePanel : Symbol(ResizablePanel, Decl(checkJsxChildrenCanBeTupleType.tsx, 6, 1))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(checkJsxChildrenCanBeTupleType.tsx, 2, 6))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 
   ResizablePanelProps, any> {}
 >ResizablePanelProps : Symbol(ResizablePanelProps, Decl(checkJsxChildrenCanBeTupleType.tsx, 2, 25))
@@ -29,10 +29,10 @@ const test = <ResizablePanel>
 >ResizablePanel : Symbol(ResizablePanel, Decl(checkJsxChildrenCanBeTupleType.tsx, 6, 1))
 
   <div />
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
 
   <div />
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
 
 </ResizablePanel>
 >ResizablePanel : Symbol(ResizablePanel, Decl(checkJsxChildrenCanBeTupleType.tsx, 6, 1))
@@ -42,13 +42,13 @@ const testErr = <ResizablePanel>
 >ResizablePanel : Symbol(ResizablePanel, Decl(checkJsxChildrenCanBeTupleType.tsx, 6, 1))
 
   <div />
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
 
   <div />
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
 
   <div />
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
 
 </ResizablePanel>
 >ResizablePanel : Symbol(ResizablePanel, Decl(checkJsxChildrenCanBeTupleType.tsx, 6, 1))
diff --git a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.symbols b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.symbols
index a3b41ed126..4a42e972f4 100644
--- a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.symbols
+++ b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.symbols
@@ -27,9 +27,9 @@ interface AsyncLoaderProps<TResult> {
 class AsyncLoader<TResult> extends React.Component<AsyncLoaderProps<TResult>> {
 >AsyncLoader : Symbol(AsyncLoader, Decl(checkJsxSubtleSkipContextSensitiveBug.tsx, 9, 1))
 >TResult : Symbol(TResult, Decl(checkJsxSubtleSkipContextSensitiveBug.tsx, 11, 18))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(checkJsxSubtleSkipContextSensitiveBug.tsx, 1, 6))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >AsyncLoaderProps : Symbol(AsyncLoaderProps, Decl(checkJsxSubtleSkipContextSensitiveBug.tsx, 3, 37))
 >TResult : Symbol(TResult, Decl(checkJsxSubtleSkipContextSensitiveBug.tsx, 11, 18))
 
diff --git a/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.symbols b/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.symbols
index b26e5cad88..13675eb985 100644
--- a/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.symbols
+++ b/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.symbols
@@ -39,8 +39,8 @@ export function ComponentWithUnion(props: PM | PS) {
 >PS : Symbol(PS, Decl(checkJsxUnionSFXContextualTypeInferredCorrectly.tsx, 2, 26))
 
     return <h1></h1>;
->h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2421, 106))
->h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2421, 106))
+>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2430, 106))
+>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2430, 106))
 }
 
 // Usage with React tsx
diff --git a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.symbols b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.symbols
index f521ba9820..93737d2a6f 100644
--- a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.symbols
+++ b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.symbols
@@ -7,7 +7,7 @@ import * as React from 'react'
 type Tab = [string, React.ReactNode]  // [tabName, tabContent]
 >Tab : Symbol(Tab, Decl(jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.tsx, 2, 30))
 >React : Symbol(React, Decl(jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.tsx, 2, 6))
->ReactNode : Symbol(React.ReactNode, Decl(react16.d.ts, 213, 49))
+>ReactNode : Symbol(React.ReactNode, Decl(react16.d.ts, 216, 49))
 
 interface Props {
 >Props : Symbol(Props, Decl(jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.tsx, 4, 36))
@@ -23,14 +23,14 @@ function TabLayout(props: Props) {
 >Props : Symbol(Props, Decl(jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.tsx, 4, 36))
 
     return <div/>
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
 }
 
 export class App extends React.Component<{}> {
 >App : Symbol(App, Decl(jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.tsx, 12, 1))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.tsx, 2, 6))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 
     render() {
 >render : Symbol(App.render, Decl(jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.tsx, 14, 46))
@@ -40,10 +40,10 @@ export class App extends React.Component<{}> {
 
             {[
                 ['Users', <div/>],
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
 
                 ['Products', <div/>]
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
 
             ]}
         </TabLayout>
diff --git a/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.symbols b/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.symbols
index b1da5f1801..f64e007286 100644
--- a/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.symbols
+++ b/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.symbols
@@ -7,6 +7,6 @@ import "./App.css"; // doesn't actually exist
 
 const tag = <div></div>;
 >tag : Symbol(tag, Decl(jsxImportForSideEffectsNonExtantNoError.tsx, 5, 5))
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
 
diff --git a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.symbols b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.symbols
index fa4e2b9861..f5cff116a4 100644
--- a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.symbols
+++ b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.symbols
@@ -25,9 +25,9 @@ class FieldFeedback<P extends Props = BaseProps> extends React.Component<P> {
 >P : Symbol(P, Decl(reactDefaultPropsInferenceSuccess.tsx, 12, 20))
 >Props : Symbol(Props, Decl(reactDefaultPropsInferenceSuccess.tsx, 7, 1))
 >BaseProps : Symbol(BaseProps, Decl(reactDefaultPropsInferenceSuccess.tsx, 2, 26))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(reactDefaultPropsInferenceSuccess.tsx, 2, 6))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >P : Symbol(P, Decl(reactDefaultPropsInferenceSuccess.tsx, 12, 20))
 
   static defaultProps = {
@@ -42,8 +42,8 @@ class FieldFeedback<P extends Props = BaseProps> extends React.Component<P> {
 >render : Symbol(FieldFeedback.render, Decl(reactDefaultPropsInferenceSuccess.tsx, 15, 4))
 
     return <div>Hello</div>;
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
   }
 }
 
@@ -71,9 +71,9 @@ class FieldFeedbackBeta<P extends Props = BaseProps> extends React.Component<P>
 >P : Symbol(P, Decl(reactDefaultPropsInferenceSuccess.tsx, 28, 24))
 >Props : Symbol(Props, Decl(reactDefaultPropsInferenceSuccess.tsx, 7, 1))
 >BaseProps : Symbol(BaseProps, Decl(reactDefaultPropsInferenceSuccess.tsx, 2, 26))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(reactDefaultPropsInferenceSuccess.tsx, 2, 6))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >P : Symbol(P, Decl(reactDefaultPropsInferenceSuccess.tsx, 28, 24))
 
   static defaultProps: BaseProps = {
@@ -89,8 +89,8 @@ class FieldFeedbackBeta<P extends Props = BaseProps> extends React.Component<P>
 >render : Symbol(FieldFeedbackBeta.render, Decl(reactDefaultPropsInferenceSuccess.tsx, 31, 4))
 
     return <div>Hello</div>;
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
   }
 }
 
@@ -147,14 +147,14 @@ class FieldFeedback2<P extends MyPropsProps = MyPropsProps> extends FieldFeedbac
 
     this.props.when("now"); // OK, always defined
 >this.props.when : Symbol(when, Decl(reactDefaultPropsInferenceSuccess.tsx, 44, 38))
->this.props : Symbol(React.Component.props, Decl(react16.d.ts, 363, 32))
+>this.props : Symbol(React.Component.props, Decl(react16.d.ts, 367, 32))
 >this : Symbol(FieldFeedback2, Decl(reactDefaultPropsInferenceSuccess.tsx, 46, 1))
->props : Symbol(React.Component.props, Decl(react16.d.ts, 363, 32))
+>props : Symbol(React.Component.props, Decl(react16.d.ts, 367, 32))
 >when : Symbol(when, Decl(reactDefaultPropsInferenceSuccess.tsx, 44, 38))
 
     return <div>Hello</div>;
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
   }
 }
 
diff --git a/tests/baselines/reference/reactHOCSpreadprops.symbols b/tests/baselines/reference/reactHOCSpreadprops.symbols
index c5da964c2f..06e698014f 100644
--- a/tests/baselines/reference/reactHOCSpreadprops.symbols
+++ b/tests/baselines/reference/reactHOCSpreadprops.symbols
@@ -8,17 +8,17 @@ function f<P>(App: React.ComponentClass<P> | React.StatelessComponent<P>): void
 >P : Symbol(P, Decl(reactHOCSpreadprops.tsx, 2, 11))
 >App : Symbol(App, Decl(reactHOCSpreadprops.tsx, 2, 14))
 >React : Symbol(React, Decl(reactHOCSpreadprops.tsx, 0, 0))
->ComponentClass : Symbol(React.ComponentClass, Decl(react16.d.ts, 417, 9))
+>ComponentClass : Symbol(React.ComponentClass, Decl(react16.d.ts, 421, 9))
 >P : Symbol(P, Decl(reactHOCSpreadprops.tsx, 2, 11))
 >React : Symbol(React, Decl(reactHOCSpreadprops.tsx, 0, 0))
->StatelessComponent : Symbol(React.StatelessComponent, Decl(react16.d.ts, 402, 49))
+>StatelessComponent : Symbol(React.StatelessComponent, Decl(react16.d.ts, 406, 49))
 >P : Symbol(P, Decl(reactHOCSpreadprops.tsx, 2, 11))
 
     class C extends React.Component<P & { x: number }> {
 >C : Symbol(C, Decl(reactHOCSpreadprops.tsx, 2, 81))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(reactHOCSpreadprops.tsx, 0, 0))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >P : Symbol(P, Decl(reactHOCSpreadprops.tsx, 2, 11))
 >x : Symbol(x, Decl(reactHOCSpreadprops.tsx, 3, 41))
 
@@ -27,9 +27,9 @@ function f<P>(App: React.ComponentClass<P> | React.StatelessComponent<P>): void
 
             return <App {...this.props} />;
 >App : Symbol(App, Decl(reactHOCSpreadprops.tsx, 2, 14))
->this.props : Symbol(React.Component.props, Decl(react16.d.ts, 363, 32))
+>this.props : Symbol(React.Component.props, Decl(react16.d.ts, 367, 32))
 >this : Symbol(C, Decl(reactHOCSpreadprops.tsx, 2, 81))
->props : Symbol(React.Component.props, Decl(react16.d.ts, 363, 32))
+>props : Symbol(React.Component.props, Decl(react16.d.ts, 367, 32))
         }
     }
 }
diff --git a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.symbols b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.symbols
index d66bb80b6f..c0fc1dbafd 100644
--- a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.symbols
+++ b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.symbols
@@ -8,18 +8,18 @@ function myHigherOrderComponent<P>(Inner: React.ComponentClass<P & {name: string
 >P : Symbol(P, Decl(reactReadonlyHOCAssignabilityReal.tsx, 3, 32))
 >Inner : Symbol(Inner, Decl(reactReadonlyHOCAssignabilityReal.tsx, 3, 35))
 >React : Symbol(React, Decl(reactReadonlyHOCAssignabilityReal.tsx, 1, 6))
->ComponentClass : Symbol(React.ComponentClass, Decl(react16.d.ts, 417, 9))
+>ComponentClass : Symbol(React.ComponentClass, Decl(react16.d.ts, 421, 9))
 >P : Symbol(P, Decl(reactReadonlyHOCAssignabilityReal.tsx, 3, 32))
 >name : Symbol(name, Decl(reactReadonlyHOCAssignabilityReal.tsx, 3, 68))
 >React : Symbol(React, Decl(reactReadonlyHOCAssignabilityReal.tsx, 1, 6))
->ComponentClass : Symbol(React.ComponentClass, Decl(react16.d.ts, 417, 9))
+>ComponentClass : Symbol(React.ComponentClass, Decl(react16.d.ts, 421, 9))
 >P : Symbol(P, Decl(reactReadonlyHOCAssignabilityReal.tsx, 3, 32))
 
     return class OuterComponent extends React.Component<P> {
 >OuterComponent : Symbol(OuterComponent, Decl(reactReadonlyHOCAssignabilityReal.tsx, 4, 10))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(reactReadonlyHOCAssignabilityReal.tsx, 1, 6))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >P : Symbol(P, Decl(reactReadonlyHOCAssignabilityReal.tsx, 3, 32))
 
         render() {
@@ -27,9 +27,9 @@ function myHigherOrderComponent<P>(Inner: React.ComponentClass<P & {name: string
 
             return <Inner {...this.props} name="Matt"/>;
 >Inner : Symbol(Inner, Decl(reactReadonlyHOCAssignabilityReal.tsx, 3, 35))
->this.props : Symbol(React.Component.props, Decl(react16.d.ts, 363, 32))
+>this.props : Symbol(React.Component.props, Decl(react16.d.ts, 367, 32))
 >this : Symbol(OuterComponent, Decl(reactReadonlyHOCAssignabilityReal.tsx, 4, 10))
->props : Symbol(React.Component.props, Decl(react16.d.ts, 363, 32))
+>props : Symbol(React.Component.props, Decl(react16.d.ts, 367, 32))
 >name : Symbol(name, Decl(reactReadonlyHOCAssignabilityReal.tsx, 6, 41))
         }
     };
diff --git a/tests/baselines/reference/reactSFCAndFunctionResolvable.symbols b/tests/baselines/reference/reactSFCAndFunctionResolvable.symbols
index d915fb83ea..18231fa8b6 100644
--- a/tests/baselines/reference/reactSFCAndFunctionResolvable.symbols
+++ b/tests/baselines/reference/reactSFCAndFunctionResolvable.symbols
@@ -8,17 +8,17 @@ declare const Radio: (props: {}) => React.ReactElement<{}>;
 >Radio : Symbol(Radio, Decl(reactSFCAndFunctionResolvable.tsx, 4, 13))
 >props : Symbol(props, Decl(reactSFCAndFunctionResolvable.tsx, 4, 22))
 >React : Symbol(React, Decl(reactSFCAndFunctionResolvable.tsx, 2, 6))
->ReactElement : Symbol(React.ReactElement, Decl(react16.d.ts, 134, 9))
+>ReactElement : Symbol(React.ReactElement, Decl(react16.d.ts, 135, 9))
 
 declare const OtherRadio: () => React.ReactElement<{}>;
 >OtherRadio : Symbol(OtherRadio, Decl(reactSFCAndFunctionResolvable.tsx, 5, 13))
 >React : Symbol(React, Decl(reactSFCAndFunctionResolvable.tsx, 2, 6))
->ReactElement : Symbol(React.ReactElement, Decl(react16.d.ts, 134, 9))
+>ReactElement : Symbol(React.ReactElement, Decl(react16.d.ts, 135, 9))
 
 declare const Checkbox: React.SFC;
 >Checkbox : Symbol(Checkbox, Decl(reactSFCAndFunctionResolvable.tsx, 6, 13))
 >React : Symbol(React, Decl(reactSFCAndFunctionResolvable.tsx, 2, 6))
->SFC : Symbol(React.SFC, Decl(react16.d.ts, 396, 9))
+>SFC : Symbol(React.SFC, Decl(react16.d.ts, 400, 9))
 
 declare const condition1: boolean;
 >condition1 : Symbol(condition1, Decl(reactSFCAndFunctionResolvable.tsx, 8, 13))
@@ -32,7 +32,7 @@ declare const condition3: boolean;
 const RandomComponent: React.SFC = () => {
 >RandomComponent : Symbol(RandomComponent, Decl(reactSFCAndFunctionResolvable.tsx, 12, 5))
 >React : Symbol(React, Decl(reactSFCAndFunctionResolvable.tsx, 2, 6))
->SFC : Symbol(React.SFC, Decl(react16.d.ts, 396, 9))
+>SFC : Symbol(React.SFC, Decl(react16.d.ts, 400, 9))
 
   const Component =
 >Component : Symbol(Component, Decl(reactSFCAndFunctionResolvable.tsx, 13, 7))
diff --git a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.symbols b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.symbols
index 07cf48c719..0b827bf7a0 100644
--- a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.symbols
+++ b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.symbols
@@ -7,7 +7,7 @@ import * as React from "react";
 declare const Tag: keyof React.ReactHTML;
 >Tag : Symbol(Tag, Decl(reactTagNameComponentWithPropsNoOOM.tsx, 3, 13))
 >React : Symbol(React, Decl(reactTagNameComponentWithPropsNoOOM.tsx, 2, 6))
->ReactHTML : Symbol(React.ReactHTML, Decl(react16.d.ts, 2083, 9))
+>ReactHTML : Symbol(React.ReactHTML, Decl(react16.d.ts, 2089, 9))
 
 const classes = "";
 >classes : Symbol(classes, Decl(reactTagNameComponentWithPropsNoOOM.tsx, 5, 5))
diff --git a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.symbols b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.symbols
index 8f2ac4f08a..658f9fd5c4 100644
--- a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.symbols
+++ b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.symbols
@@ -7,7 +7,7 @@ import * as React from "react";
 declare const Tag: keyof React.ReactHTML;
 >Tag : Symbol(Tag, Decl(reactTagNameComponentWithPropsNoOOM2.tsx, 3, 13))
 >React : Symbol(React, Decl(reactTagNameComponentWithPropsNoOOM2.tsx, 2, 6))
->ReactHTML : Symbol(React.ReactHTML, Decl(react16.d.ts, 2083, 9))
+>ReactHTML : Symbol(React.ReactHTML, Decl(react16.d.ts, 2089, 9))
 
 const classes = "";
 >classes : Symbol(classes, Decl(reactTagNameComponentWithPropsNoOOM2.tsx, 5, 5))
@@ -15,7 +15,7 @@ const classes = "";
 const rest: React.HTMLAttributes<HTMLElement> = {};
 >rest : Symbol(rest, Decl(reactTagNameComponentWithPropsNoOOM2.tsx, 6, 5))
 >React : Symbol(React, Decl(reactTagNameComponentWithPropsNoOOM2.tsx, 2, 6))
->HTMLAttributes : Symbol(React.HTMLAttributes, Decl(react16.d.ts, 1043, 9), Decl(react16.d.ts, 1100, 9))
+>HTMLAttributes : Symbol(React.HTMLAttributes, Decl(react16.d.ts, 1048, 9), Decl(react16.d.ts, 1105, 9))
 >HTMLElement : Symbol(HTMLElement, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
 
 const children: any[] = [];
diff --git a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.symbols b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.symbols
index c38313e874..9c7558aa64 100644
--- a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.symbols
+++ b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.symbols
@@ -5,9 +5,9 @@ import * as React from "react";
 
 class TestComponent extends React.Component<{ isAny: <T>(obj: any) => obj is T }> {
 >TestComponent : Symbol(TestComponent, Decl(returnTypePredicateIsInstantiateInContextOfTarget.tsx, 1, 31))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(returnTypePredicateIsInstantiateInContextOfTarget.tsx, 1, 6))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >isAny : Symbol(isAny, Decl(returnTypePredicateIsInstantiateInContextOfTarget.tsx, 2, 45))
 >T : Symbol(T, Decl(returnTypePredicateIsInstantiateInContextOfTarget.tsx, 2, 54))
 >obj : Symbol(obj, Decl(returnTypePredicateIsInstantiateInContextOfTarget.tsx, 2, 57))
diff --git a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.symbols b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.symbols
index 425e852760..3d198673c2 100644
--- a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.symbols
+++ b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.symbols
@@ -19,9 +19,9 @@ function test<P>(wrappedProps: P) {
     };
     class MyComponent extends React.Component<P> {
 >MyComponent : Symbol(MyComponent, Decl(tsxNotUsingApparentTypeOfSFC.tsx, 7, 6))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(tsxNotUsingApparentTypeOfSFC.tsx, 2, 6))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >P : Symbol(P, Decl(tsxNotUsingApparentTypeOfSFC.tsx, 4, 14))
 
         render() {
diff --git a/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.symbols b/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.symbols
index f4e4884a31..53ab08fd3e 100644
--- a/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.symbols
+++ b/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.symbols
@@ -8,7 +8,7 @@ export type ButtonProps<T = {}> = React.ButtonHTMLAttributes<HTMLButtonElement>
 >ButtonProps : Symbol(ButtonProps, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 2, 26))
 >T : Symbol(T, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 4, 24))
 >React : Symbol(React, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 2, 6))
->ButtonHTMLAttributes : Symbol(React.ButtonHTMLAttributes, Decl(react16.d.ts, 1431, 9))
+>ButtonHTMLAttributes : Symbol(React.ButtonHTMLAttributes, Decl(react16.d.ts, 1437, 9))
 >HTMLButtonElement : Symbol(HTMLButtonElement, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
 
     outline?: boolean;
@@ -20,9 +20,9 @@ export type ButtonProps<T = {}> = React.ButtonHTMLAttributes<HTMLButtonElement>
 declare class Button<T = {}> extends React.Component<ButtonProps<T>> { }
 >Button : Symbol(Button, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 6, 6))
 >T : Symbol(T, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 8, 21))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 2, 6))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >ButtonProps : Symbol(ButtonProps, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 2, 26))
 >T : Symbol(T, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 8, 21))
 
@@ -37,7 +37,7 @@ interface CustomButtonProps extends ButtonProps {
 const CustomButton: React.SFC<CustomButtonProps> = props => <Button {...props} />;
 >CustomButton : Symbol(CustomButton, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 14, 5))
 >React : Symbol(React, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 2, 6))
->SFC : Symbol(React.SFC, Decl(react16.d.ts, 396, 9))
+>SFC : Symbol(React.SFC, Decl(react16.d.ts, 400, 9))
 >CustomButtonProps : Symbol(CustomButtonProps, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 8, 72))
 >props : Symbol(props, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 14, 50))
 >Button : Symbol(Button, Decl(tsxReactPropsInferenceSucceedsOnIntersections.tsx, 6, 6))
diff --git a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.symbols b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.symbols
index 195cc2a3ed..8e40f317ee 100644
--- a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.symbols
+++ b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.symbols
@@ -6,9 +6,9 @@ import React from "react";
 
 class MyComponent extends React.Component<{dataSource: number[], onClick?: any}, {}> {
 >MyComponent : Symbol(MyComponent, Decl(tsxSpreadDoesNotReportExcessProps.tsx, 2, 26))
->React.Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >React : Symbol(React, Decl(tsxSpreadDoesNotReportExcessProps.tsx, 2, 6))
->Component : Symbol(React.Component, Decl(react16.d.ts, 342, 54), Decl(react16.d.ts, 345, 94))
+>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
 >dataSource : Symbol(dataSource, Decl(tsxSpreadDoesNotReportExcessProps.tsx, 4, 43))
 >onClick : Symbol(onClick, Decl(tsxSpreadDoesNotReportExcessProps.tsx, 4, 64))
 
@@ -16,12 +16,12 @@ class MyComponent extends React.Component<{dataSource: number[], onClick?: any},
 >render : Symbol(MyComponent.render, Decl(tsxSpreadDoesNotReportExcessProps.tsx, 4, 86))
 
         return (<div {...this.props} className="ok"></div>);
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
->this.props : Symbol(React.Component.props, Decl(react16.d.ts, 363, 32))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
+>this.props : Symbol(React.Component.props, Decl(react16.d.ts, 367, 32))
 >this : Symbol(MyComponent, Decl(tsxSpreadDoesNotReportExcessProps.tsx, 2, 26))
->props : Symbol(React.Component.props, Decl(react16.d.ts, 363, 32))
+>props : Symbol(React.Component.props, Decl(react16.d.ts, 367, 32))
 >className : Symbol(className, Decl(tsxSpreadDoesNotReportExcessProps.tsx, 6, 36))
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
     }
 }
 
diff --git a/tests/baselines/reference/tsxStatelessComponentDefaultProps.symbols b/tests/baselines/reference/tsxStatelessComponentDefaultProps.symbols
index 20226ded1d..9540cdeb48 100644
--- a/tests/baselines/reference/tsxStatelessComponentDefaultProps.symbols
+++ b/tests/baselines/reference/tsxStatelessComponentDefaultProps.symbols
@@ -17,7 +17,7 @@ function BackButton(_props: Props) {
 >Props : Symbol(Props, Decl(tsxStatelessComponentDefaultProps.tsx, 2, 26))
 
     return <div />
->div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2411, 114))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2420, 114))
 }
 BackButton.defaultProps = {
 >BackButton.defaultProps : Symbol(BackButton.defaultProps, Decl(tsxStatelessComponentDefaultProps.tsx, 9, 1))
diff --git a/tests/lib/react16.d.ts b/tests/lib/react16.d.ts
index b3068d0dce..4b91fb0c6f 100644
--- a/tests/lib/react16.d.ts
+++ b/tests/lib/react16.d.ts
@@ -107,6 +107,7 @@ declare module "react" {
     type NativeUIEvent = UIEvent;
     type NativeWheelEvent = WheelEvent;
 
+    // tslint:disable-next-line:export-just-namespace
     export = React;
 
     namespace React {
@@ -159,6 +160,7 @@ declare module "react" {
         }
 
         // ReactHTML for ReactHTMLElement
+        // tslint:disable-next-line:no-empty-interface
         interface ReactHTMLElement<T extends HTMLElement> extends DetailedReactHTMLElement<AllHTMLAttributes<T>, T> { }
 
         interface DetailedReactHTMLElement<P extends HTMLAttributes<T>, T extends HTMLElement> extends DOMElement<P, T> {
@@ -192,6 +194,7 @@ declare module "react" {
         type DOMFactory<P extends DOMAttributes<T>, T extends Element> =
             (props?: ClassAttributes<T> & P | null, ...children: ReactNode[]) => DOMElement<P, T>;
 
+        // tslint:disable-next-line:no-empty-interface
         interface HTMLFactory<T extends HTMLElement> extends DetailedHTMLFactory<AllHTMLAttributes<T>, T> { }
 
         interface DetailedHTMLFactory<P extends HTMLAttributes<T>, T extends HTMLElement> extends DOMFactory<P, T> {
@@ -343,6 +346,7 @@ declare module "react" {
         type ReactInstance = Component<any> | Element;
 
         // Base component for plain JS classes
+        // tslint:disable-next-line:no-empty-interface
         interface Component<P = {}, S = {}, SS = any> extends ComponentLifecycle<P, S, SS> { }
         class Component<P, S> {
             constructor(props: Readonly<P>);
@@ -687,6 +691,7 @@ declare module "react" {
             target: EventTarget & T;
         }
 
+        // tslint:disable-next-line:no-empty-interface
         interface FormEvent<T = Element> extends SyntheticEvent<T> {
         }
 
@@ -1408,6 +1413,7 @@ declare module "react" {
             type?: string;
         }
 
+        // tslint:disable-next-line:no-empty-interface
         interface AudioHTMLAttributes<T> extends MediaHTMLAttributes<T> { }
 
         interface AreaHTMLAttributes<T> extends HTMLAttributes<T> {
@@ -2361,6 +2367,7 @@ declare module "react" {
 
     global {
         namespace JSX {
+            // tslint:disable-next-line:no-empty-interface
             interface Element extends React.ReactElement<any> { }
             interface ElementClass extends React.Component<any> {
                 render(): React.ReactNode;
@@ -2376,7 +2383,9 @@ declare module "react" {
                 ? Defaultize<P, D>
                 : P;
 
+            // tslint:disable-next-line:no-empty-interface
             interface IntrinsicAttributes extends React.Attributes { }
+            // tslint:disable-next-line:no-empty-interface
             interface IntrinsicClassAttributes<T> extends React.ClassAttributes<T> { }
 
             interface IntrinsicElements {