From c2776e63ae5b690ea022beb80f4a488b62624d44 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Mon, 6 Apr 2015 06:13:43 -0700
Subject: [PATCH] rename umd module variable name - fixes #1166

---
 src/babel/transformation/modules/umd.js                   | 4 ++--
 src/babel/transformation/templates/umd-runner-body.js     | 6 +++---
 .../es6.modules-umd/exports-default/expected.js           | 8 ++++----
 .../es6.modules-umd/exports-from/expected.js              | 6 +++---
 .../es6.modules-umd/exports-named/expected.js             | 8 ++++----
 .../es6.modules-umd/exports-variable/expected.js          | 8 ++++----
 .../es6.modules-umd/get-module-name-option/expected.js    | 8 ++++----
 .../es6.modules-umd/hoist-function-exports/expected.js    | 8 ++++----
 .../es6.modules-umd/imports-default/expected.js           | 8 ++++----
 .../es6.modules-umd/imports-glob/expected.js              | 8 ++++----
 .../es6.modules-umd/imports-mixing/expected.js            | 8 ++++----
 .../es6.modules-umd/imports-named/expected.js             | 8 ++++----
 .../transformation/es6.modules-umd/imports/expected.js    | 8 ++++----
 .../es6.modules-umd/module-name/expected.js               | 8 ++++----
 .../transformation/es6.modules-umd/overview/expected.js   | 8 ++++----
 .../transformation/es6.modules-umd/remap/expected.js      | 8 ++++----
 .../transformation/runtime/modules-umd/expected.js        | 8 ++++----
 .../spec.function-name/self-reference/expected.js         | 2 +-
 18 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/src/babel/transformation/modules/umd.js b/src/babel/transformation/modules/umd.js
index ccd4e5d09b..f143cfcaa7 100644
--- a/src/babel/transformation/modules/umd.js
+++ b/src/babel/transformation/modules/umd.js
@@ -47,8 +47,8 @@ export default class UMDFormatter extends AMDFormatter {
 
     // globals
 
-    var browserArgs = [t.memberExpression(t.identifier("module"), t.identifier("exports"))];
-    if (this.passModuleArg) browserArgs.push(t.identifier("module"));
+    var browserArgs = [];
+    if (this.passModuleArg) browserArgs.push(t.identifier("mod"));
 
     for (let name in this.ids) {
       var id = this.defaultIds[name] || t.identifier(t.toIdentifier(name));
diff --git a/src/babel/transformation/templates/umd-runner-body.js b/src/babel/transformation/templates/umd-runner-body.js
index fb896d3253..801ff25870 100644
--- a/src/babel/transformation/templates/umd-runner-body.js
+++ b/src/babel/transformation/templates/umd-runner-body.js
@@ -4,8 +4,8 @@
   } else if (COMMON_TEST) {
     factory(COMMON_ARGUMENTS);
   } else {
-    var module = { exports: {} };
-    factory(BROWSER_ARGUMENTS);
-    global.GLOBAL_ARG = module.exports;
+    var mod = { exports: {} };
+    factory(mod.exports, BROWSER_ARGUMENTS);
+    global.GLOBAL_ARG = mod.exports;
   }
 });
diff --git a/test/core/fixtures/transformation/es6.modules-umd/exports-default/expected.js b/test/core/fixtures/transformation/es6.modules-umd/exports-default/expected.js
index 7fe1729f28..f66c44756d 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/exports-default/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/exports-default/expected.js
@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined" && typeof module !== "undefined") {
     factory(exports, module);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, module);
-    global.actual = module.exports;
+    factory(mod.exports, mod);
+    global.actual = mod.exports;
   }
 })(this, function (exports, module) {
   "use strict";
@@ -41,4 +41,4 @@
 
   module.exports = Foo;
   module.exports = foo;
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/exports-from/expected.js b/test/core/fixtures/transformation/es6.modules-umd/exports-from/expected.js
index 6af923e516..52a8b64320 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/exports-from/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/exports-from/expected.js
@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
   "use strict";
diff --git a/test/core/fixtures/transformation/es6.modules-umd/exports-named/expected.js b/test/core/fixtures/transformation/es6.modules-umd/exports-named/expected.js
index a34c42de0e..b4ecf1daf0 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/exports-named/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/exports-named/expected.js
@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports);
-    global.actual = module.exports;
+    factory(mod.exports);
+    global.actual = mod.exports;
   }
 })(this, function (exports) {
   "use strict";
@@ -23,4 +23,4 @@
   exports["default"] = foo;
   exports["default"] = foo;
   exports.bar = bar;
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/exports-variable/expected.js b/test/core/fixtures/transformation/es6.modules-umd/exports-variable/expected.js
index c8ab347b60..c806e52afa 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/exports-variable/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/exports-variable/expected.js
@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports);
-    global.actual = module.exports;
+    factory(mod.exports);
+    global.actual = mod.exports;
   }
 })(this, function (exports) {
   "use strict";
@@ -43,4 +43,4 @@
   };
 
   exports.foo8 = foo8;
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/get-module-name-option/expected.js b/test/core/fixtures/transformation/es6.modules-umd/get-module-name-option/expected.js
index 4c03225fb2..6c3019bb18 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/get-module-name-option/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/get-module-name-option/expected.js
@@ -4,12 +4,12 @@
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports);
-    global.actual = module.exports;
+    factory(mod.exports);
+    global.myCustomModuleName = mod.exports;
   }
 })(this, function (exports) {
   "use strict";
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/hoist-function-exports/expected.js b/test/core/fixtures/transformation/es6.modules-umd/hoist-function-exports/expected.js
index a9b50f8325..20f35378df 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/hoist-function-exports/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/hoist-function-exports/expected.js
@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("./evens"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.evens);
-    global.actual = module.exports;
+    factory(mod.exports, global.evens);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _evens) {
   "use strict";
@@ -28,4 +28,4 @@
     };
   })(_evens.isEven);
   exports.isOdd = isOdd;
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/imports-default/expected.js b/test/core/fixtures/transformation/es6.modules-umd/imports-default/expected.js
index 6f874d225c..940e36e2d8 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/imports-default/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/imports-default/expected.js
@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
   "use strict";
