Skip to content

Commit 85e95ff

Browse files
committed
Auto merge of #2699 - rust-lang:renovate/ember-router-scroll-3.x, r=Turbo87
Update dependency ember-router-scroll to v3 This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [ember-router-scroll](https://togithub.com/dockyard/ember-router-scroll) | devDependencies | major | [`2.0.2` -> `3.3.3`](https://renovatebot.com/diffs/npm/ember-router-scroll/2.0.2/3.3.3) | --- ### Release Notes <details> <summary>dockyard/ember-router-scroll</summary> ### [`v3.3.3`](https://togithub.com/dockyard/ember-router-scroll/compare/v3.3.2...v3.3.3) [Compare Source](https://togithub.com/dockyard/ember-router-scroll/compare/v3.3.2...v3.3.3) ### [`v3.3.2`](https://togithub.com/dockyard/ember-router-scroll/compare/v3.3.1...v3.3.2) [Compare Source](https://togithub.com/dockyard/ember-router-scroll/compare/v3.3.1...v3.3.2) ### [`v3.3.1`](https://togithub.com/dockyard/ember-router-scroll/compare/v3.3.0...v3.3.1) [Compare Source](https://togithub.com/dockyard/ember-router-scroll/compare/v3.3.0...v3.3.1) ### [`v3.3.0`](https://togithub.com/dockyard/ember-router-scroll/blob/master/CHANGELOG.md#&#8203;330) [Compare Source](https://togithub.com/dockyard/ember-router-scroll/compare/v3.2.0...v3.3.0) - [#&#8203;246](https://togithub.com/DockYard/ember-router-scroll/pull/246) Add Evented trigger didScroll ### [`v3.2.0`](https://togithub.com/dockyard/ember-router-scroll/blob/master/CHANGELOG.md#&#8203;320) [Compare Source](https://togithub.com/dockyard/ember-router-scroll/compare/v3.1.3...v3.2.0) - [#&#8203;244](https://togithub.com/DockYard/ember-router-scroll/pull/244) Bring back scroll recursive ### [`v3.1.3`](https://togithub.com/dockyard/ember-router-scroll/blob/master/CHANGELOG.md#&#8203;313) [Compare Source](https://togithub.com/dockyard/ember-router-scroll/compare/v3.1.2...v3.1.3) - [#&#8203;242](https://togithub.com/DockYard/ember-router-scroll/pull/242) Unique functions to scheduleOnce...follow up - [#&#8203;241](https://togithub.com/DockYard/ember-router-scroll/pull/241) Prevent multiple calls on routeDidChange - [#&#8203;240](https://togithub.com/DockYard/ember-router-scroll/pull/240) Missing setter for scrollWhenAfterRender ### [`v3.1.2`](https://togithub.com/dockyard/ember-router-scroll/compare/v3.1.1...v3.1.2) [Compare Source](https://togithub.com/dockyard/ember-router-scroll/compare/v3.1.1...v3.1.2) ### [`v3.1.1`](https://togithub.com/dockyard/ember-router-scroll/compare/v3.1.0...v3.1.1) [Compare Source](https://togithub.com/dockyard/ember-router-scroll/compare/v3.1.0...v3.1.1) ### [`v3.1.0`](https://togithub.com/dockyard/ember-router-scroll/blob/master/CHANGELOG.md#&#8203;310) [Compare Source](https://togithub.com/dockyard/ember-router-scroll/compare/v3.0.0...v3.1.0) - [#&#8203;239](https://togithub.com/DockYard/ember-router-scroll/pull/239) Scroll when afterRender ### [`v3.0.0`](https://togithub.com/dockyard/ember-router-scroll/blob/master/CHANGELOG.md#&#8203;300) [Compare Source](https://togithub.com/dockyard/ember-router-scroll/compare/v2.0.2...v3.0.0) - [#&#8203;238](https://togithub.com/DockYard/ember-router-scroll/pull/238) Upgrade ember-app-scheduler to v4.0.0 </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**: Renovate will not automatically rebase this PR, because other commits have been found. :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 a51bf4f + ccc6c81 commit 85e95ff

File tree

2 files changed

+26
-20
lines changed

2 files changed

+26
-20
lines changed

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"ember-promise-helpers": "1.0.9",
9292
"ember-qunit": "4.6.0",
9393
"ember-resolver": "8.0.2",
94-
"ember-router-scroll": "2.0.2",
94+
"ember-router-scroll": "3.3.3",
9595
"ember-set-body-class": "^1.0.1",
9696
"ember-source": "3.22.0",
9797
"ember-svg-jar": "2.2.3",
@@ -119,5 +119,8 @@
119119
"engines": {
120120
"node": "^14.9.0",
121121
"npm": "^6.10.2"
122+
},
123+
"resolutions": {
124+
"ember-test-waiters": "^2.0.0"
122125
}
123126
}

yarn.lock

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5879,16 +5879,17 @@ ember-api-actions@0.2.9:
58795879
ember-cli-babel "^7.1.3"
58805880
ember-cli-typescript "^3.0.0"
58815881

