Skip to content

Commit

Permalink
Merge branch 'main' into rfc-100-part1
Browse files Browse the repository at this point in the history
* 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
  ...
  • Loading branch information
bmish committed Nov 5, 2023
2 parents 8518c04 + 5454c22 commit 9d70807
Show file tree
Hide file tree
Showing 488 changed files with 32,111 additions and 6,688 deletions.
19 changes: 2 additions & 17 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
* Internally, ESLint is using the eslint.config.js file to lint itself.
* This file is needed too, because:
*
* 1. There are tests that expect .eslintrc.js to be present to actually run.
* 2. ESLint VS Code extension expects eslintrc config files to be
* 1. ESLint VS Code extension expects eslintrc config files to be
* present to work correctly.
*
* Once we no longer need to support both eslintrc and flat config, we will
Expand Down Expand Up @@ -63,21 +62,11 @@ module.exports = {
"internal-rules"
],
extends: [
"eslint"
"eslint/eslintrc"
],
parserOptions: {
ecmaVersion: 2021
},

/*
* it fixes eslint-plugin-jsdoc's reports: "Invalid JSDoc tag name "template" jsdoc/check-tag-names"
* refs: https://github.com/gajus/eslint-plugin-jsdoc#check-tag-names
*/
settings: {
jsdoc: {
mode: "typescript"
}
},
rules: {
"internal-rules/multiline-comment-style": "error"
},
Expand All @@ -96,9 +85,6 @@ module.exports = {
"plugin:eslint-plugin/rules-recommended"
],
rules: {
"eslint-plugin/no-missing-message-ids": "error",
"eslint-plugin/no-unused-message-ids": "error",
"eslint-plugin/prefer-message-ids": "error",
"eslint-plugin/prefer-placeholders": "error",
"eslint-plugin/prefer-replace-text": "error",
"eslint-plugin/report-message-format": ["error", "[^a-z].*\\.$"],
Expand All @@ -119,7 +105,6 @@ module.exports = {
"plugin:eslint-plugin/tests-recommended"
],
rules: {
"eslint-plugin/prefer-output-null": "error",
"eslint-plugin/test-case-property-ordering": "error",
"eslint-plugin/test-case-shorthand-strings": "error"
}
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/add-to-triage.yml

This file was deleted.

22 changes: 14 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
name: Verify Files
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 'lts/*'
- name: Install Packages
Expand Down Expand Up @@ -45,16 +45,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [20.x, 19.x, 18.x, 17.x, 16.x, 14.x, 12.x, "12.22.0"]
node: [21.x, 20.x, 19.x, 18.x, 17.x, 16.x, 14.x, 12.x, "12.22.0"]
include:
- os: windows-latest
node: "lts/*"
- os: macOS-latest
node: "lts/*"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Install Packages
Expand All @@ -68,13 +68,19 @@ jobs:
name: Browser Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '16'
- name: Install Packages
run: npm install
- name: Test
run: node Makefile karma
run: node Makefile wdio
- name: Fuzz Test
run: node Makefile fuzz
- uses: actions/upload-artifact@v3
if: failure()
with:
name: logs
path: |
wdio-logs/*.log
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.WORKFLOW_PUSH_BOT_TOKEN }}

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

- name: Install npm packages
run: npm install
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
test.js
coverage/
build/
logs
wdio-logs
npm-debug.log
yarn-error.log
.pnpm-debug.log
Expand Down
Loading

0 comments on commit 9d70807

Please sign in to comment.