Merge pull request #36 from scottkidder/upgrade-ember-3

Upgrade to Ember 3

Author: jerel

.bowerrc

@@ -13,22 +13,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
 [*.hbs]
 insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
 
 [*.{diff,md}]
 trim_trailing_whitespace = false

.editorconfig

@@ -5,5 +5,6 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "disableAnalytics": false,
+  "yarn": true
 }

.ember-cli

@@ -0,0 +1 @@
+/blueprints/*/files/**/*.js

.eslintignore

@@ -0,0 +1,50 @@
+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: [
+        'ember-cli-build.js',
+        'index.js',
+        'testem.js',
+        'blueprints/*/index.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: [
+        'addon/**',
+        'addon-test-support/**',
+        'app/**',
+        '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
+      })
+    }
+  ]
+};

.eslintrc.js

@@ -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
@@ -13,5 +13,11 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
+yarn-error.log
 testem.log
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.gitignore

@@ -1,14 +1,21 @@
-bower_components/
-tests/
-tmp/
-dist/
-
+/bower_components
+/config/ember-try.js
+/dist
+/tests
+/tmp
+**/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
+.eslintrc.js
+.gitignore
+.watchmanconfig
 .travis.yml
-.npmignore
-**/.gitkeep
 bower.json
-Brocfile.js
-testem.json
+ember-cli-build.js
+testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.jshintrc

@@ -1,34 +1,47 @@
 ---
 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
+    - $HOME/.npm
 
 env:
-  - EMBER_TRY_SCENARIO=default
-  - 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:
+    # 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-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:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
-
-install:
-  - npm install -g bower
-  - npm install
-  - bower install
+  - npm config set spin false
+  - npm install -g npm@4
+  - npm --version
 
 script:
-  - ember try $EMBER_TRY_SCENARIO test
+  - 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 --skip-cleanup

.npmignore

@@ -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:
 

.travis.yml

@@ -6,7 +6,8 @@ A loading indicator component for EmberJS that animates across the top of the vi
 
 [![Build Status](https://travis-ci.org/jerel/ember-cli-loading-slider.svg?branch=master)](https://travis-ci.org/jerel/ember-cli-loading-slider)
 
-## Installation
+Installation
+------------------------------------------------------------------------------
 
 `npm install ember-cli-loading-slider --save-dev`
 
@@ -91,4 +92,3 @@ addition to using the `loading-slider` component.
 Copyright (c) 2014 Jerel Unruh
 
 [Licensed under the MIT license](http://www.opensource.org/licenses/mit-license.php)
-

LICENSE.md

@@ -1,14 +1,16 @@
-import Ember from 'ember';
-
-const { Component, run, isBlank, inject, on } = Ember;
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
+import { run } from '@ember/runloop';
+import { isBlank } from '@ember/utils';
+import $ from 'jquery';
 
 export default Component.extend({
   tagName: 'div',
   classNames: ['loading-slider'],
   classNameBindings: 'expanding',
   progressBarClass: null,
 
-  loadingSlider: inject.service(),
+  loadingSlider: service(),
 
   init() {
     this._super(...arguments);
@@ -22,7 +24,8 @@ export default Component.extend({
     });
   },
 
-  setAttrsThenManage: on('didReceiveAttrs', function() {
+  didReceiveAttrs() {
+    this._super(...arguments);
 
     if (isFastBoot()) { return; }
 
@@ -35,7 +38,7 @@ export default Component.extend({
     });
 
     this.manage();
-  }),
+  },
 
   willDestroy() {
     run.once(this, function() {
@@ -150,8 +153,7 @@ export default Component.extend({
   },
 
   expandItem(color, cleanUp) {
-    let self = this,
-        inner = $('<span>').css({'background-color': color}),
+    let inner = $('<span>').css({'background-color': color}),
         outer = this.$(),
         innerWidth = 0,
         outerWidth = outer.width(),

README.md

@@ -1,16 +1,16 @@
-import Ember from 'ember';
-
-const { Mixin, inject, isPresent } = Ember;
+import { inject as service } from '@ember/service';
+import Mixin from '@ember/object/mixin';
+import { isPresent } from '@ember/utils';
 
 export default Mixin.create({
-  loadingSlider: inject.service(),
+  loadingSlider: service(),
 
   actions: {
     loading() {
       let loadingSliderService = this.get('loadingSlider');
       loadingSliderService.startLoading();
-      if (isPresent(this.router)) {
-        this.router.one('didTransition', function() {
+      if (isPresent(this._router)) {
+        this._router.one('didTransition', function() {
           loadingSliderService.endLoading();
         });
       }

app/components/loading-slider.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Service, Evented } = Ember;
+import Service from '@ember/service';
+import Evented from '@ember/object/evented';
 
 export default Service.extend(Evented, {
   startLoading() {