@nitro/gulp 10.0.4 → 11.0.0-beta.1

package/lib/utils.js

@@ -3,15 +3,6 @@
 const config = require('config');
 const gulp = require('gulp');
 const plugins = require('gulp-load-plugins')();
-let browserSync;
-
-function getBrowserSyncInstance() {
-	const name = `Nitro${config.get('server.port')}`;
-	if (!browserSync) {
-		browserSync = require('browser-sync').create(name);
-	}
-	return browserSync;
-}
 
 function getTask(task) {
 	const gulpFunction = require(`../tasks/${task}`)(gulp, plugins);
@@ -23,17 +14,6 @@ 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 (Array.isArray(cfgs)) {
 		cfgs.forEach((cfg) => {
@@ -45,9 +25,7 @@ function each(cfgs, fn) {
 }
 
 module.exports = {
-	getBrowserSyncInstance,
 	getTask,
 	getProjectPath,
-	getOptionalPackage,
 	each,
 };

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@nitro/gulp",
-  "version": "10.0.4",
+  "version": "11.0.0-beta.1",
   "description": "Nitro gulp",
   "license": "MIT",
   "author": "The Nitro Team",
   "engines": {
-    "node": ">=20.18.1 <21",
-    "npm": ">=10.8.2 <11"
+    "node": ">=22.11.0 <25",
+    "npm": ">=10.9.0 <12"
   },
   "scripts": {
     "lint": "eslint .",
@@ -23,19 +23,17 @@
     "gulp"
   ],
   "peerDependencies": {
-    "@nitro/app": ">=10.0.4",
+    "@nitro/app": ">=11.0.0-beta.1",
     "gulp": ">=5.0.0"
   },
   "dependencies": {
-    "browser-sync": "3.0.4",
     "compression": "1.8.1",
-    "config": "4.2.0",
-    "del": "6.1.1",
-    "get-port": "5.1.1",
-    "globby": "11.1.0",
+    "config": "4.2.1",
+    "del": "8.0.1",
+    "get-port": "7.1.0",
     "gulp": "5.0.1",
     "gulp-html-validate": "0.2.0",
-    "gulp-imagemin": "7.1.0",
+    "gulp-imagemin": "9.2.0",
     "gulp-live-server": "0.0.31",
     "gulp-load-plugins": "2.0.8",
     "gulp-newer": "1.4.0",
@@ -49,7 +47,7 @@
     "yargs": "18.0.0"
   },
   "optionalDependencies": {
-    "imagemin-pngquant": "9.0.2"
+    "imagemin-pngquant": "10.0.0"
   },
   "devDependencies": {
     "@merkle-open/eslint-config": "4.0.1",

package/tasks/dump-views.js

@@ -16,11 +16,12 @@
  */
 
 const yargs = require('yargs');
+// eslint-disable-next-line import/no-unresolved -- yargs exposes helpers via package "exports" map.
 const { hideBin } = require('yargs/helpers');
 const config = require('config');
 const view = require('@nitro/app/app/lib/view');
-const del = require('del');
-const getPort = require('get-port');
+const del = (...args) => import('del').then(mod => mod.deleteAsync(...args));
+const getPort = () => import('get-port').then(mod => mod.default());
 
 const argv = yargs(hideBin(process.argv)).argv;
 const serverPath = require('@nitro/app/app/lib/utils').getServerPath();

package/tasks/minify-images.js

@@ -4,50 +4,47 @@ const config = require('config');
 const ordered = require('ordered-read-streams');
 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 = [];
+async function loadImageminPlugins() {
+	const plugins = [];
+
+	try {
+		const mozjpeg = (await import('imagemin-mozjpeg')).default;
+		plugins.push(mozjpeg({ quality: 75, progressive: true }));
+	} catch { /* empty */ }
+
+	try {
+		const optipng = (await import('imagemin-optipng')).default;
+		plugins.push(optipng({ optimizationLevel: 7 }));
+	} catch { /* empty */ }
+
+	try {
+		const pngquant = (await import('imagemin-pngquant')).default;
+		plugins.push(pngquant());
+	} catch { /* empty */ }
 
-		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 = [];
+	try {
+		const svgo = (await import('imagemin-svgo')).default;
+		plugins.push(svgo({
+			plugins: [
+				{ name: 'collapseGroups', active: false },
+				// { name: 'cleanupIDs', active: false },
+				{ name: 'removeUnknownsAndDefaults', active: false },
+				{ name: 'removeViewBox', active: false },
+			],
+		}));
+	} catch { /* empty */ }
 
-		// 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');
+	return plugins;
+}
 
-		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()
-			);
-		}
+module.exports = (gulp, plugins) => {
+
+	return async () => {
+		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) {
@@ -56,7 +53,7 @@ module.exports = (gulp, plugins) => {
 						.src(minifyImagesConfig.src, { encoding: false })
 						.pipe(plugins.newer(minifyImagesConfig.dest))
 						.pipe(
-							plugins.imagemin(imageminPluginsConfig)
+							imagemin(imageminPlugins)
 						)
 						.pipe(gulp.dest(minifyImagesConfig.dest))
 				);
@@ -65,5 +62,4 @@ module.exports = (gulp, plugins) => {
 
 		return streams.length ? ordered(streams) : Promise.resolve('resolved');
 	};
-	/* eslint-enable complexity */
 };

package/tasks/watch-assets.js

@@ -9,11 +9,6 @@ module.exports = (gulp) => {
 	const projectPath = utils.getProjectPath();
 
 	return () => {
-		const browserSync = utils.getBrowserSyncInstance();
-		const reloadBrowser = (done) => {
-			browserSync.reload('*.html');
-			done();
-		};
 		const options = {
 			delay,
 			cwd: projectPath,
@@ -37,21 +32,6 @@ module.exports = (gulp) => {
 					.filter(Boolean)
 			: [];
 
-		if (config.get('nitro.mode.livereload')) {
-			gulp.watch(
-				[
-					`src/views/**/*.${config.get('nitro.viewFileExtension')}`,
-					`${config.get('nitro.viewDataDirectory')}/**/*.json`,
-					`src/patterns/**/*.${config.get('nitro.viewFileExtension')}`,
-					'!src/patterns/**/template/**/*.hbs',
-					'src/patterns/**/schema.json',
-					'src/patterns/**/_data/*.json',
-				],
-				options,
-				reloadBrowser
-			);
-		}
-
 		if (copyAssetsSrc.length) {
 			gulp.watch(copyAssetsSrc, options, gulp.series('copy-assets'));
 		}

package/tasks/watch-serve.js

@@ -1,39 +0,0 @@
-'use strict';
-
-const config = require('config');
-const utils = require('../lib/utils');
-const compression = require('compression');
-
-module.exports = () => {
-	return () => {
-		const browserSync = utils.getBrowserSyncInstance();
-		// fallback port for older config
-		const port = config.has('server.proxy.port') ? config.get('server.proxy.port') : config.get('server.proxy');
-		const browserSyncConfig = {
-			watch: false,
-			proxy: {
-				target: `127.0.0.1:${config.get('server.port')}`,
-				middleware: [compression()],
-			},
-			port: Number(port),
-			online: !config.get('nitro.mode.offline'),
-			ghostMode: false,
-		};
-
-		if (config.has('server.proxy.https')) {
-			browserSyncConfig.https = config.get('server.proxy.https');
-		}
-		if (config.has('server.proxy.host')) {
-			browserSyncConfig.host = config.get('server.proxy.host');
-		}
-		if (config.has('server.proxy.open')) {
-			browserSyncConfig.open = config.get('server.proxy.open');
-		}
-
-		browserSync.init(browserSyncConfig, (e) => {
-			if (!e) {
-				browserSync.notify('Compiling your assets, please wait!');
-			}
-		});
-	};
-};