added libraryTarget commonjs-module

sokra · sokra · commit 66edde657eda · 2016-09-08T22:26:43.000+02:00
for commonjs wrapped harmony modules via `__esModule` fixes webpack#2945
diff --git a/lib/CommonJsHarmonyMainTemplatePlugin.js b/lib/CommonJsHarmonyMainTemplatePlugin.js
@@ -0,0 +1,21 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var ConcatSource = require("webpack-sources").ConcatSource;
+
+function CommonJsHarmonyMainTemplatePlugin() {}
+
+module.exports = CommonJsHarmonyMainTemplatePlugin;
+
+CommonJsHarmonyMainTemplatePlugin.prototype.apply = function(compilation) {
+	var mainTemplate = compilation.mainTemplate;
+	compilation.templatesPlugin("render-with-entry", function(source, chunk, hash) {
+		var prefix = "module.exports =\n";
+		var postfix = "\nObject.defineProperty(module.exports, \"__esModule\", { value: true });";
+		return new ConcatSource(prefix, source, postfix);
+	});
+	mainTemplate.plugin("hash", function(hash) {
+		hash.update("commonjs harmony");
+	});
+};
diff --git a/lib/LibraryTemplatePlugin.js b/lib/LibraryTemplatePlugin.js
@@ -3,6 +3,7 @@
 	Author Tobias Koppers @sokra
 */
 var SetVarMainTemplatePlugin = require("./SetVarMainTemplatePlugin");
+var CommonJsHarmonyMainTemplatePlugin = require("./CommonJsHarmonyMainTemplatePlugin");
 
 function accessorToObjectAccess(accessor) {
 	return accessor.map(function(a) {
@@ -55,6 +56,9 @@ LibraryTemplatePlugin.prototype.apply = function(compiler) {
 			case "commonjs2":
 				compilation.apply(new SetVarMainTemplatePlugin("module.exports"));
 				break;
+			case "commonjs-module":
+				compilation.apply(new CommonJsHarmonyMainTemplatePlugin());
+				break;
 			case "amd":
 				var AmdMainTemplatePlugin = require("./AmdMainTemplatePlugin");
 				compilation.apply(new AmdMainTemplatePlugin(this.name));
diff --git a/test/configCases/library/0-create-library/a.js b/test/configCases/library/0-create-library/a.js
@@ -0,0 +1 @@
+export var a = "a";
diff --git a/test/configCases/library/0-create-library/index.js b/test/configCases/library/0-create-library/index.js
@@ -0,0 +1,3 @@
+export * from "./a";
+export default "default-value";
+export var b = "b";
diff --git a/test/configCases/library/0-create-library/test.config.js b/test/configCases/library/0-create-library/test.config.js
@@ -0,0 +1 @@
+exports.noTests = true;
diff --git a/test/configCases/library/0-create-library/webpack.config.js b/test/configCases/library/0-create-library/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	output: {
+		libraryTarget: "commonjs-module"
+	}
+};
diff --git a/test/configCases/library/1-use-library/index.js b/test/configCases/library/1-use-library/index.js
@@ -0,0 +1,8 @@
+import d from "library";
+import { a, b } from "library";
+
+it("should be able to import hamorny exports from library", function() {
+	d.should.be.eql("default-value");
+	a.should.be.eql("a");
+	b.should.be.eql("b");
+});
diff --git a/test/configCases/library/1-use-library/webpack.config.js b/test/configCases/library/1-use-library/webpack.config.js
@@ -0,0 +1,8 @@
+var path = require("path");
+module.exports = {
+	resolve: {
+		alias: {
+			library: path.resolve(__dirname, "../../../js/config/library/0-create-library/bundle0.js")
+		}
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export * from "./a";`
	`2`	`+export default "default-value";`
	`3`	`+export var b = "b";`