[pull] master from jsx-eslint:master

.eslint-doc-generatorrc.js

@@ -4,7 +4,7 @@ const config = {
     ['jsx-runtime', '🏃'],
     ['recommended', '☑️'],
   ],
-  ignoreConfig: ['all'],
+  ignoreConfig: ['all', 'flat'],
   urlConfigs: 'https://github.com/jsx-eslint/eslint-plugin-react/#shareable-configs',
 };
 

.eslintrc

@@ -1,82 +1,85 @@
 {
-    "root": true,
-    "extends": ["airbnb-base", "plugin:eslint-plugin/recommended"],
-    "plugins": ["eslint-plugin"],
-    "env": {
-       "es6": true,
-       "node": true
-    },
-    "parserOptions": {
-      "ecmaVersion": 6,
-      "ecmaFeatures": {
-        "jsx": true
-      },
-      "sourceType": "script",
-    },
-    "ignorePatterns": [
-      "coverage/",
-      ".nyc_output/",
-    ],
-    "rules": {
-        "comma-dangle": [2, "always-multiline"],
-        "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,
+	"root": true,
+	"extends": ["airbnb-base", "plugin:eslint-plugin/recommended"],
+	"plugins": ["eslint-plugin"],
+	"env": {
+		"es6": true,
+		"node": true
+	},
+	"parserOptions": {
+		"ecmaVersion": 6,
+		"ecmaFeatures": {
+			"jsx": true
+		},
+		"sourceType": "script",
+	},
+	"ignorePatterns": [
+		"coverage/",
+		".nyc_output/",
+		"test-published-types/",
+		"tests/fixtures/flat-config/",
+		"**/*/*.d.ts",
+	],
+	"rules": {
+		"comma-dangle": [2, "always-multiline"],
+		"object-shorthand": [2, "always", {
+			"ignoreConstructors": false,
+			"avoidQuotes": false, // this is the override vs airbnb
+    }],
+    "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
+    "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,
+      },
     },
-    "overrides": [
-      {
-        "files": "tests/**",
-        "rules": {
-          "no-template-curly-in-string": 1,
-        },
+    {
+      "files": "markdown.config.js",
+      "rules": {
+        "no-console": 0,
       },
-      {
-        "files": "markdown.config.js",
-        "rules": {
-          "no-console": 0,
-        },
+    },
+    {
+      "files": ".github/workflows/*.js",
+      "parserOptions": {
+        "ecmaVersion": 2019,
       },
-      {
-        "files": ".github/workflows/*.js",
-        "parserOptions": {
-          "ecmaVersion": 2019,
-        },
-        "rules": {
-          "camelcase": 0,
-          "no-console": 0,
-          "no-restricted-syntax": 0,
-        },
+      "rules": {
+        "camelcase": 0,
+        "no-console": 0,
+        "no-restricted-syntax": 0,
       },
-    ],
+    },
+  ],
 }

.github/workflows/node-18+.yml

@@ -26,6 +26,7 @@ jobs:
       matrix:
         node-version: ${{ fromJson(needs.matrix.outputs.latest) }}
         eslint:
+          - 9
           - 8
           - 7
           - 6
@@ -37,20 +38,78 @@ jobs:
           - 10
           - 9
           - 8
+        typescript-eslint:
+          - 5
+          - 6
+          - 7
+          - 8
+        exclude:
+          - eslint: 3
+            babel-eslint: 10
+          - eslint: 3
+            typescript-eslint: 5
+          - eslint: 4
+            typescript-eslint: 5
+          - eslint: 4.14
+            typescript-eslint: 5
+          - eslint: 5
+            typescript-eslint: 5
+          - eslint: 3
+            typescript-eslint: 6
+          - eslint: 4
+            typescript-eslint: 6
+          - eslint: 4.14
+            typescript-eslint: 6
+          - eslint: 5
+            typescript-eslint: 6
+          - eslint: 6
+            typescript-eslint: 6
+          - eslint: 9
+            typescript-eslint: 6
+          - eslint: 3
+            typescript-eslint: 7
+          - eslint: 4
+            typescript-eslint: 7
+          - eslint: 4.14
+            typescript-eslint: 7
+          - eslint: 5
+            typescript-eslint: 7
+          - eslint: 6
+            typescript-eslint: 7
+          - eslint: 7
+            typescript-eslint: 7
+          - eslint: 9
+            typescript-eslint: 7
+          - eslint: 3
+            typescript-eslint: 8
+          - eslint: 4
+            typescript-eslint: 8
+          - eslint: 4.14
+            typescript-eslint: 8
+          - eslint: 5
+            typescript-eslint: 8
+          - eslint: 6
+            typescript-eslint: 8
+          - eslint: 7
+            typescript-eslint: 8
+          - eslint: 9
+            typescript-eslint: 5
+          - node-version: 19
+            typescript-eslint: 7
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ljharb/actions/node/install@main
         name: 'nvm install ${{ matrix.node-version }} && npm install'
         with:
           node-version: ${{ matrix.node-version }}
           after_install: |
-            npm install --no-save "eslint@${{ matrix.eslint }}" "@typescript-eslint/parser@5" "babel-eslint@${{ matrix.babel-eslint }}"
+            npm install --no-save "eslint@${{ matrix.eslint }}" "@typescript-eslint/parser@${{ matrix.typescript-eslint == 8 && 8.17 || matrix.typescript-eslint }}" "babel-eslint@${{ matrix.babel-eslint }}"
         env:
-          NPM_CONFIG_LEGACY_PEER_DEPS: true
+          NPM_CONFIG_LEGACY_PEER_DEPS: "${{ matrix.typescript-eslint >= 6 && 'false' || 'true' }}"
       - run: npx ls-engines
       - run: npm run unit-test
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v3.1.5
 
   node:
     name: 'node 18+'

.github/workflows/node-minors.yml

@@ -94,20 +94,20 @@ jobs:
             eslint: 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ljharb/actions/node/install@main
         name: 'nvm install ${{ matrix.node-version }} && npm install'
         with:
           node-version: ${{ matrix.node-version }}
           after_install: |
-            npm install --no-save "eslint@${{ matrix.eslint }}" "@typescript-eslint/parser@${{ matrix.node-version >= 14 && '5' || (matrix.node-version >= 12 && '4' || (matrix.node-version >= 10 && '4.0' || (matrix.node-version >= 8 && '3' || '2'))) }}" "babel-eslint@${{ matrix.babel-eslint }}"
+            npm install --no-save "eslint@${{ matrix.eslint }}" "@typescript-eslint/parser@${{ matrix.node-version >= 18 && matrix.eslint >= 8 && '8.17' || (matrix.node-version >= 16 && matrix.eslint >= 7 && '6' || (matrix.node-version >= 14 && '5' || (matrix.node-version >= 12 && '4' || (matrix.node-version >= 10 && '4.0' || (matrix.node-version >= 8 && '3' || '2'))))) }}" "babel-eslint@${{ matrix.babel-eslint }}"
           skip-ls-check: ${{ matrix.node-version < 10 && true || false }}
         env:
-          NPM_CONFIG_LEGACY_PEER_DEPS: true
+          NPM_CONFIG_LEGACY_PEER_DEPS: "${{ matrix.node-version >= 16 && matrix.eslint >= 7 && 'false' || 'true' }}"
       - run: npx ls-engines
         if: ${{ matrix.node-version >= 12 }}
       - run: npm run unit-test
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v3.1.5
 
   node:
     name: 'node 4 - 17'

.github/workflows/node-pretest.yml

@@ -7,20 +7,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ljharb/actions/node/install@main
         name: 'nvm install lts/* && npm install'
         with:
           node-version: 'lts/*'
-        env:
-          NPM_CONFIG_LEGACY_PEER_DEPS: true
       - run: npm run pretest
 
   posttest:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ljharb/actions/node/install@main
         name: 'nvm install lts/* && npm install'
         with:

.github/workflows/npm-publish.yml

@@ -15,7 +15,7 @@ jobs:
     outputs:
       is-new-version: ${{ steps.cpv.outputs.is-new-version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.tag }}
 
@@ -63,7 +63,10 @@ jobs:
             const pending = checkSuites.filter(({ status }) => status !== 'completed')
 
             if (pending.length > 0) {
-              core.setFailed(`Some workflows for ${context.payload.inputs.tag} are still in-progress: ${JSON.stringify(pending)}`);
+              core.setFailed(`Some workflows for ${context.payload.inputs.tag} are still in-progress`);
+              pending.forEach(({ pull_requests, ...x }) => {
+                core.debug(JSON.stringify(x));
+              });
             }
 
             const result = await Promise.all(
@@ -94,16 +97,17 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - uses: step-security/harden-runner@v1
+      - uses: step-security/harden-runner@v2
         with:
           egress-policy: block
           allowed-endpoints: >
             github.com:443
             nodejs.org:443
             prod.api.stepsecurity.io:443
             registry.npmjs.org:443
+            raw.githubusercontent.com:443
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.tag }}
 

.github/workflows/rebase.yml

@@ -4,12 +4,6 @@ on: [pull_request_target]
 
 jobs:
   _:
-    name: "Automatic Rebase"
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ljharb/rebase@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    uses: ljharb/actions/.github/workflows/rebase.yml@main
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}