Skip to content

Commit 9d70807

Browse files
committed
Merge branch 'main' into rfc-100-part1
* main: (248 commits) Revert "chore: remove metascraper (eslint#17707)" (eslint#17708) 8.53.0 Build: changelog update for 8.53.0 chore: remove metascraper (eslint#17707) chore: Update dependencies (eslint#17706) chore: package.json update for @eslint/js release docs: change position of return to top button (eslint#17688) feat: Deprecate formatting rules (eslint#17696) test: fix ESLint tests for caching (eslint#17699) feat: Add suggestions for no-prototype-builtins (eslint#17677) docs: update twitter icon to new X icon (eslint#17687) fix: ensure that exit code for fatal errors is not overwritten (eslint#17683) docs: Update README docs: Fix tabs in rule examples (eslint#17653) docs: explained rule fixers and suggestions (eslint#17657) ci: bump actions/setup-node from 3 to 4 (eslint#17676) fix: add `;` after JSX nodes in `no-object-constructor` autofix (eslint#17672) ci: run tests in Node.js 21 (eslint#17673) 8.52.0 Build: changelog update for 8.52.0 ...
2 parents 8518c04 + 5454c22 commit 9d70807

File tree

488 files changed

+32111
-6688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

488 files changed

+32111
-6688
lines changed

.eslintrc.js

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
* Internally, ESLint is using the eslint.config.js file to lint itself.
77
* This file is needed too, because:
88
*
9-
* 1. There are tests that expect .eslintrc.js to be present to actually run.
10-
* 2. ESLint VS Code extension expects eslintrc config files to be
9+
* 1. ESLint VS Code extension expects eslintrc config files to be
1110
* present to work correctly.
1211
*
1312
* Once we no longer need to support both eslintrc and flat config, we will
@@ -63,21 +62,11 @@ module.exports = {
6362
"internal-rules"
6463
],
6564
extends: [
66-
"eslint"
65+
"eslint/eslintrc"
6766
],
6867
parserOptions: {
6968
ecmaVersion: 2021
7069
},
71-
72-
/*
73-
* it fixes eslint-plugin-jsdoc's reports: "Invalid JSDoc tag name "template" jsdoc/check-tag-names"
74-
* refs: https://github.com/gajus/eslint-plugin-jsdoc#check-tag-names
75-
*/
76-
settings: {
77-
jsdoc: {
78-
mode: "typescript"
79-
}
80-
},
8170
rules: {
8271
"internal-rules/multiline-comment-style": "error"
8372
},
@@ -96,9 +85,6 @@ module.exports = {
9685
"plugin:eslint-plugin/rules-recommended"
9786
],
9887
rules: {
99-
"eslint-plugin/no-missing-message-ids": "error",
100-
"eslint-plugin/no-unused-message-ids": "error",
101-
"eslint-plugin/prefer-message-ids": "error",
10288
"eslint-plugin/prefer-placeholders": "error",
10389
"eslint-plugin/prefer-replace-text": "error",
10490
"eslint-plugin/report-message-format": ["error", "[^a-z].*\\.$"],
@@ -119,7 +105,6 @@ module.exports = {
119105
"plugin:eslint-plugin/tests-recommended"
120106
],
121107
rules: {
122-
"eslint-plugin/prefer-output-null": "error",
123108
"eslint-plugin/test-case-property-ordering": "error",
124109
"eslint-plugin/test-case-shorthand-strings": "error"
125110
}

.github/workflows/add-to-triage.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
name: Verify Files
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
17-
- uses: actions/setup-node@v3
16+
- uses: actions/checkout@v4
17+
- uses: actions/setup-node@v4
1818
with:
1919
node-version: 'lts/*'
2020
- name: Install Packages
@@ -45,16 +45,16 @@ jobs:
4545
strategy:
4646
matrix:
4747
os: [ubuntu-latest]
48-
node: [20.x, 19.x, 18.x, 17.x, 16.x, 14.x, 12.x, "12.22.0"]
48+
node: [21.x, 20.x, 19.x, 18.x, 17.x, 16.x, 14.x, 12.x, "12.22.0"]
4949
include:
5050
- os: windows-latest
5151
node: "lts/*"
5252
- os: macOS-latest
5353
node: "lts/*"
5454
runs-on: ${{ matrix.os }}
5555
steps:
56-
- uses: actions/checkout@v3
57-
- uses: actions/setup-node@v3
56+
- uses: actions/checkout@v4
57+
- uses: actions/setup-node@v4
5858
with:
5959
node-version: ${{ matrix.node }}
6060
- name: Install Packages
@@ -68,13 +68,19 @@ jobs:
6868
name: Browser Test
6969
runs-on: ubuntu-latest
7070
steps:
71-
- uses: actions/checkout@v3
72-
- uses: actions/setup-node@v3
71+
- uses: actions/checkout@v4
72+
- uses: actions/setup-node@v4
7373
with:
7474
node-version: '16'
7575
- name: Install Packages
7676
run: npm install
7777
- name: Test
78-
run: node Makefile karma
78+
run: node Makefile wdio
7979
- name: Fuzz Test
8080
run: node Makefile fuzz
81+
- uses: actions/upload-artifact@v3
82+
if: failure()
83+
with:
84+
name: logs
85+
path: |
86+
wdio-logs/*.log

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Checkout repository
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343

4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL

.github/workflows/update-readme.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Check out repo
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
with:
1414
token: ${{ secrets.WORKFLOW_PUSH_BOT_TOKEN }}
1515

1616
- name: Set up Node.js
17-
uses: actions/setup-node@v3
17+
uses: actions/setup-node@v4
1818

1919
- name: Install npm packages
2020
run: npm install

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
test.js
44
coverage/
55
build/
6+
logs
7+
wdio-logs
68
npm-debug.log
79
yarn-error.log
810
.pnpm-debug.log

0 commit comments

Comments
 (0)