balm-core 5.0.2 → 5.1.0

package/tslib/tasks/foundation/balm_style.js

@@ -37,7 +37,6 @@ class BalmStyleTask extends BalmTask {
         const shouldUseSourceMap = !(BalmJS.config.env.isProd || BalmJS.config.styles.minify);
         let stream = gulp
             .src(this.input, Object.assign({
-            encoding: false,
             sourcemaps: shouldUseSourceMap,
             allowEmpty: true
         }, this.gulpSrcOptions))
@@ -48,7 +47,9 @@ class BalmStyleTask extends BalmTask {
         }));
         switch (style) {
             case 'sass':
-                stream = stream.pipe(BalmJS.plugins.sass(options));
+                stream = stream.pipe(node.isLegacySass
+                    ? BalmJS.plugins.legacySass(options)
+                    : BalmJS.plugins.sass(options));
                 break;
             case 'less':
                 stream = stream.pipe(BalmJS.plugins.less(options));

package/tslib/tasks/private/build.js

@@ -2,14 +2,14 @@ import gulpSize from 'gulp-size';
 class BuildTask extends BalmJS.BalmTask {
     constructor() {
         super('build');
-        this.fn = () => {
-            this.init();
-            return this.src.pipe(gulpSize({
-                title: this.name,
-                gzip: true
-            }));
-        };
         this.defaultInput = BalmJS.file.matchAllFiles(BalmJS.config.dest.base);
     }
+    fn = () => {
+        this.init();
+        return this.src.pipe(gulpSize({
+            title: this.name,
+            gzip: true
+        }));
+    };
 }
 export default BuildTask;

package/tslib/tasks/private/cache.js

@@ -3,16 +3,6 @@ import { ASSETS_TYPES, CHUNK, ASSET } from '../../config/constants.js';
 class CacheTask extends BalmJS.BalmTask {
     constructor() {
         super('cache');
-        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));
-        };
         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]));
@@ -37,9 +27,16 @@ class CacheTask extends BalmJS.BalmTask {
         this.defaultOutput = BalmJS.config.inFrontend
             ? BalmJS.config.dest.base
             : BalmJS.config.dest.static;
-        this.gulpSrcOptions = {
-            base: BalmJS.config.dest.base
-        };
     }
+    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));
+    };
 }
 export default CacheTask;

package/tslib/tasks/private/clean.js

