Remove runtime dep on prop-types

gaearon · gaearon · commit 7068c9b92f1a · 2020-02-25T15:54:22.000Z
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
@@ -26,7 +26,6 @@
     "create-react-class": "^15.6.2",
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.2",
     "scheduler": "^0.18.0"
   },
   "peerDependencies": {
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
@@ -19,7 +19,6 @@
   "dependencies": {
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.2",
     "scheduler": "^0.18.0"
   },
   "peerDependencies": {
diff --git a/packages/react-dom/src/server/ReactPartialRendererContext.js b/packages/react-dom/src/server/ReactPartialRendererContext.js
@@ -12,14 +12,11 @@ import type {ReactContext} from 'shared/ReactTypes';
 
 import {disableLegacyContext} from 'shared/ReactFeatureFlags';
 import {REACT_CONTEXT_TYPE, REACT_PROVIDER_TYPE} from 'shared/ReactSymbols';
-import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
-import checkPropTypes from 'prop-types/checkPropTypes';
+import checkPropTypes from 'shared/checkPropTypes';
 
-let ReactDebugCurrentFrame;
 let didWarnAboutInvalidateContextType;
 if (__DEV__) {
-  ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
   didWarnAboutInvalidateContextType = new Set();
 }
 
@@ -42,13 +39,7 @@ function maskContext(type, context) {
 
 function checkContextTypes(typeSpecs, values, location: string) {
   if (__DEV__) {
-    checkPropTypes(
-      typeSpecs,
-      values,
-      location,
-      'Component',
-      ReactDebugCurrentFrame.getCurrentStack,
-    );
+    checkPropTypes(typeSpecs, values, location, 'Component');
   }
 }
 
diff --git a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import checkPropTypes from 'prop-types/checkPropTypes';
+import checkPropTypes from 'shared/checkPropTypes';
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 import {enableDeprecatedFlareAPI} from 'shared/ReactFeatureFlags';
 
diff --git a/packages/react-flight/package.json b/packages/react-flight/package.json
@@ -29,8 +29,7 @@
   },
   "dependencies": {
     "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1",
-    "prop-types": "^15.6.2"
+    "object-assign": "^4.1.1"
   },
   "browserify": {
     "transform": [
diff --git a/packages/react-native-renderer/package.json b/packages/react-native-renderer/package.json
@@ -9,7 +9,6 @@
   },
   "dependencies": {
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.2",
     "scheduler": "^0.11.0"
   },
   "peerDependencies": {
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
@@ -12,7 +12,6 @@
   "license": "MIT",
   "dependencies": {
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.2",
     "regenerator-runtime": "^0.11.0",
     "react-reconciler": "*",
     "react-flight": "*",
diff --git a/packages/react-reconciler/package.json b/packages/react-reconciler/package.json
@@ -32,7 +32,6 @@
   "dependencies": {
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.2",
     "scheduler": "^0.18.0"
   },
   "browserify": {
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -18,7 +18,7 @@ import type {
 } from './ReactFiberSuspenseComponent';
 import type {SuspenseContext} from './ReactFiberSuspenseContext';
 
-import checkPropTypes from 'prop-types/checkPropTypes';
+import checkPropTypes from 'shared/checkPropTypes';
 
 import {
   IndeterminateComponent,
@@ -76,7 +76,6 @@ import {REACT_LAZY_TYPE, getIteratorFn} from 'shared/ReactSymbols';
 import {
   setCurrentPhase,
   getCurrentFiberOwnerNameInDevOrNull,
-  getCurrentFiberStackInDev,
 } from './ReactCurrentFiber';
 import {startWorkTimer, cancelWorkTimer} from './ReactDebugFiberPerf';
 import {
@@ -298,7 +297,6 @@ function updateForwardRef(
           nextProps, // Resolved props
           'prop',
           getComponentName(Component),
-          getCurrentFiberStackInDev,
         );
       }
     }
@@ -416,7 +414,6 @@ function updateMemoComponent(
           nextProps, // Resolved props
           'prop',
           getComponentName(type),
-          getCurrentFiberStackInDev,
         );
       }
     }
@@ -444,7 +441,6 @@ function updateMemoComponent(
         nextProps, // Resolved props
         'prop',
         getComponentName(type),
-        getCurrentFiberStackInDev,
       );
     }
   }
@@ -503,7 +499,6 @@ function updateSimpleMemoComponent(
           nextProps, // Resolved (SimpleMemoComponent has no defaultProps)
           'prop',
           getComponentName(outerMemoType),
-          getCurrentFiberStackInDev,
         );
       }
       // Inner propTypes will be validated in the function component path.
@@ -628,7 +623,6 @@ function updateFunctionComponent(
           nextProps, // Resolved props
           'prop',
           getComponentName(Component),
-          getCurrentFiberStackInDev,
         );
       }
     }
