Skip to content

Commit 23d9c3a

Browse files
committed
Enable ESLint with our current rule set for .ts files
1 parent 511d7af commit 23d9c3a

File tree

6 files changed

+52
-11
lines changed

6 files changed

+52
-11
lines changed

.eslintignore

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,21 @@
1-
/blueprints/*/files/**/*.js
2-
/js
1+
# unconventional js
2+
/blueprint-files/
3+
/test-fixtures/
4+
/vendor/
5+
6+
# compiled output
7+
/dist/
8+
/tmp/
9+
/js/
10+
11+
# dependencies
12+
/bower_components/
13+
/tests/dummy/lib/*/node_modules/
14+
15+
# misc
16+
/coverage/
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

.eslintrc.js

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,33 @@ module.exports = {
4747

4848
// test files
4949
{
50-
files: ['tests/**/*.js'],
51-
excludedFiles: ['tests/dummy/**/*.js'],
50+
files: ['tests/**/*.{js,ts}'],
51+
excludedFiles: ['tests/dummy/**/*.{js,ts}'],
5252
env: {
5353
embertest: true,
5454
},
5555
},
5656

5757
// node test files
5858
{
59-
files: ['ts/tests/**/*.js'],
59+
files: ['ts/tests/**/*.{js,ts}'],
6060
env: {
6161
mocha: true,
6262
},
6363
rules: {
6464
'node/no-unpublished-require': 'off',
6565
},
6666
},
67+
68+
// all TypeScript files
69+
{
70+
files: ['**/*.ts'],
71+
parser: 'typescript-eslint-parser',
72+
rules: {
73+
// These are covered by tsc
74+
'no-undef': 'off',
75+
'no-unused-var': 'off'
76+
}
77+
}
6778
],
6879
};

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"homepage": "https://github.com/typed-ember/ember-cli-typescript",
2525
"scripts": {
2626
"build": "ember build",
27-
"lint:js": "eslint ./*.js addon addon-test-support app blueprints config lib server test-support tests",
27+
"lint:js": "eslint --ext js,ts .",
2828
"start": "ember serve",
2929
"test": "ember test",
3030
"ci:prepare": "yarn prepublishOnly && rimraf ts",
@@ -94,7 +94,8 @@
9494
"rimraf": "^2.6.2",
9595
"testdouble": "^3.5.0",
9696
"ts-node": "^7.0.1",
97-
"typescript": "^2.7.2"
97+
"typescript": "^2.7.2",
98+
"typescript-eslint-parser": "^15.0.0"
9899
},
99100
"resolutions": {
100101
"@types/ember": "2.8.13"

tests/dummy/app/controllers/application.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Ember from 'ember';
1+
import Controller from '@ember/controller';
22

3-
export default Ember.Controller.extend({
3+
export default Controller.extend({
44
// Just a very roundabout way of using some ES6 features
55
value: ((test = 'Test') => `${test} ${'Value'}`)(),
66
foo: 'hello'

tests/dummy/app/helpers/typed-help.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import Ember from 'ember';
21
import { helper } from '@ember/component/helper';
32

43
export function typedHelp(/*params, hash*/) {

yarn.lock

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5041,6 +5041,10 @@ lodash.templatesettings@~2.3.0:
50415041
lodash._reinterpolate "~2.3.0"
50425042
lodash.escape "~2.3.0"
50435043

5044+
5045+
version "4.0.1"
5046+
resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
5047+
50445048
lodash.uniq@^4.2.0:
50455049
version "4.5.0"
50465050
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -6406,7 +6410,7 @@ sane@^2.2.0, sane@^2.4.1:
64066410
optionalDependencies:
64076411
fsevents "^1.1.1"
64086412

6409-
"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
6413+
"semver@2 || 3 || 4 || 5", semver@5.5.0, semver@^5.1.0, semver@^5.1.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
64106414
version "5.5.0"
64116415
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
64126416

@@ -7175,6 +7179,13 @@ typedarray@^0.0.6:
71757179
version "0.0.6"
71767180
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
71777181

7182+
typescript-eslint-parser@^15.0.0:
7183+
version "15.0.1"
7184+
resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-15.0.1.tgz#fb18bfd255821c5c1dcb98be826f7e4fac63480c"
7185+
dependencies:
7186+
lodash.unescape "4.0.1"
7187+
semver "5.5.0"
7188+
71787189
typescript@^2.7.2:
71797190
version "2.8.1"
71807191
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"

0 commit comments

Comments
 (0)