Skip to content

Commit 18774d7

Browse files
committed
Enable node type-checking with @ts-check.
1 parent 0955fc3 commit 18774d7

File tree

6 files changed

+28
-23
lines changed

6 files changed

+28
-23
lines changed

index.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @ts-check
12
/* eslint-env node */
23

34
const fs = require('fs');
@@ -27,7 +28,7 @@ module.exports = {
2728

2829
includedCommands() {
2930
return {
30-
'serve-ts': ServeTS
31+
'serve-ts': ServeTS,
3132
};
3233
},
3334

@@ -53,10 +54,10 @@ module.exports = {
5354
}
5455

5556
return relativePath;
56-
}
57+
},
5758
});
5859

59-
return mergeTrees([ tree, ts ]);
60+
return mergeTrees([tree, ts]);
6061
},
6162

6263
treeForTestSupport(tree) {
@@ -70,7 +71,7 @@ module.exports = {
7071
mkdirp.sync(tests);
7172

7273
const ts = funnel(tests);
73-
return tree ? mergeTrees([ tree, ts ]) : ts;
74+
return tree ? mergeTrees([tree, ts]) : ts;
7475
},
7576

7677
setupPreprocessorRegistry(type, registry) {

lib/serve-ts.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// @ts-check
2+
/* eslint-env node */
3+
14
const child_process = require('child_process');
25
const Serve = require('ember-cli/lib/commands/serve');
36
const Builder = require('ember-cli/lib/models/builder');

lib/typescript-preprocessor.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
// @ts-check
12
/* eslint-env node */
3+
24
const fs = require('fs');
35
const path = require('path');
46

package.json

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22
"name": "ember-cli-typescript",
33
"version": "1.0.6",
44
"description": "Allow ember apps to use typescript files.",
5-
"keywords": [
6-
"ember-addon",
7-
"typescript"
8-
],
5+
"keywords": ["ember-addon", "typescript"],
96
"license": "MIT",
107
"author": "Chris Krycho <chris@chriskrycho.com> (http://www.chriskrycho.com)",
11-
"contributors": [
12-
"Marius Seritan",
13-
"David Gardiner",
14-
"Philip Bjorge"
15-
],
8+
"contributors": ["Marius Seritan", "David Gardiner", "Philip Bjorge"],
169
"directories": {
1710
"doc": "doc",
1811
"test": "tests"
@@ -41,7 +34,8 @@
4134
"silent-error": "^1.1.0"
4235
},
4336
"devDependencies": {
44-
"@types/ember": "^2.7.43",
37+
"@types/ember": "*",
38+
"@types/node": "*",
4539
"broccoli-asset-rev": "^2.4.5",
4640
"ember-cli": "~2.17.1",
4741
"ember-cli-app-version": "^2.0.0",
@@ -74,9 +68,7 @@
7468
},
7569
"ember-addon": {
7670
"configPath": "tests/dummy/config",
77-
"before": [
78-
"ember-cli-babel"
79-
]
71+
"before": ["ember-cli-babel"]
8072
},
8173
"prettier": {
8274
"printWidth": 100,

tsconfig.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@
77
"baseUrl": ".",
88
"paths": {}
99
},
10-
"include": [
11-
"**/*"
12-
]
10+
"include": ["**/*"]
1311
}

yarn.lock

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
dependencies:
2020
"@glimmer/di" "^0.2.0"
2121

22-
"@types/ember@^2.7.43":
23-
version "2.7.43"
24-
resolved "https://registry.yarnpkg.com/@types/ember/-/ember-2.7.43.tgz#24c4ffa0b05f121d3bf6687dd2ac481213ff1074"
22+
"@types/ember@*":
23+
version "2.8.3"
24+
resolved "https://registry.yarnpkg.com/@types/ember/-/ember-2.8.3.tgz#f6a8549b727d752f6e4e0aeb6074b460a309aa79"
2525
dependencies:
2626
"@types/handlebars" "*"
2727
"@types/jquery" "*"
28+
"@types/rsvp" "*"
2829

2930
"@types/handlebars@*":
3031
version "4.0.35"
@@ -34,6 +35,14 @@
3435
version "3.2.10"
3536
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.2.10.tgz#0e3da7ad6481a1cdf48af39ff00a990afeb8018b"
3637

38+
"@types/node@*":
39+
version "8.5.1"
40+
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.1.tgz#4ec3020bcdfe2abffeef9ba3fbf26fca097514b5"
41+
42+
"@types/rsvp@*":
43+
version "4.0.0"
44+
resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.0.tgz#6c59d84bb5ea8a4fd11ec3d7aa748710e0e5e373"
45+
3746
abbrev@1:
3847
version "1.1.0"
3948
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"

0 commit comments

Comments
 (0)