Skip to content

Commit

Permalink
Merge pull request #16 from salsify/drop-tslint
Browse files Browse the repository at this point in the history
Drop TSLint in favor of ESLint + typescript-eslint-parser
  • Loading branch information
dfreeman authored Oct 2, 2018
2 parents 9dd3280 + 3946c99 commit 76281d7
Show file tree
Hide file tree
Showing 4 changed files with 1,382 additions and 46 deletions.
11 changes: 11 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ module.exports = {
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
},

// TypeScript files
{
files: ['**/*.ts'],
parser: 'typescript-eslint-parser',
rules: {
// Handled by tsc
'no-undef': 'off',
'no-unused-vars': 'off'
}
}
]
};
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ install:

script:
- yarn lint:js
- yarn lint:ts
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
"scripts": {
"build": "ember build",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"lint:js": "eslint . --ext js,ts",
"start": "ember server",
"test": "ember test",
"lint:ts": "tslint -p tsconfig.json -c tslint.json --exclude '**/*.js'",
"prepublishOnly": "ember ts:precompile",
"postpublish": "ember ts:clean",
"test:all": "ember try:each"
Expand Down Expand Up @@ -47,8 +46,8 @@
"eslint-plugin-node": "^7.0.1",
"loader.js": "^4.7.0",
"qunit-dom": "^0.7.1",
"tslint": "^5.9.1",
"typescript": "2.7.1"
"typescript": "~3.0.1",
"typescript-eslint-parser": "^19.0.2"
},
"keywords": [
"ember-addon"
Expand Down
Loading

0 comments on commit 76281d7

Please sign in to comment.