Skip to content

Commit

Permalink
chore: v8
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Oct 11, 2021
1 parent afad49a commit e4f94c5
Show file tree
Hide file tree
Showing 5 changed files with 155 additions and 196 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module.exports = {
'import/no-commonjs': 'error',
'import/no-duplicates': 'error',
'import/no-extraneous-dependencies': 'error',
'import/no-unused-modules': 'error',
// 'import/no-unused-modules': 'error',
'import/order': [
'error',
{ alphabetize: { order: 'asc' }, 'newlines-between': 'never' },
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,18 @@ jobs:
test-node:
name:
# prettier-ignore
Test on Node.js v${{ matrix.node-version }} and eslint v${{ matrix.eslint-version }}
Test on Node.js v${{ matrix.node-version }}, eslint v${{ matrix.eslint-version }} and ts-eslint/plugin v${{ matrix.ts-eslint-plugin-version }}
needs: prepare-yarn-cache
strategy:
fail-fast: false
matrix:
node-version: [12.x, 14.x, 16.x]
eslint-version: [6, 7]
eslint-version: [6, 7, 8]
ts-eslint-plugin-version: [4, 5]
exclude:
# ts-eslint/plugin@4 doesn't support eslint@8
- eslint-version: 8
ts-eslint-plugin-version: 4
runs-on: ubuntu-latest

steps:
Expand All @@ -81,7 +86,7 @@ jobs:
- name: install with eslint v${{ matrix.eslint-version }}
run: |
yarn
yarn add --dev eslint@${{ matrix.eslint-version }}
yarn add --dev eslint@${{ matrix.eslint-version }} @typescript-eslint/eslint-plugin@${{ matrix.ts-eslint-plugin-version }}
- name: run tests
run: yarn test --coverage
env:
Expand Down
12 changes: 12 additions & 0 deletions .yarn/patches/eslint-plugin-import-npm-2.24.2-127dbaeebd
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/lib/index.js b/lib/index.js
index 247818e0a79278a5e9420273b3c60a8af657d023..97301bc59f2430ed8ac7e0139b28e1b9af623381 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -19,7 +19,6 @@
'no-named-as-default': require('./rules/no-named-as-default'),
'no-named-as-default-member': require('./rules/no-named-as-default-member'),
'no-anonymous-default-export': require('./rules/no-anonymous-default-export'),
- 'no-unused-modules': require('./rules/no-unused-modules'),

'no-commonjs': require('./rules/no-commonjs'),
'no-amd': require('./rules/no-amd'),
18 changes: 12 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
"projects": [
{
"displayName": "test",
"moduleNameMapper": {
"@eslint/eslintrc/universal": "@eslint/eslintrc/dist/eslintrc-universal.cjs"
},
"testEnvironment": "node",
"testPathIgnorePatterns": [
"<rootDir>/lib/.*",
Expand Down Expand Up @@ -95,17 +98,17 @@
"@types/jest": "^27.0.0",
"@types/node": "^14.0.0",
"@types/prettier": "^2.0.0",
"@typescript-eslint/eslint-plugin": "^4.0.1",
"@typescript-eslint/parser": "^4.0.1",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"babel-jest": "^27.0.0",
"babel-plugin-replace-ts-export-assignment": "^0.0.2",
"dedent": "^0.7.0",
"eslint": "^6.0.0 || ^7.0.0",
"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-eslint-comments": "^3.1.2",
"eslint-plugin-eslint-config": "^2.0.0",
"eslint-plugin-eslint-plugin": "^3.5.3",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-import": "patch:eslint-plugin-import@npm:2.24.2#.yarn/patches/eslint-plugin-import-npm-2.24.2-127dbaeebd",
"eslint-plugin-node": "^11.0.0",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^7.0.2",
Expand All @@ -123,8 +126,8 @@
"typescript": "^4.4.0"
},
"peerDependencies": {
"@typescript-eslint/eslint-plugin": "^4.0.0",
"eslint": "^6.0.0 || ^7.0.0"
"@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0",
"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
},
"peerDependenciesMeta": {
"@typescript-eslint/eslint-plugin": {
Expand All @@ -150,5 +153,8 @@
"@semantic-release/git",
"@semantic-release/github"
]
},
"resolutions": {
"@typescript-eslint/experimental-utils": "^5.0.0"
}
}
Loading

0 comments on commit e4f94c5

Please sign in to comment.