From 8db466c69815e81a12500a4db082573525276142 Mon Sep 17 00:00:00 2001
From: Lars Kappert <lars@webpro.nl>
Date: Tue, 18 Nov 2014 22:04:41 +0100
Subject: [PATCH 1/7] Make AMD module id's optional

---
 bin/6to5/index.js                      | 2 ++
 lib/6to5/file.js                       | 6 +++---
 lib/6to5/transformation/modules/amd.js | 7 +++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bin/6to5/index.js b/bin/6to5/index.js
index a76af2a6fd..af3db9094e 100755
--- a/bin/6to5/index.js
+++ b/bin/6to5/index.js
@@ -18,6 +18,7 @@ commander.option("-b, --blacklist [blacklist]", "Blacklist of transformers to NO
 commander.option("-o, --out-file [out]", "Compile all input files into a single file");
 commander.option("-d, --out-dir [out]", "Compile an input directory of modules into an output directory");
 commander.option("-c, --remove-comments", "Remove comments from the compiled code", false);
+commander.option("-a, --amd-module-id", "Insert module id in AMD modules", false);
 
 commander.on("--help", function(){
   var outKeys = function (title, obj) {
@@ -90,6 +91,7 @@ exports.opts = {
   whitelist:     commander.whitelist,
   sourceMap:     commander.sourceMaps || commander.sourceMapsInline,
   comments:      !commander.removeComments,
+  amdModuleId:   commander.amdModuleId,
   runtime:       commander.runtime,
   modules:       commander.modules
 };
diff --git a/lib/6to5/file.js b/lib/6to5/file.js
index d8ecb685bf..18dc3fc86d 100644
--- a/lib/6to5/file.js
+++ b/lib/6to5/file.js
@@ -11,7 +11,7 @@ var _         = require("lodash");
 
 function File(opts) {
   this.opts            = File.normaliseOptions(opts);
-  this.moduleFormatter = this.getModuleFormatter(this.opts.modules);
+  this.moduleFormatter = this.getModuleFormatter(this.opts.modules, this.opts);
 
   this.declarations = {};
   this.uids         = {};
@@ -58,7 +58,7 @@ File.normaliseOptions = function (opts) {
   return opts;
 };
 
-File.prototype.getModuleFormatter = function (type) {
+File.prototype.getModuleFormatter = function (type, opts) {
   var ModuleFormatter = transform.moduleFormatters[type];
 
   if (!ModuleFormatter) {
@@ -70,7 +70,7 @@ File.prototype.getModuleFormatter = function (type) {
     throw new ReferenceError("unknown module formatter type " + type);
   }
 
-  return new ModuleFormatter(this);
+  return new ModuleFormatter(this, opts);
 };
 
 File.prototype.parseShebang = function (code) {
diff --git a/lib/6to5/transformation/modules/amd.js b/lib/6to5/transformation/modules/amd.js
index d6e3f50d71..8d3bbd131e 100644
--- a/lib/6to5/transformation/modules/amd.js
+++ b/lib/6to5/transformation/modules/amd.js
@@ -5,9 +5,10 @@ var util              = require("../../util");
 var t                 = require("../../types");
 var _                 = require("lodash");
 
-function AMDFormatter(file) {
+function AMDFormatter(file, opts) {
   this.file = file;
   this.ids  = {};
+  this.insertModuleId = opts.amdModuleId;
 }
 
 util.inherits(AMDFormatter, CommonJSFormatter);
@@ -32,7 +33,9 @@ AMDFormatter.prototype.transform = function (ast) {
   var moduleName = this.getModuleName();
 
   var container = t.functionExpression(null, params, t.blockStatement(body));
-  var call = t.callExpression(t.identifier("define"), [t.literal(moduleName), names, container]);
+  var defineArgs = [names, container];
+  if( this.insertModuleId ) defineArgs.unshift(t.literal(moduleName));
+  var call = t.callExpression(t.identifier("define"), defineArgs);
 
   program.body = [t.expressionStatement(call)];
 };

From d2724554cc803cf151d5b9ad30010e58b862c882 Mon Sep 17 00:00:00 2001
From: Lars Kappert <lars@webpro.nl>
Date: Tue, 18 Nov 2014 22:12:03 +0100
Subject: [PATCH 2/7] Make module id's for AMD body in UMD optional as well

---
 lib/6to5/transformation/modules/umd.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/6to5/transformation/modules/umd.js b/lib/6to5/transformation/modules/umd.js
index ea2f668a8e..9bc27e6c31 100644
--- a/lib/6to5/transformation/modules/umd.js
+++ b/lib/6to5/transformation/modules/umd.js
@@ -5,9 +5,10 @@ var util         = require("../../util");
 var t            = require("../../types");
 var _            = require("lodash");
 
-function UMDFormatter(file) {
+function UMDFormatter(file, opts) {
   this.file = file;
   this.ids  = {};
+  this.insertModuleId = opts.amdModuleId;
 }
 
 util.inherits(UMDFormatter, AMDFormatter);
@@ -34,8 +35,11 @@ UMDFormatter.prototype.transform = function (ast) {
 
   var moduleName = this.getModuleName();
 
+  var defineArgs = [t.arrayExpression([t.literal("exports")].concat(names))];
+  if( this.insertModuleId ) defineArgs.unshift(t.literal(moduleName));
+
   var runner = util.template("umd-runner-body", {
-    AMD_ARGUMENTS: [t.literal(moduleName), t.arrayExpression([t.literal("exports")].concat(names))],
+    AMD_ARGUMENTS: defineArgs,
 
     COMMON_ARGUMENTS: names.map(function (name) {
       return t.callExpression(t.identifier("require"), [name]);

From 9895711bf4988a65e8d210f02e9921e991a5e0b8 Mon Sep 17 00:00:00 2001
From: Lars Kappert <lars@webpro.nl>
Date: Tue, 18 Nov 2014 22:15:02 +0100
Subject: [PATCH 3/7] Improve performance

---
 lib/6to5/transformation/modules/amd.js | 7 ++++---
 lib/6to5/transformation/modules/umd.js | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/6to5/transformation/modules/amd.js b/lib/6to5/transformation/modules/amd.js
index 8d3bbd131e..5585a226bd 100644
--- a/lib/6to5/transformation/modules/amd.js
+++ b/lib/6to5/transformation/modules/amd.js
@@ -30,11 +30,12 @@ AMDFormatter.prototype.transform = function (ast) {
   var params = _.values(this.ids);
   params.unshift(t.identifier("exports"));
 
-  var moduleName = this.getModuleName();
-
   var container = t.functionExpression(null, params, t.blockStatement(body));
   var defineArgs = [names, container];
-  if( this.insertModuleId ) defineArgs.unshift(t.literal(moduleName));
+  if (this.insertModuleId) {
+    var moduleName = this.getModuleName();
+    defineArgs.unshift(t.literal(moduleName));
+  }
   var call = t.callExpression(t.identifier("define"), defineArgs);
 
   program.body = [t.expressionStatement(call)];
diff --git a/lib/6to5/transformation/modules/umd.js b/lib/6to5/transformation/modules/umd.js
index 9bc27e6c31..84e4f8ecd4 100644
--- a/lib/6to5/transformation/modules/umd.js
+++ b/lib/6to5/transformation/modules/umd.js
@@ -33,10 +33,11 @@ UMDFormatter.prototype.transform = function (ast) {
 
   // runner
 
-  var moduleName = this.getModuleName();
-
   var defineArgs = [t.arrayExpression([t.literal("exports")].concat(names))];
-  if( this.insertModuleId ) defineArgs.unshift(t.literal(moduleName));
+  if (this.insertModuleId) {
+    var moduleName = this.getModuleName();
+    defineArgs.unshift(t.literal(moduleName));
+  }
 
   var runner = util.template("umd-runner-body", {
     AMD_ARGUMENTS: defineArgs,

From df0e4f643133a4c96f4597db1903601ccef3f5cc Mon Sep 17 00:00:00 2001
From: Lars Kappert <lars@webpro.nl>
Date: Wed, 19 Nov 2014 08:40:57 +0100
Subject: [PATCH 4/7] Reuse Formatter::getModuleName(), fix opts

---
 lib/6to5/file.js                       |  2 +-
 lib/6to5/transformation/modules/amd.js | 13 +++++++------
 lib/6to5/transformation/modules/umd.js |  6 ++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/6to5/file.js b/lib/6to5/file.js
index cf7daf2505..f1f0c42768 100644
--- a/lib/6to5/file.js
+++ b/lib/6to5/file.js
@@ -81,7 +81,7 @@ File.prototype.getModuleFormatter = function (type) {
     throw new ReferenceError("unknown module formatter type " + type);
   }
 
-  return new ModuleFormatter(this, opts);
+  return new ModuleFormatter(this);
 };
 
 File.prototype.parseShebang = function (code) {
diff --git a/lib/6to5/transformation/modules/amd.js b/lib/6to5/transformation/modules/amd.js
index 5585a226bd..cfff80012f 100644
--- a/lib/6to5/transformation/modules/amd.js
+++ b/lib/6to5/transformation/modules/amd.js
@@ -5,10 +5,9 @@ var util              = require("../../util");
 var t                 = require("../../types");
 var _                 = require("lodash");
 
-function AMDFormatter(file, opts) {
+function AMDFormatter(file) {
   this.file = file;
   this.ids  = {};
-  this.insertModuleId = opts.amdModuleId;
 }
 
 util.inherits(AMDFormatter, CommonJSFormatter);
@@ -32,10 +31,8 @@ AMDFormatter.prototype.transform = function (ast) {
 
   var container = t.functionExpression(null, params, t.blockStatement(body));
   var defineArgs = [names, container];
-  if (this.insertModuleId) {
-    var moduleName = this.getModuleName();
-    defineArgs.unshift(t.literal(moduleName));
-  }
+  var moduleName = this.getModuleName();
+  if (moduleName) defineArgs.unshift(t.literal(moduleName));
   var call = t.callExpression(t.identifier("define"), defineArgs);
 
   program.body = [t.expressionStatement(call)];
@@ -46,6 +43,10 @@ AMDFormatter.prototype.getModuleName = function () {
   var filenameRelative = opts.filenameRelative;
   var moduleName = "";
 
+  if (!opts.amdModuleId) {
+    return null;
+  }
+
   if (opts.moduleRoot) {
     moduleName = opts.moduleRoot + "/";
   }
diff --git a/lib/6to5/transformation/modules/umd.js b/lib/6to5/transformation/modules/umd.js
index 93d9bafd78..199de38024 100644
--- a/lib/6to5/transformation/modules/umd.js
+++ b/lib/6to5/transformation/modules/umd.js
@@ -32,10 +32,8 @@ UMDFormatter.prototype.transform = function (ast) {
   // runner
 
   var defineArgs = [t.arrayExpression([t.literal("exports")].concat(names))];
-  if (this.insertModuleId) {
-    var moduleName = this.getModuleName();
-    defineArgs.unshift(t.literal(moduleName));
-  }
+  var moduleName = this.getModuleName();
+  if (moduleName) defineArgs.unshift(t.literal(moduleName));
 
   var runner = util.template("umd-runner-body", {
     AMD_ARGUMENTS: defineArgs,

From fdad51b53b578c7139236844994e731ddd3ed7f3 Mon Sep 17 00:00:00 2001
From: Lars Kappert <lars@webpro.nl>
Date: Wed, 19 Nov 2014 08:45:58 +0100
Subject: [PATCH 5/7] Revert "update umd and amd tests with new moduleName
 option"

This reverts commit 5409691a3a63290ff7c7013035ec1b351e1eb250.
---
 .../transformation/modules-amd/exports-default/expected.js    | 4 ++--
 .../transformation/modules-amd/exports-from/expected.js       | 4 ++--
 .../transformation/modules-amd/exports-named/expected.js      | 4 ++--
 .../transformation/modules-amd/exports-variable/expected.js   | 4 ++--
 .../modules-amd/hoist-function-exports/expected.js            | 4 ++--
 .../transformation/modules-amd/imports-default/expected.js    | 4 ++--
 .../transformation/modules-amd/imports-glob/expected.js       | 2 +-
 .../transformation/modules-amd/imports-mixing/expected.js     | 4 ++--
 .../transformation/modules-amd/imports-named/expected.js      | 2 +-
 test/fixtures/transformation/modules-amd/imports/expected.js  | 4 ++--
 test/fixtures/transformation/modules-amd/overview/expected.js | 4 ++--
 .../transformation/modules-umd/exports-default/expected.js    | 4 ++--
 .../transformation/modules-umd/exports-from/expected.js       | 4 ++--
 .../transformation/modules-umd/exports-named/expected.js      | 4 ++--
 .../transformation/modules-umd/exports-variable/expected.js   | 4 ++--
 .../modules-umd/hoist-function-exports/expected.js            | 4 ++--
 .../transformation/modules-umd/imports-default/expected.js    | 4 ++--
 .../transformation/modules-umd/imports-glob/expected.js       | 2 +-
 .../transformation/modules-umd/imports-mixing/expected.js     | 4 ++--
 .../transformation/modules-umd/imports-named/expected.js      | 2 +-
 test/fixtures/transformation/modules-umd/imports/expected.js  | 4 ++--
 test/fixtures/transformation/modules-umd/overview/expected.js | 4 ++--
 22 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/test/fixtures/transformation/modules-amd/exports-default/expected.js b/test/fixtures/transformation/modules-amd/exports-default/expected.js
index d43b32db01..9d46b7b13b 100644
--- a/test/fixtures/transformation/modules-amd/exports-default/expected.js
+++ b/test/fixtures/transformation/modules-amd/exports-default/expected.js
@@ -1,4 +1,4 @@
-define("modules-amd/exports-default/expected", ["exports"], function (exports) {
+define(["exports"], function (exports) {
   "use strict";
 
   exports["default"] = 42;
@@ -12,4 +12,4 @@ define("modules-amd/exports-default/expected", ["exports"], function (exports) {
   var Foo = function Foo() {};
 
   exports["default"] = Foo;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-amd/exports-from/expected.js b/test/fixtures/transformation/modules-amd/exports-from/expected.js
index 77ae51d64b..04d83b65ca 100644
--- a/test/fixtures/transformation/modules-amd/exports-from/expected.js
+++ b/test/fixtures/transformation/modules-amd/exports-from/expected.js
@@ -1,4 +1,4 @@
-define("modules-amd/exports-from/expected", ["exports", "foo"], function (exports, _foo) {
+define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
   (function (obj) {
@@ -14,4 +14,4 @@ define("modules-amd/exports-from/expected", ["exports", "foo"], function (export
   exports["default"] = _foo.foo;
   exports["default"] = _foo.foo;
   exports.bar = _foo.bar;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-amd/exports-named/expected.js b/test/fixtures/transformation/modules-amd/exports-named/expected.js
index 1e1070e93f..e07a20d178 100644
--- a/test/fixtures/transformation/modules-amd/exports-named/expected.js
+++ b/test/fixtures/transformation/modules-amd/exports-named/expected.js
@@ -1,4 +1,4 @@
-define("modules-amd/exports-named/expected", ["exports"], function (exports) {
+define(["exports"], function (exports) {
   "use strict";
 
   exports.foo = foo;
@@ -8,4 +8,4 @@ define("modules-amd/exports-named/expected", ["exports"], function (exports) {
   exports["default"] = foo;
   exports["default"] = foo;
   exports.bar = bar;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-amd/exports-variable/expected.js b/test/fixtures/transformation/modules-amd/exports-variable/expected.js
index 9f75a11911..b94e1dd338 100644
--- a/test/fixtures/transformation/modules-amd/exports-variable/expected.js
+++ b/test/fixtures/transformation/modules-amd/exports-variable/expected.js
@@ -1,4 +1,4 @@
-define("modules-amd/exports-variable/expected", ["exports"], function (exports) {
+define(["exports"], function (exports) {
   "use strict";
 
   exports.foo7 = foo7;
@@ -12,4 +12,4 @@ define("modules-amd/exports-variable/expected", ["exports"], function (exports)
   var foo8 = function foo8() {};
 
   exports.foo8 = foo8;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-amd/hoist-function-exports/expected.js b/test/fixtures/transformation/modules-amd/hoist-function-exports/expected.js
index 4a9013f20e..7d072c6f35 100644
--- a/test/fixtures/transformation/modules-amd/hoist-function-exports/expected.js
+++ b/test/fixtures/transformation/modules-amd/hoist-function-exports/expected.js
@@ -1,4 +1,4 @@
-define("modules-amd/hoist-function-exports/expected", ["exports", "./evens"], function (exports, _evens) {
+define(["exports", "./evens"], function (exports, _evens) {
   "use strict";
 
   exports.nextOdd = nextOdd;
@@ -12,4 +12,4 @@ define("modules-amd/hoist-function-exports/expected", ["exports", "./evens"], fu
       return !isEven(n);
     };
   })(isEven);
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-amd/imports-default/expected.js b/test/fixtures/transformation/modules-amd/imports-default/expected.js
index 5b57ae6866..e13da123e2 100644
--- a/test/fixtures/transformation/modules-amd/imports-default/expected.js
+++ b/test/fixtures/transformation/modules-amd/imports-default/expected.js
@@ -1,6 +1,6 @@
-define("modules-amd/imports-default/expected", ["exports", "foo"], function (exports, _foo) {
+define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
   var foo = _foo["default"];
   var foo = _foo["default"];
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-amd/imports-glob/expected.js b/test/fixtures/transformation/modules-amd/imports-glob/expected.js
index d28af52835..cc03946787 100644
--- a/test/fixtures/transformation/modules-amd/imports-glob/expected.js
+++ b/test/fixtures/transformation/modules-amd/imports-glob/expected.js
@@ -1,4 +1,4 @@
-define("modules-amd/imports-glob/expected", ["exports", "foo"], function (exports, _foo) {
+define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
   var foo = _foo;
diff --git a/test/fixtures/transformation/modules-amd/imports-mixing/expected.js b/test/fixtures/transformation/modules-amd/imports-mixing/expected.js
index 785292dedb..5ff7a48899 100644
--- a/test/fixtures/transformation/modules-amd/imports-mixing/expected.js
+++ b/test/fixtures/transformation/modules-amd/imports-mixing/expected.js
@@ -1,6 +1,6 @@
-define("modules-amd/imports-mixing/expected", ["exports", "foo"], function (exports, _foo) {
+define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
   var foo = _foo["default"];
   var xyz = _foo.baz;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-amd/imports-named/expected.js b/test/fixtures/transformation/modules-amd/imports-named/expected.js
index c20a471eca..5140508011 100644
--- a/test/fixtures/transformation/modules-amd/imports-named/expected.js
+++ b/test/fixtures/transformation/modules-amd/imports-named/expected.js
@@ -1,4 +1,4 @@
-define("modules-amd/imports-named/expected", ["exports", "foo"], function (exports, _foo) {
+define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
   var bar = _foo.bar;
diff --git a/test/fixtures/transformation/modules-amd/imports/expected.js b/test/fixtures/transformation/modules-amd/imports/expected.js
index 1abd7b4ba0..7191917e73 100644
--- a/test/fixtures/transformation/modules-amd/imports/expected.js
+++ b/test/fixtures/transformation/modules-amd/imports/expected.js
@@ -1,3 +1,3 @@
-define("modules-amd/imports/expected", ["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-amd/overview/expected.js b/test/fixtures/transformation/modules-amd/overview/expected.js
index d5228359cb..5fc0d32601 100644
--- a/test/fixtures/transformation/modules-amd/overview/expected.js
+++ b/test/fixtures/transformation/modules-amd/overview/expected.js
@@ -1,4 +1,4 @@
-define("modules-amd/overview/expected", ["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
 
   var foo = _foo["default"];
@@ -9,4 +9,4 @@ define("modules-amd/overview/expected", ["exports", "foo", "foo-bar", "./directo
   var test = exports.test = 5;
 
   exports["default"] = test;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-umd/exports-default/expected.js b/test/fixtures/transformation/modules-umd/exports-default/expected.js
index a9170c8ffe..6bf0a88c3f 100644
--- a/test/fixtures/transformation/modules-umd/exports-default/expected.js
+++ b/test/fixtures/transformation/modules-umd/exports-default/expected.js
@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/exports-default/expected", ["exports"], factory);
+    define(["exports"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports);
   }
@@ -18,4 +18,4 @@
   var Foo = function Foo() {};
 
   exports["default"] = Foo;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-umd/exports-from/expected.js b/test/fixtures/transformation/modules-umd/exports-from/expected.js
index f7b1dd1e4f..c4015dbf8f 100644
--- a/test/fixtures/transformation/modules-umd/exports-from/expected.js
+++ b/test/fixtures/transformation/modules-umd/exports-from/expected.js
@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/exports-from/expected", ["exports", "foo"], factory);
+    define(["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }
@@ -20,4 +20,4 @@
   exports["default"] = _foo.foo;
   exports["default"] = _foo.foo;
   exports.bar = _foo.bar;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-umd/exports-named/expected.js b/test/fixtures/transformation/modules-umd/exports-named/expected.js
index 8c0a7e6df9..ae16b5380b 100644
--- a/test/fixtures/transformation/modules-umd/exports-named/expected.js
+++ b/test/fixtures/transformation/modules-umd/exports-named/expected.js
@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/exports-named/expected", ["exports"], factory);
+    define(["exports"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports);
   }
@@ -14,4 +14,4 @@
   exports["default"] = foo;
   exports["default"] = foo;
   exports.bar = bar;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-umd/exports-variable/expected.js b/test/fixtures/transformation/modules-umd/exports-variable/expected.js
index 7a1e2feb99..d381823150 100644
--- a/test/fixtures/transformation/modules-umd/exports-variable/expected.js
+++ b/test/fixtures/transformation/modules-umd/exports-variable/expected.js
@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/exports-variable/expected", ["exports"], factory);
+    define(["exports"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports);
   }
@@ -18,4 +18,4 @@
   var foo8 = function foo8() {};
 
   exports.foo8 = foo8;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-umd/hoist-function-exports/expected.js b/test/fixtures/transformation/modules-umd/hoist-function-exports/expected.js
index 3691750913..bd34bf40d1 100644
--- a/test/fixtures/transformation/modules-umd/hoist-function-exports/expected.js
+++ b/test/fixtures/transformation/modules-umd/hoist-function-exports/expected.js
@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/hoist-function-exports/expected", ["exports", "./evens"], factory);
+    define(["exports", "./evens"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("./evens"));
   }
@@ -18,4 +18,4 @@
       return !isEven(n);
     };
   })(isEven);
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-umd/imports-default/expected.js b/test/fixtures/transformation/modules-umd/imports-default/expected.js
index 666ea076d7..10ec822646 100644
--- a/test/fixtures/transformation/modules-umd/imports-default/expected.js
+++ b/test/fixtures/transformation/modules-umd/imports-default/expected.js
@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/imports-default/expected", ["exports", "foo"], factory);
+    define(["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }
@@ -9,4 +9,4 @@
 
   var foo = _foo["default"];
   var foo = _foo["default"];
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-umd/imports-glob/expected.js b/test/fixtures/transformation/modules-umd/imports-glob/expected.js
index cf5428c747..45a763f2f2 100644
--- a/test/fixtures/transformation/modules-umd/imports-glob/expected.js
+++ b/test/fixtures/transformation/modules-umd/imports-glob/expected.js
@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/imports-glob/expected", ["exports", "foo"], factory);
+    define(["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }
diff --git a/test/fixtures/transformation/modules-umd/imports-mixing/expected.js b/test/fixtures/transformation/modules-umd/imports-mixing/expected.js
index acf986b6b3..35f4b65e7f 100644
--- a/test/fixtures/transformation/modules-umd/imports-mixing/expected.js
+++ b/test/fixtures/transformation/modules-umd/imports-mixing/expected.js
@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/imports-mixing/expected", ["exports", "foo"], factory);
+    define(["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }
@@ -9,4 +9,4 @@
 
   var foo = _foo["default"];
   var xyz = _foo.baz;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-umd/imports-named/expected.js b/test/fixtures/transformation/modules-umd/imports-named/expected.js
index 8f8761bd25..2d75892bf6 100644
--- a/test/fixtures/transformation/modules-umd/imports-named/expected.js
+++ b/test/fixtures/transformation/modules-umd/imports-named/expected.js
@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/imports-named/expected", ["exports", "foo"], factory);
+    define(["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }
diff --git a/test/fixtures/transformation/modules-umd/imports/expected.js b/test/fixtures/transformation/modules-umd/imports/expected.js
index cd1e4eee5a..81b4069c95 100644
--- a/test/fixtures/transformation/modules-umd/imports/expected.js
+++ b/test/fixtures/transformation/modules-umd/imports/expected.js
@@ -1,9 +1,9 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/imports/expected", ["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
+    define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   }
 })(function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/modules-umd/overview/expected.js b/test/fixtures/transformation/modules-umd/overview/expected.js
index d3ee62b9b6..6a6a53fdc5 100644
--- a/test/fixtures/transformation/modules-umd/overview/expected.js
+++ b/test/fixtures/transformation/modules-umd/overview/expected.js
@@ -1,6 +1,6 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("modules-umd/overview/expected", ["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
+    define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   }
@@ -15,4 +15,4 @@
   var test = exports.test = 5;
 
   exports["default"] = test;
-});
\ No newline at end of file
+});

From ef21724a9c55d948cadc0b8f36f5366613ad73cf Mon Sep 17 00:00:00 2001
From: Lars Kappert <lars@webpro.nl>
Date: Wed, 19 Nov 2014 08:52:33 +0100
Subject: [PATCH 6/7] Update docs

---
 doc/modules.md | 10 ++++++++--
 doc/usage.md   |  5 +++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/modules.md b/doc/modules.md
index 781900a167..ff655c5119 100644
--- a/doc/modules.md
+++ b/doc/modules.md
@@ -66,7 +66,7 @@ export function bar() {
 **Out**
 
 ```javascript
-define("filename", ["exports", "foo"], function (exports, _foo) {
+define(["exports", "foo"], function (exports, _foo) {
   exports.bar = bar;
 
   var foo = _foo.default;
@@ -77,6 +77,12 @@ define("filename", ["exports", "foo"], function (exports, _foo) {
 });
 ```
 
+You can optionally specify to include the module id (using the `--amd-module-id` argument):
+
+```javascript
+define("filename", ["exports", "foo"], function (exports, _foo) {})
+```
+
 ### UMD
 
 **In**
@@ -94,7 +100,7 @@ export function bar() {
 ```javascript
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define("filename", ["exports", "foo"], factory);
+    define(["exports", "foo"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"));
   }
diff --git a/doc/usage.md b/doc/usage.md
index 02c845469b..3fd2d4f10e 100644
--- a/doc/usage.md
+++ b/doc/usage.md
@@ -123,6 +123,11 @@ to5.transformFile("filename.js", options, function (err, result) {
   // Default: `sourceRoot` option.
   moduleRoot: "my-app",
 
+  // If truthy, insert an explicit id for each defined AMD module.
+  // By default, AMD modules are anonymous.
+  // Default: false
+  amdModuleId: true,
+
   // Optionally replace all 6to5 helper declarations with a referenece to this
   // variable. If set to `true` then the default namespace is used "to5Runtime".
   // Default: false

From b924e3deb5ff3fcce488b55d32836c63c3c215b2 Mon Sep 17 00:00:00 2001
From: Lars Kappert <lars@webpro.nl>
Date: Wed, 19 Nov 2014 08:55:16 +0100
Subject: [PATCH 7/7] Rename to "--amd-module-ids"

---
 bin/6to5/index.js                      | 4 ++--
 doc/usage.md                           | 2 +-
 lib/6to5/transformation/modules/amd.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/6to5/index.js b/bin/6to5/index.js
index af3db9094e..9f41d92530 100755
--- a/bin/6to5/index.js
+++ b/bin/6to5/index.js
@@ -18,7 +18,7 @@ commander.option("-b, --blacklist [blacklist]", "Blacklist of transformers to NO
 commander.option("-o, --out-file [out]", "Compile all input files into a single file");
 commander.option("-d, --out-dir [out]", "Compile an input directory of modules into an output directory");
 commander.option("-c, --remove-comments", "Remove comments from the compiled code", false);
-commander.option("-a, --amd-module-id", "Insert module id in AMD modules", false);
+commander.option("-a, --amd-module-ids", "Insert module id in AMD modules", false);
 
 commander.on("--help", function(){
   var outKeys = function (title, obj) {
@@ -91,7 +91,7 @@ exports.opts = {
   whitelist:     commander.whitelist,
   sourceMap:     commander.sourceMaps || commander.sourceMapsInline,
   comments:      !commander.removeComments,
-  amdModuleId:   commander.amdModuleId,
+  amdModuleIds:   commander.amdModuleIds,
   runtime:       commander.runtime,
   modules:       commander.modules
 };
diff --git a/doc/usage.md b/doc/usage.md
index 3fd2d4f10e..ce51614591 100644
--- a/doc/usage.md
+++ b/doc/usage.md
@@ -126,7 +126,7 @@ to5.transformFile("filename.js", options, function (err, result) {
   // If truthy, insert an explicit id for each defined AMD module.
   // By default, AMD modules are anonymous.
   // Default: false
-  amdModuleId: true,
+  amdModuleIds: true,
 
   // Optionally replace all 6to5 helper declarations with a referenece to this
   // variable. If set to `true` then the default namespace is used "to5Runtime".
diff --git a/lib/6to5/transformation/modules/amd.js b/lib/6to5/transformation/modules/amd.js
index cfff80012f..6b174ac376 100644
--- a/lib/6to5/transformation/modules/amd.js
+++ b/lib/6to5/transformation/modules/amd.js
@@ -43,7 +43,7 @@ AMDFormatter.prototype.getModuleName = function () {
   var filenameRelative = opts.filenameRelative;
   var moduleName = "";
 
-  if (!opts.amdModuleId) {
+  if (!opts.amdModuleIds) {
     return null;
   }