Changeset 44246

Timestamp:

12/16/2018 11:33:38 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Build Tools: Revert unrelated changes to Gruntfile.js added in [44245].

See #45156.

File:

• trunk/Gruntfile.js (modified) (11 diffs)

trunk/Gruntfile.js

@@ -13 +13 @@
                 nodesass = require( 'node-sass' ),
                 phpUnitWatchGroup = grunt.option( 'group' ),
-                themeFiles = [
-                        'wp-content/themes/index.php',
-                        'wp-content/themes/twenty*/**'
-                ],
                 buildFiles = [
                         '*.php',
@@ -24 +20 @@
                         '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 = {
@@ -130 +128 @@
                         }
                 },
-                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: {
@@ -177 +139 @@
                                                         '!.{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'
@@ -193 +153 @@
                                         }
                                 ]
-                        },
-                        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': {
@@ -398 +341 @@
                                 src: SOURCE_DIR + 'wp-includes/version.php',
                                 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: {
@@ -1224 +1160 @@
         grunt.registerTask( 'watch', function() {
                 if ( ! this.args.length || this.args.indexOf( 'webpack' ) > -1 ) {
-                        grunt.task.run( 'build:dev' );
+                        grunt.task.run( 'build' );
                 }
 
@@ -1373 +1309 @@
         } );
 
-        grunt.registerTask( 'uglify:all', [
-                'uglify:core',
-                'uglify:embed',
-                'uglify:jqueryui',
-                'uglify:imgareaselect'
-        ] );
-
         grunt.registerTask( 'copy:js', [
                 'copy:npm-packages',
@@ -1387 +1316 @@
         ] );
 
-        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'
+        grunt.registerTask( 'uglify:all', [
+                'uglify:core',
+                'uglify:embed',
+                'uglify:jqueryui',
+                'uglify:imgareaselect'
         ] );
 
@@ -1420 +1340 @@
         ] );
 
-        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',
+        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',
                 'copy:all',
                 'file_append',
@@ -1458 +1368 @@
         ] );
 
-        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', [
                 'format:php:error',