Update to ember-cli 2.16.2

Mainly to get an updated babel so we don't force a regenerator runtime on apps consuming this addon.

Author: Ben Demboski

.eslintrc.js

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

.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
@@ -14,6 +14,10 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
 
-/.idea
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.npmignore

@@ -8,6 +8,7 @@
 .editorconfig
 .ember-cli
 .gitignore
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json

.travis.yml

@@ -1,24 +1,46 @@
 ---
 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
   - "4"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
-  directories:
-    - node_modules
+  yarn: true
+
+env:
+  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.8
+    - EMBER_TRY_SCENARIO=ember-lts-2.12
+    - 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
-  - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - npm install
-  - bower install
+  - yarn install --no-lockfile --non-interactive
 
 script:
-  - ember try:each
+  # 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 --skip-cleanup

README.md

@@ -28,13 +28,11 @@ use it to wrap any tasks that you want to block asynchronous test helpers:
 
 ```javascript
 // components/my-component.js
-import Ember from 'ember';
+import Component from '@ember/component';
 import { task } from 'ember-concurrency';
 import withTestWaiter from 'ember-concurrency-test-waiter/with-test-waiter';
 import doSomethingAsync from '../utils/do-something-async';
 
-const { Component } = Ember;
-
 export default Component.extend({
   myTask: withTestWaiter(task(function*() {
     return yield doSomethingAsync();
@@ -56,12 +54,10 @@ defineModifier();
 
 ```javascript
 // components/my-component.js
-import Ember from 'ember';
+import Component from '@ember/component';
 import { task } from 'ember-concurrency';
 import doSomethingAsync from '../utils/do-something-async';
 
-const { Component } = Ember;
-
 export default Component.extend({
   myTask: task(function*() {
     return yield doSomethingAsync();
@@ -89,25 +85,21 @@ defineModifier();
 ```javascript
 // app/components/image-size.js
 
-import Ember from 'ember';
+import $ from 'jquery';
+import Component from '@ember/component';
+import { Promise } from 'rsvp';
+import { run } from '@ember/runloop';
 import { task } from 'ember-concurrency';
 
-const {
-  $,
-  Component,
-  RSVP: { Promise },
-  run
-} = Ember;
-
 export default Component.extend({
   src: null,
   dimensions: null,
-  
+
   init() {
     this._super(...arguments);
     this.get('computeDimensions').perform(this.get('src'));
   },
-  
+
   computeDimensions: task(function*(src) {
     let img = yield new Promise((resolve, reject) => {
       let $img = $('<img>');
@@ -134,25 +126,21 @@ export default Component.extend({
 ```javascript
 // tests/integration/components/image-size.js
 
-import Ember from 'ember';
+import { A } from '@ember/array';
+import { run } from '@ember/runloop';
 import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 import wait from 'ember-test-helpers/wait';
 
-const {
-  A,
-  run
-} = Ember;
-
 moduleForComponent('image-size', 'Integration | Component | image-size', {
   integration: true
 });
 
 test('it works', function(assert) {
   assert.expect(2);
-  
+
   this.render(hbs`{{image-size src="assets/test-image.jpg"}}`);
-  
+
   assert.equal(this.$().text().trim(), "loading...");
   return wait().then(() => { // yay!
     assert.equal(this.$().text().trim(), "200x350");

addon/with-test-waiter.js

@@ -1,34 +1,30 @@
+import { assert } from '@ember/debug';
+import { registerWaiter } from '@ember/test';
 import Ember from 'ember';
 
-const {
-  Test,
-  assert,
-  testing
-} = Ember;
-
+let registered = false;
 let taskRunCounter = 0;
 
-if (testing) {
-  Test.registerWaiter(() => taskRunCounter === 0);
-}
-
 // A function that, given a task property, will register it with the test
 // waiter so async test helpers will block anytime a task instance spawned
 // from that property is running.
 export default function withTestWaiter(taskProperty) {
-  if (testing) {
-    assert("withTestWaiter() will only work with ember-concurrency >=0.7.19 -- please upgrade", taskProperty.taskFn);
+  assert("withTestWaiter() will only work with ember-concurrency >=0.7.19 -- please upgrade", taskProperty.taskFn);
+
+  let originalTaskFn = taskProperty.taskFn;
 
-    let originalTaskFn = taskProperty.taskFn;
+  taskProperty.taskFn = function *(...args) {
+    if (Ember.testing && !registered) {
+      registerWaiter(() => taskRunCounter === 0);
+      registered = true;
+    }
 
-    taskProperty.taskFn = function *(...args) {
-      taskRunCounter += 1;
-      try {
-        return yield * originalTaskFn.apply(this, args);
-      } finally {
-        taskRunCounter -= 1;
-      }
-    };
-  }
+    taskRunCounter += 1;
+    try {
+      return yield * originalTaskFn.apply(this, args);
+    } finally {
+      taskRunCounter -= 1;
+    }
+  };
   return taskProperty;
 }

bower.json

@@ -1,18 +1,83 @@
 /* eslint-env node */
 module.exports = {
-  useVersionCompatibility: true,
-
+  useYarn: true,
   scenarios: [
     {
-      name: 'ember-alpha',
-      allowedToFail: true,
+      name: 'ember-lts-2.8',
       bower: {
-        'dependencies': {
-          'ember': 'alpha'
+        dependencies: {
+          'ember': 'components/ember#lts-2-8'
         },
         resolutions: {
-          'ember': 'alpha'
+          'ember': 'lts-2-8'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-lts-2.12',
+      npm: {
+        devDependencies: {
+          'ember-source': '~2.12.0'
+        }
+      }
+    },
+    {
+      name: 'ember-release',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-beta',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#beta'
+        },
+        resolutions: {
+          'ember': 'beta'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-canary',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#canary'
+        },
+        resolutions: {
+          'ember': 'canary'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-default',
+      npm: {
+        devDependencies: {}
       }
     }
   ]

config/ember-try.js

@@ -1,9 +1,10 @@
 /* eslint-env node */
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+'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
   });