balm-core 5.0.2 → 5.2.0

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,10 +23,8 @@ 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;
-
-    // fix for gulp@5
     this.gulpSrcOptions = {
-      base: BalmJS.config.dest.base
+      base: this.defaultOutput
     };
   }
 }

package/lib/tasks/private/image.js

@@ -9,8 +9,8 @@ class ImageTask extends BalmJS.BalmTask {
       this.init();
       const balmImage = () => {
         return gulp.src(BalmJS.file.absPaths(this.input), {
-          encoding: false,
-          since: gulp.lastRun(balmImage)
+          since: gulp.lastRun(balmImage),
+          encoding: false
         }).pipe(BalmJS.plugins.plumber(error => {
           BalmJS.logger.error(`${this.name} task`, error);
         })).pipe(BalmJS.plugins.imagemin(this.plugins)).pipe(gulp.dest(this.output));

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/lib/tasks/public/sass.js

@@ -1,10 +1,9 @@
-import { isLegacy } from '../../plugins/sass.js';
 class SassTask extends BalmJS.BalmStyleTask {
   constructor() {
     super('sass');
   }
   get options() {
-    return Object.assign(isLegacy ? {
+    return Object.assign(node.isLegacySass ? {
       includePaths: BalmJS.file.stylePaths,
       outputStyle: 'expanded'
     } : {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "5.0.2",
+  "version": "5.2.0",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -41,77 +41,77 @@
     "directory": "packages/balm-core"
   },
   "dependencies": {
-    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-terser": "^1.0.0",
     "ansi-colors": "^4.1.3",
-    "async": "^3.2.5",
-    "autoprefixer": "^10.4.20",
-    "babel-loader": "^9.1.3",
-    "browser-sync": "^3.0.2",
+    "async": "^3.2.6",
+    "autoprefixer": "^10.5.0",
+    "babel-loader": "^10.1.1",
+    "browser-sync": "^3.0.4",
     "connect-history-api-fallback": "^2.0.0",
-    "css-loader": "^7.1.2",
-    "css-minimizer-webpack-plugin": "^7.0.0",
-    "cssnano": "^7.0.5",
-    "del": "^7.1.0",
-    "dotenv": "^16.4.5",
-    "dotenv-expand": "^11.0.6",
-    "esbuild": "^0.23.0",
+    "css-loader": "^7.1.4",
+    "css-minimizer-webpack-plugin": "^8.0.0",
+    "cssnano": "7",
+    "del": "^8.0.1",
+    "dotenv": "^17.4.2",
+    "dotenv-expand": "^13.0.0",
+    "esbuild": "^0.28.0",
     "fancy-log": "^2.0.0",
     "gulp-eslint": "^6.0.0",
     "gulp-if": "^3.0.0",
     "gulp-load-plugins": "^2.0.8",
-    "gulp-rev-all": "^4.0.0",
+    "gulp-rev-all": "^5.1.0",
     "gulp-rev-delete-original": "^0.2.3",
     "gulp-size": "^5.0.0",
     "gulp-useref": "^5.0.0",
-    "gulp-zip": "^6.0.0",
+    "gulp-zip": "^6.1.0",
     "gulp.spritesmith": "^6.13.1",
     "html-loader": "^5.1.0",
-    "html-minifier": "^4.0.0",
-    "html-webpack-plugin": "^5.6.0",
-    "http-proxy-middleware": "^3.0.0",
-    "imagemin": "^9.0.0",
+    "html-minifier-terser": "^7.2.0",
+    "html-webpack-plugin": "^5.6.7",
+    "http-proxy-middleware": "3",
+    "imagemin": "^9.0.1",
     "istextorbinary": "^9.5.0",
-    "less": "^4.2.0",
-    "mini-css-extract-plugin": "^2.9.0",
+    "less": "^4.6.4",
+    "mini-css-extract-plugin": "^2.10.2",
     "modernizr": "^3.13.1",
     "parents": "^1.0.1",
     "plugin-error": "^2.0.1",
-    "postcss": "^8.4.41",
+    "postcss": "^8.5.14",
     "postcss-flexbugs-fixes": "^5.0.2",
-    "postcss-import": "^16.1.0",
+    "postcss-import": "^16.1.1",
     "postcss-load-config": "^6.0.1",
-    "postcss-loader": "^8.1.1",
-    "postcss-preset-env": "^10.0.1",
-    "pretty-bytes": "^6.1.1",
-    "readable-stream": "^4.5.2",
+    "postcss-loader": "^8.2.1",
+    "postcss-preset-env": "^11.2.1",
+    "pretty-bytes": "^7.1.0",
+    "readable-stream": "^4.7.0",
     "replace-ext": "^2.0.0",
-    "rollup": "^4.20.0",
-    "sass": "^1.77.8",
-    "sass-loader": "^16.0.0",
-    "semver": "^7.6.3",
-    "ssh2": "^1.15.0",
-    "strip-ansi": "^7.1.0",
+    "rollup": "^4.60.3",
+    "sass": "^1.99.0",
+    "sass-loader": "^16.0.8",
+    "semver": "^7.8.0",
+    "ssh2": "^1.17.0",
+    "strip-ansi": "^6.0.1",
     "style-loader": "^4.0.0",
-    "tailwindcss": "^3.4.10",
-    "terser": "^5.31.6",
-    "terser-webpack-plugin": "^5.3.10",
-    "through2": "^4.0.2",
+    "tailwindcss": "^4.3.0",
+    "terser": "^5.47.1",
+    "terser-webpack-plugin": "^5.6.0",
+    "through2": "^5.0.0",
     "through2-concurrent": "^2.0.0",
-    "tslib": "^2.6.3",
+    "tslib": "^2.8.1",
     "vinyl-sourcemaps-apply": "^0.2.1",
-    "webpack": "^5.93.0",
-    "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-dev-middleware": "^7.3.0",
+    "webpack": "^5.106.2",
+    "webpack-bundle-analyzer": "^5.3.0",
+    "webpack-dev-middleware": "^8.0.3",
     "webpack-hot-middleware": "^2.26.1",
     "webpack-merge": "^6.0.1",
-    "workbox-build": "^7.1.1"
+    "workbox-build": "^7.4.1"
   },
   "devDependencies": {
     "@types/async": "3",
     "@types/browser-sync": "2",
-    "@types/express": "4",
+    "@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",
@@ -124,12 +124,11 @@
   },
   "optionalDependencies": {
     "imagemin-gifsicle": "^7.0.0",
-    "imagemin-mozjpeg": "^9.0.0",
+    "imagemin-mozjpeg": "^10.0.0",
     "imagemin-optipng": "^8.0.0",
-    "imagemin-svgo": "^9.0.0"
+    "imagemin-svgo": "^12.0.0"
   },
   "engines": {
-    "node": ">=18.12.0"
-  },
-  "gitHead": "c0b70cc1a9042401efbdc47d4a2eee59f1f2df1b"
+    "node": "^20.19.0 || >=22.0.0"
+  }
 }

package/tslib/balm.js

@@ -1,5 +1,3 @@
-var _Balm_config;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import './config/index.js';
 import './utilities/index.js';
 import './plugins/index.js';
@@ -7,18 +5,18 @@ import registerTasks from './tasks/index.js';
 import { setConfig, setTask } from './bootstrap/index.js';
 import loading from './utilities/loading.js';
 class Balm {
+    #config;
     constructor() {
-        _Balm_config.set(this, void 0);
         BalmJS.loading = false;
         loading.succeed();
-        __classPrivateFieldSet(this, _Balm_config, setConfig({}), "f");
+        this.#config = setConfig({});
     }
     get config() {
-        return __classPrivateFieldGet(this, _Balm_config, "f");
+        return this.#config;
     }
     set config(value) {
-        __classPrivateFieldSet(this, _Balm_config, setConfig(value), "f");
-        BalmJS.config = __classPrivateFieldGet(this, _Balm_config, "f");
+        this.#config = setConfig(value);
+        BalmJS.config = this.#config;
     }
     set beforeTask(name) {
         BalmJS.beforeTask = setTask(name);
@@ -43,5 +41,4 @@ class Balm {
         BalmJS.config.useDefaults = true;
     }
 }
-_Balm_config = new WeakMap();
 export default Balm;

package/tslib/config/globals.js

@@ -4,8 +4,26 @@ import colors from 'ansi-colors';
 import { create } from 'browser-sync';
 import through2 from 'through2';
 import PluginError from 'plugin-error';
+import semver from 'semver';
 process.env.BALM_CWD = process.env.INIT_CWD || process.cwd();
 const gulpModule = path.join(process.env.BALM_ROOT || process.env.BALM_CWD, 'node_modules', 'gulp', 'index.js');
+const localSassModule = path.join(process.env.BALM_CWD, 'node_modules', 'sass');
+let isLegacySass = false;
+try {
+    const sassPkg = requireModule(path.join(localSassModule, 'package.json'));
+    isLegacySass = semver.lt(sassPkg.version, '1.40.0');
+}
+catch (_) { }
+const nodeLocalSassModule = path.join(localSassModule, 'sass.node.js');
+const defaultLocalSassModule = path.join(localSassModule, 'sass.default.js');
+const dartLocalSassModule = path.join(localSassModule, 'sass.dart.js');
+const getSassModule = (sass) => fs.existsSync(nodeLocalSassModule)
+    ? requireModule(nodeLocalSassModule)
+    : fs.existsSync(defaultLocalSassModule)
+        ? requireModule(defaultLocalSassModule)
+        : fs.existsSync(dartLocalSassModule)
+            ? requireModule(dartLocalSassModule)
+            : sass;
 if (fs.existsSync(gulpModule)) {
     if (process.cwd() !== process.env.BALM_CWD) {
         process.chdir(process.env.BALM_CWD);
@@ -19,7 +37,9 @@ else {
 }
 global.node = {
     path,
-    fs
+    fs,
+    isLegacySass,
+    getSassModule
 };
 global.server = create();
 global.through2 = through2;

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/imagemin.js

@@ -4,12 +4,17 @@ import through2Concurrent from 'through2-concurrent';
 const PLUGIN_NAME = 'imagemin';
 const defaultPlugins = ['gifsicle', 'mozjpeg', 'optipng', 'svgo'];
 const loadPlugin = (plugin, ...args) => {
-    try {
-        return requireModule(`imagemin-${plugin}`)(...args);
-    }
-    catch (_) {
-        BalmJS.logger.error(PLUGIN_NAME, `Could not load default plugin \`${plugin}\``);
-    }
+    return async (input) => {
+        try {
+            const m = await import(`imagemin-${plugin}`);
+            const pluginFn = m.default(...args);
+            return pluginFn(input);
+        }
+        catch (_) {
+            BalmJS.logger.error(PLUGIN_NAME, `Could not load default plugin \`${plugin}\``);
+            return input;
+        }
+    };
 };
 const exposePlugin = (plugin) => (...args) => loadPlugin(plugin, ...args);
 const getDefaultPlugins = () => defaultPlugins.flatMap((plugin) => loadPlugin(plugin));
@@ -38,9 +43,9 @@ function gulpImagemin(customPlugins) {
         const plugins = customPlugins ?? getDefaultPlugins();
         (async () => {
             try {
-                const data = Buffer.from(await imagemin.buffer(file.contents, {
-                    plugins
-                }));
+                const data = await imagemin.buffer(file.contents, {
+                    plugins: plugins
+                });
                 const originalSize = file.contents.length;
                 const optimizedSize = data.length;
                 const saved = originalSize - optimizedSize;
@@ -55,7 +60,7 @@ function gulpImagemin(customPlugins) {
                     totalFiles++;
                 }
                 BalmJS.logger.debug(PLUGIN_NAME, `${file.relative} (${message})`);
-                file.contents = data;
+                file.contents = Buffer.from(data);
                 callback(null, file);
             }
             catch (error) {

package/tslib/plugins/index.js

@@ -8,6 +8,7 @@ import postcssPlugins from './postcss-plugins.js';
 import rename from './rename.js';
 import replace from './replace.js';
 import sass from './sass.js';
+import legacySass from './sass-legacy.js';
 import sftp from './sftp.js';
 const plugins = {
     htmlmin,
@@ -20,6 +21,7 @@ const plugins = {
     rename,
     replace,
     sass,
+    legacySass,
     sftp
 };
 BalmJS.plugins = plugins;

package/tslib/plugins/rename.js

@@ -12,7 +12,7 @@ function gulpRename(obj, options = {}) {
         };
     };
     stream._transform = (chunk, unused, callback) => {
-        const file = chunk.clone({ contents: false });
+        const file = chunk.clone();
         let parsedPath = parsePath(file.relative);
         let _path;
         const type = typeof obj;

package/tslib/plugins/replace.js

@@ -1,6 +1,7 @@
 import { Transform } from 'node:stream';
-import { isText } from 'istextorbinary';
+import * as isTextModule from 'istextorbinary';
 import rs from '../utilities/replacestream.js';
+const isText = isTextModule.isText || isTextModule;
 const defaultOptions = {
     skipBinary: true
 };

package/tslib/plugins/sass-legacy.js

@@ -0,0 +1,95 @@
+import { Transform } from 'node:stream';
+import * as sass from 'sass';
+import replaceExtension from 'replace-ext';
+import stripAnsi from 'strip-ansi';
+import applySourceMap from 'vinyl-sourcemaps-apply';
+import ansiColors from 'ansi-colors';
+const sassModule = node.getSassModule(sass);
+const PLUGIN_NAME = 'sass-legacy';
+const transformObj = (transform) => new Transform({ transform, objectMode: true });
+function filePush(file, sassObject, callback) {
+    if (sassObject.map) {
+        const sassMap = JSON.parse(sassObject.map.toString());
+        const sassMapFile = sassMap.file.replace(/^stdout$/, 'stdin');
+        const sassFileSrc = file.relative;
+        const sassFileSrcPath = node.path.dirname(sassFileSrc);
+        if (sassFileSrcPath) {
+            const sourceFileIndex = sassMap.sources.indexOf(sassMapFile);
+            sassMap.sources = sassMap.sources.map((source, index) => index === sourceFileIndex
+                ? source
+                : node.path.join(sassFileSrcPath, source));
+        }
+        sassMap.sources = sassMap.sources.filter((src) => src !== 'stdin' && src);
+        sassMap.file = replaceExtension(sassFileSrc, '.css');
+        applySourceMap(file, sassMap);
+    }
+    file.contents = sassObject.css;
+    file.path = replaceExtension(file.path, '.css');
+    if (file.stat) {
+        file.stat.atime = file.stat.mtime = file.stat.ctime = new Date();
+    }
+    callback(null, file);
+}
+function handleError(error, file, callback) {
+    const filePath = (error.file === 'stdin' ? file.path : error.file) || file.path;
+    const relativePath = node.path.relative(process.cwd(), filePath);
+    const message = `${ansiColors.underline(relativePath)}\n${error.formatted}`;
+    error.messageFormatted = message;
+    error.messageOriginal = error.message;
+    error.message = stripAnsi(message);
+    error.relativePath = relativePath;
+    return callback(new PluginError(PLUGIN_NAME, error));
+}
+const gulpSass = (options, sync = false) => transformObj((file, encoding, callback) => {
+    if (file.isNull()) {
+        return callback(null, file);
+    }
+    if (file.isStream()) {
+        return callback(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
+    }
+    if (node.path.basename(file.path).startsWith('_')) {
+        return callback();
+    }
+    if (!file.contents.length) {
+        file.path = replaceExtension(file.path, '.css');
+        return callback(null, file);
+    }
+    const opts = (options || {});
+    opts.data = file.contents.toString();
+    opts.file = file.path;
+    if (node.path.extname(file.path) === '.sass') {
+        opts.indentedSyntax = true;
+    }
+    if (opts.includePaths) {
+        if (typeof opts.includePaths === 'string') {
+            opts.includePaths = [opts.includePaths];
+        }
+    }
+    else {
+        opts.includePaths = [];
+    }
+    opts.includePaths.unshift(node.path.dirname(file.path));
+    if (file.sourceMap) {
+        opts.sourceMap = file.path;
+        opts.omitSourceMapUrl = true;
+        opts.sourceMapContents = true;
+    }
+    if (sync !== true) {
+        sassModule.render(opts, (error, obj) => {
+            if (error) {
+                handleError(error, file, callback);
+                return;
+            }
+            filePush(file, obj, callback);
+        });
+    }
+    else {
+        try {
+            filePush(file, sassModule.renderSync(opts), callback);
+        }
+        catch (error) {
+            handleError(error, file, callback);
+        }
+    }
+});
+export default gulpSass;