upgrade to [email protected]

Author: crcn

apps/api/bus/db/index.js

@@ -28,5 +28,5 @@ function _wrapBus20(bus) {
     return co(function*() {
       return yield wp(bus, operation);
     });
-  }
-}
+  };
+}

apps/api/bus/db/mock.js

@@ -13,11 +13,10 @@ module.exports = function(app) {
   return bus;
 };
 
-
 function createId() {
   var buffer = [];
   for (var i = 24; i--;) {
     buffer.push(Math.round(Math.random() * 9));
   }
   return buffer.join("");
-}
+}

apps/api/bus/db/mock2.js

@@ -14,7 +14,7 @@ import PasswordKey        from "api/data/models/password-key";
 import httperr            from "httperr";
 import mu                 from "mustache";
 import fs                 from "fs";
-import templates          from "./templates"
+import templates          from "./templates";
 import _command           from "api/bus/drivers/command";
 
 export default function(app, bus) {

apps/api/bus/public-commands/account.js

@@ -1,7 +1,6 @@
 import sift              from "sift";
 import mesh              from "common/mesh";
 import httperr           from "httperr";
-import templates         from "./templates"
 import _command          from "api/bus/drivers/command";
 import Invitee           from "api/data/models/invitee";
 import User              from "api/data/models/user";

apps/api/bus/public-commands/invitees.js

@@ -4,10 +4,9 @@ import mesh               from "common/mesh";
 import httperr            from "httperr";
 import mu                 from "mustache";
 import fs                 from "fs";
-import templates          from "./templates"
 import _command           from "api/bus/drivers/command";
-import cstripe            from "stripe"
-import Organization       from "api/data/models/organization"
+import cstripe            from "stripe";
+import Organization       from "api/data/models/organization";
 
 export default function(app, bus) {
 

apps/api/bus/public-commands/organizations.js

@@ -4,7 +4,7 @@ import mesh           from "common/mesh";
 import httperr        from "httperr";
 import mu             from "mustache";
 import fs             from "fs";
-import templates      from "./templates"
+import templates      from "./templates";
 import _command       from "api/bus/drivers/command";
 import cstripe        from "stripe"
 import StripeCustomer from "api/data/models/stripe-customer"

apps/api/bus/public-commands/payments.js

@@ -1,12 +1,11 @@
 import http       from "http";
-import socket     from "./socket";
 import mesh       from "mesh";
 import routes     from "./routes";
-import koa        from "koa"
+import koa        from "koa";
 import bodyparser from "koa-bodyparser";
 import cors       from "koa-cors"
 import redisStore from "koa-redis";
-import session    from "koa-generic-session"
+import session    from "koa-generic-session";
 import serve      from "koa-static";
 
 /**
@@ -34,16 +33,4 @@ module.exports = function(app) {
 
   var server = app.http = http.createServer(k.callback());
   app.http.listen(port);
-
-  // app.bus({
-  //   name: "intercept",
-  //   max: 1,
-  //   query: { name: "dispose" },
-  //   bus: mesh.wrap(function(operation, next) {
-  //     server.close();
-  //     next();
-  //   })
-  // });
-
-  socket(app);
 };

apps/api/http/index.js

@@ -1,8 +1,9 @@
-var createRouter = require("koa-router");
+import createRouter from "koa-router";
+
 /**
  */
 
-module.exports = function(server, app) {
+export default function(server, app) {
 
   var router = createRouter();
 
@@ -12,7 +13,7 @@ module.exports = function(server, app) {
 
     try {
       this.body = yield app.bus(Object.assign({}, this.request.body, { app: app, session: session, public: true }));
-    } catch(e) {
+    } catch (e) {
       var statusCode = e.statusCode || 500;
       this.status = statusCode;
       this.body = {
@@ -26,6 +27,4 @@ module.exports = function(server, app) {
   });
 
   server.use(router.routes()).use(router.allowedMethods());
-
-}
-
+};

apps/api/http/routes/index.js

@@ -1,34 +1,36 @@
 0 info it worked if it ends with ok
 1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'start' ]
-2 info using npm@2.11.3
-3 info using node@v0.12.7
+2 info using npm@2.14.2
+3 info using node@v4.0.0
 4 verbose run-script [ 'prestart', 'start', 'poststart' ]
 5 info prestart [email protected]
 6 info start [email protected]
 7 verbose unsafe-perm in lifecycle true
 8 info [email protected] Failed to exec start script
-9 verbose stack Error: [email protected] start: `node --harmony .`
+9 verbose stack Error: [email protected] start: `node .`
 9 verbose stack Exit status 1
-9 verbose stack     at EventEmitter.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:213:16)
-9 verbose stack     at EventEmitter.emit (events.js:110:17)
+9 verbose stack     at EventEmitter.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:214:16)
+9 verbose stack     at emitTwo (events.js:87:13)
+9 verbose stack     at EventEmitter.emit (events.js:172:7)
 9 verbose stack     at ChildProcess.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:24:14)
-9 verbose stack     at ChildProcess.emit (events.js:110:17)
-9 verbose stack     at maybeClose (child_process.js:1015:16)
-9 verbose stack     at Process.ChildProcess._handle.onexit (child_process.js:1087:5)
+9 verbose stack     at emitTwo (events.js:87:13)
+9 verbose stack     at ChildProcess.emit (events.js:172:7)
+9 verbose stack     at maybeClose (internal/child_process.js:817:16)
+9 verbose stack     at Process.ChildProcess._handle.onexit (internal/child_process.js:211:5)
 10 verbose pkgid [email protected]
 11 verbose cwd /Users/crcn/Developer/jobs/browsertap/apps/api
 12 error Darwin 14.5.0
 13 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "start"
-14 error node v0.12.7
-15 error npm  v2.11.3
+14 error node v4.0.0
+15 error npm  v2.14.2
 16 error code ELIFECYCLE
-17 error [email protected] start: `node --harmony .`
+17 error [email protected] start: `node .`
 17 error Exit status 1
-18 error Failed at the [email protected] start script 'node --harmony .'.
+18 error Failed at the [email protected] start script 'node .'.
 18 error This is most likely a problem with the api package,
 18 error not with npm itself.
 18 error Tell the author that this fails on your system:
-18 error     node --harmony .
+18 error     node .
 18 error You can get their info via:
 18 error     npm owner ls api
 18 error There is likely additional logging output above.

apps/api/http/socket/index.js

@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start": "node --harmony .",
+    "start": "node .",
     "test": "gulp lint test --only=api"
   },
   "author": "",