jenkins-bot has submitted this change and it was merged. Change subject: Adding Node 6 compatibility to dependancies ......................................................................
Adding Node 6 compatibility to dependancies Making the gulp tasks work with Node 6. - fixing `gulp sprite` by swapping out the official version of sprity for a forked one that works with node 6. See https://github.com/sprity/sprity/pull/71 - fixing `gulp fetch-meta` by replace `gulp-download` with a curl command. - upgrading all npm packages. This patch requires deleting your node_modules dir and doing a fresh npm install. Bug: T150190 Change-Id: Ia031b43aed5a293c0fa313149503e3ac60122cd3 --- M gulpfile.js M package.json 2 files changed, 16 insertions(+), 30 deletions(-) Approvals: MarcoAurelio: Looks good to me, approved jenkins-bot: Verified diff --git a/gulpfile.js b/gulpfile.js index c48a570..11ac713 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -11,6 +11,7 @@ imageminZopfli = require( 'imagemin-zopfli' ), siteStats = require( './data/site-stats' ), fs = require( 'fs' ), + exec = require( 'child_process' ).exec, sprity = require( 'sprity' ), postCSSNext = require( 'postcss-cssnext' ), postCSSImport = require( 'postcss-import' ), @@ -103,7 +104,7 @@ compatibility: 'ie7', keepSpecialComments: '0' }; - return plugins.minifyCss.call( this, options ); + return plugins.cleanCss.call( this, options ); }; config.inline = { @@ -341,21 +342,11 @@ var portalsFromMeta = [ 'wikibooks.org', 'wikimedia.org', 'wikinews.org', 'wikiquote.org', 'wikiversity.org', 'wikivoyage.org', 'wiktionary.org' ]; portalsFromMeta.forEach( function ( wiki ) { - plugins.downloader( { - fileName: 'index.html', - request: { - url: 'https://meta.wikimedia.org/w/index.php?title=Www.' + wiki + '_template&action=raw' - } - } ).pipe( gulp.dest( 'prod/' + wiki + '/' ) ); + exec( ' curl -Lo prod/' + wiki + '/index.html "https://meta.wikimedia.org/w/index.php?title=Www.' + wiki + '_template&action=raw" ' ); } ); } else { - plugins.downloader( { - fileName: 'index.html', - request: { - url: 'https://meta.wikimedia.org/w/index.php?title=Www.' + portalParam + '_template&action=raw' - } - } ).pipe( gulp.dest( getProdDir() ) ); + exec( ' curl -Lo ' + getProdDir() + 'index.html "https://meta.wikimedia.org/w/index.php?title=Www.' + portalParam + '_template&action=raw" ' ); } } ); diff --git a/package.json b/package.json index 7bcfad7..f0799d3 100644 --- a/package.json +++ b/package.json @@ -11,44 +11,39 @@ "devDependencies": { "bluebird": "^3.0.5", "casperjs": "git+https://github.com/n1k0/casperjs.git";, - "cssnext": "^1.8.4", - "deepmerge": "^0.2.10", + "deepmerge": "^1.2.0", "del": "^2.2.0", - "gulp": "^3.9.0", - "gulp-compile-handlebars": "^0.5.0", - "gulp-downloader": "^1.0.4", - "gulp-htmlmin": "^1.2.0", + "gulp": "^3.9.1", + "gulp-clean-css": "^2.0.13", + "gulp-compile-handlebars": "^0.6.1", + "gulp-htmlmin": "^3.0.0", "gulp-if": "^2.0.0", "gulp-imagemin": "^3.0.3", "gulp-inline": "^0.1.0", - "gulp-jscs": "^3.0.2", + "gulp-jscs": "^4.0.0", "gulp-jshint": "^2.0.0", "gulp-load-plugins": "^1.0.0", - "gulp-minify-css": "^1.2.1", "gulp-postcss": "^6.0.1", "gulp-rename": "^1.2.2", - "gulp-rev": "^6.0.1", + "gulp-rev": "^7.1.2", "gulp-rev-replace": "^0.4.3", "gulp-stylelint": "^3.5.0", - "gulp-uglify": "^1.4.2", + "gulp-uglify": "^2.0.0", "gulp-useref": "^3.0.5", "handlebars": "^4.0.4", "imagemin-pngquant": "^5.0.0", "imagemin-zopfli": "^5.0.0", "jshint": "^2.9.2", - "lwip": "0.0.9", "moment": "^2.10.6", + "phantomjs-prebuilt": "^2.1.3", "postcss-cssnext": "^2.4.0", "postcss-import": "^8.0.2", "postcss-reporter": "^2.0.0", - "preq": "^0.4.6", - "sprity": "^1.0.8", + "preq": "^0.4.12", + "sprity": "git+https://github.com/nealfennimore/sprity";, "stylelint-config-wikimedia": "^0.3.0", "sync-request": "^3.0.1", "underscore": "^1.8.3", - "yargs": "^3.29.0" - }, - "dependencies": { - "phantomjs-prebuilt": "^2.1.3" + "yargs": "^6.3.0" } } -- To view, visit https://gerrit.wikimedia.org/r/314592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia031b43aed5a293c0fa313149503e3ac60122cd3 Gerrit-PatchSet: 8 Gerrit-Project: wikimedia/portals Gerrit-Branch: master Gerrit-Owner: Jdrewniak <jdrewn...@wikimedia.org> Gerrit-Reviewer: GWicke <gwi...@wikimedia.org> Gerrit-Reviewer: JGirault <julien.inbox.w...@gmail.com> Gerrit-Reviewer: Jdrewniak <jdrewn...@wikimedia.org> Gerrit-Reviewer: MarcoAurelio <strig...@gmail.com> Gerrit-Reviewer: Mxn <m...@1ec5.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
