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
This commit is contained in:
parent
e7022adab2
commit
baa9b2d1f0
|
@ -116,7 +116,7 @@ module.exports = function(grunt) {
|
||||||
WORKING_DIR + 'wp-includes/js/'
|
WORKING_DIR + 'wp-includes/js/'
|
||||||
],
|
],
|
||||||
'webpack-assets': [
|
'webpack-assets': [
|
||||||
WORKING_DIR + 'wp-includes/js/dist/assets.php'
|
WORKING_DIR + 'wp-includes/assets/'
|
||||||
],
|
],
|
||||||
dynamic: {
|
dynamic: {
|
||||||
dot: true,
|
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: {
|
version: {
|
||||||
options: {
|
options: {
|
||||||
processContent: function( src ) {
|
processContent: function( src ) {
|
||||||
|
@ -1366,10 +1362,9 @@ module.exports = function(grunt) {
|
||||||
] );
|
] );
|
||||||
|
|
||||||
grunt.registerTask( 'build:webpack', [
|
grunt.registerTask( 'build:webpack', [
|
||||||
|
'clean:webpack-assets',
|
||||||
'webpack:prod',
|
'webpack:prod',
|
||||||
'webpack:dev',
|
'webpack:dev',
|
||||||
'copy:webpack-assets',
|
|
||||||
'clean:webpack-assets',
|
|
||||||
] );
|
] );
|
||||||
|
|
||||||
grunt.registerTask( 'build:js', [
|
grunt.registerTask( 'build:js', [
|
||||||
|
|
|
@ -247,6 +247,7 @@ module.exports = function( env = { environment: 'production', watch: false, buil
|
||||||
new DependencyExtractionPlugin( {
|
new DependencyExtractionPlugin( {
|
||||||
injectPolyfill: true,
|
injectPolyfill: true,
|
||||||
combineAssets: true,
|
combineAssets: true,
|
||||||
|
combinedOutputFile: '../../assets/script-loader-packages.php',
|
||||||
} ),
|
} ),
|
||||||
new CopyWebpackPlugin(
|
new CopyWebpackPlugin(
|
||||||
[
|
[
|
||||||
|
|
Loading…
Reference in New Issue