Cleanup, dep updates, update Ember, etc (#206)

.eslintignore

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

.eslintrc.js

@@ -32,15 +32,17 @@ module.exports = {
     // node files
     {
       files: [
+        'ember-cli-build.js',
         'index.js',
         'testem.js',
-        'ember-cli-build.js',
+        'blueprints/*/index.js',
         'config/**/*.js',
         'tests/dummy/config/**/*.js'
       ],
       excludedFiles: [
-        'app/**',
         'addon/**',
+        'addon-test-support/**',
+        'app/**',
         'tests/dummy/app/**'
       ],
       parserOptions: {

.travis.yml

@@ -27,6 +27,7 @@ env:
     - EMBER_TRY_SCENARIO=ember-lts-2.8
     - 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
@@ -50,8 +51,6 @@ after_script:
 
 install:
   - yarn install --no-lockfile --non-interactive
-  - yarn global add bower
-  - bower install
 
 script:
   - yarn lint:js

config/ember-try.js

@@ -110,6 +110,14 @@ module.exports = function() {
             }
           }
         },
+        {
+          name: 'ember-lts-2.18',
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.18.0'
+            }
+          }
+        },
         {
           name: 'ember-release',
           npm: {

ember-cli-build.js

@@ -13,7 +13,7 @@ module.exports = function(defaults) {
     return true;
   };
 
-  let bootstrapPath = `${app.bowerDirectory  }/bootstrap/dist/`;
+  let bootstrapPath = 'node_modules/bootstrap/dist/';
   app.import(`${bootstrapPath}css/bootstrap.css`);
   app.import(`${bootstrapPath}fonts/glyphicons-halflings-regular.eot`, { destDir: '/fonts' });
   app.import(`${bootstrapPath}fonts/glyphicons-halflings-regular.svg`, { destDir: '/fonts' });

package.json

@@ -41,9 +41,10 @@
   "bugs": "https://github.com/html-next/vertical-collection/issues",
   "scripts": {
     "build": "ember build",
-    "lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
+    "lint:js": "eslint ./*.js addon addon-test-support app blueprints config lib server test-support tests",
     "start": "ember serve",
-    "test": "ember try:each"
+    "test": "ember test",
+    "test:all": "ember try:each"
   },
   "dependencies": {
     "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
@@ -58,37 +59,38 @@
     "ember-raf-scheduler": "0.1.0"
   },
   "devDependencies": {
+    "bootstrap": "~3.3.5",
     "broccoli-asset-rev": "^2.4.5",
-    "ember-cli": "~3.0.0-beta.2",
-    "ember-cli-app-version": "^3.1.3",
+    "ember-cli": "~3.1.4",
+    "ember-cli-app-version": "^3.2.0",
     "ember-cli-changelog": "0.3.4",
     "ember-cli-dependency-checker": "^2.1.0",
     "ember-cli-eslint": "^4.2.3",
-    "ember-cli-github-pages": "^0.1.2",
+    "ember-cli-github-pages": "^0.2.0",
     "ember-cli-htmlbars-inline-precompile": "^1.0.2",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.3.0",
-    "ember-cli-release": "^0.2.9",
+    "ember-cli-release": "^1.0.0-beta.2",
     "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
-    "ember-code-snippet": "^2.0.0",
-    "ember-data": "^3.0.0",
+    "ember-code-snippet": "^2.2.0",
+    "ember-data": "^3.1.1",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^1.0.0",
+    "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-native-dom-helpers": "^0.6.2",
     "ember-perf-timeline": "^1.2.1",
     "ember-resolver": "^4.5.0",
-    "ember-source": "~3.0.0-beta.3",
+    "ember-source": "~3.1.0",
     "ember-source-channel-url": "^1.0.1",
-    "ember-try": "^0.2.23",
-    "eslint-plugin-ember": "^5.0.0",
+    "ember-try": "^1.0.0-beta.3",
+    "eslint-plugin-ember": "^5.2.0",
     "eslint-plugin-ember-suave": "^1.0.0",
-    "eslint-plugin-node": "^6.0.0",
-    "fastboot": "^1.0.0-rc.6",
+    "eslint-plugin-node": "^6.0.1",
+    "fastboot": "^1.1.4-beta.1",
     "loader.js": "^4.2.3"
   },
   "engines": {

testem.js

@@ -12,11 +12,14 @@ module.exports = {
     Chrome: {
       mode: 'ci',
       args: [
+        // --no-sandbox is needed when running Chrome inside a container
+        process.env.TRAVIS ? '--no-sandbox' : null,
+
         '--disable-gpu',
         '--headless',
         '--remote-debugging-port=0',
         '--window-size=1440,900'
-      ]
+      ].filter(Boolean)
     }
   }
 };

tests/dummy/app/routes/index/controller.js

@@ -1,8 +1,8 @@
 import Controller from '@ember/controller';
-import Ember from 'ember';
 import config from 'dummy/config/environment';
+import { VERSION } from '@ember/version';
 
 export default Controller.extend({
   version: config.VERSION,
-  emberVersion: Ember.VERSION
+  emberVersion: VERSION
 });

tests/integration/a11y-test.js

@@ -1,10 +1,10 @@
 import { moduleForComponent } from 'ember-qunit';
 import {
-  click,
   find,
   findAll,
   scrollTo
 } from 'ember-native-dom-helpers';
+import { click } from '@ember/test-helpers';
 import wait from 'ember-test-helpers/wait';
 
 import getNumbers from 'dummy/lib/get-numbers';