Skip to content

Commit

Permalink
Merge pull request #43 from ingeno/chore/support-eslint8
Browse files Browse the repository at this point in the history
Chore/support eslint8
  • Loading branch information
infctr authored Oct 15, 2021
2 parents 1764ffd + c683bd6 commit 5016820
Show file tree
Hide file tree
Showing 5 changed files with 1,134 additions and 908 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [10.x, 12.x, 14.x]
node-version: [12.x, 14.x, 16.x]

steps:
- uses: actions/checkout@v2
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"verify": "yarn typecheck && yarn lint && yarn build && yarn coverage"
},
"dependencies": {
"@typescript-eslint/experimental-utils": "^4.29.2",
"@typescript-eslint/experimental-utils": "^5.0.0",
"json-schema": "^0.3.0",
"natural-compare-lite": "^1.4.0"
},
Expand All @@ -58,24 +58,24 @@
"@rollup/plugin-typescript": "~4.1.2",
"@types/babel__core": "~7.1.7",
"@types/babel__preset-env": "~7.9.0",
"@types/eslint": "~7.28.0",
"@types/jest": "~25.2.3",
"@types/eslint": "~7.28.1",
"@types/jest": "~27.0.2",
"@types/natural-compare-lite": "~1.4.0",
"@types/rimraf": "~3.0.1",
"@types/tmp": "~0.2.1",
"@typescript-eslint/eslint-plugin": "~4.29.2",
"@typescript-eslint/parser": "~4.29.2",
"@typescript-eslint/eslint-plugin": "~5.0.0",
"@typescript-eslint/parser": "~5.0.0",
"babel-jest": "~26.6.3",
"babel-plugin-module-resolver": "~4.1.0",
"eslint": "~7.32.0",
"eslint": "~8.0.1",
"eslint-config-prettier": "~8.3.0",
"eslint-plugin-eslint-plugin": "~3.5.3",
"eslint-plugin-import": "~2.24.0",
"eslint-plugin-jest": "~24.4.0",
"eslint-plugin-prettier": "~3.4.0",
"eslint-plugin-eslint-plugin": "~3.6.1",
"eslint-plugin-import": "~2.25.2",
"eslint-plugin-jest": "~25.0.6",
"eslint-plugin-prettier": "~4.0.0",
"http-server": "~13.0.0",
"husky": "~4.2.5",
"jest": "~26.6.3",
"jest": "~27.2.5",
"lint-staged": "~10.5.4",
"prettier": "~2.3.2",
"rimraf": "~3.0.2",
Expand All @@ -85,8 +85,8 @@
"typescript": "~4.3.5"
},
"peerDependencies": {
"@typescript-eslint/parser": "^1 || ^2 || ^3 || ^4",
"eslint": "^5 || ^6 || ^7",
"@typescript-eslint/parser": "^1 || ^2 || ^3 || ^4 || ^5",
"eslint": "^5 || ^6 || ^7 || ^8",
"typescript": "^3 || ^4"
},
"engines": {
Expand Down
3 changes: 1 addition & 2 deletions src/rules/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const sortingParamsOptionSchema: JSONSchema4 = {
/**
* The schema for the rule options.
*/
const schema: JSONSchema4 = [sortingOrderOptionSchema, sortingParamsOptionSchema]
const schema: JSONSchema4[] = [sortingOrderOptionSchema, sortingParamsOptionSchema]

/**
* The default options for the rule.
Expand All @@ -68,7 +68,6 @@ const meta: RuleMetaData<keyof typeof errorMessages> = {
type: 'suggestion',
docs: {
description: 'require interface keys to be sorted',
category: 'Stylistic Issues',
recommended: 'warn',
},
messages: errorMessages,
Expand Down
3 changes: 1 addition & 2 deletions src/rules/string-enum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const sortingParamsOptionSchema: JSONSchema4 = {
/**
* The schema for the rule options.
*/
const schema: JSONSchema4 = [sortingOrderOptionSchema, sortingParamsOptionSchema]
const schema: JSONSchema4[] = [sortingOrderOptionSchema, sortingParamsOptionSchema]

/**
* The default options for the rule.
Expand All @@ -65,7 +65,6 @@ const meta: RuleMetaData<keyof typeof errorMessages> = {
type: 'suggestion',
docs: {
description: 'require string enum members to be sorted',
category: 'Stylistic Issues',
recommended: 'warn',
},
messages: errorMessages,
Expand Down
Loading

0 comments on commit 5016820

Please sign in to comment.