balm-core 4.30.0 → 4.32.0

package/lib/tasks/private/sprite.js

@@ -1,5 +1,5 @@
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import mergeStream from '../../utilities/merge-stream.js';

package/lib/tasks/private/start.js

@@ -1,4 +1,4 @@
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class StartTask extends BalmJS.BalmTask {

package/lib/tasks/private/workbox-sw.js

@@ -1,4 +1,4 @@
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class WorkboxSwTask extends BalmJS.BalmTask {

package/lib/tasks/public/html.js

@@ -1,5 +1,5 @@
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import { PUBLIC_URL } from '../../config/constants.js';

package/lib/tasks/public/publish.js

@@ -1,5 +1,5 @@
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import mergeStream from '../../utilities/merge-stream.js';

package/lib/tasks/public/remove.js

@@ -1,5 +1,5 @@
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import { deleteAsync } from 'del';

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

@@ -1,5 +1,5 @@
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import detectPort from '../../utilities/detect-port.js';

package/lib/tasks/public/url.js

@@ -1,5 +1,5 @@
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 var _urlProcessing = /*#__PURE__*/new WeakMap();

package/lib/utilities/compiling.js

@@ -1,5 +1,5 @@
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }

package/lib/utilities/loading.js

@@ -1,5 +1,5 @@
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }

package/lib/utilities/logger.js

@@ -1,5 +1,5 @@
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import util from 'node:util';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "4.30.0",
+  "version": "4.32.0",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -43,18 +43,18 @@
   "dependencies": {
     "@rollup/plugin-terser": "^0.4.4",
     "ansi-colors": "^4.1.3",
-    "async": "^3.2.5",
-    "autoprefixer": "^10.4.19",
-    "babel-loader": "^9.1.3",
-    "browser-sync": "^3.0.2",
+    "async": "^3.2.6",
+    "autoprefixer": "^10.4.21",
+    "babel-loader": "^10.0.0",
+    "browser-sync": "^3.0.4",
     "connect-history-api-fallback": "^2.0.0",
-    "css-loader": "^7.1.1",
-    "css-minimizer-webpack-plugin": "^6.0.0",
-    "cssnano": "^7.0.1",
-    "del": "^7.1.0",
-    "dotenv": "^16.4.5",
-    "dotenv-expand": "^11.0.6",
-    "esbuild": "^0.20.0",
+    "css-loader": "^7.1.2",
+    "css-minimizer-webpack-plugin": "^7.0.2",
+    "cssnano": "^7.0.7",
+    "del": "^8.0.0",
+    "dotenv": "^16.5.0",
+    "dotenv-expand": "^12.0.2",
+    "esbuild": "^0.25.4",
     "fancy-log": "^2.0.0",
     "gulp-eslint": "^6.0.0",
     "gulp-if": "^3.0.0",
@@ -63,60 +63,61 @@
     "gulp-rev-delete-original": "^0.2.3",
     "gulp-size": "^5.0.0",
     "gulp-useref": "^5.0.0",
-    "gulp-zip": "^6.0.0",
-    "gulp.spritesmith": "^6.13.0",
-    "html-loader": "^5.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-webpack-plugin": "^5.6.3",
+    "http-proxy-middleware": "^3.0.5",
+    "imagemin": "^9.0.1",
     "istextorbinary": "^9.5.0",
-    "less": "^4.2.0",
-    "mini-css-extract-plugin": "^2.9.0",
-    "modernizr": "^3.13.0",
+    "less": "^4.3.0",
+    "mini-css-extract-plugin": "^2.9.2",
+    "modernizr": "^3.13.1",
     "parents": "^1.0.1",
     "plugin-error": "^2.0.1",
-    "postcss": "^8.4.38",
+    "postcss": "^8.5.3",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^16.1.0",
-    "postcss-load-config": "^5.1.0",
+    "postcss-load-config": "^6.0.1",
     "postcss-loader": "^8.1.1",
-    "postcss-preset-env": "^9.5.11",
-    "pretty-bytes": "^6.1.1",
-    "readable-stream": "^4.5.2",
+    "postcss-preset-env": "^10.1.6",
+    "pretty-bytes": "^7.0.0",
+    "readable-stream": "^4.7.0",
     "replace-ext": "^2.0.0",
-    "rollup": "^4.17.2",
-    "sass": "^1.77.0",
-    "sass-loader": "^14.2.1",
-    "semver": "^7.6.0",
-    "ssh2": "^1.15.0",
+    "rollup": "^4.41.0",
+    "sass": "^1.89.0",
+    "sass-loader": "^16.0.5",
+    "semver": "^7.7.2",
+    "ssh2": "^1.16.0",
     "strip-ansi": "^7.1.0",
     "style-loader": "^4.0.0",
-    "tailwindcss": "^3.4.3",
-    "terser": "^5.31.0",
-    "terser-webpack-plugin": "^5.3.10",
+    "tailwindcss": "^4.1.7",
+    "terser": "^5.39.2",
+    "terser-webpack-plugin": "^5.3.14",
     "through2": "^4.0.2",
     "through2-concurrent": "^2.0.0",
-    "tslib": "^2.6.2",
+    "tslib": "^2.8.1",
     "vinyl-sourcemaps-apply": "^0.2.1",
-    "webpack": "^5.91.0",
+    "webpack": "^5.99.8",
     "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-dev-middleware": "^7.2.1",
+    "webpack-dev-middleware": "^7.4.2",
     "webpack-hot-middleware": "^2.26.1",
-    "webpack-merge": "^5.10.0",
-    "workbox-build": "^7.1.0"
+    "webpack-merge": "^6.0.1",
+    "workbox-build": "^7.3.0"
   },
   "devDependencies": {
     "@types/async": "3",
     "@types/browser-sync": "2",
-    "@types/express": "4",
+    "@types/express": "5",
     "@types/fancy-log": "2",
     "@types/html-minifier": "4",
-    "@types/imagemin": "8",
+    "@types/imagemin": "9",
     "@types/parents": "1",
     "@types/postcss-flexbugs-fixes": "5",
     "@types/readable-stream": "4",
     "@types/replace-ext": "2",
+    "@types/semver": "7",
     "@types/through2-concurrent": "2",
     "@types/webpack-bundle-analyzer": "4",
     "@types/webpack-hot-middleware": "2"
@@ -128,7 +129,7 @@
     "imagemin-svgo": "^9.0.0"
   },
   "engines": {
-    "node": ">=18.12.0"
+    "node": "^20.10.0 || >=22.0.0"
   },
-  "gitHead": "55b2193b43739c624bd7d3e3f927b114724883ea"
+  "gitHead": "0bfe647d62456b11dfbc8a27f533db5d9f109e31"
 }

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

@@ -55,7 +55,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/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;