From f5b3d727300764c21228d48624a6873884c7f4f3 Mon Sep 17 00:00:00 2001
From: Christopher Monsanto <chris@monsan.to>
Date: Fri, 1 May 2015 00:09:26 -0400
Subject: [PATCH 1/3] support commas as obj property separators in flow

---
 src/acorn/plugins/flow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/acorn/plugins/flow.js b/src/acorn/plugins/flow.js
index 1c4fdcce38..fad5277665 100644
--- a/src/acorn/plugins/flow.js
+++ b/src/acorn/plugins/flow.js
@@ -322,7 +322,7 @@ pp.flow_parseObjectType = function (allowStatic) {
 }
 
 pp.flow_objectTypeSemicolon = function () {
-  if (!this.eat(tt.semi) && this.type !== tt.braceR) {
+  if (!this.eat(tt.semi) && !this.eat(tt.comma) && this.type !== tt.braceR) {
     this.unexpected()
   }
 }

From 0a1154e6fd46c2169a8feb57d4a37de08e50e8d5 Mon Sep 17 00:00:00 2001
From: Dan Wyand <danwyand@gmail.com>
Date: Fri, 1 May 2015 01:01:10 -0400
Subject: [PATCH 2/3] fix spelling

---
 src/babel/generation/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/babel/generation/index.js b/src/babel/generation/index.js
index 5645491b0a..51a0914488 100644
--- a/src/babel/generation/index.js
+++ b/src/babel/generation/index.js
@@ -37,7 +37,7 @@ class CodeGenerator {
       retainLines: opts.retainLines,
       comments: opts.comments == null || opts.comments,
       compact: opts.compact,
-      quotes: CodeGenerator.findCommonStringDelimeter(code, tokens),
+      quotes: CodeGenerator.findCommonStringDelimiter(code, tokens),
       indent: {
         adjustMultilineComment: true,
         style: style,
@@ -56,7 +56,7 @@ class CodeGenerator {
     return format;
   }
 
-  static findCommonStringDelimeter(code, tokens) {
+  static findCommonStringDelimiter(code, tokens) {
     var occurences = {
       single: 0,
       double: 0

From 502cc13aed69e51436703d04ca1e1f3108f44036 Mon Sep 17 00:00:00 2001
From: Tim Burgess <timothy.burgess.87@gmail.com>
Date: Fri, 1 May 2015 04:05:22 -0400
Subject: [PATCH 3/3] hopefully fixes #1402

---
 src/babel/transformation/file/plugin-manager.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/babel/transformation/file/plugin-manager.js b/src/babel/transformation/file/plugin-manager.js
index 3cb2faf1cc..21258797ac 100644
--- a/src/babel/transformation/file/plugin-manager.js
+++ b/src/babel/transformation/file/plugin-manager.js
@@ -1,3 +1,4 @@
+import * as node from  "../../api/node";
 import * as messages from "../../messages";
 import * as util from  "../../util";