Skip to content

Commit 4818422

Browse files
Run ember-cli-typescript blueprints, yarn upgrade
1 parent 5e54718 commit 4818422

File tree

8 files changed

+1467
-5053
lines changed

8 files changed

+1467
-5053
lines changed

package.json

+37-31
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,22 @@
2626
"start": "ember serve",
2727
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
2828
"test:ember": "ember test",
29-
"test:ember-compatibility": "ember try:each"
29+
"test:ember-compatibility": "ember try:each",
30+
"prepack": "ember ts:precompile",
31+
"postpack": "ember ts:clean"
3032
},
3133
"dependencies": {
3234
"broccoli-plugin": "^4.0.3",
3335
"ember-auto-import": "^2.7.2",
3436
"ember-cli-babel": "^7.26.11",
3537
"ember-cli-htmlbars": "^6.2.0",
38+
"ember-cli-typescript": "^5.2.1",
3639
"ensure-posix-path": "^1.1.1",
3740
"fs-extra": "^11.2.0",
38-
"json-api-serializer": "^1.12.0",
41+
"json-api-serializer": "^2.6.6",
3942
"resolve": "^1.22.8",
4043
"stagehand": "^1.0.1",
41-
"typedoc": "^0.19.2"
44+
"typedoc": "^0.25.8"
4245
},
4346
"devDependencies": {
4447
"@babel/eslint-parser": "^7.21.3",
@@ -49,43 +52,45 @@
4952
"@embroider/test-setup": "^2.1.1",
5053
"@glimmer/component": "^1.1.2",
5154
"@glimmer/tracking": "^1.1.2",
52-
"@types/ember": "^4.0.3",
53-
"@types/ember-data": "^4.4.11",
54-
"@types/ember-data__adapter": "^4.0.1",
55-
"@types/ember-data__model": "^4.0.1",
56-
"@types/ember-data__serializer": "^4.0.2",
57-
"@types/ember-data__store": "^4.0.3",
58-
"@types/ember-qunit": "^5.0.2",
55+
"@tsconfig/ember": "^3.0.3",
56+
"@types/ember": "^4.0.11",
57+
"@types/ember-data": "^4.4.16",
58+
"@types/ember-data__adapter": "^4.0.6",
59+
"@types/ember-data__model": "^4.0.5",
60+
"@types/ember-data__serializer": "^4.0.6",
61+
"@types/ember-data__store": "^4.0.7",
62+
"@types/ember-qunit": "^6.1.1",
5963
"@types/ember-resolver": "^9.0.0",
60-
"@types/ember__application": "^4.0.5",
61-
"@types/ember__array": "^4.0.3",
62-
"@types/ember__component": "^4.0.12",
63-
"@types/ember__controller": "^4.0.4",
64-
"@types/ember__debug": "^4.0.3",
65-
"@types/ember__destroyable": "^4.0.1",
66-
"@types/ember__engine": "^4.0.4",
67-
"@types/ember__error": "^4.0.2",
68-
"@types/ember__object": "^4.0.5",
64+
"@types/ember__application": "^4.0.11",
65+
"@types/ember__array": "^4.0.10",
66+
"@types/ember__component": "^4.0.22",
67+
"@types/ember__controller": "^4.0.12",
68+
"@types/ember__debug": "^4.0.8",
69+
"@types/ember__destroyable": "^4.0.5",
70+
"@types/ember__engine": "^4.0.11",
71+
"@types/ember__error": "^4.0.6",
72+
"@types/ember__object": "^4.0.12",
6973
"@types/ember__owner": "^4.0.4",
70-
"@types/ember__polyfills": "^4.0.1",
71-
"@types/ember__routing": "^4.0.12",
72-
"@types/ember__runloop": "^4.0.2",
73-
"@types/ember__service": "^4.0.2",
74-
"@types/ember__string": "^3.0.10",
75-
"@types/ember__template": "^4.0.1",
76-
"@types/ember__test": "^4.0.1",
74+
"@types/ember__polyfills": "^4.0.6",
75+
"@types/ember__routing": "^4.0.22",
76+
"@types/ember__runloop": "^4.0.10",
77+
"@types/ember__service": "^4.0.9",
78+
"@types/ember__string": "^3.0.15",
79+
"@types/ember__template": "^4.0.6",
80+
"@types/ember__test": "^4.0.6",
7781
"@types/ember__test-helpers": "^2.9.1",
78-
"@types/ember__utils": "^4.0.2",
82+
"@types/ember__utils": "^4.0.7",
7983
"@types/qunit": "^2.19.10",
84+
"@types/rsvp": "^4.0.9",
8085
"broccoli-asset-rev": "^3.0.0",
8186
"concurrently": "^8.0.1",
8287
"ember-cli": "~4.12.1",
83-
"ember-cli-addon-docs": "^5.0.0",
88+
"ember-cli-addon-docs": "^7.0.0",
8489
"ember-cli-dependency-checker": "^3.3.1",
8590
"ember-cli-inject-live-reload": "^2.1.0",
8691
"ember-cli-sri": "^2.1.1",
8792
"ember-cli-terser": "^4.0.2",
88-
"ember-cli-typescript": "^5.2.1",
93+
"ember-data": "^4.12.0",
8994
"ember-load-initializers": "^2.1.2",
9095
"ember-page-title": "^7.0.0",
9196
"ember-qunit": "^6.2.0",
@@ -107,11 +112,12 @@
107112
"stylelint": "^15.4.0",
108113
"stylelint-config-standard": "^32.0.0",
109114
"stylelint-prettier": "^3.0.0",
110-
"typescript": "^4.9.5",
115+
"typescript": "^5.3.3",
111116
"webpack": "^5.89.0"
112117
},
113118
"peerDependencies": {
114-
"ember-source": "^4.0.0"
119+
"ember-source": "^4.0.0",
120+
"typescript": ">= 4.6"
115121
},
116122
"engines": {
117123
"node": "14.* || 16.* || >= 18"

tests/dummy-addon/package.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@
99
"ember-cli-htmlbars": "*"
1010
},
1111
"devDependencies": {
12-
"ember-cli-typescript": "*"
12+
"@glimmer/component": "*",
13+
"@glimmer/tracking": "*",
14+
"ember-cli-typescript": "*",
15+
"typescript": "*"
1316
},
1417
"ember-addon": {
15-
"paths": ["../.."]
18+
"paths": [
19+
"../.."
20+
]
1621
}
1722
}
+6-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
export default config;
2-
31
/**
42
* Type declarations for
5-
* import config from './config/environment'
6-
*
7-
* For now these need to be managed by the developer
8-
* since different ember addons can materialize new entries.
3+
* import config from 'my-app/config/environment'
94
*/
105
declare const config: {
11-
environment: any;
6+
environment: string;
127
modulePrefix: string;
138
podModulePrefix: string;
14-
locationType: string;
9+
locationType: 'history' | 'hash' | 'none' | 'auto';
1510
rootURL: string;
11+
APP: Record<string, unknown>;
1612
};
13+
14+
export default config;

