Module name webpack es6

Tools/Gulp/helpers/gulp-processAmdDeclarationToModule.js

@@ -49,7 +49,7 @@ var processData = function(data, options) {
             line = line.replace(/import "/g, `import "${moduleName}/`);
         }
 
-        // Replace Static Readonly declaration for Legacy TS Version compat
+        // Replace Static Readonly declaration for UMD TS Version compat
         var regexVar = /(.*)readonly (.*) = (.*);/g;
         match = regexVar.exec(line);
         if (match) {

Tools/Gulp/helpers/gulp-remapPaths.js

@@ -16,7 +16,7 @@ function modifyPath(str, filePath, opts) {
     for (let index = 0; index < lines.length; index++) {
         let line = lines[index];
 
-        // Replace Static Readonly declaration for Legacy TS Version compat
+        // Replace Static Readonly declaration for UMD TS Version compat
         var regexVar = /(.*)import .*"(.*)";/g;
         var match = regexVar.exec(line);
         if (match) {

Tools/Gulp/tasks/gulpTasks-libraries.js

@@ -16,7 +16,8 @@ var del = require("del");
 
 // Parse Command Line.
 var commandLineOptions = minimist(process.argv.slice(2), {
-    boolean: ["noNamespace"]
+    boolean: ["noNamespace"],
+    string: ["moduleName"]
 });
 
 // Import Build Config
@@ -129,7 +130,7 @@ var processDTSFiles = function(libraries, settings, cb) {
         // Convert the tsc AMD BUNDLED declaration to our expected one
         processAmdDeclarationToModule(config.computed.tempTypingsFilePath, {
             output: fileLocation,
-            moduleName: settings.build.umd.packageName,
+            moduleName: commandLineOptions.moduleName || settings.build.umd.packageName,
             entryPoint: library.entry,
             externals: settings.build.umd.processDeclaration.classMap,
         });

Tools/Gulp/tasks/gulpTasks-librariesES6.js

@@ -208,7 +208,7 @@ var build = function(settings, cb) {
 /**
  * Webpack Build.
  */
-var buildWebpack = function(module, cb) {
+var buildWebpack = function(settings, module, cb) {
     const gulpPath = path.join(config.computed.sourceES6Folder, "Tools/Gulp");
     // Launch TSC.
     const options = {
@@ -216,7 +216,7 @@ var buildWebpack = function(module, cb) {
         verbose: true
     };
 
-    let command = `gulp ${module} --noNamespace`;
+    let command = `gulp ${module} --noNamespace --moduleName ${settings.build.es6.packageName}`;
     shelljs.exec(command, options, function(code, stdout, stderr) {
         if (stderr) {
             console.log(stderr);
@@ -265,7 +265,7 @@ function buildES6Library(settings, module) {
     var buildSteps = null;
     if (settings.build.es6.webpackBuild) {
         buildSteps = [
-            function buildes6(cb) { return buildWebpack(module, cb) },
+            function buildes6(cb) { return buildWebpack(settings, module, cb) },
             function copyDist() { return copyWebpackDist(settings, module) }
         ];
     }