@plaudit/pnpm-plugin-plaudit-config 1.12.1 → 1.12.2

package/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.12.2] - 2026-05-28
+### Fixed
+- The `@wordpress/dependency-extraction-webpack-plugin` patch not handling the same module being imported in different ways across multiple files
+
 ## [1.12.1] - 2026-05-27
 ### Fixed
 - My code not accounting for PNPM's buggy peerDependencies handling

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/pnpm-plugin-plaudit-config",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "license": "SEE LICENSE IN LICENSE.md",
   "exports": {
     ".": "./dist/lib.mjs"

package/patches/@wordpress__dependency-extraction-webpack-plugin.patch

@@ -1,5 +1,5 @@
 diff --git a/lib/index.js b/lib/index.js
-index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0e62f6415 100644
+index 8bc7cb29312161fde29039f146c9f0de4d278fc8..36eac734bc4b73626886c24c40a8104001eeb548 100644
 --- a/lib/index.js
 +++ b/lib/index.js
 @@ -88,9 +88,19 @@ class DependencyExtractionWebpackPlugin {
@@ -25,7 +25,7 @@ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0
  			}
  		} catch ( err ) {
  			return callback( err );
-@@ -289,6 +299,10 @@ class DependencyExtractionWebpackPlugin {
+@@ -289,6 +299,13 @@ class DependencyExtractionWebpackPlugin {
  			const chunkStaticDeps = new Set();
  			/** @type {Set<string>} */
  			const chunkDynamicDeps = new Set();
@@ -33,24 +33,36 @@ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0
 +			const chunkScriptModuleStaticDeps = new Set();
 +			/** @type {Set<string>} */
 +			const chunkScriptModuleDynamicDeps = new Set();
++
++			const staticDepsCurrent = new WeakSet();
++			const staticDepsCache = new WeakMap();
  
  			if ( injectPolyfill ) {
  				chunkStaticDeps.add( 'wp-polyfill' );
-@@ -310,12 +324,32 @@ class DependencyExtractionWebpackPlugin {
+@@ -303,6 +320,8 @@ class DependencyExtractionWebpackPlugin {
+ 					if ( this.useModules ) {
+ 						const isStatic =
+ 							DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
++								staticDepsCache,
++								staticDepsCurrent,
+ 								compilation,
+ 								m
+ 							);
+@@ -310,12 +329,47 @@ class DependencyExtractionWebpackPlugin {
  						( isStatic ? chunkStaticDeps : chunkDynamicDeps ).add(
  							m.request
  						);
 +					} else if ( m.externalType === 'import' || m.externalType === 'module') {
 +						const isStatic =
-+							      DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
-+								      compilation,
-+								      m
-+							      );
++							DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
++								staticDepsCache,
++								staticDepsCurrent,
++								compilation,
++								m
++							);
 +
-+						(isStatic
-+								? chunkScriptModuleStaticDeps
-+								: chunkScriptModuleDynamicDeps
-+						).add(userRequest);
++						(isStatic ? chunkScriptModuleStaticDeps : chunkScriptModuleDynamicDeps)
++							.add(userRequest);
  					} else {
  						chunkStaticDeps.add(
  							this.mapRequestToDependency( userRequest )
@@ -59,9 +71,24 @@ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0
  				}
 +				if (m.blocks) {
 +					for (const block of m.blocks) {
-+						if (block.constructor.name === AsyncDependenciesBlock.name || block.constructor.name === DependenciesBlock.name) {
-+							for (const dep of block.dependencies) {
-+								processModule(compilation.moduleGraph.getModule(dep));
++						if (block.constructor.name !== AsyncDependenciesBlock.name && block.constructor.name !== DependenciesBlock.name) {
++							continue;
++						}
++						for (const dep of block.dependencies) {
++							if (this.externalizedDeps.has(dep.userRequest)) {
++								if (block.constructor.name === AsyncDependenciesBlock.name) {
++									if (this.useModules) {
++										chunkDynamicDeps.add(dep.request);
++									} else {
++										chunkScriptModuleDynamicDeps.add(dep.userRequest)
++									}
++								} else {
++									if (this.useModules) {
++										chunkStaticDeps.add(dep.request);
++									} else {
++										chunkScriptModuleStaticDeps.add(dep.userRequest)
++									}
++								}
 +							}
 +						}
 +					}
@@ -69,7 +96,7 @@ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0
  			};
  
  			// Search for externalized modules in all chunks.
-@@ -383,6 +417,18 @@ class DependencyExtractionWebpackPlugin {
+@@ -383,6 +437,18 @@ class DependencyExtractionWebpackPlugin {
  				version: contentHash,
  			};
  
@@ -88,3 +115,84 @@ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0
  			if ( this.useModules ) {
  				assetData.type = 'module';
  			}
+@@ -444,9 +510,6 @@ class DependencyExtractionWebpackPlugin {
+ 		}
+ 	}
+ 
+-	static #staticDepsCurrent = new WeakSet();
+-	static #staticDepsCache = new WeakMap();
+-
+ 	/**
+ 	 * Can we trace a line of static dependencies from an entry to a module
+ 	 *
+@@ -455,20 +518,20 @@ class DependencyExtractionWebpackPlugin {
+ 	 *
+ 	 * @return {boolean} True if there is a static import path to the root
+ 	 */
+-	static hasStaticDependencyPathToRoot( compilation, block ) {
+-		if ( DependencyExtractionWebpackPlugin.#staticDepsCache.has( block ) ) {
+-			return DependencyExtractionWebpackPlugin.#staticDepsCache.get(
++	static hasStaticDependencyPathToRoot( staticDepsCache, staticDepsCurrent, compilation, block ) {
++		if ( staticDepsCache.has( block ) ) {
++			return staticDepsCache.get(
+ 				block
+ 			);
+ 		}
+ 
+ 		if (
+-			DependencyExtractionWebpackPlugin.#staticDepsCurrent.has( block )
++			staticDepsCurrent.has( block )
+ 		) {
+ 			return false;
+ 		}
+ 
+-		DependencyExtractionWebpackPlugin.#staticDepsCurrent.add( block );
++		staticDepsCurrent.add( block );
+ 
+ 		const incomingConnections = [
+ 			...compilation.moduleGraph.getIncomingConnections( block ),
+@@ -483,11 +546,11 @@ class DependencyExtractionWebpackPlugin {
+ 		// If we don't have non-entry, non-library incoming connections,
+ 		// we've reached a root of
+ 		if ( ! incomingConnections.length ) {
+-			DependencyExtractionWebpackPlugin.#staticDepsCache.set(
++			staticDepsCache.set(
+ 				block,
+ 				true
+ 			);
+-			DependencyExtractionWebpackPlugin.#staticDepsCurrent.delete(
++			staticDepsCurrent.delete(
+ 				block
+ 			);
+ 			return true;
+@@ -508,11 +571,11 @@ class DependencyExtractionWebpackPlugin {
+ 
+ 		// All the dependencies were Async, the module was reached via a dynamic import
+ 		if ( ! staticDependentModules.length ) {
+-			DependencyExtractionWebpackPlugin.#staticDepsCache.set(
++			staticDepsCache.set(
+ 				block,
+ 				false
+ 			);
+-			DependencyExtractionWebpackPlugin.#staticDepsCurrent.delete(
++			staticDepsCurrent.delete(
+ 				block
+ 			);
+ 			return false;
+@@ -522,13 +585,14 @@ class DependencyExtractionWebpackPlugin {
+ 		const result = staticDependentModules.some(
+ 			( parentStaticDependentModule ) =>
+ 				DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
++					staticDepsCache, staticDepsCurrent,
+ 					compilation,
+ 					parentStaticDependentModule
+ 				)
+ 		);
+ 
+-		DependencyExtractionWebpackPlugin.#staticDepsCache.set( block, result );
+-		DependencyExtractionWebpackPlugin.#staticDepsCurrent.delete( block );
++		staticDepsCache.set( block, result );
++		staticDepsCurrent.delete( block );
+ 		return result;
+ 	}
+ }