<!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>[BuddyPress][12574] trunk: Update Grunt tasks & .gitignore to match BP Blocks needs</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 { white-space: pre-line; 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="http://buddypress.trac.wordpress.org/changeset/12574">12574</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12574","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-03-25 05:52:59 +0000 (Wed, 25 Mar 2020)</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'>Update Grunt tasks & .gitignore to match BP Blocks needs
- The `makepot` task is now using the WP CLI `wp i18n make-pot` command.
- Exclude JavaScript Files generated by Parcel/Babel from `jsvalidate`, `jshint` & `uglify` tasks.
- Add new tasks to build & minify BP Blocks files.
See <a href="http://buddypress.trac.wordpress.org/ticket/8048">#8048</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgitignore">trunk/.gitignore</a></li>
<li><a href="#trunkjshintignore">trunk/.jshintignore</a></li>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunkcomposerjson">trunk/composer.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgitignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.gitignore</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.gitignore 2020-03-25 05:41:47 UTC (rev 12573)
+++ trunk/.gitignore 2020-03-25 05:52:59 UTC (rev 12574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .DS_Store
</span><span class="cx" style="display: block; padding: 0 10px"> phpunit.xml
</span><span class="cx" style="display: block; padding: 0 10px"> .idea
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.cache
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> lib-cov
</span><span class="cx" style="display: block; padding: 0 10px"> *.seed
</span></span></pre></div>
<a id="trunkjshintignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.jshintignore</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.jshintignore 2020-03-25 05:41:47 UTC (rev 12573)
+++ trunk/.jshintignore 2020-03-25 05:52:59 UTC (rev 12574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 3rd party libraries
</span><span class="cx" style="display: block; padding: 0 10px"> src/bp-core/js/vendor/**/*
</span><span class="cx" style="display: block; padding: 0 10px"> src/bp-messages/js/autocomplete/*
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+// Blocks Scripts
+src/**/js/blocks/*.js
+src/**/js/block-components/*.js
+src/**/js/block-components/**/*.js
+src/bp-core/js/block-components.js
</ins></span></pre></div>
<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 2020-03-25 05:41:47 UTC (rev 12573)
+++ trunk/Gruntfile.js 2020-03-25 05:52:59 UTC (rev 12574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '**/*.js'
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ BP_EXCLUDED_JS = [
+ '!**/js/blocks/*.js',
+ '!**/js/block-components/*.js',
+ '!**/js/block-components/**/*.js',
+ '!**/js/block-components.js'
+ ],
+
</ins><span class="cx" style="display: block; padding: 0 10px"> BP_EXCLUDED_MISC = [
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,23 +171,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true
</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">- makepot: {
- target: {
- options: {
- cwd: BUILD_DIR,
- domainPath: '.',
- mainFile: 'bp-loader.php',
- potFilename: 'buddypress.pot',
- processPot: function( pot ) {
- pot.headers['report-msgid-bugs-to'] = 'https://buddypress.trac.wordpress.org';
- pot.headers['last-translator'] = 'JOHN JAMES JACOBY <jjj@buddypress.org>';
- pot.headers['language-team'] = 'ENGLISH <jjj@buddypress.org>';
- return pot;
- },
- type: 'wp-plugin'
- }
- }
- },
</del><span class="cx" style="display: block; padding: 0 10px"> imagemin: {
</span><span class="cx" style="display: block; padding: 0 10px"> core: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> dest: BUILD_DIR,
</span><span class="cx" style="display: block; padding: 0 10px"> dot: true,
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- src: ['**', '!**/.{svn,git}/**'].concat( BP_EXCLUDED_MISC )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src: ['**', '!**/.{svn,git,cache}/**', '!js/**'].concat( BP_EXCLUDED_MISC )
</ins><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"> dest: BUILD_DIR,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> extDot: 'last',
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="cx" style="display: block; padding: 0 10px"> ext: '.min.js',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- src: BP_JS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src: BP_JS.concat( BP_EXCLUDED_JS, BP_EXCLUDED_MISC )
</ins><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"> stylelint: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,6 +322,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> command: 'svn export --force https://github.com/buddypress/BP-REST.git/trunk bp-rest',
</span><span class="cx" style="display: block; padding: 0 10px"> cwd: BUILD_DIR,
</span><span class="cx" style="display: block; padding: 0 10px"> stdout: false
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+ makepot: {
+ command: 'wp i18n make-pot build build/buddypress.pot --headers=\'{"Project-Id-Version": "BuddyPress", "Report-Msgid-Bugs-To": "https://buddypress.trac.wordpress.org", "Last-Translator": "JOHN JAMES JACOBY <jjj@buddypress.org>", "Language-Team": "ENGLISH <jjj@buddypress.org>"}\'',
+ stdout: true
+ },
+ blocks_src: {
+ command: 'npm run dev',
+ cwd: SOURCE_DIR,
+ stdout: true
+ },
+ blocks_build: {
+ command: 'npm run build',
+ cwd: SOURCE_DIR,
+ stdout: true
</ins><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"> jsvalidate:{
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,12 +346,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> build: {
</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">- src: [BUILD_DIR + '/**/*.js']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src: [BUILD_DIR + '/**/*.js'].concat( BP_EXCLUDED_JS, BP_EXCLUDED_MISC )
</ins><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"> src: {
</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">- src: [SOURCE_DIR + '/**/*.js'].concat( BP_EXCLUDED_MISC )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src: [SOURCE_DIR + '/**/*.js'].concat( BP_EXCLUDED_JS, BP_EXCLUDED_MISC )
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,9 +371,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Register tasks.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'src', ['checkDependencies', 'jsvalidate:src', 'jshint', 'stylelint', 'sass', 'postcss', 'rtlcss'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'makepot', ['exec:makepot'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'commit', ['src', 'checktextdomain', 'imagemin', 'phplint', 'exec:phpcompat'] );
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'bp_rest', [ 'exec:rest_api', 'copy:bp_rest_components', 'copy:bp_rest_core', 'clean:bp_rest' ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.registerTask( 'build', ['commit', 'clean:all', 'copy:files', 'uglify', 'jsvalidate:build', 'cssmin', 'bp_rest', 'makepot', 'exec:bpdefault', 'exec:cli'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'build', ['commit', 'clean:all', 'copy:files', 'uglify:core', 'jsvalidate:build', 'exec:blocks_src', 'cssmin', 'bp_rest', 'makepot', 'exec:blocks_build', 'exec:bpdefault', 'exec:cli'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'release', ['build'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Testing tasks.
</span></span></pre></div>
<a id="trunkcomposerjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/composer.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/composer.json 2020-03-25 05:41:47 UTC (rev 12573)
+++ trunk/composer.json 2020-03-25 05:52:59 UTC (rev 12574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "php": ">=5.3.0"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "require-dev": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "phpcompatibility/phpcompatibility-wp": "*",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "phpcompatibility/phpcompatibility-wp": "*",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>