From fa6f24ebef9e5e706b68f62bfc4bc77fc269ae5a Mon Sep 17 00:00:00 2001
From: Miles Johnson <mileswjohnson@gmail.com>
Date: Tue, 25 Sep 2018 13:19:17 -0700
Subject: [PATCH] Decouple react from prop-types.

---
 types/prop-types/index.d.ts | 63 ++++++++++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 14 deletions(-)

diff --git a/types/prop-types/index.d.ts b/types/prop-types/index.d.ts
index f6176dd59d..fe521031d9 100644
--- a/types/prop-types/index.d.ts
+++ b/types/prop-types/index.d.ts
@@ -5,18 +5,46 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { ReactNode, ReactElement } from 'react';
+export interface ReactElementLike {
+    type: string | ((...args: any[]) => ReactElementLike);
+    props: any;
+    key: string | number | null;
+    children?: ReactNodeLike;
+}
+
+export interface ReactNodeArray extends Array<ReactNodeLike> {}
+
+export type ReactNodeLike =
+    | {}
+    | ReactElementLike
+    | ReactNodeArray
+    | string
+    | number
+    | boolean
+    | null
+    | undefined;
 
 export const nominalTypeHack: unique symbol;
 
-export type IsOptional<T> = undefined | null extends T ? true : undefined extends T ? true : null extends T ? true : false;
-
-export type RequiredKeys<V> = { [K in keyof V]: V[K] extends Validator<infer T> ? IsOptional<T> extends true ? never : K : never }[keyof V];
+export type IsOptional<T> = undefined | null extends T
+    ? true
+    : undefined extends T ? true : null extends T ? true : false;
+export type RequiredKeys<V> = {
+    [K in keyof V]: V[K] extends Validator<infer T>
+        ? IsOptional<T> extends true ? never : K
+        : never
+}[keyof V];
 export type OptionalKeys<V> = Exclude<keyof V, RequiredKeys<V>>;
-export type InferPropsInner<V> = { [K in keyof V]: InferType<V[K]>; };
+export type InferPropsInner<V> = { [K in keyof V]: InferType<V[K]> };
 
 export interface Validator<T> {
-    (props: object, propName: string, componentName: string, location: string, propFullName: string): Error | null;
+    (
+        props: object,
+        propName: string,
+        componentName: string,
+        location: string,
+        propFullName: string,
+    ): Error | null;
     [nominalTypeHack]?: T;
 }
 
@@ -27,9 +55,8 @@ export interface Requireable<T> extends Validator<T | undefined | null> {
 export type ValidationMap<T> = { [K in keyof T]-?: Validator<T[K]> };
 
 export type InferType<V> = V extends Validator<infer T> ? T : any;
-export type InferProps<V> =
-    & InferPropsInner<Pick<V, RequiredKeys<V>>>
-    & Partial<InferPropsInner<Pick<V, OptionalKeys<V>>>>;
+export type InferProps<V> = InferPropsInner<Pick<V, RequiredKeys<V>>> &
+    Partial<InferPropsInner<Pick<V, OptionalKeys<V>>>>;
 
 export const any: Requireable<any>;
 export const array: Requireable<any[]>;
@@ -38,14 +65,16 @@ export const func: Requireable<(...args: any[]) => any>;
 export const number: Requireable<number>;
 export const object: Requireable<object>;
 export const string: Requireable<string>;
-export const node: Requireable<ReactNode>;
-export const element: Requireable<ReactElement<any>>;
+export const node: Requireable<ReactNodeLike>;
+export const element: Requireable<ReactElementLike>;
 export const symbol: Requireable<symbol>;
 export function instanceOf<T>(expectedClass: new (...args: any[]) => T): Requireable<T>;
 export function oneOf<T>(types: T[]): Requireable<T>;
-export function oneOfType<T extends Validator<any>>(types: T[]): Requireable<NonNullable<InferType<T>>>;
+export function oneOfType<T extends Validator<any>>(
+    types: T[],
+): Requireable<NonNullable<InferType<T>>>;
 export function arrayOf<T>(type: Validator<T>): Requireable<T[]>;
-export function objectOf<T>(type: Validator<T>): Requireable<{ [K in keyof any]: T; }>;
+export function objectOf<T>(type: Validator<T>): Requireable<{ [K in keyof any]: T }>;
 export function shape<P extends ValidationMap<any>>(type: P): Requireable<InferProps<P>>;
 export function exact<P extends ValidationMap<any>>(type: P): Requireable<Required<InferProps<P>>>;
 
@@ -59,4 +88,10 @@ export function exact<P extends ValidationMap<any>>(type: P): Requireable<Requir
  * @param componentName Name of the component for error messages.
  * @param getStack Returns the component stack.
  */
-export function checkPropTypes(typeSpecs: any, values: any, location: string, componentName: string, getStack?: () => any): void;
+export function checkPropTypes(
+    typeSpecs: any,
+    values: any,
+    location: string,
+    componentName: string,
+    getStack?: () => any,
+): void;