Skip to content

Commit

Permalink
Merge branch 'main' into suggestion-fix-parse-error
Browse files Browse the repository at this point in the history
* main: (285 commits)
  8.55.0
  Build: changelog update for 8.55.0
  chore: upgrade @eslint/js@8.55.0 (eslint#17811)
  chore: package.json update for @eslint/js release
  chore: upgrade @eslint/eslintrc@2.1.4 (eslint#17799)
  feat: importNamePattern option in no-restricted-imports (eslint#17721)
  docs: fix typo `--rules` -> `--rule` (eslint#17806)
  ci: pin Node.js 21.2.0 (eslint#17809)
  chore: fix several `cli` tests to run in the intended flat config mode (eslint#17797)
  docs: remove "Open in Playground" buttons for removed rules (eslint#17791)
  docs: fix correct/incorrect examples of rules (eslint#17789)
  docs: update and fix examples for `no-unused-vars` (eslint#17788)
  docs: add specific stylistic rule for each deprecated rule (eslint#17778)
  chore: remove unused config-extends fixtures (eslint#17781)
  chore: remove formatting/stylistic rules from new rule templates (eslint#17780)
  chore: check rule examples for syntax errors (eslint#17718)
  8.54.0
  Build: changelog update for 8.54.0
  chore: upgrade @eslint/js@8.54.0 (eslint#17773)
  chore: package.json update for @eslint/js release
  ...
  • Loading branch information
bmish committed Dec 3, 2023
2 parents 62681aa + e0cb960 commit b175c4c
Show file tree
Hide file tree
Showing 563 changed files with 34,926 additions and 7,251 deletions.
19 changes: 2 additions & 17 deletions .eslintrc.js
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
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/new-rule.yml
Expand Up @@ -26,7 +26,6 @@ body:
options:
- Warns about a potential problem
- Suggests an alternate way of doing something
- Enforces a formatting/stylistic preference
validations:
required: true
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/rule-change.yml
Expand Up @@ -15,7 +15,7 @@ body:
required: true
- type: dropdown
attributes:
label: What change to do you want to make?
label: What change do you want to make?
options:
- Generate more warnings
- Generate fewer warnings
Expand Down
42 changes: 42 additions & 0 deletions .github/renovate.json5
@@ -0,0 +1,42 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
":approveMajorUpdates",
":semanticCommitScopeDisabled"
],
"ignorePresets": [":semanticPrefixFixDepsChoreOthers"],
"labels": ["dependencies"],

// Wait well over npm's three day window for any new package as a precaution against malicious publishes
// https://docs.npmjs.com/policies/unpublish/#packages-published-less-than-72-hours-ago
"minimumReleaseAge": "7 days",

"packageRules": [
{
"description": "Use the deps:actions label for github-action manager updates (this means Renovate's github-action manager).",
"addLabels": ["deps:actions"],
"matchManagers": ["github-actions"]
},
{
"description": "Use the deps:npm label for npm manager packages (this means Renovate's npm manager).",
"addLabels": ["deps:npm"],
"matchManagers": ["npm"]
},
{
"description": "Group Babel packages into a single PR.",
"groupName": "babel",
"matchPackagePrefixes": ["@babel", "babel-"]
},
{
"description": "Group wdio packages into a single PR.",
"groupName": "wdio",
"matchPackagePrefixes": ["@wdio"]
},
{
"description": "Group metascraper packages into a single PR.",
"groupName": "metascraper",
"matchPackagePrefixes": ["metascraper"]
}
]
}
18 changes: 0 additions & 18 deletions .github/workflows/add-to-triage.yml

This file was deleted.

24 changes: 16 additions & 8 deletions .github/workflows/ci.yml
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 All @@ -33,6 +33,8 @@ jobs:
run: npm run lint:scss
- name: Lint Docs JS Files
run: node Makefile lintDocsJS
- name: Check Rule Examples
run: node Makefile checkRuleExamples
- name: Build Docs Website
working-directory: docs
run: npm run build
Expand All @@ -45,16 +47,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.2.0", 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 +70,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
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
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
Expand Up @@ -3,6 +3,8 @@
test.js
coverage/
build/
logs
wdio-logs
npm-debug.log
yarn-error.log
.pnpm-debug.log
Expand Down

0 comments on commit b175c4c

Please sign in to comment.