balm-core 5.0.2 → 5.2.0

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,23 +2,31 @@ 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);
     }
     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
+            .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;

package/tslib/tasks/public/html.js

@@ -1,33 +1,31 @@
-var _HtmlTask_updateAssetsPath, _HtmlTask_hasSourcePath;
-import { __classPrivateFieldGet } from "tslib";
 import { PUBLIC_URL } from '../../config/constants.js';
 class HtmlTask extends BalmJS.BalmTask {
     constructor() {
         super('html');
-        _HtmlTask_updateAssetsPath.set(this, (type) => {
-            const isManifest = type === 'manifest';
-            const assetsType = isManifest ? 'img' : type;
-            const from = BalmJS.config.paths.source[assetsType];
-            const to = BalmJS.file.assetsPath(BalmJS.config.paths.target[assetsType]);
-            const assetsPathSrc = new RegExp(isManifest ? `/?${from}` : `${PUBLIC_URL}/${from}`, 'g');
-            const assetsPathDest = `${PUBLIC_URL}/${to}`;
-            BalmJS.logger.debug(`${this.name} task - assets path`, {
-                regex: assetsPathSrc,
-                replacement: assetsPathDest
-            }, {
-                pre: true
-            });
-            return BalmJS.plugins.replace(assetsPathSrc, assetsPathDest);
-        });
-        _HtmlTask_hasSourcePath.set(this, (type) => {
-            return !!BalmJS.config.paths.source[type];
-        });
         this.defaultInput = [
             node.path.join(BalmJS.file.templateBasePath, '*.html'),
             node.path.join(BalmJS.file.templateBasePath, BalmJS.config.pwa.manifest)
         ];
         this.defaultOutput = BalmJS.config.dest.base;
     }
+    #updateAssetsPath = (type) => {
+        const isManifest = type === 'manifest';
+        const assetsType = isManifest ? 'img' : type;
+        const from = BalmJS.config.paths.source[assetsType];
+        const to = BalmJS.file.assetsPath(BalmJS.config.paths.target[assetsType]);
+        const assetsPathSrc = new RegExp(isManifest ? `/?${from}` : `${PUBLIC_URL}/${from}`, 'g');
+        const assetsPathDest = `${PUBLIC_URL}/${to}`;
+        BalmJS.logger.debug(`${this.name} task - assets path`, {
+            regex: assetsPathSrc,
+            replacement: assetsPathDest
+        }, {
+            pre: true
+        });
+        return BalmJS.plugins.replace(assetsPathSrc, assetsPathDest);
+    };
+    #hasSourcePath = (type) => {
+        return !!BalmJS.config.paths.source[type];
+    };
     recipe(input, output) {
         const balmHtml = () => {
             this.init(input, output);
@@ -46,9 +44,9 @@ class HtmlTask extends BalmJS.BalmTask {
                 ['css', 'js', 'img', 'media', 'manifest'].forEach((type) => {
                     const canUpdate = type === 'manifest'
                         ? BalmJS.config.pwa.enabled
-                        : __classPrivateFieldGet(this, _HtmlTask_hasSourcePath, "f").call(this, type);
+                        : this.#hasSourcePath(type);
                     if (canUpdate) {
-                        stream = stream.pipe(__classPrivateFieldGet(this, _HtmlTask_updateAssetsPath, "f").call(this, type));
+                        stream = stream.pipe(this.#updateAssetsPath(type));
                     }
                 });
                 stream = BalmJS.config.assets.cache
@@ -58,10 +56,10 @@ class HtmlTask extends BalmJS.BalmTask {
             else {
                 ['css', 'js', 'img', 'media'].forEach((type, index) => {
                     const canUpdate = index > 1
-                        ? __classPrivateFieldGet(this, _HtmlTask_hasSourcePath, "f").call(this, type) && !BalmJS.config.inFrontend
-                        : __classPrivateFieldGet(this, _HtmlTask_hasSourcePath, "f").call(this, type);
+                        ? this.#hasSourcePath(type) && !BalmJS.config.inFrontend
+                        : this.#hasSourcePath(type);
                     if (canUpdate) {
-                        stream = stream.pipe(__classPrivateFieldGet(this, _HtmlTask_updateAssetsPath, "f").call(this, type));
+                        stream = stream.pipe(this.#updateAssetsPath(type));
                     }
                 });
                 stream = stream.pipe(BalmJS.file.setPublicPath());
@@ -74,5 +72,4 @@ class HtmlTask extends BalmJS.BalmTask {
         return this.recipe();
     }
 }
-_HtmlTask_updateAssetsPath = new WeakMap(), _HtmlTask_hasSourcePath = new WeakMap();
 export default HtmlTask;

package/tslib/tasks/public/publish.js

@@ -1,35 +1,39 @@
-var _PublishTask_release;
-import { __classPrivateFieldGet } from "tslib";
 import mergeStream from '../../utilities/merge-stream.js';
 class PublishTask extends BalmJS.BalmTask {
     constructor() {
         super('publish');
-        _PublishTask_release.set(this, (input, output, renameOptions = {}) => {
-            if (input && output) {
-                this.init(node.path.join(BalmJS.config.dest.base, input), node.path.join(BalmJS.config.assets.root, output));
-            }
-            else {
-                this.init();
-            }
-            return this.src
-                .pipe($.if(!BalmJS.utils.isArray(this.input), BalmJS.plugins.rename(renameOptions)))
-                .pipe(gulp.dest(this.output));
-        });
         this.defaultInput = [
             BalmJS.file.matchAllFiles(BalmJS.config.dest.static),
             node.path.join(`!${BalmJS.config.dest.base}`, '*.*')
         ];
         this.defaultOutput = BalmJS.config.assets.static;
     }
+    #release = (input, output, renameOptions = {}) => {
+        let srcPath;
+        let destPath;
+        if (input && 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 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) => {
             if (BalmJS.config.env.isProd) {
                 if (BalmJS.utils.isArray(input)) {
-                    const tasks = input.map((template) => __classPrivateFieldGet(this, _PublishTask_release, "f").call(this, template.input, template.output, template.renameOptions));
+                    const tasks = input.map((template) => this.#release(template.input, template.output, template.renameOptions));
                     return mergeStream(...tasks);
                 }
                 else {
-                    return __classPrivateFieldGet(this, _PublishTask_release, "f").call(this, input, output, renameOptions);
+                    return this.#release(input, output, renameOptions);
                 }
             }
             else {
@@ -43,5 +47,4 @@ class PublishTask extends BalmJS.BalmTask {
         callback();
     }
 }
-_PublishTask_release = new WeakMap();
 export default PublishTask;

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 {

package/tslib/tasks/public/remove.js

@@ -1,23 +1,21 @@
-var _RemoveTask_getFiles;
-import { __classPrivateFieldGet } from "tslib";
 import { deleteAsync } from 'del';
 class RemoveTask extends BalmJS.BalmTask {
     constructor() {
         super('remove');
-        _RemoveTask_getFiles.set(this, (input) => {
-            let files = BalmJS.file.absPaths(input);
-            files = BalmJS.utils.isArray(input)
-                ? files.map((file) => file.replace(/\\/g, '/'))
-                : files.replace(/\\/g, '/');
-            return files;
-        });
     }
+    #getFiles = (input) => {
+        let files = BalmJS.file.absPaths(input);
+        files = BalmJS.utils.isArray(input)
+            ? files.map((file) => file.replace(/\\/g, '/'))
+            : files.replace(/\\/g, '/');
+        return files;
+    };
     recipe(input) {
         const balmRemove = async (callback) => {
             const canDel = !!((BalmJS.utils.isString(input) && input.trim()) ||
                 (BalmJS.utils.isArray(input) && input.length));
             if (canDel) {
-                const files = __classPrivateFieldGet(this, _RemoveTask_getFiles, "f").call(this, input);
+                const files = this.#getFiles(input);
                 BalmJS.logger.debug(`${this.name} task`, {
                     files
                 }, {
@@ -43,5 +41,4 @@ class RemoveTask extends BalmJS.BalmTask {
         callback();
     }
 }
-_RemoveTask_getFiles = new WeakMap();
 export default RemoveTask;

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

@@ -1,43 +1,8 @@
-var _ServerTask_watchTask, _ServerTask_onWatch;
-import { __classPrivateFieldGet } from "tslib";
 import detectPort from '../../utilities/detect-port.js';
 import getMiddlewares from '../../middlewares/index.js';
 class ServerTask extends BalmJS.BalmTask {
     constructor() {
         super('serve');
-        _ServerTask_watchTask.set(this, (taskName, serverReload = false) => {
-            const balmTask = BalmJS.tasks.get(taskName).fn;
-            const reload = (done) => {
-                server.reload();
-                done();
-            };
-            return serverReload ? gulp.series(balmTask, reload) : balmTask;
-        });
-        _ServerTask_onWatch.set(this, () => {
-            const { watch } = gulp;
-            const watchOptions = {
-                cwd: BalmJS.config.workspace
-            };
-            watch([
-                `${BalmJS.config.src.img}/**/*`,
-                `${BalmJS.config.dest.font}/**/*`,
-                ...BalmJS.config.server.extraWatchFiles
-            ], watchOptions).on('change', server.reload);
-            watch(`${BalmJS.file.templateBasePath}/*.html`, watchOptions, __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, 'html', true));
-            watch(`${BalmJS.config.src.css}/**/*.${BalmJS.config.styles.extname}`, watchOptions, __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, BalmJS.config.inFrontend ? this.styleName : 'style'));
-            if (!BalmJS.config.server.useHMR) {
-                watch(`${BalmJS.config.src.js}/**/*`, watchOptions, __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, BalmJS.config.scripts.bundler, true));
-            }
-            watch(`${BalmJS.config.src.base}/modernizr.json`, watchOptions, __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, 'modernizr'));
-            watch(`${BalmJS.config.src.font}/**/*`, watchOptions, __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, 'font'));
-            if (BalmJS.config.ftp.watchFiles.length) {
-                watch(BalmJS.config.ftp.watchFiles, watchOptions).on('change', (path) => {
-                    BalmJS.logger.debug(`${this.name} task`, `File ${path} was changed`);
-                    BalmJS.watchFtpFile = path;
-                    __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, 'ftp', true)();
-                });
-            }
-        });
         if (BalmJS.config.env.isDev) {
             detectPort(BalmJS.config.server.port, BalmJS.config.server.host).then((port) => {
                 if (BalmJS.config.server.port !== port) {
@@ -47,6 +12,39 @@ class ServerTask extends BalmJS.BalmTask {
             }, () => { });
         }
     }
+    #watchTask = (taskName, serverReload = false) => {
+        const balmTask = BalmJS.tasks.get(taskName).fn;
+        const reload = (done) => {
+            server.reload();
+            done();
+        };
+        return serverReload ? gulp.series(balmTask, reload) : balmTask;
+    };
+    #onWatch = () => {
+        const { watch } = gulp;
+        const watchOptions = {
+            cwd: BalmJS.config.workspace
+        };
+        watch([
+            `${BalmJS.config.src.img}/**/*`,
+            `${BalmJS.config.dest.font}/**/*`,
+            ...BalmJS.config.server.extraWatchFiles
+        ], watchOptions).on('change', server.reload);
+        watch(`${BalmJS.file.templateBasePath}/*.html`, watchOptions, this.#watchTask('html', true));
+        watch(`${BalmJS.config.src.css}/**/*.${BalmJS.config.styles.extname}`, watchOptions, this.#watchTask(BalmJS.config.inFrontend ? this.styleName : 'style'));
+        if (!BalmJS.config.server.useHMR) {
+            watch(`${BalmJS.config.src.js}/**/*`, watchOptions, this.#watchTask(BalmJS.config.scripts.bundler, true));
+        }
+        watch(`${BalmJS.config.src.base}/modernizr.json`, watchOptions, this.#watchTask('modernizr'));
+        watch(`${BalmJS.config.src.font}/**/*`, watchOptions, this.#watchTask('font'));
+        if (BalmJS.config.ftp.watchFiles.length) {
+            watch(BalmJS.config.ftp.watchFiles, watchOptions).on('change', (path) => {
+                BalmJS.logger.debug(`${this.name} task`, `File ${path} was changed`);
+                BalmJS.watchFtpFile = path;
+                this.#watchTask('ftp', true)();
+            });
+        }
+    };
     recipe(customHandler) {
         const balmServe = (callback) => {
             if (BalmJS.server) {
@@ -102,7 +100,7 @@ class ServerTask extends BalmJS.BalmTask {
                 if (BalmJS.config.env.isDev) {
                     BalmJS.server = server.init(bsOptions);
                     if (BalmJS.config.useDefaults) {
-                        __classPrivateFieldGet(this, _ServerTask_onWatch, "f").call(this);
+                        this.#onWatch();
                     }
                     else {
                         BalmJS.watching = true;
@@ -128,5 +126,4 @@ class ServerTask extends BalmJS.BalmTask {
         return this.recipe();
     }
 }
-_ServerTask_watchTask = new WeakMap(), _ServerTask_onWatch = new WeakMap();
 export default ServerTask;