Skip to content

Commit 1fdb782

Browse files
committed
Update types & ember to 4.x
1 parent e30f6f5 commit 1fdb782

File tree

4 files changed

+261
-234
lines changed

4 files changed

+261
-234
lines changed

docs/ember/testing.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ This is a decent test, and TypeScript actually makes the experience of writing c
260260
To inform TypeScript about this, we need to tell it that the type of `this` in each test assertion includes the `user` property, of type `User`. We’ll start by importing the `TestContext` defined by Ember’s test helpers, and extending it:
261261

262262
```typescript
263-
import { TestContext } from 'ember-test-helpers';
263+
import { TestContext } from '@ember/test-helpers';
264264

265265
import User from 'app/types/user';
266266

@@ -282,9 +282,8 @@ Putting it all together, this is what our updated test definition would look lik
282282
```typescript
283283
import { module, test } from 'qunit';
284284
import { setupRenderingTest } from 'ember-qunit';
285-
import { render } from '@ember/test-helpers';
285+
import { render, TestContext } from '@ember/test-helpers';
286286
import hbs from 'htmlbars-inline-precompile';
287-
import { TestContext } from 'ember-test-helpers';
288287

289288
import User from 'app/types/user';
290289

known-typings.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ For addons which do not have types shipped with the addon directly, you may be f
2525
* `@types/ember-data`
2626
* `@types/ember-mocha`
2727
* `@types/ember-qunit`
28-
* `@types/ember-test-helpers`
29-
* `@types/ember-testing-helpers`
28+
* `@types/ember__test-helpers`
3029
* `@types/ember`
3130
* `@types/rsvp`

package.json

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,23 @@
5454
"@glimmer/component": "^1.0.0-beta.3",
5555
"@glimmer/tracking": "^1.0.0-beta.3",
5656
"@typed-ember/renovate-config": "1.2.1",
57-
"@types/capture-console": "1.0.0",
58-
"@types/chai": "4.2.14",
59-
"@types/chai-as-promised": "7.1.3",
60-
"@types/console-ui": "2.2.3",
57+
"@types/capture-console": "1.0.1",
58+
"@types/chai": "4.3.0",
59+
"@types/chai-as-promised": "7.1.4",
60+
"@types/console-ui": "2.2.5",
6161
"@types/core-object": "3.0.1",
62-
"@types/debug": "4.1.5",
63-
"@types/ember": "3.16.2",
64-
"@types/ember-qunit": "3.4.13",
65-
"@types/ember__object": "^3.1.1",
66-
"@types/esprima": "4.0.2",
67-
"@types/express": "4.17.7",
68-
"@types/fs-extra": "9.0.4",
69-
"@types/got": "9.6.11",
70-
"@types/mocha": "8.0.4",
62+
"@types/debug": "4.1.7",
63+
"@types/ember": "4.0.0",
64+
"@types/ember-qunit": "5.0.0",
65+
"@types/esprima": "4.0.3",
66+
"@types/express": "4.17.13",
67+
"@types/fs-extra": "9.0.13",
68+
"@types/got": "9.6.12",
69+
"@types/mocha": "9.1.0",
7170
"@types/node": "14.14.8",
72-
"@types/qunit": "2.11.1",
73-
"@types/resolve": "1.17.1",
74-
"@types/semver": "7.3.4",
71+
"@types/qunit": "2.11.3",
72+
"@types/resolve": "1.20.1",
73+
"@types/semver": "7.3.9",
7574
"@typescript-eslint/eslint-plugin": "4.8.1",
7675
"@typescript-eslint/parser": "4.8.1",
7776
"broccoli-asset-rev": "3.0.0",
@@ -117,11 +116,9 @@
117116
"rimraf": "3.0.2",
118117
"testdouble": "3.16.1",
119118
"ts-node": "9.0.0",
120-
"typescript": "4.0.5"
119+
"typescript": "4.5.5"
121120
},
122121
"resolutions": {
123-
"@types/ember": "3.16.2",
124-
"@types/ember__string": "3.16.1",
125122
"hawk": "7"
126123
},
127124
"engines": {

0 commit comments

Comments
 (0)