Merge branch 'master' of https://github.com/caesar1030/eslint-plugin-…

…react
jsx-eslint · Dec 3, 2023 · de82efe · de82efe
2 parents a7287a2 + 3c11201
commit de82efe
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 84 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,11 @@ This change log adheres to standards from [Keep a CHANGELOG](https://keepachange
 
 ### Fixed
 * [`require-default-props`]: fix config schema ([#3605][] @controversial)
+* [`jsx-curly-brace-presence`]: Revert [#3538][] due to issues with intended string type casting usage ([#3611][] @taozhou-glean)
+* [`sort-prop-types`]: ensure sort-prop-types respects noSortAlphabetically ([#3610][] @caesar1030)
 
+[#3611]: https://github.com/jsx-eslint/eslint-plugin-react/pull/3611
+[#3610]: https://github.com/jsx-eslint/eslint-plugin-react/pull/3610
 [#3605]: https://github.com/jsx-eslint/eslint-plugin-react/pull/3605
 
 ## [7.33.0] - 2023.07.19

diff --git a/lib/rules/jsx-curly-brace-presence.js b/lib/rules/jsx-curly-brace-presence.js
@@ -131,10 +131,6 @@ module.exports = {
       return containsLineTerminators(text) && text.trim() === '';
     }
 
-    function isSingleExpressionTemplateLiteral(child) {
-      return child.type === 'TemplateLiteral' && child.expressions.length === 1 && child.quasis.map((quasis) => quasis.value.raw).join('') === '';
-    }
-
     function wrapNonHTMLEntities(text) {
       const HTML_ENTITY = '<HTML_ENTITY>';
       const withCurlyBraces = text.split(HTML_ENTITY_REGEX()).map((word) => (
@@ -181,9 +177,6 @@ module.exports = {
           if (jsxUtil.isJSX(expression)) {
             const sourceCode = context.getSourceCode();
             textToReplace = sourceCode.getText(expression);
-          } else if (isSingleExpressionTemplateLiteral(expression)) {
-            const sourceCode = context.getSourceCode();
-            textToReplace = `{${sourceCode.getText(expression.expressions[0])}}`;
           } else {
             const expressionType = expression && expression.type;
             const parentType = JSXExpressionNode.parent.type;
@@ -286,9 +279,6 @@ module.exports = {
         && !containsQuoteCharacters(expression.quasis[0].value.cooked)
       ) {
         reportUnnecessaryCurly(JSXExpressionNode);
-      } else if (
-        isSingleExpressionTemplateLiteral(expression)) {
-        reportUnnecessaryCurly(JSXExpressionNode);
       } else if (jsxUtil.isJSX(expression)) {
         reportUnnecessaryCurly(JSXExpressionNode);
       }

diff --git a/tests/lib/rules/default-props-match-prop-types.js b/tests/lib/rules/default-props-match-prop-types.js
@@ -789,7 +789,7 @@ ruleTester.run('default-props-match-prop-types', rule, {
           placeholder?: string,
           disabled?: boolean,
         };
-        
+
         TextField.defaultProps = {
           label: '',
           placeholder: '',
@@ -1761,12 +1761,12 @@ ruleTester.run('default-props-match-prop-types', rule, {
         export type SharedProps = {|
             disabled: boolean,
         |};
-        
+
         type Props = {|
             ...SharedProps,
             focused?: boolean,
         |};
-        
+
         class Foo extends React.Component<Props> {
             static defaultProps = {
               disabled: false

diff --git a/tests/lib/rules/destructuring-assignment.js b/tests/lib/rules/destructuring-assignment.js
@@ -857,7 +857,7 @@ ruleTester.run('destructuring-assignment', rule, {
         ],
         output: `
           function Foo({a}) {
-            
+${'            '}
             return <p>{a}</p>;
           }
         `,
@@ -878,7 +878,7 @@ ruleTester.run('destructuring-assignment', rule, {
         ],
         output: `
           function Foo({a}: FooProps) {
-            
+${'            '}
             return <p>{a}</p>;
           }
         `,

diff --git a/tests/lib/rules/display-name.js b/tests/lib/rules/display-name.js
@@ -543,15 +543,15 @@ ruleTester.run('display-name', rule, {
               name: 'Bob',
             },
           ];
-        
+
           const columns = [
             {
               Header: 'Name',
               accessor: 'name',
               Cell: ({ value }) => <div>{value}</div>,
             },
           ];
-        
+
           return <ReactTable columns={columns} data={data} />;
         }
       `,
@@ -576,15 +576,15 @@ ruleTester.run('display-name', rule, {
                 name: 'Bob',
               },
             ];
-        
+
             const columns = [
               {
                 Header: 'Name',
                 accessor: 'name',
                 Cell: ({ value }) => <div>{value}</div>,
               },
             ];
-        
+
             return <ReactTable columns={columns} data={data} />;
           }
         }
@@ -660,7 +660,7 @@ ruleTester.run('display-name', rule, {
         function MyComponent(props) {
           return <b>{props.name}</b>;
         }
-            
+
         const MemoizedMyComponent = React.memo(
           MyComponent,
           (prevProps, nextProps) => prevProps.name === nextProps.name
@@ -1284,11 +1284,11 @@ ruleTester.run('display-name', rule, {
           const data = processData({ value: 'data' });
           return <div>{data}</div>;
         });
-        
+
         export const Component2 = observer(() => {
           const data = processData();
           return <div>{data}</div>;
-        });      
+        });
       `,
       features: ['optional chaining', 'types'],
       settings: { componentWrapperFunctions: ['observer'] },

diff --git a/tests/lib/rules/function-component-definition.js b/tests/lib/rules/function-component-definition.js
@@ -1144,7 +1144,7 @@ ruleTester.run('function-component-definition', rule, {
             </div>
           )
         }
-        
+
         export default IndexPage;
       `,
       output: `
@@ -1157,7 +1157,7 @@ ruleTester.run('function-component-definition', rule, {
             </div>
           )
         }
-        
+
         export default IndexPage;
       `,
       options: [{ namedComponents: ['function-declaration'] }],

diff --git a/tests/lib/rules/jsx-curly-brace-presence.js b/tests/lib/rules/jsx-curly-brace-presence.js
@@ -469,13 +469,14 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       features: ['no-ts'],
       options: ['never'],
     },
+    // legit as this single template literal might be used for stringifying
     {
-      code: '<App label={`${label}${suffix}`} />',
-      options: [{ props: 'never' }],
+      code: '<App label={`${label}`} />',
+      options: ['never'],
     },
     {
-      code: '<App>{`${label}${suffix}`}</App>',
-      options: [{ children: 'never' }],
+      code: '<App>{`${label}`}</App>',
+      options: ['never'],
     }
   )),
 
@@ -786,23 +787,23 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
     },
     {
       code: `
-        <App prop="    
-           a     
+        <App prop="${'    '}
+           a${'     '}
              b      c
                 d
         ">
           a
-              b     c   
-                 d      
+              b     c${'   '}
+                 d${'      '}
         </App>
       `,
       errors: [
         { messageId: 'missingCurly' }, { messageId: 'missingCurly' },
       ],
       options: ['always'],
       output: `
-        <App prop="    
-           a     
+        <App prop="${'    '}
+           a${'     '}
              b      c
                 d
         ">
@@ -814,23 +815,23 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
     },
     {
       code: `
-        <App prop='    
-           a     
+        <App prop='${'    '}
+           a${'     '}
              b      c
                 d
         '>
           a
-              b     c   
-                 d      
+              b     c${'   '}
+                 d${'      '}
         </App>
       `,
       errors: [
         { messageId: 'missingCurly' }, { messageId: 'missingCurly' },
       ],
       options: ['always'],
       output: `
-        <App prop='    
-           a     
+        <App prop='${'    '}
+           a${'     '}
              b      c
                 d
         '>
@@ -939,18 +940,6 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       errors: [{ messageId: 'unnecessaryCurly' }],
       options: [{ props: 'never', children: 'never', propElementValues: 'never' }],
       features: ['no-ts'],
-    },
-    {
-      code: '<App label={`${label}`} />',
-      output: '<App label={label} />',
-      errors: [{ messageId: 'unnecessaryCurly' }],
-      options: [{ props: 'never', children: 'never', propElementValues: 'never' }],
-    },
-    {
-      code: '<App>{`${label}`}</App>',
-      output: '<App>{label}</App>',
-      errors: [{ messageId: 'unnecessaryCurly' }],
-      options: [{ props: 'never', children: 'never', propElementValues: 'never' }],
     }
   )),
 });
diff --git a/tests/lib/rules/jsx-first-prop-new-line.js b/tests/lib/rules/jsx-first-prop-new-line.js
@@ -49,7 +49,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
     {
       code: `
         <Foo a
-          b 
+          b
         />
       `,
       options: ['never'],
@@ -109,7 +109,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
     },
     {
       code: `
-        <Foo 
+        <Foo
           foo={{
           }}
           bar

diff --git a/tests/lib/rules/jsx-indent.js b/tests/lib/rules/jsx-indent.js
@@ -45,7 +45,7 @@ ruleTester.run('jsx-indent', rule, {
     {
       code: `
         <App>
-        </App> 
+        </App>
       `,
     },
     {
@@ -1183,21 +1183,21 @@ const Component = () => (
           state = {
             name: '',
           }
-        
+
           componentDidMount() {
             this.fetchName()
               .then(name => {
                 this.setState({name})
               });
           }
-        
+
           fetchName = () => {
             const url = 'https://api.github.com/users/job13er'
             return fetch(url)
               .then(resp => resp.json())
               .then(json => json.name)
           }
-        
+
           render() {
             const {name} = this.state
             return (