yeoman-environment 3.15.0 → 3.15.1

package/lib/environment.js

@@ -33,6 +33,7 @@ const {
   createYoRcTransform,
   createYoResolveTransform
 } = require('./util/transform');
+const {requireOrImport} = require('./util/esm');
 
 const {isFilePending} = FileEditor.State;
 
@@ -564,13 +565,15 @@ class Environment extends Base {
       return;
     }
 
-    // eslint-disable-next-line node/no-unsupported-features/es-syntax
-    const importModule = async () => import(meta.resolved);
-    const instantiate = async (args, options) => this.instantiate(await this._findGeneratorClass(await meta.importGenerator()), args, options);
+    const {importGenerator, resolved} = meta;
+    const importModule = async () => requireOrImport(resolved);
+    const importGeneratorClass = async () => this._findGeneratorClass(await importGenerator(), meta);
+    const instantiate = async (args, options) => this.instantiate(await importGeneratorClass(), args, options);
     const instantiateHelp = async () => instantiate([], {help: true});
     const newMeta = {
       ...meta,
       importModule,
+      importGeneratorClass,
       instantiate,
       instantiateHelp
     };
@@ -1282,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([

package/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';
+            }
+          });
+        }
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "3.15.0",
+  "version": "3.15.1",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",