Merge pull request #398 from kratiahuja/kill-ember-fastboot

Kill ember fastboot command

Author: stefanpenner

index.js

@@ -4,7 +4,6 @@
 const path = require('path');
 const fs = require('fs');
 
-const EventEmitter = require('events').EventEmitter;
 const MergeTrees = require('broccoli-merge-trees');
 const FastBootExpressMiddleware = require('fastboot-express-middleware');
 const FastBoot = require('fastboot');
@@ -28,28 +27,15 @@ module.exports = {
 
   init() {
     this._super.init && this._super.init.apply(this, arguments);
-
-    // TODO remove once serve PR is checked in
-    this.emitter = new EventEmitter();
   },
 
-  // TODO remove once serve PR is checked in
+  // TODO remove after few ember-cli-fastboot rc builds
   includedCommands: function() {
     return {
       'fastboot':       require('./lib/commands/fastboot')(this),
     };
   },
 
-  // TODO remove once serve PR is checked in
-  on: function() {
-    this.emitter.on.apply(this.emitter, arguments);
-  },
-
-  // TODO remove once serve PR is checked in
-  emit: function() {
-    this.emitter.emit.apply(this.emitter, arguments);
-  },
-
   /**
    * Called at the start of the build process to let the addon know it will be
    * used. Sets the auto run on app to be false so that we create and route app
@@ -263,14 +249,7 @@ module.exports = {
     }
   },
 
-  // TODO remove once serve PR is checked in
-  outputReady: function() {
-    this.emit('outputReady');
-  },
-
-  // TODO remove once serve PR is checked in
   postBuild: function(result) {
-    this.emit('postBuild');
     if (this.fastboot) {
       // should we reload fastboot if there are only css changes? Seems it maynot be needed.
       // TODO(future): we can do a smarter reload here by running fs-tree-diff on files loaded

lib/commands/fastboot.js

@@ -1,12 +1,6 @@
 'use strict';
 
-const RSVP = require('rsvp');
-const getPort = RSVP.denodeify(require('portfinder').getPort);
-const ServerTask = require('../tasks/fastboot-server');
 const SilentError = require('silent-error');
-const VersionChecker = require('ember-cli-version-checker');
-
-const blockForever = () => (new RSVP.Promise(() => {}));
 
 module.exports = function(addon) {
   return {
@@ -24,69 +18,8 @@ module.exports = function(addon) {
       { name: 'assets-path', type: String, default: 'dist' }
     ],
 
-    blockForever,
-    getPort,
-    ServerTask,
-
     run(options) {
-      const printDeprecations = () => this.printDeprecations(options);
-      const runBuild = () => this.runBuild(options);
-      const runServer = () => this.runServer(options);
-      const startServer = (serverTask) => this.startServer(serverTask, options);
-      const blockForever = this.blockForever;
-
-      return this.checkPort(options)
-        .then(printDeprecations)
-        .then(runServer) // starts on postBuild SIGHUP
-        .then(options.build ? runBuild : startServer)
-        .then(blockForever);
-    },
-
-    runServer(options) {
-      const ServerTask = this.ServerTask;
-      const serverTask = new ServerTask({
-        ui: this.ui,
-        addon: addon
-      });
-      serverTask.run(options);
-      return serverTask;
-    },
-
-    startServer(serverTask, options) {
-      serverTask.start(options);
+      throw new SilentError('the command: `ember fastboot` has been removed, ember serve now supports fastboot.');
     },
-
-    runBuild(options) {
-      const BuildTask = options.watch ? this.tasks.BuildWatch : this.tasks.Build;
-      const buildTask = new BuildTask({
-        ui: this.ui,
-        analytics: this.analytics,
-        project: this.project,
-      });
-      buildTask.run(options); // no return, BuildWatch.run blocks forever
-    },
-
-    checkPort(options) {
-      return this.getPort({ port: options.port, host: options.host })
-        .then((foundPort) => {
-          if (options.port !== foundPort && options.port !== 0) {
-            const message = `Port ${options.port} is already in use.`;
-            return Promise.reject(new SilentError(message));
-          }
-          options.port = foundPort;
-        });
-    },
-
-    printDeprecations(options) {
-      var checker = new VersionChecker(this);
-      var dep = checker.for('ember-cli', 'npm');
-
-      if (dep.gte('2.12.0-beta.1')) {
-        this.ui.writeDeprecateLine('`ember fastboot --serve-assets` is deprecated. Please use `ember serve` to serve your fastboot assets.');
-      } else {
-        this.ui.writeWarnLine('`ember fastboot` will no longer work after FastBoot 1.0 is released.');
-      }
-    },
-
   }
 };

lib/tasks/fastboot-server.js

@@ -10,65 +10,32 @@ const get = RSVP.denodeify(request);
 describe('async content via deferred content', function() {
   this.timeout(400000);
 
-  describe('with fastboot command', function() {
-    let app;
+  let app;
 
-    before(function() {
+  before(function() {
+    app = new AddonTestApp();
 
-      app = new AddonTestApp();
-
-      return app.create('async-content')
-        .then(function() {
-          return app.startServer({
-            command: 'fastboot',
-            additionalArguments: ['--serve-assets']
-          });
-        });
-    });
-
-    after(function() {
-      return app.stopServer();
-    });
-
-    it('waits for async content when using `fastboot.deferRendering`', function() {
-      return get({
-        url: 'http://localhost:49741/'
-      })
-        .then(function(response) {
-          expect(response.body).to.contain('Async content: foo');
+    return app.create('async-content')
+      .then(function() {
+        return app.startServer({
+          command: 'serve'
         });
-    });
+      });
   });
 
-  describe('with serve command', function() {
-    let app;
-
-    before(function() {
-
-      app = new AddonTestApp();
-
-      return app.create('async-content')
-        .then(function() {
-          return app.startServer({
-            command: 'serve'
-          });
-        });
-    });
-
-    after(function() {
-      return app.stopServer();
-    });
+  after(function() {
+    return app.stopServer();
+  });
 
-    it('waits for async content when using `fastboot.deferRendering`', function() {
-      return get({
-        url: 'http://localhost:49741/',
-        headers: {
-          'Accept': 'text/html'
-        }
-      })
-        .then(function(response) {
-          expect(response.body).to.contain('Async content: foo');
-        });
-    });
+  it('waits for async content when using `fastboot.deferRendering`', function() {
+    return get({
+      url: 'http://localhost:49741/',
+      headers: {
+        'Accept': 'text/html'
+      }
+    })
+      .then(function(response) {
+        expect(response.body).to.contain('Async content: foo');
+      });
   });
 });