Merge pull request #199 from machty/snewcomer-upgrade-2.18

upgrade to 2.18

Author: machty

.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 2017,
+    sourceType: 'module'
+  },
+  extends: 'eslint:recommended',
+  env: {
+    browser: true
+  },
+  rules: {
+    'require-yield': 0
+  }
+};

.gitignore

@@ -1,8 +1,9 @@
-# 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
 /tmp
+/tests/dummy/public/api
 
 # dependencies
 /node_modules
@@ -13,14 +14,13 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
+yarn-error.log
 testem.log
-
-TODO.md
-
-deploy.sh
-
-/docs
 .vscode
-tests/dummy/public/api
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
 

.npmignore

@@ -1,24 +1,21 @@
 /bower_components
 /config/ember-try.js
-/config/deploy.js
-/config/release.js
 /dist
 /tests
 /tmp
 **/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
+.eslintrc.js
 .gitignore
-.jshintrc
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
-testem.json
-TODO.md
-vendor/dummy-deps
-builddocs.sh
-API.md
-CNAME
+testem.js
 
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.travis.yml

@@ -1,42 +1,48 @@
 ---
 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: required
 dist: trusty
 
+addons:
+  chrome: stable
+
 cache:
   yarn: true
 
-addons:
-  apt:
-    sources:
-    - google-chrome
-    packages:
-    - google-chrome-stable
-
 env:
-  - EMBER_TRY_SCENARIO=ember-1.13
-  - EMBER_TRY_SCENARIO=ember-lts-2.4
-  - EMBER_TRY_SCENARIO=ember-lts-2.8
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
+  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.4
+    - 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-beta
+    - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add phantomjs-prebuilt
-  - phantomjs --version
 
 install:
-  - yarn global add bower
-  - yarn install --no-lockfile
+  - yarn install --no-lockfile --non-interactive
 
 script:
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  # 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

@@ -52,7 +52,7 @@ This project uses `yarn` as a package manager. If you're adding a new dependency
 
 ### Running Tests
 
-* `yarn test` (Runs `ember try:testall` to test your addon against multiple Ember versions)
+* `yarn test` (Runs `ember try:each` to test your addon against multiple Ember versions)
 * `ember test`
 * `ember test --server`
 

addon/-task-group.js

@@ -1,7 +1,11 @@
-import EmberObject, { computed } from '@ember/object';
+import { or, bool } from '@ember/object/computed';
+import EmberObject from '@ember/object';
 import { objectAssign, _ComputedProperty } from './utils';
 import TaskStateMixin from './-task-state-mixin';
-import { propertyModifiers, resolveScheduler } from './-property-modifiers-mixin';
+import {
+  propertyModifiers,
+  resolveScheduler
+} from './-property-modifiers-mixin';
 
 
 export const TaskGroup = EmberObject.extend(TaskStateMixin, {
@@ -11,8 +15,8 @@ export const TaskGroup = EmberObject.extend(TaskStateMixin, {
     return `<TaskGroup:${this._propertyName}>`;
   },
 
-  _numRunningOrNumQueued: computed.or('numRunning', 'numQueued'),
-  isRunning: computed.bool('_numRunningOrNumQueued'),
+  _numRunningOrNumQueued: or('numRunning', 'numQueued'),
+  isRunning: bool('_numRunningOrNumQueued'),
   isQueued:  false
 });
 

addon/-task-instance.js

@@ -1,6 +1,6 @@
 import { assert } from '@ember/debug';
 import { defer, reject } from 'rsvp';
-import { not } from '@ember/object/computed';
+import { not, and } from '@ember/object/computed';
 import { run, join, schedule } from '@ember/runloop';
 import EmberObject, { computed, get, set } from '@ember/object';
 import Ember from 'ember';
@@ -155,7 +155,7 @@ let taskInstanceAttrs = {
    * @instance
    * @readOnly
    */
-  isCanceled: computed.and('isCanceling', 'isFinished'),
+  isCanceled: and('isCanceling', 'isFinished'),
   isCanceling: false,
 
   /**

addon/-task-property.js

@@ -4,15 +4,30 @@ import { addListener } from '@ember/object/events';
 import EmberObject from '@ember/object';
 import { getOwner } from '@ember/application';
 import Ember from 'ember';
-import { default as TaskInstance, getRunningInstance } from './-task-instance';
-import { PERFORM_TYPE_DEFAULT, PERFORM_TYPE_UNLINKED, PERFORM_TYPE_LINKED } from './-task-instance';
+import {
+  default as TaskInstance,
+  getRunningInstance
+} from './-task-instance';
+import {
+  PERFORM_TYPE_DEFAULT,
+  PERFORM_TYPE_UNLINKED,
+  PERFORM_TYPE_LINKED
+} from './-task-instance';
 import TaskStateMixin from './-task-state-mixin';
 import { TaskGroup } from './-task-group';
-import { propertyModifiers, resolveScheduler } from './-property-modifiers-mixin';
-import { objectAssign, INVOKE, _cleanupOnDestroy, _ComputedProperty } from './utils';
+import {
+  propertyModifiers,
+  resolveScheduler
+} from './-property-modifiers-mixin';
+import {
+  objectAssign,
+  INVOKE,
+  _cleanupOnDestroy,
+  _ComputedProperty
+} from './utils';
 import EncapsulatedTask from './-encapsulated-task';
 
-const PerformProxy = Ember.Object.extend({
+const PerformProxy = EmberObject.extend({
   _task: null,
   _performType: null,
   _linkedObject: null,

addon/-task-state-mixin.js

@@ -1,11 +1,12 @@
+import { gt } from '@ember/object/computed';
 import Mixin from '@ember/object/mixin';
 import { computed } from '@ember/object';
 const { alias } = computed;
 
 // this is a mixin of properties/methods shared between Tasks and TaskGroups
 export default Mixin.create({
-  isRunning: computed.gt('numRunning', 0),
-  isQueued:  computed.gt('numQueued',  0),
+  isRunning: gt('numRunning', 0),
+  isQueued:  gt('numQueued',  0),
   isIdle:    computed('isRunning', 'isQueued', function() {
     return !this.get('isRunning') && !this.get('isQueued');
   }),

app/helpers/cancel-all.js

@@ -1,17 +1,18 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
+import { assert } from '@ember/debug';
 import { taskHelperClosure } from 'ember-concurrency/-helpers';
 
 const CANCEL_REASON = "the 'cancel-all' template helper was invoked";
 
 export function cancelHelper(args) {
   let cancelable = args[0];
   if (!cancelable || typeof cancelable.cancelAll !== 'function') {
-    Ember.assert(`The first argument passed to the \`cancel-all\` helper should be a Task or TaskGroup (without quotes); you passed ${cancelable}`, false);
+    assert(`The first argument passed to the \`cancel-all\` helper should be a Task or TaskGroup (without quotes); you passed ${cancelable}`, false);
   }
 
   return taskHelperClosure('cancel-all', 'cancelAll', [cancelable, CANCEL_REASON]);
 }
 
-export default Ember.Helper.helper(cancelHelper);
+export default helper(cancelHelper);
 
 

app/helpers/perform.js

@@ -1,9 +1,9 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 import { taskHelperClosure } from 'ember-concurrency/-helpers';
 
 export function performHelper(args, hash) {
   return taskHelperClosure('perform', 'perform', args, hash);
 }
 
-export default Ember.Helper.helper(performHelper);
+export default helper(performHelper);
 

app/helpers/task.js

@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 function taskHelper([task, ...args]) {
   return task._curry(...args);
 }
 
-export default Ember.Helper.helper(taskHelper);
+export default helper(taskHelper);