From 3f82b4ec72e182c049cf73f00164e462b65d5ab9 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Wed, 18 Feb 2015 13:08:25 +1100
Subject: [PATCH] remove `commonStandard` module formatter and make it the
 default behaviour of all the strict module formatters

---
 CHANGELOG.md                                    |  5 +++++
 lib/babel/transformation/modules/_strict.js     |  1 +
 .../transformation/modules/common-standard.js   | 13 -------------
 lib/babel/transformation/modules/index.js       | 17 ++++++++---------
 4 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 lib/babel/transformation/modules/common-standard.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c70812b8f..60af8ce417 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,11 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 4.3.0
+
+ * **Breaking Change**
+  * Remove `commonStandard` module formatter and make it the default behaviour of all the strict module formatters.
+
 ## 4.2.1
 
  * **Polish**
diff --git a/lib/babel/transformation/modules/_strict.js b/lib/babel/transformation/modules/_strict.js
index 5fa3c9f57f..5368cb79c3 100644
--- a/lib/babel/transformation/modules/_strict.js
+++ b/lib/babel/transformation/modules/_strict.js
@@ -4,6 +4,7 @@ var util = require("../../util");
 
 module.exports = function (Parent) {
   var Constructor = function () {
+    this.noInteropRequireImport = true;
     this.noInteropRequireExport = true;
     Parent.apply(this, arguments);
   };
diff --git a/lib/babel/transformation/modules/common-standard.js b/lib/babel/transformation/modules/common-standard.js
deleted file mode 100644
index 41888a8293..0000000000
--- a/lib/babel/transformation/modules/common-standard.js
+++ /dev/null
@@ -1,13 +0,0 @@
-"use strict";
-
-module.exports = CommonStandardFormatter;
-
-var CommonStrictFormatter = require("./common-strict");
-var util = require("../../util");
-
-function CommonStandardFormatter() {
-  this.noInteropRequireImport = true;
-  CommonStrictFormatter.apply(this, arguments);
-}
-
-util.inherits(CommonStandardFormatter, CommonStrictFormatter);
diff --git a/lib/babel/transformation/modules/index.js b/lib/babel/transformation/modules/index.js
index f383755ab5..8202dff6ad 100644
--- a/lib/babel/transformation/modules/index.js
+++ b/lib/babel/transformation/modules/index.js
@@ -1,11 +1,10 @@
 module.exports = {
-  commonStandard: require("./common-standard"),
-  commonStrict:   require("./common-strict"),
-  amdStrict:      require("./amd-strict"),
-  umdStrict:      require("./umd-strict"),
-  common:         require("./common"),
-  system:         require("./system"),
-  ignore:         require("./ignore"),
-  amd:            require("./amd"),
-  umd:            require("./umd")
+  commonStrict: require("./common-strict"),
+  amdStrict:    require("./amd-strict"),
+  umdStrict:    require("./umd-strict"),
+  common:       require("./common"),
+  system:       require("./system"),
+  ignore:       require("./ignore"),
+  amd:          require("./amd"),
+  umd:          require("./umd")
 };