webpack 3.8.1 → 3.11.0

package/lib/NormalModuleFactory.js

@@ -133,7 +133,9 @@ class NormalModuleFactory extends Tapable {
 				try {
 					loaders.forEach(item => {
 						if(typeof item.options === "string" && /^\?/.test(item.options)) {
-							item.options = this.ruleSet.findOptionsByIdent(item.options.substr(1));
+							const ident = item.options.substr(1);
+							item.options = this.ruleSet.findOptionsByIdent(ident);
+							item.ident = ident;
 						}
 					});
 				} catch(e) {

package/lib/NormalModuleReplacementPlugin.js

@@ -1,45 +1,45 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const path = require("path");
-
-class NormalModuleReplacementPlugin {
-	constructor(resourceRegExp, newResource) {
-		this.resourceRegExp = resourceRegExp;
-		this.newResource = newResource;
-	}
-
-	apply(compiler) {
-		const resourceRegExp = this.resourceRegExp;
-		const newResource = this.newResource;
-		compiler.plugin("normal-module-factory", (nmf) => {
-			nmf.plugin("before-resolve", (result, callback) => {
-				if(!result) return callback();
-				if(resourceRegExp.test(result.request)) {
-					if(typeof newResource === "function") {
-						newResource(result);
-					} else {
-						result.request = newResource;
-					}
-				}
-				return callback(null, result);
-			});
-			nmf.plugin("after-resolve", (result, callback) => {
-				if(!result) return callback();
-				if(resourceRegExp.test(result.resource)) {
-					if(typeof newResource === "function") {
-						newResource(result);
-					} else {
-						result.resource = path.resolve(path.dirname(result.resource), newResource);
-					}
-				}
-				return callback(null, result);
-			});
-		});
-	}
-}
-
-module.exports = NormalModuleReplacementPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const path = require("path");
+
+class NormalModuleReplacementPlugin {
+	constructor(resourceRegExp, newResource) {
+		this.resourceRegExp = resourceRegExp;
+		this.newResource = newResource;
+	}
+
+	apply(compiler) {
+		const resourceRegExp = this.resourceRegExp;
+		const newResource = this.newResource;
+		compiler.plugin("normal-module-factory", (nmf) => {
+			nmf.plugin("before-resolve", (result, callback) => {
+				if(!result) return callback();
+				if(resourceRegExp.test(result.request)) {
+					if(typeof newResource === "function") {
+						newResource(result);
+					} else {
+						result.request = newResource;
+					}
+				}
+				return callback(null, result);
+			});
+			nmf.plugin("after-resolve", (result, callback) => {
+				if(!result) return callback();
+				if(resourceRegExp.test(result.resource)) {
+					if(typeof newResource === "function") {
+						newResource(result);
+					} else {
+						result.resource = path.resolve(path.dirname(result.resource), newResource);
+					}
+				}
+				return callback(null, result);
+			});
+		});
+	}
+}
+
+module.exports = NormalModuleReplacementPlugin;

package/lib/NullFactory.js

@@ -1,12 +1,12 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class NullFactory {
-	create(data, callback) {
-		return callback();
-	}
-}
-module.exports = NullFactory;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class NullFactory {
+	create(data, callback) {
+		return callback();
+	}
+}
+module.exports = NullFactory;

package/lib/OptionsApply.js

@@ -1,10 +1,10 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class OptionsApply {
-	process(options, compiler) {}
-}
-module.exports = OptionsApply;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class OptionsApply {
+	process(options, compiler) {}
+}
+module.exports = OptionsApply;

package/lib/OptionsDefaulter.js

@@ -6,7 +6,7 @@
 
 function getProperty(obj, name) {
 	name = name.split(".");
-	for(var i = 0; i < name.length - 1; i++) {
+	for(let i = 0; i < name.length - 1; i++) {
 		obj = obj[name[i]];
 		if(typeof obj !== "object" || !obj) return;
 	}
@@ -15,7 +15,7 @@ function getProperty(obj, name) {
 
 function setProperty(obj, name, value) {
 	name = name.split(".");
-	for(var i = 0; i < name.length - 1; i++) {
+	for(let i = 0; i < name.length - 1; i++) {
 		if(typeof obj[name[i]] !== "object" && typeof obj[name[i]] !== "undefined") return;
 		if(!obj[name[i]]) obj[name[i]] = {};
 		obj = obj[name[i]];

package/lib/Parser.js

@@ -174,6 +174,15 @@ class Parser extends Tapable {
 				res.setNumber(left.number / right.number);
 				res.setRange(expr.range);
 				return res;
+			} else if(expr.operator === "**") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(Math.pow(left.number, right.number));
+				res.setRange(expr.range);
+				return res;
 			} else if(expr.operator === "==" || expr.operator === "===") {
 				left = this.evaluateExpression(expr.left);
 				right = this.evaluateExpression(expr.right);
@@ -200,6 +209,60 @@ class Parser extends Tapable {
 				} else if(left.isBoolean() && right.isBoolean()) {
 					return res.setBoolean(left.bool !== right.bool);
 				}
+			} else if(expr.operator === "&") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number & right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === "|") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number | right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === "^") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number ^ right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === ">>>") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number >>> right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === ">>") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number >> right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === "<<") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number << right.number);
+				res.setRange(expr.range);
+				return res;
 			}
 		});
 		this.plugin("evaluate UnaryExpression", function(expr) {
@@ -242,6 +305,14 @@ class Parser extends Tapable {
 				} else if(argument.isNumber()) {
 					return new BasicEvaluatedExpression().setBoolean(!argument.number).setRange(expr.range);
 				}
+			} else if(expr.operator === "~") {
+				const argument = this.evaluateExpression(expr.argument);
+				if(!argument) return;
+				if(!argument.isNumber()) return;
+				const res = new BasicEvaluatedExpression();
+				res.setNumber(~argument.number);
+				res.setRange(expr.range);
+				return res;
 			}
 		});
 		this.plugin("evaluate typeof undefined", function(expr) {
@@ -1047,6 +1118,14 @@ class Parser extends Tapable {
 	}
 
 	walkNewExpression(expression) {
+		const callee = this.evaluateExpression(expression.callee);
+		if(callee.isIdentifier()) {
+			const result = this.applyPluginsBailResult("new " + callee.identifier, expression);
+			if(result === true) {
+				return;
+			}
+		}
+
 		this.walkExpression(expression.callee);
 		if(expression.arguments)
 			this.walkExpressions(expression.arguments);

package/lib/ParserHelpers.js

@@ -1,85 +1,85 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const path = require("path");
-
-const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
-const ConstDependency = require("./dependencies/ConstDependency");
-const UnsupportedFeatureWarning = require("./UnsupportedFeatureWarning");
-
-const ParserHelpers = exports;
-
-ParserHelpers.addParsedVariableToModule = function(parser, name, expression) {
-	if(!parser.state.current.addVariable) return false;
-	var deps = [];
-	parser.parse(expression, {
-		current: {
-			addDependency: function(dep) {
-				dep.userRequest = name;
-				deps.push(dep);
-			}
-		},
-		module: parser.state.module
-	});
-	parser.state.current.addVariable(name, expression, deps);
-	return true;
-};
-
-ParserHelpers.requireFileAsExpression = function(context, pathToModule) {
-	var moduleJsPath = path.relative(context, pathToModule);
-	if(!/^[A-Z]:/i.test(moduleJsPath)) {
-		moduleJsPath = "./" + moduleJsPath.replace(/\\/g, "/");
-	}
-	return "require(" + JSON.stringify(moduleJsPath) + ")";
-};
-
-ParserHelpers.toConstantDependency = function(value) {
-	return function constDependency(expr) {
-		var dep = new ConstDependency(value, expr.range);
-		dep.loc = expr.loc;
-		this.state.current.addDependency(dep);
-		return true;
-	};
-};
-
-ParserHelpers.evaluateToString = function(value) {
-	return function stringExpression(expr) {
-		return new BasicEvaluatedExpression().setString(value).setRange(expr.range);
-	};
-};
-
-ParserHelpers.evaluateToBoolean = function(value) {
-	return function booleanExpression(expr) {
-		return new BasicEvaluatedExpression().setBoolean(value).setRange(expr.range);
-	};
-};
-
-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);
-		dep.loc = expr.loc;
-		this.state.current.addDependency(dep);
-		if(!this.state.module) return;
-		this.state.module.warnings.push(new UnsupportedFeatureWarning(this.state.module, message));
-		return true;
-	};
-};
-
-ParserHelpers.skipTraversal = function skipTraversal() {
-	return true;
-};
-
-ParserHelpers.approve = function approve() {
-	return true;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const path = require("path");
+
+const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
+const ConstDependency = require("./dependencies/ConstDependency");
+const UnsupportedFeatureWarning = require("./UnsupportedFeatureWarning");
+
+const ParserHelpers = exports;
+
+ParserHelpers.addParsedVariableToModule = function(parser, name, expression) {
+	if(!parser.state.current.addVariable) return false;
+	var deps = [];
+	parser.parse(expression, {
+		current: {
+			addDependency: function(dep) {
+				dep.userRequest = name;
+				deps.push(dep);
+			}
+		},
+		module: parser.state.module
+	});
+	parser.state.current.addVariable(name, expression, deps);
+	return true;
+};
+
+ParserHelpers.requireFileAsExpression = function(context, pathToModule) {
+	var moduleJsPath = path.relative(context, pathToModule);
+	if(!/^[A-Z]:/i.test(moduleJsPath)) {
+		moduleJsPath = "./" + moduleJsPath.replace(/\\/g, "/");
+	}
+	return "require(" + JSON.stringify(moduleJsPath) + ")";
+};
+
+ParserHelpers.toConstantDependency = function(value) {
+	return function constDependency(expr) {
+		var dep = new ConstDependency(value, expr.range);
+		dep.loc = expr.loc;
+		this.state.current.addDependency(dep);
+		return true;
+	};
+};
+
+ParserHelpers.evaluateToString = function(value) {
+	return function stringExpression(expr) {
+		return new BasicEvaluatedExpression().setString(value).setRange(expr.range);
+	};
+};
+
+ParserHelpers.evaluateToBoolean = function(value) {
+	return function booleanExpression(expr) {
+		return new BasicEvaluatedExpression().setBoolean(value).setRange(expr.range);
+	};
+};
+
+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);
+		dep.loc = expr.loc;
+		this.state.current.addDependency(dep);
+		if(!this.state.module) return;
+		this.state.module.warnings.push(new UnsupportedFeatureWarning(this.state.module, message));
+		return true;
+	};
+};
+
+ParserHelpers.skipTraversal = function skipTraversal() {
+	return true;
+};
+
+ParserHelpers.approve = function approve() {
+	return true;
+};

