feat(babel6): Fix spread operator

internal_packages/composer/lib/decorators/inflate-draft-client-id.es6

@@ -1,7 +1,8 @@
 import React from 'react';
 import {DraftStore, Actions, Utils} from 'nylas-exports';
 
-export default ComposedComponent => class extends React.Component {
+function InflateDraftClientId(ComposedComponent) {
+  return class extends React.Component {
     static displayName = ComposedComponent.displayName;
     static propTypes = {
       draftClientId: React.PropTypes.string,
@@ -95,4 +96,6 @@ export default ComposedComponent => class extends React.Component {
       }
       return <ComposedComponent ref="composed" {...this.props} {...this.state} />;
     }
-};
+  };
+}
+export default InflateDraftClientId

src/components/decorators/listens-to-flux-store.es6

@@ -1,36 +0,0 @@
-import React, {Component} from 'react';
-
-export default (ComposedComponent, {stores, getStateFromStores}) => class extends Component {
-  static displayName = ComposedComponent.displayName;
-
-  static containerRequired = false;
-
-  constructor(props) {
-    super(props);
-    this._unlisteners = [];
-    this.state = getStateFromStores(props);
-  }
-
-  componentDidMount() {
-    stores.forEach((store) => {
-      this._unlisteners.push(store.listen(() => {
-        this.setState(getStateFromStores(this.props));
-      }));
-    });
-  }
-
-  componentWillReceiveProps(nextProps) {
-    this.setState(getStateFromStores(nextProps));
-  }
-
-  componentWillUnmount() {
-    for (const unlisten of this._unlisteners) {
-      unlisten();
-    }
-    this._unlisteners = [];
-  }
-
-  render() {
-    return <ComposedComponent {...this.props} {...this.state} />;
-  }
-};

src/components/decorators/listens-to-flux-store.jsx

@@ -0,0 +1,40 @@
+import React, {Component} from 'react';
+
+function ListensToFluxStore(ComposedComponent, {stores, getStateFromStores}) {
+  return class extends Component {
+    static displayName = ComposedComponent.displayName;
+
+    static containerRequired = false;
+
+    constructor(props) {
+      super(props);
+      this._unlisteners = [];
+      this.state = getStateFromStores(props);
+    }
+
+    componentDidMount() {
+      stores.forEach((store) => {
+        this._unlisteners.push(store.listen(() => {
+          this.setState(getStateFromStores(this.props));
+        }));
+      });
+    }
+
+    componentWillReceiveProps(nextProps) {
+      this.setState(getStateFromStores(nextProps));
+    }
+
+    componentWillUnmount() {
+      for (const unlisten of this._unlisteners) {
+        unlisten();
+      }
+      this._unlisteners = [];
+    }
+
+    render() {
+      return <ComposedComponent {...this.props} {...this.state} />;
+    }
+  };
+}
+
+export default ListensToFluxStore

src/extensions/extension-utils.es6

@@ -2,6 +2,7 @@ import RegExpUtils from '../regexp-utils';
 
 export function getFunctionArgs(func) {
   const match = func.toString().match(RegExpUtils.functionArgs());
-  if (!match) return null;
+  if (!match) return [[]];
-  return match[1].split(/\s*,\s*/);
+  const matchStr = match[1] || match[2]
+  return matchStr.split(/\s*,\s*/);
 }

src/regexp-utils.coffee

@@ -158,8 +158,8 @@ RegExpUtils =
   looseStyleTag: -> /<style/gim
 
   # Regular expression matching javasript function arguments:
-  # https://regex101.com/r/pZ6zF0/1
+  # https://regex101.com/r/pZ6zF0/2
-  functionArgs: -> /\(\s*([^)]+?)\s*\)/
+  functionArgs: -> /(?:\(\s*([^)]+?)\s*\)|(\w+)\s?=>)/
 
   illegalPathCharactersRegexp: ->
     #https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx