@wordpress/dependency-extraction-webpack-plugin 3.4.1 → 3.6.0

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 3.5.0 (2022-05-18)
+
+### Bug Fix
+
+-   Use OpenSSL provider supported in Node 17+ when calling `crypto.createHash` ([#40503](https://github.com/WordPress/gutenberg/pull/40503)).
+-   Add new line at the end of generated `*.asset.php` files ([#40753](https://github.com/WordPress/gutenberg/pull/40753)).
+-   Calculate version hashes based on output file contents rather than input files and other Webpack internal state ([#34969](https://github.com/WordPress/gutenberg/pull/34969)).
+
 ## 3.3.0 (2022-01-27)
 
 -   Add the optional `externalizedReportFile` option ([#35106](https://github.com/WordPress/gutenberg/pull/35106)).

package/lib/index.js

@@ -1,13 +1,13 @@
 /**
  * External dependencies
  */
-const { createHash } = require( 'crypto' );
 const path = require( 'path' );
 const webpack = require( 'webpack' );
 // In webpack 5 there is a `webpack.sources` field but for webpack 4 we have to fallback to the `webpack-sources` package.
 const { RawSource } = webpack.sources || require( 'webpack-sources' );
 const json2php = require( 'json2php' );
 const isWebpack4 = webpack.version.startsWith( '4.' );
+const { createHash } = webpack.util;
 
 /**
  * Internal dependencies
@@ -106,7 +106,7 @@ class DependencyExtractionWebpackPlugin {
 		if ( this.options.outputFormat === 'php' ) {
 			return `<?php return ${ json2php(
 				JSON.parse( JSON.stringify( asset ) )
-			) };`;
+			) };\n`;
 		}
 
 		return JSON.stringify( asset );
@@ -126,9 +126,8 @@ class DependencyExtractionWebpackPlugin {
 					compilation.hooks.processAssets.tap(
 						{
 							name: this.constructor.name,
-							stage:
-								compiler.webpack.Compilation
-									.PROCESS_ASSETS_STAGE_ADDITIONAL,
+							stage: compiler.webpack.Compilation
+								.PROCESS_ASSETS_STAGE_ANALYSE,
 						},
 						() => this.addAssets( compilation, compiler )
 					);
@@ -175,9 +174,8 @@ class DependencyExtractionWebpackPlugin {
 
 			const processModule = ( { userRequest } ) => {
 				if ( this.externalizedDeps.has( userRequest ) ) {
-					const scriptDependency = this.mapRequestToDependency(
-						userRequest
-					);
+					const scriptDependency =
+						this.mapRequestToDependency( userRequest );
 					entrypointExternalizedWpDeps.add( scriptDependency );
 				}
 			};
@@ -198,6 +196,24 @@ class DependencyExtractionWebpackPlugin {
 				}
 			}
 
+			const { hashFunction, hashDigest, hashDigestLength } =
+				compilation.outputOptions;
+
+			// Go through the assets and hash the sources. We can't just use
+			// `entrypointChunk.contentHash` because that's not updated when
+			// assets are minified. In practice the hash is updated by
+			// `RealContentHashPlugin` after minification, but it only modifies
+			// already-produced asset filenames and the updated hash is not
+			// available to plugins.
+			const hash = createHash( hashFunction );
+			for ( const filename of entrypoint.getFiles().sort() ) {
+				const asset = compilation.getAsset( filename );
+				hash.update( asset.source.buffer() );
+			}
+			const version = hash
+				.digest( hashDigest )
+				.slice( 0, hashDigestLength );
+
 			const entrypointChunk = isWebpack4
 				? entrypoint.chunks.find( ( c ) => c.name === entrypointName )
 				: entrypoint.getEntrypointChunk();
@@ -205,10 +221,14 @@ class DependencyExtractionWebpackPlugin {
 			const assetData = {
 				// Get a sorted array so we can produce a stable, stringified representation.
 				dependencies: Array.from( entrypointExternalizedWpDeps ).sort(),
-				version: entrypointChunk.hash,
+				version,
 			};
 
 			const assetString = this.stringify( assetData );
+			const contentHash = createHash( hashFunction )
+				.update( assetString )
+				.digest( hashDigest )
+				.slice( 0, hashDigestLength );
 
 			// Determine a filename for the asset file.
 			const [ filename, query ] = entrypointName.split( '?', 2 );
@@ -219,9 +239,7 @@ class DependencyExtractionWebpackPlugin {
 					filename,
 					query,
 					basename: basename( filename ),
-					contentHash: createHash( 'md4' )
-						.update( assetString )
-						.digest( 'hex' ),
+					contentHash,
 				}
 			);
 
@@ -238,9 +256,7 @@ class DependencyExtractionWebpackPlugin {
 					filename,
 					query,
 					basename: basename( filename ),
-					contentHash: createHash( 'md4' )
-						.update( assetString )
-						.digest( 'hex' ),
+					contentHash,
 				} );
 			} else {
 				assetFilename = buildFilename.replace(
@@ -261,8 +277,9 @@ class DependencyExtractionWebpackPlugin {
 			// The type indicates the option may be `undefined`.
 			// However, at this point in compilation, webpack has filled the options in if
 			// they were not provided.
-			const outputFolder = /** @type {{path:string}} */ ( compiler.options
-				.output ).path;
+			const outputFolder = /** @type {{path:string}} */ (
+				compiler.options.output
+			).path;
 
 			const assetsFilePath = path.resolve(
 				outputFolder,

package/lib/types.d.ts

@@ -11,7 +11,7 @@ declare interface DependencyExtractionWebpackPluginOptions {
 	injectPolyfill?: boolean;
 	useDefaults?: boolean;
 	outputFormat?: 'php' | 'json';
-	outputFilename?: string | Function,
+	outputFilename?: string | Function;
 	requestToExternal?: ( request: string ) => string | string[] | undefined;
 	requestToHandle?: ( request: string ) => string | undefined;
 	combinedOutputFile?: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dependency-extraction-webpack-plugin",
-	"version": "3.4.1",
+	"version": "3.6.0",
 	"description": "Extract WordPress script dependencies from webpack bundles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -38,5 +38,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "3494eafea7cb345728166c902b3d1223c4a8db6f"
+	"gitHead": "48d5f37dfb52d2e77c8eeb662f9874cf141b8c6b"
 }