Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 975724d

Browse files
makepanicalexlafroscia
authored andcommitted
fix: bump typescript to get working d.ts
fixes #388
1 parent 196b10f commit 975724d

File tree

5 files changed

+1636
-69
lines changed

5 files changed

+1636
-69
lines changed

addon/mixins/ajax-request.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ export default Mixin.create({
434434
*/
435435
_getFullHeadersHash(headers?: Headers): Headers {
436436
const classHeaders = get(this, 'headers');
437-
return assign({}, classHeaders, headers);
437+
return assign({}, classHeaders!, headers!);
438438
},
439439

440440
/**

package.json

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,13 @@
4545
"@commitlint/config-conventional": "^7.0.1",
4646
"@commitlint/travis-cli": "^7.0.0",
4747
"@types/chai": "^4.1.4",
48-
"@types/ember": "^2.8.28",
49-
"@types/ember-data": "^2.14.17",
50-
"@types/ember-mocha": "^0.12.3",
51-
"@types/ember-test-helpers": "^0.7.1",
48+
"@types/ember": "^3.0.24",
49+
"@types/ember-data": "^3.1.1",
50+
"@types/ember-mocha": "^0.14.4",
51+
"@types/ember-test-helpers": "^1.0.3",
5252
"@types/ember-testing-helpers": "^0.0.3",
53-
"@types/mocha": "^5.2.3",
53+
"@types/ember__test-helpers": "^0.7.5",
54+
"@types/mocha": "^5.2.5",
5455
"@types/node": "^10.3.3",
5556
"@types/rsvp": "^4.0.2",
5657
"broccoli-asset-rev": "^2.7.0",
@@ -70,7 +71,7 @@
7071
"ember-cli-sri": "^2.1.0",
7172
"ember-cli-test-loader": "^2.1.0",
7273
"ember-cli-testdouble": "^0.1.3",
73-
"ember-cli-typescript": "^1.3.2",
74+
"ember-cli-typescript": "^1.4.3",
7475
"ember-cli-uglify": "^2.1.0",
7576
"ember-data": "^3.1.1",
7677
"ember-export-application-global": "2.0.0",
@@ -94,13 +95,17 @@
9495
"prettier": "^1.13.5",
9596
"testdouble": "^3.8.1",
9697
"testdouble-chai": "^0.5.0",
97-
"typescript": "^2.9.2",
98-
"typescript-eslint-parser": "^16.0.1"
98+
"typescript": "^3.1.1",
99+
"typescript-eslint-parser": "^19.0.2"
99100
},
100101
"resolutions": {
101-
"@types/ember": "2.8.28",
102-
"@types/mocha": "5.2.3",
103-
"@types/rsvp": "4.0.2"
102+
"@types/ember__error": "3.0.2",
103+
"@types/ember-mocha": "0.14.4",
104+
"@types/ember-test-helpers": "1.0.3",
105+
"@types/ember-testing-helpers": "0.0.3",
106+
"@types/ember__test-helpers": "0.7.5",
107+
"@types/mocha": "^5.2.5",
108+
"@types/jquery": "^3.3.10"
104109
},
105110
"engines": {
106111
"node": "^4.5 || 6.* || >= 7.*"

tsconfig.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,23 @@
3333
"ember-ajax/*": [
3434
"addon/*"
3535
],
36+
"ember-ajax/test-support": [
37+
"addon-test-support"
38+
],
39+
"ember-ajax/test-support/*": [
40+
"addon-test-support/*"
41+
],
3642
"*": [
3743
"types/*"
3844
]
3945
}
4046
},
4147
"include": [
42-
"app",
43-
"addon",
44-
"tests",
45-
"types"
48+
"app/**/*",
49+
"addon/**/*",
50+
"tests/**/*",
51+
"types/**/*",
52+
"test-support/**/*",
53+
"addon-test-support/**/*"
4654
]
4755
}

types/ember-data.d.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
/**
2-
* Catch-all for ember-data.
3-
*/
4-
declare module 'ember-data' {
5-
interface ModelRegistry {
1+
// see https://github.com/typed-ember/ember-cli-typescript#fixing-the-ember-data-error-ts2344-problem
2+
declare module 'ember-data/types/registries/model' {
3+
export default interface ModelRegistry {
64
[key: string]: any;
75
}
86
}

0 commit comments

Comments
 (0)