add ignore prompt if fs is passed to createConflicterCheckTransform

yeoman · Feb 16, 2023 · 2ec05ec · 2ec05ec
1 parent 5279fb9
commit 2ec05ec
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/lib/environment.js b/lib/environment.js
@@ -1285,14 +1285,7 @@ class Environment extends Base {
 
       const conflicterStatus = {};
       if (this.enableConflicterIgnore) {
-        conflicterStatus.fileActions = [{
-          key: 'i',
-          name: 'ignore, do not overwrite and remember (experimental)',
-          value: ({relativeFilePath}) => {
-            this.fs.append(`${this.cwd}/.yo-resolve`, `${relativeFilePath} skip`, {create: true});
-            return 'skip';
-          }
-        }];
+        conflicterStatus.fs = this.fs;
       }
 
       this.fs.commit([

diff --git a/lib/util/conflicter.js b/lib/util/conflicter.js
@@ -315,8 +315,20 @@ class Conflicter {
           value: 'edit'
         }
       );
-      if (conflicterStatus && conflicterStatus.fileActions) {
-        prompt.choices.push(...conflicterStatus.fileActions);
+      if (conflicterStatus) {
+        if (conflicterStatus.fileActions) {
+          prompt.choices.push(...conflicterStatus.fileActions);
+        }
+        if (conflicterStatus.fs) {
+          prompt.choices.push({
+            key: 'i',
+            name: 'ignore, do not overwrite and remember (experimental)',
+            value: ({relativeFilePath}) => {
+              conflicterStatus.fs.append(`${this.cwd}/.yo-resolve`, `${relativeFilePath} skip`, {create: true});
+              return 'skip';
+            }
+          });
+        }
       }
     }
 

diff --git a/test/environment.js b/test/environment.js
@@ -462,7 +462,7 @@ describe('Environment', () => {
     });
   });
 
-  describe.only('#getGeneratorMeta{}', () => {
+  describe('#getGeneratorMeta{}', () => {
     it('importGenerator should return a class', async function () {
       this.env
         .register(path.join(__dirname, './fixtures/generator-module/generators/app'), 'fixtures:generator-module');