[WIP] Update ember-cli to 3.0 (needs clean-up)

.eslintrc.js

@@ -0,0 +1,48 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 2017,
+    sourceType: 'module'
+  },
+  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
+      })
+    }
+  ]
+};

.gitignore

@@ -9,14 +9,21 @@
 /bower_components
 
 # misc
+/.idea
 /.sass-cache
 /connect.lock
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
 
 # vscode
 .vscodeignore
 jsconfig.json
 /typings
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.npmignore

@@ -7,10 +7,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
+.eslintrc.js
 .gitignore
-.jshintrc
 .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,42 +1,48 @@
 ---
+sudo: false
+dist: trusty
 language: node_js
 node_js:
   - "6"
 
-sudo: false
+addons:
+  chrome: stable
 
 cache:
+  yarn: true
   directories:
     - $HOME/.npm
-    - $HOME/.cache # includes bowers cache
-
 
+# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
 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
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+  matrix:
+    - EMBER_TRY_SCENARIO=ember-lts-2.12
+    - EMBER_TRY_SCENARIO=ember-lts-2.16
+    - EMBER_TRY_SCENARIO=ember-lts-2.18
+    - 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:
-  - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
-  - 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
+  - yarn global add bower 
 
 install:
-  - npm install
+  - yarn install --no-lockfile --non-interactive
   - bower install
 
 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".
-  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016
+Copyright (c) 2018
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

addon/components/d3-element.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/components/d3-element';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName: '',
   'with-transition': true,

addon/components/d3-graph.js

@@ -1,12 +1,10 @@
-import Ember from 'ember';
+import { scheduleOnce } from '@ember/runloop';
+import Component from '@ember/component';
+import { isNone } from '@ember/utils';
 import { select } from 'd3-selection';
 import layout from '../templates/components/d3-graph';
 
-const {
-  isNone
-} = Ember;
-
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName: 'g',
 
@@ -15,7 +13,7 @@ export default Ember.Component.extend({
 
     let selection = this.get('selection');
     if (isNone(selection)) {
-      Ember.run.scheduleOnce('afterRender', this, 'renderChart');
+      scheduleOnce('afterRender', this, 'renderChart');
     }
   },
 

addon/helpers/band-scale.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 import { scaleBand } from 'd3-scale';
 import addOptionsToOrdinalScale from '../utils/add-options-to-ordinal-scale';
 import guidDomainScale from '../utils/guid-domain-scale';
@@ -9,4 +9,4 @@ export function bandScale([domain, range], hash) {
   return scale;
 }
 
-export default Ember.Helper.helper(bandScale);
+export default helper(bandScale);

addon/helpers/cat-color-scale.js

@@ -1,4 +1,6 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
+import { assert } from '@ember/debug';
+import { isPresent } from '@ember/utils';
 import {
   scaleOrdinal,
   schemeCategory10,
@@ -8,11 +10,6 @@ import {
 } from 'd3-scale';
 import guidDomainScale from '../utils/guid-domain-scale';
 
-const {
-  assert,
-  isPresent,
-} = Ember;
-
 const SCALES = {
   10: schemeCategory10,
   '20b': schemeCategory20b,
@@ -35,4 +32,4 @@ export function catColorScale([type, domain]) {
   return scale;
 }
 
-export default Ember.Helper.helper(catColorScale);
+export default helper(catColorScale);

addon/helpers/d3-append.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 export function d3Append([ selector ]) {
   return (d3el) => d3el.append(selector);
 }
 
-export default Ember.Helper.helper(d3Append);
+export default helper(d3Append);

addon/helpers/d3-arc-tween.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 import { interpolate } from 'd3-interpolate';
 
@@ -12,4 +12,4 @@ function d3ArcTween([arc]) {
   };
 }
 
-export default Ember.Helper.helper(d3ArcTween);
+export default helper(d3ArcTween);

addon/helpers/d3-arc.js

@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
+import { isPresent } from '@ember/utils';
 import { arc } from 'd3-shape';
 
-const { isPresent } = Ember;
-
 export function d3Arc(params, { innerRadius, outerRadius, startAngle, endAngle }) {
   let arcFn = arc().outerRadius(outerRadius).innerRadius(innerRadius);
   if (isPresent(startAngle) && isPresent(endAngle)) {
@@ -11,4 +10,4 @@ export function d3Arc(params, { innerRadius, outerRadius, startAngle, endAngle }
   return arcFn;
 }
 
-export default Ember.Helper.helper(d3Arc);
+export default helper(d3Arc);

addon/helpers/d3-area.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 import { area } from 'd3-shape';
 
 export function d3Area( [ xScale, yScale ], { xAccessor, yAccessor } ) {
@@ -10,4 +10,4 @@ export function d3Area( [ xScale, yScale ], { xAccessor, yAccessor } ) {
   return area().x(xFn).y1(y1Fn).y0(y0Fn);
 }
 
-export default Ember.Helper.helper(d3Area);
+export default helper(d3Area);

addon/helpers/d3-array.js

@@ -1,13 +1,15 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
+import { assert } from '@ember/debug';
+import { A } from '@ember/array';
 import array from 'd3-array';
 
-let allowedMethods = Ember.A(['min', 'max', 'extent', 'sum', 'mean', 'median', 'variance', 'deviation', 'scan', 'merge', 'pairs', 'permute']);
+let allowedMethods = A(['min', 'max', 'extent', 'sum', 'mean', 'median', 'variance', 'deviation', 'scan', 'merge', 'pairs', 'permute']);
 
 export function d3Array([ method, ...args ]) {
-  Ember.assert('this method is not yet supported', allowedMethods.includes(method));
+  assert('this method is not yet supported', allowedMethods.includes(method));
 
   let arrayMethod = array[method];
   return arrayMethod.apply(null, args);
 }
 
-export default Ember.Helper.helper(d3Array);
+export default helper(d3Array);

addon/helpers/d3-attr-tween.js

@@ -1,9 +1,9 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 export function d3AttrTween([attr, callback]) {
   return function (d3sel) {
     return d3sel.attrTween(attr, callback);
   };
 }
 
-export default Ember.Helper.helper(d3AttrTween);
+export default helper(d3AttrTween);

addon/helpers/d3-attr.js

@@ -1,9 +1,9 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 export function d3Attr([ attribute, value ]) {
   return function(d3el) {
     return d3el.attr(attribute, value);
   };
 }
 
-export default Ember.Helper.helper(d3Attr);
+export default helper(d3Attr);

addon/helpers/d3-call.js

@@ -1,9 +1,9 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 export function d3Call([ callback, ...args ]) {
   return function(d3el) {
     return d3el.call(callback, ...args);
   };
 }
 
-export default Ember.Helper.helper(d3Call);
+export default helper(d3Call);

addon/helpers/d3-data.js

@@ -1,9 +1,9 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 export function d3Data(params) {
   return function(selection){
     return selection.data(...params);
   };
 }
 
-export default Ember.Helper.helper(d3Data);
+export default helper(d3Data);