@wordpress/dependency-extraction-webpack-plugin 6.50.0 → 6.51.0

package/lib/index.js

@@ -296,12 +296,24 @@ class DependencyExtractionWebpackPlugin {
 
 			/**
 			 * @param {webpack.Module} m
+			 * @param {boolean}        [fromAsyncChunk] Module was found in an
+			 *                                          async chunk of the entry.
 			 */
-			const processModule = ( m ) => {
+			const processModule = ( m, fromAsyncChunk ) => {
 				const { userRequest } = m;
 				if ( this.externalizedDeps.has( userRequest ) ) {
 					if ( this.useModules ) {
+						// A static occurrence (in the entry chunk) wins.
+						if (
+							fromAsyncChunk &&
+							chunkStaticDeps.has( m.request )
+						) {
+							return;
+						}
+						// Externals in an async chunk are reached via a dynamic
+						// import by definition.
 						const isStatic =
+							! fromAsyncChunk &&
 							DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
 								compilation,
 								m
@@ -318,16 +330,49 @@ class DependencyExtractionWebpackPlugin {
 				}
 			};
 
-			// Search for externalized modules in all chunks.
-			for ( const chunkModule of compilation.chunkGraph.getChunkModulesIterable(
-				chunk
-			) ) {
-				processModule( chunkModule );
-				// Loop through submodules of ConcatenatedModule.
-				if ( chunkModule.modules ) {
-					for ( const concatModule of chunkModule.modules ) {
-						processModule( concatModule );
+			/**
+			 * @param {webpack.Chunk} searchChunk
+			 * @param {boolean}       [fromAsyncChunk]
+			 */
+			const processChunkModules = ( searchChunk, fromAsyncChunk ) => {
+				for ( const chunkModule of compilation.chunkGraph.getChunkModulesIterable(
+					searchChunk
+				) ) {
+					processModule( chunkModule, fromAsyncChunk );
+					// Loop through submodules of ConcatenatedModule.
+					if ( chunkModule.modules ) {
+						for ( const concatModule of chunkModule.modules ) {
+							processModule( concatModule, fromAsyncChunk );
+						}
+					}
+				}
+			};
+
+			processChunkModules( chunk );
+
+			/*
+			 * Also search the entry's async chunks: webpack can code-split a
+			 * dynamically imported external into its own chunk.
+			 */
+			for ( const group of chunk.groupsIterable ) {
+				if (
+					typeof group.getEntrypointChunk !== 'function' ||
+					group.getEntrypointChunk() !== chunk
+				) {
+					continue;
+				}
+				const seenGroups = new Set();
+				const groupQueue = [ ...group.getChildren() ];
+				while ( groupQueue.length ) {
+					const childGroup = groupQueue.pop();
+					if ( seenGroups.has( childGroup ) ) {
+						continue;
+					}
+					seenGroups.add( childGroup );
+					for ( const asyncChunk of childGroup.chunks ) {
+						processChunkModules( asyncChunk, true );
 					}
+					groupQueue.push( ...childGroup.getChildren() );
 				}
 			}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dependency-extraction-webpack-plugin",
-	"version": "6.50.0",
+	"version": "6.51.0",
 	"description": "Extract WordPress script dependencies from webpack bundles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -46,7 +46,9 @@
 		"glob": "^7.1.2",
 		"lodash": "^4.17.21",
 		"mini-css-extract-plugin": "^2.9.2",
-		"mkdirp": "^3.0.1"
+		"mkdirp": "^3.0.1",
+		"rimraf": "^5.0.10",
+		"webpack": "^5.108.1"
 	},
 	"peerDependencies": {
 		"webpack": "^5.0.0"
@@ -54,5 +56,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "fee6e24e8e63d36f6bbcf487c193461e9bd79753"
+	"gitHead": "e9a74f9c14095a34398ecd4d1f7a908e55051205"
 }