Refactored to support yeoman-generator v3

no issue
TryGhost · Mar 9, 2023 · b28d7f3 · b28d7f3
1 parent 18b1277
commit b28d7f3
Show file tree

Hide file tree

Showing 3 changed files with 1,626 additions and 65 deletions.
diff --git a/packages/slimer/lib/cli-yo.js b/packages/slimer/lib/cli-yo.js
@@ -14,20 +14,18 @@ class CliYo {
         this.loaded = false;
     }
 
-    loadEnv(cb) {
-        env.lookup(() => {
-            this.loaded = true;
-            cb();
-        });
+    loadEnv() {
+        env.lookup();
+        this.loaded = true;
     }
 
-    findGenerator(name, cb) {
+    findGenerator(name) {
         // @TODO: validation / error handling
         if (!this.loaded) {
-            return this.loadEnv(() => cb(env.get(name)));
+            this.loadEnv();
         }
 
-        return cb(env.get(name));
+        return env.get(name);
     }
 
     initGeneratorHelp(Generator) {
@@ -53,26 +51,25 @@ class CliYo {
     }
 
     yoToSywac(name, cb) {
-        this.findGenerator(name, (Generator) => {
-            let {args, options} = this.initGeneratorHelp(Generator);
-            const yoDefaults = ['help', 'skip-cache', 'skip-install'];
-
-            const toSywac = (t) => {
-                let tt = _.clone(t);
-                tt.type = t.type.name.toLowerCase();
-                tt.flags = `--${t.name}`;
-                tt.defaultValue = t.default;
-                return tt;
-            };
+        const Generator = this.findGenerator(name);
+        let {args, options} = this.initGeneratorHelp(Generator);
+        const yoDefaults = ['help', 'skip-cache', 'skip-install'];
+
+        const toSywac = (t) => {
+            let tt = _.clone(t);
+            tt.type = t.type.name.toLowerCase();
+            tt.flags = `--${t.name}`;
+            tt.defaultValue = t.default;
+            return tt;
+        };
 
-            args = _.map(args, toSywac);
+        args = _.map(args, toSywac);
 
-            options = _(options).filter((opt) => {
-                return !_.includes(yoDefaults, opt.name);
-            }).map(toSywac).value();
+        options = _(options).filter((opt) => {
+            return !_.includes(yoDefaults, opt.name);
+        }).map(toSywac).value();
 
-            cb(args, options);
-        });
+        cb(args, options);
     }
 
     callGenerator(name, argv, cb) {

diff --git a/packages/slimer/package.json b/packages/slimer/package.json
@@ -35,6 +35,6 @@
     "is-public": "^1.1.0",
     "lodash": "^4.17.11",
     "mkdirp": "^0.5.1",
-    "yeoman-environment": "^2.3.3"
+    "yeoman-environment": "^3.15.1"
   }
 }