balm-core 4.10.0 → 4.12.0

package/lib/plugins/sftp.js

@@ -1,4 +1,5 @@
 // Reference `gulp-sftp@0.1.5`
+
 import { Client } from 'ssh2';
 import parents from 'parents';
 import async from 'async';
@@ -6,19 +7,15 @@ const PLUGIN_NAME = 'sftp';
 const DefaultAlgorithms = {
   kex: ['curve25519-sha256', 'curve25519-sha256@libssh.org', 'ecdh-sha2-nistp256', 'ecdh-sha2-nistp384', 'ecdh-sha2-nistp521', 'diffie-hellman-group-exchange-sha256', 'diffie-hellman-group14-sha256', 'diffie-hellman-group15-sha512', 'diffie-hellman-group16-sha512', 'diffie-hellman-group17-sha512', 'diffie-hellman-group18-sha512', 'diffie-hellman-group-exchange-sha1', 'diffie-hellman-group14-sha1', 'diffie-hellman-group1-sha1']
 };
-
 const normalizePath = _path => _path.replace(/\\/g, '/');
-
 function resolveHomePath(key) {
   if (key.location) {
     const HOME = process.env.HOME || process.env.USERPROFILE || '';
-
     for (let i = 0, len = key.location.length; i < len; i++) {
       if (key.location[i].substr(0, 2) === '~/') {
         key.location[i] = node.path.resolve(HOME, key.location[i].replace(/^~\//, ''));
       }
     }
-
     for (let i = 0, keyPath; keyPath = key.location[i++];) {
       if (node.fs.existsSync(keyPath)) {
         key.contents = node.fs.readFileSync(keyPath);
@@ -29,67 +26,59 @@ function resolveHomePath(key) {
     const rsaKey = key.location.join(', ');
     throw new PluginError(PLUGIN_NAME, `Cannot find RSA key, searched: ${rsaKey}`);
   }
-
   return key;
 }
+
 /**
  * Lots of ways to present key info
  */
-
-
 function getKey(options) {
   let key = options.key || options.keyLocation || null;
-
   if (key && BalmJS.utils.isString(key)) {
     key = {
       location: key
     };
-  } // Check for other options that imply a key or if there is no password
-
+  }
 
+  // Check for other options that imply a key or if there is no password
   if (!key && (options.passphrase || options.keyContents || !options.password)) {
     key = {};
   }
-
   if (key) {
     // Aliases
     key.contents = key.contents || options.keyContents;
-    key.passphrase = key.passphrase || options.passphrase; // Defaults
+    key.passphrase = key.passphrase || options.passphrase;
 
-    key.location = key.location || ['~/.ssh/id_rsa', '/.ssh/id_rsa', '~/.ssh/id_dsa', '/.ssh/id_dsa']; // Type normalization
+    // Defaults
+    key.location = key.location || ['~/.ssh/id_rsa', '/.ssh/id_rsa', '~/.ssh/id_dsa', '/.ssh/id_dsa'];
 
+    // Type normalization
     if (!BalmJS.utils.isArray(key.location)) {
       key.location = [key.location];
-    } // Resolve all home paths
-
+    }
 
+    // Resolve all home paths
     key = resolveHomePath(key);
   }
-
   return key;
 }
-
 function gulpSftp(options) {
   options = Object.assign({}, options); // Credit sindresorhus
 
   if (options.host === undefined) {
     throw new PluginError(PLUGIN_NAME, '`host` required');
   }
-
   let fileCount = 0;
   const remotePath = options.remotePath || '/';
   const remotePlatform = options.remotePlatform || options.platform || 'unix';
   options.authKey = options.authKey || options.auth;
   const authFilePath = options.authFile || '.ftppass';
   const authFile = node.path.join('./', authFilePath);
-
   if (options.authKey && node.fs.existsSync(authFile)) {
     let auth = JSON.parse(node.fs.readFileSync(authFile, 'utf8'))[options.authKey];
-
     if (!auth) {
       throw new PluginError(PLUGIN_NAME, 'Could not find authkey in .ftppass');
     }
-
     if (BalmJS.utils.isString(auth) && auth.indexOf(':') !== -1) {
       const authparts = auth.split(':');
       auth = {
@@ -97,26 +86,24 @@ function gulpSftp(options) {
         pass: authparts[1]
       };
     }
-
     const authKeys = Object.keys(auth);
-
     for (let i = 0, len = authKeys.length; i < len; i++) {
       const attr = authKeys[i];
-
       if (auth[attr]) {
         options[attr] = auth[attr];
       }
     }
-  } // Option aliases
-
+  }
 
+  // Option aliases
   const password = options.password;
   const username = options.username || 'anonymous';
+
   /*
    * Key info
    */
-
   const key = getKey(options);
+
   /*
    * End Key normalization, key should now be of form:
    * {location:Array,passphrase:String,contents:String}
@@ -126,7 +113,6 @@ function gulpSftp(options) {
   const mkDirCache = {};
   let finished = false;
   let sftpCache = null; // SFTP connection cache
-
   let connCache = null; // SSH connection cache
 
   function _pool(uploader) {
@@ -134,24 +120,21 @@ function gulpSftp(options) {
     if (sftpCache) {
       return uploader(sftpCache);
     }
-
     if (password) {
       BalmJS.logger.debug(PLUGIN_NAME, 'Authenticating with password');
     } else if (key) {
       BalmJS.logger.debug(PLUGIN_NAME, 'Authenticating with private key');
     }
+
     /*
      * Connection options, may be a key
      */
-
-
     const connectionOptions = {
       host: options.host,
       port: options.port || 22,
       username,
       algorithms: options.algorithms || DefaultAlgorithms
     };
-
     if (password) {
       connectionOptions.password = password;
     } else if (options.agent) {
@@ -161,11 +144,9 @@ function gulpSftp(options) {
       connectionOptions.privateKey = key.contents;
       connectionOptions.passphrase = key.passphrase;
     }
-
     if (options.timeout) {
       connectionOptions.readyTimeout = options.timeout;
     }
-
     const conn = new Client();
     connCache = conn;
     conn.on('ready', () => {
@@ -174,11 +155,9 @@ function gulpSftp(options) {
         if (err) {
           throw err;
         }
-
         sftp.on('end', function () {
           BalmJS.logger.debug(PLUGIN_NAME, 'SFTP session closed');
           sftpCache = null;
-
           if (!finished) {
             this.emit('error', new PluginError(PLUGIN_NAME, 'SFTP abrupt closure'));
           }
@@ -197,49 +176,50 @@ function gulpSftp(options) {
       if (!finished) {
         this.emit('error', new PluginError(PLUGIN_NAME, 'SFTP abrupt closure'));
       }
-
       if (options.callback) {
         options.callback();
       }
     });
     conn.connect(connectionOptions);
   }
-
   function transform(file, encoding, callback) {
     if (file.isNull()) {
       return callback();
-    } // Have to create a new connection for each file otherwise they conflict, pulled from sindresorhus
-
+    }
 
-    const finalRemotePath = normalizePath(node.path.join(remotePath, file.relative)); // Connection pulled from pool
+    // Have to create a new connection for each file otherwise they conflict, pulled from sindresorhus
+    const finalRemotePath = normalizePath(node.path.join(remotePath, file.relative));
 
+    // Connection pulled from pool
     _pool.call(this, sftp => {
       /*
        * Create Directories
        */
+
       // Get dir name from file path
-      const dirname = node.path.dirname(finalRemotePath); // Get parents of the target dir
+      const dirname = node.path.dirname(finalRemotePath);
+      // Get parents of the target dir
 
       let fileDirs = parents(dirname).map(d => d.replace(/^\/~/, '~')).map(normalizePath);
-
       if (dirname.search(/^\//) === 0) {
         fileDirs = fileDirs.map(dir => dir.search(/^\//) === 0 ? dir : `/${dir}`);
-      } // Get filter out dirs that are closer to root than the base remote path
-      // also filter out any dirs made during this gulp session
+      }
 
+      // Get filter out dirs that are closer to root than the base remote path
+      // also filter out any dirs made during this gulp session
+      fileDirs = fileDirs.filter(d => d.length >= remotePath.length && !mkDirCache[d]);
 
-      fileDirs = fileDirs.filter(d => d.length >= remotePath.length && !mkDirCache[d]); // While there are dirs to create, create them
+      // While there are dirs to create, create them
       // https://github.com/caolan/async#whilst - not the most commonly used async control flow
-
-      async.whilst( // https://github.com/caolan/async/issues/1668
+      async.whilst(
+      // https://github.com/caolan/async/issues/1668
       cb => cb(null, fileDirs && fileDirs.length), cb => {
         let d = fileDirs.pop();
-        mkDirCache[d] = true; // Mdrake - TODO: use a default file permission instead of defaulting to 755
-
+        mkDirCache[d] = true;
+        // Mdrake - TODO: use a default file permission instead of defaulting to 755
         if (remotePlatform && remotePlatform.toLowerCase().indexOf('win') !== -1) {
           d = d.replace('/', '\\');
         }
-
         sftp.exists(d, exist => {
           if (exist) {
             cb();
@@ -254,7 +234,6 @@ function gulpSftp(options) {
               } else {
                 BalmJS.logger.debug(PLUGIN_NAME, `Created: ${d}`);
               }
-
               cb();
             });
           }
@@ -265,14 +244,14 @@ function gulpSftp(options) {
           encoding: null,
           mode: '0666',
           autoClose: true
-        }); // Start upload
+        });
 
+        // Start upload
         if (file.isStream()) {
           file.contents.pipe(stream);
         } else if (file.isBuffer()) {
           stream.end(file.contents);
         }
-
         stream.on('close', function (error) {
           if (error) {
             this.emit('error', new PluginError(PLUGIN_NAME, error));
@@ -281,13 +260,11 @@ function gulpSftp(options) {
             BalmJS.logger.info(PLUGIN_NAME, `Uploaded: ${fileRelativePath} => ${finalRemotePath}`);
             fileCount++;
           }
-
           return callback(error);
         });
       });
     });
   }
-
   function flush(callback) {
     if (fileCount > 0) {
       const unit = fileCount === 1 ? 'file' : 'files';
@@ -295,21 +272,15 @@ function gulpSftp(options) {
     } else {
       BalmJS.logger.warn(PLUGIN_NAME, 'No files uploaded');
     }
-
     finished = true;
-
     if (sftpCache) {
       sftpCache.end();
     }
-
     if (connCache) {
       connCache.end();
     }
-
     callback();
   }
-
   return through2.obj(transform, flush);
 }
-
 export default gulpSftp;

package/lib/tasks/default.js

@@ -2,54 +2,45 @@ class DefaultTask extends BalmJS.BalmTask {
   constructor() {
     super('default');
   }
-
   get startTask() {
     const tasks = BalmJS.toNamespace(['start']);
-
     if (BalmJS.utils.isString(BalmJS.beforeTask)) {
       tasks.unshift(BalmJS.beforeTask);
     }
-
     return tasks;
   }
-
   get mainTasks() {
-    let tasks = ['clean', // Stylesheets
-    ...(BalmJS.config.styles.sprites.length ? ['sprite'] : []), 'style', // Scripts
-    ...(BalmJS.config.scripts.lint ? ['lint'] : []), 'script', // Templates
-    'html', // Other Assets
+    let tasks = ['clean',
+    // Stylesheets
+    ...(BalmJS.config.styles.sprites.length ? ['sprite'] : []), 'style',
+    // Scripts
+    ...(BalmJS.config.scripts.lint ? ['lint'] : []), 'script',
+    // Templates
+    'html',
+    // Other Assets
     ...(BalmJS.config.env.isProd || !BalmJS.config.inFrontend ? ['image', 'font', 'media'] : [])];
-
     if (BalmJS.config.env.isProd) {
-      tasks = [...tasks, 'extra', 'build', // Measure size
+      tasks = [...tasks, 'extra', 'build',
+      // Measure size
       ...(BalmJS.config.assets.cache ? ['cache'] : []), ...(BalmJS.config.pwa.enabled ? ['workbox-sw', 'pwa'] : [])];
     } else {
       tasks = [...tasks, 'modernizr', 'serve'];
     }
-
     let defaultMainTasks = BalmJS.config.useDefaults ? BalmJS.toNamespace(tasks) : [];
-
     if (BalmJS.config.env.inSSR || BalmJS.config.env.isMP || BalmJS.config.env.inDesktopApp) {
       defaultMainTasks = BalmJS.toNamespace(BalmJS.config.env.isMP ? ['style', 'script'] : ['script']);
     }
-
     return defaultMainTasks;
   }
-
   get subTasks() {
     return BalmJS.recipes.length ? BalmJS.toNamespace(BalmJS.recipes) : [];
   }
-
   get endTask() {
     const tasks = BalmJS.toNamespace(['end']);
-
     if (BalmJS.utils.isString(BalmJS.afterTask)) {
       tasks.push(BalmJS.afterTask);
     }
-
     return tasks;
   }
-
 }
-
 export default DefaultTask;

package/lib/tasks/foundation/balm.js

@@ -1,47 +1,32 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class BalmTask {
   constructor(name) {
     _defineProperty(this, "name", void 0);
-
     _defineProperty(this, "taskName", void 0);
-
     _defineProperty(this, "defaultInput", '');
-
     _defineProperty(this, "defaultOutput", '');
-
     _defineProperty(this, "input", '');
-
     _defineProperty(this, "output", '');
-
     _defineProperty(this, "customOptions", {});
-
     _defineProperty(this, "gulpSrcOptions", {});
-
     this.name = name;
     this.taskName = BalmJS.toNamespace(name);
   }
-
   get styleName() {
     let name;
-
     switch (BalmJS.config.styles.extname) {
       case 'sass':
       case 'scss':
         name = 'sass';
         break;
-
       case 'less':
         name = 'less';
         break;
-
       default:
         name = 'postcss';
     }
-
     return name;
   }
-
   get src() {
     return gulp.src(this.input, Object.assign({
       allowEmpty: true
@@ -49,22 +34,17 @@ class BalmTask {
       BalmJS.logger.error(`${this.name} task`, error.message);
     }));
   }
-
   init(input, output, options = {}) {
     let key = this.name;
-
     switch (key) {
       case 'copy':
         key = 'rename';
         break;
-
       case 'jsmin':
         key = 'terser';
         break;
-
       default:
     }
-
     const useAbsPath = !['webpack', 'rollup', 'esbuild', 'sprite'].includes(key);
     this.input = useAbsPath ? BalmJS.file.absPaths(input || this.defaultInput) : input || this.defaultInput;
     this.output = useAbsPath ? BalmJS.file.absPath(output || this.defaultOutput) : output || this.defaultOutput;
@@ -73,22 +53,17 @@ class BalmTask {
       input: this.input,
       output: this.output
     };
-
     if (options[key]) {
       obj.customOptions = this.customOptions;
     }
-
     if (useAbsPath) {
       BalmJS.logger.debug(`${this.name} task`, obj, {
         pre: true
       });
     }
-
     if (options.src) {
       this.gulpSrcOptions = options.src;
     }
   }
-
 }
-
 export default BalmTask;

package/lib/tasks/foundation/balm_style.js

@@ -1,24 +1,19 @@
 import BalmTask from './balm.js';
 import { ASSET } from '../../config/constants.js';
-
 class BalmStyleTask extends BalmTask {
   constructor(name) {
     super(name);
     let extname;
-
     switch (name) {
       case 'sass':
         extname = '{scss,sass}';
         break;
-
       case 'less':
         extname = 'less';
         break;
-
       default:
         extname = 'css';
     }
-
     if (Array.isArray(BalmJS.config.styles.entry)) {
       this.defaultInput = BalmJS.config.styles.entry.map(styleEntry => node.path.join(BalmJS.config.src.css, styleEntry));
     } else {
@@ -28,10 +23,8 @@ class BalmStyleTask extends BalmTask {
         this.defaultInput = node.path.join(BalmJS.config.src.css, '**', `!(_*).${extname}`);
       }
     }
-
     this.defaultOutput = BalmJS.config.env.isMP ? node.path.join(BalmJS.config.dest.base, ASSET.mpDir, BalmJS.config.paths.target.css) : BalmJS.config.dest.css;
   }
-
   handleStyle(style, output, options) {
     BalmJS.logger.debug(`${this.name} entry`, this.defaultInput, {
       pre: true
@@ -43,27 +36,23 @@ class BalmStyleTask extends BalmTask {
       allowEmpty: true
     }, this.gulpSrcOptions)).pipe(BalmJS.plugins.plumber(function (error) {
       // https://github.com/floatdrop/gulp-plumber/issues/30
-      BalmJS.logger.error(taskName, error.message); // Must emit end event for any dependent streams to pick up on this. Destroying the stream
+      BalmJS.logger.error(taskName, error.message);
+      // Must emit end event for any dependent streams to pick up on this. Destroying the stream
       // ensures nothing else in that stream gets done, for example, if we're dealing with five
       // files, after an error in one of them, any other won't carry on. Doing destroy without
       // ending it first will not notify depending streams, tasks like `watch` will hang up.
-
       this.emit('end');
       this.destroy();
     }));
-
     switch (style) {
       case 'sass':
         stream = stream.pipe(BalmJS.plugins.sass(options));
         break;
-
       case 'less':
         stream = stream.pipe(BalmJS.plugins.less(options));
         break;
-
       default:
     }
-
     return stream.pipe(BalmJS.plugins.postcss(BalmJS.plugins.postcssPlugins(style === 'postcss'))).pipe($.if(BalmJS.config.env.isMP, BalmJS.plugins.rename({
       extname: '.wxss'
     }))).pipe(gulp.dest(output, {
@@ -72,7 +61,5 @@ class BalmStyleTask extends BalmTask {
       stream: true
     }));
   }
-
 }
-
 export default BalmStyleTask;

package/lib/tasks/foundation/index.js

@@ -3,9 +3,7 @@ import BalmStyleTask from './balm_style.js';
 BalmJS.BalmTask = BalmTask;
 BalmJS.BalmStyleTask = BalmStyleTask;
 BalmJS.tasks = new Map(); // Main tasks
-
 BalmJS.recipes = []; // Sub tasks
-
 BalmJS.recipeIndex = 0;
 BalmJS.server = null;
 BalmJS.watchFtpFile = '';

package/lib/tasks/index.js

@@ -3,10 +3,10 @@ import PRIVATE_TASKS from './private/index.js';
 import PUBLIC_TASKS from './public/index.js';
 import DefaultTask from './default.js';
 import BalmHooks from '../hooks/index.js';
-
 function registerTasks(recipe) {
-  const AwesomeTasks = BalmJS.utils.deepMerge(PRIVATE_TASKS, PUBLIC_TASKS); // 1. Register balm tasks
+  const AwesomeTasks = BalmJS.utils.deepMerge(PRIVATE_TASKS, PUBLIC_TASKS);
 
+  // 1. Register balm tasks
   const depsTasks = [];
   const nonDepsTasks = [];
   Object.values(AwesomeTasks).forEach(AwesomeTask => {
@@ -26,8 +26,9 @@ function registerTasks(recipe) {
     };
     gulp.task(taskName, taskFunction);
     BalmJS.tasks.set(task.name, task);
-  }); // 2. Register balm hooks
+  });
 
+  // 2. Register balm hooks
   try {
     recipe(new BalmHooks());
   } catch (error) {
@@ -35,13 +36,13 @@ function registerTasks(recipe) {
       message
     } = error;
     BalmJS.logger.error('balm hook', message);
-  } // 3. Register balm default task
-
+  }
 
+  // 3. Register balm default task
   const defaultTask = new DefaultTask();
-  gulp.task(defaultTask.taskName, gulp.series(...defaultTask.startTask, ...defaultTask.mainTasks, ...defaultTask.subTasks, ...defaultTask.endTask)); // 4. Run
+  gulp.task(defaultTask.taskName, gulp.series(...defaultTask.startTask, ...defaultTask.mainTasks, ...defaultTask.subTasks, ...defaultTask.endTask));
 
+  // 4. Run
   gulp.parallel('balm:default')();
 }
-
 export default registerTasks;

package/lib/tasks/private/build.js

@@ -1,9 +1,7 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class BuildTask extends BalmJS.BalmTask {
   constructor() {
     super('build');
-
     _defineProperty(this, "fn", () => {
       this.init();
       return this.src.pipe($.size({
@@ -11,10 +9,7 @@ class BuildTask extends BalmJS.BalmTask {
         gzip: true
       }));
     });
-
     this.defaultInput = BalmJS.file.matchAllFiles(BalmJS.config.dest.base);
   }
-
 }
-
 export default BuildTask;

package/lib/tasks/private/cache.js

@@ -1,16 +1,12 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { ASSETS_TYPES, CHUNK, ASSET } from '../../config/constants.js';
-
 class CacheTask extends BalmJS.BalmTask {
   constructor() {
     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));
     });
-
     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)];
     const customIncludes = BalmJS.config.assets.includes;
@@ -20,7 +16,5 @@ 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;
   }
-
 }
-
 export default CacheTask;