From bb162c96bd1948826022192aa2a856b408ee0e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Birkemeyer?= Date: Fri, 28 Jul 2023 10:00:42 +0000 Subject: [PATCH] Replace gulp-clean-css with gulp-csso --- config/postcss-plugins-default.js | 20 ++++++++++---------- package.json | 1 + tasks/styles.js | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/config/postcss-plugins-default.js b/config/postcss-plugins-default.js index c2ccedb..f6782b5 100644 --- a/config/postcss-plugins-default.js +++ b/config/postcss-plugins-default.js @@ -19,15 +19,6 @@ function postCssPlugins(config, stylesheet) { let purgeCss = purgeCssConfig && !purgeCssDisabled; return [ - $.autoprefixer(), - $.postcssurl({ - url: function (asset) { - if (!asset.url || asset.url.indexOf("base64") !== -1) { - return asset.url; - } - return $.path.relative(`${config.webdir}/${stylesheet.destDir}/`, asset.absolutePath).split("\\").join("/"); - } - }), // conditionally run PurgeCSS if any config (local or global) was found purgeCss ? $.purgecss({ content: purgeCssConfig.content, @@ -38,7 +29,16 @@ function postCssPlugins(config, stylesheet) { } ], safelist: purgeCssConfig.safelist - }) : false + }) : false, + $.postcssurl({ + url: function (asset) { + if (!asset.url || asset.url.indexOf("base64") !== -1) { + return asset.url; + } + return $.path.relative(`${config.webdir}/${stylesheet.destDir}/`, asset.absolutePath).split("\\").join("/"); + } + }), + $.autoprefixer(), ].filter(Boolean); // Strip falsy values (this enables conditional plugins like PurgeCSS) } diff --git a/package.json b/package.json index a629ffc..91a2118 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "gulp-babel": "^8.0.0", "gulp-clean-css": "github:webfactory/gulp-clean-css", "gulp-concat": "^2.3.3", + "gulp-csso": "^4.0.1", "gulp-load-plugins": "^2.0.1", "gulp-postcss": "^9.0.0", "gulp-sass": "^5.0.0", diff --git a/tasks/styles.js b/tasks/styles.js index 3a8cc09..7a70c36 100644 --- a/tasks/styles.js +++ b/tasks/styles.js @@ -18,7 +18,7 @@ function styles(gulp, $, config) { }).on('error', $.sass.logError)) .pipe($.postcss(config.styles.postCssPlugins(config, stylesheet))) .pipe($.concat(stylesheet.name)) - .pipe($.cleanCss({ compatibility: 'ie11' })) + .pipe($.csso({ sourceMap: true })) .pipe(config.development ? $.sourcemaps.write('.') : $.through2.obj()) .pipe(gulp.dest(`${config.webdir}/${stylesheet.destDir}`)) .pipe($.browserSync.reload({ stream: true }));