uses getFromPropTypesModule consistently (hack)

brigand · Dec 30, 2017 · 0a676d5 · 0a676d5
1 parent 342bca7
commit 0a676d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/index.js b/src/index.js
@@ -6,7 +6,7 @@ import {
   hasReactElementTypeAnnotationReturn,
 } from './util';
 import convertToPropTypes from './convertToPropTypes';
-import {makePropTypesAstForExport, makePropTypesAstForPropTypesAssignment} from './makePropTypesAst';
+import {makePropTypesAstForExport, makePropTypesAstForPropTypesAssignment, setMakePropTypeImportNode} from './makePropTypesAst';
 
 // maps between type alias name to prop types
 let internalTypes = {};
@@ -329,6 +329,9 @@ module.exports = function flowReactPropTypes(babel) {
         importedTypes = {};
         exportedTypes = {};
         addedImports = {};
+
+        setMakePropTypeImportNode(() => getFromPropTypesModule(path));
+
         suppress = false;
         omitRuntimeTypeExport = opts.omitRuntimeTypeExport || false;
         const directives = path.node.directives;

diff --git a/src/makePropTypesAst.js b/src/makePropTypesAst.js
@@ -2,7 +2,12 @@ import {$debug, makeLiteral, PLUGIN_NAME} from './util';
 import * as t from 'babel-types';
 import template from 'babel-template';
 
-const USE_PROPTYPES_PACKAGE = true;
+function makePropTypeImportNode() {
+  return t.callExpression(t.identifier('require'), [makeLiteral('prop-types')]);
+}
+export function setMakePropTypeImportNode(fn) {
+  makePropTypeImportNode = fn;
+}
 
 const dontSetTemplate = template(`
 (props, propName, componentName) => {
@@ -200,15 +205,6 @@ function makeObjectAstForShape(propTypeData) {
   return t.objectExpression(rootProperties);
 }
 
-function makePropTypeImportNode() {
-  if (USE_PROPTYPES_PACKAGE) {
-    return t.callExpression(t.identifier('require'), [makeLiteral('prop-types')]);
-  }
-  else {
-    const reactNode = t.callExpression(t.identifier('require'), [makeLiteral('react')]);
-    return t.memberExpression(reactNode, t.identifier('PropTypes'));
-  }
-}
 function makeFunctionCheckAST(variableNode) {
   return t.binaryExpression('===', t.unaryExpression('typeof', variableNode), t.stringLiteral('function'));
 }