Merge branch 'next' into grey_dev

client/build.js

@@ -1,5 +1,3 @@
-#!/bin/sh
-':' //; exec "$(command -v nodejs || command -v node)" "$0" "$@"
 'use strict'
 
 let fs = require('fs')
@@ -25,6 +23,10 @@ function compile(watching) {
     // All source files need to be babelified first
       sourceMapRelative: '.', // source maps will be relative to this dir
     })
+    .transform('uglifyify', {
+      // uglify all sources, not just application code
+      global: true,
+    })
 
   if (watching) {
     bundler.on('update', function() {
@@ -38,7 +40,7 @@ function compile(watching) {
   } else {
     bundler.on('log', msg => {
       console.log(msg)
-      process.exit(0)
+      bundler.close()
     })
   }
 

client/package.json

@@ -17,6 +17,7 @@
     "exorcist": "^0.4.0",
     "mocha": "^2.3.3",
     "rx": "^4.0.7",
+    "uglifyify": "^3.0.1",
     "underscore": "^1.8.3",
     "watchify": "^3.6.1"
   },

server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fusion-server",
   "version": "0.0.1",
-  "description": "Server for RethinkDB fusion",
+  "description": "Server for RethinkDB Project Fusion",
   "main": "main.js",
   "scripts": {
     "test": "./node_modules/.bin/mocha --compilers js:babel-core/register test/test.js test/schema.js"
@@ -12,6 +12,9 @@
   },
   "author": "RethinkDB",
   "license": "MIT",
+  "bin": {
+    "fusion": "./src/main.js"
+  },
   "bugs": {
     "url": "https://github.com/rethinkdb/fusion/issues"
   },

server/src/main.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node --harmony-destructuring
 'use strict';
 
 const fusion = require('./server');