<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[31629] trunk/Gruntfile.js: Use `browserify`'s watch mechanism in tandem with `grunt watch`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31629">31629</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31629","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-05 19:48:59 +0000 (Thu, 05 Mar 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/28510">#28510</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2015-03-05 19:13:00 UTC (rev 31628)
+++ trunk/Gruntfile.js 2015-03-05 19:48:59 UTC (rev 31629)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,13 +2,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = function(grunt) {
</span><span class="cx" style="display: block; padding: 0 10px"> var path = require('path'),
</span><span class="cx" style="display: block; padding: 0 10px"> SOURCE_DIR = 'src/',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- BUILD_DIR = 'build/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ BUILD_DIR = 'build/',
+ mediaConfig = {},
+ mediaBuilds = ['audio-video', 'grid', 'models', 'views'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load tasks.
</span><span class="cx" style="display: block; padding: 0 10px"> require('matchdep').filterDev(['grunt-*', '!grunt-legacy-util']).forEach( grunt.loadNpmTasks );
</span><span class="cx" style="display: block; padding: 0 10px"> // Load legacy utils
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.util = require('grunt-legacy-util');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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' ];
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Project configuration.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.initConfig({
</span><span class="cx" style="display: block; padding: 0 10px"> autoprefixer: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,16 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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' ]
- }
- }
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ browserify: mediaConfig,
</ins><span class="cx" style="display: block; padding: 0 10px"> sass: {
</span><span class="cx" style="display: block; padding: 0 10px"> colors: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,7 +501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> dest: SOURCE_DIR
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- watch: {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _watch: {
</ins><span class="cx" style="display: block; padding: 0 10px"> all: {
</span><span class="cx" style="display: block; padding: 0 10px"> files: [
</span><span class="cx" style="display: block; padding: 0 10px"> SOURCE_DIR + '**',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,13 +517,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> browserify: {
</span><span class="cx" style="display: block; padding: 0 10px"> files: [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ SOURCE_DIR + 'wp-includes/js/media/*.js',
+ '!' + SOURCE_DIR + 'wp-includes/js/media/*.manifest.js'
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tasks: ['browserify', 'uglify:media']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tasks: ['uglify:media']
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> config: {
</span><span class="cx" style="display: block; padding: 0 10px"> files: 'Gruntfile.js'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -571,18 +567,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'jshint:media'
</span><span class="cx" style="display: block; padding: 0 10px"> ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.renameTask( 'watch', '_watch' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Copy task.
- grunt.registerTask('copy:all', ['copy:files', 'copy:wp-admin-rtl', 'copy:version']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'watch', function() {
+ if ( ! this.args.length || this.args.indexOf( 'browserify' ) > -1 ) {
+ grunt.config( 'browserify.options', {
+ browserifyOptions: {
+ debug: true
+ },
+ watch: true
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.task.run( 'browserify' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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'
+ ] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Testing tasks.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerMultiTask('phpunit', 'Runs PHPUnit tests, including the ajax, external-http, and multisite tests.', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.util.spawn({
</span></span></pre>
</div>
</div>
</body>
</html>