Merge pull request #197 from rwjblue/update-dependencies

Update ember-cli blueprint to 2.17.1.

.editorconfig

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

.eslintrc.js

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

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

.npmignore

@@ -8,9 +8,14 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .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,38 +1,42 @@
 ---
 language: node_js
 node_js:
-  - "6"
+  # 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:
+  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=default
   - EMBER_TRY_SCENARIO=old-test-loader
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
 
 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:one $EMBER_TRY_SCENARIO
+  # 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
 
 before_deploy:
   - npm install -g auto-dist-tag

config/ember-try.js

@@ -7,63 +7,15 @@ module.exports = {
         dependencies: {
           'ember-cli-test-loader': '0.2.2'
         }
-      }
-    },
-    {
-      name: 'default',
-      npm: {
-        devDependencies: {
-          'ember-cli-test-loader': '^2.2.0'
-        }
-      }
-    },
-    {
-      name: 'ember-release',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#release',
-        },
-        resolutions: {
-          'ember': 'release'
-        }
       },
       npm: {
         devDependencies: {
-          'ember-cli-test-loader': '^2.2.0'
+          'ember-cli-test-loader': null
         }
       }
-    },
+     },
     {
-      name: 'ember-beta',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#beta',
-        },
-        resolutions: {
-          'ember': 'beta',
-        }
-      },
-      npm: {
-        devDependencies: {
-          'ember-cli-test-loader': '^2.2.0',
-        }
-      }
-    },
-    {
-      name: 'ember-canary',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#canary',
-        },
-        resolutions: {
-          'ember': 'canary',
-        }
-      },
-      npm: {
-        devDependencies: {
-          'ember-cli-test-loader': '^2.2.0',
-        }
-      }
+      name: 'default',
     }
   ]
 };

config/environment.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

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

package.json

@@ -2,50 +2,49 @@
   "name": "ember-cli-qunit",
   "version": "4.2.0",
   "description": "QUnit testing package for ember-cli applications",
-  "main": "index.js",
-  "engines": {
-    "node": ">= 4.0"
-  },
-  "scripts": {
-    "changelog": "lerna-changelog",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "ember-addon": {
-    "main": "index.js",
-    "configPath": "tests/dummy/config"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ember-cli/ember-cli-qunit.git"
-  },
   "keywords": [
-    "ember-addon",
     "ember",
+    "ember-addon",
     "qunit"
   ],
+  "homepage": "https://github.com/ember-cli/ember-cli-qunit",
+  "bugs": {
+    "url": "https://github.com/ember-cli/ember-cli-qunit/issues"
+  },
+  "license": "MIT",
   "contributors": [
     "Jake Craige",
     "Stefan Penner",
     "Robert Jackson"
   ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/ember-cli/ember-cli-qunit/issues"
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ember-cli/ember-cli-qunit.git"
+  },
+  "scripts": {
+    "changelog": "lerna-changelog",
+    "test": "ember try:each"
   },
-  "homepage": "https://github.com/ember-cli/ember-cli-qunit",
   "dependencies": {
     "ember-cli-babel": "^6.8.1",
     "ember-qunit": "^3.2.0"
   },
   "devDependencies": {
-    "ember-cli": "^2.4.2",
+    "ember-cli": "~2.17.1",
+    "ember-cli-eslint": "^4.2.1",
     "ember-cli-htmlbars": "^2.0.3",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-test-loader": "^2.2.0",
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.4.0",
+    "ember-source": "~2.17.0",
     "lerna-changelog": "^0.7.0",
     "loader.js": "^4.6.0"
   },
+  "engines": {
+    "node": "^4.5 || 6.* || >= 7.*"
+  },
   "changelog": {
     "repo": "ember-cli/ember-cli-qunit",
     "labels": {
@@ -55,5 +54,9 @@
       "documentation": ":memo: Documentation",
       "internal": ":house: Internal"
     }
+  },
+  "ember-addon": {
+    "main": "index.js",
+    "configPath": "tests/dummy/config"
   }
 }

testem.js

@@ -1,13 +1,22 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "PhantomJS"
+  test_page: 'tests/index.html?hidepassed',
+  disable_watching: true,
+  launch_in_ci: [
+    'Chrome'
   ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
-  ]
+  launch_in_dev: [
+    'Chrome'
+  ],
+  browser_args: {
+    Chrome: {
+      mode: 'ci',
+      args: [
+        '--disable-gpu',
+        '--headless',
+        '--remote-debugging-port=0',
+        '--window-size=1440,900'
+      ]
+    }
+  }
 };

tests/.eslintrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+  env: {
+    embertest: true
+  }
+};