Merge pull request webpack#5849 from cdata/fix-5843

sokra · web-flow · commit 05c5479b9555 · 2017-11-28T10:14:38.000+01:00
Fixes webpack#5843
diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
@@ -171,7 +171,7 @@ class UmdMainTemplatePlugin {
 					"		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n" +
 					"	}\n"
 				) +
-				"})(this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, ";\n})");
+				"})(typeof self !== 'undefined' ? self : this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, ";\n})");
 		});
 		mainTemplate.plugin("global-hash-paths", (paths) => {
 			if(this.names.root) paths = paths.concat(this.names.root);
diff --git a/test/UmdMainTemplatePlugin.unittest.js b/test/UmdMainTemplatePlugin.unittest.js
@@ -0,0 +1,70 @@
+/* global describe, beforeEach, it */
+"use strict";
+
+const should = require("should");
+const TemplatePluginEnvironment = require("./helpers/TemplatePluginEnvironment");
+const ConcatSource = require("webpack-sources").ConcatSource;
+const UmdMainTemplatePlugin = require("../lib/UmdMainTemplatePlugin");
+
+describe("UmdMainTemplatePlugin", () => {
+
+	const setupBasicTemplatePlugin = name => {
+		const plugin = new UmdMainTemplatePlugin({
+			amd: name
+		}, {
+			auxiliaryComment: {}
+		});
+		const templatePlugin = new TemplatePluginEnvironment();
+		const environment = templatePlugin.getEnvironmentStub();
+		environment.mainTemplate.applyPluginsWaterfall = () => [];
+		plugin.apply(environment);
+		return templatePlugin;
+	};
+
+	let templatePlugin;
+
+	beforeEach(() => {
+		templatePlugin = setupBasicTemplatePlugin("foo");
+	});
+
+	describe("when applied", () => {
+		describe("event handlers", () => {
+			let eventBindings;
+
+			beforeEach(() => {
+				eventBindings = templatePlugin.getEventBindings();
+			});
+
+			describe("handling render-with-entry", () => {
+				let eventHandler;
+
+				beforeEach(() => {
+					eventHandler = eventBindings
+						.filter(eventBinding => eventBinding.name === 'render-with-entry')
+						.map(eventBinding => eventBinding.handler)
+						.pop();
+				});
+
+				it("creates source that safely detects the global object", () => {
+					const source = eventHandler("{ foo: true }", {
+						getModules: () => []
+					}, "bar");
+
+					source.should.be.instanceof(ConcatSource);
+					source.source().should.be.exactly(`(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else {
+		var a = factory();
+		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];
+	}
+})(typeof self !== 'undefined' ? self : this, function() {
+return { foo: true };
+})`);
+				});
+			});
+		});
+	});
+});
