webpack 4.8.2 → 4.9.2

package/lib/util/SortableSet.js

@@ -1,106 +1,106 @@
-"use strict";
-//TODO: Make this a generic type
-//https://github.com/Microsoft/TypeScript/issues/23385
-//https://github.com/Microsoft/TypeScript/issues/23384
-class SortableSet extends Set {
-	constructor(initialIterable, defaultSort) {
-		super(initialIterable);
-		this._sortFn = defaultSort;
-		this._lastActiveSortFn = null;
-		this._cache = undefined;
-		this._cacheOrderIndependent = undefined;
-	}
-
-	/**
-	 * @param {TODO} value - value to add to set
-	 * @returns {this} - returns itself
-	 */
-	add(value) {
-		this._lastActiveSortFn = null;
-		this._invalidateCache();
-		this._invalidateOrderedCache();
-		super.add(value);
-		return this;
-	}
-
-	delete(value) {
-		this._invalidateCache();
-		this._invalidateOrderedCache();
-		return super.delete(value);
-	}
-
-	clear() {
-		this._invalidateCache();
-		this._invalidateOrderedCache();
-		return super.clear();
-	}
-
-	sortWith(/** @type {(a: TODO, b: TODO) => number} */ sortFn) {
-		if (this.size <= 1 || sortFn === this._lastActiveSortFn) {
-			// already sorted - nothing to do
-			return;
-		}
-
-		const sortedArray = Array.from(this).sort(sortFn);
-		super.clear();
-		for (let i = 0; i < sortedArray.length; i += 1) {
-			super.add(sortedArray[i]);
-		}
-		this._lastActiveSortFn = sortFn;
-		this._invalidateCache();
-	}
-
-	/**
-	 * @returns {void}
-	 */
-	sort() {
-		this.sortWith(this._sortFn);
-	}
-
-	/**
-	 * @param {Function} fn - function to calculate value
-	 * @returns {TODO} - returns result of fn(this), cached until set changes
-	 */
-	getFromCache(fn) {
-		if (this._cache === undefined) {
-			this._cache = new Map();
-		} else {
-			const data = this._cache.get(fn);
-			if (data !== undefined) {
-				return data;
-			}
-		}
-		const newData = fn(this);
-		this._cache.set(fn, newData);
-		return newData;
-	}
-
-	/**
-	 * @param {Function} fn - function to calculate value
-	 * @returns {TODO} - returns result of fn(this), cached until set changes
-	 */
-	getFromUnorderedCache(fn) {
-		if (this._cacheOrderIndependent === undefined) {
-			this._cacheOrderIndependent = new Map();
-		} else {
-			const data = this._cacheOrderIndependent.get(fn);
-			if (data !== undefined) {
-				return data;
-			}
-		}
-		const newData = fn(this);
-		this._cacheOrderIndependent.set(fn, newData);
-		return newData;
-	}
-
-	_invalidateCache() {
-		if (this._cache !== undefined) this._cache.clear();
-	}
-
-	_invalidateOrderedCache() {
-		if (this._cacheOrderIndependent !== undefined)
-			this._cacheOrderIndependent.clear();
-	}
-}
-
-module.exports = SortableSet;
+"use strict";
+//TODO: Make this a generic type
+//https://github.com/Microsoft/TypeScript/issues/23385
+//https://github.com/Microsoft/TypeScript/issues/23384
+class SortableSet extends Set {
+	constructor(initialIterable, defaultSort) {
+		super(initialIterable);
+		this._sortFn = defaultSort;
+		this._lastActiveSortFn = null;
+		this._cache = undefined;
+		this._cacheOrderIndependent = undefined;
+	}
+
+	/**
+	 * @param {TODO} value - value to add to set
+	 * @returns {this} - returns itself
+	 */
+	add(value) {
+		this._lastActiveSortFn = null;
+		this._invalidateCache();
+		this._invalidateOrderedCache();
+		super.add(value);
+		return this;
+	}
+
+	delete(value) {
+		this._invalidateCache();
+		this._invalidateOrderedCache();
+		return super.delete(value);
+	}
+
+	clear() {
+		this._invalidateCache();
+		this._invalidateOrderedCache();
+		return super.clear();
+	}
+
+	sortWith(/** @type {(a: TODO, b: TODO) => number} */ sortFn) {
+		if (this.size <= 1 || sortFn === this._lastActiveSortFn) {
+			// already sorted - nothing to do
+			return;
+		}
+
+		const sortedArray = Array.from(this).sort(sortFn);
+		super.clear();
+		for (let i = 0; i < sortedArray.length; i += 1) {
+			super.add(sortedArray[i]);
+		}
+		this._lastActiveSortFn = sortFn;
+		this._invalidateCache();
+	}
+
+	/**
+	 * @returns {void}
+	 */
+	sort() {
+		this.sortWith(this._sortFn);
+	}
+
+	/**
+	 * @param {Function} fn - function to calculate value
+	 * @returns {TODO} - returns result of fn(this), cached until set changes
+	 */
+	getFromCache(fn) {
+		if (this._cache === undefined) {
+			this._cache = new Map();
+		} else {
+			const data = this._cache.get(fn);
+			if (data !== undefined) {
+				return data;
+			}
+		}
+		const newData = fn(this);
+		this._cache.set(fn, newData);
+		return newData;
+	}
+
+	/**
+	 * @param {Function} fn - function to calculate value
+	 * @returns {TODO} - returns result of fn(this), cached until set changes
+	 */
+	getFromUnorderedCache(fn) {
+		if (this._cacheOrderIndependent === undefined) {
+			this._cacheOrderIndependent = new Map();
+		} else {
+			const data = this._cacheOrderIndependent.get(fn);
+			if (data !== undefined) {
+				return data;
+			}
+		}
+		const newData = fn(this);
+		this._cacheOrderIndependent.set(fn, newData);
+		return newData;
+	}
+
+	_invalidateCache() {
+		if (this._cache !== undefined) this._cache.clear();
+	}
+
+	_invalidateOrderedCache() {
+		if (this._cacheOrderIndependent !== undefined)
+			this._cacheOrderIndependent.clear();
+	}
+}
+
+module.exports = SortableSet;

