Merge pull request #111 from mike-north/updates

Ember 2.17 updates

.eslintrc.js

@@ -4,13 +4,53 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
+  plugins: [
+    'ember'
+  ],
   extends: [
     'eslint:recommended',
-    'plugin:ember-suave/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/**'
+      ],
+      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

@@ -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,5 +14,10 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
-*.sublime-workspace
+
+# 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

.prettierrc

@@ -0,0 +1,9 @@
+{
+  "singleQuote": true,
+  "bracketSpacing": true,
+  "trailingComma": "none",
+  "useTabs": false,
+  "tabWidth": 2,
+  "printWidth": 120,
+  "semi": true
+}

.travis.yml

@@ -1,39 +1,51 @@
+---
 language: node_js
 node_js:
-- '6'
+  - "4"
+
+sudo: false
 dist: trusty
-sudo: required
+
 addons:
-  apt:
-    sources:
-    - google-chrome
-    packages:
-    - google-chrome-stable
+  chrome: stable
+
 cache:
   yarn: true
+
 env:
-- 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:
+    # 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
   allow_failures:
-  - env: EMBER_TRY_SCENARIO=ember-canary
+    - env: EMBER_TRY_SCENARIO=ember-canary
+
 before_install:
-- export CHROME_BIN=chromium-browser
-- export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
-- npm config set spin false
-- curl -o- -L https://yarnpkg.com/install.sh | bash
-- export PATH=$HOME/.yarn/bin:$PATH
-- yarn global add phantomjs-prebuilt
-- phantomjs --version
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
+
 install:
-- yarn install --no-lockfile
+  - yarn install --no-lockfile --non-interactive
+
 script:
-- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - yarn 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
+  - git add -A
+  - git reset --hard HEAD
+
 deploy:
   provider: heroku
   api_key:

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "javascript.implicitProjectConfig.checkJs": true
+}

addon/components/parallax-content.js

@@ -1,12 +1,13 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { htmlSafe } from '@ember/string';
 import layout from '../templates/components/parallax-content';
 
-const { Component, computed, inject, String: { htmlSafe } } = Ember;
-
 export default Component.extend({
   classNames: ['parallax-content'],
   attributeBindings: ['style'],
-  windoc: inject.service(),
+  windoc: service(),
   offsetTop: 0,
   layout,
   cssHeight: computed('height', function() {
@@ -24,8 +25,12 @@ export default Component.extend({
     cssAttrs.push(['position', 'absolute']);
     cssAttrs.push(['width', '100%']);
 
-    return htmlSafe(cssAttrs.map((a) => {
-      return `${a[0]}: ${a[1]}`;
-    }).join('; '));
+    return htmlSafe(
+      cssAttrs
+        .map(a => {
+          return `${a[0]}: ${a[1]}`;
+        })
+        .join('; ')
+    );
   })
 });

addon/components/scroll-speed-adjust.js

@@ -1,12 +1,14 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { scheduleOnce } from '@ember/runloop';
+import { htmlSafe } from '@ember/string';
 import layout from '../templates/components/scroll-speed-adjust';
 
-const { Component, computed, inject, run: { scheduleOnce }, String: { htmlSafe } } = Ember;
-
 export default Component.extend({
   classNames: ['scroll-speed-adjust'],
   layout,
-  windoc: inject.service(),
+  windoc: service(),
   speed: 1,
   attributeBindings: ['style'],
   offsetTop: 0,
@@ -24,10 +26,14 @@ export default Component.extend({
     let cssAttrs = [];
     if (this.get('offsetTop') !== null) {
       cssAttrs.push(['position', 'relative']);
-      cssAttrs.push(['top', `${this.get('offsetTop') - (this.get('windoc.scrollTop') * this.get('speed'))}px`]);
+      cssAttrs.push(['top', `${this.get('offsetTop') - this.get('windoc.scrollTop') * this.get('speed')}px`]);
     }
-    return htmlSafe(cssAttrs.map((a) => {
-      return `${a[0]}: ${a[1]}`;
-    }).join('; '));
+    return htmlSafe(
+      cssAttrs
+        .map(a => {
+          return `${a[0]}: ${a[1]}`;
+        })
+        .join('; ')
+    );
   })
 });

app/components/parallax-content.js

@@ -1 +1 @@
-export { default } from 'ember-parallax/components/parallax-content';
+export { default } from 'ember-parallax/components/parallax-content';

app/components/scroll-speed-adjust.js

@@ -1 +1 @@
-export { default } from 'ember-parallax/components/scroll-speed-adjust';
+export { default } from 'ember-parallax/components/scroll-speed-adjust';

config/ember-try.js

@@ -1,46 +1,30 @@
-/* eslint-env node */
 module.exports = {
+  useYarn: true,
   scenarios: [
     {
-      name: 'ember-lts-2.4',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-4'
-        },
-        resolutions: {
-          'ember': 'lts-2-4'
-        }
-      },
+      name: 'ember-lts-2.12',
       npm: {
         devDependencies: {
-          'ember-source': null
+          'ember-source': '~2.12.0'
         }
       }
     },
     {
-      name: 'ember-lts-2.8',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-8'
-        },
-        resolutions: {
-          'ember': 'lts-2-8'
-        }
-      },
+      name: 'ember-lts-2.16',
       npm: {
         devDependencies: {
-          'ember-source': null
+          'ember-source': '~2.16.0'
         }
       }
     },
     {
       name: 'ember-release',
       bower: {
         dependencies: {
-          'ember': 'components/ember#release'
+          ember: 'components/ember#release'
         },
         resolutions: {
-          'ember': 'release'
+          ember: 'release'
         }
       },
       npm: {
@@ -53,10 +37,10 @@ module.exports = {
       name: 'ember-beta',
       bower: {
         dependencies: {
-          'ember': 'components/ember#beta'
+          ember: 'components/ember#beta'
         },
         resolutions: {
-          'ember': 'beta'
+          ember: 'beta'
         }
       },
       npm: {
@@ -69,10 +53,10 @@ module.exports = {
       name: 'ember-canary',
       bower: {
         dependencies: {
-          'ember': 'components/ember#canary'
+          ember: 'components/ember#canary'
         },
         resolutions: {
-          'ember': 'canary'
+          ember: 'canary'
         }
       },
       npm: {

config/environment.js

@@ -1,6 +1,5 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
-  return { };
+  return {};
 };

ember-cli-build.js

@@ -1,8 +1,9 @@
-/* eslint-env node */
+'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
   });
 

index.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = {

jsconfig.json

@@ -0,0 +1 @@
+{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]}