yeoman-environment 3.19.2 → 3.19.3

package/lib/environment.js

@@ -11,6 +11,7 @@ const memFs = require('mem-fs');
 const FileEditor = require('mem-fs-editor');
 const debug = require('debug')('yeoman:environment');
 const isScoped = require('is-scoped');
+const npmlog = require('npmlog');
 const semver = require('semver');
 const slash = require('slash');
 const {TrackerGroup} = require('are-we-there-yet');
@@ -51,7 +52,7 @@ function splitArgsFromString(argsString) {
   if (!argsString) {
     return result;
   }
-  const quoteSeparatedArgs = argsString.split(/("[^"]*")/).filter(Boolean);
+  const quoteSeparatedArgs = argsString.split(/("[^"]*")/).filter(x => x);
   for (const arg of quoteSeparatedArgs) {
     if (arg.match('\x22')) {
       result.push(arg.replace(/"/g, ''));
@@ -1315,49 +1316,31 @@ class Environment extends Base {
 
     let {log = true} = options;
 
+    if (log) {
+      npmlog.tracker = new TrackerGroup();
+      npmlog.enableProgress();
+      log = npmlog.newItem(name);
+    }
+
     if (!Array.isArray(transformStreams)) {
       transformStreams = [transformStreams];
     }
-
-    const progress = this.adapter.progress ? this.adapter.progress.bind(this.adapter) : (async callback => {
-      const npmlog = require('npmlog');
-      log = log && !npmlog.progressEnabled;
-      if (log) {
-        try {
-          npmlog.tracker = new TrackerGroup();
-          npmlog.enableProgress();
-          log = npmlog.newItem(name);
-        } catch {
-          // Failed to enable progress.
-          npmlog.disableProgress();
-          log = false;
-        }
-      }
-      try {
-        await callback({
-          step(prefix, message, ...args) {
-            if (log) {
-              log.completeWork(10);
-              npmlog.info(prefix, message, ...args);
-            }
-          }
-        });
-      } finally {
-        if (log) {
-          log.finish();
-          npmlog.disableProgress();
-        }
-      }
-    });
-
-    return progress(({step}) => pipeline(
+    return pipeline(
       stream,
       createModifiedTransform(),
       ...transformStreams,
       transform(file => {
-        step('Completed', path.relative(this.logCwd, file.path));
+        if (log) {
+          log.completeWork(10);
+          npmlog.info('Completed', path.relative(this.logCwd, file.path));
+        }
       }, 'environment:log')
-    ));
+    ).then(() => {
+      if (log) {
+        log.finish();
+        npmlog.disableProgress();
+      }
+    });
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "3.19.2",
+  "version": "3.19.3",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",