jenkins-bot has submitted this change and it was merged.
Change subject: build: Compress PNGs with Zopfli etc. after they are built
......................................................................
build: Compress PNGs with Zopfli etc. after they are built
Bug: T127627
Change-Id: If645871187a069a87caff699880d0294e3c5ff81
---
M Gruntfile.js
M package.json
2 files changed, 23 insertions(+), 7 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 120aaf9..5490b85 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -22,7 +22,6 @@
rtlFiles = {},
minBanner = '/*! OOjs UI v<%= pkg.version %> |
http://oojs.mit-license.org */';
- grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-contrib-clean' );
grunt.loadNpmTasks( 'grunt-contrib-concat' );
@@ -34,13 +33,15 @@
grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-csscomb' );
+ grunt.loadNpmTasks( 'grunt-cssjanus' );
grunt.loadNpmTasks( 'grunt-exec' );
grunt.loadNpmTasks( 'grunt-file-exists' );
- grunt.loadNpmTasks( 'grunt-cssjanus' );
+ grunt.loadNpmTasks( 'grunt-image' );
grunt.loadNpmTasks( 'grunt-jscs' );
- grunt.loadNpmTasks( 'grunt-tyops' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-karma' );
grunt.loadNpmTasks( 'grunt-svg2png' );
+ grunt.loadNpmTasks( 'grunt-tyops' );
grunt.loadTasks( 'build/tasks' );
( function () {
@@ -311,6 +312,19 @@
src: []
}
},
+ image: {
+ dist: {
+ options: {
+ zopflipng: true,
+ pngout: true,
+ optipng: true,
+ advpng: true,
+ pngcrush: true
+ },
+ expand: true,
+ src: 'dist/**/*.png'
+ }
+ },
cssmin: {
options: {
keepSpecialComments: 0,
@@ -496,8 +510,9 @@
'note-quick-build'
] );
- // Completely useless stuff that we pretend to support
- grunt.registerTask( 'minify', [ 'uglify', 'cssmin' ] );
+ // Minification tasks for the npm publish step
+ grunt.registerTask( 'minify', [ 'uglify', 'image', 'cssmin' ] );
+ grunt.registerTask( 'publish-build', [ 'build', 'minify' ] );
grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'jsonlint',
'banana' ] );
grunt.registerTask( 'test', [ 'lint', 'git-build', 'build-tests',
'karma:main', 'karma:other' ] );
diff --git a/package.json b/package.json
index 2a9985b..04de2f2 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"predoc": "grunt build",
"doc": "jsduck",
"postdoc": "grunt copy:jsduck",
- "prepublish": "grunt build",
+ "prepublish": "grunt publish-build",
"demos": "grunt demos"
},
"dependencies": {
@@ -26,7 +26,6 @@
"oojs": "1.1.10"
},
"devDependencies": {
- "grunt": "0.4.5",
"grunt-banana-checker": "0.4.0",
"grunt-cli": "0.1.13",
"grunt-contrib-clean": "0.7.0",
@@ -42,12 +41,14 @@
"grunt-cssjanus": "0.2.4",
"grunt-exec": "0.4.6",
"grunt-file-exists": "0.1.3",
+ "grunt-image": "1.2.2",
"grunt-jscs": "2.6.0",
"grunt-jsonlint": "1.0.7",
"grunt-karma": "0.12.1",
"grunt-promise-q": "0.1.1",
"grunt-svg2png":
"git://github.com/jdforrester/grunt-svg2png.git#b7da0f41921cc7f734f5462b77299e6262d6dc03",
"grunt-tyops": "0.1.0",
+ "grunt": "0.4.5",
"karma-chrome-launcher": "0.2.2",
"karma-coverage": "0.5.3",
"karma-firefox-launcher": "0.1.7",
--
To view, visit https://gerrit.wikimedia.org/r/272928
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If645871187a069a87caff699880d0294e3c5ff81
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