5882-
ember-app-scheduler@^1.0.5:
5883-
version "1.0.8"
5884-
resolved "https://registry.yarnpkg.com/ember-app-scheduler/-/ember-app-scheduler-1.0.8.tgz#37adacce2fa5ab59324e2c0b08f3c4a3568025b4"
5885-
integrity sha512-fYCOhQTLb1b+TZ2PBSqyvHXVAxf7qfWD0ZSJTd/IdU/xbLJSt34X75w7qK2uBHZCkVvCNm/ATW3pjFC/0zYk7A==
5882+
ember-app-scheduler@^5.0.1:
5883+
version "5.0.1"
5884+
resolved "https://registry.yarnpkg.com/ember-app-scheduler/-/ember-app-scheduler-5.0.1.tgz#8f73a6c04538b4d156d6e179ce29a29c4a0058dc"
5885+
integrity sha512-WnsdC5MF3/2ArANFJ/m5jH/TIUCQKaxOp+AU9oZhrzd1ucm30sx/MSOOtnpktuJMSjfWXWTOLhAfPKlT08bGjw==
58865886
dependencies:
58875887
"@types/ember" "^3.1.0"
58885888
"@types/rsvp" "^4.0.2"
5889-
ember-cli-babel "^7.1.3"
5890-
ember-cli-typescript "^2.0.0"
5889+
ember-cli-babel "^7.19.0"
5890+
ember-cli-typescript "^3.1.4"
58915891
ember-compatibility-helpers "^1.1.2"
5892+
ember-test-waiters "^2.0.0"
58925893

58935894
ember-assign-polyfill@^2.5.0, ember-assign-polyfill@^2.6.0:
58945895
version "2.7.2"
@@ -6370,7 +6371,7 @@ ember-cli-typescript@3.0.0:
63706371
stagehand "^1.0.0"
63716372
walk-sync "^2.0.0"
63726373

6373-
ember-cli-typescript@^2.0.0, ember-cli-typescript@^2.0.2:
6374+
ember-cli-typescript@^2.0.2:
63746375
version "2.0.2"
63756376
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.2.tgz#464984131fbdc05655eb61d1c3cdd911d3137f0d"
63766377
integrity sha512-7I5azCTxOgRDN8aSSnJZIKSqr+MGnT+jLTUbBYqF8wu6ojs2DUnTePxUcQMcvNh3Q3B1ySv7Q/uZFSjdU9gSjA==
@@ -6388,7 +6389,7 @@ ember-cli-typescript@^2.0.0, ember-cli-typescript@^2.0.2:
63886389
stagehand "^1.0.0"
63896390
walk-sync "^1.0.0"
63906391

6391-
ember-cli-typescript@^3.0.0, ember-cli-typescript@^3.1.3:
6392+
ember-cli-typescript@^3.0.0, ember-cli-typescript@^3.1.3, ember-cli-typescript@^3.1.4:
63926393
version "3.1.4"
63936394
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.1.4.tgz#21d6ccd670d1f2e34c9cce68c6e32c442f46806b"
63946395
integrity sha512-HJ73kL45OGRmIkPhBNFt31I1SGUvdZND+LCH21+qpq3pPlFpJG8GORyXpP+2ze8PbnITNLzwe5AwUrpyuRswdQ==
@@ -6843,12 +6844,12 @@ ember-router-generator@^2.0.0:
68436844
"@babel/traverse" "^7.4.5"
68446845
recast "^0.18.1"
68456846

6846-
ember-router-scroll@2.0.2:
6847-
version "2.0.2"
6848-
resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-2.0.2.tgz#3f68af91e98fc3d494fab352c17a4f29b17db06d"
6849-
integrity sha512-fPpIzrjeyEieIAQuFk1CLq30JXB7oAzHxvKV9el9/LD7K2PykM56g9Q0lE+Ss0OUkczWFmmT18I9v/W+Ywxb/g==
6847+
ember-router-scroll@3.3.3:
6848+
version "3.3.3"
6849+
resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-3.3.3.tgz#65321318b74bfe5b06a243953d1b7d5e9faf1e82"
6850+
integrity sha512-n+TpZ9Dt/UQaRiNpNVTOUur+TsA6hAkorgi4hj7kjbchPd7/n54ZXUTSH0GVyMEkqsZHJeAmuNADjv3zHTfQDQ==
68506851
dependencies:
6851-
ember-app-scheduler "^1.0.5"
6852+
ember-app-scheduler "^5.0.1"
68526853
ember-cli-babel "^7.11.1"
68536854
ember-compatibility-helpers "^1.1.2"
68546855

@@ -6956,13 +6957,15 @@ ember-test-selectors@5.0.0:
69566957
ember-cli-babel "^7.22.1"
69576958
ember-cli-version-checker "^5.1.1"
69586959

6959-
ember-test-waiters@^1.1.1:
6960-
version "1.2.0"
6961-
resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-1.2.0.tgz#c12ead4313934c24cff41857020cacdbf8e6effe"
6962-
integrity sha512-aEw7YuutLuJT4NUuPTNiGFwgTYl23ThqmBxSkfFimQAn+keWjAftykk3dlFELuhsJhYW/S8YoVjN0bSAQRLNtw==
6960+
ember-test-waiters@^1.1.1, ember-test-waiters@^2.0.0:
6961+
version "2.1.3"
6962+
resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-2.1.3.tgz#40fe7b674d5ef1005f665e0e040753f88c5a2175"
6963+
integrity sha512-xDjvq8/1C3b9z3NGpez7aslbq5gsLrxsdjD3apyziHkImh/PTeXZr2bxo/YAUgOwGOtpZ1So0fIsppiSN0u1Ng==
69636964
dependencies:
6964-
ember-cli-babel "^7.11.0"
6965-
semver "^6.3.0"
6965+
ember-cli-babel "^7.21.0"
6966+
ember-cli-typescript "^3.1.3"
6967+
ember-cli-version-checker "^5.1.1"
6968+
semver "^7.1.3"
69666969

69676970
ember-truth-helpers@3.0.0:
69686971
version "3.0.0"

0 commit comments

Comments
 (0)