Merge pull request #610 from ember-fastboot/bump-dep

Bump deps

Author: ef4

.eslintignore

@@ -0,0 +1,16 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+
+# misc
+/coverage/
+
+# ember-try
+/.node_modules.ember-try/

.eslintrc.js

@@ -20,16 +20,18 @@ 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',
         'lib/**/*.js'
       ],
       excludedFiles: [
         'app/**',
-        'addon/**'
+        'addon/**',
+        'addon-test-support/**',
       ],
       parserOptions: {
         sourceType: 'script',

.gitignore

@@ -1,23 +1,23 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist
-/tmp
+/dist/
+/tmp/
 
 # dependencies
-/node_modules
-/bower_components
+/bower_components/
+/node_modules/
 
 # misc
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage/
 /libpeerconnection.log
-npm-debug.log*
-yarn-error.log
-testem.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
 
 # ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.npmignore

@@ -15,6 +15,7 @@
 bower.json
 ember-cli-build.js
 testem.js
+yarn.lock
 
 # ember-try
 .node_modules.ember-try/

package.json

@@ -5,13 +5,13 @@
   "keywords": [
     "ember-addon"
   ],
+  "repository": "https://github.com/ember-fastboot/ember-cli-fastboot",
   "license": "MIT",
   "author": "Tom Dale & Yehuda Katz <[email protected]>",
   "directories": {
     "doc": "doc",
     "test": "tests"
   },
-  "repository": "https://github.com/ember-fastboot/ember-cli-fastboot",
   "scripts": {
     "build": "ember build",
     "lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
@@ -22,17 +22,17 @@
   "dependencies": {
     "broccoli-concat": "^3.2.2",
     "broccoli-funnel": "^2.0.0",
-    "broccoli-merge-trees": "^2.0.0",
+    "broccoli-merge-trees": "^3.0.1",
     "broccoli-plugin": "^1.2.1",
     "chalk": "^2.0.1",
     "ember-cli-babel": "^6.7.2",
     "ember-cli-lodash-subset": "2.0.1",
     "ember-cli-preprocess-registry": "^3.1.0",
     "ember-cli-version-checker": "^2.1.0",
-    "fastboot": "^1.1.4-beta.1",
+    "fastboot": "^1.2.0",
     "fastboot-express-middleware": "^1.1.0",
     "fastboot-transform": "^0.1.2",
-    "fs-extra": "^4.0.2",
+    "fs-extra": "^7.0.0",
     "json-stable-stringify": "^1.0.1",
     "md5-hex": "^2.0.0",
     "silent-error": "^1.0.0"
@@ -46,34 +46,35 @@
     "chai-string": "^1.4.0",
     "co": "^4.6.0",
     "ember-ajax": "^3.0.0",
-    "ember-cli": "~3.0.0",
+    "ember-cli": "~3.3.0",
     "ember-cli-addon-tests": "^0.11.0",
     "ember-cli-dependency-checker": "^2.0.1",
     "ember-cli-eslint": "^4.2.1",
     "ember-cli-htmlbars": "^2.0.2",
     "ember-cli-htmlbars-inline-precompile": "^1.0.2",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.3.0",
+    "ember-cli-qunit": "^4.3.2",
     "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^1.0.0",
+    "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator-for-testing": "^1.0.0",
     "ember-resolver": "^4.5.4",
     "ember-sinon": "^1.0.0",
-    "ember-source": "~3.0.0",
+    "ember-source": "~3.3.0",
     "eslint-plugin-ember": "^5.0.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-node": "^7.0.1",
     "glob": "^7.0.0",
     "loader.js": "^4.2.3",
     "mocha": "^5.0.0",
+    "qunit-dom": "^0.6.2",
     "request": "^2.55.0",
     "rsvp": "^4.0.1"
   },
   "engines": {
-    "node": "^4.5 || 6.* || >= 7.*"
+    "node": "6.* || 8.* || >= 10.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",

testem.js

@@ -9,13 +9,14 @@ module.exports = {
   ],
   browser_args: {
     Chrome: {
-      mode: 'ci',
-      args: [
+      ci: [
         // --no-sandbox is needed when running Chrome inside a container
-        process.env.TRAVIS ? '--no-sandbox' : null,
-
-        '--disable-gpu',
+        process.env.CI ? '--no-sandbox' : null,
         '--headless',
+        '--disable-gpu',
+        '--disable-dev-shm-usage',
+        '--disable-software-rasterizer',
+        '--mute-audio',
         '--remote-debugging-port=0',
         '--window-size=1440,900'
       ].filter(Boolean)

tests/dummy/config/targets.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const browsers = [
   'last 1 Chrome versions',
   'last 1 Firefox versions',