tsconfig.json

+20-31
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,31 @@
11
{
2+
"extends": "@tsconfig/ember/tsconfig.json",
23
"compilerOptions": {
3-
"target": "es2017",
4-
"allowJs": true,
5-
"moduleResolution": "node",
6-
"allowSyntheticDefaultImports": true,
7-
"noImplicitAny": true,
8-
"noImplicitThis": true,
9-
"alwaysStrict": true,
10-
"strictNullChecks": true,
11-
"strictPropertyInitialization": true,
12-
"noFallthroughCasesInSwitch": true,
13-
"noImplicitReturns": true,
14-
"noEmitOnError": false,
15-
"noEmit": true,
16-
"inlineSourceMap": true,
17-
"inlineSources": true,
4+
// The combination of `baseUrl` with `paths` allows Ember's classic package
5+
// layout, which is not resolvable with the Node resolution algorithm, to
6+
// work with TypeScript.
187
"baseUrl": ".",
19-
"module": "es6",
208
"paths": {
21-
"dummy/tests/*": [
22-
"tests/*"
9+
"dummy/tests/*": ["tests/*"],
10+
"dummy/*": ["tests/dummy/app/*", "app/*"],
11+
"dummy-addon": ["tests/dummy-addon/*"],
12+
"@dfreeman/ember-cli-addon-docs-typedoc": ["addon"],
13+
"@dfreeman/ember-cli-addon-docs-typedoc/*": ["addon/*"],
14+
"@dfreeman/ember-cli-addon-docs-typedoc/test-support": [
15+
"addon-test-support"
2316
],
24-
"dummy/*": [
25-
"tests/dummy/app/*"
17+
"@dfreeman/ember-cli-addon-docs-typedoc/test-support/*": [
18+
"addon-test-support/*"
2619
],
27-
"dummy-addon": [
28-
"tests/dummy-addon/addon"
29-
],
30-
"dummy-addon/*": [
31-
"tests/dummy-addon/addon/*"
32-
],
33-
"*": [
34-
"types/*"
35-
]
20+
"*": ["types/*"]
3621
}
3722
},
3823
"include": [
39-
"tests",
40-
"types"
24+
"app/**/*",
25+
"addon/**/*",
26+
"tests/**/*",
27+
"types/**/*",
28+
"test-support/**/*",
29+
"addon-test-support/**/*"
4130
]
4231
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/**
2+
* Catch-all for ember-data.
3+
*/
4+
export default interface ModelRegistry {
5+
[key: string]: any;
6+
}

types/ember-resolver/index.d.ts

-6
This file was deleted.

types/global.d.ts

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Types for compiled templates
2+
declare module '@dfreeman/ember-cli-addon-docs-typedoc/templates/*' {
3+
import { TemplateFactory } from 'ember-cli-htmlbars';
4+
5+
const tmpl: TemplateFactory;
6+
export default tmpl;
7+
}

0 commit comments

Comments
 (0)