Jdrewniak has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/387194 )
Change subject: SVG Sprites - Removing old gulp tasks & npm deps
......................................................................
SVG Sprites - Removing old gulp tasks & npm deps
Removing unneeded gulp tasks related to the old image processing
workflow. Modifying gulp tasks to suit new SVG sprite workflow.
Removing NPM dependancies that are no longer needed with new SVG
sprite worflow as well. These dependancies include image processors
and optimizers that have been failing to build in CI & certain OS's.
Bug: T152351, T129634, T177343
Change-Id: I139f2e3e4fb071437e2671ee88169f6e40069608
---
M gulpfile.js
M package.json
2 files changed, 5 insertions(+), 68 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals
refs/changes/94/387194/1
diff --git a/gulpfile.js b/gulpfile.js
index bf92086..eca2ee6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -8,13 +8,9 @@
var gulp = require( 'gulp' ),
gulpLoadPlugins = require( 'gulp-load-plugins' ),
argv = require( 'yargs' ).argv,
- imagemin = require( 'gulp-imagemin' ),
- imageminPngquant = require( 'imagemin-pngquant' ),
- 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' ),
postCSSReporter = require( 'postcss-reporter' ),
@@ -153,15 +149,6 @@
};
config.optImage = {
- imageminConf: {
- plugins: [
- imagemin.svgo(),
- imageminPngquant( { quality: '57-95', speed: 1
} ),
- imagemin.optipng(),
- imageminZopfli()
- ],
- options: { verbose: true }
- },
src: [ baseDir + 'assets/img/*', '!' + baseDir +
'assets/img/sprite_assets' ],
dest: prodDir + 'assets/img'
};
@@ -269,21 +256,6 @@
} );
/**
- * Optimizes images in dev folder and moves them into prod folder
- */
-gulp.task( 'optimize-images', function () {
-
- var imgOpt;
- requirePortalParam();
-
- imgOpt = getConfig().optImage;
-
- return gulp.src( imgOpt.src )
- .pipe( imagemin( imgOpt.imageminConf.plugins,
imgOpt.imageminConf.options ) )
- .pipe( gulp.dest( imgOpt.dest ) );
-} );
-
-/**
* Watches for changes in dev folder and compiles:
* - handlebars templates
* - postCSS files
@@ -377,7 +349,7 @@
* Must be run when after all assets have been versioned, minified &
* copied into the production dir.
*/
-gulp.task( 'update-urls-to-purge', [ 'compile-handlebars', 'sprite',
'postcss', 'inline-assets', 'clean-prod-js', 'concat-minify-js', 'minify-html',
'optimize-images', 'copy-translation-files' ], function() {
+gulp.task( 'update-urls-to-purge', [ 'compile-handlebars', 'svgSprite',
'postcss', 'inline-assets', 'clean-prod-js', 'concat-minify-js', 'minify-html',
'copy-images', 'copy-translation-files' ], function() {
var UrlsToPurge = [
'https://www.wikibooks.org/',
@@ -422,37 +394,6 @@
.on( 'end', function() {
writePurgeFile( UrlsToPurge );
} );
-} );
-
-/**
- * Generates images sprites and accompanying CSS files using Sprity.
- * Outputs sprites into dev assets/img folder.
- * Outputs css into dev css/sprites.css file.
- *
- * Sprites are seperated into subfolders in img/sprite_assets.
- * The contents of each folder will output a single sprite, named after the
folder.
- * Sprity will generate @2x, @1.5x, and @1x versions of the sprite.
- *
- * You should only supply and place the @2x versions of the assets into the
sprite folders.
- */
-gulp.task( 'sprite', function () {
-
- requirePortalParam();
-
- return sprity.src( {
- src: getBaseDir() + 'assets/img/sprite_assets/**/*.{png,jpg}',
- cssPath: 'portal/wikipedia.org/assets/img/',
- style: getBaseDir() + 'assets/css/sprites.css',
- prefix: 'sprite',
- dimension: [ { ratio: 1, dpi: 72 },
- { ratio: 1.5, dpi: 144 },
- { ratio: 2, dpi: 192 }
- ],
- split: true,
- margin: 0,
- cachebuster: true
- } )
- .pipe( plugins[ 'if' ]( '*.png', gulp.dest( getBaseDir() +
'assets/img/' ), gulp.dest( getBaseDir() + 'assets/css/' ) ) );
} );
/**
@@ -520,9 +461,9 @@
.pipe( gulp.dest( getBaseDir() + 'assets/css/' ) );
} );
/**
- * Moves images to Prod folder.
+ * Copies images to Prod folder.
*/
-gulp.task( 'move-images', [ 'createSvgSprite' ], function () {
+gulp.task( 'copy-images', [ 'svgSprite' ], function () {
var imgOpt = getConfig().optImage;
requirePortalParam();
return gulp.src( imgOpt.src ).pipe( gulp.dest( imgOpt.dest ) );
@@ -537,13 +478,13 @@
gulp.task( 'default', [
'lint',
'compile-handlebars',
- 'sprite',
+ 'svgSprite',
'postcss',
'inline-assets',
'clean-prod-js',
'concat-minify-js',
'minify-html',
- 'optimize-images',
+ 'copy-images',
'copy-translation-files',
'update-urls-to-purge'
] );
diff --git a/package.json b/package.json
index d25d17f..f616ecf 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
"gulp-eslint": "^3.0.1",
"gulp-htmlmin": "^3.0.0",
"gulp-if": "^2.0.0",
- "gulp-imagemin": "^3.0.3",
"gulp-inline": "^0.1.0",
"gulp-load-plugins": "^1.0.0",
"gulp-postcss": "^6.0.1",
@@ -36,8 +35,6 @@
"gulp-uglify": "^1.4.2",
"gulp-useref": "^3.0.5",
"handlebars": "^4.0.4",
- "imagemin-pngquant": "^5.0.0",
- "imagemin-zopfli": "^5.0.0",
"jshint": "^2.9.2",
"moment": "^2.10.6",
"phantomjs-prebuilt": "^2.1.3",
@@ -45,7 +42,6 @@
"postcss-import": "^8.0.2",
"postcss-reporter": "^2.0.0",
"preq": "^0.4.12",
- "sprity": "git+https://github.com/nealfennimore/sprity";,
"stylelint": "7.8.0",
"stylelint-config-wikimedia": "0.4.1",
"sync-request": "^3.0.1",
--
To view, visit https://gerrit.wikimedia.org/r/387194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I139f2e3e4fb071437e2671ee88169f6e40069608
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/portals
Gerrit-Branch: master
Gerrit-Owner: Jdrewniak <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
