@depup/webpack 5.111.1-depup.2 → 5.112.0-depup.1

package/lib/json/JsonData.js

@@ -14,7 +14,7 @@ const { register } = require("../util/serialization");
  * } from "../serialization/ObjectMiddleware"
  */
 /** @import Hash from "../util/Hash" */
-/** @import { JsonValue } from "../util/fs" */
+/** @import { JsonValue } from "../fs/fs" */
 
 class JsonData {
 	/**

package/lib/{dependencies → json}/JsonExportsDependency.js

@@ -5,21 +5,21 @@
 
 "use strict";
 
+const NullDependency = require("../dependencies/core/NullDependency");
 const makeSerializable = require("../util/makeSerializable");
-const NullDependency = require("./NullDependency");
 
 /**
  * @import {
  * 	ExportSpec,
  * 	ExportsSpec,
  * 	UpdateHashContext
- * } from "../Dependency"
+ * } from "../graph/Dependency"
  */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 /** @import JsonData from "../json/JsonData" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[JsonData, number]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[JsonData, number]>} ObjectSerializerContext */
-/** @import { JsonValue } from "../util/fs" */
+/** @import { JsonValue } from "../fs/fs" */
 /** @import Hash from "../util/Hash" */
 
 /**
@@ -138,9 +138,10 @@ class JsonExportsDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	JsonExportsDependency,
+makeSerializable(JsonExportsDependency, [
+	"webpack/lib/json/JsonExportsDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/JsonExportsDependency"
-);
+]);
 
 module.exports = JsonExportsDependency;

package/lib/json/JsonGenerator.js

@@ -6,27 +6,27 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const ConcatenationScope = require("../ConcatenationScope");
-const { UsageState } = require("../ExportsInfo");
-const Generator = require("../Generator");
-const { JAVASCRIPT_TYPES } = require("../ModuleSourceTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
+const { UsageState } = require("../graph/ExportsInfo");
+const Generator = require("../module/Generator");
+const { JAVASCRIPT_TYPES } = require("../module/ModuleSourceTypeConstants");
+const ConcatenationScope = require("../optimize/ConcatenationScope");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 
 /** @import { Source } from "webpack-sources" */
 /** @import { JsonGeneratorOptions } from "../../declarations/WebpackOptions" */
-/** @import ExportsInfo from "../ExportsInfo" */
-/** @import { GenerateContext, UpdateHashContext } from "../Generator" */
+/** @import ExportsInfo from "../graph/ExportsInfo" */
+/** @import { GenerateContext, UpdateHashContext } from "../module/Generator" */
 /** @import Hash from "../util/Hash" */
 /**
  * @import {
  * 	ConcatenationBailoutReasonContext,
  * 	SourceType,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
-/** @import NormalModule from "../NormalModule" */
+/** @import NormalModule from "../module/NormalModule" */
 /** @import { RuntimeSpec } from "../util/runtime" */
-/** @import { JsonArray, JsonObject, JsonValue } from "../util/fs" */
+/** @import { JsonArray, JsonObject, JsonValue } from "../fs/fs" */
 
 /**
  * Returns stringified data.

package/lib/json/JsonModule.js

@@ -4,14 +4,14 @@
 
 "use strict";
 
-const NormalModule = require("../NormalModule");
+const NormalModule = require("../module/NormalModule");
 const makeSerializable = require("../util/makeSerializable");
 
 /**
  * @import {
  * 	NormalModuleBuildInfo,
  * 	NormalModuleCreateData
- * } from "../NormalModule"
+ * } from "../module/NormalModule"
  */
 /** @import JsonData from "./JsonData" */
 

package/lib/json/JsonModulesPlugin.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const { JSON_MODULE_TYPE } = require("../ModuleTypeConstants");
+const { JSON_MODULE_TYPE } = require("../module/ModuleTypeConstants");
 const JsonGenerator = require("./JsonGenerator");
 const JsonModule = require("./JsonModule");
 const JsonParser = require("./JsonParser");

package/lib/json/JsonParser.js

@@ -5,16 +5,16 @@
 
 "use strict";
 
-const Parser = require("../Parser");
-const JsonExportsDependency = require("../dependencies/JsonExportsDependency");
+const Parser = require("../module/Parser");
 const parseJson = require("../util/parseJson");
 const JsonData = require("./JsonData");
+const JsonExportsDependency = require("./JsonExportsDependency");
 
 /** @import { JsonParserOptions } from "../../declarations/WebpackOptions" */
 /** @import { JsonModuleBuildInfo } from "./JsonModule" */
-/** @import { BuildMeta } from "../Module" */
-/** @import { ParserState, PreparsedAst } from "../Parser" */
-/** @import { JsonValue } from "../util/fs" */
+/** @import { BuildMeta } from "../module/Module" */
+/** @import { ParserState, PreparsedAst } from "../module/Parser" */
+/** @import { JsonValue } from "../fs/fs" */
 
 /** @typedef {(input: string) => Buffer | JsonValue} ParseFn */
 

package/lib/json/jsonMinify.js

@@ -0,0 +1,69 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author sheo13666q @sheo13666q
+*/
+
+"use strict";
+
+/**
+ * A `minify` function for `minimizer-webpack-plugin` that drops the whitespace
+ * between a JSON asset's tokens and keeps every token as written. Source that is
+ * not valid JSON is returned unchanged rather than failing the build.
+ * @param {{ [file: string]: string | Buffer }} input a single `{ filename: code }` entry; a `Buffer` is read as UTF-8
+ * @returns {Promise<{ code: string }>} the minified JSON
+ */
+const jsonMinify = async (input) => {
+	// WHY: the body is self-contained because the plugin ships this function to
+	// its worker pool as source. Re-serializing through `JSON.parse` would round
+	// `9007199254740993` to `…992` and turn `1e400` into `null`, so only the
+	// whitespace goes; `JSON.parse` is asked solely whether the source is JSON.
+	const [[, source]] = Object.entries(input);
+	const code = typeof source === "string" ? source : source.toString("utf8");
+	try {
+		JSON.parse(code);
+	} catch (_err) {
+		return { code };
+	}
+	let result = "";
+	let start = 0;
+	let inString = false;
+	for (let i = 0; i < code.length; i++) {
+		const charCode = code.charCodeAt(i);
+		if (inString) {
+			// A backslash always escapes the one character after it.
+			if (charCode === 92) i++;
+			else if (charCode === 34) inString = false;
+		} else if (charCode === 34) {
+			inString = true;
+		} else if (
+			charCode === 32 ||
+			charCode === 10 ||
+			charCode === 13 ||
+			charCode === 9
+		) {
+			result += code.slice(start, i);
+			start = i + 1;
+		}
+	}
+	return { code: result + code.slice(start) };
+};
+
+// Worker-safe (the body reaches nothing outside itself), so it may run in the
+// shared worker-thread pool alongside jsMinify.
+jsonMinify.supportsWorkerThreads = () => true;
+
+/**
+ * The language this minifies, for a caller dispatching source that carries no
+ * filename of its own.
+ * @returns {string[]} the languages
+ */
+jsonMinify.getTypes = () => ["json"];
+
+/**
+ * @param {string} name asset filename
+ * @returns {boolean} true for JSON assets, a web app manifest included
+ */
+jsonMinify.filter = (name) =>
+	/^[^?#]*\.(?:json|webmanifest)(?:[?#].*)?$/i.test(name);
+
+module.exports = jsonMinify;

package/lib/library/AbstractLibraryPlugin.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
 const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 
 /** @import { Source } from "webpack-sources" */
 /**
@@ -15,11 +15,11 @@ const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin")
  * 	LibraryType
  * } from "../../declarations/WebpackOptions"
  */
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation, { ChunkHashContext } from "../Compilation" */
 /** @import Compiler from "../Compiler" */
-/** @import Module, { RuntimeRequirements } from "../Module" */
+/** @import Module, { RuntimeRequirements } from "../module/Module" */
 /**
  * @import {
  * 	RenderContext,
@@ -84,21 +84,34 @@ class AbstractLibraryPlugin {
 							options: { library }
 						}
 					] of compilation.entries) {
-						const options = this._parseOptionsCached(
+						const resolvedLibrary =
 							library !== undefined
 								? library
-								: compilation.outputOptions.library
-						);
+								: compilation.outputOptions.library;
+						const options = this._parseOptionsCached(resolvedLibrary);
 						if (options !== false) {
-							const dep = deps[deps.length - 1];
-							if (dep) {
-								const module = compilation.moduleGraph.getModule(dep);
+							const libraryContext = {
+								options,
+								compilation,
+								chunkGraph: compilation.chunkGraph
+							};
+							// Only the exported entry modules must survive tree shaking,
+							// which is the last one unless their exports are merged.
+							if (
+								resolvedLibrary !== undefined &&
+								resolvedLibrary.entryExports === "all"
+							) {
+								for (const dep of deps) {
+									const module = compilation.moduleGraph.getModule(dep);
+									if (module) {
+										this.finishEntryModule(module, name, libraryContext);
+									}
+								}
+							} else {
+								const dep = deps[deps.length - 1];
+								const module = dep && compilation.moduleGraph.getModule(dep);
 								if (module) {
-									this.finishEntryModule(module, name, {
-										options,
-										compilation,
-										chunkGraph: compilation.chunkGraph
-									});
+									this.finishEntryModule(module, name, libraryContext);
 								}
 							}
 						}

package/lib/library/AmdLibraryPlugin.js

@@ -6,10 +6,10 @@
 "use strict";
 
 const { ConcatSource } = require("webpack-sources");
-const ExternalModule = require("../ExternalModule");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 
+/** @import ExternalModule from "../externals/ExternalModule" */
 /** @import { Source } from "webpack-sources" */
 /**
  * @import {
@@ -17,7 +17,7 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
  * 	LibraryType
  * } from "../../declarations/WebpackOptions"
  */
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import { ChunkHashContext } from "../Compilation" */
 /** @import { RenderContext } from "../javascript/JavascriptModulesPlugin" */
 /** @import Hash from "../util/Hash" */
@@ -100,7 +100,7 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
 			.getChunkModules(chunk)
 			.filter(
 				(m) =>
-					m instanceof ExternalModule &&
+					m.is("external") &&
 					(m.externalType === "amd" || m.externalType === "amd-require")
 			);
 		const externals = /** @type {ExternalModule[]} */ (modules);

package/lib/library/AssignLibraryPlugin.js

@@ -6,9 +6,13 @@
 "use strict";
 
 const { ConcatSource } = require("webpack-sources");
-const { UsageState } = require("../ExportsInfo");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const { UsageState } = require("../graph/ExportsInfo");
+const {
+	getMergedExports,
+	mergedEntryModules
+} = require("../javascript/MergedEntryExports");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const Template = require("../template/Template");
 const { propertyAccess } = require("../util/property");
 const { getEntryRuntime } = require("../util/runtime");
 const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
@@ -21,10 +25,10 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
  * 	LibraryExport
  * } from "../../declarations/WebpackOptions"
  */
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compilation, { ChunkHashContext } from "../Compilation" */
-/** @import { ExportInfoName } from "../Dependency" */
-/** @import Module, { RuntimeRequirements } from "../Module" */
+/** @import { ExportInfoName } from "../graph/Dependency" */
+/** @import Module, { RuntimeRequirements } from "../module/Module" */
 /**
  * @import {
  * 	RenderContext,
@@ -324,7 +328,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 	renderStartup(
 		source,
 		module,
-		{ moduleGraph, chunk },
+		{ moduleGraph, chunkGraph, chunk },
 		{ options, compilation }
 	) {
 		const fullNameResolved = this._getResolvedFullName(
@@ -348,15 +352,27 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 				true
 			);
 
+			// A merged entry exposes what its modules expose together, so the names
+			// written out are theirs rather than the last module's alone.
+			const mergedModules = mergedEntryModules(chunk, chunkGraph, compilation);
+			const names = mergedModules
+				? getMergedExports(
+						mergedModules,
+						moduleGraph,
+						chunk.runtime
+					).exports.map(({ name }) => name)
+				: [...exportsInfo.orderedExports]
+						.filter((exportInfo) => exportInfo.provided)
+						.map((exportInfo) => exportInfo.name);
+
 			/** @type {ExportInfoName[]} */
 			const provided = [];
-			for (const exportInfo of exportsInfo.orderedExports) {
-				if (!exportInfo.provided) continue;
-				const nameAccess = propertyAccess([exportInfo.name]);
+			for (const name of names) {
+				const nameAccess = propertyAccess([name]);
 				result.add(
 					`${exportTarget}${nameAccess} = ${RuntimeGlobals.exports}${exportAccess}${nameAccess};\n`
 				);
-				provided.push(exportInfo.name);
+				provided.push(name);
 			}
 
 			const webpackExportTarget = accessWithInit(

package/lib/library/EnableLibraryPlugin.js

@@ -249,7 +249,7 @@ class EnableLibraryPlugin {
 								compiler.hooks.thisCompilation.tap(
 									"WarnFalseIifeUmdPlugin",
 									(compilation) => {
-										const FalseIIFEUmdWarning = require("./FalseIIFEUmdWarning");
+										const FalseIIFEUmdWarning = require("../errors/FalseIIFEUmdWarning");
 
 										compilation.warnings.push(new FalseIIFEUmdWarning());
 									}

package/lib/library/ExportPropertyLibraryPlugin.js

@@ -6,8 +6,8 @@
 "use strict";
 
 const { ConcatSource } = require("webpack-sources");
-const { UsageState } = require("../ExportsInfo");
-const RuntimeGlobals = require("../RuntimeGlobals");
+const { UsageState } = require("../graph/ExportsInfo");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const { propertyAccess } = require("../util/property");
 const { getEntryRuntime } = require("../util/runtime");
 const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
@@ -20,8 +20,8 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
  * 	LibraryExport
  * } from "../../declarations/WebpackOptions"
  */
-/** @import Chunk from "../Chunk" */
-/** @import Module, { RuntimeRequirements } from "../Module" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import Module, { RuntimeRequirements } from "../module/Module" */
 /**
  * @import {
  * 	StartupRenderContext

package/lib/library/JsonpLibraryPlugin.js

@@ -15,7 +15,7 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
  * 	LibraryType
  * } from "../../declarations/WebpackOptions"
  */
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import { ChunkHashContext } from "../Compilation" */
 /** @import { RenderContext } from "../javascript/JavascriptModulesPlugin" */
 /** @import Hash from "../util/Hash" */

package/lib/library/LibraryTemplatePlugin.js

@@ -0,0 +1,53 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const EnableLibraryPlugin = require("./EnableLibraryPlugin");
+
+/**
+ * @import {
+ * 	AuxiliaryComment,
+ * 	LibraryExport,
+ * 	LibraryName,
+ * 	LibraryType,
+ * 	UmdNamedDefine
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Compiler from "../Compiler" */
+
+// TODO in the next major release: remove
+class LibraryTemplatePlugin {
+	/**
+	 * Creates an instance of LibraryTemplatePlugin.
+	 * @param {LibraryName} name name of library
+	 * @param {LibraryType} target type of library
+	 * @param {UmdNamedDefine} umdNamedDefine setting this to true will name the UMD module
+	 * @param {AuxiliaryComment} auxiliaryComment comment in the UMD wrapper
+	 * @param {LibraryExport} exportProperty which export should be exposed as library
+	 */
+	constructor(name, target, umdNamedDefine, auxiliaryComment, exportProperty) {
+		this.library = {
+			type: target || "var",
+			name,
+			umdNamedDefine,
+			auxiliaryComment,
+			export: exportProperty
+		};
+	}
+
+	/**
+	 * Applies the plugin by registering its hooks on the compiler.
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		const { output } = compiler.options;
+		output.library = this.library;
+		new EnableLibraryPlugin(this.library.type).apply(compiler);
+	}
+}
+
+module.exports = LibraryTemplatePlugin;