Merge remote-tracking branch 'origin/master' into checklist

* origin/master:
  resolve the resolved merge conflict
  and actually install bower globally
  and that means you'll have to actually run the bower install in CI
  oops - this app actually has bower deps so don't delete bower.json
  sunnova
  suspect sudo is required to run chrome in travis
  clean up lint errors
  update torii-provider-arcgis to get past build error
  run ember-cli-update and  ember-modules-codemod
  bump node version in travis
  fixed isDestroy(ed|ing) logic
  MTGA
  clean up tests for MTGA

.eslintrc.js

@@ -1,12 +1,15 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
+  plugins: [
+    'ember'
+  ],
   extends: [
     'eslint:recommended',
-    // 'semistandard'
+    'plugin:ember/recommended'
   ],
   env: {
     'browser': true
@@ -22,5 +25,32 @@ module.exports = {
     "Set": false,
     "Map": false,
     "md5": false
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      }
+    },
+
+    // test files
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      env: {
+        embertest: true
+      }
+    }
+  ]
 };

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,9 +13,15 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
+yarn-error.log
 testem.log
 2·
 
 .cache.md
 /itemStore
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.travis.yml

@@ -1,24 +1,31 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
-sudo: false
+sudo: required
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
+
+env:
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
 
 before_install:
   - npm config set spin false
   - npm install -g bower
-  - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
 
 install:
   - npm install
   - bower install
 
 script:
+  - npm run lint:js
   - npm test

CHANGELOG.md

@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 ### Changed
 - update ember-esri-loader to 2.0.0
+- update ember to 2.18
 
 ## [0.0.1]
 ### Added

README.md

@@ -46,23 +46,22 @@ e.g. for item "2f4c72dc471b4baab362c0437273bd51" put that on the tail end of the
 
 You will need the following things properly installed on your computer.
 
