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

@@ -13 +13 @@
         nodesass = require( 'node-sass' ),
         phpUnitWatchGroup = grunt.option( 'group' ),
+
+
+
+
         buildFiles = [
             '*.php',
@@ -20 +24 @@
             '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/**'
-        ],
+        ],
         cleanFiles = [],
         changedFiles = {
@@ -128 +130 @@
             }
         },
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         copy: {
             files: {
@@ -139 +177 @@
                             '!.{svn,git}', // Exclude version control folders.
                             '!wp-includes/version.php', // Exclude version.php
+
+
                             '!index.php', '!wp-admin/index.php',
                             '!_index.php', '!wp-admin/_index.php'
@@ -153 +193 @@
                     }
                 ]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             },
             'npm-packages': {
@@ -342 +399 @@
                 dest: BUILD_DIR + 'wp-includes/version.php'
             },
+
+
+
+
+
+
+
             dynamic: {
                 dot: true,
@@ -707 +771 @@
         webpack: {
             prod: webpackConfig( { environment: 'production' } ),
+
             dev: webpackConfig( { environment: 'development' } ),
             watch: webpackConfig( { environment: 'development', watch: true } )
@@ -1159 +1224 @@
     grunt.registerTask( 'watch', function() {
         if ( ! this.args.length || this.args.indexOf( 'webpack' ) > -1 ) {
-            grunt.task.run( 'build' );
+            grunt.task.run( 'build' );
         }
 
@@ -1308 +1373 @@
     } );
 
+
+
+
+
+
+
+
     grunt.registerTask( 'copy:js', [
         'copy:npm-packages',
@@ -1315 +1387 @@
     ] );
 
-    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'
     ] );
 
@@ -1339 +1420 @@
     ] );
 
-    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',
@@ -1363 +1454 @@
         'usebanner',
         'webpack:prod',
-        'webpack:dev',
+        'webpack:dev',
         'jsvalidate:build'
     ] );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     grunt.registerTask( 'prerelease', [

trunk/tools/webpack/packages.js

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

trunk/webpack.config.js

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