Merge branch 'npm-update' of https://github.com/Dasc3er/openstamanager

Author: loviuz

gulpfile.js

@@ -81,20 +81,21 @@ config.babelOptions.compact = !config.debug;
 
 function waitPipes(pipes, done) {
     if (!pipes || pipes.length === 0) {
-        done();
+        if (done) done();
         return Promise.resolve();
     }
 
     return Promise.all(
         pipes.map(pipe => new Promise((resolve, reject) => {
             pipe.on('end', resolve);
             pipe.on('error', reject);
+            pipe.on('close', resolve); // Add close event handler
         }))
     ).then(() => {
-        done();
+        if (done) done();
     }).catch(err => {
         console.error('Error in pipe:', err);
-        done(err);
+        if (done) done(err);
     });
 }
 
@@ -274,7 +275,7 @@ function srcImages() {
         .pipe(gulp.dest(config.production + '/' + config.paths.images));
 }
 
-function leaflet(done) {
+function leaflet() {
     const leaflet = gulp.src([
         config.nodeDirectory + '/leaflet.fullscreen/icon-fullscreen.svg',
         config.development + '/' + config.paths.images + '/leaflet/*',
@@ -287,10 +288,10 @@ function leaflet(done) {
         .pipe(flatten())
         .pipe(gulp.dest(config.production + '/' + config.paths.images + '/leaflet'));
 
-    return waitPipes([images, leaflet], done);
+    return merge(images, leaflet);
 }
 
-function wacom(done) {
+function wacom() {
     // Librerie da node_modules secondo package.json
     const vendor = [
         'clipper-lib/clipper.js',
@@ -338,7 +339,7 @@ function wacom(done) {
         .pipe(gulpIf(!config.debug, minifyJS()))
         .pipe(gulp.dest(config.production + '/' + config.paths.js));
 
-    return waitPipes([jsStream, wasmStream], done);
+    return merge(jsStream, wasmStream);
 }
 
 // Elaborazione dei fonts
@@ -438,7 +439,7 @@ function csrf() {
         .pipe(gulp.dest(config.production + '/' + config.paths.js + '/csrf'));
 }
 
-function pdfjs(done) {
+function pdfjs() {
     const web = gulp.src([
         config.nodeDirectory + '/pdfjs-viewer-element/dist/pdfjs-*-dist/web/**/*',
         '!' + config.nodeDirectory + '/pdfjs-viewer-element/dist/pdfjs-*-dist/web/cmaps/*',
@@ -453,7 +454,7 @@ function pdfjs(done) {
     ], {encoding: false})
         .pipe(gulp.dest(config.production + '/pdfjs/build'));
 
-    return waitPipes([web, build], done);
+    return merge(web, build);
 }
 
 function uaparser() {
@@ -661,11 +662,14 @@ export default bower;
 
 // Watch task - lanciato con `gulp watch`, resta in attesa e ogni volta che viene modificato un asset in src
 // viene aggiornata la dist
-gulp.task('watch', function () {
+export function watch() {
     gulp.watch('assets/src/css/*.css', gulp.series(srcCSS, CSS));
     gulp.watch('assets/src/css/print/*.css', gulp.series(srcCSS, CSS));
     gulp.watch('assets/src/css/themes/*.css', gulp.series(srcCSS, CSS));
     gulp.watch('assets/src/js/base/*.js', gulp.series(srcJS, JS));
     gulp.watch('assets/src/js/functions/*.js', gulp.series(srcJS, JS));
     gulp.watch('assets/src/img/*', gulp.series(images));
-});
+}
+
+// Replace the old watch task definition
+gulp.task('watch', watch);

package.json

@@ -79,7 +79,7 @@
         "gulp-sass": "^6.0.0",
         "gulp-stylus": "^3.0.0",
         "gulp-uglify": "^3.0.2",
-        "inquirer": "^9.2.12",
+        "inquirer": "^12.3.0",
         "main-bower-files": "^2.13.1",
         "md5-file": "^5.0.0",
         "sass": "^1.62.1",