Changeset 31629

Timestamp:

03/05/2015 07:48:59 PM (10 years ago)

Author:

wonderboymusic

Message:

Use browserify's watch mechanism in tandem with grunt watch. Makes building media bundles about 10 (million) times faster.

Make the browserify config more dynamic to make future additions easier and to ensure proper use of SOURCE_DIR.

Props iseulde, wonderboymusic.
See #28510.

File:

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

trunk/Gruntfile.js

@@ -3 +3 @@
     var path = require('path'),
         SOURCE_DIR = 'src/',
-        BUILD_DIR = 'build/';
+        BUILD_DIR = 'build/',
+        mediaConfig = {},
+        mediaBuilds = ['audio-video', 'grid', 'models', 'views'];
 
     // Load tasks.
@@ -9 +11 @@
     // Load legacy utils
     grunt.util = require('grunt-legacy-util');
+
+    mediaBuilds.forEach( function ( build ) {
+        var path = SOURCE_DIR + 'wp-includes/js/media/';
+        mediaConfig[ build ] = { files : {} };
+        mediaConfig[ build ].files[ path + build + '.js' ] = [ path + build + '.manifest.js' ];
+    } );
 
     // Project configuration.
@@ -117 +125 @@
             }
         },
-        browserify: {
-            media: {
-                files: {
-                    'src/wp-includes/js/media/models.js' : [ SOURCE_DIR + 'wp-includes/js/media/models.manifest.js' ],
-                    'src/wp-includes/js/media/views.js' : [ SOURCE_DIR + 'wp-includes/js/media/views.manifest.js' ],
-                    'src/wp-includes/js/media/audio-video.js' : [ SOURCE_DIR + 'wp-includes/js/media/audio-video.manifest.js' ],
-                    'src/wp-includes/js/media/grid.js' : [ SOURCE_DIR + 'wp-includes/js/media/grid.manifest.js' ]
-                }
-            }
-        },
+        browserify: mediaConfig,
         sass: {
             colors: {
@@ -503 +502 @@
             }
         },
-        watch: {
+        _watch: {
             all: {
                 files: [
@@ -519 +518 @@
             browserify: {
                 files: [
-                    SOURCE_DIR + 'wp-includes/js/media/**/*.js',
-                    '!' + SOURCE_DIR + 'wp-includes/js/media/audio-video.js',
-                    '!' + SOURCE_DIR + 'wp-includes/js/media/grid.js',
-                    '!' + SOURCE_DIR + 'wp-includes/js/media/models.js',
-                    '!' + SOURCE_DIR + 'wp-includes/js/media/views.js'
-                ],
-                tasks: ['browserify', 'uglify:media']
+                    SOURCE_DIR + 'wp-includes/js/media/*.js',
+                    '!' + SOURCE_DIR + 'wp-includes/js/media/*.manifest.js'
+                ],
+                tasks: ['uglify:media']
             },
             config: {
@@ -572 +568 @@
     ] );
 
-    // Pre-commit task.
-    grunt.registerTask('precommit', 'Runs front-end dev/test tasks in preparation for a commit.',
-        ['autoprefixer:core', 'imagemin:core', 'jshint:corejs', 'qunit:compiled', 'uglify:bookmarklet']);
-
-    // Copy task.
-    grunt.registerTask('copy:all', ['copy:files', 'copy:wp-admin-rtl', 'copy:version']);
-
-    // Build task.
-    grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core', 'colors', 'rtl', 'cssmin:rtl', 'cssmin:colors',
-        'browserify:media', 'uglify:core', 'uglify:media', 'uglify:jqueryui', 'concat:tinymce', 'compress:tinymce',
-        'clean:tinymce', 'jsvalidate:build']);
+    grunt.renameTask( 'watch', '_watch' );
+
+    grunt.registerTask( 'watch', function() {
+        if ( ! this.args.length || this.args.indexOf( 'browserify' ) > -1 ) {
+            grunt.config( 'browserify.options', {
+                browserifyOptions: {
+                    debug: true
+                },
+                watch: true
+            } );
+
+            grunt.task.run( 'browserify' );
+        }
+
+        grunt.task.run( '_' + this.nameArgs );
+    } );
+
+    grunt.registerTask( 'precommit', 'Runs front-end dev/test tasks in preparation for a commit.', [
+        'autoprefixer:core',
+        'imagemin:core',
+        'browserify',
+        'jshint:corejs',
+        'qunit:compiled',
+        'uglify:bookmarklet'
+    ] );
+
+    grunt.registerTask( 'copy:all', [
+        'copy:files',
+        'copy:wp-admin-rtl',
+        'copy:version'
+    ] );
+
+    grunt.registerTask( 'build', [
+        'clean:all',
+        'copy:all',
+        'cssmin:core',
+        'colors',
+        'rtl',
+        'cssmin:rtl',
+        'cssmin:colors',
+        'browserify',
+        'uglify:core',
+        'uglify:media',
+        'uglify:jqueryui',
+        'concat:tinymce',
+        'compress:tinymce',
+        'clean:tinymce',
+        'jsvalidate:build'
+    ] );
 
     // Testing tasks.