Changeset 43760
- Timestamp:
- 10/19/2018 06:05:13 AM (5 years ago)
- Location:
- branches/5.0
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/5.0/.gitignore
r43748 r43760 19 19 /jsdoc 20 20 /vendor 21 /src/wp-includes/js/dist 22 /src/wp-includes/css/dist 21 23 22 24 # Files and folders that get created in wp-content -
branches/5.0/Gruntfile.js
r43719 r43760 936 936 'includes:embed', 937 937 'usebanner', 938 'webpack:prod', 938 939 'jsvalidate:build' 939 940 ] ); -
branches/5.0/src/wp-includes/css
-
Property
svn:ignore
set to
dist
-
Property
svn:ignore
set to
-
branches/5.0/src/wp-includes/js
-
Property
svn:ignore
set to
dist
-
Property
svn:ignore
set to
-
branches/5.0/src/wp-includes/script-loader.php
r43753 r43760 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 ); … … 338 338 foreach ( $packages_dependencies as $package => $dependencies ) { 339 339 $handle = 'wp-' . $package; 340 $path = "/ js/dist/$package$suffix.js";340 $path = "/wp-includes/js/dist/$package$suffix.js"; 341 341 342 342 $scripts->add( $handle, $path, $dependencies, false, 1 ); … … 1608 1608 $styles->add( 'wp-editor-font', $fonts_url ); 1609 1609 1610 $styles->add( 'wp-block-library-theme', '/ styles/dist/block-library/theme.css' );1610 $styles->add( 'wp-block-library-theme', '/wp-includes/css/dist/block-library/theme.css' ); 1611 1611 $styles->add_data( 'wp-block-library-theme', 'rtl', 'replace' ); 1612 1612 1613 1613 $styles->add( 1614 1614 'wp-edit-blocks', 1615 '/ styles/dist/block-library/editor.css',1615 '/wp-includes/css/dist/block-library/editor.css', 1616 1616 array( 1617 1617 'wp-components', … … 1634 1634 foreach ( $package_styles as $package => $dependencies ) { 1635 1635 $handle = 'wp-' . $package; 1636 $path = '/ styles/dist/' . $package . '/style.css';1636 $path = '/wp-includes/css/dist/' . $package . '/style.css'; 1637 1637 1638 1638 $styles->add( $handle, $path, $dependencies ); -
branches/5.0/tools/webpack/packages.js
r43752 r43760 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.