package/lib/util/StackedSetMap.js

@@ -1,128 +1,128 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const util = require("util");
-
-const TOMBSTONE = {};
-const UNDEFINED_MARKER = {};
-
-class StackedSetMap {
-	constructor(parentStack) {
-		this.stack = parentStack === undefined ? [] : parentStack.slice();
-		this.map = new Map();
-		this.stack.push(this.map);
-	}
-
-	add(item) {
-		this.map.set(item, true);
-	}
-
-	set(item, value) {
-		this.map.set(item, value === undefined ? UNDEFINED_MARKER : value);
-	}
-
-	delete(item) {
-		if (this.stack.length > 1) this.map.set(item, TOMBSTONE);
-		else this.map.delete(item);
-	}
-
-	has(item) {
-		const topValue = this.map.get(item);
-		if (topValue !== undefined) return topValue !== TOMBSTONE;
-		if (this.stack.length > 1) {
-			for (var i = this.stack.length - 2; i >= 0; i--) {
-				const value = this.stack[i].get(item);
-				if (value !== undefined) {
-					this.map.set(item, value);
-					return value !== TOMBSTONE;
-				}
-			}
-			this.map.set(item, TOMBSTONE);
-		}
-		return false;
-	}
-
-	get(item) {
-		const topValue = this.map.get(item);
-		if (topValue !== undefined)
-			return topValue === TOMBSTONE || topValue === UNDEFINED_MARKER
-				? undefined
-				: topValue;
-		if (this.stack.length > 1) {
-			for (var i = this.stack.length - 2; i >= 0; i--) {
-				const value = this.stack[i].get(item);
-				if (value !== undefined) {
-					this.map.set(item, value);
-					return value === TOMBSTONE || value === UNDEFINED_MARKER
-						? undefined
-						: value;
-				}
-			}
-			this.map.set(item, TOMBSTONE);
-		}
-		return undefined;
-	}
-
-	_compress() {
-		if (this.stack.length === 1) return;
-		this.map = new Map();
-		for (const data of this.stack) {
-			for (const pair of data) {
-				if (pair[1] === TOMBSTONE) this.map.delete(pair[0]);
-				else this.map.set(pair[0], pair[1]);
-			}
-		}
-		this.stack = [this.map];
-	}
-
-	asArray() {
-		this._compress();
-		return Array.from(this.map.entries(), pair => pair[0]);
-	}
-
-	asSet() {
-		return new Set(this.asArray());
-	}
-
-	asPairArray() {
-		this._compress();
-		return Array.from(
-			this.map.entries(),
-			pair =>
-				/** @type {[TODO, TODO]} */ (pair[1] === UNDEFINED_MARKER
-					? [pair[0], undefined]
-					: pair)
-		);
-	}
-
-	asMap() {
-		return new Map(this.asPairArray());
-	}
-
-	get size() {
-		this._compress();
-		return this.map.size;
-	}
-
-	createChild() {
-		return new StackedSetMap(this.stack);
-	}
-
-	get length() {
-		throw new Error("This is no longer an Array");
-	}
-
-	set length(value) {
-		throw new Error("This is no longer an Array");
-	}
-}
-
-// TODO remove in webpack 5
-StackedSetMap.prototype.push = util.deprecate(function(item) {
-	this.add(item);
-}, "This is no longer an Array: Use add instead.");
-
-module.exports = StackedSetMap;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const util = require("util");
+
+const TOMBSTONE = {};
+const UNDEFINED_MARKER = {};
+
+class StackedSetMap {
+	constructor(parentStack) {
+		this.stack = parentStack === undefined ? [] : parentStack.slice();
+		this.map = new Map();
+		this.stack.push(this.map);
+	}
+
+	add(item) {
+		this.map.set(item, true);
+	}
+
+	set(item, value) {
+		this.map.set(item, value === undefined ? UNDEFINED_MARKER : value);
+	}
+
+	delete(item) {
+		if (this.stack.length > 1) this.map.set(item, TOMBSTONE);
+		else this.map.delete(item);
+	}
+
+	has(item) {
+		const topValue = this.map.get(item);
+		if (topValue !== undefined) return topValue !== TOMBSTONE;
+		if (this.stack.length > 1) {
+			for (var i = this.stack.length - 2; i >= 0; i--) {
+				const value = this.stack[i].get(item);
+				if (value !== undefined) {
+					this.map.set(item, value);
+					return value !== TOMBSTONE;
+				}
+			}
+			this.map.set(item, TOMBSTONE);
+		}
+		return false;
+	}
+
+	get(item) {
+		const topValue = this.map.get(item);
+		if (topValue !== undefined)
+			return topValue === TOMBSTONE || topValue === UNDEFINED_MARKER
+				? undefined
+				: topValue;
+		if (this.stack.length > 1) {
+			for (var i = this.stack.length - 2; i >= 0; i--) {
+				const value = this.stack[i].get(item);
+				if (value !== undefined) {
+					this.map.set(item, value);
+					return value === TOMBSTONE || value === UNDEFINED_MARKER
+						? undefined
+						: value;
+				}
+			}
+			this.map.set(item, TOMBSTONE);
+		}
+		return undefined;
+	}
+
+	_compress() {
+		if (this.stack.length === 1) return;
+		this.map = new Map();
+		for (const data of this.stack) {
+			for (const pair of data) {
+				if (pair[1] === TOMBSTONE) this.map.delete(pair[0]);
+				else this.map.set(pair[0], pair[1]);
+			}
+		}
+		this.stack = [this.map];
+	}
+
+	asArray() {
+		this._compress();
+		return Array.from(this.map.entries(), pair => pair[0]);
+	}
+
+	asSet() {
+		return new Set(this.asArray());
+	}
+
+	asPairArray() {
+		this._compress();
+		return Array.from(
+			this.map.entries(),
+			pair =>
+				/** @type {[TODO, TODO]} */ (pair[1] === UNDEFINED_MARKER
+					? [pair[0], undefined]
+					: pair)
+		);
+	}
+
+	asMap() {
+		return new Map(this.asPairArray());
+	}
+
+	get size() {
+		this._compress();
+		return this.map.size;
+	}
+
+	createChild() {
+		return new StackedSetMap(this.stack);
+	}
+
+	get length() {
+		throw new Error("This is no longer an Array");
+	}
+
+	set length(value) {
+		throw new Error("This is no longer an Array");
+	}
+}
+
+// TODO remove in webpack 5
+StackedSetMap.prototype.push = util.deprecate(function(item) {
+	this.add(item);
+}, "This is no longer an Array: Use add instead.");
+
+module.exports = StackedSetMap;

