Use latest visit API

app/initializers/ajax.js → app/initializers/server/ajax.js

@@ -1,4 +1,4 @@
-/*globals najax, FastBoot, Ember*/
+/*globals najax, Ember*/
 var nodeAjax = function(url, type, options) {
   var adapter = this;
 
@@ -22,15 +22,7 @@ export default {
   name: 'ajax-service',
 
   initialize: function(application) {
-    // Detect if we're running in Node. If not, there's nothing to do.
-    if (typeof document === 'undefined') {
-      application.register('ajax:node', {
-        create: function() {
-          return nodeAjax;
-        }
-      });
-
-      application.inject('adapter', 'ajax', 'ajax:node');
-    }
+    application.register('ajax:node', nodeAjax, { instantiate: false });
+    application.inject('adapter', 'ajax', 'ajax:node');
   }
 };

app/initializers/server/dom-helper-patches.js

@@ -0,0 +1,17 @@
+/*globals Ember, URL*/
+export default {
+  name: "dom-helper-patches",
+
+  initialize: function(App) {
+    // TODO: remove me
+    Ember.HTMLBars.DOMHelper.prototype.protocolForURL = function(url) {
+      var protocol = URL.parse(url).protocol;
+      return (protocol == null) ? ':' : protocol;
+    };
+
+    // TODO: remove me https://github.com/tildeio/htmlbars/pull/425
+    Ember.HTMLBars.DOMHelper.prototype.parseHTML = function(html) {
+      return this.document.createRawHTMLSection(html);
+    };
+  }
+};

app/instance-initializers/clear-double-boot.js → app/instance-initializers/browser/clear-double-boot.js

@@ -1,3 +1,5 @@
+/*globals Ember*/
+
 // When using `ember fastboot --serve-assets` the application output will
 // already be rendered to the DOM when the actual JavaScript loads. Ember
 // does not automatically clear its `rootElement` so this leads to the
@@ -8,6 +10,8 @@
 // application will replace the pre-rendered output
 
 export default {
+  name: "clear-double-boot",
+
   initialize: function(instance) {
     var originalDidCreateRootView = instance.didCreateRootView;
 

index.js

@@ -1,6 +1,32 @@
 /* jshint node: true */
 'use strict';
 
+var Funnel = require('broccoli-funnel');
+
+// Expose the an factory for the creating the `Application` object
+// with the proper config at a known path, so that the server does
+// not have to disover the app's module prefix ("my-app").
+//
+// The module defined here is prefixed with a `~` to make it less
+// likely to collide with user code, since it is not possible to
+// define a module with a name like this in the file system.
+function fastbootAppModule(prefix) {
+  return [
+    "",
+    "define('~fastboot/app-factory', ['{{MODULE_PREFIX}}/app', '{{MODULE_PREFIX}}/config/environment'], function(App, config) {",
+    "  App = App['default'];",
+    "  config = config['default'];",
+    "",
+    "  return {",
+    "    'default': function() {",
+    "      return App.create(config.APP);",
+    "    }",
+    "  };",
+    "});",
+    ""
+  ].join("\n").replace(/\{\{MODULE_PREFIX\}\}/g, prefix);
+}
+
 module.exports = {
   name: 'ember-cli-fastboot',
 
@@ -11,6 +37,30 @@ module.exports = {
     };
   },
 
+  included: function(app) {
+    if (process.env.EMBER_CLI_FASTBOOT) {
+      process.env.EMBER_CLI_FASTBOOT_APP_NAME = app.name;
+      app.options.autoRun = false;
+    }
+
+    // We serve the index.html from fastboot-dist, so this has to apply to both builds
+    app.options.storeConfigInMeta = false;
+  },
+
+  config: function(/* environment, appConfig */) {
+    // do nothing unless running `ember fastboot` command
+    if (!process.env.EMBER_CLI_FASTBOOT) { return {}; }
+
+    return {
+      EmberENV: {
+        FEATURES: { 'ember-application-visit': true }
+      },
+      APP: {
+        autoboot: false
+      }
+    };
+  },
+
   contentFor: function(type, config) {
     // do nothing unless running `ember fastboot` command
     if (!process.env.EMBER_CLI_FASTBOOT) { return; }
@@ -23,17 +73,28 @@ module.exports = {
       return "<!-- EMBER_CLI_FASTBOOT_TITLE -->";
     }
 
-    if (type === 'vendor-prefix') {
-      return '// Added from ember-cli-fastboot \n' +
-             'EmberENV.FEATURES = EmberENV.FEATURES || {};\n' +
-             'EmberENV.FEATURES["ember-application-visit"] = true;\n';
+    if (type === 'app-boot') {
+      return fastbootAppModule(config.modulePrefix);
     }
   },
 
-  included: function() {
+  treeForApp: function(tree) {
     if (process.env.EMBER_CLI_FASTBOOT) {
-      this.app.options.storeConfigInMeta = false;
-      process.env.EMBER_CLI_FASTBOOT_APP_NAME = this.app.name;
+      return new Funnel(tree, {
+        annotation: 'Funnel: Remove browser-only initializers',
+        exclude: [
+          'initializers/browser/*',
+          'instance-initializers/browser/*'
+        ]
+      });
+    } else {
+      return new Funnel(tree, {
+        annotation: 'Funnel: Remove server-only initializers',
+        exclude: [
+          'initializers/server/*',
+          'instance-initializers/server/*'
+        ]
+      });
     }
   }
 };

lib/commands/fastboot.js

@@ -9,14 +9,16 @@ module.exports = {
     { name: 'environment', type: String, default: 'development', aliases: ['e',{'dev' : 'development'}, {'prod' : 'production'}] },
     { name: 'serve-assets', type: Boolean, default: false },
     { name: 'port', type: Number, default: 3000 },
-    { name: 'output-path', type: String, default: 'fastboot-dist' }
+    { name: 'output-path', type: String, default: 'fastboot-dist' },
+    { name: 'assets-path', type: String, default: 'dist' }
   ],
 
   runCommand: function(appName, options) {
     var FastBootServer = require('ember-fastboot-server');
     var RSVP = require('rsvp');
     var express = require('express');
     var outputPath = this.commandOptions.outputPath;
+    var assetsPath = this.commandOptions.assetsPath;
 
     var server = new FastBootServer({
       appFile: findAppFile(outputPath, appName),
@@ -29,7 +31,7 @@ module.exports = {
 
     if (this.commandOptions.serveAssets) {
       app.get('/', server.middleware());
-      app.use(express.static(outputPath));
+      app.use(express.static(assetsPath));
     }
 
     app.get('/*', server.middleware());

package.json

@@ -42,14 +42,14 @@
     "configPath": "tests/dummy/config"
   },
   "dependencies": {
+    "broccoli-funnel": "0.2.8",
     "chalk": "^0.5.1",
     "contextify": "^0.1.11",
     "debug": "^2.1.0",
-    "ember-fastboot-server": "0.0.2",
+    "ember-fastboot-server": "chancancode/ember-fastboot-server#new-visit-api",
     "express": "^4.8.5",
     "glob": "^4.0.5",
     "najax": "^0.1.5",
-    "rsvp": "^3.0.16",
-    "simple-dom": "^0.2.7"
+    "rsvp": "^3.0.16"
   }
 }

tests/helpers/start-server.js

@@ -3,6 +3,7 @@
 var RSVP = require('rsvp');
 var path = require('path');
 var runCommand = require('ember-cli/tests/helpers/run-command');
+var emberCommand = path.join('.', 'node_modules', 'ember-cli', 'bin', 'ember');
 
 module.exports = function runServer(callback, options) {
   options = options || { };
@@ -12,7 +13,7 @@ module.exports = function runServer(callback, options) {
   }
 
   var args = [
-    path.join('.', 'node_modules', 'ember-cli', 'bin', 'ember'),
+    emberCommand,
     'fastboot',
     '--port', options.port
   ];
@@ -36,7 +37,10 @@ module.exports = function runServer(callback, options) {
   args.push(commandOptions);
 
   return new RSVP.Promise(function(resolve, reject) {
-    runCommand.apply(null, args)
+    runCommand.call(null, emberCommand, 'build') // build 'dist'
+      .then(function() {
+        return runCommand.apply(null, args);
+      })
       .then(function() {
         throw new Error('The server should not have exited successfully.');
       })