Update Ember dependencies to 3.7.*

.eslintrc.js

@@ -317,6 +317,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'testem.js',

.gitignore

@@ -9,6 +9,7 @@
 /node_modules/
 
 # misc
+/.env*
 /.sass-cache
 /connect.lock
 /coverage/

app/adapters/v3.js

@@ -1,4 +1,4 @@
-import { merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 import { underscore } from '@ember/string';
 import { pluralize } from 'ember-inflector';
 import { get } from '@ember/object';
@@ -23,7 +23,7 @@ export default RESTAdapter.extend({
   ajaxOptions: function (url, type = 'GET', options) {
     options = options || {};
     options.data = options.data || {};
-    options.data = merge({}, options.data); // clone
+    options.data = assign({}, options.data); // clone
 
     for (let key in options.data) {
       let value = options.data[key];

app/router.js

@@ -1,17 +1,9 @@
-/* global _gaq */
 import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
 const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL,
-
-  didTransition() {
-    this._super(...arguments);
-    if (config.gaCode) {
-      _gaq.push(['_trackPageview', location.pathname]);
-    }
-  }
 });
 
 Router.map(function () {

app/routes/application.js

@@ -1,4 +1,4 @@
-/* global Travis */
+/* global Travis, _gaq */
 import $ from 'jquery';
 
 import TravisRoute from 'travis/routes/basic';
@@ -14,13 +14,21 @@ export default TravisRoute.extend(BuildFaviconMixin, KeyboardShortcuts, {
   featureFlags: service(),
   flashes: service(),
   repositories: service(),
+  router: service(),
 
   needsAuth: false,
 
   init() {
     this.get('auth').afterSignOut(() => {
       this.afterSignOut();
     });
+
+    this.router.on('routeDidChange', () => {
+      if (config.gaCode) {
+        _gaq.push(['_trackPageview', location.pathname]);
+      }
+    });
+
     return this._super(...arguments);
   },
 

app/routes/basic.js

@@ -32,13 +32,10 @@ export default Route.extend({
   },
 
   redirectToProfile(transition) {
-    // make this hack the least invasive it can be
     let { targetName } = transition;
-    let { params } = transition;
+    let { owner } = this.paramsFor('owner');
     if (targetName === 'owner.repositories' &&
-      params.owner &&
-      params.owner.owner &&
-      params.owner.owner === 'profile') {
+      owner === 'profile') {
       this.transitionTo('account', {
         queryParams: { offset: 0 }
       });

app/routes/first-sync.js

@@ -6,14 +6,15 @@ export default SimpleLayoutRoute.extend({
   activate() {
     let controller;
     controller = this.controllerFor('firstSync');
-    controller.addObserver('isSyncing', this, this.isSyncingDidChange);
+    controller.addObserver('isSyncing', this, 'isSyncingDidChange');
     this.isSyncingDidChange();
   },
 
   deactivate() {
     let controller;
     controller = this.controllerFor('firstSync');
-    return controller.removeObserver('controller.isSyncing', this, this.isSyncingDidChange);
+
+    return controller.removeObserver('controller.isSyncing', this, 'isSyncingDidChange');
   },
 
   isSyncingDidChange() {

app/routes/owner/repositories.js

@@ -16,7 +16,7 @@ export default TravisRoute.extend({
   model({ page }, transition) {
     const limit = config.pagination.profileReposPerPage;
     const offset = (page - 1) * limit;
-    const owner = transition.params.owner.owner;
+    const owner = this.paramsFor('owner').owner;
     const type = 'byOwner';
     const sort_by = 'default_branch.last_build:desc'; // eslint-disable-line
 

app/routes/owner/running.js

@@ -12,7 +12,7 @@ export default TravisRoute.extend({
   model(params, transition) {
     let includes =
       '?include=user.repositories,organization.repositories,build.commit,repository.active';
-    let { owner } = transition.params.owner;
+    let { owner } = this.paramsFor('owner');
     return $.ajax({
       url: `${config.apiEndpoint}/owner/${owner}${includes}`,
       headers: {

app/routes/profile.js

@@ -9,8 +9,8 @@ const SECTION_ROUTE_MAP = {
 export default TravisRoute.extend({
   accounts: service(),
 
-  beforeModel({ params, targetName }) {
-    const { section, login } = params[targetName] || {};
+  beforeModel({ targetName }) {
+    const { section, login } = this.paramsFor('profile') || {};
     const isUserAccount = this.accounts.user.login === login;
     const root = isUserAccount ? 'account' : 'organization';
 

app/utils/fetch-all.js

@@ -1,11 +1,11 @@
-import { merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 
 let fetchAll = function (store, type, query) {
   return store.query(type, query).then((collection) => {
     let nextPage = collection.get('meta.pagination.next');
     if (nextPage) {
       let { limit, offset } = nextPage;
-      return fetchAll(store, type, merge(query, { limit, offset }));
+      return fetchAll(store, type, assign(query, { limit, offset }));
     }
   });
 };

app/utils/keys-map.js

@@ -1,4 +1,4 @@
-import { merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 
 let configKeys, configKeysMap, languageConfigKeys;
 
@@ -56,7 +56,7 @@ configKeys = {
   os: 'OS'
 };
 
-configKeysMap = merge(configKeys, languageConfigKeys);
+configKeysMap = assign(configKeys, languageConfigKeys);
 
 export default configKeysMap;
 

ember-cli-build.js

@@ -36,9 +36,6 @@ module.exports = function () {
     'ember-cli-babel': {
       includePolyfill: true,
     },
-    babel: {
-      blacklist: ['regenerator'],
-    },
     fingerprint: fingerprint,
     sourcemaps: {
       enabled: true,
@@ -79,7 +76,7 @@ module.exports = function () {
   });
 
   const emojiAssets = new Funnel('node_modules/emoji-datasource-apple/img/apple/64', {
-    destDir: '/public/images/emoji'
+    destDir: '/images/emoji'
   });
 
   importNpmDependency(app, 'node_modules/fuzzysort/fuzzysort.js');

mirage/serializers/feature.js

@@ -1,6 +1,6 @@
 import { Serializer } from 'ember-cli-mirage';
 import { isArray } from '@ember/array';
-import { merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 
 export default Serializer.extend({
   serialize(object) {
@@ -17,7 +17,7 @@ export default Serializer.extend({
         '@href': '/features',
         '@representation': 'standard'
       };
-      return merge(metadata, object.attrs);
+      return assign(metadata, object.attrs);
     }
   }
 });

mirage/serializers/preference.js

@@ -1,6 +1,6 @@
 import { Serializer } from 'ember-cli-mirage';
 import { isArray } from '@ember/array';
-import { merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 
 export default Serializer.extend({
   serialize(object) {
@@ -17,7 +17,7 @@ export default Serializer.extend({
         '@href': '/v3/preferences',
         '@representation': 'standard'
       };
-      return merge(metadata, object.attrs);
+      return assign(metadata, object.attrs);
     }
   }
 });