update to 2.17

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
   extends: 'eslint:recommended',

.gitignore

@@ -14,7 +14,10 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
+
+# ember-try
 .node_modules.ember-try/
 bower.json.ember-try
 package.json.ember-try

.npmignore

@@ -7,10 +7,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.travis.yml

@@ -1,40 +1,49 @@
 ---
 language: node_js
 node_js:
+  # we recommend testing addons with the same minimum supported node version as Ember CLI
+  # so that your addon works for all apps
   - "6"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
+  yarn: true
   directories:
-    - $HOME/.npm
-    - $HOME/.cache # includes bowers cache
+    - $HOME/.cache
 
 env:
-  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
-  - EMBER_TRY_SCENARIO=ember-lts-2.4
-  - EMBER_TRY_SCENARIO=ember-lts-2.8
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
-  - EMBER_TRY_SCENARIO=ember-default
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+  matrix:
+    # we recommend new addons test the current and previous LTS
+    # as well as latest stable release (bonus points to beta/canary)
+    - EMBER_TRY_SCENARIO=ember-lts-2.12
+    - EMBER_TRY_SCENARIO=ember-lts-2.16
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - npm config set spin false
-  - npm install -g bower phantomjs-prebuilt
-  - bower --version
-  - phantomjs --version
-
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
+  - yarn add global bower
 install:
-  - npm install
+  - yarn install --no-lockfile --non-interactive
   - bower install
 
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

addon/adapters/github.js

@@ -1,12 +1,15 @@
+import { inject as service } from '@ember/service';
+import { camelize } from '@ember/string';
+import { computed } from '@ember/object';
+import { isNone } from '@ember/utils';
 import DS from 'ember-data';
-import Ember from 'ember';
+import { pluralize } from 'ember-inflector';
 
 const { RESTAdapter } = DS;
