Merge branch 'master' of https://github.com/TheLarkInn/webpack

Sean Larkin · Sean Larkin · commit 8738b8dea18a · 2016-03-31T14:04:25.000-05:00
diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
@@ -147,15 +147,15 @@ UmdMainTemplatePlugin.prototype.apply = function(compilation) {
 				) +
 				"	else if(typeof exports === 'object')\n" +
 				"		exports[" + libraryName(this.name) + "] = factory(" + externalsRequireArray("commonjs") + ");\n" +
-				"	else\n" +
-				"		" + replaceKeys(accessorAccess("root", this.name)) + " = factory(" + externalsRootArray(externals) + ");\n" :
 				(this.auxiliaryComment &&
 					typeof this.auxiliaryComment === 'string' ?
 					"   //" + this.auxiliaryComment + "\n" :
 					this.auxiliaryComment.root ?
 					"   //" + this.auxiliaryComment.root + "\n" :
 					""
 				) +
+				"	else\n" +
+				"		" + replaceKeys(accessorAccess("root", this.name)) + " = factory(" + externalsRootArray(externals) + ");\n" :
 				"	else {\n" +
 				(externals.length > 0 ?
 					"		var a = typeof exports === 'object' ? factory(" + externalsRequireArray("commonjs") + ") : factory(" + externalsRootArray(externals) + ");\n" :
diff --git a/test/configCases/target/umd-auxiliary-comments-object/index.js b/test/configCases/target/umd-auxiliary-comments-object/index.js
@@ -6,8 +6,8 @@ it("should have auxiliary comments", function() {
 	var fs = require("fs");
 	var source = fs.readFileSync(__filename, "utf-8");
 
-	source.should.containEql("//test comment commonjs");
-	source.should.containEql("//test comment commonjs2");
-	source.should.containEql("//test comment amd");
-	source.should.containEql("//test comment root");
+	source.should.containEql("//test " + "comment " + "commonjs");
+	source.should.containEql("//test " + "comment " + "commonjs2");
+	source.should.containEql("//test " + "comment " + "amd");
+	source.should.containEql("//test " + "comment " + "root");
 });
diff --git a/test/configCases/target/umd-auxiliary-comments-string/index.js b/test/configCases/target/umd-auxiliary-comments-string/index.js
@@ -5,6 +5,6 @@ it("should run", function() {
 it("should have auxiliary comment string", function() {
 	var fs = require("fs");
 	var source = fs.readFileSync(__filename, "utf-8");
-
-	source.should.containEql("//test comment");
+	
+	source.should.containEql("//test " + "comment");
 });
