Remove support for chainning at composeWith.

yeoman · Feb 20, 2021 · e9d0a15 · e9d0a15
1 parent c2245e1
commit e9d0a15
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -1051,8 +1051,7 @@ class Generator extends Base {
    * Compose this generator with another one.
    * @param  {String|Object|Array} generator  The path to the generator module or an object (see examples)
    * @param  {Object}  [options]   The options passed to the Generator
-   * @param  {boolean} [returnNewGenerator] Returns the created generator instead of returning this.
-   * @return {this|Object}    This generator or the composed generator when returnNewGenerator=true
+   * @return {Generator}    The composed generator
    *
    * @example <caption>Using a peerDependency generator</caption>
    * this.composeWith('bootstrap', { sass: true });
@@ -1063,22 +1062,15 @@ class Generator extends Base {
    * @example <caption>Passing a Generator class</caption>
    * this.composeWith({ Generator: MyGenerator, path: '../generator-bootstrap/app/main.js' }, { sass: true });
    */
-  composeWith(generator, options, returnNewGenerator = false) {
+  composeWith(generator, options) {
     if (typeof options === 'boolean') {
-      returnNewGenerator = options;
       options = {};
     }
 
-    const returnCompose = (returnValue) =>
-      returnNewGenerator ? returnValue : this;
-
     let instantiatedGenerator;
 
     if (Array.isArray(generator)) {
-      const generators = generator.map((gen) =>
-        this.composeWith(gen, options, returnNewGenerator)
-      );
-      return returnCompose(generators);
+      return generator.map((gen) => this.composeWith(gen, options));
     }
 
     const instantiate = (Generator, path) => {
@@ -1166,7 +1158,7 @@ class Generator extends Base {
     }
 
     if (!instantiatedGenerator) {
-      return returnCompose(instantiatedGenerator);
+      return instantiatedGenerator;
     }
 
     if (this._running) {
@@ -1175,7 +1167,7 @@ class Generator extends Base {
       this._composedWith.push(instantiatedGenerator);
     }
 
-    return returnCompose(instantiatedGenerator);
+    return instantiatedGenerator;
   }
 
   /**