<!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>[8708] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins: Plugin Directory: Fix `grunt build` for the JS client.</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://meta.trac.wordpress.org/changeset/8708">8708</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/8708","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-05-01 07:07:48 +0000 (Wed, 01 May 2019)</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'>Plugin Directory: Fix `grunt build` for the JS client.
Props ck3lee.
Fixes <a href="http://meta.trac.wordpress.org/ticket/4173">#4173</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsGruntfilejs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/Gruntfile.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsREADMEmd">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/README.md</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsclientmodulesapijs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/modules/api.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginspackagejson">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/package.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/Gruntfile.js 2019-04-30 19:37:45 UTC (rev 8707)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/Gruntfile.js 2019-05-01 07:07:48 UTC (rev 8708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,10 +115,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> options: { signature: false }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- shell: {
- build: {
- command: './node_modules/wpapi/lib/data/update-default-routes-json.js --endpoint=https://wordpress.org/plugins/wp-json --output=./client'
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ curl: {
+ './client/modules/default-routes.json': 'https://wordpress.org/plugins/wp-json'
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> rtlcss: {
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,13 +180,20 @@
</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"> watch: {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ css: {
+ files: ['**/*.scss', '../wporg/css/**/*scss', 'client/components/**/**.scss'],
+ tasks: ['css']
+ },
+ scripts: {
+ files: ['**/*.jsx'],
+ tasks: ['webpack:build-dev'],
+ options: {
+ atBegin: true,
+ }
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> eslint: {
</span><span class="cx" style="display: block; padding: 0 10px"> files: ['<%= eslint.files %>'],
</span><span class="cx" style="display: block; padding: 0 10px"> tasks: ['eslint']
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- },
- css: {
- files: ['**/*.scss', '../wporg/css/**/*scss', 'client/components/**/**.scss'],
- tasks: ['css']
</del><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">@@ -200,9 +205,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.loadNpmTasks('grunt-webpack');
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.loadNpmTasks('grunt-eslint');
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.loadNpmTasks('grunt-contrib-watch');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.loadNpmTasks('grunt-shell');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.loadNpmTasks('grunt-curl');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask('default', ['eslint', 'sass_globbing', 'sass', 'rtlcss:dynamic']);
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask('css', ['sass_globbing', 'sass', 'postcss', 'rtlcss:dynamic']);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.registerTask('build', ['webpack:build', 'css', 'shell:build']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask('build', ['webpack:build', 'css', 'curl']);
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsREADMEmd"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/README.md</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/README.md 2019-04-30 19:37:45 UTC (rev 8707)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/README.md 2019-05-01 07:07:48 UTC (rev 8708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,8 +4,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"> npm install
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-grunt webpack:watch # Build JS client.
-grunt watch # Run linters, build Sass, etc.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+grunt watch # Run linters, build Sass, JS client, etc.
</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"> #### Committing
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsclientmodulesapijs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/modules/api.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/modules/api.js 2019-04-30 19:37:45 UTC (rev 8707)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/modules/api.js 2019-05-01 07:07:48 UTC (rev 8708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> import WPAPI from 'wpapi';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-import routes from 'default-routes.json';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+import routes from './default-routes.json';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @type {Object} pluginDirectory Config variable */
</span><span class="cx" style="display: block; padding: 0 10px"> const pluginDirectory = window.pluginDirectory || {};
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginspackagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/package.json 2019-04-30 19:37:45 UTC (rev 8707)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/package.json 2019-05-01 07:07:48 UTC (rev 8708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,12 +29,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt": "^1.0.3",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-jshint": "^1.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-watch": "^1.1.0",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "grunt-curl": "^2.5.1",
</ins><span class="cx" style="display: block; padding: 0 10px"> "grunt-eslint": "^19.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-postcss": "~0.7.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-rtlcss": "^2.0.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-sass": "~3.0.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-sass-globbing": "^1.5.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "grunt-shell": "^2.1.0",
</del><span class="cx" style="display: block; padding: 0 10px"> "grunt-webpack": "^1.0.11",
</span><span class="cx" style="display: block; padding: 0 10px"> "history": "^2.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "jquery": "^3.1.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,6 +58,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "dependencies": {
</span><span class="cx" style="display: block; padding: 0 10px"> "i18n-calypso": "^1.7.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "json-loader": "^0.5.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "wpapi": "^1.0.0"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "wpapi": "^1.2.1"
</ins><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>