Consider jsxFrag as set when it's set to the default value (#11295)

* Consider jsxFrag as set when it's set to the default value * Test #11294
babel · Mar 20, 2020 · 87b2781 · 87b2781
1 parent bb6a158
commit 87b2781
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 2 deletions.
diff --git a/packages/babel-plugin-transform-react-jsx/src/transform-classic.js b/packages/babel-plugin-transform-react-jsx/src/transform-classic.js
@@ -53,25 +53,29 @@ export default declare((api, options) => {
 
       let pragma = PRAGMA_DEFAULT;
       let pragmaFrag = PRAGMA_FRAG_DEFAULT;
+      let pragmaSet = !!options.pragma;
+      let pragmaFragSet = !!options.pragma;
 
       if (file.ast.comments) {
         for (const comment of (file.ast.comments: Array<Object>)) {
           const jsxMatches = JSX_ANNOTATION_REGEX.exec(comment.value);
           if (jsxMatches) {
             pragma = jsxMatches[1];
+            pragmaSet = true;
           }
           const jsxFragMatches = JSX_FRAG_ANNOTATION_REGEX.exec(comment.value);
           if (jsxFragMatches) {
             pragmaFrag = jsxFragMatches[1];
+            pragmaFragSet = true;
           }
         }
       }
 
       state.set("jsxIdentifier", createIdentifierParser(pragma));
       state.set("jsxFragIdentifier", createIdentifierParser(pragmaFrag));
       state.set("usedFragment", false);
-      state.set("pragmaSet", pragma !== DEFAULT.pragma);
-      state.set("pragmaFragSet", pragmaFrag !== DEFAULT.pragmaFrag);
+      state.set("pragmaSet", pragmaSet);
+      state.set("pragmaFragSet", pragmaFragSet);
     },
     exit(path, state) {
       if (

diff --git a/...abel-plugin-transform-react-jsx/test/fixtures/regression/pragma-frag-set-default/input.js b/...abel-plugin-transform-react-jsx/test/fixtures/regression/pragma-frag-set-default/input.js
@@ -0,0 +1,3 @@
+/* @jsxFrag React.Fragment */
+/* @jsx h */
+<>Test</>;
diff --git a/...-plugin-transform-react-jsx/test/fixtures/regression/pragma-frag-set-default/options.json b/...-plugin-transform-react-jsx/test/fixtures/regression/pragma-frag-set-default/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "transform-react-jsx"
+  ]
+}
diff --git a/...bel-plugin-transform-react-jsx/test/fixtures/regression/pragma-frag-set-default/output.js b/...bel-plugin-transform-react-jsx/test/fixtures/regression/pragma-frag-set-default/output.js
@@ -0,0 +1,4 @@
+/* @jsxFrag React.Fragment */
+
+/* @jsx h */
+h(React.Fragment, null, "Test");
diff --git a/packages/babel-preset-react/test/fixtures/regression/11294/input.mjs b/packages/babel-preset-react/test/fixtures/regression/11294/input.mjs
@@ -0,0 +1,2 @@
+import React from 'react';
+const D = <></>;
diff --git a/packages/babel-preset-react/test/fixtures/regression/11294/options.json b/packages/babel-preset-react/test/fixtures/regression/11294/options.json
@@ -0,0 +1,4 @@
+{
+  "presets": [
+    ["react", { "pragma": "__jsx" }]]
+}
diff --git a/packages/babel-preset-react/test/fixtures/regression/11294/output.mjs b/packages/babel-preset-react/test/fixtures/regression/11294/output.mjs
@@ -0,0 +1,3 @@
+import React from 'react';
+
+const D = __jsx(React.Fragment, null);