From baa9b2d1f00a4531ba6849ccad8e645c5be15f24 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Wed, 18 Mar 2020 04:48:19 +0000
Subject: [PATCH] Build Tools: Use the new `combinedOutputFile` setting for the
 updated DependencyExtractionWebpackPlugin and output
 `script-loader-packages.php` directly in `wp-includes/assets/`.

Props gziolo, azaozz.
See: #48154.

git-svn-id: https://develop.svn.wordpress.org/trunk@47471 602fd350-edb4-49c9-b593-d223f7449a82
---
 Gruntfile.js              | 9 ++-------
 tools/webpack/packages.js | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 8621843c8d..a490af6b4b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -116,7 +116,7 @@ module.exports = function(grunt) {
 				WORKING_DIR + 'wp-includes/js/'
 			],
 			'webpack-assets': [
-				WORKING_DIR + 'wp-includes/js/dist/assets.php'
+				WORKING_DIR + 'wp-includes/assets/'
 			],
 			dynamic: {
 				dot: true,
@@ -354,10 +354,6 @@ module.exports = function(grunt) {
 					}
 				]
 			},
-			'webpack-assets': {
-				src: WORKING_DIR + 'wp-includes/js/dist/assets.php',
-				dest: WORKING_DIR + 'wp-includes/assets/script-loader-packages.php'
-			},
 			version: {
 				options: {
 					processContent: function( src ) {
@@ -1366,10 +1362,9 @@ module.exports = function(grunt) {
 	] );
 
 	grunt.registerTask( 'build:webpack', [
+		'clean:webpack-assets',
 		'webpack:prod',
 		'webpack:dev',
-		'copy:webpack-assets',
-		'clean:webpack-assets',
 	] );
 
 	grunt.registerTask( 'build:js', [
diff --git a/tools/webpack/packages.js b/tools/webpack/packages.js
index 6867c47c91..d651194761 100644
--- a/tools/webpack/packages.js
+++ b/tools/webpack/packages.js
@@ -247,6 +247,7 @@ module.exports = function( env = { environment: 'production', watch: false, buil
 			new DependencyExtractionPlugin( {
 				injectPolyfill: true,
 				combineAssets: true,
+				combinedOutputFile: '../../assets/script-loader-packages.php',
 			} ),
 			new CopyWebpackPlugin(
 				[