webpack 5.18.0 → 5.20.2

package/README.md

@@ -111,14 +111,9 @@ within webpack itself use this plugin interface. This makes webpack very
 | :---------------------------------------: | :----------------: | :-----------------: | :-------------------------------------------------------------------------------------- |
 |    [mini-css-extract-plugin][mini-css]    |  ![mini-css-npm]   |  ![mini-css-size]   | Extracts CSS into separate files. It creates a CSS file per JS file which contains CSS. |
 | [compression-webpack-plugin][compression] | ![compression-npm] | ![compression-size] | Prepares compressed versions of assets to serve them with Content-Encoding              |
-|        [i18n-webpack-plugin][i18n]        |    ![i18n-npm]     |    ![i18n-size]     | Adds i18n support to your bundles                                                       |
 |    [html-webpack-plugin][html-plugin]     | ![html-plugin-npm] | ![html-plugin-size] | Simplifies creation of HTML files (`index.html`) to serve your bundles                  |
-|  [extract-text-webpack-plugin][extract]   |   ![extract-npm]   |   ![extract-size]   | Extract text from a bundle, or bundles, into a separate file                            |
 
 [common-npm]: https://img.shields.io/npm/v/webpack.svg
-[extract]: https://github.com/webpack-contrib/extract-text-webpack-plugin
-[extract-npm]: https://img.shields.io/npm/v/extract-text-webpack-plugin.svg
-[extract-size]: https://packagephobia.com/badge?p=extract-text-webpack-plugin
 [mini-css]: https://github.com/webpack-contrib/mini-css-extract-plugin
 [mini-css-npm]: https://img.shields.io/npm/v/mini-css-extract-plugin.svg
 [mini-css-size]: https://packagephobia.com/badge?p=mini-css-extract-plugin
@@ -128,9 +123,6 @@ within webpack itself use this plugin interface. This makes webpack very
 [compression]: https://github.com/webpack-contrib/compression-webpack-plugin
 [compression-npm]: https://img.shields.io/npm/v/compression-webpack-plugin.svg
 [compression-size]: https://packagephobia.com/badge?p=compression-webpack-plugin
-[i18n]: https://github.com/webpack-contrib/i18n-webpack-plugin
-[i18n-npm]: https://img.shields.io/npm/v/i18n-webpack-plugin.svg
-[i18n-size]: https://packagephobia.com/badge?p=i18n-webpack-plugin
 [html-plugin]: https://github.com/jantimon/html-webpack-plugin
 [html-plugin-npm]: https://img.shields.io/npm/v/html-webpack-plugin.svg
 [html-plugin-size]: https://packagephobia.com/badge?p=html-webpack-plugin
@@ -168,32 +160,22 @@ or are automatically applied via regex from your webpack configuration.
 
 #### JSON
 
-|                                                                                Name                                                                                |    Status    | Install Size  | Description                             |
-| :----------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------: | :-----------: | :-------------------------------------- |
-|             <a href="https://github.com/webpack-contrib/json-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/json.svg"></a>             | ![json-npm]  | ![json-size]  | Loads a JSON file (included by default) |
-| <a href="https://github.com/webpack-contrib/json5-loader"><img width="48" height="10.656" src="https://cdn.rawgit.com/json5/json5-logo/master/json5-logo.svg"></a> | ![json5-npm] | ![json5-size] | Loads and transpiles a JSON 5 file      |
-|             <a href="https://github.com/awnist/cson-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a>              | ![cson-npm]  | ![cson-size]  | Loads and transpiles a CSON file        |
+|                                                                   Name                                                                    |   Status    | Install Size |           Description            |
+| :---------------------------------------------------------------------------------------------------------------------------------------: | :---------: | :----------: | :------------------------------: |
+| <a href="https://github.com/awnist/cson-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a> | ![cson-npm] | ![cson-size] | Loads and transpiles a CSON file |
 
