Update cli/environment-builder.js

jhipster · Sep 15, 2022 · 931bc39 · 931bc39
1 parent 93e604a
commit 931bc39
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/cli/environment-builder.js b/cli/environment-builder.js
@@ -116,7 +116,17 @@ module.exports = class EnvironmentBuilder {
    */
   _lookupJHipster() {
     // Register jhipster generators.
-    this.env.lookup({ packagePaths: [path.join(__dirname, '../..')], lookups: ['dist/generators'] }).forEach(generator => {
+    const sourceRoot = path.basename(path.join(__dirname, '..'));
+    let packagePath;
+    let lookup;
+    if (sourceRoot === 'generator-jhipster') {
+      packagePath = path.join(__dirname, '..');
+      lookup = 'generators';
+    } else {
+      packagePath = path.join(__dirname, '../..');
+      lookup = `${sourceRoot}/generators`;
+    }
+    this.env.lookup({ packagePaths: [packagePath], lookups: [lookup] }).forEach(generator => {
       // Verify jhipster generators namespace.
       assert(
         generator.namespace.startsWith(`${CLI_NAME}:`),