fix module shadowing when using CommonJS-like module formatters - fixes #1544

src/babel/transformation/modules/amd.js

@@ -6,8 +6,8 @@ import * as util from  "../../util";
 import * as t from "../../types";
 
 export default class AMDFormatter extends DefaultFormatter {
-  init() {
+  setup() {
-    CommonFormatter.prototype._init.call(this, this.hasNonDefaultExports);
+    CommonFormatter.prototype._setup.call(this, this.hasNonDefaultExports);
   }
 
   buildDependencyLiterals() {

src/babel/transformation/modules/common.js

@@ -4,11 +4,11 @@ import * as util from  "../../util";
 import * as t from "../../types";
 
 export default class CommonJSFormatter extends DefaultFormatter {
-  init() {
+  setup() {
-    this._init(this.hasLocalExports);
+    this._setup(this.hasLocalExports);
   }
 
-  _init(conditional) {
+  _setup(conditional) {
     var file  = this.file;
     var scope = file.scope;
 

src/babel/transformation/transformers/internal/modules.js

@@ -85,18 +85,28 @@ export function ExportNamedDeclaration(node, parent, scope) {
   }
 }
 
-export function Program(node) {
+export var Program = {
-  var imports = [];
+  enter(node) {
-  var rest = [];
+    var imports = [];
+    var rest = [];
 
-  for (var i = 0; i < node.body.length; i++) {
+    for (var i = 0; i < node.body.length; i++) {
-    var bodyNode = node.body[i];
+      var bodyNode = node.body[i];
-    if (t.isImportDeclaration(bodyNode)) {
+      if (t.isImportDeclaration(bodyNode)) {
-      imports.push(bodyNode);
+        imports.push(bodyNode);
-    } else {
+      } else {
-      rest.push(bodyNode);
+        rest.push(bodyNode);
+      }
+    }
+
+    node.body = imports.concat(rest);
+  },
+
+  exit(node, parent, scope, file) {
+    if (!file.transformers["es6.modules"].canTransform()) return;
+
+    if (file.moduleFormatter.setup) {
+      file.moduleFormatter.setup();
     }
   }
-
+};
-  node.body = imports.concat(rest);
-}

test/core/fixtures/transformation/es6.modules-common/module-shadow/actual.js

@@ -0,0 +1,3 @@
+export function module() {
+  
+}

test/core/fixtures/transformation/es6.modules-common/module-shadow/expected.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.module = _module;
+
+function _module() {}