-[json-npm]: https://img.shields.io/npm/v/json-loader.svg
-[json-size]: https://packagephobia.com/badge?p=json-loader
-[json5-npm]: https://img.shields.io/npm/v/json5-loader.svg
-[json5-size]: https://packagephobia.com/badge?p=json5-loader
 [cson-npm]: https://img.shields.io/npm/v/cson-loader.svg
 [cson-size]: https://packagephobia.com/badge?p=cson-loader
 
 #### Transpiling
 
-|                                                                            Name                                                                            |          Status           |        Install Size        | Description                                                                                          |
-| :--------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------: | :------------------------: | :--------------------------------------------------------------------------------------------------- |
-|                                         <a href="https://github.com/webpack-contrib/script-loader">`<script>`</a>                                          |       ![script-npm]       |       ![script-size]       | Executes a JavaScript file once in global context (like in script tag), `require()`s are not parsed  |
-| <a href="https://github.com/babel/babel-loader"><img width="48" height="48" title="babel-loader" src="https://worldvectorlogo.com/logos/babel-10.svg"></a> |       ![babel-npm]        |       ![babel-size]        | Loads ES2015+ code and transpiles to ES5 using <a href="https://github.com/babel/babel">Babel</a>    |
-|       <a href="https://github.com/jupl/traceur-loader"><img width="48" height="48" src="https://google.github.com/traceur-compiler/logo/tc.svg"></a>       |      ![traceur-npm]       |      ![traceur-size]       | Loads ES2015+ code and transpiles to ES5 using [Traceur](https://github.com/google/traceur-compiler) |
-|  <a href="https://github.com/TypeStrong/ts-loader"><img width="48" height="48" src="https://cdn.rawgit.com/Microsoft/TypeScript/master/doc/logo.svg"></a>  |        ![type-npm]        |        ![type-size]        | Loads TypeScript like JavaScript                                                                     |
-|                                   [`awesome-typescript-loader`](https://github.com/s-panferov/awesome-typescript-loader)                                   | ![awesome-typescript-npm] | ![awesome-typescript-size] | Awesome TypeScript loader for webpack                                                                |
-|    <a href="https://github.com/webpack-contrib/coffee-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a>    |       ![coffee-npm]       |       ![coffee-size]       | Loads CoffeeScript like JavaScript                                                                   |
-
-[script-npm]: https://img.shields.io/npm/v/script-loader.svg
-[script-size]: https://packagephobia.com/badge?p=script-loader
+|                                                                            Name                                                                            |     Status     |  Install Size   | Description                                                                                          |
+| :--------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------: | :-------------: | :--------------------------------------------------------------------------------------------------- |
+| <a href="https://github.com/babel/babel-loader"><img width="48" height="48" title="babel-loader" src="https://worldvectorlogo.com/logos/babel-10.svg"></a> |  ![babel-npm]  |  ![babel-size]  | Loads ES2015+ code and transpiles to ES5 using <a href="https://github.com/babel/babel">Babel</a>    |
+|       <a href="https://github.com/jupl/traceur-loader"><img width="48" height="48" src="https://google.github.com/traceur-compiler/logo/tc.svg"></a>       | ![traceur-npm] | ![traceur-size] | Loads ES2015+ code and transpiles to ES5 using [Traceur](https://github.com/google/traceur-compiler) |
+|  <a href="https://github.com/TypeStrong/ts-loader"><img width="48" height="48" src="https://cdn.rawgit.com/Microsoft/TypeScript/master/doc/logo.svg"></a>  |  ![type-npm]   |  ![type-size]   | Loads TypeScript like JavaScript                                                                     |
+|    <a href="https://github.com/webpack-contrib/coffee-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a>    | ![coffee-npm]  | ![coffee-size]  | Loads CoffeeScript like JavaScript                                                                   |
+
 [babel-npm]: https://img.shields.io/npm/v/babel-loader.svg
 [babel-size]: https://packagephobia.com/badge?p=babel-loader
 [traceur-npm]: https://img.shields.io/npm/v/traceur-loader.svg
@@ -202,8 +184,6 @@ or are automatically applied via regex from your webpack configuration.
 [coffee-size]: https://packagephobia.com/badge?p=coffee-loader
 [type-npm]: https://img.shields.io/npm/v/ts-loader.svg
 [type-size]: https://packagephobia.com/badge?p=ts-loader
-[awesome-typescript-npm]: https://img.shields.io/npm/v/awesome-typescript-loader.svg
-[awesome-typescript-size]: https://packagephobia.com/badge?p=awesome-typescript-loader
 
 #### Templating
 
@@ -252,23 +232,6 @@ or are automatically applied via regex from your webpack configuration.
 [postcss-npm]: https://img.shields.io/npm/v/postcss-loader.svg
 [postcss-size]: https://packagephobia.com/badge?p=postcss-loader
 
-#### Linting & Testing
-
-|                                                                      Name                                                                      |    Status     |  Install Size  | Description                             |
-| :--------------------------------------------------------------------------------------------------------------------------------------------: | :-----------: | :------------: | :-------------------------------------- |
-|  <a href="https://github.com/webpack-contrib/mocha-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/mocha.svg"></a>  | ![mocha-npm]  | ![mocha-size]  | Tests with mocha (Browser/NodeJS)       |
-| <a href="https://github.com/webpack-contrib/eslint-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/eslint.svg"></a> | ![eslint-npm] | ![eslint-size] | PreLoader for linting code using ESLint |
-|  <a href="https://github.com/webpack-contrib/jshint-loader"><img width="48" height="20.64" src="https://jshint.com/res/jshint-dark.png"></a>   | ![jshint-npm] | ![jshint-size] | PreLoader for linting code using JSHint |
-
-[mocha-npm]: https://img.shields.io/npm/v/mocha-loader.svg
-[mocha-size]: https://packagephobia.com/badge?p=mocha-loader
-[eslint-npm]: https://img.shields.io/npm/v/eslint-loader.svg
-[eslint-size]: https://packagephobia.com/badge?p=eslint-loader
-[jshint-npm]: https://img.shields.io/npm/v/jshint-loader.svg
-[jshint-size]: https://packagephobia.com/badge?p=jshint-loader
-[jscs-npm]: https://img.shields.io/npm/v/jscs-loader.svg
-[jscs-size]: https://packagephobia.com/badge?p=jscs-loader
-
 #### Frameworks
 
 |                                                                             Name                                                                             |     Status     |  Install Size   | Description                                                                                            |

package/lib/CleanPlugin.js

@@ -0,0 +1,357 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sergey Melyukov @smelukov
+*/
+
+"use strict";
+
+const asyncLib = require("neo-async");
+const { validate } = require("schema-utils");
+const { SyncBailHook } = require("tapable");
+const Compilation = require("../lib/Compilation");
+const { join } = require("./util/fs");
+const memoize = require("./util/memoize");
+const processAsyncTree = require("./util/processAsyncTree");
+
+/** @typedef {import("../declarations/WebpackOptions").CleanOptions} CleanOptions */
+/** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./logging/Logger").Logger} Logger */
+/** @typedef {import("./util/fs").OutputFileSystem} OutputFileSystem */
+
+/** @typedef {(function(string):boolean)|RegExp} IgnoreItem */
+/** @typedef {function(IgnoreItem): void} AddToIgnoreCallback */
+
+/**
+ * @typedef {Object} CleanPluginCompilationHooks
+ * @property {SyncBailHook<[string], boolean>} keep when returning true the file/directory will be kept during cleaning, returning false will clean it and ignore the following plugins and config
+ */
+
+const getSchema = memoize(() => {
+	const { definitions } = require("../schemas/WebpackOptions.json");
+	return {
+		definitions,
+		oneOf: [{ $ref: "#/definitions/CleanOptions" }]
+	};
+});
+
+/**
+ * @param {OutputFileSystem} fs filesystem
+ * @param {string} outputPath output path
+ * @param {Set<string>} currentAssets filename of the current assets (must not start with .. or ., must only use / as path separator)
+ * @param {function(Error=, Set<string>=): void} callback returns the filenames of the assets that shouldn't be there
+ * @returns {void}
+ */
+const getDiffToFs = (fs, outputPath, currentAssets, callback) => {
+	const directories = new Set();
+	// get directories of assets
+	for (const asset of currentAssets) {
+		directories.add(asset.replace(/(^|\/)[^/]*$/, ""));
+	}
+	// and all parent directories
+	for (const directory of directories) {
+		directories.add(directory.replace(/(^|\/)[^/]*$/, ""));
+	}
+	const diff = new Set();
+	asyncLib.forEachLimit(
+		directories,
+		10,
+		(directory, callback) => {
+			fs.readdir(join(fs, outputPath, directory), (err, entries) => {
+				if (err) {
+					if (err.code === "ENOENT") return callback();
+					if (err.code === "ENOTDIR") {
+						diff.add(directory);
+						return callback();
+					}
+					return callback(err);
+				}
+				for (const entry of entries) {
+					const file = /** @type {string} */ (entry);
+					const filename = directory ? `${directory}/${file}` : file;
+					if (!directories.has(filename) && !currentAssets.has(filename)) {
+						diff.add(filename);
+					}
+				}
+				callback();
+			});
+		},
+		err => {
+			if (err) return callback(err);
+
+			callback(null, diff);
+		}
+	);
+};
+
+/**
+ * @param {Set<string>} currentAssets assets list
+ * @param {Set<string>} oldAssets old assets list
+ * @returns {Set<string>} diff
+ */
+const getDiffToOldAssets = (currentAssets, oldAssets) => {
+	const diff = new Set();
+	for (const asset of oldAssets) {
+		if (!currentAssets.has(asset)) diff.add(asset);
+	}
+	return diff;
+};
+
+/**
+ * @param {OutputFileSystem} fs filesystem
+ * @param {string} outputPath output path
+ * @param {boolean} dry only log instead of fs modification
+ * @param {Logger} logger logger
+ * @param {Set<string>} diff filenames of the assets that shouldn't be there
+ * @param {function(string): boolean} isKept check if the entry is ignored
+ * @param {function(Error=): void} callback callback
+ * @returns {void}
+ */
+const applyDiff = (fs, outputPath, dry, logger, diff, isKept, callback) => {
+	const log = msg => {
+		if (dry) {
+			logger.info(msg);
+		} else {
+			logger.log(msg);
+		}
+	};
+	/** @typedef {{ type: "check" | "unlink" | "rmdir", filename: string, parent: { remaining: number, job: Job } | undefined }} Job */
+	/** @type {Job[]} */
+	const jobs = Array.from(diff, filename => ({
+		type: "check",
+		filename,
+		parent: undefined
+	}));
+	processAsyncTree(
+		jobs,
+		10,
+		({ type, filename, parent }, push, callback) => {
+			const handleError = err => {
+				if (err.code === "ENOENT") {
+					log(`${filename} was removed during cleaning by something else`);
+					handleParent();
+					return callback();
+				}
+				return callback(err);
+			};
+			const handleParent = () => {
+				if (parent && --parent.remaining === 0) push(parent.job);
+			};
+			const path = join(fs, outputPath, filename);
+			switch (type) {
+				case "check":
+					if (isKept(filename)) {
+						// do not decrement parent entry as we don't want to delete the parent
+						log(`${filename} will be kept`);
+						return process.nextTick(callback);
+					}
+					fs.stat(path, (err, stats) => {
+						if (err) return handleError(err);
+						if (!stats.isDirectory()) {
+							push({
+								type: "unlink",
+								filename,
+								parent
+							});
+							return callback();
+						}
+						fs.readdir(path, (err, entries) => {
+							if (err) return handleError(err);
+							/** @type {Job} */
+							const deleteJob = {
+								type: "rmdir",
+								filename,
+								parent
+							};
+							if (entries.length === 0) {
+								push(deleteJob);
+							} else {
+								const parentToken = {
+									remaining: entries.length,
+									job: deleteJob
+								};
+								for (const entry of entries) {
+									const file = /** @type {string} */ (entry);
+									if (file.startsWith(".")) {
+										log(
+											`${filename} will be kept (dot-files will never be removed)`
+										);
+										continue;
+									}
+									push({
+										type: "check",
+										filename: `${filename}/${file}`,
+										parent: parentToken
+									});
+								}
+							}
+							return callback();
+						});
+					});
+					break;
+				case "rmdir":
+					log(`${filename} will be removed`);
+					if (dry) {
+						handleParent();
+						return process.nextTick(callback);
+					}
+					if (!fs.rmdir) {
+						logger.warn(
+							`${filename} can't be removed because output file system doesn't support removing directories (rmdir)`
+						);
+						return process.nextTick(callback);
+					}
+					fs.rmdir(path, err => {
+						if (err) return handleError(err);
+						handleParent();
+						callback();
+					});
+					break;
+				case "unlink":
+					log(`${filename} will be removed`);
+					if (dry) {
+						handleParent();
+						return process.nextTick(callback);
+					}
+					if (!fs.unlink) {
+						logger.warn(
+							`${filename} can't be removed because output file system doesn't support removing files (rmdir)`
+						);
+						return process.nextTick(callback);
+					}
+					fs.unlink(path, err => {
+						if (err) return handleError(err);
+						handleParent();
+						callback();
+					});
+					break;
+			}
+		},
+		callback
+	);
+};
+
+/** @type {WeakMap<Compilation, CleanPluginCompilationHooks>} */
+const compilationHooksMap = new WeakMap();
+
+class CleanPlugin {
+	/**
+	 * @param {Compilation} compilation the compilation
+	 * @returns {CleanPluginCompilationHooks} the attached hooks
+	 */
+	static getCompilationHooks(compilation) {
+		if (!(compilation instanceof Compilation)) {
+			throw new TypeError(
+				"The 'compilation' argument must be an instance of Compilation"
+			);
+		}
+		let hooks = compilationHooksMap.get(compilation);
+		if (hooks === undefined) {
+			hooks = {
+				/** @type {SyncBailHook<[string], boolean>} */
+				keep: new SyncBailHook(["ignore"])
+			};
+			compilationHooksMap.set(compilation, hooks);
+		}
+		return hooks;
+	}
+
+	/** @param {CleanOptions} [options] options */
+	constructor(options = {}) {
+		validate(getSchema(), options, {
+			name: "Clean Plugin",
+			baseDataPath: "options"
+		});
+
+		this.options = { dry: false, ...options };
+	}
+
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		const { dry, keep } = this.options;
+
+		const keepFn =
+			typeof keep === "function"
+				? keep
+				: typeof keep === "string"
+				? path => path.startsWith(keep)
+				: typeof keep === "object" && keep.test
+				? path => keep.test(path)
+				: () => false;
+
+		// We assume that no external modification happens while the compiler is active
+		// So we can store the old assets and only diff to them to avoid fs access on
+		// incremental builds
+		let oldAssets;
+
+		compiler.hooks.emit.tapAsync(
+			{
+				name: "CleanPlugin",
+				stage: 100
+			},
+			(compilation, callback) => {
+				const hooks = CleanPlugin.getCompilationHooks(compilation);
+				const logger = compilation.getLogger("webpack.CleanPlugin");
+				const fs = compiler.outputFileSystem;
+
+				if (!fs.readdir) {
+					return callback(
+						new Error(
+							"CleanPlugin: Output filesystem doesn't support listing directories (readdir)"
+						)
+					);
+				}
+
+				const currentAssets = new Set();
+				for (const asset of Object.keys(compilation.assets)) {
+					if (/^[A-Za-z]:\\|^\/|^\\\\/.test(asset)) continue;
+					let normalizedAsset;
+					let newNormalizedAsset = asset.replace(/\\/g, "/");
+					do {
+						normalizedAsset = newNormalizedAsset;
+						newNormalizedAsset = normalizedAsset.replace(
+							/(^|\/)(?!\.\.)[^/]+\/\.\.\//g,
+							"$1"
+						);
+					} while (newNormalizedAsset !== normalizedAsset);
+					if (normalizedAsset.startsWith("../")) continue;
+					currentAssets.add(normalizedAsset);
+				}
+
+				const outputPath = compilation.getPath(compiler.outputPath, {});
+
+				const isKept = path => {
+					const result = hooks.keep.call(path);
+					if (result !== undefined) return result;
+					return keepFn(path);
+				};
+
+				const diffCallback = (err, diff) => {
+					if (err) {
+						oldAssets = undefined;
+						return callback(err);
+					}
+					applyDiff(fs, outputPath, dry, logger, diff, isKept, err => {
+						if (err) {
+							oldAssets = undefined;
+						} else {
+							oldAssets = currentAssets;
+						}
+						callback(err);
+					});
+				};
+
+				if (oldAssets) {
+					diffCallback(null, getDiffToOldAssets(currentAssets, oldAssets));
+				} else {
+					getDiffToFs(fs, outputPath, currentAssets, diffCallback);
+				}
+			}
+		);
+	}
+}
+
+module.exports = CleanPlugin;

package/lib/CodeGenerationResults.js

@@ -18,8 +18,6 @@ class CodeGenerationResults {
 	constructor() {
 		/** @type {Map<Module, RuntimeSpecMap<CodeGenerationResult>>} */
 		this.map = new Map();
-		/** @type {Map<Module, RuntimeSpecMap<string>>} */
-		this.hashes = new Map();
 	}
 
 	/**
@@ -38,31 +36,33 @@ class CodeGenerationResults {
 			);
 		}
 		if (runtime === undefined) {
-			const results = new Set(entry.values());
-			if (results.size !== 1) {
-				throw new Error(
-					`No unique code generation entry for unspecified runtime for ${module.identifier()} (existing runtimes: ${Array.from(
-						entry.keys(),
-						r => runtimeToString(r)
-					).join(", ")}).
+			if (entry.size > 1) {
+				const results = new Set(entry.values());
+				if (results.size !== 1) {
+					throw new Error(
+						`No unique code generation entry for unspecified runtime for ${module.identifier()} (existing runtimes: ${Array.from(
+							entry.keys(),
+							r => runtimeToString(r)
+						).join(", ")}).
 Caller might not support runtime-dependent code generation (opt-out via optimization.usedExports: "global").`
-				);
-			}
-			return results.values().next().value;
-		} else {
-			const result = entry.get(runtime);
-			if (result === undefined) {
-				throw new Error(
-					`No code generation entry for runtime ${runtimeToString(
-						runtime
-					)} for ${module.identifier()} (existing runtimes: ${Array.from(
-						entry.keys(),
-						r => runtimeToString(r)
-					).join(", ")})`
-				);
+					);
+				}
+				return results.values().next().value;
 			}
-			return result;
+			return entry.values().next().value;
+		}
+		const result = entry.get(runtime);
+		if (result === undefined) {
+			throw new Error(
+				`No code generation entry for runtime ${runtimeToString(
+					runtime
+				)} for ${module.identifier()} (existing runtimes: ${Array.from(
+					entry.keys(),
+					r => runtimeToString(r)
+				).join(", ")})`
+			);
 		}
+		return result;
 	}
 
 	/**
@@ -75,11 +75,13 @@ Caller might not support runtime-dependent code generation (opt-out via optimiza
 		if (entry === undefined) {
 			return false;
 		}
-		if (runtime === undefined) {
+		if (runtime !== undefined) {
+			return entry.has(runtime);
+		} else if (entry.size > 1) {
 			const results = new Set(entry.values());
 			return results.size === 1;
 		} else {
-			return entry.has(runtime);
+			return entry.size === 1;
 		}
 	}