Add import statement when there is any undefined scope variable

WordPress · Feb 20, 2019 · de7c852 · de7c852
1 parent d07d960
commit de7c852
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/packages/babel-plugin-import-jsx-pragma/src/index.js b/packages/babel-plugin-import-jsx-pragma/src/index.js
@@ -44,6 +44,13 @@ export default function( babel ) {
 		visitor: {
 			JSXElement( path, state ) {
 				state.hasJSX = true;
+				if ( state.hasUndeclaredScopeVariable ) {
+					return;
+				}
+
+				const { scopeVariable } = getOptions( state );
+
+				state.hasUndeclaredScopeVariable = ! path.scope.hasBinding( scopeVariable );
 			},
 			ImportDeclaration( path, state ) {
 				if ( state.hasImportedScopeVariable ) {
@@ -69,18 +76,9 @@ export default function( babel ) {
 					}
 				} );
 			},
-			VariableDeclaration( path, state ) {
-				if ( state.hasDeclaredScopeVariable ) {
-					return;
-				}
-
-				const { scopeVariable } = getOptions( state );
-
-				state.hasDeclaredScopeVariable = ! path.scope.parent && path.scope.hasOwnBinding( scopeVariable );
-			},
 			Program: {
 				exit( path, state ) {
-					if ( ! state.hasJSX || state.hasImportedScopeVariable || state.hasDeclaredScopeVariable ) {
+					if ( ! state.hasJSX || state.hasImportedScopeVariable || ! state.hasUndeclaredScopeVariable ) {
 						return;
 					}