Skip to content

Commit b5f1462

Browse files
committed
Auto merge of #2149 - rust-lang:dependabot/npm_and_yarn/ember-router-scroll-2.0.0, r=locks
Bump ember-router-scroll from 1.3.3 to 2.0.0 Bumps [ember-router-scroll](https://github.com/dockyard/ember-router-scroll) from 1.3.3 to 2.0.0. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/DockYard/ember-router-scroll/blob/master/CHANGELOG.md">ember-router-scroll's changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/DockYard/ember-router-scroll/commit/8695fe28ff01d7e8029bce0fa6018d70584d1cf1"><code>8695fe2</code></a> 2.0.0</li> <li><a href="https://github.com/DockYard/ember-router-scroll/commit/308d21c4d296b0ea6d859942d063d4fa4c24e235"><code>308d21c</code></a> [MAJOR] Class based elements (<a href="https://github-redirect.dependabot.com/dockyard/ember-router-scroll/issues/234">#234</a>)</li> <li><a href="https://github.com/DockYard/ember-router-scroll/commit/a3adb4a96a90e27bdf5a50c48f4da82c682a62cc"><code>a3adb4a</code></a> Bump handlebars from 4.0.12 to 4.5.3 (<a href="https://github-redirect.dependabot.com/dockyard/ember-router-scroll/issues/227">#227</a>)</li> <li><a href="https://github.com/DockYard/ember-router-scroll/commit/c2ace95d9ed47ba2ed51de4af0262189448b95e9"><code>c2ace95</code></a> Bump lodash from 4.17.11 to 4.17.15 (<a href="https://github-redirect.dependabot.com/dockyard/ember-router-scroll/issues/229">#229</a>)</li> <li><a href="https://github.com/DockYard/ember-router-scroll/commit/7fe60727eaf586867b49fb7c4f0d2c97e261f61a"><code>7fe6072</code></a> Bump mixin-deep from 1.3.1 to 1.3.2 (<a href="https://github-redirect.dependabot.com/dockyard/ember-router-scroll/issues/230">#230</a>)</li> <li><a href="https://github.com/DockYard/ember-router-scroll/commit/ab3111366148b8743c8c8541a3d873c056e2b0b0"><code>ab31113</code></a> Bump lodash.merge from 4.6.1 to 4.6.2 (<a href="https://github-redirect.dependabot.com/dockyard/ember-router-scroll/issues/231">#231</a>)</li> <li><a href="https://github.com/DockYard/ember-router-scroll/commit/bb6b6a80545a281975bc55a7adc2da56e1d70edc"><code>bb6b6a8</code></a> Bump lodash.defaultsdeep from 4.6.0 to 4.6.1 (<a href="https://github-redirect.dependabot.com/dockyard/ember-router-scroll/issues/232">#232</a>)</li> <li><a href="https://github.com/DockYard/ember-router-scroll/commit/c496b20ea0da78dcedaf3b44767af45520adca30"><code>c496b20</code></a> Bump tar from 2.2.1 to 2.2.2 (<a href="https://github-redirect.dependabot.com/dockyard/ember-router-scroll/issues/228">#228</a>)</li> <li><a href="https://github.com/DockYard/ember-router-scroll/commit/25f0a1fa8c43d0a7adfa6ccaa8f1f2a5ea1a6c47"><code>25f0a1f</code></a> Update to 3.12 (<a href="https://github-redirect.dependabot.com/dockyard/ember-router-scroll/issues/202">#202</a>)</li> <li><a href="https://github.com/DockYard/ember-router-scroll/commit/a4297a564b8a4c34b5c042c8503d7754830056b4"><code>a4297a5</code></a> Update Changelog</li> <li>See full diff in <a href="https://github.com/dockyard/ember-router-scroll/compare/1.3.3...2.0.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=ember-router-scroll&package-manager=npm_and_yarn&previous-version=1.3.3&new-version=2.0.0)](https://dependabot.com/compatibility-score.html?dependency-name=ember-router-scroll&package-manager=npm_and_yarn&previous-version=1.3.3&new-version=2.0.0) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in the `.dependabot/config.yml` file in this repo: - Update frequency - Automerge options (never/patch/minor, and dev/runtime dependencies) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details>
2 parents 8b63232 + aa4292a commit b5f1462

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

app/router.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import EmberRouter from '@ember/routing/router';
21
import config from './config/environment';
32
import RouterScroll from 'ember-router-scroll';
43

5-
export default class Router extends EmberRouter.extend(RouterScroll) {
4+
export default class Router extends RouterScroll {
65
location = config.locationType;
76
rootURL = config.rootURL;
87
}

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"ember-prism": "^0.5.0",
7272
"ember-promise-helpers": "^1.0.9",
7373
"ember-resolver": "^7.0.0",
74-
"ember-router-scroll": "^1.3.3",
74+
"ember-router-scroll": "^2.0.0",
7575
"ember-template-lint": "^1.13.2",
7676
"ember-source": "~3.16.0",
7777
"ember-svg-jar": "^2.2.3",

0 commit comments

Comments
 (0)