yeoman-environment 5.0.0-beta.1 → 5.0.0-beta.2

package/dist/environment-base.js

@@ -328,7 +328,7 @@ export default class EnvironmentBase extends EventEmitter {
             // Backward compatibility
             const oldGenerator = generator;
             if (!oldGenerator.options.forwardErrorToEnvironment) {
-                oldGenerator.on('error', (error) => this.emit('error', error));
+                oldGenerator.on('error', (error) => this.adapter.abort(error));
             }
             oldGenerator.promise = oldGenerator.run();
         };
@@ -549,6 +549,9 @@ export default class EnvironmentBase extends EventEmitter {
      */
     async start(options) {
         return new Promise((resolve, reject) => {
+            if (this.adapter.signal?.aborted) {
+                return reject(this.adapter.signal.reason);
+            }
             Object.assign(this.options, removePropertiesWithNullishValues(pick(options, ['skipInstall', 'nodePackageManager'])));
             this.logCwd = options.logCwd ?? this.logCwd;
             const conflicterOptionsProperties = ['force', 'bail', 'ignoreWhitespace', 'dryRun', 'skipYoResolve'];
@@ -565,32 +568,26 @@ export default class EnvironmentBase extends EventEmitter {
              * would be killed if an error is thrown to environment.
              * Make sure to not rely on that behavior.
              */
-            this.on('error', async (error) => {
-                this.runLoop.pause();
-                await this.adapter.onIdle?.();
-                reject(error);
-                this.adapter.close();
+            let errorEmitted = false;
+            this.on('error', error => {
+                errorEmitted = true;
+                this.adapter.abort(error);
             });
             this.once('end', async () => {
                 await this.adapter.onIdle?.();
                 resolve();
-                this.adapter.close();
             });
             /*
              * For backward compatibility
              */
-            this.on('generator:reject', error => {
-                this.emit('error', error);
-            });
+            this.on('generator:reject', error => this.adapter.abort(error));
             /*
              * For backward compatibility
              */
             this.on('generator:resolve', () => {
                 this.emit('end');
             });
-            this.runLoop.on('error', (error) => {
-                this.emit('error', error);
-            });
+            this.runLoop.on('error', (error) => this.adapter.abort(error));
             this.runLoop.on('paused', () => {
                 this.emit('paused');
             });
@@ -598,6 +595,15 @@ export default class EnvironmentBase extends EventEmitter {
             this.runLoop.once('end', () => {
                 this.emit('end');
             });
+            this.adapter.signal?.addEventListener('abort', async () => {
+                const reason = this.adapter.signal.reason;
+                if (!errorEmitted) {
+                    this.emit('error', reason);
+                }
+                this.runLoop.pause();
+                await this.adapter.onIdle?.();
+                reject(reason);
+            });
             this.emit('run');
             this.runLoop.start();
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "keywords": [
     "development",
@@ -57,11 +57,11 @@
     "doc_path": "./yeoman-environment-doc"
   },
   "dependencies": {
-    "@yeoman/adapter": "^2.1.1",
+    "@yeoman/adapter": "^3.1.0",
     "@yeoman/conflicter": "^3.0.0",
     "@yeoman/namespace": "^1.0.1",
     "@yeoman/transform": "^2.1.0",
-    "@yeoman/types": "^1.7.1",
+    "@yeoman/types": "^1.8.0",
     "arrify": "^3.0.0",
     "chalk": "^5.5.0",
     "commander": "^14.0.0",
@@ -106,10 +106,10 @@
     "yeoman-generator-6": "npm:yeoman-generator@^6.0.1",
     "yeoman-generator-7": "npm:yeoman-generator@^7.0.0",
     "yeoman-generator-8": "npm:yeoman-generator@^8.0.0-beta.0",
-    "yeoman-test": "^10.1.1"
+    "yeoman-test": "^11.0.0-0"
   },
   "peerDependencies": {
-    "@yeoman/types": "^1.7.1",
+    "@yeoman/types": "^1.8.0",
     "mem-fs": "^4.1.2"
   },
   "engines": {