Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8,517 changes: 3,336 additions & 5,181 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 8 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,13 @@
],
"devDependencies": {
"@wordpress/babel-preset-default": "6.4.1",
"@wordpress/custom-templated-path-webpack-plugin": "2.1.0",
"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
"@wordpress/dependency-extraction-webpack-plugin": "3.4.1",
"@wordpress/e2e-test-utils": "5.4.10",
"@wordpress/library-export-default-webpack-plugin": "2.2.0",
"@wordpress/scripts": "19.2.4",
"@wordpress/scripts": "20.0.2",
"autoprefixer": "^9.8.8",
"chalk": "4.1.2",
"check-node-version": "4.1.0",
"copy-webpack-plugin": "^5.1.2",
"copy-webpack-plugin": "10.2.4",
"cssnano": "4.1.11",
"dotenv": "10.0.0",
"dotenv-expand": "5.1.0",
Expand All @@ -57,7 +55,7 @@
"grunt-replace-lts": "~1.1.0",
"grunt-rtlcss": "~2.0.2",
"grunt-sass": "~3.1.0",
"grunt-webpack": "^4.0.3",
"grunt-webpack": "5.0.0",
"ink-docstrap": "1.3.2",
"install-changed": "1.1.0",
"jest-image-snapshot": "3.0.1",
Expand All @@ -67,14 +65,13 @@
"sass": "^1.43.4",
"sinon": "~12.0.1",
"sinon-test": "~3.1.1",
"source-map-loader": "^1.1.3",
"source-map-loader": "^3.0.1",
"terser-webpack-plugin": "5.3.1",
"uglify-js": "^3.14.3",
"uglifyjs-webpack-plugin": "2.2.0",
"uuid": "8.3.2",
"wait-on": "6.0.0",
"webpack": "4.43.0",
"webpack-dev-server": "3.11.2",
"webpack-livereload-plugin": "2.3.0"
"webpack": "5.71.0",
"webpack-livereload-plugin": "3.0.2"
},
"dependencies": {
"@wordpress/a11y": "3.2.4",
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/assets/script-loader-packages.php

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/wp-includes/blocks/file/view.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array(), 'version' => '499eaf2efb98327a07f222e92d742380');
<?php return array('dependencies' => array(), 'version' => '9a1dbe2fc8e62a7e82dd0d30439951b3');
2 changes: 1 addition & 1 deletion src/wp-includes/blocks/file/view.min.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array(), 'version' => 'e8d668b8e69d9bf1c99dc250d92f2b72');
<?php return array('dependencies' => array(), 'version' => 'c7ee2db603af4ed37bd6b1d2bb4a51bf');
2 changes: 1 addition & 1 deletion src/wp-includes/blocks/navigation/view.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array(), 'version' => '49bd3949750c5172758e1b3058f0c72a');
<?php return array('dependencies' => array(), 'version' => '3bc2957a58e1f08fa9309e91ffeef792');
2 changes: 1 addition & 1 deletion src/wp-includes/blocks/navigation/view.min.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array(), 'version' => '3776ea67846b3bb10fe8f7cdd486b0ba');
<?php return array('dependencies' => array(), 'version' => '009e29110e016c14bac4ba0ecc809fcd');
83 changes: 12 additions & 71 deletions tools/webpack/blocks.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
*/
const { DefinePlugin } = require( 'webpack' );
const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
const postcss = require( 'postcss' );
const UglifyJS = require( 'uglify-js' );

const { join, basename } = require( 'path' );
const { get } = require( 'lodash' );
const { join } = require( 'path' );

/**
* WordPress dependencies
*/
const DependencyExtractionPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );

const baseDir = join( __dirname, '../../' );
/**
* Internal dependencies
*/
const { stylesTransform, baseConfig, baseDir } = require( './shared' );

