@depup/webpack 5.106.1-depup.0 → 5.109.2-depup.0

package/lib/WebpackOptionsApply.js

@@ -57,14 +57,14 @@ const SystemPlugin = require("./dependencies/SystemPlugin");
 
 const URLPlugin = require("./dependencies/URLPlugin");
 
-const WorkerPlugin = require("./dependencies/WorkerPlugin");
+const WorkerAndWorkletPlugin = require("./dependencies/WorkerAndWorkletPlugin");
 
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
-const JavascriptParser = require("./javascript/JavascriptParser");
 
 const JsonModulesPlugin = require("./json/JsonModulesPlugin");
 
 const ChunkPrefetchPreloadPlugin = require("./prefetch/ChunkPrefetchPreloadPlugin");
+const ResourceHintPlugin = require("./prefetch/ResourceHintPlugin");
 
 const DataUriPlugin = require("./schemes/DataUriPlugin");
 const FileUriPlugin = require("./schemes/FileUriPlugin");
@@ -90,6 +90,7 @@ class WebpackOptionsApply extends OptionsApply {
 	}
 
 	/**
+	 * Returns options object.
 	 * @param {WebpackOptions} options options object
 	 * @param {Compiler} compiler compiler object
 	 * @param {WebpackOptionsInterception=} interception intercepted options
@@ -148,6 +149,16 @@ class WebpackOptionsApply extends OptionsApply {
 				).apply(compiler);
 			}
 		}
+		if (options.externalsPresets.deno) {
+			const DenoTargetPlugin = require("./deno/DenoTargetPlugin");
+
+			new DenoTargetPlugin().apply(compiler);
+		}
+		if (options.externalsPresets.bun) {
+			const BunTargetPlugin = require("./bun/BunTargetPlugin");
+
+			new BunTargetPlugin().apply(compiler);
+		}
 		if (options.externalsPresets.webAsync || options.externalsPresets.web) {
 			const type = options.externalsPresets.webAsync ? "import" : "module";
 
@@ -174,23 +185,42 @@ class WebpackOptionsApply extends OptionsApply {
 			}).apply(compiler);
 		}
 		if (options.externalsPresets.electron) {
+			// Use ESM imports only when the targeted electron version supports them
+			const type =
+				options.output.module && options.output.environment.module
+					? "module-import"
+					: "node-commonjs";
+
+			// Warn when ESM output is requested but the electron version lacks it (added in electron 28)
+			if (options.output.module && !options.output.environment.module) {
+				const WebpackError = require("./WebpackError");
+
+				compiler.hooks.thisCompilation.tap(CLASS_NAME, (compilation) => {
+					compilation.warnings.push(
+						new WebpackError(
+							"'output.module' is enabled, but the targeted electron version does not support ECMAScript modules (added in electron 28). Electron built-in modules are externalized as 'node-commonjs'."
+						)
+					);
+				});
+			}
+
 			if (options.externalsPresets.electronMain) {
 				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 				const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
 
-				new ElectronTargetPlugin("main").apply(compiler);
+				new ElectronTargetPlugin("main", type).apply(compiler);
 			}
 			if (options.externalsPresets.electronPreload) {
 				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 				const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
 
-				new ElectronTargetPlugin("preload").apply(compiler);
+				new ElectronTargetPlugin("preload", type).apply(compiler);
 			}
 			if (options.externalsPresets.electronRenderer) {
 				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 				const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
 
-				new ElectronTargetPlugin("renderer").apply(compiler);
+				new ElectronTargetPlugin("renderer", type).apply(compiler);
 			}
 			if (
 				!options.externalsPresets.electronMain &&
@@ -200,7 +230,7 @@ class WebpackOptionsApply extends OptionsApply {
 				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 				const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
 
-				new ElectronTargetPlugin().apply(compiler);
+				new ElectronTargetPlugin(undefined, type).apply(compiler);
 			}
 		}
 		if (options.externalsPresets.nwjs) {
@@ -211,6 +241,7 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 
 		new ChunkPrefetchPreloadPlugin().apply(compiler);
+		new ResourceHintPlugin(options.output.resourceHints).apply(compiler);
 
 		if (typeof options.output.chunkFormat === "string") {
 			switch (options.output.chunkFormat) {
@@ -371,6 +402,7 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 
 		new JavascriptModulesPlugin().apply(compiler);
+
 		new JsonModulesPlugin().apply(compiler);
 		new AssetModulesPlugin({
 			sideEffectFree: options.experiments.futureDefaults
@@ -424,6 +456,18 @@ class WebpackOptionsApply extends OptionsApply {
 			new CssModulesPlugin().apply(compiler);
 		}
 
+		if (options.experiments.html) {
+			const HtmlModulesPlugin = require("./html/HtmlModulesPlugin");
+
+			new HtmlModulesPlugin().apply(compiler);
+		}
+
+		if (options.experiments.typescript) {
+			const TypeScriptPlugin = require("./typescript/TypeScriptPlugin");
+
+			new TypeScriptPlugin().apply(compiler);
+		}
+
 		if (options.experiments.lazyCompilation) {
 			const LazyCompilationPlugin = require("./hmr/LazyCompilationPlugin");
 
@@ -486,20 +530,6 @@ class WebpackOptionsApply extends OptionsApply {
 			new HttpUriPlugin(httpOptions).apply(compiler);
 		}
 
-		if (
-			!(
-				/** @type {typeof JavascriptParser & { __importPhasesExtended?: true }} */
-				(JavascriptParser).__importPhasesExtended
-			) &&
-			(options.experiments.deferImport || options.experiments.sourceImport)
-		) {
-			const importPhases = require("acorn-import-phases");
-
-			JavascriptParser.extend(importPhases({ source: true, defer: true }));
-			/** @type {typeof JavascriptParser & { __importPhasesExtended?: true }} */
-			(JavascriptParser).__importPhasesExtended = true;
-		}
-
 		new EntryOptionPlugin().apply(compiler);
 		compiler.hooks.entryOption.call(options.context, options.entry);
 
