resolve conflicts

Author: kimtaejin3

.eslintrc

@@ -22,61 +22,61 @@
 		"object-shorthand": [2, "always", {
 			"ignoreConstructors": false,
 			"avoidQuotes": false, // this is the override vs airbnb
-			}],
-			"max-len": [2, 120, {
-				"ignoreStrings": true,
-				"ignoreTemplateLiterals": true,
-				"ignoreComments": true,
-				}],
-				"consistent-return": 0,
+    }],
+    "max-len": [2, 140, {
+      "ignoreStrings": true,
+      "ignoreTemplateLiterals": true,
+      "ignoreComments": true,
+    }],
+    "consistent-return": 0,
 
-				"prefer-destructuring": [2, { "array": false, "object": false }, { "enforceForRenamedProperties": false }],
-				"prefer-object-spread": 0, // until node 8 is required
-				"prefer-rest-params": 0, // until node 6 is required
-				"prefer-spread": 0, // until node 6 is required
-				"function-call-argument-newline": 1, // TODO: enable
-				"function-paren-newline": 0,
-				"no-plusplus": [2, {"allowForLoopAfterthoughts": true}],
-				"no-param-reassign": 1,
-				"no-restricted-syntax": [2, {
-					"selector": "ObjectPattern",
-					"message": "Object destructuring is not compatible with Node v4"
-					}],
-					"strict": [2, "safe"],
-					"valid-jsdoc": [2, {
-						"requireReturn": false,
-						"requireParamDescription": false,
-						"requireReturnDescription": false,
-						}],
+    "prefer-destructuring": [2, { "array": false, "object": false }, { "enforceForRenamedProperties": false }],
+    "prefer-object-spread": 0, // until node 8 is required
+    "prefer-rest-params": 0, // until node 6 is required
+    "prefer-spread": 0, // until node 6 is required
+    "function-call-argument-newline": 1, // TODO: enable
+    "function-paren-newline": 0,
+    "no-plusplus": [2, {"allowForLoopAfterthoughts": true}],
+    "no-param-reassign": 1,
+    "no-restricted-syntax": [2, {
+      "selector": "ObjectPattern",
+      "message": "Object destructuring is not compatible with Node v4"
+    }],
+    "strict": [2, "safe"],
+    "valid-jsdoc": [2, {
+      "requireReturn": false,
+      "requireParamDescription": false,
+      "requireReturnDescription": false,
+    }],
 
-						"eslint-plugin/consistent-output": 0,
-						"eslint-plugin/require-meta-docs-description": [2, { "pattern": "^(Enforce|Require|Disallow)" }],
-						"eslint-plugin/require-meta-schema": 0,
-						"eslint-plugin/require-meta-type": 0
-					},
-					"overrides": [
-						{
-							"files": "tests/**",
-							"rules": {
-								"no-template-curly-in-string": 1,
-							},
-						},
-						{
-							"files": "markdown.config.js",
-							"rules": {
-								"no-console": 0,
-							},
-						},
-						{
-							"files": ".github/workflows/*.js",
-							"parserOptions": {
-								"ecmaVersion": 2019,
-							},
-							"rules": {
-								"camelcase": 0,
-								"no-console": 0,
-								"no-restricted-syntax": 0,
-							},
-						},
-					],
-				}
+    "eslint-plugin/consistent-output": 0,
+    "eslint-plugin/require-meta-docs-description": [2, { "pattern": "^(Enforce|Require|Disallow)" }],
+    "eslint-plugin/require-meta-schema": 0,
+    "eslint-plugin/require-meta-type": 0
+  },
+  "overrides": [
+    {
+      "files": "tests/**",
+      "rules": {
+        "no-template-curly-in-string": 1,
+      },
+    },
+    {
+      "files": "markdown.config.js",
+      "rules": {
+        "no-console": 0,
+      },
+    },
+    {
+      "files": ".github/workflows/*.js",
+      "parserOptions": {
+        "ecmaVersion": 2019,
+      },
+      "rules": {
+        "camelcase": 0,
+        "no-console": 0,
+        "no-restricted-syntax": 0,
+      },
+    },
+  ],
+}

CHANGELOG.md

