Skip to content

Commit b979d06

Browse files
authored
Merge pull request #334 from typed-ember/babel-7-transforms
[v2] Use Babel 7 transforms rather than tsc for transpilation
2 parents 158ef94 + 0019e11 commit b979d06

File tree

23 files changed

+1616
-1613
lines changed

23 files changed

+1616
-1613
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ module.exports = {
7373
rules: {
7474
// These are covered by tsc
7575
'no-undef': 'off',
76-
'no-unused-var': 'off'
76+
'no-unused-vars': 'off'
7777
}
7878
}
7979
],

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ember-cli-typescript
1+
# ember-cli-typescript 2.0
22

33
Use TypeScript in your Ember 2.x and 3.x apps!
44

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ const fs = require('fs');
66
// Otherwise, register ts-node if necessary and load from source.
77
if (fs.existsSync(`${__dirname}/js/addon.js`)) {
88
// eslint-disable-next-line node/no-missing-require
9-
module.exports = require('./js/addon');
9+
module.exports = require('./js/addon').default;
1010
} else {
1111
require('./register-ts-node');
1212

1313
// eslint-disable-next-line node/no-unpublished-require
14-
module.exports = require('./ts/addon');
14+
module.exports = require('./ts/addon').default;
1515
}

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,39 @@
3535
"postpublish": "rimraf js"
3636
},
3737
"dependencies": {
38+
"@babel/plugin-proposal-class-properties": "^7.1.0",
39+
"@babel/plugin-transform-typescript": "^7.1.0",
3840
"broccoli-funnel": "^2.0.1",
3941
"broccoli-merge-trees": "^2.0.0",
4042
"broccoli-plugin": "^1.2.1",
4143
"broccoli-stew": "^1.4.0",
4244
"chokidar": "^2.0.3",
4345
"debug": "^3.1.0",
44-
"ember-cli-typescript-blueprints": "^1.0.0",
46+
"ember-cli-babel-plugin-helpers": "^1.0.0",
4547
"escape-string-regexp": "^1.0.5",
4648
"execa": "^0.9.0",
4749
"fs-extra": "^5.0.0",
4850
"glob": "^7.1.2",
4951
"resolve": "^1.5.0",
5052
"rsvp": "^4.8.1",
53+
"semver": "^5.5.1",
5154
"symlink-or-copy": "^1.1.8",
5255
"walk-sync": "^0.3.2"
5356
},
5457
"devDependencies": {
5558
"@ember/optional-features": "^0.6.3",
59+
"@types/console-ui": "^2.2.0",
60+
"@types/core-object": "^3.0.0",
5661
"@types/ember": "2.8.13",
5762
"@types/ember-qunit": "^3.0.1",
5863
"@types/node": "^9.6.5",
5964
"@types/qunit": "^2.0.31",
65+
"@types/semver": "^5.5.0",
6066
"broccoli-asset-rev": "^2.7.0",
6167
"co": "^4.6.0",
6268
"ember-cli": "~3.5.0",
6369
"ember-cli-app-version": "^3.1.3",
64-
"ember-cli-babel": "^6.16.0",
70+
"ember-cli-babel": "^7.1.2",
6571
"ember-cli-blueprint-test-helpers": "^0.18.3",
6672
"ember-cli-dependency-checker": "^3.0.0",
6773
"ember-cli-eslint": "^4.2.3",
@@ -70,6 +76,7 @@
7076
"ember-cli-inject-live-reload": "^1.8.2",
7177
"ember-cli-release": "^0.2.9",
7278
"ember-cli-sri": "^2.1.1",
79+
"ember-cli-typescript-blueprints": "^1.0.0",
7380
"ember-cli-uglify": "^2.1.0",
7481
"ember-cli-update": "^0.14.0",
7582
"ember-disable-prototype-extensions": "^1.1.3",
@@ -86,16 +93,15 @@
8693
"esprima": "^4.0.0",
8794
"in-repo-a": "link:tests/dummy/lib/in-repo-a",
8895
"in-repo-b": "link:tests/dummy/lib/in-repo-b",
89-
"in-repo-c": "link:tests/dummy/lib/in-repo-c",
9096
"loader.js": "^4.7.0",
9197
"mktemp": "^0.4.0",
9298
"mocha": "^5.0.0",
9399
"qunit-dom": "^0.8.0",
94100
"rimraf": "^2.6.2",
95101
"testdouble": "^3.5.0",
96102
"ts-node": "^7.0.1",
97-
"typescript": "^2.7.2",
98-
"typescript-eslint-parser": "^15.0.0"
103+
"typescript": "^3.1.1",
104+
"typescript-eslint-parser": "^19.0.2"
99105
},
100106
"resolutions": {
101107
"@types/ember": "2.8.13"
@@ -106,13 +112,7 @@
106112
"ember-addon": {
107113
"configPath": "tests/dummy/config",
108114
"before": [
109-
"ember-cli-babel",
110-
"ember-qunit-decorators"
111-
],
112-
"after": [
113-
"ember-source",
114-
"ember-data",
115-
"ember-decorators"
115+
"ember-cli-babel"
116116
]
117117
},
118118
"prettier": {

tests/dummy/lib/in-repo-a/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
"keywords": [
55
"ember-addon"
66
],
7-
"devDependencies": {
8-
"ember-cli-typescript": "*"
9-
},
107
"ember-addon": {
118
"paths": [
9+
"../../../..",
1210
"../../../../node_modules/ember-cli-babel"
1311
]
1412
}

tests/dummy/lib/in-repo-b/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
"keywords": [
55
"ember-addon"
66
],
7-
"devDependencies": {
8-
"ember-cli-typescript": "*"
9-
},
107
"ember-addon": {
118
"paths": [
9+
"../../../..",
1210
"../../../../node_modules/ember-cli-babel"
1311
]
1412
}

tests/dummy/lib/in-repo-c/index.js

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

tests/dummy/lib/in-repo-c/package.json

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

tests/dummy/lib/in-repo-c/src/test-file.ts

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

tests/dummy/src/test-file.ts

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

0 commit comments

Comments
 (0)