Changeset 44245

Timestamp:

12/16/2018 11:27:36 PM ( 6 years ago)

Author:

SergeyBiryukov

Message:

Build Tools: Add non-minified @wordpress scripts to the build output.

Props atimmer.
Merges [43886] to trunk.
See #45156 .

Location:

trunk

Files:

• . (modified) ( 1 prop )
• Gruntfile.js (modified) ( 12 diffs )
• tools/webpack/packages.js (modified) ( 1 diff )
• webpack.config.js (modified) ( 1 diff )

trunk/Gruntfile.js

@@ -thirteen +thirteen @@
          nodesass = require( 'node-sass' ),
          phpUnitWatchGroup = grunt.option( 'group' ),
+         themeFiles = [
+             'wp-content/themes/index.php',
+             'wp-content/themes/twenty*/**'
+         ],
          buildFiles = [
              '*.php',
@@ -twenty +twenty-four @@
              'wp-admin/**', // Include everything in wp-admin.
              'wp-content/index.php',
-             'wp-content/themes/index.php',
-             'wp-content/themes/twenty*/**',
              'wp-content/plugins/index.php',
              'wp-content/plugins/hello.php',
              'wp-content/plugins/akismet/**'
-         ] ,
+         ] .concat( themeFiles ) ,
          cleanFiles = [],
          changedFiles = {
@@ -one hundred and twenty-eight +one hundred and thirty @@
              }
          },
+         symlink: {
+             expanded: {
+                 files: [
+                   {
+                     expand: true,
+                     overwrite: true,
+                     cwd: SOURCE_DIR,
+                     src: [
+                             'wp-admin/*',
+                             'wp-content/uploads/',
+                             'wp-content/index.php',
+                             'wp-content/plugins/*',
+                             'wp-includes/*',
+                             '*.php',
+                             '*.txt',
+                             '*.html',
+                             '! wp-load.php',
+                             '! wp-admin/css',
+                             '! wp-content/themes',
+                             '! wp-includes/css',
+                             '! wp-includes/version.php', // Exclude version.php
+                             '! wp-includes/formatting.php', // Exclude formatting.php
+                             '! wp-includes/embed.php', // Exclude formatting.php
+                             '! index.php', '!wp-admin/index.php',
+                             '!_ index.php', '!wp-admin/_index.php'
+                         ],
+                     dest: BUILD_DIR
+                   },
+                     {
+                         'build/wp-config-sample.php': ['wp-config-sample.php'],
+                         'build/index.php': ['src/_index.php'],
+                         'build/wp-admin/index.php': ['src/wp-admin/_index.php']
+                     }
+                 ]
+             }
+         },
          copy: {
              files: {
@@ -one hundred and thirty-nine +one hundred and seventy-seven @@
                              '!. {svn, git}', // Exclude version control folders.
                              '! wp-includes/version.php', // Exclude version.php
+                             '! wp-admin/css/**/*', // Exclude the CSS
+                             '! wp-includes/css/**/*', // Exclude the CSS
                              '! index.php', '!wp-admin/index.php',
                              '!_ index.php', '!wp-admin/_index.php'
@@ -one hundred and fifty-three +one hundred and ninety-three @@
                      }
                  ]
+             },
+             css: {
+                 dot: true,
+                 expand: true,
+                 cwd: SOURCE_DIR,
+                 src: [
+                     'wp-admin/**/*.css',
+                     'wp-includes/**/*.css'
+                 ],
+                 dest: BUILD_DIR
+             },
+             themes: {
+                 dot: true,
+                 expand: true,
+                 cwd: SOURCE_DIR,
+                 src: themeFiles,
+                 dest: BUILD_DIR
              },
              'npm-packages': {
@@ -three hundred and forty-two +three hundred and ninety-nine @@
                  dest: BUILD_DIR + 'wp-includes/version.php'
              },