@@ -516,7 +546,7 @@ class WebpackOptionsApply extends OptionsApply {
 		}).apply(compiler);
 		if (options.amd !== false) {
 			const AMDPlugin = require("./dependencies/AMDPlugin");
-			const RequireJsStuffPlugin = require("./RequireJsStuffPlugin");
+			const RequireJsStuffPlugin = require("./dependencies/RequireJsStuffPlugin");
 
 			new AMDPlugin(options.amd || {}).apply(compiler);
 			new RequireJsStuffPlugin().apply(compiler);
@@ -541,11 +571,12 @@ class WebpackOptionsApply extends OptionsApply {
 		new SystemPlugin().apply(compiler);
 		new ImportMetaPlugin().apply(compiler);
 		new URLPlugin().apply(compiler);
-		new WorkerPlugin(
+		new WorkerAndWorkletPlugin(
 			options.output.workerChunkLoading,
 			options.output.workerWasmLoading,
 			options.output.module,
-			options.output.workerPublicPath
+			options.output.workerPublicPath,
+			options.experiments.futureDefaults
 		).apply(compiler);
 
 		new DefaultStatsFactoryPlugin().apply(compiler);
@@ -597,7 +628,9 @@ class WebpackOptionsApply extends OptionsApply {
 			const FlagDependencyUsagePlugin = require("./FlagDependencyUsagePlugin");
 
 			new FlagDependencyUsagePlugin(
-				options.optimization.usedExports === "global"
+				options.optimization.usedExports === "global",
+				// Keep an escaping module's exports mangleable when mangling is on.
+				Boolean(options.optimization.mangleExports)
 			).apply(compiler);
 		}
 		if (options.optimization.innerGraph) {
@@ -605,6 +638,19 @@ class WebpackOptionsApply extends OptionsApply {
 
 			new InnerGraphPlugin().apply(compiler);
 		}
+
+		if (options.mode === "production") {
+			const CircularModulesPlugin = require("./CircularModulesPlugin");
+
+			new CircularModulesPlugin().apply(compiler);
+		}
+
+		const ConstExportsPlugin = require("./optimize/ConstExportsPlugin");
+
+		new ConstExportsPlugin({
+			inlineExports: options.optimization.inlineExports
+		}).apply(compiler);
+
 		if (options.optimization.mangleExports) {
 			const MangleExportsPlugin = require("./optimize/MangleExportsPlugin");
 
@@ -747,10 +793,27 @@ class WebpackOptionsApply extends OptionsApply {
 			const DefinePlugin = require("./DefinePlugin");
 
 			const defValue = JSON.stringify(options.optimization.nodeEnv);
+			const development = options.mode === "development";
+			// SSR = server-only build (node, not browser); a universal (node+browser) target is null here, so not SSR.
+			const ssr =
+				compiler.platform.node === true && compiler.platform.browser !== true;
+			const { publicPath } = options.output;
+			// Vite-compatible base URL; fall back to "/" for runtime ("auto") or empty publicPath.
+			const baseUrl =
+				typeof publicPath === "string" &&
+				publicPath !== "auto" &&
+				publicPath !== ""
+					? publicPath
+					: "/";
 
 			new DefinePlugin({
 				"process.env.NODE_ENV": defValue,
-				"import.meta.env.NODE_ENV": defValue
+				"import.meta.env.NODE_ENV": defValue,
+				"import.meta.env.MODE": defValue,
+				"import.meta.env.DEV": JSON.stringify(development),
+				"import.meta.env.PROD": JSON.stringify(!development),
+				"import.meta.env.SSR": JSON.stringify(ssr),
+				"import.meta.env.BASE_URL": JSON.stringify(baseUrl)
 			}).apply(compiler);
 		}
 		if (options.optimization.minimize) {

package/lib/WebpackOptionsDefaulter.js

@@ -13,6 +13,7 @@ const { getNormalizedWebpackOptions } = require("./config/normalization");
 
 class WebpackOptionsDefaulter {
 	/**
+	 * Returns normalized webpack options.
 	 * @param {WebpackOptions} options webpack options
 	 * @returns {WebpackOptionsNormalized} normalized webpack options
 	 */

package/lib/asset/AssetBytesGenerator.js

@@ -9,10 +9,11 @@ const { RawSource } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const {
+	ASSET_URL_TYPE,
+	ASSET_URL_TYPES,
 	CSS_TYPE,
-	CSS_URL_TYPE,
-	CSS_URL_TYPES,
-	JAVASCRIPT_AND_CSS_URL_TYPES,
+	HTML_TYPE,
+	JAVASCRIPT_AND_ASSET_URL_TYPES,
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES,
 	NO_TYPES
@@ -27,17 +28,20 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../NormalModule")} NormalModule */
 
-class AssetSourceGenerator extends Generator {
+class AssetBytesGenerator extends Generator {
 	/**
+	 * Creates an instance of AssetBytesGenerator.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 */
 	constructor(moduleGraph) {
 		super();
 
+		/** @type {ModuleGraph} */
 		this._moduleGraph = moduleGraph;
 	}
 
 	/**
+	 * Generates generated code for this runtime module.
 	 * @param {NormalModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {Source | null} generated code
@@ -77,7 +81,7 @@ class AssetSourceGenerator extends Generator {
 				}
 				return new RawSource(sourceContent);
 			}
-			case CSS_URL_TYPE: {
+			case ASSET_URL_TYPE: {
 				if (!originalSource) {
 					return null;
 				}
@@ -97,6 +101,7 @@ class AssetSourceGenerator extends Generator {
 	}
 
 	/**
+	 * Generates fallback output for the provided error condition.
 	 * @param {Error} error the error
 	 * @param {NormalModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate
@@ -115,6 +120,7 @@ class AssetSourceGenerator extends Generator {
 	}
 
 	/**
+	 * Returns the reason this module cannot be concatenated, when one exists.
 	 * @param {NormalModule} module module for which the bailout reason should be determined
 	 * @param {ConcatenationBailoutReasonContext} context context
 	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
@@ -124,6 +130,7 @@ class AssetSourceGenerator extends Generator {
 	}
 
 	/**
+	 * Returns the source types available for this module.
 	 * @param {NormalModule} module fresh module
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
@@ -141,10 +148,13 @@ class AssetSourceGenerator extends Generator {
 		}
 
 		if (sourceTypes.size > 0) {
-			if (sourceTypes.has(JAVASCRIPT_TYPE) && sourceTypes.has(CSS_TYPE)) {
-				return JAVASCRIPT_AND_CSS_URL_TYPES;
-			} else if (sourceTypes.has(CSS_TYPE)) {
-				return CSS_URL_TYPES;
+			if (
+				sourceTypes.has(JAVASCRIPT_TYPE) &&
+				(sourceTypes.has(CSS_TYPE) || sourceTypes.has(HTML_TYPE))
+			) {
+				return JAVASCRIPT_AND_ASSET_URL_TYPES;
+			} else if (sourceTypes.has(CSS_TYPE) || sourceTypes.has(HTML_TYPE)) {
+				return ASSET_URL_TYPES;
 			}
 			return JAVASCRIPT_TYPES;
 		}
@@ -153,6 +163,14 @@ class AssetSourceGenerator extends Generator {
 	}
 
 	/**
+	 * @returns {boolean} whether getTypes() depends on the module's incoming connections
+	 */
+	getTypesDependOnIncomingConnections() {
+		return true;
+	}
+
+	/**
+	 * Returns the estimated size for the requested source type.
 	 * @param {NormalModule} module the module
 	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
@@ -169,4 +187,4 @@ class AssetSourceGenerator extends Generator {
 	}
 }
 
-module.exports = AssetSourceGenerator;
+module.exports = AssetBytesGenerator;

package/lib/asset/AssetBytesParser.js

@@ -14,6 +14,7 @@ const Parser = require("../Parser");
 
 class AssetBytesParser extends Parser {
 	/**
+	 * Parses the provided source and updates the parser state.
 	 * @param {string | Buffer | PreparsedAst} source the source to parse
 	 * @param {ParserState} state the parser state
 	 * @returns {ParserState} the parser state