Add features parameter to the constructor of every generator.

generators/add/index.cjs

@@ -26,8 +26,8 @@ const { GENERATOR_ADD } = require('../generator-list');
  * @experimental
  */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     this.argument('generators', {
       type: Array,

generators/app/index.js

@@ -42,8 +42,8 @@ const {
 let useBlueprints;
 
 module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     this.option('defaults', {
       desc: 'Execute jhipster with default config',

generators/app/prompts.js

@@ -75,7 +75,7 @@ async function askForApplicationType() {
 }
 
 function askForModuleName() {
-  if (this.existingProject) return undefined;
+  if (this.existingProject || this.jhipsterConfig.baseName) return undefined;
   return this.askModuleName(this);
 }
 

generators/aws/index.js

@@ -31,8 +31,8 @@ const { MYSQL, POSTGRESQL, MARIADB } = require('../../jdl/jhipster/database-type
 let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, options) {
-    super(args, options);
+  constructor(args, options, features) {
+    super(args, options, features);
     useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_AWS);
   }
 

generators/azure-app-service/index.js

@@ -39,8 +39,8 @@ const AZURE_APP_INSIGHTS_STARTER_VERSION = '2.5.1';
 let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     this.option('skip-build', {
       desc: 'Skips building the application',

generators/azure-spring-cloud/index.js

@@ -35,8 +35,8 @@ const { GENERATOR_AZURE_SPRING_CLOUD } = require('../generator-list');
 let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     this.option('skip-build', {
       desc: 'Skips building the application',

generators/bootstrap/index.js

@@ -43,8 +43,8 @@ const { CommonDBTypes } = require('../../jdl/jhipster/field-types');
 const { STRING: TYPE_STRING, LONG: TYPE_LONG } = CommonDBTypes;
 
 module.exports = class extends BaseGenerator {
-  constructor(args, options) {
-    super(args, options, { unique: 'namespace', customCommitTask: true });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', customCommitTask: true, ...features });
 
     /*
      * When testing a generator with yeoman-test using 'withLocalConfig(localConfig)', it instantiates the

generators/ci-cd/index.js

@@ -32,8 +32,8 @@ const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
 let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     // Automatically configure Travis
     this.option('autoconfigure-travis', {

generators/client/index.js

@@ -45,8 +45,8 @@ const TYPE_UUID = CommonDBTypes.UUID;
 let useBlueprints;
 
 module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     // This adds support for a `--auth` flag
     this.option('auth', {

generators/cloudfoundry/index.js

@@ -38,8 +38,8 @@ const exec = childProcess.exec;
 let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, options) {
-    super(args, options);
+  constructor(args, options, features) {
+    super(args, options, features);
     useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_CLOUDFOUNDRY);
   }
 

generators/common/index.js

@@ -28,8 +28,8 @@ const packageJson = require('../../package.json');
 let useBlueprints;
 
 module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     if (this.options.help) {
       return;

generators/cypress/index.js

@@ -26,8 +26,8 @@ const { CYPRESS } = require('../../jdl/jhipster/test-framework-types');
 let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     if (this.options.help) {
       return;

generators/database-changelog-liquibase/index.js

@@ -38,8 +38,8 @@ const { prepareFieldForLiquibaseTemplates } = require('../../utils/liquibase');
 let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, options) {
-    super(args, options);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     assert(this.options.databaseChangelog, 'Changelog is required');
     this.databaseChangelog = this.options.databaseChangelog;

generators/database-changelog/index.js

@@ -31,8 +31,8 @@ const BASE_CHANGELOG = {
 let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, options) {
-    super(args, options, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     this.argument('entities', {
       desc: 'Which entities to generate a new changelog',

generators/docker-compose/index.js

@@ -38,8 +38,8 @@ let useBlueprints;
 
 /* eslint-disable consistent-return */
 module.exports = class extends BaseDockerGenerator {
-  constructor(args, options) {
-    super(args, options);
+  constructor(args, options, features) {
+    super(args, options, features);
     useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_DOCKER_COMPOSE);
   }
 

generators/entities-client/index.js

@@ -22,8 +22,8 @@ const { GENERATOR_ENTITIES_CLIENT } = require('../generator-list');
 let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
     if (this.options.help) return;
     this.clientEntities = this.options.clientEntities;
     useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITIES_CLIENT);

generators/entities/index.js

@@ -24,8 +24,8 @@ const { GENERATOR_ENTITIES, GENERATOR_ENTITIES_CLIENT, GENERATOR_ENTITY, GENERAT
 let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     // This makes `name` a required argument.
     this.argument('entities', {

generators/entity-client/index.js

@@ -29,13 +29,13 @@ const { GENERATOR_ENTITY_CLIENT } = require('../generator-list');
 let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
-    this.entity = opts.context;
+  constructor(args, options, features) {
+    super(args, options, features);
 
-    this.jhipsterContext = opts.jhipsterContext || opts.context;
+    this.entity = this.options.context;
+    this.jhipsterContext = this.options.jhipsterContext || this.options.context;
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_CLIENT, { context: opts.context });
+    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_CLIENT, { context: this.options.context });
   }
 
   // Public API method used by the getter and also by Blueprints

generators/entity-i18n/index.js

@@ -26,13 +26,13 @@ const BaseBlueprintGenerator = require('../generator-base-blueprint');
 let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
-    this.entity = opts.context;
-    this.jhipsterContext = opts.jhipsterContext || opts.context;
+    this.entity = this.options.context;
+    this.jhipsterContext = this.options.jhipsterContext || this.options.context;
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_I18N, { context: opts.context });
+    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_I18N, { context: this.options.context });
   }
 
   // Public API method used by the getter and also by Blueprints

generators/entity-server/index.js

@@ -30,14 +30,14 @@ const { isReservedTableName } = require('../../jdl/jhipster/reserved-keywords');
 let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
-    this.entity = opts.context;
+    this.entity = this.options.context;
 
-    this.jhipsterContext = opts.jhipsterContext || opts.context;
+    this.jhipsterContext = this.options.jhipsterContext || this.options.context;
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_SERVER, { context: opts.context });
+    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_SERVER, { context: this.options.context });
   }
 
   // Public API method used by the getter and also by Blueprints

generators/entity/index.js

@@ -68,8 +68,8 @@ const JHIPSTER_CONFIG_DIR = constants.JHIPSTER_CONFIG_DIR;
 let useBlueprints;
 
 class EntityGenerator extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts, { unique: 'argument' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'argument', ...features });
 
     // This makes `name` a required argument.
     this.argument('name', {

generators/export-jdl/index.js

@@ -26,8 +26,8 @@ const JSONToJDLConverter = require('../../jdl/converters/json-to-jdl-converter')
 const { BASE_NAME } = OptionNames;
 
 module.exports = class extends BaseGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     this.argument('jdlFile', { type: String, required: false });
 

generators/gae/index.js

@@ -37,8 +37,8 @@ const NO_CACHE_PROVIDER = cacheProviders.NO;
 
 let useBlueprints;
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
     useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_GAE);
   }
 

generators/generator-base-blueprint.js

@@ -32,8 +32,8 @@ const { mergeBlueprints, parseBluePrints, loadBlueprintsFromConfiguration, norma
  * The method signatures in public API should not be changed without a major version change
  */
 module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
-  constructor(args, opts, features) {
-    super(args, opts, features);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     if (this.options.help) {
       return;
@@ -49,7 +49,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
       this.blueprintConfig = this.blueprintStorage.createProxy();
 
       // jhipsterContext is the original generator
-      this.jhipsterContext = opts.jhipsterContext;
+      this.jhipsterContext = this.options.jhipsterContext;
 
       if (this.jhipsterContext) {
         // Fallback to the original generator if the file does not exists in the blueprint.

generators/generator-base-docker.js

@@ -32,8 +32,8 @@ const { Options: DeploymentOptions } = require('../jdl/jhipster/deployment-optio
 const { JWT_SECRET_KEY } = OptionNames;
 
 module.exports = class extends BlueprintBaseGenerator {
-  constructor(args, opts, features) {
-    super(args, opts, features);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     // This adds support for a `--skip-checks` flag
     this.option('skip-checks', {

generators/generator-base-private.js

@@ -77,8 +77,8 @@ const { SPRING_WEBSOCKET } = require('../jdl/jhipster/websocket-types');
  * The method signatures in private API can be changed without a major version change.
  */
 module.exports = class JHipsterBasePrivateGenerator extends Generator {
-  constructor(args, opts, features) {
-    super(args, opts, features);
+  constructor(args, options, features) {
+    super(args, options, features);
     // expose lodash to templates
     this._ = _;
   }

generators/generator-base.js

@@ -86,8 +86,8 @@ const NO_WEBSOCKET = websocketTypes.FALSE;
  * The method signatures in public API should not be changed without a major version change
  */
 module.exports = class JHipsterBaseGenerator extends PrivateBase {
-  constructor(args, opts, features) {
-    super(args, opts, features);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     if (!this.features.jhipsterModular) {
       // This adds support for a `--from-cli` flag

generators/generator-list.js

@@ -19,6 +19,7 @@
 
 const Generators = {
   GENERATOR_ADD: 'add',
+  GENERATOR_APP: 'app',
   GENERATOR_AWS: 'aws',
   GENERATOR_BOOTSTRAP: 'bootstrap',
   GENERATOR_AZURE_APP_SERVICE: 'azure-app-service',

generators/gradle/index.cjs

@@ -29,8 +29,8 @@ const { BUILD_TOOL, BUILD_DESTINATION } = require('../java/constants.cjs');
 const MixedChain = generateMixedChain(GENERATOR_JAVA);
 
 module.exports = class extends MixedChain {
-  constructor(args, opts, features) {
-    super(args, opts, { jhipsterModular: true, unique: 'namespace', ...features });
+  constructor(args, options, features) {
+    super(args, options, { jhipsterModular: true, unique: 'namespace', ...features });
 
     // Register options available to cli.
     if (!this.fromBlueprint) {

generators/heroku/index.js

@@ -42,8 +42,8 @@ const execCmd = util.promisify(ChildProcess.exec);
 let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     this.option('skip-build', {
       desc: 'Skips building the application',

generators/info/index.js

@@ -24,8 +24,8 @@ const BaseGenerator = require('../generator-base');
 // stderr unlike yeoman's log() so that user can easily redirect output to a file.
 /* eslint-disable no-console */
 module.exports = class extends BaseGenerator {
-  constructor(args, options) {
-    super(args, options, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     this.option('skipCommit', {
       desc: 'Skip commit',

generators/init/index.cjs

@@ -40,8 +40,8 @@ const { dependencyChain } = require('./mixin.cjs');
 const MixedChain = generateMixedChain(GENERATOR_INIT);
 
 module.exports = class extends MixedChain {
-  constructor(args, opts, features) {
-    super(args, opts, { jhipsterModular: true, unique: 'namespace', ...features });
+  constructor(args, options, features) {
+    super(args, options, { jhipsterModular: true, unique: 'namespace', ...features });
 
     // Register options available to cli.
     if (!this.fromBlueprint) {

generators/java/index.cjs

@@ -45,8 +45,8 @@ const { dependencyChain } = require('./mixin.cjs');
 const MixedChain = generateMixedChain(GENERATOR_JAVA);
 
 module.exports = class extends MixedChain {
-  constructor(args, opts, features) {
-    super(args, opts, { jhipsterModular: true, unique: 'namespace', ...features });
+  constructor(args, options, features) {
+    super(args, options, { jhipsterModular: true, unique: 'namespace', ...features });
 
     // Register options available to cli.
     if (!this.fromBlueprint) {