@nitro/gulp 6.0.10 → 6.1.1

package/lib/utils.js

@@ -23,6 +23,17 @@ function getProjectPath() {
 	return config.get('nitro.basePath');
 }
 
+// load optional package
+function getOptionalPackage(x) {
+	let mod;
+	try {
+		mod = require(x);
+	} catch (error) {
+		mod = null;
+	}
+	return mod;
+}
+
 function each(cfgs, fn) {
 	if (cfgs.length) {
 		cfgs.forEach((cfg) => {
@@ -37,5 +48,6 @@ module.exports = {
 	getBrowserSyncInstance,
 	getTask,
 	getProjectPath,
+	getOptionalPackage,
 	each,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitro/gulp",
-  "version": "6.0.10",
+  "version": "6.1.1",
   "description": "Nitro gulp",
   "license": "MIT",
   "author": "The Nitro Team",
@@ -23,7 +23,7 @@
     "gulp"
   ],
   "peerDependencies": {
-    "@nitro/app": ">=6.0.10",
+    "@nitro/app": ">=6.1.1",
     "gulp": ">=4.0.2"
   },
   "dependencies": {
@@ -34,7 +34,7 @@
     "get-port": "5.1.1",
     "globby": "11.0.4",
     "gulp": "4.0.2",
-    "gulp-htmllint": "0.0.19",
+    "gulp-html-validate": "0.2.0",
     "gulp-imagemin": "7.1.0",
     "gulp-live-server": "0.0.31",
     "gulp-load-plugins": "2.0.7",
@@ -44,8 +44,9 @@
     "gulp-rename": "2.0.0",
     "gulp-svgmin": "4.1.0",
     "gulp-svgstore": "9.0.0",
+    "html-validate": "6.9.0",
     "merge-stream": "2.0.0",
-    "yargs": "17.4.0"
+    "yargs": "17.4.1"
   },
   "optionalDependencies": {
     "imagemin-pngquant": "9.0.2"
@@ -54,7 +55,7 @@
     "@namics/eslint-config": "9.1.1",
     "@nitro/app": "*",
     "eslint": "7.32.0",
-    "eslint-plugin-import": "2.25.4"
+    "eslint-plugin-import": "2.26.0"
   },
   "publishConfig": {
     "access": "public"

package/tasks/lint-html.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const lint = require('@nitro/app/app/lib/lint');
 const config = require('config');
 const srcPattern = `${config.get('nitro.tmpDirectory')}/views/*.html`;
 
@@ -8,7 +7,9 @@ module.exports = (gulp, plugins) => {
 	return () => {
 		return gulp
 			.src(srcPattern)
-			.pipe(plugins.htmllint({}, lint.htmllintReporter))
+			.pipe(plugins.htmlValidate())
+			.pipe(plugins.htmlValidate.format())
+			.pipe(plugins.htmlValidate.failAfterError())
 			.on('end', () => {});
 	};
 };

package/tasks/minify-images.js

@@ -1,15 +1,54 @@
 'use strict';
 
 const config = require('config');
-const pngquant = require('imagemin-pngquant');
 const merge = require('merge-stream');
 const utils = require('../lib/utils');
 
 module.exports = (gulp, plugins) => {
+	/* eslint-disable complexity */
 	return () => {
 		const minifyImagesConfigs = config.has('gulp.minifyImages') ? config.get('gulp.minifyImages') : {};
 		const streams = [];
 
+		const imageminMozjpeg = utils.getOptionalPackage('imagemin-mozjpeg');
+		const imageminOptipng = utils.getOptionalPackage('imagemin-optipng');
+		const imageminPngquant = utils.getOptionalPackage('imagemin-pngquant');
+		const imageminSvgo = utils.getOptionalPackage('imagemin-svgo');
+		const imageminPluginsConfig = [];
+
+		// console.log('imagemin-mozjpeg: ', imageminMozjpeg ? 'installed' : 'NOT');
+		// console.log('imagemin-optipng: ', imageminOptipng ? 'installed' : 'NOT');
+		// console.log('imagemin-pngquant: ', imageminPngquant ? 'installed' : 'NOT');
+		// console.log('imagemin-svgo: ', imageminSvgo ? 'installed' : 'NOT');
+
+		if (imageminMozjpeg) {
+			imageminPluginsConfig.push(
+				plugins.imagemin.mozjpeg({ quality: 75, progressive: true })
+			);
+		}
+		if (imageminOptipng) {
+			imageminPluginsConfig.push(
+				plugins.imagemin.optipng({ optimizationLevel: 7 })
+			);
+		}
+		if (imageminSvgo) {
+			imageminPluginsConfig.push(
+				plugins.imagemin.svgo({
+					plugins: [
+						{ collapseGroups: false },
+						{ cleanupIDs: false },
+						{ removeUnknownsAndDefaults: false },
+						{ removeViewBox: false },
+					],
+				})
+			);
+		}
+		if (imageminPngquant) {
+			imageminPluginsConfig.push(
+				imageminPngquant()
+			);
+		}
+
 		utils.each(minifyImagesConfigs, (minifyImagesConfig) => {
 			if (minifyImagesConfig && minifyImagesConfig.src && minifyImagesConfig.dest) {
 				streams.push(
@@ -17,19 +56,7 @@ module.exports = (gulp, plugins) => {
 						.src(minifyImagesConfig.src)
 						.pipe(plugins.newer(minifyImagesConfig.dest))
 						.pipe(
-							plugins.imagemin([
-								plugins.imagemin.mozjpeg({ quality: 75, progressive: true }),
-								plugins.imagemin.optipng({ optimizationLevel: 7 }),
-								plugins.imagemin.svgo({
-									plugins: [
-										{ collapseGroups: false },
-										{ cleanupIDs: false },
-										{ removeUnknownsAndDefaults: false },
-										{ removeViewBox: false },
-									],
-								}),
-								pngquant(),
-							])
+							plugins.imagemin(imageminPluginsConfig)
 						)
 						.pipe(gulp.dest(minifyImagesConfig.dest))
 				);
@@ -38,4 +65,5 @@ module.exports = (gulp, plugins) => {
 
 		return streams.length ? merge(...streams) : Promise.resolve('resolved');
 	};
+	/* eslint-enable complexity */
 };