webpack 3.5.2 → 3.5.6

package/lib/OptionsDefaulter.js

@@ -1,71 +1,73 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-function getProperty(obj, name) {
-	name = name.split(".");
-	for(var i = 0; i < name.length - 1; i++) {
-		obj = obj[name[i]];
-		if(typeof obj !== "object" || !obj) return;
-	}
-	return obj[name.pop()];
-}
-
-function setProperty(obj, name, value) {
-	name = name.split(".");
-	for(var 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]];
-	}
-	obj[name.pop()] = value;
-}
-
-class OptionsDefaulter {
-	constructor() {
-		this.defaults = {};
-		this.config = {};
-	}
-
-	process(options) {
-		for(let name in this.defaults) {
-			switch(this.config[name]) {
-				case undefined:
-					if(getProperty(options, name) === undefined)
-						setProperty(options, name, this.defaults[name]);
-					break;
-				case "call":
-					setProperty(options, name, this.defaults[name].call(this, getProperty(options, name), options), options);
-					break;
-				case "make":
-					if(getProperty(options, name) === undefined)
-						setProperty(options, name, this.defaults[name].call(this, options), options);
-					break;
-				case "append":
-					{
-						let oldValue = getProperty(options, name);
-						if(!Array.isArray(oldValue)) oldValue = [];
-						oldValue.push.apply(oldValue, this.defaults[name]);
-						setProperty(options, name, oldValue);
-						break;
-					}
-				default:
-					throw new Error("OptionsDefaulter cannot process " + this.config[name]);
-			}
-		}
-	}
-
-	set(name, config, def) {
-		if(arguments.length === 3) {
-			this.defaults[name] = def;
-			this.config[name] = config;
-		} else {
-			this.defaults[name] = config;
-			delete this.config[name];
-		}
-	}
-}
-
-module.exports = OptionsDefaulter;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+function getProperty(obj, name) {
+	name = name.split(".");
+	for(var i = 0; i < name.length - 1; i++) {
+		obj = obj[name[i]];
+		if(typeof obj !== "object" || !obj) return;
+	}
+	return obj[name.pop()];
+}
+
+function setProperty(obj, name, value) {
+	name = name.split(".");
+	for(var 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]];
+	}
+	obj[name.pop()] = value;
+}
+
+class OptionsDefaulter {
+	constructor() {
+		this.defaults = {};
+		this.config = {};
+	}
+
+	process(options) {
+		// TODO: change this for webpack 4: options = Object.assign({}, options);
+		for(let name in this.defaults) {
+			switch(this.config[name]) {
+				case undefined:
+					if(getProperty(options, name) === undefined)
+						setProperty(options, name, this.defaults[name]);
+					break;
+				case "call":
+					setProperty(options, name, this.defaults[name].call(this, getProperty(options, name), options), options);
+					break;
+				case "make":
+					if(getProperty(options, name) === undefined)
+						setProperty(options, name, this.defaults[name].call(this, options), options);
+					break;
+				case "append":
+					{
+						let oldValue = getProperty(options, name);
+						if(!Array.isArray(oldValue)) oldValue = [];
+						oldValue.push.apply(oldValue, this.defaults[name]);
+						setProperty(options, name, oldValue);
+						break;
+					}
+				default:
+					throw new Error("OptionsDefaulter cannot process " + this.config[name]);
+			}
+		}
+		// TODO: change this for webpack 4: return options;
+	}
+
+	set(name, config, def) {
+		if(arguments.length === 3) {
+			this.defaults[name] = def;
+			this.config[name] = config;
+		} else {
+			this.defaults[name] = config;
+			delete this.config[name];
+		}
+	}
+}
+
+module.exports = OptionsDefaulter;

package/lib/Parser.js