package/lib/PrefetchPlugin.js

@@ -1,31 +1,31 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const PrefetchDependency = require("./dependencies/PrefetchDependency");
-
-class PrefetchPlugin {
-
-	constructor(context, request) {
-		if(!request) {
-			this.request = context;
-		} else {
-			this.context = context;
-			this.request = request;
-		}
-	}
-
-	apply(compiler) {
-		compiler.plugin("compilation", (compilation, params) => {
-			const normalModuleFactory = params.normalModuleFactory;
-
-			compilation.dependencyFactories.set(PrefetchDependency, normalModuleFactory);
-		});
-		compiler.plugin("make", (compilation, callback) => {
-			compilation.prefetch(this.context || compiler.context, new PrefetchDependency(this.request), callback);
-		});
-	}
-
-}
-module.exports = PrefetchPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const PrefetchDependency = require("./dependencies/PrefetchDependency");
+
+class PrefetchPlugin {
+
+	constructor(context, request) {
+		if(!request) {
+			this.request = context;
+		} else {
+			this.context = context;
+			this.request = request;
+		}
+	}
+
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation, params) => {
+			const normalModuleFactory = params.normalModuleFactory;
+
+			compilation.dependencyFactories.set(PrefetchDependency, normalModuleFactory);
+		});
+		compiler.plugin("make", (compilation, callback) => {
+			compilation.prefetch(this.context || compiler.context, new PrefetchDependency(this.request), callback);
+		});
+	}
+
+}
+module.exports = PrefetchPlugin;