-const { computed, inject, isNone } = Ember;
 
 export default RESTAdapter.extend({
 
-  session: inject.service('github-session'),
+  session: service('github-session'),
 
   host: 'https://api.github.com',
 
@@ -19,7 +22,7 @@ export default RESTAdapter.extend({
   }),
 
   pathForType(type) {
-    return Ember.String.camelize(Ember.String.pluralize(type.replace('github', '')));
+    return camelize(pluralize(type.replace('github', '')));
   },
 
   // Parse Link response header out into an object like:
@@ -42,6 +45,7 @@ export default RESTAdapter.extend({
 
       try {
         [, url] = url.match(/<(.+)>/);
+        //eslint-disable-next-line no-useless-escape
         [, rel] = rel.match(/rel=\"(.+)\"/);
       } catch(error) {
         // Any error in parsing should not cause the application to error

addon/serializers/github.js

@@ -1,7 +1,8 @@
+import { isArray } from '@ember/array';
+import { get } from '@ember/object';
+import { isNone } from '@ember/utils';
+import { pluralize } from 'ember-inflector';
 import DS from 'ember-data';
-import Ember from 'ember';
-
-const { isArray, String:Str, get, isNone } = Ember;
 
 export default DS.RESTSerializer.extend({
 
@@ -10,7 +11,7 @@ export default DS.RESTSerializer.extend({
     let wrappedPayload = {};
     let fieldName = primaryModelClass.modelName;
     if (isArray(payload)) {
-      fieldName = Str.pluralize(fieldName);
+      fieldName = pluralize(fieldName);
     }
     wrappedPayload[fieldName] = payload;
     return this._super(store, primaryModelClass, wrappedPayload, id, requestType);
@@ -25,7 +26,7 @@ export default DS.RESTSerializer.extend({
   //   }
   //
   extractMeta(store, modelClass, payload) {
-    const links = get(payload, `${Str.pluralize(modelClass.modelName)}.links`);
+    const links = get(payload, `${pluralize(modelClass.modelName)}.links`);
 
     if (isNone(links)) {
       return;

addon/services/github-session.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Service } = Ember;
+import Service from '@ember/service';
 
 export default Service.extend({
   githubAccessToken: ''

config/ember-try.js

@@ -1,35 +1,20 @@
 /* eslint-env node */
 module.exports = {
+  useYarn: true,
   scenarios: [
     {
-      name: 'ember-lts-2.4',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-4'
-        },
-        resolutions: {
-          'ember': 'lts-2-4'
-        }
-      },
+      name: 'ember-lts-2.12',
       npm: {
         devDependencies: {
-          'ember-source': null
+          'ember-source': '~2.12.0'
         }
       }
     },
     {
-      name: 'ember-lts-2.8',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-8'
-        },
-        resolutions: {
-          'ember': 'lts-2-8'
-        }
-      },
+      name: 'ember-lts-2.16',
       npm: {
         devDependencies: {
-          'ember-source': null
+          'ember-source': '~2.16.0'
         }
       }
     },

ember-cli-build.js

@@ -1,8 +1,10 @@
 /* eslint-env node */
+'use strict';
+
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  let app = new EmberAddon(defaults, {
     // Add options here
   });
 

package.json

@@ -17,35 +17,35 @@
   "repository": "git@github.com:elwayman02/ember-data-github",
   "scripts": {
     "build": "ember build",
-    "start": "ember server",
+    "start": "ember serve",
     "test": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^5.1.7"
+    "ember-cli-babel": "^6.9.0"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "ember-cli": "2.12.1",
-    "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "^3.0.2",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli": "~2.17.2",
+    "ember-cli-dependency-checker": "^2.0.0",
+    "ember-cli-eslint": "^4.2.1",
+    "ember-cli-htmlbars": "^2.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.1.0",
+    "ember-cli-qunit": "^4.1.1",
     "ember-cli-release": "1.0.0-beta.2",
-    "ember-cli-shims": "^1.0.2",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.12.1",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.1.1",
-    "ember-load-initializers": "^0.6.2",
-    "ember-resolver": "^2.0.3",
-    "ember-source": "~2.12.0",
+    "ember-cli-uglify": "^2.0.0",
+    "ember-data": "^2.18.0",
+    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.0.0",
+    "ember-source": "~2.17.0",
     "loader.js": "^4.2.3"
   },
   "engines": {
-    "node": ">= 4"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.js

@@ -1,12 +1,22 @@
 /* eslint-env node */
 module.exports = {
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "PhantomJS"
+  test_page: 'tests/index.html?hidepassed',
+  disable_watching: true,
+  launch_in_ci: [
+    'Chrome'
   ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
-  ]
+  launch_in_dev: [
+    'Chrome'
+  ],
+  browser_args: {
+    Chrome: {
+      mode: 'ci',
+      args: [
+        '--disable-gpu',
+        '--headless',
+        '--remote-debugging-port=0',
+        '--window-size=1440,900'
+      ]
+    }
+  }
 };

tests/acceptance/current-github-user-test.js

@@ -1,22 +1,19 @@
 /* global Factory */
+import { run } from '@ember/runloop';
+
 import { test } from 'qunit';
 import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
-import startApp from 'dummy/tests/helpers/start-app';
 import Pretender from 'pretender';
-import Ember from 'ember';
-
-const { run } = Ember;
 
-let server, app, container, store;
+let server, container, store;
 
 moduleForAcceptance('Acceptance | current github user', {
   beforeEach() {
     server = new Pretender();
     server.prepareBody = function (body) {
       return JSON.stringify(body);
     };
-    app = startApp();
-    container = app.__container__;
+    container = this.application.__container__;
     store = run(container, 'lookup', 'service:store');
     container.lookup('service:github-session').set('githubAccessToken', 'abc123');
     server.get('/user', () => {
@@ -26,8 +23,6 @@ moduleForAcceptance('Acceptance | current github user', {
 
   afterEach() {
     server.shutdown();
-    run(app, app.destroy);
-    Ember.BOOTED = false;
   }
 });
 
@@ -62,4 +57,3 @@ test(`finding current user's repositories`, function (assert) {
     });
   });
 });
-

tests/acceptance/github-blob-test.js

@@ -1,29 +1,24 @@
 /* global Factory */
+import { run } from '@ember/runloop';
+
 import { test } from 'qunit';
 import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
-import startApp from 'dummy/tests/helpers/start-app';
 import Pretender from 'pretender';
-import Ember from 'ember';
-
-const { run } = Ember;
 
-let server, app, container, store;
+let server, container, store;
 
 moduleForAcceptance('Acceptance | github blob', {
   beforeEach() {
     server = new Pretender();
     server.prepareBody = function (body) {
       return JSON.stringify(body);
     };
-    app = startApp();
-    container = app.__container__;
+    container = this.application.__container__;
     store = run(container, 'lookup', 'service:store');
   },
 
   afterEach() {
     server.shutdown();
-    run(app, app.destroy);
-    Ember.BOOTED = false;
   }
 });