<!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>[25188] trunk: Build tinymce.js.gz using grunt.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25188">25188</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-08-30 22:16:43 +0000 (Fri, 30 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build tinymce.js.gz using grunt.
props azaozz.
see <a href="http://core.trac.wordpress.org/ticket/25159">#25159</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunkpackagejson">trunk/package.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4>Modified: trunk/Gruntfile.js (25187 => 25188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Gruntfile.js 2013-08-30 17:43:18 UTC (rev 25187)
+++ trunk/Gruntfile.js 2013-08-30 22:16:43 UTC (rev 25188)
</span><span class="lines">@@ -14,6 +14,13 @@
</span><span class="cx"> cwd: BUILD_DIR,
</span><span class="cx"> src: []
</span><span class="cx"> },
</span><ins>+ tinymce: {
+ src: [
+ '<%= concat.tinymce.dest %>',
+ BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce-schema.min.js',
+ BUILD_DIR + 'wp-includes/js/tinymce/mark_loaded.js'
+ ]
+ }
</ins><span class="cx"> },
</span><span class="cx"> copy: {
</span><span class="cx"> all: {
</span><span class="lines">@@ -68,6 +75,7 @@
</span><span class="cx"> 'wp-includes/js/plupload/handlers.js',
</span><span class="cx"> 'wp-includes/js/plupload/wp-plupload.js',
</span><span class="cx"> 'wp-includes/js/tinymce/plugins/wp*/js/*.js',
</span><ins>+ 'wp-includes/js/tinymce/wp-tinymce-schema.js',
</ins><span class="cx"> // Exceptions
</span><span class="cx"> '!wp-admin/js/custom-header.js', // Why? We should minify this.
</span><span class="cx"> '!wp-admin/js/farbtastic.js',
</span><span class="lines">@@ -75,7 +83,9 @@
</span><span class="cx"> '!wp-includes/js/backbone.min.js',
</span><span class="cx"> '!wp-includes/js/swfobject.js',
</span><span class="cx"> '!wp-includes/js/underscore.min.js',
</span><del>- '!wp-includes/js/zxcvbn.min.js'
</del><ins>+ '!wp-includes/js/zxcvbn.min.js',
+ // Hard-coded in editimage.html
+ '!wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js'
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> tinymce: {
</span><span class="lines">@@ -84,16 +94,46 @@
</span><span class="cx"> dest: BUILD_DIR,
</span><span class="cx"> src: [
</span><span class="cx"> 'wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js',
</span><del>- 'wp-includes/js/tinymce/plugins/wp*/editor_plugin_src.js'
</del><ins>+ 'wp-includes/js/tinymce/plugins/wp*/editor_plugin_src.js',
+ 'wp-includes/js/tinymce/mark_loaded_src.js'
</ins><span class="cx"> ],
</span><span class="cx"> // TinyMCE plugins use a nonstandard naming scheme: plugin files are named
</span><span class="cx"> // `editor_plugin_src.js`, and are compressed into `editor_plugin.js`.
</span><span class="cx"> rename: function(destBase, destPath) {
</span><del>- destPath = destPath.replace('/editor_plugin_src.js', '/editor_plugin.js');
</del><ins>+ destPath = destPath.replace(/_src.js$/, '.js');
</ins><span class="cx"> return path.join(destBase || '', destPath);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> },
</span><ins>+ concat: {
+ tinymce: {
+ options: {
+ separator: '\n',
+ banner: '// Created: <%= grunt.template.today("UTC:yyyy-mm-dd HH:MM:ss Z") %>\n',
+ process: function( src, filepath ) {
+ return '// Source: ' + filepath.replace( BUILD_DIR, '' ) + '\n' + src;
+ }
+ },
+ src: [
+ BUILD_DIR + 'wp-includes/js/tinymce/tiny_mce.js',
+ BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce-schema.min.js',
+ BUILD_DIR + 'wp-includes/js/tinymce/themes/advanced/editor_template.js',
+ BUILD_DIR + 'wp-includes/js/tinymce/plugins/*/editor_plugin.js',
+ BUILD_DIR + 'wp-includes/js/tinymce/mark_loaded.js'
+ ],
+ dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js'
+ }
+ },
+ compress: {
+ tinymce: {
+ options: {
+ mode: 'gzip',
+ level: 9
+ },
+ src: '<%= concat.tinymce.dest %>',
+ dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js.gz'
+ }
+ },
</ins><span class="cx"> watch: {
</span><span class="cx"> all: {
</span><span class="cx"> files: [
</span><span class="lines">@@ -122,10 +162,12 @@
</span><span class="cx"> grunt.loadNpmTasks('grunt-contrib-qunit');
</span><span class="cx"> grunt.loadNpmTasks('grunt-contrib-uglify');
</span><span class="cx"> grunt.loadNpmTasks('grunt-contrib-watch');
</span><ins>+ grunt.loadNpmTasks('grunt-contrib-compress');
+ grunt.loadNpmTasks('grunt-contrib-concat');
</ins><span class="cx">
</span><span class="cx"> // Register tasks.
</span><del>- grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core',
- 'uglify:core', 'uglify:tinymce']);
</del><ins>+ grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core', 'uglify:core',
+ 'uglify:tinymce', 'concat:tinymce', 'compress:tinymce', 'clean:tinymce']);
</ins><span class="cx">
</span><span class="cx"> // Testing task.
</span><span class="cx"> grunt.registerTask('test', ['qunit']);
</span><span class="lines">@@ -137,12 +179,14 @@
</span><span class="cx"> //
</span><span class="cx"> // On `watch:all`, automatically updates the `copy:dynamic` and `clean:dynamic`
</span><span class="cx"> // configurations so that only the changed files are updated.
</span><del>- grunt.event.on('watch', function(action, filepath, target) {
- if (target != 'all') return;
</del><ins>+ grunt.event.on('watch', function( action, filepath, target ) {
+ if ( target != 'all' )
+ return;
</ins><span class="cx">
</span><del>- var relativePath = path.relative(SOURCE_DIR, filepath);
- var cleanSrc = (action == 'deleted') ? [relativePath] : [];
- var copySrc = (action == 'deleted') ? [] : [relativePath];
</del><ins>+ var relativePath = path.relative( SOURCE_DIR, filepath );
+ var cleanSrc = ( action == 'deleted' ) ? [relativePath] : [];
+ var copySrc = ( action == 'deleted' ) ? [] : [relativePath];
+
</ins><span class="cx"> grunt.config(['clean', 'dynamic', 'src'], cleanSrc);
</span><span class="cx"> grunt.config(['copy', 'dynamic', 'src'], copySrc);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkpackagejson"></a>
<div class="modfile"><h4>Modified: trunk/package.json (25187 => 25188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/package.json 2013-08-30 17:43:18 UTC (rev 25187)
+++ trunk/package.json 2013-08-30 22:16:43 UTC (rev 25188)
</span><span class="lines">@@ -15,6 +15,8 @@
</span><span class="cx"> "grunt-contrib-cssmin": "~0.6.1",
</span><span class="cx"> "grunt-contrib-qunit": "~0.2.2",
</span><span class="cx"> "grunt-contrib-uglify": "~0.2.2",
</span><del>- "grunt-contrib-watch": "~0.5.1"
</del><ins>+ "grunt-contrib-watch": "~0.5.1",
+ "grunt-contrib-compress": "~0.5.2",
+ "grunt-contrib-concat": "~0.3.0"
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>