From a14e9798978a23b9878d81dbc0c4d356a4c6468b Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Sat, 21 Mar 2015 15:27:32 +1100
Subject: [PATCH] use module syntax for strict module formatters

---
 src/babel/helpers/code-frame.js                   | 2 +-
 src/babel/transformation/modules/amd-strict.js    | 4 +++-
 src/babel/transformation/modules/common-strict.js | 4 +++-
 src/babel/transformation/modules/system.js        | 2 +-
 src/babel/transformation/modules/umd-strict.js    | 4 +++-
 src/babel/transformation/transformer.js           | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/babel/helpers/code-frame.js b/src/babel/helpers/code-frame.js
index c7c6a1e061..ac99470b34 100644
--- a/src/babel/helpers/code-frame.js
+++ b/src/babel/helpers/code-frame.js
@@ -54,7 +54,7 @@ function highlight(text) {
   });
 }
 
-export default function (lines: number, lineNumber: number, colNumber: number, opts?): string {
+export default function (lines: number, lineNumber: number, colNumber: number, opts = {}): string {
   colNumber = Math.max(colNumber, 0);
 
   if (opts.highlightCode && chalk.supportsColor) {
diff --git a/src/babel/transformation/modules/amd-strict.js b/src/babel/transformation/modules/amd-strict.js
index 725d67325d..bb7bc59663 100644
--- a/src/babel/transformation/modules/amd-strict.js
+++ b/src/babel/transformation/modules/amd-strict.js
@@ -1 +1,3 @@
-module.exports = require("./_strict")(require("./amd"));
+import AMDFormatter from "./amd";
+import buildStrict from "./_strict";
+export default buildStrict(AMDFormatter);
diff --git a/src/babel/transformation/modules/common-strict.js b/src/babel/transformation/modules/common-strict.js
index 54608375de..c5acc6a9a5 100644
--- a/src/babel/transformation/modules/common-strict.js
+++ b/src/babel/transformation/modules/common-strict.js
@@ -1 +1,3 @@
-module.exports = require("./_strict")(require("./common"));
+import CommonFormatter from "./common";
+import buildStrict from "./_strict";
+export default buildStrict(CommonFormatter);
diff --git a/src/babel/transformation/modules/system.js b/src/babel/transformation/modules/system.js
index 2471159594..20a39f97ca 100644
--- a/src/babel/transformation/modules/system.js
+++ b/src/babel/transformation/modules/system.js
@@ -42,7 +42,7 @@ var hoistVariablesVisitor = {
         }
 
         if (parent.init === node) {
-          return t.toSequenceExpression(nodes, scope);
+          return nodes;
         }
       }
 
diff --git a/src/babel/transformation/modules/umd-strict.js b/src/babel/transformation/modules/umd-strict.js
index c14d6e4076..1204b5503a 100644
--- a/src/babel/transformation/modules/umd-strict.js
+++ b/src/babel/transformation/modules/umd-strict.js
@@ -1 +1,3 @@
-module.exports = require("./_strict")(require("./umd"));
+import UMDFormatter from "./umd";
+import buildStrict from "./_strict";
+export default buildStrict(UMDFormatter);
diff --git a/src/babel/transformation/transformer.js b/src/babel/transformation/transformer.js
index cbddf0bea2..a98de824b9 100644
--- a/src/babel/transformation/transformer.js
+++ b/src/babel/transformation/transformer.js
@@ -3,7 +3,7 @@ import isFunction from "lodash/lang/isFunction";
 import traverse from "../traversal";
 import isObject from "lodash/lang/isObject";
 import assign from "lodash/object/assign";
-import acorn from "../../../vendor/acorn";
+import * as acorn from "../../acorn";
 import File from "./file";
 import each from "lodash/collection/each";