Merge pull request #190 from ember-fastboot/fastboot-1.0.0-beta.1

Update to use fastboot-express-middleware

Author: tomdale

.travis.yml

@@ -1,9 +1,8 @@
 ---
 language: node_js
 node_js:
-  - "stable"
+  - "5"
   - "4"
-  - "0.12"
 
 env:
   - CXX=g++-4.8 WORKER_COUNT=2

lib/commands/fastboot.js

@@ -25,23 +25,24 @@ module.exports = {
 
     return exec('npm install', { cwd: outputPath })
       .then(function() {
-        var FastBootServer = require('ember-fastboot-server');
+        var fastbootMiddleware = require('fastboot-express-middleware');
         var RSVP = require('rsvp');
         var express = require('express');
 
-        var server = new FastBootServer({
-          distPath: outputPath,
-          ui: ui
-        });
+        var middleware = fastbootMiddleware(outputPath);
 
         var app = express();
 
         if (commandOptions.serveAssets) {
-          app.get('/', server.middleware());
+          app.get('/', middleware);
           app.use(express.static(assetsPath));
         }
 
-        app.get('/*', server.middleware());
+        app.get('/*', middleware);
+
+        app.use(function(req, res) {
+          res.sendStatus(404);
+        });
 
         var listener = app.listen(options.port, options.host, function() {
           var host = listener.address().address;

package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "start": "ember server",
     "build": "ember build",
-    "test": "node tests/runner",
+    "test": "mocha",
     "test:precook": "node node_modules/ember-cli-addon-tests/scripts/precook-node-modules.js"
   },
   "engines": {
@@ -23,9 +23,9 @@
     "chai": "^2.2.0",
     "chai-fs": "peterkc/chai-fs#31deec5232297e2887a2ffb39b9081364c8e78e1",
     "chalk": "^1.1.1",
-    "cpr": "^1.0.0",
-    "ember-cli": "^2.4.0",
-    "ember-cli-addon-tests": "^0.2.6",
+    "cpr": "^1.1.1",
+    "ember-cli": "^2.5.0",
+    "ember-cli-addon-tests": "^0.3.0",
     "ember-cli-app-version": "0.5.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.1",
@@ -62,7 +62,7 @@
     "broccoli-merge-trees": "^1.1.1",
     "broccoli-plugin": "^1.2.1",
     "broccoli-stew": "^1.2.0",
-    "ember-fastboot-server": "^0.7.3",
+    "fastboot-express-middleware": "1.0.0-beta.3",
     "express": "^4.8.5",
     "fastboot-filter-initializers": "0.0.2",
     "lodash.clonedeep": "^4.3.1",