webpack 3.6.0 → 3.8.1

package/lib/Parser.js

@@ -321,45 +321,76 @@ class Parser extends Tapable {
 				}
 				return new BasicEvaluatedExpression().setString(result).setRange(expr.range);
 			});
+		});
 
-			/**
-			 * @param {string} kind "cooked" | "raw"
-			 * @param {any[]} quasis quasis
-			 * @param {any[]} expressions expressions
-			 * @return {BasicEvaluatedExpression[]} Simplified template
-			 */
-			function getSimplifiedTemplateResult(kind, quasis, expressions) {
-				const parts = [];
-
-				for(let i = 0; i < quasis.length; i++) {
-					parts.push(new BasicEvaluatedExpression().setString(quasis[i].value[kind]).setRange(quasis[i].range));
-
-					if(i > 0) {
-						const prevExpr = parts[parts.length - 2],
-							lastExpr = parts[parts.length - 1];
-						const expr = this.evaluateExpression(expressions[i - 1]);
-						if(!(expr.isString() || expr.isNumber())) continue;
-
-						prevExpr.setString(prevExpr.string + (expr.isString() ? expr.string : expr.number) + lastExpr.string);
-						prevExpr.setRange([prevExpr.range[0], lastExpr.range[1]]);
-						parts.pop();
-					}
+		/**
+		 * @param {string} kind "cooked" | "raw"
+		 * @param {any[]} quasis quasis
+		 * @param {any[]} expressions expressions
+		 * @return {BasicEvaluatedExpression[]} Simplified template
+		 */
+		function getSimplifiedTemplateResult(kind, quasis, expressions) {
+			const parts = [];
+
+			for(let i = 0; i < quasis.length; i++) {
+				parts.push(new BasicEvaluatedExpression().setString(quasis[i].value[kind]).setRange(quasis[i].range));
+
+				if(i > 0) {
+					const prevExpr = parts[parts.length - 2],
+						lastExpr = parts[parts.length - 1];
+					const expr = this.evaluateExpression(expressions[i - 1]);
+					if(!(expr.isString() || expr.isNumber())) continue;
+
+					prevExpr.setString(prevExpr.string + (expr.isString() ? expr.string : expr.number) + lastExpr.string);
+					prevExpr.setRange([prevExpr.range[0], lastExpr.range[1]]);
+					parts.pop();
 				}
-				return parts;
 			}
+			return parts;
+		}
 
-			this.plugin("evaluate TemplateLiteral", function(node) {
-				const parts = getSimplifiedTemplateResult.call(this, "cooked", node.quasis, node.expressions);
-				if(parts.length === 1) {
-					return parts[0].setRange(node.range);
+		this.plugin("evaluate TemplateLiteral", function(node) {
+			const parts = getSimplifiedTemplateResult.call(this, "cooked", node.quasis, node.expressions);
+			if(parts.length === 1) {
+				return parts[0].setRange(node.range);
+			}
+			return new BasicEvaluatedExpression().setTemplateString(parts).setRange(node.range);
+		});
+		this.plugin("evaluate TaggedTemplateExpression", function(node) {
+			if(this.evaluateExpression(node.tag).identifier !== "String.raw") return;
+			const parts = getSimplifiedTemplateResult.call(this, "raw", node.quasi.quasis, node.quasi.expressions);
+			return new BasicEvaluatedExpression().setTemplateString(parts).setRange(node.range);
+		});
+
+		this.plugin("evaluate CallExpression .concat", function(expr, param) {
+			if(!param.isString() && !param.isWrapped()) return;
+
+			let stringSuffix = null;
+			let hasUnknownParams = false;
+			for(let i = expr.arguments.length - 1; i >= 0; i--) {
+				const argExpr = this.evaluateExpression(expr.arguments[i]);
+				if(!argExpr.isString() && !argExpr.isNumber()) {
+					hasUnknownParams = true;
+					break;
 				}
-				return new BasicEvaluatedExpression().setTemplateString(parts).setRange(node.range);
-			});
-			this.plugin("evaluate TaggedTemplateExpression", function(node) {
-				if(this.evaluateExpression(node.tag).identifier !== "String.raw") return;
-				const parts = getSimplifiedTemplateResult.call(this, "raw", node.quasi.quasis, node.quasi.expressions);
-				return new BasicEvaluatedExpression().setTemplateString(parts).setRange(node.range);
-			});
+
+				const value = argExpr.isString() ? argExpr.string : "" + argExpr.number;
+
+				const newString = value + (stringSuffix ? stringSuffix.string : "");
+				const newRange = [argExpr.range[0], (stringSuffix || argExpr).range[1]];
+				stringSuffix = new BasicEvaluatedExpression().setString(newString).setRange(newRange);
+			}
+
+			if(hasUnknownParams) {
+				const prefix = param.isString() ? param : param.prefix;
+				return new BasicEvaluatedExpression().setWrapped(prefix, stringSuffix).setRange(expr.range);
+			} else if(param.isWrapped()) {
+				const postfix = stringSuffix || param.postfix;
+				return new BasicEvaluatedExpression().setWrapped(param.prefix, postfix).setRange(expr.range);
+			} else {
+				const newString = param.string + (stringSuffix ? stringSuffix.string : "");
+				return new BasicEvaluatedExpression().setString(newString).setRange(expr.range);
+			}
 		});
 		this.plugin("evaluate CallExpression .split", function(expr, param) {
 			if(!param.isString()) return;

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;