Merge pull request webpack#5784 from NMinhNguyen/bugfix/only-use-umd-externals-for-umd-library-target

Only use UMD or UMD2 externals for UMD libraryTarget. Resolve webpack#5766

Author: sokra

lib/UmdMainTemplatePlugin.js

@@ -42,7 +42,7 @@ class UmdMainTemplatePlugin {
 	apply(compilation) {
 		const mainTemplate = compilation.mainTemplate;
 		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
-			let externals = chunk.getModules().filter(m => m.external);
+			let externals = chunk.getModules().filter(m => m.external && (m.type === "umd" || m.type === "umd2"));
 			const optionalExternals = [];
 			let requiredExternals = [];
 			if(this.optionalAmdExternalAsGlobal) {

test/configCases/externals/non-umd-externals-umd/index.js

@@ -0,0 +1,23 @@
+require("should");
+var fs = require("fs");
+var path = require("path");
+
+it("should correctly import a UMD external", function() {
+	var external = require("external0");
+	external.should.be.eql("module 0");
+});
+
+it("should contain `require()` statements for the UMD external", function() {
+	var source = fs.readFileSync(path.join(__dirname, "bundle0.js"), "utf-8");
+	source.should.containEql("require(\"external0\")");
+});
+
+it("should correctly import a non-UMD external", function() {
+	var external = require("external1");
+	external.should.be.eql("abc");
+});
+
+it("should not contain `require()` statements for the non-UMD external", function() {
+	var source = fs.readFileSync(path.join(__dirname, "bundle0.js"), "utf-8");
+	source.should.not.containEql("require(\"'abc'\")");
+});

test/configCases/externals/non-umd-externals-umd/test.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	modules: {
+		external0: "module 0"
+	}
+};

test/configCases/externals/non-umd-externals-umd/webpack.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+	output: {
+		libraryTarget: "umd"
+	},
+	externals: {
+		external0: "external0",
+		external1: "var 'abc'"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	}
+};

test/configCases/externals/non-umd-externals-umd2/index.js

@@ -0,0 +1,23 @@
+require("should");
+var fs = require("fs");
+var path = require("path");
+
+it("should correctly import a UMD2 external", function() {
+	var external = require("external0");
+	external.should.be.eql("module 0");
+});
+
+it("should contain `require()` statements for the UMD2 external", function() {
+	var source = fs.readFileSync(path.join(__dirname, "bundle0.js"), "utf-8");
+	source.should.containEql("require(\"external0\")");
+});
+
+it("should correctly import a non-UMD2 external", function() {
+	var external = require("external1");
+	external.should.be.eql("abc");
+});
+
+it("should not contain `require()` statements for the non-UMD2 external", function() {
+	var source = fs.readFileSync(path.join(__dirname, "bundle0.js"), "utf-8");
+	source.should.not.containEql("require(\"'abc'\")");
+});

test/configCases/externals/non-umd-externals-umd2/test.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	modules: {
+		external0: "module 0"
+	}
+};

test/configCases/externals/non-umd-externals-umd2/webpack.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+	output: {
+		libraryTarget: "umd2"
+	},
+	externals: {
+		external0: "external0",
+		external1: "var 'abc'"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	}
+};