Merge branch 'master' into next

sokra · sokra · commit 302289ce2475 · 2017-06-02T16:28:22.000+02:00
diff --git a/lib/BasicEvaluatedExpression.js b/lib/BasicEvaluatedExpression.js
@@ -56,7 +56,9 @@ class BasicEvaluatedExpression {
 	}
 
 	asBool() {
-		if(this.isBoolean()) return this.bool;
+		if(this.truthy) return true;
+		else if(this.falsy) return false;
+		else if(this.isBoolean()) return this.bool;
 		else if(this.isNull()) return false;
 		else if(this.isString()) return !!this.string;
 		else if(this.isNumber()) return !!this.number;
@@ -163,6 +165,18 @@ class BasicEvaluatedExpression {
 		return this;
 	}
 
+	setTruthy() {
+		this.falsy = false;
+		this.truthy = true;
+		return this;
+	}
+
+	setFalsy() {
+		this.falsy = true;
+		this.truthy = false;
+		return this;
+	}
+
 	addOptions(options) {
 		if(!this.options) this.options = [];
 		options.forEach(item => {
diff --git a/lib/DefinePlugin.js b/lib/DefinePlugin.js
@@ -111,7 +111,7 @@ class DefinePlugin {
 				function applyObjectDefine(key, obj) {
 					const code = stringifyObj(obj);
 					parser.plugin("can-rename " + key, ParserHelpers.approve);
-					parser.plugin("evaluate Identifier " + key, (expr) => new BasicEvaluatedExpression().setRange(expr.range));
+					parser.plugin("evaluate Identifier " + key, (expr) => new BasicEvaluatedExpression().setTruthy().setRange(expr.range));
 					parser.plugin("evaluate typeof " + key, ParserHelpers.evaluateToString("object"));
 					parser.plugin("expression " + key, ParserHelpers.toConstantDependency(code));
 					parser.plugin("typeof " + key, ParserHelpers.toConstantDependency(JSON.stringify("object")));
diff --git a/lib/ExportPropertyMainTemplatePlugin.js b/lib/ExportPropertyMainTemplatePlugin.js
@@ -0,0 +1,31 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ConcatSource = require("webpack-sources").ConcatSource;
+
+function accessorToObjectAccess(accessor) {
+	return accessor.map(a => `[${JSON.stringify(a)}]`).join("");
+}
+
+class ExportPropertyMainTemplatePlugin {
+	constructor(property) {
+		this.property = property;
+	}
+
+	apply(compilation) {
+		const mainTemplate = compilation.mainTemplate;
+		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
+			const postfix = `${accessorToObjectAccess([].concat(this.property))}`;
+			return new ConcatSource(source, postfix);
+		});
+		mainTemplate.plugin("hash", hash => {
+			hash.update("export property");
+			hash.update(`${this.property}`);
+		});
+	}
+}
+
+module.exports = ExportPropertyMainTemplatePlugin;
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js
@@ -200,7 +200,7 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 			parser.plugin("expression __webpack_hash__", ParserHelpers.toConstantDependency("__webpack_require__.h()"));
 			parser.plugin("evaluate typeof __webpack_hash__", ParserHelpers.evaluateToString("string"));
 			parser.plugin("evaluate Identifier module.hot", function(expr) {
-				return ParserHelpers.evaluateToBoolean(!!this.state.compilation.hotUpdateChunkTemplate)(expr);
+				return ParserHelpers.evaluateToIdentifier("module.hot", !!this.state.compilation.hotUpdateChunkTemplate)(expr);
 			});
 			parser.plugin("call module.hot.accept", function(expr) {
 				if(!this.state.compilation.hotUpdateChunkTemplate) return false;
diff --git a/lib/LibraryTemplatePlugin.js b/lib/LibraryTemplatePlugin.js
@@ -26,15 +26,20 @@ function accessorAccess(base, accessor, joinWith) {
 
 class LibraryTemplatePlugin {
 
-	constructor(name, target, umdNamedDefine, auxiliaryComment) {
+	constructor(name, target, umdNamedDefine, auxiliaryComment, exportProperty) {
 		this.name = name;
 		this.target = target;
 		this.umdNamedDefine = umdNamedDefine;
 		this.auxiliaryComment = auxiliaryComment;
+		this.exportProperty = exportProperty;
 	}
 
 	apply(compiler) {
 		compiler.plugin("this-compilation", (compilation) => {
+			if(this.exportProperty) {
+				var ExportPropertyMainTemplatePlugin = require("./ExportPropertyMainTemplatePlugin");
+				compilation.apply(new ExportPropertyMainTemplatePlugin(this.exportProperty));
+			}
 			switch(this.target) {
 				case "var":
 					compilation.apply(new SetVarMainTemplatePlugin(`var ${accessorAccess(false, this.name)}`));
diff --git a/lib/NodeStuffPlugin.js b/lib/NodeStuffPlugin.js
@@ -77,7 +77,7 @@ class NodeStuffPlugin {
 					if(!isHarmony)
 						return true;
 				});
-				parser.plugin("evaluate Identifier module.hot", ParserHelpers.evaluateToBoolean(false));
+				parser.plugin("evaluate Identifier module.hot", ParserHelpers.evaluateToIdentifier("module.hot", false));
 				parser.plugin("expression module", function() {
 					const module = this.state.module;
 					const isHarmony = module.meta && module.meta.harmonyModule;
diff --git a/lib/ParserHelpers.js b/lib/ParserHelpers.js
@@ -56,6 +56,15 @@ ParserHelpers.evaluateToBoolean = function(value) {
 	};
 };
 
+ParserHelpers.evaluateToIdentifier = function(identifier, truthy) {
+	return function identifierExpression(expr) {
+		let evex = new BasicEvaluatedExpression().setIdentifier(identifier).setRange(expr.range);
+		if(truthy === true) evex = evex.setTruthy();
+		else if(truthy === false) evex = evex.setFalsy();
+		return evex;
+	};
+};
+
 ParserHelpers.expressionIsUnsupported = function(message) {
 	return function unsupportedExpression(expr) {
 		var dep = new ConstDependency("(void 0)", expr.range);
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -187,7 +187,7 @@ class WebpackOptionsApply extends OptionsApply {
 
 		if(options.output.library || options.output.libraryTarget !== "var") {
 			let LibraryTemplatePlugin = require("./LibraryTemplatePlugin");
-			compiler.apply(new LibraryTemplatePlugin(options.output.library, options.output.libraryTarget, options.output.umdNamedDefine, options.output.auxiliaryComment || ""));
+			compiler.apply(new LibraryTemplatePlugin(options.output.library, options.output.libraryTarget, options.output.umdNamedDefine, options.output.auxiliaryComment || "", options.output.libraryExport));
 		}
 		if(options.externals) {
 			ExternalsPlugin = require("./ExternalsPlugin");
@@ -247,7 +247,7 @@ class WebpackOptionsApply extends OptionsApply {
 			new UseStrictPlugin(),
 			new RequireIncludePlugin(),
 			new RequireEnsurePlugin(),
-			new RequireContextPlugin(options.resolve.modules, options.resolve.extensions),
+			new RequireContextPlugin(options.resolve.modules, options.resolve.extensions, options.resolve.mainFiles),
 			new ImportPlugin(options.module),
 			new SystemPlugin(options.module)
 		);
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -85,6 +85,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("resolve.unsafeCache", true);
 		this.set("resolve.modules", ["node_modules"]);
 		this.set("resolve.extensions", [".js", ".json"]);
+		this.set("resolve.mainFiles", ["index"]);
 		this.set("resolve.aliasFields", "make", (options) => {
 			if(options.target === "web" || options.target === "webworker")
 				return ["browser"];
@@ -101,6 +102,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("resolveLoader.unsafeCache", true);
 		this.set("resolveLoader.mainFields", ["loader", "main"]);
 		this.set("resolveLoader.extensions", [".js", ".json"]);
+		this.set("resolveLoader.mainFiles", ["index"]);
 	}
 }
 
diff --git a/lib/dependencies/AMDPlugin.js b/lib/dependencies/AMDPlugin.js
@@ -82,8 +82,8 @@ class AMDPlugin {
 					parser.state.current.addVariable("__webpack_amd_options__", JSON.stringify(amdOptions)));
 				parser.plugin("evaluate typeof define.amd", ParserHelpers.evaluateToString(typeof amdOptions));
 				parser.plugin("evaluate typeof require.amd", ParserHelpers.evaluateToString(typeof amdOptions));
-				parser.plugin("evaluate Identifier define.amd", ParserHelpers.evaluateToBoolean(true));
-				parser.plugin("evaluate Identifier require.amd", ParserHelpers.evaluateToBoolean(true));
+				parser.plugin("evaluate Identifier define.amd", ParserHelpers.evaluateToIdentifier("define.amd", true));
+				parser.plugin("evaluate Identifier require.amd", ParserHelpers.evaluateToIdentifier("require.amd", true));
 				parser.plugin("typeof define", ParserHelpers.toConstantDependency(JSON.stringify("function")));
 				parser.plugin("evaluate typeof define", ParserHelpers.evaluateToString("function"));
 				parser.plugin("can-rename define", ParserHelpers.approve);
diff --git a/lib/dependencies/CommonJsPlugin.js b/lib/dependencies/CommonJsPlugin.js
@@ -56,6 +56,7 @@ class CommonJsPlugin {
 				for(let expression of requireExpressions) {
 					parser.plugin(`typeof ${expression}`, ParserHelpers.toConstantDependency("function"));
 					parser.plugin(`evaluate typeof ${expression}`, ParserHelpers.evaluateToString("function"));
+					parser.plugin(`evaluate Identifier ${expression}`, ParserHelpers.evaluateToIdentifier(expression, true));
 				}
 
 				parser.plugin("evaluate typeof module", ParserHelpers.evaluateToString("object"));
diff --git a/lib/dependencies/RequireContextPlugin.js b/lib/dependencies/RequireContextPlugin.js
@@ -10,18 +10,17 @@ const ContextElementDependency = require("./ContextElementDependency");
 const RequireContextDependencyParserPlugin = require("./RequireContextDependencyParserPlugin");
 
 class RequireContextPlugin {
-	constructor(modulesDirectories, extensions) {
+	constructor(modulesDirectories, extensions, mainFiles) {
 		if(!Array.isArray(modulesDirectories))
 			throw new Error("modulesDirectories must be an array");
 		if(!Array.isArray(extensions))
 			throw new Error("extensions must be an array");
 		this.modulesDirectories = modulesDirectories;
 		this.extensions = extensions;
+		this.mainFiles = mainFiles;
 	}
 
 	apply(compiler) {
-		const modulesDirectories = this.modulesDirectories;
-		const extensions = this.extensions;
 		compiler.plugin("compilation", (compilation, params) => {
 			const contextModuleFactory = params.contextModuleFactory;
 			const normalModuleFactory = params.normalModuleFactory;
@@ -43,7 +42,7 @@ class RequireContextPlugin {
 				if(items.length === 0) return callback(null, items);
 
 				callback(null, items.map((obj) => {
-					return extensions.filter((ext) => {
+					return this.extensions.filter((ext) => {
 						const l = obj.request.length;
 						return l > ext.length && obj.request.substr(l - ext.length, l) === ext;
 					}).map((ext) => {
@@ -60,8 +59,28 @@ class RequireContextPlugin {
 				if(items.length === 0) return callback(null, items);
 
 				callback(null, items.map((obj) => {
-					for(let i = 0; i < modulesDirectories.length; i++) {
-						const dir = modulesDirectories[i];
+					return this.mainFiles.filter((mainFile) => {
+						const l = obj.request.length;
+						return l > mainFile.length + 1 && obj.request.substr(l - mainFile.length - 1, l) === "/" + mainFile;
+					}).map((mainFile) => {
+						const l = obj.request.length;
+						return [{
+							context: obj.context,
+							request: obj.request.substr(0, l - mainFile.length)
+						}, {
+							context: obj.context,
+							request: obj.request.substr(0, l - mainFile.length - 1)
+						}];
+					}).reduce((a, b) => a.concat(b), []).concat(obj);
+				}).reduce((a, b) => a.concat(b), []));
+			});
+
+			params.contextModuleFactory.plugin("alternatives", (items, callback) => {
+				if(items.length === 0) return callback(null, items);
+
+				callback(null, items.map((obj) => {
+					for(let i = 0; i < this.modulesDirectories.length; i++) {
+						const dir = this.modulesDirectories[i];
 						const idx = obj.request.indexOf("./" + dir + "/");
 						if(idx === 0) {
 							obj.request = obj.request.slice(dir.length + 3);
diff --git a/lib/optimize/AggressiveMergingPlugin.js b/lib/optimize/AggressiveMergingPlugin.js
@@ -23,7 +23,7 @@ class AggressiveMergingPlugin {
 				return a + b;
 			}, 0);
 		}
-		compiler.plugin("compilation", (compilation) => {
+		compiler.plugin("this-compilation", (compilation) => {
 			compilation.plugin("optimize-chunks-advanced", (chunks) => {
 				let combinations = [];
 				chunks.forEach((a, idx) => {
diff --git a/lib/optimize/AggressiveSplittingPlugin.js b/lib/optimize/AggressiveSplittingPlugin.js
@@ -37,7 +37,7 @@ class AggressiveSplittingPlugin {
 		if(typeof this.options.entryChunkMultiplicator !== "number") this.options.entryChunkMultiplicator = 1;
 	}
 	apply(compiler) {
-		compiler.plugin("compilation", (compilation) => {
+		compiler.plugin("this-compilation", (compilation) => {
 			compilation.plugin("optimize-chunks-advanced", (chunks) => {
 				const savedSplits = compilation.records && compilation.records.aggressiveSplits || [];
 				const usedSplits = compilation._aggressiveSplittingSplits ?
diff --git a/schemas/webpackOptionsSchema.json b/schemas/webpackOptionsSchema.json
@@ -392,6 +392,16 @@
             "jsonp"
           ]
         },
+        "libraryExport": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "$ref": "#/definitions/common.arrayOfStringValues"
+            }
+          ]
+        },
         "path": {
           "description": "The output directory as **absolute path** (required).",
           "type": "string",
diff --git a/test/cases/context/issue-3873/index.js b/test/cases/context/issue-3873/index.js
@@ -0,0 +1,7 @@
+function get(name) {
+	return require("./" + name);
+}
+
+it("should automatically infer the index.js file", function() {
+	get("module").should.be.eql("module");
+});
diff --git a/test/cases/context/issue-3873/module/index.js b/test/cases/context/issue-3873/module/index.js
@@ -0,0 +1 @@
+module.exports = "module";
diff --git a/test/cases/parsing/issue-4596/index.js b/test/cases/parsing/issue-4596/index.js
@@ -0,0 +1,13 @@
+it("should evaluate require.resolve as truthy value", function() {
+	var id;
+	if(require.resolve)
+		id = require.resolve("./module.js");
+
+	(typeof id).should.be.oneOf("number", "string");
+});
+
+it("should evaluate require.resolve in ?: expression", function() {
+	var id = require.resolve ? require.resolve("./module.js") : null;
+
+	(typeof id).should.be.oneOf("number", "string");
+});
diff --git a/test/cases/parsing/issue-4596/module.js b/test/cases/parsing/issue-4596/module.js
diff --git a/test/configCases/library/0-create-library/index.js b/test/configCases/library/0-create-library/index.js
@@ -1,3 +1,4 @@
 export * from "./a";
 export default "default-value";
 export var b = "b";
+export { default as external } from "external";
diff --git a/test/configCases/library/0-create-library/non-external.js b/test/configCases/library/0-create-library/non-external.js
@@ -0,0 +1 @@
+export default "non-external";
diff --git a/test/configCases/library/0-create-library/webpack.config.js b/test/configCases/library/0-create-library/webpack.config.js
@@ -1,5 +1,65 @@
-module.exports = {
-	output: {
-		libraryTarget: "commonjs-module"
+module.exports = [
+	{
+		output: {
+			filename: "commonjs.js",
+			libraryTarget: "commonjs-module"
+		},
+		resolve: {
+			alias: {
+				external: "./non-external"
+			}
+		}
+	},
+	{
+		output: {
+			filename: "umd.js",
+			libraryTarget: "umd"
+		},
+		resolve: {
+			alias: {
+				external: "./non-external"
+			}
+		}
+	},
+	{
+		output: {
+			filename: "umd-default.js",
+			libraryTarget: "umd",
+			libraryExport: "default"
+		},
+		resolve: {
+			alias: {
+				external: "./non-external"
+			}
+		}
+	},
+	{
+		output: {
+			filename: "this.js",
+			libraryTarget: "this"
+		},
+		resolve: {
+			alias: {
+				external: "./non-external"
+			}
+		}
+	},
+	{
+		output: {
+			filename: "global.js",
+			library: "globalName"
+		},
+		resolve: {
+			alias: {
+				external: "./non-external"
+			}
+		}
+	},
+	{
+		output: {
+			filename: "commonjs2-external.js",
+			libraryTarget: "commonjs2"
+		},
+		externals: ["external"]
 	}
-};
+];
diff --git a/test/configCases/library/1-use-library/default-test.js b/test/configCases/library/1-use-library/default-test.js
@@ -0,0 +1,7 @@
+import d from "library";
+var data = require("library");
+
+it("should get default export from library (" + NAME + ")", function() {
+	data.should.be.eql("default-value");
+	d.should.be.eql("default-value");
+});
diff --git a/test/configCases/library/1-use-library/global-test.js b/test/configCases/library/1-use-library/global-test.js
@@ -0,0 +1,7 @@
+var data = require("library");
+
+it("should be able get items from library (" + NAME + ")", function() {
+	data.should.have.property("default").be.eql("default-value");
+	data.should.have.property("a").be.eql("a");
+	data.should.have.property("b").be.eql("b");
+});
diff --git a/test/configCases/library/1-use-library/index.js b/test/configCases/library/1-use-library/index.js
diff --git a/test/configCases/library/1-use-library/node_modules/external.js b/test/configCases/library/1-use-library/node_modules/external.js
diff --git a/test/configCases/library/1-use-library/webpack.config.js b/test/configCases/library/1-use-library/webpack.config.js
diff --git a/test/configCases/library/2-create-library-with-external/a.js b/test/configCases/library/2-create-library-with-external/a.js
diff --git a/test/configCases/library/2-create-library-with-external/index.js b/test/configCases/library/2-create-library-with-external/index.js
diff --git a/test/configCases/library/2-create-library-with-external/test.config.js b/test/configCases/library/2-create-library-with-external/test.config.js
diff --git a/test/configCases/library/2-create-library-with-external/webpack.config.js b/test/configCases/library/2-create-library-with-external/webpack.config.js
diff --git a/test/configCases/library/3-use-library-with-external/index.js b/test/configCases/library/3-use-library-with-external/index.js
diff --git a/test/configCases/library/3-use-library-with-external/webpack.config.js b/test/configCases/library/3-use-library-with-external/webpack.config.js

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {`
`85`	`85`	`this.set("resolve.unsafeCache", true);`
`86`	`86`	`this.set("resolve.modules", ["node_modules"]);`
`87`	`87`	`this.set("resolve.extensions", [".js", ".json"]);`
	`88`	`+ this.set("resolve.mainFiles", ["index"]);`
`88`	`89`	`this.set("resolve.aliasFields", "make", (options) => {`
`89`	`90`	`if(options.target === "web" \|\| options.target === "webworker")`
`90`	`91`	`return ["browser"];`
`@@ -101,6 +102,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {`
`101`	`102`	`this.set("resolveLoader.unsafeCache", true);`
`102`	`103`	`this.set("resolveLoader.mainFields", ["loader", "main"]);`
`103`	`104`	`this.set("resolveLoader.extensions", [".js", ".json"]);`
	`105`	`+ this.set("resolveLoader.mainFiles", ["index"]);`
`104`	`106`	`}`
`105`	`107`	`}`
`106`	`108`