@@ -1,5 +1,3 @@
-var _CleanTask_getAssetsDir;
-import { __classPrivateFieldGet } from "tslib";
 import { deleteAsync } from 'del';
 import { ASSETS_TYPES } from '../../config/constants.js';
 function unique(arr) {
@@ -16,33 +14,10 @@ function unique(arr) {
 class CleanTask extends BalmJS.BalmTask {
     constructor() {
         super('clean');
-        _CleanTask_getAssetsDir.set(this, (rootKey = 'assets') => {
-            return unique(ASSETS_TYPES.map((assetType) => BalmJS.config[rootKey][assetType]));
-        });
-        this.fn = async (callback) => {
-            const taskName = `${this.name} task`;
-            const directories = BalmJS.config.inFrontend
-                ? this.dirInFrontend
-                : this.dirInBackend;
-            if (BalmJS.config.env.isProd && !BalmJS.config.assets.root) {
-                BalmJS.logger.warn(taskName, 'Remote root path is empty');
-            }
-            BalmJS.logger.debug(taskName, {
-                directories
-            }, {
-                pre: true
-            });
-            const deletedPaths = await deleteAsync(directories, {
-                force: true
-            });
-            BalmJS.logger.warn(taskName, {
-                deletedPaths
-            }, {
-                pre: true
-            });
-            callback();
-        };
     }
+    #getAssetsDir = (rootKey = 'assets') => {
+        return unique(ASSETS_TYPES.map((assetType) => BalmJS.config[rootKey][assetType]));
+    };
     get remoteRootDir() {
         return BalmJS.config.assets.root.trim().length
             ? [BalmJS.config.assets.root]
@@ -51,7 +26,7 @@ class CleanTask extends BalmJS.BalmTask {
     get remoteAppDir() {
         return BalmJS.config.assets.subDir
             ? [BalmJS.config.assets.static]
-            : __classPrivateFieldGet(this, _CleanTask_getAssetsDir, "f").call(this);
+            : this.#getAssetsDir();
     }
     get dirInFrontend() {
         const isLocal = !node.path.isAbsolute(BalmJS.config.assets.root);
@@ -77,9 +52,31 @@ class CleanTask extends BalmJS.BalmTask {
         return [
             ...(BalmJS.config.env.isProd && hasBuildDir
                 ? buildDirInProd
-                : [...buildDirInDev, ...__classPrivateFieldGet(this, _CleanTask_getAssetsDir, "f").call(this, 'dest')])
+                : [...buildDirInDev, ...this.#getAssetsDir('dest')])
         ];
     }
+    fn = async (callback) => {
+        const taskName = `${this.name} task`;
+        const directories = BalmJS.config.inFrontend
+            ? this.dirInFrontend
+            : this.dirInBackend;
+        if (BalmJS.config.env.isProd && !BalmJS.config.assets.root) {
+            BalmJS.logger.warn(taskName, 'Remote root path is empty');
+        }
+        BalmJS.logger.debug(taskName, {
+            directories
+        }, {
+            pre: true
+        });
+        const deletedPaths = await deleteAsync(directories, {
+            force: true
+        });
+        BalmJS.logger.warn(taskName, {
+            deletedPaths
+        }, {
+            pre: true
+        });
+        callback();
+    };
 }
-_CleanTask_getAssetsDir = new WeakMap();
 export default CleanTask;

package/tslib/tasks/private/end.js

@@ -1,14 +1,6 @@
 class EndTask extends BalmJS.BalmTask {
     constructor() {
         super('end');
-        this.fn = async (callback) => {
-            if (BalmJS.utils.isFunction(BalmJS.afterTask)) {
-                await BalmJS.afterTask();
-            }
-            this.time();
-            BalmJS.emitter.emit('exit');
-            callback();
-        };
     }
     time() {
         const end = process.hrtime(BalmJS.start);
@@ -17,5 +9,13 @@ class EndTask extends BalmJS.BalmTask {
             logLevel: BalmJS.LogLevel.Error
         });
     }
+    fn = async (callback) => {
+        if (BalmJS.utils.isFunction(BalmJS.afterTask)) {
+            await BalmJS.afterTask();
+        }
+        this.time();
+        BalmJS.emitter.emit('exit');
+        callback();
+    };
 }
 export default EndTask;

package/tslib/tasks/private/extra.js

@@ -1,13 +1,6 @@
 class ExtraTask extends BalmJS.BalmTask {
     constructor() {
         super('extra');
-        this.fn = () => {
-            this.init();
-            this.gulpSrcOptions = {
-                dot: true
-            };
-            return this.src.pipe(gulp.dest(this.output));
-        };
         const includeGlobs = [];
         if (BalmJS.config.extras.includes.length) {
             for (const filename of BalmJS.config.extras.includes) {
@@ -30,5 +23,12 @@ class ExtraTask extends BalmJS.BalmTask {
         this.defaultInput = defaultGlobs;
         this.defaultOutput = BalmJS.config.dest.base;
     }
+    fn = () => {
+        this.init();
+        this.gulpSrcOptions = {
+            dot: true
+        };
+        return this.src.pipe(gulp.dest(this.output));
+    };
 }
 export default ExtraTask;

package/tslib/tasks/private/font.js

@@ -1,12 +1,12 @@
 class FontTask extends BalmJS.BalmTask {
     constructor() {
         super('font');
-        this.fn = () => {
-            this.init();
-            return this.src.pipe(gulp.dest(this.output));
-        };
         this.defaultInput = BalmJS.file.matchAllFiles(BalmJS.config.src.font, '*.{eot,svg,ttf,woff,woff2}');
         this.defaultOutput = BalmJS.config.dest.font;
     }
+    fn = () => {
+        this.init();
+        return this.src.pipe(gulp.dest(this.output));
+    };
 }
 export default FontTask;

package/tslib/tasks/private/image.js

@@ -2,22 +2,6 @@ import { getDefaultImagePlugins } from '../../plugins/imagemin.js';
 class ImageTask extends BalmJS.BalmTask {
     constructor() {
         super('image');
-        this.fn = () => {
-            this.init();
-            const balmImage = () => {
-                return gulp
-                    .src(BalmJS.file.absPaths(this.input), {
-                    encoding: false,
-                    since: gulp.lastRun(balmImage)
-                })
-                    .pipe(BalmJS.plugins.plumber((error) => {
-                    BalmJS.logger.error(`${this.name} task`, error);
-                }))
-                    .pipe(BalmJS.plugins.imagemin(this.plugins))
-                    .pipe(gulp.dest(this.output));
-            };
-            return balmImage();
-        };
         const excludeGlobs = [];
         for (const imageFolder of BalmJS.config.styles.sprites) {
             excludeGlobs.push(node.path.join(`!${BalmJS.config.src.img}`, imageFolder));
@@ -38,5 +22,21 @@ class ImageTask extends BalmJS.BalmTask {
             BalmJS.logger.debug(`${this.name} task - plugins`, enablePlugins);
         }
     }
+    fn = () => {
+        this.init();
+        const balmImage = () => {
+            return gulp
+                .src(BalmJS.file.absPaths(this.input), {
+                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));
+        };
+        return balmImage();
+    };
 }
 export default ImageTask;

package/tslib/tasks/private/lint.js

@@ -1,17 +1,17 @@
 class LintTask extends BalmJS.BalmTask {
     constructor() {
         super('lint');
-        this.fn = () => {
-            this.init();
-            return this.src
-                .pipe($.eslint({ fix: true }))
-                .pipe(server.reload({ stream: true, once: true }))
-                .pipe($.eslint.format())
-                .pipe($.if(!server.active, $.eslint.failAfterError()))
-                .pipe(gulp.dest(this.output));
-        };
         this.defaultOutput = BalmJS.config.src.js;
         this.defaultInput = BalmJS.file.matchAllFiles(this.defaultOutput, '*.js');
     }
+    fn = () => {
+        this.init();
+        return this.src
+            .pipe($.eslint({ fix: true }))
+            .pipe(server.reload({ stream: true, once: true }))
+            .pipe($.eslint.format())
+            .pipe($.if(!server.active, $.eslint.failAfterError()))
+            .pipe(gulp.dest(this.output));
+    };
 }
 export default LintTask;

package/tslib/tasks/private/media.js

@@ -1,12 +1,12 @@
 class MediaTask extends BalmJS.BalmTask {
     constructor() {
         super('media');
-        this.fn = () => {
-            this.init();
-            return this.src.pipe(gulp.dest(this.output));
-        };
         this.defaultInput = BalmJS.file.matchAllFiles(BalmJS.config.src.media);
         this.defaultOutput = BalmJS.config.dest.media;
     }
+    fn = () => {
+        this.init();
+        return this.src.pipe(gulp.dest(this.output));
+    };
 }
 export default MediaTask;

package/tslib/tasks/private/modernizr.js

@@ -1,57 +1,54 @@
-var _ModernizrTask_readConfig, _ModernizrTask_createDir, _ModernizrTask_generateScript;
-import { __classPrivateFieldGet } from "tslib";
 import { build } from 'modernizr';
 class ModernizrTask extends BalmJS.BalmTask {
     constructor() {
         super('modernizr');
-        _ModernizrTask_readConfig.set(this, () => {
-            return new Promise((resolve, reject) => {
-                node.fs.readFile(this.input, 'utf8', (err, data) => {
-                    if (err)
-                        reject(err);
-                    resolve(JSON.parse(data));
-                });
+        this.defaultInput = `${this.name}.json`;
+        this.defaultOutput = node.path.join(BalmJS.config.dest.js, `${this.name}.js`);
+    }
+    #readConfig = () => {
+        return new Promise((resolve, reject) => {
+            node.fs.readFile(this.input, 'utf8', (err, data) => {
+                if (err)
+                    reject(err);
+                resolve(JSON.parse(data));
+            });
+        });
+    };
+    #createDir = () => {
+        return new Promise((resolve, reject) => {
+            node.fs.mkdir(BalmJS.file.absPath(BalmJS.config.dest.js), { recursive: true }, (err) => {
+                if (err)
+                    reject(err);
+                resolve();
             });
         });
-        _ModernizrTask_createDir.set(this, () => {
-            return new Promise((resolve, reject) => {
-                node.fs.mkdir(BalmJS.file.absPath(BalmJS.config.dest.js), { recursive: true }, (err) => {
+    };
+    #generateScript = (config) => {
+        return new Promise((resolve, reject) => {
+            build(config, (content) => {
+                node.fs.writeFile(this.output, content, (err) => {
                     if (err)
                         reject(err);
-                    resolve();
+                    resolve(content);
                 });
             });
         });
-        _ModernizrTask_generateScript.set(this, (config) => {
-            return new Promise((resolve, reject) => {
-                build(config, (content) => {
-                    node.fs.writeFile(this.output, content, (err) => {
-                        if (err)
-                            reject(err);
-                        resolve(content);
-                    });
-                });
+    };
+    fn = async (callback) => {
+        this.init();
+        if (node.fs.existsSync(this.input)) {
+            const [config] = await Promise.all([
+                this.#readConfig(),
+                this.#createDir()
+            ]);
+            await this.#generateScript(config);
+        }
+        else {
+            BalmJS.logger.warn(`${this.name} task`, `The '${this.input}' does not exist`, {
+                logLevel: BalmJS.LogLevel.Info
             });
-        });
-        this.fn = async (callback) => {
-            this.init();
-            if (node.fs.existsSync(this.input)) {
-                const [config] = await Promise.all([
-                    __classPrivateFieldGet(this, _ModernizrTask_readConfig, "f").call(this),
-                    __classPrivateFieldGet(this, _ModernizrTask_createDir, "f").call(this)
-                ]);
-                await __classPrivateFieldGet(this, _ModernizrTask_generateScript, "f").call(this, config);
-            }
-            else {
-                BalmJS.logger.warn(`${this.name} task`, `The '${this.input}' does not exist`, {
-                    logLevel: BalmJS.LogLevel.Info
-                });
-            }
-            callback();
-        };
-        this.defaultInput = `${this.name}.json`;
-        this.defaultOutput = node.path.join(BalmJS.config.dest.js, `${this.name}.js`);
-    }
+        }
+        callback();
+    };
 }
-_ModernizrTask_readConfig = new WeakMap(), _ModernizrTask_createDir = new WeakMap(), _ModernizrTask_generateScript = new WeakMap();
 export default ModernizrTask;

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

@@ -2,17 +2,6 @@ import { deleteAsync } from 'del';
 class PwaCacheTask extends BalmJS.BalmTask {
     constructor() {
         super('pwa-cache');
-        this.fn = () => {
-            this.init();
-            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));
-            this.clear();
-            return stream;
-        };
         this.defaultOutput = BalmJS.config.dest.base;
         this.defaultInput = node.path.join(this.defaultOutput, BalmJS.config.pwa.swDestFilename);
     }
@@ -20,5 +9,16 @@ class PwaCacheTask extends BalmJS.BalmTask {
         const swOrigin = BalmJS.file.absPath(node.path.join(BalmJS.config.dest.base, BalmJS.config.pwa.swSrcFilename));
         deleteAsync(swOrigin, { force: true });
     }
+    fn = () => {
+        this.init();
+        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));
+        this.clear();
+        return stream;
+    };
 }
 export default PwaCacheTask;

package/tslib/tasks/private/sprite.js

@@ -1,42 +1,8 @@
-var _SpriteTask_tasks, _SpriteTask_getParams;
-import { __classPrivateFieldGet } from "tslib";
 import mergeStream from '../../utilities/merge-stream.js';
 class SpriteTask extends BalmJS.BalmTask {
+    #tasks = [];
     constructor() {
         super('sprite');
-        _SpriteTask_tasks.set(this, []);
-        _SpriteTask_getParams.set(this, (spriteItem, spriteOptions) => {
-            const stylesConfig = Object.assign(spriteOptions, BalmJS.config.styles);
-            const spriteName = `${spriteItem.folderName}-${this.name}s`;
-            const imageTarget = stylesConfig.imageTarget || BalmJS.config.paths.target.img;
-            let defaultParams = Object.assign({
-                padding: 1
-            }, {
-                imgName: `${spriteName}.png`,
-                cssName: `_${spriteItem.folderName}.${stylesConfig.extname}`,
-                imgPath: `${stylesConfig.imageBasePath}${imageTarget}/${spriteName}.png`,
-                cssVarMap: (sprite) => {
-                    sprite.name = `${spriteItem.folderName}-${sprite.name}`;
-                },
-                cssSpritesheetName: `${spriteItem.folderName}-spritesheet`,
-                cssOpts: {
-                    cssSelector: (sprite) => `.${sprite.name}`
-                }
-            });
-            if (stylesConfig.spriteRetina) {
-                defaultParams = Object.assign(defaultParams, {
-                    retinaSrcFilter: `${spriteItem.retinaSrc}`,
-                    retinaImgName: `${spriteName}@2x.png`,
-                    retinaImgPath: `${stylesConfig.imageBasePath}${imageTarget}/${spriteName}@2x.png`,
-                    cssVarMap: (sprite) => {
-                        sprite.name = `${spriteItem.folderName}-${sprite.name}`;
-                    },
-                    cssRetinaSpritesheetName: `${spriteItem.folderName}-spritesheet-2x`,
-                    cssRetinaGroupsName: `${spriteItem.folderName}-retina-groups`
-                });
-            }
-            return Object.assign(defaultParams, stylesConfig.spriteParams);
-        });
         this.defaultInput = BalmJS.config.styles.sprites;
         this.defaultOutput = BalmJS.config.dest.img;
         if (this.defaultInput.length) {
@@ -44,6 +10,38 @@ class SpriteTask extends BalmJS.BalmTask {
             this.collect();
         }
     }
+    #getParams = (spriteItem, spriteOptions) => {
+        const stylesConfig = Object.assign(spriteOptions, BalmJS.config.styles);
+        const spriteName = `${spriteItem.folderName}-${this.name}s`;
+        const imageTarget = stylesConfig.imageTarget || BalmJS.config.paths.target.img;
+        let defaultParams = Object.assign({
+            padding: 1
+        }, {
+            imgName: `${spriteName}.png`,
+            cssName: `_${spriteItem.folderName}.${stylesConfig.extname}`,
+            imgPath: `${stylesConfig.imageBasePath}${imageTarget}/${spriteName}.png`,
+            cssVarMap: (sprite) => {
+                sprite.name = `${spriteItem.folderName}-${sprite.name}`;
+            },
+            cssSpritesheetName: `${spriteItem.folderName}-spritesheet`,
+            cssOpts: {
+                cssSelector: (sprite) => `.${sprite.name}`
+            }
+        });
+        if (stylesConfig.spriteRetina) {
+            defaultParams = Object.assign(defaultParams, {
+                retinaSrcFilter: `${spriteItem.retinaSrc}`,
+                retinaImgName: `${spriteName}@2x.png`,
+                retinaImgPath: `${stylesConfig.imageBasePath}${imageTarget}/${spriteName}@2x.png`,
+                cssVarMap: (sprite) => {
+                    sprite.name = `${spriteItem.folderName}-${sprite.name}`;
+                },
+                cssRetinaSpritesheetName: `${spriteItem.folderName}-spritesheet-2x`,
+                cssRetinaGroupsName: `${spriteItem.folderName}-retina-groups`
+            });
+        }
+        return Object.assign(defaultParams, stylesConfig.spriteParams);
+    };
     collect(spriteOptions = {}) {
         const spriteList = [];
         for (const spriteName of this.input) {
@@ -64,7 +62,7 @@ class SpriteTask extends BalmJS.BalmTask {
             BalmJS.logger.debug(`${this.name} task`, spriteConfig, {
                 pre: true
             });
-            spriteConfig.params = __classPrivateFieldGet(this, _SpriteTask_getParams, "f").call(this, spriteItem, spriteOptions);
+            spriteConfig.params = this.#getParams(spriteItem, spriteOptions);
             gulp.task(BalmJS.toNamespace(spriteTaskName), () => {
                 const spriteData = gulp
                     .src(spriteConfig.input, { encoding: false })
@@ -76,7 +74,7 @@ class SpriteTask extends BalmJS.BalmTask {
                 const cssStream = spriteData.css.pipe(gulp.dest(spriteConfig.cssOutput));
                 return mergeStream(imgStream, cssStream);
             });
-            __classPrivateFieldGet(this, _SpriteTask_tasks, "f").push(spriteTaskName);
+            this.#tasks.push(spriteTaskName);
         }
     }
     recipe(input, output, spriteOptions = {}) {
@@ -89,8 +87,7 @@ class SpriteTask extends BalmJS.BalmTask {
         }
     }
     get deps() {
-        return __classPrivateFieldGet(this, _SpriteTask_tasks, "f");
+        return this.#tasks;
     }
 }
-_SpriteTask_tasks = new WeakMap(), _SpriteTask_getParams = new WeakMap();
 export default SpriteTask;

package/tslib/tasks/private/start.js

@@ -1,13 +1,13 @@
 class StartTask extends BalmJS.BalmTask {
     constructor() {
         super('start');
-        this.fn = async (callback) => {
-            BalmJS.start = process.hrtime();
-            if (BalmJS.utils.isFunction(BalmJS.beforeTask)) {
-                await BalmJS.beforeTask();
-            }
-            callback();
-        };
     }
+    fn = async (callback) => {
+        BalmJS.start = process.hrtime();
+        if (BalmJS.utils.isFunction(BalmJS.beforeTask)) {
+            await BalmJS.beforeTask();
+        }
+        callback();
+    };
 }
 export default StartTask;

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

@@ -1,15 +1,15 @@
 class WorkboxSwTask extends BalmJS.BalmTask {
     constructor() {
         super('workbox-sw');
-        this.fn = () => {
-            this.init();
-            return this.src.pipe(gulp.dest(this.output));
-        };
         this.defaultInput = [
             BalmJS.config.pwa.workboxSw,
             `${BalmJS.config.pwa.workboxSw}.map`
         ];
         this.defaultOutput = BalmJS.config.dest.base;
     }
+    fn = () => {
+        this.init();
+        return this.src.pipe(gulp.dest(this.output));
+    };
 }
 export default WorkboxSwTask;