package/lib/util/cachedMerge.js

@@ -6,6 +6,19 @@
 
 const mergeCache = new WeakMap();
 
+/**
+ * Merges two given objects and caches the result to avoid computation if same objects passed as arguements again.
+ * @example
+ * // performs Object.assign(first, second), stores the result in WeakMap and returns result
+ * cachedMerge({a: 1}, {a: 2})
+ * {a: 2}
+ *  // when same arguments passed, gets the result from WeakMap and returns it.
+ * cachedMerge({a: 1}, {a: 2})
+ * {a: 2}
+ * @param {object} first first object
+ * @param {object} second second object
+ * @returns {object} merged object of first and second object
+ */
 const cachedMerge = (first, second) => {
 	let innerCache = mergeCache.get(first);
 	if (innerCache === undefined) {

package/lib/util/identifier.js

@@ -12,6 +12,11 @@ const path = require("path");
  * @returns {boolean} returns true if path is "Absolute Path"-like
  */
 const looksLikeAbsolutePath = maybeAbsolutePath => {
+	if (/^\/.*\/$/.test(maybeAbsolutePath)) {
+		// this 'path' is actually a regexp generated by dynamic requires.
+		// Don't treat it as an absolute path.
+		return false;
+	}
 	return /^(?:[a-z]:\\|\/)/i.test(maybeAbsolutePath);
 };
 

package/lib/util/objectToMap.js

@@ -1,16 +1,16 @@
-/**
- * convert an object into its 2D array equivalent to be turned
- * into an ES6 map
- *
- * @param {object} obj - any object type that works with Object.keys()
- * @returns {Map<TODO, TODO>} an ES6 Map of KV pairs
- */
-module.exports = function objectToMap(obj) {
-	return new Map(
-		Object.keys(obj).map(key => {
-			/** @type {[string, string]} */
-			const pair = [key, obj[key]];
-			return pair;
-		})
-	);
-};
+/**
+ * convert an object into its 2D array equivalent to be turned
+ * into an ES6 map
+ *
+ * @param {object} obj - any object type that works with Object.keys()
+ * @returns {Map<TODO, TODO>} an ES6 Map of KV pairs
+ */
+module.exports = function objectToMap(obj) {
+	return new Map(
+		Object.keys(obj).map(key => {
+			/** @type {[string, string]} */
+			const pair = [key, obj[key]];
+			return pair;
+		})
+	);
+};