Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade devDependencies #312

Merged
merged 4 commits into from
Nov 6, 2020
Merged

Upgrade devDependencies #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
681cc20
upgrade deps
stefanpenner Nov 6, 2020
41c8394
upgrade deps
stefanpenner Nov 6, 2020
c0ab97d
update deps
stefanpenner Nov 6, 2020
c296705
update deps
stefanpenner Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/rsvp/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ declare module 'rsvp' {
| ((value: T) => TResult1 | PromiseLike<TResult1>)
| undefined
| null;
export type OnRejected<T, TResult2> =
export type OnRejected<TResult2> =
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this T seem unused? What am i missing...

| ((reason: any) => TResult2 | PromiseLike<TResult2>)
| undefined
| null;
Expand Down
30 changes: 15 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,30 @@
"@glimmer/env": "^0.1.7"
},
"devDependencies": {
"@babel/plugin-transform-modules-amd": "^7.10.5",
"@babel/plugin-transform-modules-commonjs": "^7.10.4",
"@types/node": "^12.7.5",
"@types/qunit": "^2.9.1",
"@typescript-eslint/eslint-plugin": "^3.7.0",
"@typescript-eslint/parser": "^3.7.0",
"@babel/plugin-transform-modules-amd": "^7.12.1",
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
"@types/node": "^14.14.6",
"@types/qunit": "^2.9.6",
"@typescript-eslint/eslint-plugin": "^4.6.1",
"@typescript-eslint/parser": "^4.6.1",
"babel-plugin-debug-macros": "^0.3.3",
"backburner.js": "^2.6.0",
"broccoli-babel-transpiler": "^7.6.0",
"broccoli-babel-transpiler": "^7.8.0",
"broccoli-concat": "^4.2.4",
"broccoli-funnel": "^3.0.3",
"broccoli-merge-trees": "^4.2.0",
"broccoli-typescript-compiler": "^6.0.0",
"ember-cli": "~3.19.0",
"broccoli-typescript-compiler": "^7.0.0",
stefanpenner marked this conversation as resolved.
Show resolved Hide resolved
"ember-cli": "~3.22.0",
"ensure-posix-path": "^1.1.1",
"eslint": "^7.5.0",
"eslint-config-prettier": "^6.11.0",
"eslint": "^7.12.1",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-prettier": "^3.1.4",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "2.0.5",
"qunit": "^2.10.1",
"release-it": "^14.0.2",
"release-it-lerna-changelog": "^2.4.0",
"prettier": "^2.1.2",
"qunit": "^2.11.3",
"release-it": "^14.2.1",
"release-it-lerna-changelog": "^3.1.0",
"route-recognizer": "^0.3.4",
"rsvp": "^4.8.5"
},
Expand Down
17 changes: 12 additions & 5 deletions tests/route_info_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,19 @@ test('UnresolvedRouteInfoByObject does NOT get its model hook called', function
assert.expect(1);

class TestRouteInfo extends UnresolvedRouteInfoByObject<Route> {
route = createHandler('uresolved', {
model: function () {
assert.ok(false, "I shouldn't be called because I already have a context/model");
},
});
__routeHandler?: Route;
get route(): Route {
if (this.__routeHandler) {
return this.__routeHandler;
}
return (this.__routeHandler = createHandler('uresolved', {
model: function () {
assert.ok(false, "I shouldn't be called because I already have a context/model");
},
}));
}
}

let routeInfo = new TestRouteInfo(
new TestRouter(),
'unresolved',
Expand Down
3 changes: 0 additions & 3 deletions tests/router_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2949,9 +2949,6 @@ scenarios.forEach(function (scenario) {

// Go to post 3. This triggers our test.
transitionTo(router, '/posts/3');

// Clean up.
delete router.willTransition;
});

test('tests whether arguments to transitionTo are considered active', function (assert) {
Expand Down
Loading