webpack 4.9.1 → 4.10.2

package/lib/RawModule.js

@@ -1,54 +1,56 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const Module = require("./Module");
-const { OriginalSource, RawSource } = require("webpack-sources");
-
-module.exports = class RawModule extends Module {
-	constructor(source, identifier, readableIdentifier) {
-		super("javascript/dynamic", null);
-		this.sourceStr = source;
-		this.identifierStr = identifier || this.sourceStr;
-		this.readableIdentifierStr = readableIdentifier || this.identifierStr;
-		this.built = false;
-	}
-
-	identifier() {
-		return this.identifierStr;
-	}
-
-	size() {
-		return this.sourceStr.length;
-	}
-
-	readableIdentifier(requestShortener) {
-		return requestShortener.shorten(this.readableIdentifierStr);
-	}
-
-	needRebuild() {
-		return false;
-	}
-
-	build(options, compilations, resolver, fs, callback) {
-		this.built = true;
-		this.buildMeta = {};
-		this.buildInfo = {
-			cacheable: true
-		};
-		callback();
-	}
-
-	source() {
-		if (this.useSourceMap)
-			return new OriginalSource(this.sourceStr, this.identifier());
-		else return new RawSource(this.sourceStr);
-	}
-
-	updateHash(hash) {
-		hash.update(this.sourceStr);
-		super.updateHash(hash);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const Module = require("./Module");
+const { OriginalSource, RawSource } = require("webpack-sources");
+
+module.exports = class RawModule extends Module {
+	constructor(source, identifier, readableIdentifier) {
+		super("javascript/dynamic", null);
+		this.sourceStr = source;
+		this.identifierStr = identifier || this.sourceStr;
+		this.readableIdentifierStr = readableIdentifier || this.identifierStr;
+		this.built = false;
+	}
+
+	identifier() {
+		return this.identifierStr;
+	}
+
+	size() {
+		return this.sourceStr.length;
+	}
+
+	readableIdentifier(requestShortener) {
+		return requestShortener.shorten(this.readableIdentifierStr);
+	}
+
+	needRebuild() {
+		return false;
+	}
+
+	build(options, compilations, resolver, fs, callback) {
+		this.built = true;
+		this.buildMeta = {};
+		this.buildInfo = {
+			cacheable: true
+		};
+		callback();
+	}
+
+	source() {
+		if (this.useSourceMap) {
+			return new OriginalSource(this.sourceStr, this.identifier());
+		} else {
+			return new RawSource(this.sourceStr);
+		}
+	}
+
+	updateHash(hash) {
+		hash.update(this.sourceStr);
+		super.updateHash(hash);
+	}
+};

package/lib/RecordIdsPlugin.js

@@ -1,162 +1,166 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const identifierUtils = require("./util/identifier");
-
-class RecordIdsPlugin {
-	constructor(options) {
-		this.options = options || {};
-	}
-
-	apply(compiler) {
-		const portableIds = this.options.portableIds;
-		compiler.hooks.compilation.tap("RecordIdsPlugin", compilation => {
-			compilation.hooks.recordModules.tap(
-				"RecordIdsPlugin",
-				(modules, records) => {
-					if (!records.modules) records.modules = {};
-					if (!records.modules.byIdentifier) records.modules.byIdentifier = {};
-					if (!records.modules.usedIds) records.modules.usedIds = {};
-					for (const module of modules) {
-						if (typeof module.id !== "number") continue;
-						const identifier = portableIds
-							? identifierUtils.makePathsRelative(
-									compiler.context,
-									module.identifier(),
-									compilation.cache
-							  )
-							: module.identifier();
-						records.modules.byIdentifier[identifier] = module.id;
-						records.modules.usedIds[module.id] = module.id;
-					}
-				}
-			);
-			compilation.hooks.reviveModules.tap(
-				"RecordIdsPlugin",
-				(modules, records) => {
-					if (!records.modules) return;
-					if (records.modules.byIdentifier) {
-						const usedIds = new Set();
-						for (const module of modules) {
-							if (module.id !== null) continue;
-							const identifier = portableIds
-								? identifierUtils.makePathsRelative(
-										compiler.context,
-										module.identifier(),
-										compilation.cache
-								  )
-								: module.identifier();
-							const id = records.modules.byIdentifier[identifier];
-							if (id === undefined) continue;
-							if (usedIds.has(id)) continue;
-							usedIds.add(id);
-							module.id = id;
-						}
-					}
-					if (Array.isArray(records.modules.usedIds))
-						compilation.usedModuleIds = new Set(records.modules.usedIds);
-				}
-			);
-
-			const getModuleIdentifier = module => {
-				if (portableIds)
-					return identifierUtils.makePathsRelative(
-						compiler.context,
-						module.identifier(),
-						compilation.cache
-					);
-				return module.identifier();
-			};
-
-			const getChunkSources = chunk => {
-				const sources = [];
-				for (const chunkGroup of chunk.groupsIterable) {
-					const index = chunkGroup.chunks.indexOf(chunk);
-					for (const origin of chunkGroup.origins) {
-						if (origin.module) {
-							if (origin.request)
-								sources.push(
-									`${index} ${getModuleIdentifier(origin.module)} ${
-										origin.request
-									}`
-								);
-							else if (typeof origin.loc === "string")
-								sources.push(
-									`${index} ${getModuleIdentifier(origin.module)} ${origin.loc}`
-								);
-							else if (
-								origin.loc &&
-								typeof origin.loc === "object" &&
-								origin.loc.start
-							)
-								sources.push(
-									`${index} ${getModuleIdentifier(
-										origin.module
-									)} ${JSON.stringify(origin.loc.start)}`
-								);
-						}
-					}
-				}
-				return sources;
-			};
-
-			compilation.hooks.recordChunks.tap(
-				"RecordIdsPlugin",
-				(chunks, records) => {
-					if (!records.chunks) records.chunks = {};
-					if (!records.chunks.byName) records.chunks.byName = {};
-					if (!records.chunks.bySource) records.chunks.bySource = {};
-					const usedIds = new Set();
-					for (const chunk of chunks) {
-						if (typeof chunk.id !== "number") continue;
-						const name = chunk.name;
-						if (name) records.chunks.byName[name] = chunk.id;
-						const sources = getChunkSources(chunk);
-						for (const source of sources) {
-							records.chunks.bySource[source] = chunk.id;
-						}
-						usedIds.add(chunk.id);
-					}
-					records.chunks.usedIds = Array.from(usedIds).sort();
-				}
-			);
-			compilation.hooks.reviveChunks.tap(
-				"RecordIdsPlugin",
-				(chunks, records) => {
-					if (!records.chunks) return;
-					const usedIds = new Set();
-					if (records.chunks.byName) {
-						for (const chunk of chunks) {
-							if (chunk.id !== null) continue;
-							if (!chunk.name) continue;
-							const id = records.chunks.byName[chunk.name];
-							if (id === undefined) continue;
-							if (usedIds.has(id)) continue;
-							usedIds.add(id);
-							chunk.id = id;
-						}
-					}
-					if (records.chunks.bySource) {
-						for (const chunk of chunks) {
-							const sources = getChunkSources(chunk);
-							for (const source of sources) {
-								const id = records.chunks.bySource[source];
-								if (id === undefined) continue;
-								if (usedIds[id]) continue;
-								usedIds[id] = true;
-								chunk.id = id;
-								break;
-							}
-						}
-					}
-					if (Array.isArray(records.chunks.usedIds))
-						compilation.usedChunkIds = new Set(records.chunks.usedIds);
-				}
-			);
-		});
-	}
-}
-module.exports = RecordIdsPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const identifierUtils = require("./util/identifier");
+
+class RecordIdsPlugin {
+	constructor(options) {
+		this.options = options || {};
+	}
+
+	apply(compiler) {
+		const portableIds = this.options.portableIds;
+		compiler.hooks.compilation.tap("RecordIdsPlugin", compilation => {
+			compilation.hooks.recordModules.tap(
+				"RecordIdsPlugin",
+				(modules, records) => {
+					if (!records.modules) records.modules = {};
+					if (!records.modules.byIdentifier) records.modules.byIdentifier = {};
+					if (!records.modules.usedIds) records.modules.usedIds = {};
+					for (const module of modules) {
+						if (typeof module.id !== "number") continue;
+						const identifier = portableIds
+							? identifierUtils.makePathsRelative(
+									compiler.context,
+									module.identifier(),
+									compilation.cache
+							  )
+							: module.identifier();
+						records.modules.byIdentifier[identifier] = module.id;
+						records.modules.usedIds[module.id] = module.id;
+					}
+				}
+			);
+			compilation.hooks.reviveModules.tap(
+				"RecordIdsPlugin",
+				(modules, records) => {
+					if (!records.modules) return;
+					if (records.modules.byIdentifier) {
+						const usedIds = new Set();
+						for (const module of modules) {
+							if (module.id !== null) continue;
+							const identifier = portableIds
+								? identifierUtils.makePathsRelative(
+										compiler.context,
+										module.identifier(),
+										compilation.cache
+								  )
+								: module.identifier();
+							const id = records.modules.byIdentifier[identifier];
+							if (id === undefined) continue;
+							if (usedIds.has(id)) continue;
+							usedIds.add(id);
+							module.id = id;
+						}
+					}
+					if (Array.isArray(records.modules.usedIds)) {
+						compilation.usedModuleIds = new Set(records.modules.usedIds);
+					}
+				}
+			);
+
+			const getModuleIdentifier = module => {
+				if (portableIds) {
+					return identifierUtils.makePathsRelative(
+						compiler.context,
+						module.identifier(),
+						compilation.cache
+					);
+				}
+				return module.identifier();
+			};
+
+			const getChunkSources = chunk => {
+				const sources = [];
+				for (const chunkGroup of chunk.groupsIterable) {
+					const index = chunkGroup.chunks.indexOf(chunk);
+					for (const origin of chunkGroup.origins) {
+						if (origin.module) {
+							if (origin.request) {
+								sources.push(
+									`${index} ${getModuleIdentifier(origin.module)} ${
+										origin.request
+									}`
+								);
+							} else if (typeof origin.loc === "string") {
+								sources.push(
+									`${index} ${getModuleIdentifier(origin.module)} ${origin.loc}`
+								);
+							} else if (
+								origin.loc &&
+								typeof origin.loc === "object" &&
+								origin.loc.start
+							) {
+								sources.push(
+									`${index} ${getModuleIdentifier(
+										origin.module
+									)} ${JSON.stringify(origin.loc.start)}`
+								);
+							}
+						}
+					}
+				}
+				return sources;
+			};
+
+			compilation.hooks.recordChunks.tap(
+				"RecordIdsPlugin",
+				(chunks, records) => {
+					if (!records.chunks) records.chunks = {};
+					if (!records.chunks.byName) records.chunks.byName = {};
+					if (!records.chunks.bySource) records.chunks.bySource = {};
+					const usedIds = new Set();
+					for (const chunk of chunks) {
+						if (typeof chunk.id !== "number") continue;
+						const name = chunk.name;
+						if (name) records.chunks.byName[name] = chunk.id;
+						const sources = getChunkSources(chunk);
+						for (const source of sources) {
+							records.chunks.bySource[source] = chunk.id;
+						}
+						usedIds.add(chunk.id);
+					}
+					records.chunks.usedIds = Array.from(usedIds).sort();
+				}
+			);
+			compilation.hooks.reviveChunks.tap(
+				"RecordIdsPlugin",
+				(chunks, records) => {
+					if (!records.chunks) return;
+					const usedIds = new Set();
+					if (records.chunks.byName) {
+						for (const chunk of chunks) {
+							if (chunk.id !== null) continue;
+							if (!chunk.name) continue;
+							const id = records.chunks.byName[chunk.name];
+							if (id === undefined) continue;
+							if (usedIds.has(id)) continue;
+							usedIds.add(id);
+							chunk.id = id;
+						}
+					}
+					if (records.chunks.bySource) {
+						for (const chunk of chunks) {
+							const sources = getChunkSources(chunk);
+							for (const source of sources) {
+								const id = records.chunks.bySource[source];
+								if (id === undefined) continue;
+								if (usedIds[id]) continue;
+								usedIds[id] = true;
+								chunk.id = id;
+								break;
+							}
+						}
+					}
+					if (Array.isArray(records.chunks.usedIds)) {
+						compilation.usedChunkIds = new Set(records.chunks.usedIds);
+					}
+				}
+			);
+		});
+	}
+}
+module.exports = RecordIdsPlugin;

package/lib/RemovedPluginError.js

@@ -1,13 +1,13 @@
-"use strict";
-
-const WebpackError = require("./WebpackError");
-
-module.exports = class RemovedPluginError extends WebpackError {
-	constructor(message) {
-		super();
-
-		this.message = message;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-};
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+module.exports = class RemovedPluginError extends WebpackError {
+	constructor(message) {
+		super();
+
+		this.message = message;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+};

package/lib/RequestShortener.js

@@ -1,74 +1,81 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const path = require("path");
-const NORMALIZE_SLASH_DIRECTION_REGEXP = /\\/g;
-const PATH_CHARS_REGEXP = /[-[\]{}()*+?.,\\^$|#\s]/g;
-const SEPARATOR_REGEXP = /[/\\]$/;
-const FRONT_OR_BACK_BANG_REGEXP = /^!|!$/g;
-const INDEX_JS_REGEXP = /\/index.js(!|\?|\(query\))/g;
-
-const normalizeBackSlashDirection = request => {
-	return request.replace(NORMALIZE_SLASH_DIRECTION_REGEXP, "/");
-};
-
-const createRegExpForPath = path => {
-	const regexpTypePartial = path.replace(PATH_CHARS_REGEXP, "\\$&");
-	return new RegExp(`(^|!)${regexpTypePartial}`, "g");
-};
-
-class RequestShortener {
-	constructor(directory) {
-		directory = normalizeBackSlashDirection(directory);
-		if (SEPARATOR_REGEXP.test(directory))
-			directory = directory.substr(0, directory.length - 1);
-
-		if (directory) {
-			this.currentDirectoryRegExp = createRegExpForPath(directory);
-		}
-
-		const dirname = path.dirname(directory);
-		const endsWithSeparator = SEPARATOR_REGEXP.test(dirname);
-		const parentDirectory = endsWithSeparator
-			? dirname.substr(0, dirname.length - 1)
-			: dirname;
-		if (parentDirectory && parentDirectory !== directory) {
-			this.parentDirectoryRegExp = createRegExpForPath(parentDirectory);
-		}
-
-		if (__dirname.length >= 2) {
-			const buildins = normalizeBackSlashDirection(path.join(__dirname, ".."));
-			const buildinsAsModule =
-				this.currentDirectoryRegExp &&
-				this.currentDirectoryRegExp.test(buildins);
-			this.buildinsAsModule = buildinsAsModule;
-			this.buildinsRegExp = createRegExpForPath(buildins);
-		}
-
-		this.cache = new Map();
-	}
-
-	shorten(request) {
-		if (!request) return request;
-		const cacheEntry = this.cache.get(request);
-		if (cacheEntry !== undefined) return cacheEntry;
-		let result = normalizeBackSlashDirection(request);
-		if (this.buildinsAsModule && this.buildinsRegExp)
-			result = result.replace(this.buildinsRegExp, "!(webpack)");
-		if (this.currentDirectoryRegExp)
-			result = result.replace(this.currentDirectoryRegExp, "!.");
-		if (this.parentDirectoryRegExp)
-			result = result.replace(this.parentDirectoryRegExp, "!..");
-		if (!this.buildinsAsModule && this.buildinsRegExp)
-			result = result.replace(this.buildinsRegExp, "!(webpack)");
-		result = result.replace(INDEX_JS_REGEXP, "$1");
-		result = result.replace(FRONT_OR_BACK_BANG_REGEXP, "");
-		this.cache.set(request, result);
-		return result;
-	}
-}
-
-module.exports = RequestShortener;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const path = require("path");
+const NORMALIZE_SLASH_DIRECTION_REGEXP = /\\/g;
+const PATH_CHARS_REGEXP = /[-[\]{}()*+?.,\\^$|#\s]/g;
+const SEPARATOR_REGEXP = /[/\\]$/;
+const FRONT_OR_BACK_BANG_REGEXP = /^!|!$/g;
+const INDEX_JS_REGEXP = /\/index.js(!|\?|\(query\))/g;
+
+const normalizeBackSlashDirection = request => {
+	return request.replace(NORMALIZE_SLASH_DIRECTION_REGEXP, "/");
+};
+
+const createRegExpForPath = path => {
+	const regexpTypePartial = path.replace(PATH_CHARS_REGEXP, "\\$&");
+	return new RegExp(`(^|!)${regexpTypePartial}`, "g");
+};
+
+class RequestShortener {
+	constructor(directory) {
+		directory = normalizeBackSlashDirection(directory);
+		if (SEPARATOR_REGEXP.test(directory)) {
+			directory = directory.substr(0, directory.length - 1);
+		}
+
+		if (directory) {
+			this.currentDirectoryRegExp = createRegExpForPath(directory);
+		}
+
+		const dirname = path.dirname(directory);
+		const endsWithSeparator = SEPARATOR_REGEXP.test(dirname);
+		const parentDirectory = endsWithSeparator
+			? dirname.substr(0, dirname.length - 1)
+			: dirname;
+		if (parentDirectory && parentDirectory !== directory) {
+			this.parentDirectoryRegExp = createRegExpForPath(parentDirectory);
+		}
+
+		if (__dirname.length >= 2) {
+			const buildins = normalizeBackSlashDirection(path.join(__dirname, ".."));
+			const buildinsAsModule =
+				this.currentDirectoryRegExp &&
+				this.currentDirectoryRegExp.test(buildins);
+			this.buildinsAsModule = buildinsAsModule;
+			this.buildinsRegExp = createRegExpForPath(buildins);
+		}
+
+		this.cache = new Map();
+	}
+
+	shorten(request) {
+		if (!request) return request;
+		const cacheEntry = this.cache.get(request);
+		if (cacheEntry !== undefined) {
+			return cacheEntry;
+		}
+		let result = normalizeBackSlashDirection(request);
+		if (this.buildinsAsModule && this.buildinsRegExp) {
+			result = result.replace(this.buildinsRegExp, "!(webpack)");
+		}
+		if (this.currentDirectoryRegExp) {
+			result = result.replace(this.currentDirectoryRegExp, "!.");
+		}
+		if (this.parentDirectoryRegExp) {
+			result = result.replace(this.parentDirectoryRegExp, "!..");
+		}
+		if (!this.buildinsAsModule && this.buildinsRegExp) {
+			result = result.replace(this.buildinsRegExp, "!(webpack)");
+		}
+		result = result.replace(INDEX_JS_REGEXP, "$1");
+		result = result.replace(FRONT_OR_BACK_BANG_REGEXP, "");
+		this.cache.set(request, result);
+		return result;
+	}
+}
+
+module.exports = RequestShortener;