Skip to content

Commit

Permalink
chore: use eslint v9 and flat config (#347)
Browse files Browse the repository at this point in the history
  • Loading branch information
ota-meshi committed Jun 23, 2024
1 parent d5a1bb9 commit 3538d59
Show file tree
Hide file tree
Showing 36 changed files with 548 additions and 376 deletions.
25 changes: 0 additions & 25 deletions .eslintignore

This file was deleted.

9 changes: 0 additions & 9 deletions .eslintrc.for-vscode.js

This file was deleted.

13 changes: 13 additions & 0 deletions .eslintrc.for-vscode.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import base from "./eslint.config.mjs";
import eslintRuleTester from "eslint-plugin-eslint-rule-tester";

export default [
...base,
{
files: ["tests/src/rules/**/*.ts"],
plugins: { "eslint-rule-tester": eslintRuleTester },
rules: {
"eslint-rule-tester/valid-testcase": "error",
},
},
];
134 changes: 0 additions & 134 deletions .eslintrc.js

This file was deleted.

33 changes: 19 additions & 14 deletions .github/workflows/NodeCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- name: Install Packages
run: npm install -f
run: npm install
- name: Build
run: npm run build
- name: Lint
Expand Down Expand Up @@ -52,22 +52,22 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x, 14.x, 16.x, 17.x, 18.x, 20.x]
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install Packages
run: npm install -f
run: npm install
- name: Test
run: npm test
test-with-eslint6:
test-with-eslint8:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
node-version: [12.x, 14.x, 16.x, 17.x]
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
Expand All @@ -76,22 +76,29 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: Install Target Packages
run: |+
npm i -D eslint@6 mocha@7
npm i -D eslint@8
npx rimraf node_modules
npm install
- name: Install Packages
run: npm install
- name: Test
run: npm test
test-with-eslint9:
test-with-eslint6:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v4
- name: Use Node.js
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install Target Packages
run: |+
npm i -D eslint@^9.0.0-0 --legacy-peer-deps
npm i -D eslint@6 mocha@7
npx rimraf node_modules
npm install --legacy-peer-deps
npm install
- name: Test
run: npm test
test-with-eslint7:
Expand All @@ -107,18 +114,16 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: Install Target Packages
run: |+
npm i -D eslint@7 --legacy-peer-deps
npm i -D eslint@7
npx rimraf node_modules
npm install --legacy-peer-deps
npm install
- name: Test
run: npm test
test-and-coverage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 14.x
- name: Install Packages
run: npm install
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0
- name: Setup Node.js 16
- name: Setup Node.js
uses: actions/setup-node@v4
- name: Install Dependencies
run: npm install -f
Expand Down
3 changes: 2 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
package-lock=false
package-lock=false
force=true
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"yaml"
],
"eslint.options": {
"overrideConfigFile": "./.eslintrc.for-vscode.js"
"overrideConfigFile": "./.eslintrc.for-vscode.mjs"
},
"typescript.validate.enable": true,
"javascript.validate.enable": false,
Expand Down
2 changes: 2 additions & 0 deletions conf/eslint-all.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// @ts-nocheck
"use strict";

const getCoreRules = require("./rules");

const allRules = {};
Expand Down
2 changes: 2 additions & 0 deletions conf/eslint-recommended.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// @ts-nocheck
"use strict";

const getCoreRules = require("./rules");

const rules = {};
Expand Down
2 changes: 2 additions & 0 deletions conf/rules.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// @ts-nocheck
"use strict";

let ruleMap;

/** Get all rules */
Expand Down
7 changes: 0 additions & 7 deletions docs/.vitepress/.eslintrc.js

This file was deleted.

6 changes: 4 additions & 2 deletions docs/.vitepress/shim/rules/auto.mjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { getSourceCode } from "eslint-compat-utils";
// eslint-disable-next-line n/no-missing-import -- The file path used is the actual rule path
import { createRule } from "../utils";
export default createRule("auto", {
Expand All @@ -15,11 +16,12 @@ export default createRule("auto", {
type: "suggestion",
},
create(context) {
if (!context.parserServices.isJSON) {
const sourceCode = getSourceCode(context);
if (!sourceCode.parserServices.isJSON) {
return {};
}
context.report({
node: context.getSourceCode().ast,
node: sourceCode.ast,
loc: {
line: 1,
column: 0,
Expand Down
Loading

0 comments on commit 3538d59

Please sign in to comment.