From 0d062436c5170a9c5f7396aa7ab4b6a455cf5b9a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 1 Feb 2020 14:42:04 +0530
Subject: [PATCH] chore(deps-dev): bump ember-router-scroll from 695d894 to
 2.0.0 (#3925)

* chore(deps-dev): bump ember-router-scroll from 695d894 to 2.0.0

Bumps [ember-router-scroll](https://github.com/dockyard/ember-router-scroll) from 695d894 to 2.0.0. This release includes the previously tagged commit.
- [Release notes](https://github.com/dockyard/ember-router-scroll/releases)
- [Changelog](https://github.com/DockYard/ember-router-scroll/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dockyard/ember-router-scroll/compare/695d89485927f6637a9c2631904b67bbc3f3087a...2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: Areeb Jamal <jamal.areeb@gmail.com>
---
 app/router.js | 25 ++++++++++++-------------
 package.json  |  2 +-
 yarn.lock     | 10 +++++-----
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/router.js b/app/router.js
index 600ca73e374..228d9d3f797 100644
--- a/app/router.js
+++ b/app/router.js
@@ -1,26 +1,25 @@
-import Router from '@ember/routing/router';
 import { scheduleOnce } from '@ember/runloop';
 import { inject as service } from '@ember/service';
 import config from 'open-event-frontend/config/environment';
 import RouterScroll from 'ember-router-scroll';
 
-const router = Router.extend(RouterScroll, {
-  location : config.locationType,
-  rootURL  : config.rootURL,
-  metrics  : service(),
-  session  : service(),
-  headData : service(),
+class Router extends RouterScroll {
+  location = config.locationType;
+  rootURL  = config.rootURL;
+  @service metrics;
+  @service session;
+  @service headData;
 
   setTitle(title) {
     this.headData.set('title', title);
-  },
+  }
 
   init() {
-    this._super(...arguments);
+    super.init(...arguments);
     this.on('routeDidChange', () => {
       this._trackPage();
     });
-  },
+  }
 
   _trackPage() {
     scheduleOnce('afterRender', this, () => {
@@ -30,9 +29,9 @@ const router = Router.extend(RouterScroll, {
       this.set('session.currentRouteName', title);
     });
   }
-});
+}
 
-router.map(function() {
+Router.map(function() {
   this.route('login');
   this.route('register');
   this.route('reset-password');
@@ -219,4 +218,4 @@ router.map(function() {
   });
 });
 
-export default router;
+export default Router;
diff --git a/package.json b/package.json
index 3ddd9db11b0..b4229431a9b 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "ember-qunit": "^4.6.0",
     "ember-resolver": "^7.0.0",
     "ember-route-action-helper": "^2.0.8",
-    "ember-router-scroll": "DockYard/ember-router-scroll#695d894",
+    "ember-router-scroll": "^2.0.0",
     "ember-scroll-to": "^0.6.5",
     "ember-simple-auth": "^2.1.1",
     "ember-simple-auth-token": "^4.0.7",
diff --git a/yarn.lock b/yarn.lock
index 06a8959d52c..056fb462630 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7142,14 +7142,14 @@ ember-router-generator@^2.0.0:
     "@babel/traverse" "^7.4.5"
     recast "^0.18.1"
 
-ember-router-scroll@DockYard/ember-router-scroll#695d894:
-  version "1.1.0"
-  resolved "https://codeload.github.com/DockYard/ember-router-scroll/tar.gz/695d89485927f6637a9c2631904b67bbc3f3087a"
+ember-router-scroll@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-2.0.0.tgz#389adc3c043fb22e7252900b874244006cca3fce"
+  integrity sha512-dUQVk2XH+Ynt9kghpaLwvK9w+Ck1FM61bfWM94vVgoGe5TeN1sdC+d9DFRMgEXnski0WSG7WIDal5/P6SPlOHA==
   dependencies:
     ember-app-scheduler "^1.0.5"
-    ember-cli-babel "^7.1.2"
+    ember-cli-babel "^7.11.1"
     ember-compatibility-helpers "^1.1.2"
-    ember-getowner-polyfill "^2.2.0"
 
 ember-runtime-enumerable-includes-polyfill@2.0.0:
   version "2.0.0"