Merge branch 'master' into stable

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nylas",
   "productName": "Nylas N1",
-  "version": "0.4.37",
+  "version": "0.4.38",
   "description": "An extensible, open-source mail client built on the modern web.",
   "main": "./src/browser/main.js",
   "repository": {

src/compile-support/babel.js

@@ -2,7 +2,6 @@
 
 var crypto = require('crypto')
 var path = require('path')
-var defaultOptions = require('../../static/babelrc.json')
 
 var babel = null
 var babelVersionDirectory = null
@@ -12,6 +11,14 @@ var babelVersionDirectory = null
 // babel-polyfill.
 require('babel-regenerator-runtime');
 
+// We run babel with lots of different working directories (like plugin folders).
+// To make sure presets always resolve to the correct path inside N1, resolve
+// them to their absolute paths ahead of time.
+var defaultOptions = require('../../static/babelrc.json')
+defaultOptions.presets = defaultOptions.presets.map((modulename) =>
+  require.resolve(`babel-preset-${modulename}`)
+);
+
 exports.shouldCompile = function (sourceCode, filePath) {
   return (filePath.endsWith('.es6') || filePath.endsWith('.jsx'))
 }

src/flux/nylas-long-connection.es6

@@ -182,7 +182,6 @@ export default class NylasLongConnection {
   }
 
   dispose(status) {
-    this._emitter.dispose()
     this._buffer = ''
     if (this._req) {
       this._req.end()