Skip to content

Commit 6b30223

Browse files
committed
Configure TS addon build
1 parent 4e5e693 commit 6b30223

File tree

8 files changed

+73
-12
lines changed

8 files changed

+73
-12
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/blueprints/*/files/**/*.js
2+
/js

.eslintrc.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ module.exports = {
1010
browser: true,
1111
},
1212
rules: {},
13+
settings: {
14+
node: {
15+
// Honor both extensions when enforcing e.g. `node/no-missing-require`
16+
tryExtensions: ['.js', '.ts'],
17+
},
18+
},
1319
overrides: [
1420
// node files
1521
{
@@ -20,8 +26,7 @@ module.exports = {
2026
'blueprints/*/index.js',
2127
'config/**/*.js',
2228
'tests/dummy/config/**/*.js',
23-
'lib/**/*.js',
24-
'node-tests/**/*.js',
29+
'ts/**/*.js',
2530
],
2631
excludedFiles: ['app/**', 'addon/**', 'tests/dummy/app/**'],
2732
parserOptions: {
@@ -50,7 +55,7 @@ module.exports = {
5055

5156
// node test files
5257
{
53-
files: ['node-tests/**/*.js'],
58+
files: ['ts/tests/**/*.js'],
5459
env: {
5560
mocha: true,
5661
},

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# compiled output
44
/dist
55
/tmp
6+
/js
67

78
# dependencies
89
/node_modules

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
/dist
44
/tests
55
/tmp
6+
/test-fixtures
7+
/ts
8+
/js/tests
9+
610
**/.gitkeep
711
.bowerrc
812
.editorconfig

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@
2727
"lint:js": "eslint ./*.js addon addon-test-support app blueprints config lib server test-support tests",
2828
"start": "ember serve",
2929
"test": "ember test",
30-
"nodetest": "mocha node-tests --recursive",
31-
"test:all": "ember try:each"
30+
"test:node": "mocha -r ts-node/register/transpile-only 'ts/tests/**/*.{ts,js}'",
31+
"test:all": "ember try:each",
32+
"prepublishOnly": "yarn tsc --project ts --noEmit false",
33+
"postpublish": "rimraf js"
3234
},
3335
"dependencies": {
3436
"broccoli-funnel": "^2.0.1",
@@ -87,7 +89,9 @@
8789
"loader.js": "^4.2.3",
8890
"mktemp": "^0.4.0",
8991
"mocha": "^5.0.0",
92+
"rimraf": "^2.6.2",
9093
"testdouble": "^3.5.0",
94+
"ts-node": "^7.0.1",
9195
"typescript": "^2.7.2"
9296
},
9397
"resolutions": {

ts/addon.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// @ts-check
21
'use strict';
32

43
const IncrementalTypescriptCompiler = require('./lib/incremental-typescript-compiler');

ts/tsconfig.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"compilerOptions": {
3+
"target": "ES2016",
4+
"module": "commonjs",
5+
"moduleResolution": "node",
6+
"allowJs": true,
7+
"noEmitOnError": true,
8+
"noEmit": true,
9+
"noImplicitAny": true,
10+
"noImplicitThis": true,
11+
"strictNullChecks": true,
12+
"strictPropertyInitialization": true,
13+
"outDir": "../js"
14+
}
15+
}

yarn.lock

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,6 +1670,10 @@ buffer-from@^1.0.0:
16701670
version "1.0.0"
16711671
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
16721672

1673+
buffer-from@^1.1.0:
1674+
version "1.1.1"
1675+
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
1676+
16731677
builtin-modules@^1.0.0:
16741678
version "1.1.1"
16751679
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -2425,7 +2429,7 @@ detective@^4.3.1:
24252429
acorn "^5.2.1"
24262430
defined "^1.0.0"
24272431

2428-
diff@3.5.0, diff@^3.2.0:
2432+
diff@3.5.0, diff@^3.1.0, diff@^3.2.0:
24292433
version "3.5.0"
24302434
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
24312435

@@ -5115,6 +5119,10 @@ make-dir@^1.0.0:
51155119
dependencies:
51165120
pify "^3.0.0"
51175121

5122+
make-error@^1.1.1:
5123+
version "1.3.5"
5124+
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
5125+
51185126
makeerror@1.0.x:
51195127
version "1.0.11"
51205128
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -6316,7 +6324,7 @@ right-align@^0.1.1:
63166324
dependencies:
63176325
align-text "^0.1.1"
63186326

6319-
rimraf@2, rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1:
6327+
rimraf@2, rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
63206328
version "2.6.2"
63216329
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
63226330
dependencies:
@@ -6632,6 +6640,13 @@ source-map-support@^0.4.15:
66326640
dependencies:
66336641
source-map "^0.5.6"
66346642

6643+
source-map-support@^0.5.6:
6644+
version "0.5.9"
6645+
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
6646+
dependencies:
6647+
buffer-from "^1.0.0"
6648+
source-map "^0.6.0"
6649+
66356650
source-map-url@^0.3.0:
66366651
version "0.3.0"
66376652
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
@@ -6656,16 +6671,16 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, sour
66566671
version "0.5.7"
66576672
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
66586673

6674+
source-map@^0.6.0, source-map@~0.6.1:
6675+
version "0.6.1"
6676+
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
6677+
66596678
source-map@~0.1.x:
66606679
version "0.1.43"
66616680
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
66626681
dependencies:
66636682
amdefine ">=0.0.4"
66646683

6665-
source-map@~0.6.1:
6666-
version "0.6.1"
6667-
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
6668-
66696684
sourcemap-validator@^1.0.5:
66706685
version "1.1.0"
66716686
resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.1.0.tgz#00454547d1682186e1498a7208e022e8dfa8738f"
@@ -7108,6 +7123,19 @@ tryor@~0.1.2:
71087123
version "0.1.2"
71097124
resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b"
71107125

7126+
ts-node@^7.0.1:
7127+
version "7.0.1"
7128+
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.1.tgz#9562dc2d1e6d248d24bc55f773e3f614337d9baf"
7129+
dependencies:
7130+
arrify "^1.0.0"
7131+
buffer-from "^1.1.0"
7132+
diff "^3.1.0"
7133+
make-error "^1.1.1"
7134+
minimist "^1.2.0"
7135+
mkdirp "^0.5.1"
7136+
source-map-support "^0.5.6"
7137+
yn "^2.0.0"
7138+
71117139
tunnel-agent@^0.6.0:
71127140
version "0.6.0"
71137141
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -7531,3 +7559,7 @@ yargs@~3.27.0:
75317559
yeast@0.1.2:
75327560
version "0.1.2"
75337561
resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
7562+
7563+
yn@^2.0.0:
7564+
version "2.0.0"
7565+
resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"

0 commit comments

Comments
 (0)