Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix JSX pragma anywhere in comment #14012

Merged
merged 3 commits into from Dec 2, 2021
Merged

Fix JSX pragma anywhere in comment #14012

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88bf400
Fix JSX pragma anywhere in comment
The-x-Theorist Nov 30, 2021
518c6a4
jsx regex patterns support jsx docs
The-x-Theorist Dec 1, 2021
4570add
removed extra spaces from regex patterns
The-x-Theorist Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 13 additions & 14 deletions packages/babel-plugin-transform-react-jsx/src/create-plugin.ts
View file
Open in desktop
Expand Up @@ -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}`);
Expand Down Expand Up @@ -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}*/`;
The-x-Theorist marked this conversation as resolved.
Show resolved Hide resolved

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;
Expand Down
2 changes: 2 additions & 0 deletions ...ct-jsx/test/fixtures/react/should-not-allow-jsx-pragma-to-be-anywhere-in-comment/input.js
View file
Open in desktop
@@ -0,0 +1,2 @@
// Make sure not to use a jsx pragma here (like "@jsx Something"), we need this to be React.createElement!
<blah/>
4 changes: 4 additions & 0 deletions ...t-jsx/test/fixtures/react/should-not-allow-jsx-pragma-to-be-anywhere-in-comment/output.js
View file
Open in desktop
@@ -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);