From 66752e4b07a6da5eb93b9ae53ad66aacd025c2a8 Mon Sep 17 00:00:00 2001
From: Marcelo Shima <marceloshima@gmail.com>
Date: Tue, 18 Jan 2022 15:37:30 -0300
Subject: [PATCH] Move _postConstruct from create to instantiate. (#382)

---
 lib/environment.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/environment.js b/lib/environment.js
index eeb5af46..af5d8f25 100644
--- a/lib/environment.js
+++ b/lib/environment.js
@@ -764,16 +764,10 @@ class Environment extends Base {
     };
 
     maybeGenerator = maybeGenerator || this.get(namespaceOrPath);
-    if (maybeGenerator && (maybeGenerator.then || maybeGenerator.prototype._postConstruct)) {
+    if (maybeGenerator && maybeGenerator.then) {
       return Promise.resolve(maybeGenerator)
         .then(Generator => checkGenerator(Generator))
-        .then(Generator => this.instantiate(Generator, args, options))
-        .then(async generator => {
-          if (!options.help && generator._postConstruct) {
-            await generator._postConstruct();
-          }
-          return generator;
-        });
+        .then(Generator => this.instantiate(Generator, args, options));
     }
 
     return this.instantiate(checkGenerator(maybeGenerator), args, options);
@@ -816,6 +810,10 @@ class Environment extends Base {
       ...environmentOptions
     };
 
+    if (!options.help && generator._postConstruct) {
+      return Promise.resolve(generator._postConstruct()).then(() => generator);
+    }
+
     return generator;
   }