yeoman-environment 3.15.1 → 3.16.0

package/lib/environment.js

@@ -979,17 +979,7 @@ class Environment extends Base {
     };
 
     if (schedule) {
-      this.runLoop.add(
-        'environment:run',
-        async (done, stop) => {
-          try {
-            await runGenerator();
-            done();
-          } catch (error) {
-            stop(error);
-          }
-        }
-      );
+      this.queueTask('environment:run', () => runGenerator());
     } else {
       const maybePromise = runGenerator();
       if (maybePromise && maybePromise.then) {
@@ -1314,11 +1304,10 @@ class Environment extends Base {
   queueConflicter() {
     const queueCommit = () => {
       debug('Queueing conflicts task');
-      this.runLoop.add('environment:conflicts', (done, stop) => {
+      this.queueTask('environment:conflicts', async () => {
         let customCommitTask = this.findGeneratorCustomCommitTask();
         if (customCommitTask !== undefined && customCommitTask) {
           if (typeof customCommitTask !== 'function') {
-            done();
             return;
           }
         } else {
@@ -1331,17 +1320,13 @@ class Environment extends Base {
         }
         const result = customCommitTask();
         if (!result || !result.then) {
-          done();
           return;
         }
-        return result.then(() => {
-          if (!this.enableConflicterIgnore) {
-            debug('Adding queueCommit event listener');
-            this.sharedFs.once('change', queueCommit);
-          }
-          done();
+        await result;
+        if (!this.enableConflicterIgnore) {
+          debug('Adding queueCommit event listener');
+          this.sharedFs.once('change', queueCommit);
         }
-        , stop);
       }
       , {
         once: 'write memory fs to disk'
@@ -1355,12 +1340,52 @@ class Environment extends Base {
    * Queue environment's package manager install task.
    */
   queuePackageManagerInstall() {
-    this.runLoop.add(
+    this.queueTask(
       'install',
-      (done, stop) => this.packageManagerInstallTask().then(done, stop),
+      () => this.packageManagerInstallTask(),
       {once: 'package manager install'}
     );
   }
+
+  /**
+   * Queue tasks
+   * @param {string} priority
+   * @param {(...args: any[]) => void | Promise<void>} task
+   * @param {{ once?: string, startQueue?: boolean }} [options]
+   */
+  queueTask(priority, task, options) {
+    return new Promise((resolve, reject) => {
+      this.runLoop.add(
+        priority,
+        async (done, stop) => {
+          try {
+            const result = await task();
+            done(result);
+            resolve(result);
+          } catch (error) {
+            stop(error);
+            reject(error);
+          }
+        },
+        {
+          once: options.once,
+          run: options.startQueue || false
+        }
+      );
+    });
+  }
+
+  /**
+   * Add priority
+   * @param {string} priority
+   * @param {string} [before]
+   */
+  addPriority(priority, before) {
+    if (this.runLoop.queueNames.includes(priority)) {
+      return;
+    }
+    this.runLoop.addSubQueue(priority, before);
+  }
 }
 
 Object.assign(Environment.prototype, resolver);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "3.15.1",
+  "version": "3.16.0",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",
@@ -98,10 +98,6 @@
     "textextensions": "^5.12.0",
     "untildify": "^4.0.0"
   },
-  "peerDependencies": {
-    "mem-fs": "^1.2.0 || ^2.0.0",
-    "mem-fs-editor": "^8.1.2 || ^9.0.0"
-  },
   "devDependencies": {
     "coveralls": "^3.0.2",
     "cross-spawn": "^7.0.1",