module.exports = function( env = { environment: 'production', watch: false, buildTarget: false } ) {
const mode = env.environment;
Expand Down Expand Up @@ -125,32 +124,13 @@ module.exports = function( env = { environment: 'production', watch: false, buil

const blockStylesheetCopies = blockFolders.map( ( blockName ) => ( {
from: join( baseDir, `node_modules/@wordpress/block-library/build-style/${ blockName }/*.css` ),
to: join( baseDir, `${ buildTarget }/blocks/${ blockName }/` ),
flatten: true,
transform: ( content ) => {
if ( mode === 'production' ) {
return postcss( [
require( 'cssnano' )( {
preset: 'default',
} ),
] )
.process( content, { from: 'src/app.css', to: 'dest/app.css' } )
.then( ( result ) => result.css );
}

return content;
},
transformPath: ( targetPath, sourcePath ) => {
if ( mode === 'production' ) {
return targetPath.replace( /\.css$/, '.min.css' );
}

return targetPath;
}
to: join( baseDir, `${ buildTarget }/blocks/${ blockName }/[name]${ suffix }.css` ),
transform: stylesTransform( mode ),
noErrorOnMissing: true,
} ) );

const config = {
mode,
...baseConfig( env ),
entry: {
'file/view': join( baseDir, `node_modules/@wordpress/block-library/build-module/file/view` ),
'navigation/view': join( baseDir, `node_modules/@wordpress/block-library/build-module/navigation/view` ),
Expand All @@ -160,27 +140,6 @@ module.exports = function( env = { environment: 'production', watch: false, buil
filename: `[name]${ suffix }.js`,
path: join( baseDir, `${ buildTarget }/blocks` ),
},
resolve: {
modules: [
baseDir,
'node_modules',
],
alias: {
'lodash-es': 'lodash',
},
},
module: {
rules: [
{
test: /\.js$/,
use: [ 'source-map-loader' ],
enforce: 'pre',
},
],
},
optimization: {
moduleIds: mode === 'production' ? 'hashed' : 'named',
},
plugins: [
new DefinePlugin( {
// Inject the `GUTENBERG_PHASE` global, used for feature flagging.
Expand All @@ -192,33 +151,15 @@ module.exports = function( env = { environment: 'production', watch: false, buil
new DependencyExtractionPlugin( {
injectPolyfill: false,
} ),
new CopyWebpackPlugin(
[
new CopyWebpackPlugin( {
patterns: [
...blockPHPCopies,
...blockMetadataCopies,
...blockStylesheetCopies,
],
),
} ),
],
stats: {
children: false,
},

watch: env.watch,
};

if ( config.mode !== 'production' ) {
config.devtool = process.env.SOURCEMAP || 'source-map';
}

if ( mode === 'development' && env.buildTarget === 'build/' ) {
delete config.devtool;
config.mode = 'production';
config.optimization = {
minimize: false,
moduleIds: 'hashed',
};
}

return config;
};
25 changes: 15 additions & 10 deletions tools/webpack/media.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
const UglifyJsPlugin = require( 'uglifyjs-webpack-plugin' );
/**
* External dependencies
*/
const TerserPlugin = require( 'terser-webpack-plugin' );

var path = require( 'path' ),
admin_files = {};

const baseDir = path.join( __dirname, '../../' );
/**
* Internal dependencies
*/
const { baseDir } = require( './shared' );

module.exports = function( env = { environment: 'production', watch: false, buildTarget: false } ) {
const include_files = {
const entry = {
[ env.buildTarget + 'wp-includes/js/media-audiovideo.js' ]: ['./src/js/_enqueues/wp/media/audiovideo.js'],
[ env.buildTarget + 'wp-includes/js/media-audiovideo.min.js' ]: ['./src/js/_enqueues/wp/media/audiovideo.js'],
[ env.buildTarget + 'wp-includes/js/media-grid.js' ]: ['./src/js/_enqueues/wp/media/grid.js'],
Expand All @@ -18,20 +21,22 @@ module.exports = function( env = { environment: 'production', watch: false, buil
};

const mediaConfig = {
target: 'browserslist',
mode: "production",
cache: true,
entry: Object.assign( admin_files, include_files ),
entry,
output: {
path: baseDir,
filename: '[name]',
},
optimization: {
minimize: true,
moduleIds: 'hashed',
moduleIds: 'deterministic',
minimizer: [
new UglifyJsPlugin( {
new TerserPlugin( {
include: /\.min\.js$/,
} )
extractComments: false,
} ),
]
},
watch: env.watch,
Expand Down
Loading