Skip to content

Commit 25eff11

Browse files
committed
Replace tslint with eslint
1 parent 691f64c commit 25eff11

File tree

6 files changed

+531
-267
lines changed

6 files changed

+531
-267
lines changed

.eslintrc-ts.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module.exports = {
2+
extends: [
3+
'./.eslintrc.js',
4+
'plugin:@typescript-eslint/eslint-recommended',
5+
'plugin:@typescript-eslint/recommended',
6+
],
7+
parser: '@typescript-eslint/parser',
8+
plugins: ['@typescript-eslint'],
9+
rules: {
10+
'@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': 'allow-with-description' }],
11+
},
12+
};

.eslintrc.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
module.exports = {
2+
env: {
3+
browser: true,
4+
commonjs: true,
5+
es6: true,
6+
node: true,
7+
},
8+
extends: ['eslint:recommended', 'prettier'],
9+
globals: {
10+
Atomics: 'readonly',
11+
SharedArrayBuffer: 'readonly',
12+
},
13+
parserOptions: {
14+
ecmaVersion: 11,
15+
},
16+
plugins: ['prettier'],
17+
ignorePatterns: ['dist'],
18+
rules: {
19+
'prettier/prettier': 'error',
20+
},
21+
};

package.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
"createChangelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
1616
"version": "npm run prepareRelease && npm run createChangelog",
1717
"test": "jest --no-cache",
18-
"lint": "tslint --project tsconfig.json",
18+
"lint:js": "eslint '**/*.js'",
19+
"lint:ts": "eslint -c './.eslintrc-ts.js' '**/*.ts'",
20+
"lint": "yarn lint:js; yarn lint:ts",
21+
"lint:fix": "yarn lint:js --fix; yarn lint:ts --fix",
1922
"start:docs": "docsify serve docs"
2023
},
2124
"dependencies": {
@@ -28,23 +31,26 @@
2831
"devDependencies": {
2932
"@commitlint/cli": "^8.2.0",
3033
"@commitlint/config-conventional": "^8.2.0",
31-
"@moneytree/tslint-rules": "^1.0.2",
3234
"@testing-library/jest-dom": "^5.11.0",
3335
"@types/jest": "^24.0.23",
3436
"@types/node-fetch": "^2.5.4",
3537
"@types/qs": "^6.9.0",
36-
"@types/store": "^2.0.2",
3738
"@types/url-safe-base64": "^1.1.0",
3839
"@types/uuid": "^8.0.0",
40+
"@typescript-eslint/eslint-plugin": "^3.0.2",
41+
"@typescript-eslint/parser": "^3.0.2",
3942
"conventional-changelog-cli": "^2.0.28",
4043
"docsify-cli": "^4.4.1",
44+
"eslint": "^7.1.0",
45+
"eslint-config-prettier": "^6.11.0",
46+
"eslint-plugin-prettier": "^3.1.3",
4147
"husky": "^3.1.0",
4248
"jest": "^26.1.0",
4349
"jest-fetch-mock": "^3.0.3",
4450
"node-fetch": "^2.5.0",
51+
"prettier": "^2.0.5",
4552
"ts-jest": "^26.1.1",
4653
"ts-loader": "^6.2.1",
47-
"tslint": "^5.20.1",
4854
"typescript": "^3.7.3",
4955
"webpack": "^4.41.2",
5056
"webpack-cli": "^3.3.10"

prettier.config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
trailingComma: 'es5',
3+
tabWidth: 2,
4+
semi: true,
5+
singleQuote: true,
6+
printWidth: 100,
7+
};

tslint.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)