Skip to content

Commit e4f94c5

Browse files
committed
chore: v8
1 parent afad49a commit e4f94c5

File tree

5 files changed

+155
-196
lines changed

5 files changed

+155
-196
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module.exports = {
5454
'import/no-commonjs': 'error',
5555
'import/no-duplicates': 'error',
5656
'import/no-extraneous-dependencies': 'error',
57-
'import/no-unused-modules': 'error',
57+
// 'import/no-unused-modules': 'error',
5858
'import/order': [
5959
'error',
6060
{ alphabetize: { order: 'asc' }, 'newlines-between': 'never' },

.github/workflows/nodejs.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,18 @@ jobs:
6262
test-node:
6363
name:
6464
# prettier-ignore
65-
Test on Node.js v${{ matrix.node-version }} and eslint v${{ matrix.eslint-version }}
65+
Test on Node.js v${{ matrix.node-version }}, eslint v${{ matrix.eslint-version }} and ts-eslint/plugin v${{ matrix.ts-eslint-plugin-version }}
6666
needs: prepare-yarn-cache
6767
strategy:
6868
fail-fast: false
6969
matrix:
7070
node-version: [12.x, 14.x, 16.x]
71-
eslint-version: [6, 7]
71+
eslint-version: [6, 7, 8]
72+
ts-eslint-plugin-version: [4, 5]
73+
exclude:
74+
# ts-eslint/plugin@4 doesn't support eslint@8
75+
- eslint-version: 8
76+
ts-eslint-plugin-version: 4
7277
runs-on: ubuntu-latest
7378

7479
steps:
@@ -81,7 +86,7 @@ jobs:
8186
- name: install with eslint v${{ matrix.eslint-version }}
8287
run: |
8388
yarn
84-
yarn add --dev eslint@${{ matrix.eslint-version }}
89+
yarn add --dev eslint@${{ matrix.eslint-version }} @typescript-eslint/eslint-plugin@${{ matrix.ts-eslint-plugin-version }}
8590
- name: run tests
8691
run: yarn test --coverage
8792
env:
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/lib/index.js b/lib/index.js
2+
index 247818e0a79278a5e9420273b3c60a8af657d023..97301bc59f2430ed8ac7e0139b28e1b9af623381 100644
3+
--- a/lib/index.js
4+
+++ b/lib/index.js
5+
@@ -19,7 +19,6 @@
6+
'no-named-as-default': require('./rules/no-named-as-default'),
7+
'no-named-as-default-member': require('./rules/no-named-as-default-member'),
8+
'no-anonymous-default-export': require('./rules/no-anonymous-default-export'),
9+
- 'no-unused-modules': require('./rules/no-unused-modules'),
10+
11+
'no-commonjs': require('./rules/no-commonjs'),
12+
'no-amd': require('./rules/no-amd'),

package.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
"projects": [
6161
{
6262
"displayName": "test",
63+
"moduleNameMapper": {
64+
"@eslint/eslintrc/universal": "@eslint/eslintrc/dist/eslintrc-universal.cjs"
65+
},
6366
"testEnvironment": "node",
6467
"testPathIgnorePatterns": [
6568
"<rootDir>/lib/.*",
@@ -95,17 +98,17 @@
9598
"@types/jest": "^27.0.0",
9699
"@types/node": "^14.0.0",
97100
"@types/prettier": "^2.0.0",
98-
"@typescript-eslint/eslint-plugin": "^4.0.1",
99-
"@typescript-eslint/parser": "^4.0.1",
101+
"@typescript-eslint/eslint-plugin": "^5.0.0",
102+
"@typescript-eslint/parser": "^5.0.0",
100103
"babel-jest": "^27.0.0",
101104
"babel-plugin-replace-ts-export-assignment": "^0.0.2",
102105
"dedent": "^0.7.0",
103-
"eslint": "^6.0.0 || ^7.0.0",
106+
"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0",
104107
"eslint-config-prettier": "^8.3.0",
105108
"eslint-plugin-eslint-comments": "^3.1.2",
106109
"eslint-plugin-eslint-config": "^2.0.0",
107110
"eslint-plugin-eslint-plugin": "^3.5.3",
108-
"eslint-plugin-import": "^2.20.2",
111+
"eslint-plugin-import": "patch:eslint-plugin-import@npm:2.24.2#.yarn/patches/eslint-plugin-import-npm-2.24.2-127dbaeebd",
109112
"eslint-plugin-node": "^11.0.0",
110113
"eslint-plugin-prettier": "^3.4.1",
111114
"husky": "^7.0.2",
@@ -123,8 +126,8 @@
123126
"typescript": "^4.4.0"
124127
},
125128
"peerDependencies": {
126-
"@typescript-eslint/eslint-plugin": "^4.0.0",
127-
"eslint": "^6.0.0 || ^7.0.0"
129+
"@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0",
130+
"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
128131
},
129132
"peerDependenciesMeta": {
130133
"@typescript-eslint/eslint-plugin": {
@@ -150,5 +153,8 @@
150153
"@semantic-release/git",
151154
"@semantic-release/github"
152155
]
156+
},
157+
"resolutions": {
158+
"@typescript-eslint/experimental-utils": "^5.0.0"
153159
}
154160
}

0 commit comments

Comments
 (0)