Skip to content

Commit 169c324

Browse files
authored
Merge pull request #46 from phanect/eslint-8
Support ESLint 8
2 parents ebabd39 + 5506f13 commit 169c324

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

.eslintrc.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
"use strict";
22

33
module.exports = {
4-
extends: "plugin:@phanect/plain",
4+
//extends: "plugin:@phanect/plain",
55
root: true,
66

77
env: {
88
node: true,
9+
es6: true,
910
},
10-
plugins: [ "@phanect" ],
11+
parserOptions: {
12+
ecmaVersion: "latest",
13+
},
14+
//plugins: [ "@phanect" ],
15+
ignorePatterns: [ "test-packages/**" ],
1116
};

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package-lock=false

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-plugin-editorconfig",
3-
"version": "3.0.2",
3+
"version": "3.1.0",
44
"description": "An ESLint plugin to enforce EditorConfig rules",
55
"main": "main.js",
66
"scripts": {
@@ -24,14 +24,13 @@
2424
},
2525
"homepage": "https://github.com/phanect/eslint-plugin-editorconfig",
2626
"dependencies": {
27-
"@typescript-eslint/eslint-plugin": "^4.9.1",
27+
"@typescript-eslint/eslint-plugin": "^5.0.0",
2828
"editorconfig": "^0.15.0",
29-
"eslint": "^7.0.0",
29+
"eslint": "^8.0.1",
3030
"klona": "^2.0.4"
3131
},
3232
"devDependencies": {
33-
"@phanect/eslint-plugin": "latest",
34-
"@typescript-eslint/parser": "^4.9.1",
35-
"mocha": "^8.0.1"
33+
"@typescript-eslint/parser": "^5.0.0",
34+
"mocha": "^9.1.3"
3635
}
3736
}

test-packages/test.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ git clean -Xd --force
1515
# If you test without copying, test package is affected by node_modules in the project root
1616
cp --recursive "${TEST_PKGS_DIR}" "${TMP}/"
1717

18-
for PKGDIR in $(find "${TMP}/test-packages/" -maxdepth 1 -type d ! -path "${TMP}/test-packages/"); do
19-
cd "${PKGDIR}"
20-
npm install
21-
npm install --save-dev "${PROJECT_ROOT}/${PACKAGE}"
22-
npm run lint
18+
for ESLINT_VERSION in "7" "8"; do
19+
for PKGDIR in $(find "${TMP}/test-packages/" -maxdepth 1 -type d ! -path "${TMP}/test-packages/"); do
20+
cd "${PKGDIR}"
21+
npm install
22+
npm install --save-dev "eslint@${ESLINT_VERSION}" "${PROJECT_ROOT}/${PACKAGE}"
23+
npm run lint
24+
done
2325
done

test-packages/ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"test": "npm run lint"
1212
},
1313
"devDependencies": {
14-
"@typescript-eslint/parser": "^4.14.0",
14+
"@typescript-eslint/parser": "^5.0.0",
1515
"typescript": "^4.1.3"
1616
}
1717
}

0 commit comments

Comments
 (0)