balm-core 5.1.0 → 5.2.0

package/index.d.ts

@@ -189,6 +189,8 @@ export interface BalmFtpConfig {
   username?: string;
   password?: string;
   remotePath?: string;
+  dirMode?: string;
+  fileMode?: string;
 }
 
 export interface BalmConfig {

package/lib/plugins/htmlmin.js

@@ -1,6 +1,6 @@
 // Reference `gulp-htmlmin@5.0.1`
 
-import { minify } from 'html-minifier';
+import { minify } from 'html-minifier-terser';
 const PLUGIN_NAME = 'htmlmin';
 function gulpHtmlmin(options) {
   options = BalmJS.utils.deepMerge({}, options);
@@ -9,9 +9,10 @@ function gulpHtmlmin(options) {
       callback(null, file);
       return;
     }
-    function htmlMinify(buf, enc, cb) {
+    async function htmlMinify(buf, enc, cb) {
       try {
-        const contents = Buffer.from(minify(buf.toString(), options));
+        const minified = await minify(buf.toString(), options);
+        const contents = Buffer.from(minified);
         if (cb === callback) {
           file.contents = contents;
           cb(null, file);

package/lib/plugins/sftp.js

@@ -65,7 +65,7 @@ function getKey(options) {
 function gulpSftp(options) {
   options = Object.assign({}, options); // Credit sindresorhus
 
-  if (options.host === undefined) {
+  if (!options.host) {
     throw new PluginError(PLUGIN_NAME, '`host` required');
   }
   let fileCount = 0;
@@ -167,7 +167,8 @@ function gulpSftp(options) {
       });
     });
     conn.on('error', err => {
-      this.emit('error', new PluginError(PLUGIN_NAME, err));
+      const errorMsg = err && (err.message || err.toString()) || 'SFTP connection error';
+      this.emit('error', new PluginError(PLUGIN_NAME, errorMsg));
     });
     conn.on('end', () => {
       BalmJS.logger.debug(PLUGIN_NAME, 'Client :: end');
@@ -216,7 +217,6 @@ function gulpSftp(options) {
       cb => cb(null, fileDirs && fileDirs.length), cb => {
         let d = fileDirs.pop();
         mkDirCache[d] = true;
-        // Mdrake - TODO: use a default file permission instead of defaulting to 755
         if (remotePlatform && remotePlatform.toLowerCase().indexOf('win') !== -1) {
           d = d.replace('/', '\\');
         }
@@ -224,8 +224,9 @@ function gulpSftp(options) {
           if (exist) {
             cb();
           } else {
+            const dirMode = options.dirMode || '0755';
             sftp.mkdir(d, {
-              mode: '0755'
+              mode: dirMode
             }, err => {
               // REMOTE PATH
               if (err) {
@@ -239,10 +240,11 @@ function gulpSftp(options) {
           }
         });
       }, () => {
+        const fileMode = options.fileMode || '0666';
         const stream = sftp.createWriteStream(finalRemotePath, {
           flags: 'w',
           encoding: null,
-          mode: '0666',
+          mode: fileMode,
           autoClose: true
         });
 

package/lib/tasks/foundation/balm.js

@@ -49,8 +49,8 @@ class BalmTask {
       default:
     }
     const useAbsPath = !['webpack', 'rollup', 'esbuild', 'sprite'].includes(key);
-    this.input = useAbsPath ? BalmJS.file.absPaths(input || this.defaultInput) : input || this.defaultInput;
-    this.output = useAbsPath ? BalmJS.file.absPath(output || this.defaultOutput) : output || this.defaultOutput;
+    this.input = useAbsPath && (input || this.defaultInput) ? BalmJS.file.absPaths(input || this.defaultInput) : input || this.defaultInput;
+    this.output = useAbsPath && typeof (output || this.defaultOutput) === 'string' ? BalmJS.file.absPath(output || this.defaultOutput) : output || this.defaultOutput;
     this.customOptions = options[key] || {};
     const obj = {
       input: this.input,

package/lib/tasks/private/cache.js

@@ -8,7 +8,12 @@ class CacheTask extends BalmJS.BalmTask {
     super('cache');
     _defineProperty(this, "fn", () => {
       this.init();
-      return this.src.pipe(revAll.revision(BalmJS.config.assets.options)).pipe($.if(/\.html$/, BalmJS.file.setPublicPath())).pipe(gulp.dest(this.output)).pipe($.revDeleteOriginal()).pipe(revAll.manifestFile()).pipe(gulp.dest(this.output));
+      this.gulpSrcOptions = {
+        base: this.output
+      };
+      return this.src.pipe(revAll.revision(BalmJS.config.assets.options)).pipe($.if(/\.html$/, BalmJS.file.setPublicPath())).pipe(gulp.dest(this.output)).pipe($.revDeleteOriginal({
+        exclude: /\.html$/
+      })).pipe(revAll.manifestFile()).pipe(gulp.dest(this.output));
     });
     const defaultIncludes = BalmJS.config.scripts.useCache ? ASSETS_TYPES.filter(assetType => assetType !== 'js').map(assetType => BalmJS.file.matchAllFiles(BalmJS.config.dest[assetType])) : ASSETS_TYPES.map(assetType => BalmJS.file.matchAllFiles(BalmJS.config.dest[assetType]));
     const defaultExcludes = [node.path.join(`!${BalmJS.config.dest.js}`, CHUNK.dir, '*'), node.path.join(`!${BalmJS.config.dest.js}`, ASSET.dir, '*'), node.path.join(`!${BalmJS.config.dest.base}`, BalmJS.config.pwa.manifest)];
@@ -18,6 +23,9 @@ class CacheTask extends BalmJS.BalmTask {
     });
     this.defaultInput = [...defaultIncludes, ...defaultExcludes, ...(BalmJS.config.inFrontend ? [node.path.join(BalmJS.config.dest.base, '*.html')] : []), ...customIncludes, ...customExcludes];
     this.defaultOutput = BalmJS.config.inFrontend ? BalmJS.config.dest.base : BalmJS.config.dest.static;
+    this.gulpSrcOptions = {
+      base: this.defaultOutput
+    };
   }
 }
 export default CacheTask;

package/lib/tasks/private/pwa-cache.js

@@ -7,6 +7,10 @@ class PwaCacheTask extends BalmJS.BalmTask {
     super('pwa-cache');
     _defineProperty(this, "fn", () => {
       this.init();
+      const swDest = typeof this.input === 'string' && this.input ? BalmJS.file.absPath(this.input) : '';
+      if (!swDest || !node.fs.existsSync(swDest)) {
+        return Promise.resolve();
+      }
       const newVersion = BalmJS.config.pwa.version || Date.now().toString();
       BalmJS.logger.info('pwa - version', newVersion);
       const stream = this.src.pipe(BalmJS.plugins.replace('{{ version }}', newVersion)).pipe($.if(BalmJS.config.env.isProd, BalmJS.plugins.jsmin(BalmJS.config.scripts.minifyOptions))).pipe(gulp.dest(this.output));
@@ -17,10 +21,12 @@ class PwaCacheTask extends BalmJS.BalmTask {
     this.defaultInput = node.path.join(this.defaultOutput, BalmJS.config.pwa.swDestFilename);
   }
   clear() {
-    const swOrigin = BalmJS.file.absPath(node.path.join(BalmJS.config.dest.base, BalmJS.config.pwa.swSrcFilename));
-    deleteAsync(swOrigin, {
-      force: true
-    });
+    if (BalmJS.config.pwa.swSrcFilename !== BalmJS.config.pwa.swDestFilename) {
+      const swOrigin = BalmJS.file.absPath(node.path.join(BalmJS.config.dest.base, BalmJS.config.pwa.swSrcFilename));
+      deleteAsync(swOrigin, {
+        force: true
+      });
+    }
   }
 }
 export default PwaCacheTask;

package/lib/tasks/public/publish.js

@@ -8,13 +8,19 @@ class PublishTask extends BalmJS.BalmTask {
   constructor() {
     super('publish');
     _classPrivateFieldInitSpec(this, _release, (input, output, renameOptions = {}) => {
+      let srcPath;
+      let destPath;
       if (input && output) {
-        this.init(node.path.join(BalmJS.config.dest.base, input), node.path.join(BalmJS.config.assets.root, output) // Remote dir
-        );
+        srcPath = BalmJS.file.absPaths(node.path.join(BalmJS.config.dest.base, input));
+        destPath = BalmJS.file.absPath(node.path.join(BalmJS.config.assets.root, output));
       } else {
         this.init();
+        srcPath = this.input;
+        destPath = this.output;
       }
-      return this.src.pipe($.if(!BalmJS.utils.isArray(this.input), BalmJS.plugins.rename(renameOptions))).pipe(gulp.dest(this.output)); // Absolute path
+      return gulp.src(srcPath, {
+        allowEmpty: true
+      }).pipe($.if(!BalmJS.utils.isArray(srcPath), BalmJS.plugins.rename(renameOptions))).pipe(gulp.dest(destPath));
     });
     this.defaultInput = [BalmJS.file.matchAllFiles(BalmJS.config.dest.static),
     // Assets

package/lib/tasks/public/pwa.js

@@ -45,15 +45,30 @@ class PwaTask extends BalmJS.BalmTask {
           pre: true
         });
         const workboxBuild = mode === 'generateSW' ? generateSW(options) : injectManifest(options);
-        await workboxBuild.then(({
-          count,
-          size
-        }) => {
+        try {
+          const {
+            count,
+            size
+          } = await workboxBuild;
           BalmJS.logger.info(`pwa - ${mode}`, `Generated '${swDest}', which will precache ${count} files, totaling ${size} bytes`);
-          gulp.parallel(BalmJS.toNamespace('pwa-cache'))();
-        }).catch(err => {
+          await new Promise(resolve => {
+            const pwaCacheTask = BalmJS.tasks.get('pwa-cache');
+            if (pwaCacheTask) {
+              const stream = pwaCacheTask.fn();
+              if (stream && typeof stream.on === 'function') {
+                stream.on('finish', resolve).on('error', () => resolve());
+              } else if (stream && typeof stream.then === 'function') {
+                stream.then(resolve, resolve);
+              } else {
+                resolve();
+              }
+            } else {
+              resolve();
+            }
+          });
+        } catch (err) {
           BalmJS.logger.warn(`pwa - ${mode}`, `Service worker generation failed: ${err}`);
-        });
+        }
         callback();
       } else {
         BalmJS.logger.warn('pwa task', 'Invalid PWA mode');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -66,7 +66,7 @@
     "gulp-zip": "^6.1.0",
     "gulp.spritesmith": "^6.13.1",
     "html-loader": "^5.1.0",
-    "html-minifier": "^4.0.0",
+    "html-minifier-terser": "^7.2.0",
     "html-webpack-plugin": "^5.6.7",
     "http-proxy-middleware": "3",
     "imagemin": "^9.0.1",
@@ -90,7 +90,7 @@
     "sass-loader": "^16.0.8",
     "semver": "^7.8.0",
     "ssh2": "^1.17.0",
-    "strip-ansi": "^7.2.0",
+    "strip-ansi": "^6.0.1",
     "style-loader": "^4.0.0",
     "tailwindcss": "^4.3.0",
     "terser": "^5.47.1",
@@ -111,7 +111,7 @@
     "@types/browser-sync": "2",
     "@types/express": "5",
     "@types/fancy-log": "2",
-    "@types/html-minifier": "4",
+    "@types/html-minifier-terser": "^7.0.2",
     "@types/imagemin": "9",
     "@types/parents": "1",
     "@types/postcss-flexbugs-fixes": "5",
@@ -130,6 +130,5 @@
   },
   "engines": {
     "node": "^20.19.0 || >=22.0.0"
-  },
-  "gitHead": "561aaa5e4a9ad75b5b047ada2d8a66900e1d5431"
+  }
 }

package/tslib/plugins/htmlmin.js

@@ -1,4 +1,4 @@
-import { minify } from 'html-minifier';
+import { minify } from 'html-minifier-terser';
 const PLUGIN_NAME = 'htmlmin';
 function gulpHtmlmin(options) {
     options = BalmJS.utils.deepMerge({}, options);
@@ -7,9 +7,10 @@ function gulpHtmlmin(options) {
             callback(null, file);
             return;
         }
-        function htmlMinify(buf, enc, cb) {
+        async function htmlMinify(buf, enc, cb) {
             try {
-                const contents = Buffer.from(minify(buf.toString(), options));
+                const minified = await minify(buf.toString(), options);
+                const contents = Buffer.from(minified);
                 if (cb === callback) {
                     file.contents = contents;
                     cb(null, file);

package/tslib/plugins/sftp.js

@@ -71,7 +71,7 @@ function getKey(options) {
 }
 function gulpSftp(options) {
     options = Object.assign({}, options);
-    if (options.host === undefined) {
+    if (!options.host) {
         throw new PluginError(PLUGIN_NAME, '`host` required');
     }
     let fileCount = 0;
@@ -154,7 +154,8 @@ function gulpSftp(options) {
             });
         });
         conn.on('error', (err) => {
-            this.emit('error', new PluginError(PLUGIN_NAME, err));
+            const errorMsg = (err && (err.message || err.toString())) || 'SFTP connection error';
+            this.emit('error', new PluginError(PLUGIN_NAME, errorMsg));
         });
         conn.on('end', () => {
             BalmJS.logger.debug(PLUGIN_NAME, 'Client :: end');
@@ -195,7 +196,8 @@ function gulpSftp(options) {
                         cb();
                     }
                     else {
-                        sftp.mkdir(d, { mode: '0755' }, (err) => {
+                        const dirMode = options.dirMode || '0755';
+                        sftp.mkdir(d, { mode: dirMode }, (err) => {
                             if (err) {
                                 BalmJS.logger.warn(PLUGIN_NAME, `Error or directory exists: ${err} ${d}`);
                             }
@@ -207,10 +209,11 @@ function gulpSftp(options) {
                     }
                 });
             }, () => {
+                const fileMode = options.fileMode || '0666';
                 const stream = sftp.createWriteStream(finalRemotePath, {
                     flags: 'w',
                     encoding: null,
-                    mode: '0666',
+                    mode: fileMode,
                     autoClose: true
                 });
                 if (file.isStream()) {

package/tslib/tasks/foundation/balm.js

@@ -48,10 +48,10 @@ class BalmTask {
             default:
         }
         const useAbsPath = !['webpack', 'rollup', 'esbuild', 'sprite'].includes(key);
-        this.input = useAbsPath
+        this.input = useAbsPath && (input || this.defaultInput)
             ? BalmJS.file.absPaths(input || this.defaultInput)
             : input || this.defaultInput;
-        this.output = useAbsPath
+        this.output = useAbsPath && typeof (output || this.defaultOutput) === 'string'
             ? BalmJS.file.absPath(output || this.defaultOutput)
             : output || this.defaultOutput;
         this.customOptions = options[key] || {};

package/tslib/tasks/private/cache.js

@@ -27,14 +27,20 @@ class CacheTask extends BalmJS.BalmTask {
         this.defaultOutput = BalmJS.config.inFrontend
             ? BalmJS.config.dest.base
             : BalmJS.config.dest.static;
+        this.gulpSrcOptions = {
+            base: this.defaultOutput
+        };
     }
     fn = () => {
         this.init();
+        this.gulpSrcOptions = {
+            base: this.output
+        };
         return this.src
             .pipe(revAll.revision(BalmJS.config.assets.options))
             .pipe($.if(/\.html$/, BalmJS.file.setPublicPath()))
             .pipe(gulp.dest(this.output))
-            .pipe($.revDeleteOriginal())
+            .pipe($.revDeleteOriginal({ exclude: /\.html$/ }))
             .pipe(revAll.manifestFile())
             .pipe(gulp.dest(this.output));
     };

package/tslib/tasks/private/pwa-cache.js

@@ -6,11 +6,19 @@ class PwaCacheTask extends BalmJS.BalmTask {
         this.defaultInput = node.path.join(this.defaultOutput, BalmJS.config.pwa.swDestFilename);
     }
     clear() {
-        const swOrigin = BalmJS.file.absPath(node.path.join(BalmJS.config.dest.base, BalmJS.config.pwa.swSrcFilename));
-        deleteAsync(swOrigin, { force: true });
+        if (BalmJS.config.pwa.swSrcFilename !== BalmJS.config.pwa.swDestFilename) {
+            const swOrigin = BalmJS.file.absPath(node.path.join(BalmJS.config.dest.base, BalmJS.config.pwa.swSrcFilename));
+            deleteAsync(swOrigin, { force: true });
+        }
     }
     fn = () => {
         this.init();
+        const swDest = typeof this.input === 'string' && this.input
+            ? BalmJS.file.absPath(this.input)
+            : '';
+        if (!swDest || !node.fs.existsSync(swDest)) {
+            return Promise.resolve();
+        }
         const newVersion = BalmJS.config.pwa.version || Date.now().toString();
         BalmJS.logger.info('pwa - version', newVersion);
         const stream = this.src

package/tslib/tasks/public/publish.js

@@ -9,15 +9,21 @@ class PublishTask extends BalmJS.BalmTask {
         this.defaultOutput = BalmJS.config.assets.static;
     }
     #release = (input, output, renameOptions = {}) => {
+        let srcPath;
+        let destPath;
         if (input && output) {
-            this.init(node.path.join(BalmJS.config.dest.base, input), node.path.join(BalmJS.config.assets.root, output));
+            srcPath = BalmJS.file.absPaths(node.path.join(BalmJS.config.dest.base, input));
+            destPath = BalmJS.file.absPath(node.path.join(BalmJS.config.assets.root, output));
         }
         else {
             this.init();
+            srcPath = this.input;
+            destPath = this.output;
         }
-        return this.src
-            .pipe($.if(!BalmJS.utils.isArray(this.input), BalmJS.plugins.rename(renameOptions)))
-            .pipe(gulp.dest(this.output));
+        return gulp
+            .src(srcPath, { allowEmpty: true })
+            .pipe($.if(!BalmJS.utils.isArray(srcPath), BalmJS.plugins.rename(renameOptions)))
+            .pipe(gulp.dest(destPath));
     };
     recipe(input, output, renameOptions) {
         const balmPublish = (callback) => {

package/tslib/tasks/public/pwa.js

@@ -46,14 +46,31 @@ class PwaTask extends BalmJS.BalmTask {
                 const workboxBuild = mode === 'generateSW'
                     ? generateSW(options)
                     : injectManifest(options);
-                await workboxBuild
-                    .then(({ count, size }) => {
+                try {
+                    const { count, size } = await workboxBuild;
                     BalmJS.logger.info(`pwa - ${mode}`, `Generated '${swDest}', which will precache ${count} files, totaling ${size} bytes`);
-                    gulp.parallel(BalmJS.toNamespace('pwa-cache'))();
-                })
-                    .catch((err) => {
+                    await new Promise((resolve) => {
+                        const pwaCacheTask = BalmJS.tasks.get('pwa-cache');
+                        if (pwaCacheTask) {
+                            const stream = pwaCacheTask.fn();
+                            if (stream && typeof stream.on === 'function') {
+                                stream.on('finish', resolve).on('error', () => resolve());
+                            }
+                            else if (stream && typeof stream.then === 'function') {
+                                stream.then(resolve, resolve);
+                            }
+                            else {
+                                resolve();
+                            }
+                        }
+                        else {
+                            resolve();
+                        }
+                    });
+                }
+                catch (err) {
                     BalmJS.logger.warn(`pwa - ${mode}`, `Service worker generation failed: ${err}`);
-                });
+                }
                 callback();
             }
             else {