@nitro/gulp 11.0.0-beta.2 → 11.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitro/gulp",
-  "version": "11.0.0-beta.2",
+  "version": "11.0.0",
   "description": "Nitro gulp",
   "license": "MIT",
   "author": "The Nitro Team",
@@ -23,12 +23,12 @@
     "gulp"
   ],
   "peerDependencies": {
-    "@nitro/app": ">=11.0.0-beta.2",
+    "@nitro/app": ">=11.0.0",
     "gulp": ">=5.0.0"
   },
   "dependencies": {
     "compression": "1.8.1",
-    "config": "4.2.1",
+    "config": "4.4.0",
     "del": "8.0.1",
     "get-port": "7.1.0",
     "gulp": "5.0.1",

package/tasks/minify-images.js

@@ -26,10 +26,37 @@ async function loadImageminPlugins() {
 		const svgo = (await import('imagemin-svgo')).default;
 		plugins.push(svgo({
 			plugins: [
+				// deactivate preset
+				{ name: 'preset-default', active: false },
+
+				// optimize
+				{ name: 'cleanupAttrs', active: true },
+				{ name: 'cleanupNumericValues', active: true },
+				{ name: 'convertColors', active: true },
+				{ name: 'convertPathData', active: true },
+				{ name: 'convertShapeToPath', active: true },
+				{ name: 'convertStyleToAttrs', active: true },
+				{ name: 'convertTransform', active: true },
+				{ name: 'mergePaths', active: true },
+				{ name: 'minifyStyles', active: true },
+				{ name: 'removeDoctype', active: true },
+				{ name: 'removeEditorsNSData', active: true },
+				{ name: 'removeEmptyAttrs', active: true },
+				{ name: 'removeEmptyContainers', active: true },
+				{ name: 'removeEmptyText', active: true },
+				{ name: 'removeMetadata', active: true },
+				{ name: 'removeTitle', active: true },
+				{ name: 'removeDesc', active: true },
+				{ name: 'removeDimensions', active: true },
+				{ name: 'removeUselessStrokeAndFill', active: true },
+				{ name: 'removeXMLNS', active: true },
+
 				{ name: 'collapseGroups', active: false },
-				// { name: 'cleanupIDs', active: false },
 				{ name: 'removeUnknownsAndDefaults', active: false },
 				{ name: 'removeViewBox', active: false },
+
+				// for icons/sprites with <symbol>
+				{ name: 'removeUselessDefs', active: false },
 			],
 		}));
 	} catch { /* empty */ }
@@ -39,27 +66,40 @@ async function loadImageminPlugins() {
 
 module.exports = (gulp, plugins) => {
 
-	return async () => {
+	return (done) => {
 		const minifyImagesConfigs = config.has('gulp.minifyImages') ? config.get('gulp.minifyImages') : {};
-		const imageminPlugins = await loadImageminPlugins();
-		const imagemin = (await import('gulp-imagemin')).default;
-
-		const streams = [];
-
-		utils.each(minifyImagesConfigs, (minifyImagesConfig) => {
-			if (minifyImagesConfig && minifyImagesConfig.src && minifyImagesConfig.dest) {
-				streams.push(
-					gulp
-						.src(minifyImagesConfig.src, { encoding: false })
-						.pipe(plugins.newer(minifyImagesConfig.dest))
-						.pipe(
-							imagemin(imageminPlugins)
-						)
-						.pipe(gulp.dest(minifyImagesConfig.dest))
-				);
-			}
-		});
-
-		return streams.length ? ordered(streams) : Promise.resolve('resolved');
+
+		Promise.all([loadImageminPlugins(), import('gulp-imagemin')])
+			.then(([imageminPlugins, imageminModule]) => {
+				const imagemin = imageminModule.default;
+				const streams = [];
+
+				utils.each(minifyImagesConfigs, (minifyImagesConfig) => {
+					if (minifyImagesConfig && minifyImagesConfig.src && minifyImagesConfig.dest) {
+						const srcStream = gulp.src(minifyImagesConfig.src, { encoding: false, allowEmpty: true });
+
+						streams.push(
+							srcStream
+								.pipe(plugins.newer(minifyImagesConfig.dest))
+								.pipe(
+									imagemin(imageminPlugins)
+								)
+								.pipe(gulp.dest(minifyImagesConfig.dest))
+						);
+					}
+				});
+
+				if (!streams.length) {
+					done();
+					return;
+				}
+
+				const merged = ordered(streams);
+				merged.on('error', done);
+				merged.on('finish', done);
+				merged.on('end', done);
+				merged.resume();
+			})
+			.catch(done);
 	};
 };