@@ -21,4 +21,4 @@
 
   _foo2;
   _foo22;
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/imports-glob/expected.js b/test/core/fixtures/transformation/es6.modules-umd/imports-glob/expected.js
index 8489c45d98..383d739202 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/imports-glob/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/imports-glob/expected.js
@@ -4,14 +4,14 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
   "use strict";
 
   _foo;
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/imports-mixing/expected.js b/test/core/fixtures/transformation/es6.modules-umd/imports-mixing/expected.js
index 947f7845de..3493511a49 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/imports-mixing/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/imports-mixing/expected.js
@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
   "use strict";
@@ -18,4 +18,4 @@
   var _foo2 = _interopRequire(_foo);
 
   _foo.baz;
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/imports-named/expected.js b/test/core/fixtures/transformation/es6.modules-umd/imports-named/expected.js
index 5ce43796d8..365b09d3fe 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/imports-named/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/imports-named/expected.js
@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
   "use strict";
@@ -19,4 +19,4 @@
   _foo.bar;
   _foo.bar;
   _foo.xyz;
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/imports/expected.js b/test/core/fixtures/transformation/es6.modules-umd/imports/expected.js
index 629e2dad02..87620012bf 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/imports/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/imports/expected.js
@@ -4,12 +4,12 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo, global.fooBar, global.directoryFooBar);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo, global.fooBar, global.directoryFooBar);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/module-name/expected.js b/test/core/fixtures/transformation/es6.modules-umd/module-name/expected.js
index 251106bb9a..fbe1110e75 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/module-name/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/module-name/expected.js
@@ -4,14 +4,14 @@
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports);
-    global.actual = module.exports;
+    factory(mod.exports);
+    global.es6ModulesUmdModuleNameExpected = mod.exports;
   }
 })(this, function (exports) {
   "use strict";
 
   foobar();
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/overview/expected.js b/test/core/fixtures/transformation/es6.modules-umd/overview/expected.js
index 3d68a7e831..385b20998b 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/overview/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/overview/expected.js
@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo2, global.fooBar, global.directoryFooBar);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo2, global.fooBar, global.directoryFooBar);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
@@ -29,4 +29,4 @@
 
   _foo.bar;
   _foo.foo;
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-umd/remap/expected.js b/test/core/fixtures/transformation/es6.modules-umd/remap/expected.js
index 6fcb566b85..70cc20ee55 100644
--- a/test/core/fixtures/transformation/es6.modules-umd/remap/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-umd/remap/expected.js
@@ -4,11 +4,11 @@
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports);
-    global.actual = module.exports;
+    factory(mod.exports);
+    global.actual = mod.exports;
   }
 })(this, function (exports) {
   "use strict";
@@ -42,4 +42,4 @@
   exports.f = d;
 
   exports.f = exports.e = d = 4;
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/runtime/modules-umd/expected.js b/test/core/fixtures/transformation/runtime/modules-umd/expected.js
index 70ea96c1e2..ca297cd94f 100644
--- a/test/core/fixtures/transformation/runtime/modules-umd/expected.js
+++ b/test/core/fixtures/transformation/runtime/modules-umd/expected.js
@@ -4,14 +4,14 @@
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("babel-runtime/helpers/interop-require"));
   } else {
-    var module = {
+    var mod = {
       exports: {}
     };
-    factory(module.exports, global.foo, global._interopRequire);
-    global.actual = module.exports;
+    factory(mod.exports, global.foo, global._interopRequire);
+    global.actual = mod.exports;
   }
 })(this, function (exports, _foo, _babelRuntimeHelpersInteropRequire) {
   "use strict";
 
   var _foo2 = _babelRuntimeHelpersInteropRequire["default"](_foo);
-});
+});
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/spec.function-name/self-reference/expected.js b/test/core/fixtures/transformation/spec.function-name/self-reference/expected.js
index 900ff0debc..57c45fda9d 100644
--- a/test/core/fixtures/transformation/spec.function-name/self-reference/expected.js
+++ b/test/core/fixtures/transformation/spec.function-name/self-reference/expected.js
@@ -6,7 +6,7 @@ var f = (function (_f) {
   }
 
   f.toString = function () {
-    return _f.toString();
+    return f.toString();
   };
 
   return f;