diff --git a/generators/angular-audit/generator.js b/generators/angular-audit/generator.js index 3460946..00eab2f 100644 --- a/generators/angular-audit/generator.js +++ b/generators/angular-audit/generator.js @@ -4,6 +4,10 @@ import { clientApplicationTemplatesBlock } from 'generator-jhipster/generators/c export default class extends BaseApplicationGenerator { ngxDiff; + constructor(args, opts, features) { + super(args, opts, { ...features, queueCommandTasks: true }); + } + async beforeQueue() { await this.dependsOnJHipster('bootstrap-application'); } diff --git a/generators/client/generator.js b/generators/client/generator.js index e1bc9ad..58c7962 100644 --- a/generators/client/generator.js +++ b/generators/client/generator.js @@ -2,7 +2,7 @@ import BaseApplicationGenerator from 'generator-jhipster/generators/base-applica export default class extends BaseApplicationGenerator { constructor(args, opts, features) { - super(args, opts, { ...features, sbsBlueprint: true }); + super(args, opts, { ...features, queueCommandTasks: true, sbsBlueprint: true }); } async beforeQueue() { diff --git a/generators/java-audit/generator.js b/generators/java-audit/generator.js index ff86375..d9bb11d 100644 --- a/generators/java-audit/generator.js +++ b/generators/java-audit/generator.js @@ -38,6 +38,10 @@ const ADDITIONAL_FIELDS = [ ]; export default class extends BaseApplicationGenerator { + constructor(args, opts, features) { + super(args, opts, { ...features, queueCommandTasks: true }); + } + async beforeQueue() { await this.dependsOnJHipster('java'); } diff --git a/generators/languages/generator.js b/generators/languages/generator.js index 7621f7b..a2cc2fe 100644 --- a/generators/languages/generator.js +++ b/generators/languages/generator.js @@ -4,7 +4,7 @@ import BaseApplicationGenerator from 'generator-jhipster/generators/base-applica export default class extends BaseApplicationGenerator { constructor(args, opts, features) { - super(args, opts, { ...features, sbsBlueprint: true }); + super(args, opts, { ...features, queueCommandTasks: true, sbsBlueprint: true }); } async beforeQueue() { diff --git a/generators/server/generator.js b/generators/server/generator.js index 6906389..01c3edd 100644 --- a/generators/server/generator.js +++ b/generators/server/generator.js @@ -1,12 +1,11 @@ import BaseApplicationGenerator from 'generator-jhipster/generators/base-application'; -import command from './command.js'; export default class extends BaseApplicationGenerator { initialRun; auditedEntities; constructor(args, opts, features) { - super(args, opts, { ...features, sbsBlueprint: true }); + super(args, opts, { ...features, queueCommandTasks: true, sbsBlueprint: true }); } get [BaseApplicationGenerator.INITIALIZING]() { @@ -14,17 +13,6 @@ export default class extends BaseApplicationGenerator { setInitialRun() { this.initialRun = this.blueprintConfig.auditFramework === undefined; }, - async initializeOptions() { - this.parseJHipsterCommand(command); - }, - }); - } - - get [BaseApplicationGenerator.PROMPTING]() { - return this.asPromptingTaskGroup({ - async promptingTemplateTask() { - await this.prompt(this.prepareQuestions(command.configs)); - }, }); } diff --git a/generators/spring-boot-custom-audit/generator.js b/generators/spring-boot-custom-audit/generator.js index c03f440..259587f 100644 --- a/generators/spring-boot-custom-audit/generator.js +++ b/generators/spring-boot-custom-audit/generator.js @@ -3,6 +3,10 @@ import BaseApplicationGenerator from 'generator-jhipster/generators/base-applica import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock } from 'generator-jhipster/generators/java/support'; export default class extends BaseApplicationGenerator { + constructor(args, opts, features) { + super(args, opts, { ...features, queueCommandTasks: true }); + } + async beforeQueue() { await this.dependsOnJHipster('jhipster-entity-audit:java-audit'); await this.dependsOnJHipster('spring-boot'); diff --git a/generators/spring-boot-javers/generator.js b/generators/spring-boot-javers/generator.js index 3e2c2bb..3cf04fc 100644 --- a/generators/spring-boot-javers/generator.js +++ b/generators/spring-boot-javers/generator.js @@ -4,6 +4,10 @@ import { javaMainPackageTemplatesBlock } from 'generator-jhipster/generators/jav import { getPomVersionProperties } from 'generator-jhipster/generators/server/support'; export default class extends BaseApplicationGenerator { + constructor(args, opts, features) { + super(args, opts, { ...features, queueCommandTasks: true }); + } + async beforeQueue() { await this.dependsOnJHipster('jhipster-entity-audit:java-audit'); await this.dependsOnJHipster('spring-boot');