Skip to content

Commit

Permalink
chore: use typescript-eslint v6 (#236)
Browse files Browse the repository at this point in the history
  • Loading branch information
ota-meshi authored Jul 22, 2023
1 parent 0b1bf8d commit 23f658c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
1 change: 0 additions & 1 deletion .github/workflows/GHPages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
run: yarn
- name: Build docs
run: |+
export NODE_OPTIONS=--openssl-legacy-provider
yarn docs:build
- name: Setup Pages
uses: actions/configure-pages@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/NodeCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
node-version: 14.x
- name: Install Target Packages
run: |+
yarn add -D eslint@6
yarn
yarn add -D eslint@6 --ignore-engines
yarn --ignore-engines
- name: Test
run: yarn test
test-with-eslint7:
Expand All @@ -65,8 +65,8 @@ jobs:
node-version: 14.x
- name: Install Target Packages
run: |+
yarn add -D eslint@7
yarn
yarn add -D eslint@7 --ignore-engines
yarn --ignore-engines
- name: Test
run: yarn test
test-and-coverage:
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
"build:ts": "tsc --project ./tsconfig.build.json",
"clean": "rimraf .nyc_output dist coverage",
"cover": "nyc --reporter=lcov yarn test",
"docs:build": "yarn build:ts && vuepress build docs --no-cache",
"docs:watch": "vuepress dev --debug docs",
"docs:build": "yarn build:ts && npm run vuepress -- build docs --no-cache",
"docs:watch": "npm run vuepress -- dev --debug docs",
"vuepress": "node --openssl-legacy-provider ./node_modules/vuepress/cli.js",
"lint": "eslint . --ext .js,.vue,.ts,.json,.md,.toml,.yaml,.yml",
"lint-fix": "yarn lint --fix",
"mocha": "yarn ts node_modules/mocha/bin/mocha",
Expand Down Expand Up @@ -74,8 +75,8 @@
"@types/node": "^18.0.0",
"@types/request": "^2.48.5",
"@types/semver": "^7.3.1",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"env-cmd": "^10.1.0",
"esbuild-register": "^3.3.3",
"eslint": "^8.0.0",
Expand Down
3 changes: 1 addition & 2 deletions src/utils/ast/js/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ const CALC_BINARY: Record<
"<<": (v1, v2) => v1 << v2,
">>": (v1, v2) => v1 >> v2,
">>>": (v1, v2) => v1 >>> v2,
// eslint-disable-next-line @typescript-eslint/restrict-plus-operands -- ignore
"+": (v1, v2) => v1 + v2,
"-": (v1, v2) => v1 - v2,
"*": (v1, v2) => v1 * v2,
Expand Down Expand Up @@ -485,7 +484,7 @@ const VISITORS = {
}
let data = node.quasis[0].value.cooked ?? node.quasis[0].value.raw;
for (let i = 0; i < expressions.length; ++i) {
data += expressions[i];
data += String(expressions[i]);
data += node.quasis[i + 1].value.cooked ?? node.quasis[i + 1].value.raw;
}
return { data, children: EMPTY_MAP };
Expand Down
1 change: 0 additions & 1 deletion tools/update-docs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ class DocFile {
} else {
if (categories) {
const presets = [];
// eslint-disable-next-line @typescript-eslint/require-array-sort-compare -- ignore
for (const cat of categories.sort()) {
presets.push(`\`"plugin:json-schema-validator/${cat}"\``);
}
Expand Down

0 comments on commit 23f658c

Please sign in to comment.