-* [Git](http://git-scm.com/)
-* [Node.js](http://nodejs.org/) (with NPM)
-* [Bower](http://bower.io/)
-* [Ember CLI](http://ember-cli.com/)
-* [PhantomJS](http://phantomjs.org/)
+* [Git](https://git-scm.com/)
+* [Node.js](https://nodejs.org/) (with npm)
+* [Ember CLI](https://ember-cli.com/)
+* [Google Chrome](https://google.com/chrome/)
 
 ## Installation
 
 * `git clone <repository-url>` this repository
 * `cd MyStreet`
 * `npm install`
-* `bower install`
 
 ## Running / Development
 
 * `ember serve`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
+* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
 ### Code Generators
 
@@ -84,8 +83,8 @@ Specify what it takes to deploy your app.
 
 ## Further Reading / Useful Links
 
-* [ember.js](http://emberjs.com/)
-* [ember-cli](http://ember-cli.com/)
+* [ember.js](https://emberjs.com/)
+* [ember-cli](https://ember-cli.com/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

app/app.js

@@ -1,13 +1,9 @@
-import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-let App;
-
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
-App = Ember.Application.extend({
+const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

app/application/controller.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

app/application/route.js

@@ -1,11 +1,13 @@
-import Ember from 'ember';
+import { reads } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
-  intl: Ember.inject.service(),
-  session: Ember.inject.service(),
-  hostUrl: Ember.computed.reads('session.portalHostname'),
-  appSettings: Ember.inject.service(),
-  itemService: Ember.inject.service('items-service'),
+export default Route.extend({
+  intl: service(),
+  session: service(),
+  hostUrl: reads('session.portalHostname'),
+  appSettings: service(),
+  itemService: service('items-service'),
 
   queryParams: {
     appid: {

app/components/address-search/component.js

@@ -1,6 +1,7 @@
-import Ember from 'ember';
+import { debounce, run } from '@ember/runloop';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ['address-search'],
 
   minLength: 2,
@@ -43,12 +44,12 @@ export default Ember.Component.extend({
       limit: this.get('limit'),
       async: true,
       source: (query, syncResults, asyncResults) => {
-        Ember.run.debounce(this, 'executeQuery', query, asyncResults, 200, true);
+        debounce(this, 'executeQuery', query, asyncResults, 200, true);
       }
     };
     this.typeahead = this.$('.typeahead').typeahead(opts, datasets)
       .on('typeahead:select', () => {
-        Ember.run(() => {
+        run(() => {
           this.typeahead.typeahead('close');
           this.get('setAddress')(this.get('address'));
         });

app/components/data-citation/component.js

@@ -1,14 +1,11 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
 import ENV from '../../config/environment';
 
-export default Ember.Component.extend({
-  ajax: Ember.inject.service(),
+export default Component.extend({
+  ajax: service(),
   citationFound: false,
 
-  init () {
-    this._super.apply(this, arguments);
-  },
-
   didReceiveAttrs() {
     let envUrl = ENV.APP.baseURL;
     let urlRegex = this.get('layer.url').replace(/.*?\/\//g,"http://");

app/components/inline-style-vars/component.js

@@ -1,14 +1,17 @@
 /* global $ */
-import Ember from 'ember';
+import { observer } from '@ember/object';
 
-export default Ember.Component.extend({
-  ajax: Ember.inject.service(),
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
+
+export default Component.extend({
+  ajax: service(),
   tagName: 'style',
   css: '',
   themeJson: '',
   loaded: false,
 
-  derivedTheme: Ember.observer('themeJson', function() {
+  derivedTheme: observer('themeJson', function() {
     // let brandPrimary = this.get('themeJson.brand.primary') || '#1c66a6';
     let bodyBg = this.get('themeJson.body.bg') || '#f8f8f8';
     let linkColor = this.get('themeJson.brand.secondary') || '#136fbf';

app/components/inline-style/component.js

@@ -1,7 +1,8 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
-  ajax: Ember.inject.service(),
+export default Component.extend({
+  ajax: service(),
   tagName: 'style',
   css: '',
   loaded: false,

app/components/svg-icon/component.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
   // tagName: 'svg',
   classNames: ['svg-icon'],
   ariaRole: 'img',

app/components/topic-feature/component.js

@@ -1,10 +1,11 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
-  featureService: Ember.inject.service(),
-  feature: [],
+export default Component.extend({
+  featureService: service(),
 
-  didInsertElement () {
-    this._super.apply(this, arguments);
+  init () {
+    this._super(...arguments);
+    this.set('feature', []);
   },
 });

app/components/topic-list/component.js

@@ -1,15 +1,21 @@
-import Ember from 'ember';
+import { once } from '@ember/runloop';
+import { observer, computed } from '@ember/object';
+import { on } from '@ember/object/evented';
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
-  featureService: Ember.inject.service(),
-  location: [],
-  featureInfos: [],
+export default Component.extend({
+  featureService: service(),
 
   loading: false,
 
-  onAddressChanged: Ember.on('init', Ember.observer('location', function() {
-    Ember.run.once(this, 'updateFeatures');
+
+  // TODO: replace this w/ didInsertElement()
+  /* eslint-disable ember/no-on-calls-in-components */
+  onAddressChanged: on('init', observer('location', function() {
+    once(this, 'updateFeatures');
   })),
+  /* eslint-enable ember/no-on-calls-in-components */
 
   updateFeatures () {
     let url = this.get('layer.url');
@@ -33,12 +39,16 @@ export default Ember.Component.extend({
       });
   },
 
-  hasData: Ember.computed('featureInfos', function(){
+  hasData: computed('featureInfos', function(){
     return (this.get('featureInfos.length') > 0);
   }),
 
-  didInsertElement () {
-    this._super.apply(this, arguments);
+  init () {
+    this._super(...arguments);
+    this.setProperties({
+      location: [],
+      featureInfos: []
+    })
   },
 
   getValue: function(data, key, fields) {