Fix JSX pragma anywhere in comment

babel · Nov 30, 2021 · 88bf400 · 88bf400
1 parent 29de280
commit 88bf400
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/packages/babel-plugin-transform-react-jsx/src/create-plugin.ts b/packages/babel-plugin-transform-react-jsx/src/create-plugin.ts
@@ -31,11 +31,14 @@ const DEFAULT = {
   pragmaFrag: "React.Fragment",
 };
 
-const JSX_SOURCE_ANNOTATION_REGEX = /\*?\s*@jsxImportSource\s+([^\s]+)/;
-const JSX_RUNTIME_ANNOTATION_REGEX = /\*?\s*@jsxRuntime\s+([^\s]+)/;
+const JSX_SOURCE_ANNOTATION_REGEX =
+  /^\/*\*?\/*\*\s*@jsxImportSource\s+([^\s]+)\s*\/*\*\//;
+const JSX_RUNTIME_ANNOTATION_REGEX =
+  /^\/*\*?\/*\*\s*@jsxRuntime\s+([^\s]+)\s*\/*\*\//;
 
-const JSX_ANNOTATION_REGEX = /\*?\s*@jsx\s+([^\s]+)/;
-const JSX_FRAG_ANNOTATION_REGEX = /\*?\s*@jsxFrag\s+([^\s]+)/;
+const JSX_ANNOTATION_REGEX = /^\/*\*?\/*\*\s*@jsx\s+([^\s]+)\s*\/*\*\//;
+const JSX_FRAG_ANNOTATION_REGEX =
+  /^\/*\*?\/*\*\s*@jsxFrag\s+([^\s]+)\s*\/*\*\//;
 
 const get = (pass: PluginPass, name: string) =>
   pass.get(`@babel/plugin-react-jsx/${name}`);
@@ -167,29 +170,25 @@ You can set \`throwIfNamespace: false\` to bypass this warning.`,
 
             if (file.ast.comments) {
               for (const comment of file.ast.comments) {
-                const sourceMatches = JSX_SOURCE_ANNOTATION_REGEX.exec(
-                  comment.value,
-                );
+                const value = `/*${comment.value}*/`;
+
+                const sourceMatches = JSX_SOURCE_ANNOTATION_REGEX.exec(value);
                 if (sourceMatches) {
                   source = sourceMatches[1];
                   sourceSet = true;
                 }
 
-                const runtimeMatches = JSX_RUNTIME_ANNOTATION_REGEX.exec(
-                  comment.value,
-                );
+                const runtimeMatches = JSX_RUNTIME_ANNOTATION_REGEX.exec(value);
                 if (runtimeMatches) {
                   runtime = runtimeMatches[1];
                 }
 
-                const jsxMatches = JSX_ANNOTATION_REGEX.exec(comment.value);
+                const jsxMatches = JSX_ANNOTATION_REGEX.exec(value);
                 if (jsxMatches) {
                   pragma = jsxMatches[1];
                   pragmaSet = true;
                 }
-                const jsxFragMatches = JSX_FRAG_ANNOTATION_REGEX.exec(
-                  comment.value,
-                );
+                const jsxFragMatches = JSX_FRAG_ANNOTATION_REGEX.exec(value);
                 if (jsxFragMatches) {
                   pragmaFrag = jsxFragMatches[1];
                   pragmaFragSet = true;

diff --git a/...ct-jsx/test/fixtures/react/should-not-allow-jsx-pragma-to-be-anywhere-in-comment/input.js b/...ct-jsx/test/fixtures/react/should-not-allow-jsx-pragma-to-be-anywhere-in-comment/input.js
@@ -0,0 +1,2 @@
+// Make sure not to use a jsx pragma here (like "@jsx Something"), we need this to be React.createElement!
+<blah/>
diff --git a/...t-jsx/test/fixtures/react/should-not-allow-jsx-pragma-to-be-anywhere-in-comment/output.js b/...t-jsx/test/fixtures/react/should-not-allow-jsx-pragma-to-be-anywhere-in-comment/output.js
@@ -0,0 +1,4 @@
+// Make sure not to use a jsx pragma here (like "@jsx Something"), we need this to be React.createElement!
+
+/*#__PURE__*/
+React.createElement("blah", null);