@@ -795,7 +789,6 @@ function updateClassComponent(
           nextProps, // Resolved props
           'prop',
           getComponentName(Component),
-          getCurrentFiberStackInDev,
         );
       }
     }
@@ -1200,7 +1193,6 @@ function mountLazyComponent(
               resolvedProps, // Resolved for outer only
               'prop',
               getComponentName(Component),
-              getCurrentFiberStackInDev,
             );
           }
         }
@@ -2636,13 +2628,7 @@ function updateContextProvider(
     const providerPropTypes = workInProgress.type.propTypes;
 
     if (providerPropTypes) {
-      checkPropTypes(
-        providerPropTypes,
-        newProps,
-        'prop',
-        'Context.Provider',
-        getCurrentFiberStackInDev,
-      );
+      checkPropTypes(providerPropTypes, newProps, 'prop', 'Context.Provider');
     }
   }
 
@@ -3222,7 +3208,6 @@ function beginWork(
               resolvedProps, // Resolved for outer only
               'prop',
               getComponentName(type),
-              getCurrentFiberStackInDev,
             );
           }
         }
diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js
@@ -15,9 +15,9 @@ import {disableLegacyContext} from 'shared/ReactFeatureFlags';
 import {ClassComponent, HostRoot} from 'shared/ReactWorkTags';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
-import checkPropTypes from 'prop-types/checkPropTypes';
+import checkPropTypes from 'shared/checkPropTypes';
 
-import {setCurrentPhase, getCurrentFiberStackInDev} from './ReactCurrentFiber';
+import {setCurrentPhase} from './ReactCurrentFiber';
 import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf';
 import {createCursor, push, pop} from './ReactFiberStack';
 