+             'php-buildFiles': {
+                 files: {
+                     'build/wp-includes/formatting.php': ['src/wp-includes/formatting.php'],
+                     'build/wp-includes/embed.php': ['src/wp-includes/embed.php'],
+                     'build/wp-load.php': ['src/wp-load.php'],
+                 }
+             },
              dynamic: {
                  dot: true,
@@ -seven hundred and seven +seven hundred and seventy-one @@
          webpack: {
              prod: webpackConfig( { environment: 'production' } ),
+             devProdTarget: webpackConfig( { environment: 'development',  forceBuildTarget: 'build/wp-includes' } ),
              dev: webpackConfig( { environment: 'development' } ),
              watch: webpackConfig( { environment: 'development', watch: true } )
@@ -one thousand one hundred and fifty-nine +one thousand two hundred and twenty-four @@
      grunt.registerTask( 'watch', function() {
          if ( ! this.args.length || this.args.indexOf( 'webpack' ) > -1 ) {
-             grunt.task.run( 'build ' );
+             grunt.task.run( 'build :dev ' );
          }
 
@@ -one thousand three hundred and eight +one thousand three hundred and seventy-three @@
      } );
 
+     grunt.registerTask( 'uglify:all', [
+         'uglify:core',
+         'uglify:embed',
+         'uglify:jqueryui',
+         'uglify:imgareaselect'
+     ] );
+
      grunt.registerTask( 'copy:js', [
          'copy:npm-packages',
@@ -one thousand three hundred and fifteen +one thousand three hundred and eighty-seven @@
      ] );
 
-     grunt.registerTask( 'uglify:all', [
-         'uglify:core',
-         'uglify:embed',
-         'uglify:jqueryui',
-         'uglify:imgareaselect'
+     grunt.registerTask( 'copyOrSymlink', function() {
+         var task = grunt.option( 'symlink' ) === true ? ' symlink:expanded' : 'copy:files';
+         grunt.task.run( task );
+     } );
+
+     grunt.registerTask( 'copy:all', [
+         'copyOrSymlink',
+         'copy:php-buildFiles',
+         'copy:css',
+         'copy:themes',
+         'copy:wp-admin-css-compat-rtl',
+         'copy:wp-admin-css-compat-min',
+         'copy:version',
+         'copy:js'
      ] );
 
@@ -one thousand three hundred and thirty-nine +one thousand four hundred and twenty @@
      ] );
 
-     grunt.registerTask( 'copy:all', [
-         'copy:files',
-         'copy:wp-admin-css-compat-rtl',
-         'copy:wp-admin-css-compat-min',
-         'copy:version',
-         'copy:js'
-     ] );
-
-     grunt.registerTask( 'build', [
-         'clean:all',
+     grunt.registerTask( 'clean-all', function() {
+         if ( grunt.option( 'symlink' ) === true ) {
+             // clean all symlinks
+             try {
+                 var delSymlinks = require('del-symlinks');
+
+                 var result = delSymlinks.sync(['./build/**']);
+                 grunt.log.writeln( '>> ' + result.length + ' symlinks cleaned.' );
+             } catch ( e ) {
+                 grunt.verbose.error( 'Error:', e.message );
+                 grunt.fail.warn( "Failed to delete symlinks. If you're on Windows, " +
+                                                  "running as administrator could resolve this issue.");
+             }
+         }
+
+         grunt.task.run( 'clean:all' );
+     } );
+
+     grunt.registerTask( 'build:all', [
+         'clean-all',
          'copy:all',
          'file_append',
@@ -one thousand three hundred and sixty-three +one thousand four hundred and fifty-four @@
          'usebanner',
          'webpack:prod',
-         'webpack:dev ',
+         'webpack:dev ProdTarget ',
          'jsvalidate:build'
      ] );
+
+     grunt.registerTask( 'build', function() {
+         grunt.task.run( 'build:all' );
+     } );
+
+     grunt.registerTask( 'build:dev', function() {
+         try {
+             // Try creating a symlink.
+             fs.symlinkSync( './symlink', './symlinktest');
+             grunt.option( 'symlink', true );
+             // If succeeded, remove it again.
+             fs.unlinkSync( './symlinktest' );
+         } catch( e ) {
+             grunt.verbose.error( 'Error:', e.message );
+             grunt.log.error( "Failed to delete symlinks. Falling back to copying " +
+                                              "files instead. If you're on Windows, " +
+                                              "running as administrator could resolve this issue.");
+         } finally {
+             grunt.task.run( 'build:all' );
+         }
+     } );
 
      grunt.registerTask( 'prerelease', [

trunk/tools/webpack/packages.js

@@ -fifty +fifty @@
  }
 
- module.exports = function( env = { environment: 'production', watch: false } ) {
+ module.exports = function( env = { environment: 'production', watch: false ,  forceBuildTarget: false } ) {
      const mode = env.environment;
      const suffix = mode === 'production' ? '. min' : '';
-     const buildTarget = ( mode === 'production' ? 'build' : 'src' ) + '/wp-includes';
+     const buildTarget = env.forceBuildTarget ? env.forceBuildTarget : ( mode === 'production' ? 'build' : 'src' ) + '/wp-includes';
 
      const packages = [

trunk/webpack.config.js

@@ -two +two @@
  const packagesConfig = require( './ tools/webpack/packages' );
 
- module.exports = function( env = { environment: "production", watch: false } ) {
+ module.exports = function( env = { environment: "production", watch: false ,  forceBuildTarget: false } ) {
      if ( ! env.watch ) {
          env.watch = false;
+     }
+
+     if ( ! env.forceBuildTarget ) {
+         env.forceBuildTarget = false;
      }