Bump ember-cli to 2.18.1

Author: tomasbasham

.eslintrc.js

@@ -4,10 +4,54 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
     browser: true
   },
   rules: {
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'index.js',
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: [
+        'app/**',
+        'addon/**',
+        'tests/dummy/app/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+      })
+    },
+
+    // test files
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      env: {
+        embertest: true
+      }
+    }
+  ]
 };

.gitignore

@@ -14,4 +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,22 +1,33 @@
 ---
 language: node_js
 node_js:
-  - "6"
+  # we recommend testing addons with the same minimum supported node version as Ember CLI
+  # so that your addon works for all apps
+  - "4"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   directories:
     - $HOME/.npm
 
 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
@@ -25,16 +36,14 @@ matrix:
 
 before_install:
   - npm config set spin false
-  - npm install -g phantomjs-prebuilt
-  - phantomjs --version
-
-install:
-  - npm install
+  - npm install -g npm@4
+  - npm --version
 
 script:
+  - npm run lint:js
   # 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
 
 notifications:
   email: false

README.md

@@ -1,4 +1,4 @@
-# Ember-cli-adapter-pattern [![Build Status](https://travis-ci.org/tomasbasham/ember-cli-adapter-pattern.svg?branch=master)](https://travis-ci.org/tomasbasham/ember-cli-adapter-pattern)
+# ember-cli-adapter-pattern [![Build Status](https://travis-ci.org/tomasbasham/ember-cli-adapter-pattern.svg?branch=master)](https://travis-ci.org/tomasbasham/ember-cli-adapter-pattern)
 
 An [Ember CLI](https://ember-cli.com/) addon to standardise a common adapter
 pattern.
@@ -37,11 +37,19 @@ service.
 
 ```JavaScript
 // app/services/social.js
-import Ember from 'ember';
+import Service from '@ember/service';
+
 import Adaptable from 'ember-cli-adapter-pattern/mixins/adaptable';
 import proxyToAdapter from 'ember-cli-adapter-pattern/utils/proxy-to-adapter';
 
-export default Ember.Service.extend(Adaptable, {
+import { getOwner } from '@ember/application';
+import { A } from '@ember/array';
+import { assert } from '@ember/debug';
+import { get, getWithDefault } from '@ember/object';
+import { on } from '@embber/object/evented';
+import { dasherize } from '@ember/string';
+
+export default Service.extend(Adaptable, {
   login: proxyToAdapter('login'), // Provides a safe method to proxy your API to each adapter.
 
   /**
@@ -51,13 +59,14 @@ export default Ember.Service.extend(Adaptable, {
    * `activateAdapters` method is
    * called.
    */
-  createAdapters: Ember.on('init', function() {
-    const adapters = Ember.getWithDefault(this, 'property.with.adapter.configurations', Ember.A());
+  createAdapters: on('init', function() {
+    const adapters = getWithDefault(this, 'property.with.adapter.configurations', A());
 
     this.set('_adapters', {});
     this.set('context', {});
 
-    this.activateAdapters(adapters); // This is important and activates configured adapters.
+    // Activate configured adapter.
+    this.activateAdapters(adapters);
   }),
 
   /**
@@ -68,11 +77,11 @@ export default Ember.Service.extend(Adaptable, {
    * container.
    */
   _lookupAdapter(adapterName) {
-    Ember.assert('Could not find adapter without a name', adapterName);
+    assert('Could not find adapter without a name', adapterName);
 
-    const container = this.get('container');
-    const dasherizedAdapterName = Ember.String.dasherize(adapterName);
-    const adapter = container.lookup(`container:${dasherizedAdapterName}`);
+    const owner = getOwner(this);
+    const dasherizedAdapterName = dasherize(adapterName);
+    const adapter = owner.lookup(`container:${dasherizedAdapterName}`);
 
     return adapter;
   }
@@ -92,14 +101,18 @@ ember object (i.e. a controller) and invoke it as normal.
 
 ```JavaScript
 // app/controller/application.js
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-  social: Ember.Service.inject(),
+import { get } from '@ember/object';
+import { inject } from '@ember/service';
+
+export default Controller.extend({
+  social: inject(),
 
   actions: {
     loginWithService() {
-      this.get('social').login({ username: 'Jean-Luc Picard', password: 'Enterprise-D' });
+      const social = get(this, 'social');
+      social.login({ username: 'Jean-Luc Picard', password: 'Enterprise-D' });
     }
   }
 });
@@ -115,14 +128,17 @@ then you must pass in it's name to the API call.
 
 ```JavaScript
 // app/controller/application.js
-import Ember from 'ember';
+import Controller from '@ember/controller';
+
+import { get } from '@ember/object';
+import { inject } from '@ember/service';
 
-export default Ember.Controller.extend({
-  social: Ember.Service.inject(),
+export default Controller.extend({
+  social: inject(),
 
   actions: {
     loginWithService() {
-      this.get('social').login('Facebook', { username: 'Jean-Luc Picard', password: 'Enterprise-D' });
+      get(this, 'social').login('Facebook', { username: 'Jean-Luc Picard', password: 'Enterprise-D' });
     }
   }
 });
@@ -146,10 +162,10 @@ within the `Adaptable` mixin.
 
 ```JavaScript
 // app/services/social.js
-import Ember from 'ember';
+import Service from '@ember/service';
 import Adaptable from 'ember-cli-adapter-pattern/mixins/adaptable';
 
-export default Ember.Service.extend(Adaptable, {
+export default Service.extend(Adaptable, {
   login(...args) {
     // Extended operations here.
     this.invoke('login', ...args);

addon/mixins/adaptable.js

@@ -1,24 +1,15 @@
-import Ember from 'ember';
-import requiredMethod from 'ember-cli-adapter-pattern/utils/required-method';
-
-const {
-  assert,
-  copy,
-  get,
-  merge,
-  on,
-  set
-} = Ember;
+import Mixin from '@ember/object/mixin';
 
-const {
-  resolve
-} = Ember.RSVP;
+import requiredMethod from 'ember-cli-adapter-pattern/utils/required-method';
 
-const {
-  keys
-} = Object;
+import { assert } from '@ember/debug';
+import { get, set } from '@ember/object';
+import { on } from '@ember/object/evented';
+import { copy } from '@ember/object/internals';
+import { merge } from '@ember/polyfills';
+import { hash, resolve } from 'rsvp';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
 
   /*
    * A cache of active adapters to save
@@ -104,7 +95,7 @@ export default Ember.Mixin.create({
    */
   invoke(methodName, ...args) {
     const cachedAdapters = get(this, '_adapters');
-    const adapterNames = keys(cachedAdapters);
+    const adapterNames = Object.keys(cachedAdapters);
     const [selectedAdapterNames, options] = args.length > 1 ? [[args[0]], args[1]] : [adapterNames, args[0]];
     const context = copy(get(this, 'context'));
     const mergedOptions = merge(context, options);
@@ -117,7 +108,7 @@ export default Ember.Mixin.create({
       promises[adapterName] = resolve(adapter[methodName].call(adapter, mergedOptions));
     });
 
-    return Ember.RSVP.hash(promises);
+    return hash(promises);
   },
 
   /*

addon/utils/proxy-to-adapter.js

@@ -1,8 +1,5 @@
-import Ember from 'ember';
-
-const {
-  assert
-} = Ember;
+import EmberError from '@ember/error';
+import { assert } from '@ember/debug';
 
 /*
  * Utility method, returning a proxy function
@@ -23,7 +20,7 @@ export default function proxyToAdapter(methodName) {
 
   return function(...args) {
     if (!this.invoke && typeof this.invoke !== 'function') {
-      throw new Ember.Error('No invoke method. Have you forgotten to include the Adaptable mixin?');
+      throw new EmberError('No invoke method. Have you forgotten to include the Adaptable mixin?');
     }
 
     return this.invoke(methodName, ...args);

addon/utils/required-method.js

@@ -1,8 +1,5 @@
-import Ember from 'ember';
-
-const {
-  assert
-} = Ember;
+import EmberError from '@ember/error';
+import { assert } from '@ember/debug';
 
 /*
  * Utility method, returning a function that
@@ -21,6 +18,6 @@ export default function requiredMethod(methodName) {
   assert('Method name is required for requiredMethod.', methodName);
 
   return function() {
-    throw new Ember.Error(`Definition of method ${methodName} is required.`);
+    throw new EmberError(`Definition of method ${methodName} is required.`);
   };
 }

addon/utils/required-property.js

@@ -1,9 +1,7 @@
-import Ember from 'ember';
+import EmberError from '@ember/error';
 
-const {
-  assert,
-  computed
-} = Ember;
+import { assert } from '@ember/debug';
+import { computed } from '@ember/object';
 
 /*
  * Utility method, returning a computed
@@ -23,6 +21,6 @@ export default function requiredProperty(propertyName) {
   assert('Property name is required for requiredProperty.', propertyName);
 
   return computed(function() {
-    throw new Ember.Error(`Definition of property ${propertyName} is required.`);
+    throw new EmberError(`Definition of property ${propertyName} is required.`);
   });
 }