@@ -5,10 +5,15 @@ This change log adheres to standards from [Keep a CHANGELOG](https://keepachange
 
 ## Unreleased
 
+### Added
+
+* [`jsx-closing-tag-location`]: add `line-aligned` option ([#3777] @kimtaejin3)
+
 ### Fixed
 
 * [`prop-types`]: fix `className` missing in prop validation false negative ([#3749] @akulsr0)
 
+[#3777]: https://github.com/jsx-eslint/eslint-plugin-react/pull/3777
 [#3749]: https://github.com/jsx-eslint/eslint-plugin-react/pull/3749
 
 ## [7.34.3] - 2024.06.18

docs/rules/jsx-closing-tag-location.md

@@ -109,6 +109,10 @@ const App = <Bar>
 	Foo
 </Bar>;
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> b381547982addc145bd58a184a18e4e6665d2b03
 ```
 
 ## When Not To Use It

lib/rules/forbid-elements.js

@@ -5,7 +5,7 @@
 
 'use strict';
 
-const has = require('object.hasown/polyfill')();
+const has = require('hasown');
 const docsUrl = require('../util/docsUrl');
 const getText = require('../util/eslint').getText;
 const isCreateElement = require('../util/isCreateElement');
@@ -60,6 +60,7 @@ module.exports = {
     const configuration = context.options[0] || {};
     const forbidConfiguration = configuration.forbid || [];
 
+    /** @type {Record<string, { element: string, message?: string }>} */
     const indexedForbidConfigs = {};
 
     forbidConfiguration.forEach((item) => {

lib/rules/jsx-closing-bracket-location.js

@@ -5,7 +5,9 @@
 
 'use strict';
 
-const has = require('object.hasown/polyfill')();
+const has = require('hasown');
+const repeat = require('string.prototype.repeat');
+
 const docsUrl = require('../util/docsUrl');
 const getSourceCode = require('../util/eslint').getSourceCode;
 const report = require('../util/report');
@@ -168,7 +170,7 @@ module.exports = {
     function getIndentation(tokens, expectedLocation, correctColumn) {
       const newColumn = correctColumn || 0;
       let indentation;
-      let spaces = [];
+      let spaces = '';
       switch (expectedLocation) {
         case 'props-aligned':
           indentation = /^\s*/.exec(getSourceCode(context).lines[tokens.lastProp.firstLine - 1])[0];
@@ -182,9 +184,9 @@ module.exports = {
       }
       if (indentation.length + 1 < newColumn) {
         // Non-whitespace characters were included in the column offset
-        spaces = new Array(+correctColumn + 1 - indentation.length);
+        spaces = repeat(' ', +correctColumn + 1 - indentation.length);
       }
-      return indentation + spaces.join(' ');
+      return indentation + spaces;
     }
 
     /**

lib/rules/jsx-closing-tag-location.js

@@ -5,7 +5,9 @@
 
 'use strict';
 
-const has = require('object.hasown/polyfill')();
+const repeat = require('string.prototype.repeat');
+const has = require('hasown');
+
 const astUtil = require('../util/ast');
 const docsUrl = require('../util/docsUrl');
 const getSourceCode = require('../util/eslint').getSourceCode;
@@ -109,7 +111,7 @@ module.exports = {
         node,
         loc: node.loc,
         fix(fixer) {
-          const indent = Array(getIndentation(openingStartOfLine, opening)).join(' ');
+          const indent = repeat(' ', getIndentation(openingStartOfLine, opening));
 
           if (astUtil.isNodeFirstInLine(context, node)) {
             return fixer.replaceTextRange(

lib/rules/jsx-curly-spacing.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-const has = require('object.hasown/polyfill')();
+const has = require('hasown');
 const docsUrl = require('../util/docsUrl');
 const getSourceCode = require('../util/eslint').getSourceCode;
 const report = require('../util/report');

lib/rules/jsx-indent-props.js

@@ -30,6 +30,8 @@
 
 'use strict';
 
+const repeat = require('string.prototype.repeat');
+
 const astUtil = require('../util/ast');
 const docsUrl = require('../util/docsUrl');
 const getText = require('../util/eslint').getText;
@@ -130,7 +132,8 @@ module.exports = {
         data: msgContext,
         fix(fixer) {
           return fixer.replaceTextRange([node.range[0] - node.loc.start.column, node.range[0]],
-            Array(needed + 1).join(indentType === 'space' ? ' ' : '\t'));
+            repeat(indentType === 'space' ? ' ' : '\t', needed + 1)
+          );
         },
       });
     }

lib/rules/jsx-indent.js

@@ -31,6 +31,7 @@
 'use strict';
 
 const matchAll = require('string.prototype.matchall');
+const repeat = require('string.prototype.repeat');
 
 const astUtil = require('../util/ast');
 const docsUrl = require('../util/docsUrl');
@@ -109,7 +110,7 @@ module.exports = {
      * @private
      */
     function getFixerFunction(node, needed) {
-      const indent = Array(needed + 1).join(indentChar);
+      const indent = repeat(indentChar, needed + 1);
 
       if (node.type === 'JSXText' || node.type === 'Literal') {
         return function fix(fixer) {

lib/rules/jsx-max-depth.js

@@ -5,7 +5,7 @@
 
 'use strict';
 
-const has = require('object.hasown/polyfill')();
+const has = require('hasown');
 const includes = require('array-includes');
 const variableUtil = require('../util/variable');
 const jsxUtil = require('../util/jsx');