@@ -634,14 +634,14 @@ class Parser extends Tapable {
 		statement.params.forEach(param => {
 			this.walkPattern(param);
 		});
-		this.inScope(statement.params, function() {
+		this.inScope(statement.params, () => {
 			if(statement.body.type === "BlockStatement") {
 				this.prewalkStatement(statement.body);
 				this.walkStatement(statement.body);
 			} else {
 				this.walkExpression(statement.body);
 			}
-		}.bind(this));
+		});
 	}
 
 	prewalkImportDeclaration(statement) {
@@ -784,10 +784,10 @@ class Parser extends Tapable {
 	}
 
 	walkCatchClause(catchClause) {
-		this.inScope([catchClause.param], function() {
+		this.inScope([catchClause.param], () => {
 			this.prewalkStatement(catchClause.body);
 			this.walkStatement(catchClause.body);
-		}.bind(this));
+		});
 	}
 
 	prewalkVariableDeclarators(declarators) {
@@ -916,28 +916,28 @@ class Parser extends Tapable {
 		expression.params.forEach(param => {
 			this.walkPattern(param);
 		});
-		this.inScope(expression.params, function() {
+		this.inScope(expression.params, () => {
 			if(expression.body.type === "BlockStatement") {
 				this.prewalkStatement(expression.body);
 				this.walkStatement(expression.body);
 			} else {
 				this.walkExpression(expression.body);
 			}
-		}.bind(this));
+		});
 	}
 
 	walkArrowFunctionExpression(expression) {
 		expression.params.forEach(param => {
 			this.walkPattern(param);
 		});
-		this.inScope(expression.params, function() {
+		this.inScope(expression.params, () => {
 			if(expression.body.type === "BlockStatement") {
 				this.prewalkStatement(expression.body);
 				this.walkStatement(expression.body);
 			} else {
 				this.walkExpression(expression.body);
 			}
-		}.bind(this));
+		});
 	}
 
 	walkSequenceExpression(expression) {
@@ -1059,7 +1059,7 @@ class Parser extends Tapable {
 			const args = options.map(renameArgOrThis, this);
 			this.inScope(params.filter(function(identifier, idx) {
 				return !args[idx];
-			}), function() {
+			}), () => {
 				if(renameThis) {
 					this.scope.renames.$this = renameThis;
 				}
@@ -1074,7 +1074,7 @@ class Parser extends Tapable {
 					this.walkStatement(functionExpression.body);
 				} else
 					this.walkExpression(functionExpression.body);
-			}.bind(this));
+			});
 		}
 		if(expression.callee.type === "MemberExpression" &&
 			expression.callee.object.type === "FunctionExpression" &&

package/lib/SourceMapDevToolPlugin.js

@@ -1,207 +1,209 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const path = require("path");
-const crypto = require("crypto");
-const RequestShortener = require("./RequestShortener");
-const ConcatSource = require("webpack-sources").ConcatSource;
-const RawSource = require("webpack-sources").RawSource;
-const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
-const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
-
-const basename = (name) => {
-	if(name.indexOf("/") < 0) return name;
-	return name.substr(name.lastIndexOf("/") + 1);
-};
-
-function getTaskForFile(file, chunk, options, compilation) {
-	const asset = compilation.assets[file];
-	if(asset.__SourceMapDevToolFile === file && asset.__SourceMapDevToolData) {
-		const data = asset.__SourceMapDevToolData;
-		for(const cachedFile in data) {
-			compilation.assets[cachedFile] = data[cachedFile];
-			if(cachedFile !== file)
-				chunk.files.push(cachedFile);
-		}
-		return;
-	}
-	let source, sourceMap;
-	if(asset.sourceAndMap) {
-		const sourceAndMap = asset.sourceAndMap(options);
-		sourceMap = sourceAndMap.map;
-		source = sourceAndMap.source;
-	} else {
-		sourceMap = asset.map(options);
-		source = asset.source();
-	}
-	if(sourceMap) {
-		return {
-			chunk,
-			file,
-			asset,
-			source,
-			sourceMap,
-			modules: undefined
-		};
-	}
-}
-
-class SourceMapDevToolPlugin {
-	constructor(options) {
-		if(arguments.length > 1)
-			throw new Error("SourceMapDevToolPlugin only takes one argument (pass an options object)");
-		// TODO: remove in webpack 3
-		if(typeof options === "string") {
-			options = {
-				sourceMapFilename: options
-			};
-		}
-		if(!options) options = {};
-		this.sourceMapFilename = options.filename;
-		this.sourceMappingURLComment = options.append === false ? false : options.append || "\n//# sourceMappingURL=[url]";
-		this.moduleFilenameTemplate = options.moduleFilenameTemplate || "webpack:///[resourcePath]";
-		this.fallbackModuleFilenameTemplate = options.fallbackModuleFilenameTemplate || "webpack:///[resourcePath]?[hash]";
-		this.options = options;
-	}
-
-	apply(compiler) {
-		const sourceMapFilename = this.sourceMapFilename;
-		const sourceMappingURLComment = this.sourceMappingURLComment;
-		const moduleFilenameTemplate = this.moduleFilenameTemplate;
-		const fallbackModuleFilenameTemplate = this.fallbackModuleFilenameTemplate;
-		const requestShortener = new RequestShortener(compiler.context);
-		const options = this.options;
-		options.test = options.test || /\.(js|css)($|\?)/i;
-
-		const matchObject = ModuleFilenameHelpers.matchObject.bind(undefined, options);
-
-		compiler.plugin("compilation", compilation => {
-			new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
-
-			compilation.plugin("after-optimize-chunk-assets", function(chunks) {
-				const moduleToSourceNameMapping = new Map();
-				const tasks = [];
-
-				chunks.forEach(function(chunk) {
-					chunk.files.forEach(file => {
-						if(matchObject(file)) {
-							const task = getTaskForFile(file, chunk, options, compilation);
-
-							if(task) {
-								const modules = task.sourceMap.sources.map(source => {
-									const module = compilation.findModule(source);
-									return module || source;
-								});
-
-								for(const module of modules) {
-									if(!moduleToSourceNameMapping.get(module)) {
-										moduleToSourceNameMapping.set(module, ModuleFilenameHelpers.createFilename(module, moduleFilenameTemplate, requestShortener));
-									}
-								}
-
-								task.modules = modules;
-
-								tasks.push(task);
-							}
-						}
-					});
-				});
-
-				const usedNamesSet = new Set(moduleToSourceNameMapping.values());
-				const conflictDetectionSet = new Set();
-
-				// all modules in defined order (longest identifier first)
-				const allModules = Array.from(moduleToSourceNameMapping.keys()).sort((a, b) => {
-					const ai = typeof a === "string" ? a : a.identifier();
-					const bi = typeof b === "string" ? b : b.identifier();
-					return ai.length - bi.length;
-				});
-
-				// find modules with conflicting source names
-				for(const module of allModules) {
-					let sourceName = moduleToSourceNameMapping.get(module);
-					let hasName = conflictDetectionSet.has(sourceName);
-					if(!hasName) {
-						conflictDetectionSet.add(sourceName);
-						continue;
-					}
-
-					// try the fallback name first
-					sourceName = ModuleFilenameHelpers.createFilename(module, fallbackModuleFilenameTemplate, requestShortener);
-					hasName = usedNamesSet.has(sourceName);
-					if(!hasName) {
-						moduleToSourceNameMapping.set(module, sourceName);
-						usedNamesSet.add(sourceName);
-						continue;
-					}
-
-					// elsewise just append stars until we have a valid name
-					while(hasName) {
-						sourceName += "*";
-						hasName = usedNamesSet.has(sourceName);
-					}
-					moduleToSourceNameMapping.set(module, sourceName);
-					usedNamesSet.add(sourceName);
-				}
-				tasks.forEach(function(task) {
-					const chunk = task.chunk;
-					const file = task.file;
-					const asset = task.asset;
-					const sourceMap = task.sourceMap;
-					const source = task.source;
-					const modules = task.modules;
-					const moduleFilenames = modules.map(m => moduleToSourceNameMapping.get(m));
-					sourceMap.sources = moduleFilenames;
-					if(sourceMap.sourcesContent && !options.noSources) {
-						sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}`);
-					} else {
-						sourceMap.sourcesContent = undefined;
-					}
-					sourceMap.sourceRoot = options.sourceRoot || "";
-					sourceMap.file = file;
-					asset.__SourceMapDevToolFile = file;
-					asset.__SourceMapDevToolData = {};
-					let currentSourceMappingURLComment = sourceMappingURLComment;
-					if(currentSourceMappingURLComment !== false && /\.css($|\?)/i.test(file)) {
-						currentSourceMappingURLComment = currentSourceMappingURLComment.replace(/^\n\/\/(.*)$/, "\n/*$1*/");
-					}
-					const sourceMapString = JSON.stringify(sourceMap);
-					if(sourceMapFilename) {
-						let filename = file;
-						let query = "";
-						const idx = filename.indexOf("?");
-						if(idx >= 0) {
-							query = filename.substr(idx);
-							filename = filename.substr(0, idx);
-						}
-						let sourceMapFile = compilation.getPath(sourceMapFilename, {
-							chunk,
-							filename,
-							query,
-							basename: basename(filename)
-						});
-						if(sourceMapFile.indexOf("[contenthash]") !== -1) {
-							sourceMapFile = sourceMapFile.replace(/\[contenthash\]/g, crypto.createHash("md5").update(sourceMapString).digest("hex"));
-						}
-						const sourceMapUrl = path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
-						if(currentSourceMappingURLComment !== false) {
-							asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));
-						}
-						asset.__SourceMapDevToolData[sourceMapFile] = compilation.assets[sourceMapFile] = new RawSource(sourceMapString);
-						chunk.files.push(sourceMapFile);
-					} else {
-						asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment
-							.replace(/\[map\]/g, () => sourceMapString)
-							.replace(/\[url\]/g, () => `data:application/json;charset=utf-8;base64,${new Buffer(sourceMapString, "utf-8").toString("base64")}`) // eslint-disable-line
-						);
-					}
-				});
-			});
-		});
-	}
-}
-
-module.exports = SourceMapDevToolPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const path = require("path");
+const crypto = require("crypto");
+const RequestShortener = require("./RequestShortener");
+const ConcatSource = require("webpack-sources").ConcatSource;
+const RawSource = require("webpack-sources").RawSource;
+const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
+const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
+
+const basename = (name) => {
+	if(name.indexOf("/") < 0) return name;
+	return name.substr(name.lastIndexOf("/") + 1);
+};
+
+function getTaskForFile(file, chunk, options, compilation) {
+	const asset = compilation.assets[file];
+	if(asset.__SourceMapDevToolFile === file && asset.__SourceMapDevToolData) {
+		const data = asset.__SourceMapDevToolData;
+		for(const cachedFile in data) {
+			compilation.assets[cachedFile] = data[cachedFile];
+			if(cachedFile !== file)
+				chunk.files.push(cachedFile);
+		}
+		return;
+	}
+	let source, sourceMap;
+	if(asset.sourceAndMap) {
+		const sourceAndMap = asset.sourceAndMap(options);
+		sourceMap = sourceAndMap.map;
+		source = sourceAndMap.source;
+	} else {
+		sourceMap = asset.map(options);
+		source = asset.source();
+	}
+	if(sourceMap) {
+		return {
+			chunk,
+			file,
+			asset,
+			source,
+			sourceMap,
+			modules: undefined
+		};
+	}
+}
+
+class SourceMapDevToolPlugin {
+	constructor(options) {
+		if(arguments.length > 1)
+			throw new Error("SourceMapDevToolPlugin only takes one argument (pass an options object)");
+		// TODO: remove in webpack 3
+		if(typeof options === "string") {
+			options = {
+				sourceMapFilename: options
+			};
+		}
+		if(!options) options = {};
+		this.sourceMapFilename = options.filename;
+		this.sourceMappingURLComment = options.append === false ? false : options.append || "\n//# sourceMappingURL=[url]";
+		this.moduleFilenameTemplate = options.moduleFilenameTemplate || "webpack:///[resourcePath]";
+		this.fallbackModuleFilenameTemplate = options.fallbackModuleFilenameTemplate || "webpack:///[resourcePath]?[hash]";
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const sourceMapFilename = this.sourceMapFilename;
+		const sourceMappingURLComment = this.sourceMappingURLComment;
+		const moduleFilenameTemplate = this.moduleFilenameTemplate;
+		const fallbackModuleFilenameTemplate = this.fallbackModuleFilenameTemplate;
+		const requestShortener = new RequestShortener(compiler.context);
+		const options = this.options;
+		options.test = options.test || /\.(js|css)($|\?)/i;
+
+		const matchObject = ModuleFilenameHelpers.matchObject.bind(undefined, options);
+
+		compiler.plugin("compilation", compilation => {
+			new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
+
+			compilation.plugin("after-optimize-chunk-assets", function(chunks) {
+				const moduleToSourceNameMapping = new Map();
+				const tasks = [];
+
+				chunks.forEach(function(chunk) {
+					chunk.files.forEach(file => {
+						if(matchObject(file)) {
+							const task = getTaskForFile(file, chunk, options, compilation);
+
+							if(task) {
+								const modules = task.sourceMap.sources.map(source => {
+									const module = compilation.findModule(source);
+									return module || source;
+								});
+
+								for(let idx = 0; idx < modules.length; idx++) {
+									const module = modules[idx];
+									if(!moduleToSourceNameMapping.get(module)) {
+										moduleToSourceNameMapping.set(module, ModuleFilenameHelpers.createFilename(module, moduleFilenameTemplate, requestShortener));
+									}
+								}
+
+								task.modules = modules;
+
+								tasks.push(task);
+							}
+						}
+					});
+				});
+
+				const usedNamesSet = new Set(moduleToSourceNameMapping.values());
+				const conflictDetectionSet = new Set();
+
+				// all modules in defined order (longest identifier first)
+				const allModules = Array.from(moduleToSourceNameMapping.keys()).sort((a, b) => {
+					const ai = typeof a === "string" ? a : a.identifier();
+					const bi = typeof b === "string" ? b : b.identifier();
+					return ai.length - bi.length;
+				});
+
+				// find modules with conflicting source names
+				for(let idx = 0; idx < allModules.length; idx++) {
+					const module = allModules[idx];
+					let sourceName = moduleToSourceNameMapping.get(module);
+					let hasName = conflictDetectionSet.has(sourceName);
+					if(!hasName) {
+						conflictDetectionSet.add(sourceName);
+						continue;
+					}
+
+					// try the fallback name first
+					sourceName = ModuleFilenameHelpers.createFilename(module, fallbackModuleFilenameTemplate, requestShortener);
+					hasName = usedNamesSet.has(sourceName);
+					if(!hasName) {
+						moduleToSourceNameMapping.set(module, sourceName);
+						usedNamesSet.add(sourceName);
+						continue;
+					}
+
+					// elsewise just append stars until we have a valid name
+					while(hasName) {
+						sourceName += "*";
+						hasName = usedNamesSet.has(sourceName);
+					}
+					moduleToSourceNameMapping.set(module, sourceName);
+					usedNamesSet.add(sourceName);
+				}
+				tasks.forEach(function(task) {
+					const chunk = task.chunk;
+					const file = task.file;
+					const asset = task.asset;
+					const sourceMap = task.sourceMap;
+					const source = task.source;
+					const modules = task.modules;
+					const moduleFilenames = modules.map(m => moduleToSourceNameMapping.get(m));
+					sourceMap.sources = moduleFilenames;
+					if(sourceMap.sourcesContent && !options.noSources) {
+						sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}`);
+					} else {
+						sourceMap.sourcesContent = undefined;
+					}
+					sourceMap.sourceRoot = options.sourceRoot || "";
+					sourceMap.file = file;
+					asset.__SourceMapDevToolFile = file;
+					asset.__SourceMapDevToolData = {};
+					let currentSourceMappingURLComment = sourceMappingURLComment;
+					if(currentSourceMappingURLComment !== false && /\.css($|\?)/i.test(file)) {
+						currentSourceMappingURLComment = currentSourceMappingURLComment.replace(/^\n\/\/(.*)$/, "\n/*$1*/");
+					}
+					const sourceMapString = JSON.stringify(sourceMap);
+					if(sourceMapFilename) {
+						let filename = file;
+						let query = "";
+						const idx = filename.indexOf("?");
+						if(idx >= 0) {
+							query = filename.substr(idx);
+							filename = filename.substr(0, idx);
+						}
+						let sourceMapFile = compilation.getPath(sourceMapFilename, {
+							chunk,
+							filename,
+							query,
+							basename: basename(filename)
+						});
+						if(sourceMapFile.indexOf("[contenthash]") !== -1) {
+							sourceMapFile = sourceMapFile.replace(/\[contenthash\]/g, crypto.createHash("md5").update(sourceMapString).digest("hex"));
+						}
+						const sourceMapUrl = path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
+						if(currentSourceMappingURLComment !== false) {
+							asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));
+						}
+						asset.__SourceMapDevToolData[sourceMapFile] = compilation.assets[sourceMapFile] = new RawSource(sourceMapString);
+						chunk.files.push(sourceMapFile);
+					} else {
+						asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment
+							.replace(/\[map\]/g, () => sourceMapString)
+							.replace(/\[url\]/g, () => `data:application/json;charset=utf-8;base64,${new Buffer(sourceMapString, "utf-8").toString("base64")}`) // eslint-disable-line
+						);
+					}
+				});
+			});
+		});
+	}
+}
+
+module.exports = SourceMapDevToolPlugin;