- Timestamp:
- 12/14/2018 04:10:26 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/5.0 merged: 43760
- Property svn:mergeinfo changed
-
trunk/.gitignore
r43348 r44159 20 20 /wp-cli.local.yml 21 21 /jsdoc 22 /src/wp-includes/js 23 /src/wp-includes/css/dist 22 24 23 25 # Files and folders that get created in wp-content -
trunk/Gruntfile.js
r44135 r44159 1347 1347 grunt.registerTask( 'build', [ 1348 1348 'clean:all', 1349 'webpack:dev',1350 1349 'copy:all', 1351 1350 'file_append', … … 1361 1360 'includes:embed', 1362 1361 'usebanner', 1362 'webpack:prod', 1363 1363 'jsvalidate:build' 1364 1364 ] ); -
trunk/src/wp-includes
-
Property
svn:ignore
set to
js
-
Property
svn:ignore
set to
-
trunk/src/wp-includes/css
-
Property
svn:ignore
set to
dist
-
Property
svn:ignore
set to
-
trunk/src/wp-includes/script-loader.php
r44157 r44159 97 97 } 98 98 99 $path = "/ js/dist/vendor/$handle$dev_suffix.js";99 $path = "/wp-includes/js/dist/vendor/$handle$dev_suffix.js"; 100 100 101 101 $scripts->add( $handle, $path, $dependencies, false, 1 ); … … 337 337 338 338 foreach ( $packages_dependencies as $package => $dependencies ) { 339 $handle = 'wp-' . $package;340 $path = "/js/dist/$package$suffix.js";339 $handle = 'wp-' . $package; 340 $path = "/wp-includes/js/dist/$package$suffix.js"; 341 341 342 342 $scripts->add( $handle, $path, $dependencies, false, 1 ); … … 1801 1801 $styles->add( 'wp-editor-font', $fonts_url ); 1802 1802 1803 $styles->add( 'wp-block-library-theme', '/ styles/dist/block-library/theme.css' );1803 $styles->add( 'wp-block-library-theme', '/wp-includes/css/dist/block-library/theme.css' ); 1804 1804 $styles->add_data( 'wp-block-library-theme', 'rtl', 'replace' ); 1805 1805 1806 1806 $styles->add( 1807 1807 'wp-edit-blocks', 1808 '/ styles/dist/block-library/editor.css',1808 '/wp-includes/css/dist/block-library/editor.css', 1809 1809 array( 1810 1810 'wp-components', … … 1826 1826 1827 1827 foreach ( $package_styles as $package => $dependencies ) { 1828 $handle = 'wp-' . $package;1829 $path = '/styles/dist/' . $package . '/style.css';1828 $handle = 'wp-' . $package; 1829 $path = '/wp-includes/css/dist/' . $package . '/style.css'; 1830 1830 1831 1831 $styles->add( $handle, $path, $dependencies ); -
trunk/tools/webpack/packages.js
r44118 r44159 38 38 * Maps vendors to copy commands for the CopyWebpackPlugin. 39 39 * 40 * @param {Object} vendors Vendors to include in the vendor folder. 40 * @param {Object} vendors Vendors to include in the vendor folder. 41 * @param {string} buildTarget The folder in which to build the packages. 41 42 * 42 43 * @return {Object[]} Copy object suitable for the CopyWebpackPlugin. 43 44 */ 44 function mapVendorCopies( vendors ) {45 function mapVendorCopies( vendors, buildTarget ) { 45 46 return Object.keys( vendors ).map( ( filename ) => ( { 46 47 from: join( baseDir, `node_modules/${ vendors[ filename ] }` ), 47 to: join( baseDir, ` build/js/dist/vendor/${ filename }` ),48 to: join( baseDir, `${ buildTarget }/js/dist/vendor/${ filename }` ), 48 49 } ) ); 49 50 } … … 51 52 module.exports = function( env = { environment: 'production', watch: false } ) { 52 53 const mode = env.environment; 53 const suffix = mode === 'production' ? '.min': ''; 54 const suffix = mode === 'production' ? '.min' : ''; 55 const buildTarget = ( mode === 'production' ? 'build' : 'src' ) + '/wp-includes'; 54 56 55 57 const packages = [ … … 144 146 } ); 145 147 146 const developmentCopies = mapVendorCopies( vendors );147 const minifiedCopies = mapVendorCopies( minifiedVendors );148 const minifyCopies = mapVendorCopies( minifyVendors ).map( ( copyCommand ) => {148 const developmentCopies = mapVendorCopies( vendors, buildTarget ); 149 const minifiedCopies = mapVendorCopies( minifiedVendors, buildTarget ); 150 const minifyCopies = mapVendorCopies( minifyVendors, buildTarget ).map( ( copyCommand ) => { 149 151 return { 150 152 ...copyCommand, … … 159 161 let cssCopies = packages.map( ( packageName ) => ( { 160 162 from: join( baseDir, `node_modules/@wordpress/${ packageName }/build-style/*.css` ), 161 to: join( baseDir, ` build/styles/dist/${ packageName }/` ),163 to: join( baseDir, `${ buildTarget }/css/dist/${ packageName }/` ), 162 164 flatten: true, 163 165 transform: ( content ) => { … … 191 193 output: { 192 194 filename: `[basename]${ suffix }.js`, 193 path: join( baseDir, 'build/js/dist'),195 path: join( baseDir, `${ buildTarget }/js/dist` ), 194 196 library: { 195 197 root: [ 'wp', '[name]' ]
Note: See TracChangeset
for help on using the changeset viewer.