Skip to content

Commit 5dffae3

Browse files
committed
Auto merge of #3302 - rust-lang:renovate/ember-concurrency-2.x, r=Turbo87
Update dependency ember-concurrency to v2 [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ember-concurrency](https://togithub.com/machty/ember-concurrency) | [`1.3.0` -> `2.0.2`](https://renovatebot.com/diffs/npm/ember-concurrency/1.3.0/2.0.2) | [![age](https://badges.renovateapi.com/packages/npm/ember-concurrency/2.0.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/ember-concurrency/2.0.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/ember-concurrency/2.0.2/compatibility-slim/1.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/ember-concurrency/2.0.2/confidence-slim/1.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>machty/ember-concurrency</summary> ### [`v2.0.2`](https://togithub.com/machty/ember-concurrency/blob/master/CHANGELOG.md#&#8203;202) [Compare Source](https://togithub.com/machty/ember-concurrency/compare/2.0.1...2.0.2) - Ensure `lastRunning` resets one-by-one as tasks are completed, successfully or not. (Fixes [#&#8203;403](https://togithub.com/machty/ember-concurrency/issues/403)) - Expose `lastValue` decorator in TS definitions (Fixes [#&#8203;406](https://togithub.com/machty/ember-concurrency/issues/406)) ### [`v2.0.1`](https://togithub.com/machty/ember-concurrency/blob/master/CHANGELOG.md#&#8203;201) [Compare Source](https://togithub.com/machty/ember-concurrency/compare/2.0.0...2.0.1) - Prevent synchronous errors in cancelable promise helpers from being rethrown asynchronously later ([#&#8203;402](https://togithub.com/machty/ember-concurrency/issues/402), fixes [#&#8203;400](https://togithub.com/machty/ember-concurrency/issues/400). thanks [`@&#8203;Turbo87](https://togithub.com/Turbo87)` for flagging!) - Restore access to host context from encapsulated tasks ([#&#8203;401](https://togithub.com/machty/ember-concurrency/issues/401)) ### [`v2.0.0`](https://togithub.com/machty/ember-concurrency/blob/master/CHANGELOG.md#&#8203;200) [Compare Source](https://togithub.com/machty/ember-concurrency/compare/1.3.0...2.0.0) - No substantive changes from 2.0.0-rc.2 </details> --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/rust-lang/crates.io).
2 parents 33ced22 + c88c057 commit 5dffae3

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

app/services/session.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export default class SessionService extends Service {
128128
this.savedTransition = null;
129129
this.isLoggedIn = false;
130130

131-
this.loadUserTask.cancelAll({ resetState: true });
131+
yield this.loadUserTask.cancelAll({ resetState: true });
132132
Sentry.setUser(null);
133133

134134
this.router.transitionTo('index');

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"ember-cli-sri": "2.1.1",
8282
"ember-cli-terser": "4.0.1",
8383
"ember-click-outside": "2.0.0",
84-
"ember-concurrency": "1.3.0",
84+
"ember-concurrency": "2.0.2",
8585
"ember-css-modules": "1.3.4",
8686
"ember-data": "3.24.1",
8787
"ember-disable-prototype-extensions": "1.1.3",

yarn.lock

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@
14361436
"@handlebars/parser" "^1.1.0"
14371437
simple-html-tokenizer "^0.5.10"
14381438

1439-
"@glimmer/tracking@1.0.3", "@glimmer/tracking@^1.0.0", "@glimmer/tracking@~1.0.3":
1439+
"@glimmer/tracking@1.0.3", "@glimmer/tracking@^1.0.0", "@glimmer/tracking@^1.0.2", "@glimmer/tracking@~1.0.3":
14401440
version "1.0.3"
14411441
resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.0.3.tgz#8b9b42aff6c206edeaaea178a95acc1eff62e61e"
14421442
integrity sha512-21WR13vPdzt1IQ6JmPPAu4szjV9yKdmLHV3nD0MLDj6/EoYv1c2PqpFBBlp++6xW8OnyDa++cQ8OFoQDP+MRpA==
@@ -6617,14 +6617,16 @@ ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-co
66176617
ember-cli-version-checker "^5.1.1"
66186618
semver "^5.4.1"
66196619

6620-
ember-concurrency@1.3.0:
6621-
version "1.3.0"
6622-
resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-1.3.0.tgz#66f90fb792687470bcee1172adc0ebf33f5e8b9c"
6623-
integrity sha512-DwGlfWFpYyAkTwsedlEtK4t1DznJSculAW6Vq5S1C0shVPc5b6tTpHB2FFYisannSYkm+wpm1f1Pd40qiNPtOQ==
6620+
ember-concurrency@2.0.2:
6621+
version "2.0.2"
6622+
resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-2.0.2.tgz#0fdadb6afae417908970c04492f98f8f2e9d06ec"
6623+
integrity sha512-dIlSg1NFZpNFJf7gEW0etrzfeivnBZKnjx6cSgbP1QUsaYgECoKXmNnuPK9YPZofqAnRZdCawQv4yMmW5zUNiw==
66246624
dependencies:
6625-
ember-cli-babel "^7.7.3"
6625+
"@glimmer/tracking" "^1.0.2"
6626+
ember-cli-babel "^7.22.1"
6627+
ember-cli-htmlbars "^5.3.1"
66266628
ember-compatibility-helpers "^1.2.0"
6627-
ember-maybe-import-regenerator "^0.1.6"
6629+
ember-destroyable-polyfill "^2.0.2"
66286630

66296631
ember-css-modules@1.3.4:
66306632
version "1.3.4"
@@ -6790,7 +6792,7 @@ ember-load-initializers@2.1.2:
67906792
ember-cli-babel "^7.13.0"
67916793
ember-cli-typescript "^2.0.2"
67926794

6793-
ember-maybe-import-regenerator@0.1.6, ember-maybe-import-regenerator@^0.1.6:
6795+
ember-maybe-import-regenerator@0.1.6:
67946796
version "0.1.6"
67956797
resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
67966798
integrity sha1-NdQYKK+m1qWbwNo85H80xXPXdso=

0 commit comments

Comments
 (0)