Answer stored inside config should take precedence over suggestions. (#…

…1297)
yeoman · May 18, 2021 · c1c847d · c1c847d
1 parent ce12e7f
commit c1c847d
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -529,9 +529,8 @@ class Generator extends Base {
         const value = questionStorage.getPath(name);
         if (value !== undefined) {
           question.default = value;
+          return [name, value];
         }
-
-        return [name, value];
       }
 
       return undefined;
@@ -550,18 +549,18 @@ class Generator extends Base {
 
     // Pre-fill answers with storage values.
     const answers = {};
-    questions
-      .map(getAnswerFromStorage)
-      .filter((a) => a)
-      .forEach(([key, value]) => {
-        answers[key] = value;
-      });
 
     questions = promptSuggestion.prefillQuestions(
       this._globalConfig,
       questions
     );
     questions = promptSuggestion.prefillQuestions(this.config, questions);
+    questions
+      .map(getAnswerFromStorage)
+      .filter((a) => a)
+      .forEach(([key, value]) => {
+        answers[key] = value;
+      });
 
     return this.env.adapter.prompt(questions, answers).then((answers) => {
       Object.entries(storageForQuestion).forEach(([name, questionStorage]) => {