@@ -105,13 +105,7 @@ function getMaskedContext(
 
     if (__DEV__) {
       const name = getComponentName(type) || 'Unknown';
-      checkPropTypes(
-        contextTypes,
-        context,
-        'context',
-        name,
-        getCurrentFiberStackInDev,
-      );
+      checkPropTypes(contextTypes, context, 'context', name);
     }
 
     // Cache unmasked context so we can avoid recreating masked context unless necessary.
@@ -229,18 +223,7 @@ function processChildContext(
     }
     if (__DEV__) {
       const name = getComponentName(type) || 'Unknown';
-      checkPropTypes(
-        childContextTypes,
-        childContext,
-        'child context',
-        name,
-        // In practice, there is one case in which we won't get a stack. It's when
-        // somebody calls unstable_renderSubtreeIntoContainer() and we process
-        // context from the parent component instance. The stack will be missing
-        // because it's outside of the reconciliation, and so the pointer has not
-        // been set. This is rare and doesn't matter. We'll also remove that API.
-        getCurrentFiberStackInDev,
-      );
+      checkPropTypes(childContextTypes, childContext, 'child context', name);
     }
 
     return {...parentContext, ...childContext};
diff --git a/packages/react-server/package.json b/packages/react-server/package.json
@@ -30,8 +30,7 @@
   },
   "dependencies": {
     "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1",
-    "prop-types": "^15.6.2"
+    "object-assign": "^4.1.1"
   },
   "browserify": {
     "transform": [
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
@@ -20,7 +20,6 @@
   "homepage": "https://reactjs.org/",
   "dependencies": {
     "object-assign": "^4.1.1",
-    "prop-types": "^15.6.2",
     "react-is": "^16.8.6",
     "scheduler": "^0.18.0"
   },
diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -9,11 +9,10 @@
 
 import * as React from 'react';
 import {isForwardRef, isMemo, ForwardRef} from 'react-is';
-import describeComponentFrame from 'shared/describeComponentFrame';
 import getComponentName from 'shared/getComponentName';
 import shallowEqual from 'shared/shallowEqual';
 import invariant from 'shared/invariant';
-import checkPropTypes from 'prop-types/checkPropTypes';
+import checkPropTypes from 'shared/checkPropTypes';
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 import is from 'shared/objectIs';
 
@@ -572,13 +571,11 @@ class ReactShallowRenderer {
 
     // Inner memo component props aren't currently validated in createElement.
     if (isMemo(element) && elementType.propTypes) {
-      currentlyValidatingElement = element;
       checkPropTypes(
         elementType.propTypes,
         element.props,
         'prop',
         getComponentName(elementType),
-        getStackAddendum,
       );
     }
 
@@ -607,16 +604,12 @@ class ReactShallowRenderer {
         }
 
         if (elementType.contextTypes) {
-          currentlyValidatingElement = element;
           checkPropTypes(
             elementType.contextTypes,
             this._context,
             'context',
             getName(elementType, this._instance),
-            getStackAddendum,
           );
-
-          currentlyValidatingElement = null;
         }
 
         this._mountClassComponent(elementType, element, this._context);
@@ -801,35 +794,6 @@ class ReactShallowRenderer {
   }
 }
 
-let currentlyValidatingElement = null;
-
-function getDisplayName(element) {
-  if (element == null) {
-    return '#empty';
-  } else if (typeof element === 'string' || typeof element === 'number') {
-    return '#text';
-  } else if (typeof element.type === 'string') {
-    return element.type;
-  } else {
-    const elementType = isMemo(element) ? element.type.type : element.type;
-    return elementType.displayName || elementType.name || 'Unknown';
-  }
-}
-
-function getStackAddendum() {
-  let stack = '';
-  if (currentlyValidatingElement) {
-    const name = getDisplayName(currentlyValidatingElement);
-    const owner = currentlyValidatingElement._owner;
-    stack += describeComponentFrame(
-      name,
-      currentlyValidatingElement._source,
-      owner && getComponentName(owner.type),
-    );
-  }
-  return stack;
-}
-
 function getName(type, instance) {
   const constructor = instance && instance.constructor;
   return (
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -27,8 +27,7 @@
   },
   "dependencies": {
     "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1",
-    "prop-types": "^15.6.2"
+    "object-assign": "^4.1.1"
   },
   "browserify": {
     "transform": [
diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js
@@ -22,7 +22,7 @@ import {
   REACT_ELEMENT_TYPE,
 } from 'shared/ReactSymbols';
 import {warnAboutSpreadingKeyToJSX} from 'shared/ReactFeatureFlags';
-import checkPropTypes from 'prop-types/checkPropTypes';
+import checkPropTypes from 'shared/checkPropTypes';
 
 import ReactCurrentOwner from './ReactCurrentOwner';
 import {
@@ -31,9 +31,7 @@ import {
   cloneElement,
   jsxDEV,
 } from './ReactElement';
-import ReactDebugCurrentFrame, {
-  setCurrentlyValidatingElement,
-} from './ReactDebugCurrentFrame';
+import {setCurrentlyValidatingElement} from './ReactDebugCurrentFrame';
 
 let propTypesMisspellWarningShown;
 
@@ -213,13 +211,7 @@ function validatePropTypes(element) {
     }
     if (propTypes) {
       setCurrentlyValidatingElement(element);
-      checkPropTypes(
-        propTypes,
-        element.props,
-        'prop',
-        name,
-        ReactDebugCurrentFrame.getStackAddendum,
-      );
+      checkPropTypes(propTypes, element.props, 'prop', name);
       setCurrentlyValidatingElement(null);
     } else if (type.PropTypes !== undefined && !propTypesMisspellWarningShown) {
       propTypesMisspellWarningShown = true;
diff --git a/packages/shared/checkPropTypes.js b/packages/shared/checkPropTypes.js

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import type {`
`18`	`18`	`} from './ReactFiberSuspenseComponent';`
`19`	`19`	`import type {SuspenseContext} from './ReactFiberSuspenseContext';`
`20`	`20`
`21`		`-import checkPropTypes from 'prop-types/checkPropTypes';`
	`21`	`+import checkPropTypes from 'shared/checkPropTypes';`
`22`	`22`
`23`	`23`	`import {`
`24`	`24`	`IndeterminateComponent,`
`@@ -76,7 +76,6 @@ import {REACT_LAZY_TYPE, getIteratorFn} from 'shared/ReactSymbols';`
`76`	`76`	`import {`
`77`	`77`	`setCurrentPhase,`
`78`	`78`	`getCurrentFiberOwnerNameInDevOrNull,`
`79`		`- getCurrentFiberStackInDev,`
`80`	`79`	`} from './ReactCurrentFiber';`
`81`	`80`	`import {startWorkTimer, cancelWorkTimer} from './ReactDebugFiberPerf';`
`82`	`81`	`import {`
`@@ -298,7 +297,6 @@ function updateForwardRef(`
`298`	`297`	`nextProps, // Resolved props`
`299`	`298`	`'prop',`
`300`	`299`	`getComponentName(Component),`
`301`		`- getCurrentFiberStackInDev,`
`302`	`300`	`);`
`303`	`301`	`}`
`304`	`302`	`}`
`@@ -416,7 +414,6 @@ function updateMemoComponent(`
`416`	`414`	`nextProps, // Resolved props`
`417`	`415`	`'prop',`
`418`	`416`	`getComponentName(type),`
`419`		`- getCurrentFiberStackInDev,`
`420`	`417`	`);`
`421`	`418`	`}`
`422`	`419`	`}`
`@@ -444,7 +441,6 @@ function updateMemoComponent(`
`444`	`441`	`nextProps, // Resolved props`
`445`	`442`	`'prop',`
`446`	`443`	`getComponentName(type),`
`447`		`- getCurrentFiberStackInDev,`
`448`	`444`	`);`
`449`	`445`	`}`
`450`	`446`	`}`
`@@ -503,7 +499,6 @@ function updateSimpleMemoComponent(`
`503`	`499`	`nextProps, // Resolved (SimpleMemoComponent has no defaultProps)`
`504`	`500`	`'prop',`
`505`	`501`	`getComponentName(outerMemoType),`
`506`		`- getCurrentFiberStackInDev,`
`507`	`502`	`);`
`508`	`503`	`}`
`509`	`504`	`// Inner propTypes will be validated in the function component path.`
`@@ -628,7 +623,6 @@ function updateFunctionComponent(`
`628`	`623`	`nextProps, // Resolved props`
`629`	`624`	`'prop',`
`630`	`625`	`getComponentName(Component),`
`631`		`- getCurrentFiberStackInDev,`
`632`	`626`	`);`
`633`	`627`	`}`
`634`	`628`	`}`
`@@ -795,7 +789,6 @@ function updateClassComponent(`
`795`	`789`	`nextProps, // Resolved props`
`796`	`790`	`'prop',`
`797`	`791`	`getComponentName(Component),`
`798`		`- getCurrentFiberStackInDev,`
`799`	`792`	`);`
`800`	`793`	`}`
`801`	`794`	`}`
`@@ -1200,7 +1193,6 @@ function mountLazyComponent(`
`1200`	`1193`	`resolvedProps, // Resolved for outer only`
`1201`	`1194`	`'prop',`
`1202`	`1195`	`getComponentName(Component),`
`1203`		`- getCurrentFiberStackInDev,`
`1204`	`1196`	`);`
`1205`	`1197`	`}`
`1206`	`1198`	`}`
`@@ -2636,13 +2628,7 @@ function updateContextProvider(`
`2636`	`2628`	`const providerPropTypes = workInProgress.type.propTypes;`
`2637`	`2629`
`2638`	`2630`	`if (providerPropTypes) {`
`2639`		`- checkPropTypes(`
`2640`		`- providerPropTypes,`
`2641`		`- newProps,`
`2642`		`- 'prop',`
`2643`		`- 'Context.Provider',`
`2644`		`- getCurrentFiberStackInDev,`
`2645`		`- );`
	`2631`	`+ checkPropTypes(providerPropTypes, newProps, 'prop', 'Context.Provider');`
`2646`	`2632`	`}`
`2647`	`2633`	`}`
`2648`	`2634`
`@@ -3222,7 +3208,6 @@ function beginWork(`
`3222`	`3208`	`resolvedProps, // Resolved for outer only`
`3223`	`3209`	`'prop',`
`3224`	`3210`	`getComponentName(type),`
`3225`		`- getCurrentFiberStackInDev,`
`3226`	`3211`	`);`
`3227`	`3212`	`}`
`3228`	`3213`	`}`