WordPress
diff --git a/Collapse file: .gitignore
‎.gitignore‎
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/Collapse file: .gitignore
‎.gitignore‎
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file: Gruntfile.js
‎Gruntfile.js‎
Copy file name to clipboard
+19-2Lines changed: 19 additions & 2 deletions b/Collapse file: Gruntfile.js
‎Gruntfile.js‎
Copy file name to clipboard
+19-2Lines changed: 19 additions & 2 deletions
@@ -24,6 +24,7 @@ wp-tests-config.php
 /src/wp-admin/css/*-rtl.css
 /src/wp-admin/css/colors/*/*.css
 /src/wp-admin/js
+/src/wp-includes/assets
 /src/wp-includes/js
 /src/wp-includes/css/dist
 /src/wp-includes/css/*.min.css
 
@@ -108,8 +108,12 @@ module.exports = function(grunt) {
 			],
 			js: [
 				WORKING_DIR + 'wp-admin/js/',
+				WORKING_DIR + 'wp-includes/assets/',
 				WORKING_DIR + 'wp-includes/js/'
 			],
+			'webpack-assets': [
+				WORKING_DIR + 'wp-includes/js/**/*.asset.php'
+			],
 			dynamic: {
 				dot: true,
 				expand: true,
@@ -137,6 +141,7 @@ module.exports = function(grunt) {
 						expand: true,
 						cwd: SOURCE_DIR,
 						src: buildFiles.concat( [
+							'!assets/**', // Assets is extracted into separate copy tasks.
 							'!js/**', // JavaScript is extracted into separate copy tasks.
 							'!.{svn,git}', // Exclude version control folders.
 							'!wp-includes/version.php', // Exclude version.php
@@ -345,6 +350,12 @@ module.exports = function(grunt) {
 					}
 				]
 			},
+			'webpack-assets': {
+				expand: true,
+				cwd: WORKING_DIR + 'wp-includes/js/',
+				src: 'dist/*.asset.php',
+				dest: WORKING_DIR + 'wp-includes/assets/'
+			},
 			version: {
 				options: {
 					processContent: function( src ) {
@@ -1350,10 +1361,16 @@ module.exports = function(grunt) {
 		'uglify:jqueryform'
 	] );
 
-	grunt.registerTask( 'build:js', [
-		'clean:js',
+	grunt.registerTask( 'build:webpack', [
 		'webpack:prod',
 		'webpack:dev',
+		'copy:webpack-assets',
+		'clean:webpack-assets',
+	] );
+
+	grunt.registerTask( 'build:js', [
+		'clean:js',
+		'build:webpack',
 		'copy:js',
 		'file_append',
 		'uglify:all',