generator-jhipster 7.3.1 → 7.4.0

package/cli/jhipster-command.js

@@ -74,9 +74,9 @@ class JHipsterCommand extends Command {
    * @private
    * Override _parseCommand to execute a callback before parsing.
    */
-  _parseCommand(operands, unknown) {
+  async _parseCommand(operands, unknown) {
     if (this._lazyBuildCommandCallBack) {
-      this._lazyBuildCommandCallBack(operands, unknown);
+      await this._lazyBuildCommandCallBack(operands, unknown);
     }
     return super._parseCommand(operands, unknown);
   }

package/cli/program.js

@@ -93,7 +93,7 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
       .excessArgumentsCallback(function (receivedArgs) {
         rejectExtraArgs(program, this.name(), receivedArgs);
       })
-      .lazyBuildCommand(function (operands) {
+      .lazyBuildCommand(async function (operands) {
         logger.debug(`cmd: lazyBuildCommand ${cmdName} ${operands}`);
         const command = this;
         if (cmdName === 'run') {
@@ -103,25 +103,27 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
             namespace => `${namespace.startsWith(JHIPSTER_NS) ? '' : `${JHIPSTER_NS}-`}${namespace}`
           );
           envBuilder.lookupGenerators(command.generatorNamespaces.map(namespace => `generator-${namespace.split(':')[0]}`));
-          command.generatorNamespaces.forEach(namespace => {
-            if (!env.getPackagePath(namespace)) {
-              logger.fatal(chalk.red(`\nGenerator ${namespace} not found.\n`));
-            }
-            const generator = env.create(namespace, { options: { help: true } });
-            this.addGeneratorArguments(generator._arguments).addGeneratorOptions(generator._options);
-          });
+          await Promise.all(
+            command.generatorNamespaces.map(async namespace => {
+              if (!(await env.getPackagePath(namespace))) {
+                logger.fatal(chalk.red(`\nGenerator ${namespace} not found.\n`));
+              }
+              const generator = await env.create(namespace, { options: { help: true } });
+              this.addGeneratorArguments(generator._arguments).addGeneratorOptions(generator._options);
+            })
+          );
           return;
         }
         if (!opts.cliOnly || cmdName === 'jdl') {
           if (opts.blueprint) {
             // Blueprint only command.
-            const generator = env.create(`${packageNameToNamespace(opts.blueprint)}:${cmdName}`, { options: { help: true } });
+            const generator = await env.create(`${packageNameToNamespace(opts.blueprint)}:${cmdName}`, { options: { help: true } });
             command.addGeneratorArguments(generator._arguments).addGeneratorOptions(generator._options);
           } else {
             const generatorName = cmdName === 'jdl' ? 'app' : cmdName;
             // Register jhipster upstream options.
             if (cmdName !== 'jdl') {
-              const generator = env.create(`${JHIPSTER_NS}:${cmdName}`, { options: { help: true } });
+              const generator = await env.create(`${JHIPSTER_NS}:${cmdName}`, { options: { help: true } });
               command.addGeneratorArguments(generator._arguments).addGeneratorOptions(generator._options);
 
               const usagePath = path.resolve(generator.sourceRoot(), '../USAGE');
@@ -130,34 +132,34 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
               }
             }
             if (cmdName === 'jdl' || program.opts().fromJdl) {
-              const appGenerator = env.create(`${JHIPSTER_NS}:app`, { options: { help: true } });
+              const appGenerator = await env.create(`${JHIPSTER_NS}:app`, { options: { help: true } });
               command.addGeneratorOptions(appGenerator._options, chalk.gray(' (application)'));
 
-              const workspacesGenerator = env.create(`${JHIPSTER_NS}:workspaces`, { options: { help: true } });
+              const workspacesGenerator = await env.create(`${JHIPSTER_NS}:workspaces`, { options: { help: true } });
               command.addGeneratorOptions(workspacesGenerator._options, chalk.gray(' (workspaces)'));
             }
 
             // Register blueprint specific options.
-            envBuilder.getBlueprintsNamespaces().forEach(blueprintNamespace => {
-              const generatorNamespace = `${blueprintNamespace}:${generatorName}`;
-              if (!env.get(generatorNamespace)) {
-                return;
-              }
-              const blueprintName = blueprintNamespace.replace(/^jhipster-/, '');
-              try {
-                command.addGeneratorOptions(
-                  env.create(generatorNamespace, { options: { help: true } })._options,
-                  chalk.yellow(` (blueprint option: ${blueprintName})`)
-                );
-              } catch (error) {
-                logger.info(`Error parsing options for generator ${generatorNamespace}, error: ${error}`);
-              }
-            });
+            await Promise.all(
+              envBuilder.getBlueprintsNamespaces().map(async blueprintNamespace => {
+                const generatorNamespace = `${blueprintNamespace}:${generatorName}`;
+                if (!(await env.get(generatorNamespace))) {
+                  return;
+                }
+                const blueprintName = blueprintNamespace.replace(/^jhipster-/, '');
+                const blueprintGenerator = await env.create(generatorNamespace, { options: { help: true } });
+                try {
+                  command.addGeneratorOptions(blueprintGenerator._options, chalk.yellow(` (blueprint option: ${blueprintName})`));
+                } catch (error) {
+                  logger.info(`Error parsing options for generator ${generatorNamespace}, error: ${error}`);
+                }
+              })
+            );
           }
         }
         command.addHelpText('after', moreInfo);
       })
-      .action((...everything) => {
+      .action(async (...everything) => {
         logger.debug('cmd: action');
         // [args, opts, command]
         const command = everything.pop();
@@ -177,7 +179,7 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
           logger.debug('Executing CLI only script');
           return loadCommand(cmdName)(args, options, env, envBuilder);
         }
-        env.composeWith('jhipster:bootstrap', options);
+        await env.composeWith('jhipster:bootstrap', options);
 
         if (cmdName === 'run') {
           return Promise.all(command.generatorNamespaces.map(generator => env.run(generator, options))).then(

package/generators/app/index.js

@@ -25,6 +25,7 @@ const prompts = require('./prompts');
 const packagejs = require('../../package.json');
 const statistics = require('../statistics');
 const { appDefaultConfig } = require('../generator-defaults');
+const { GENERATOR_APP } = require('../generator-list');
 const { JHIPSTER_CONFIG_DIR, GENERATOR_JHIPSTER } = require('../generator-constants');
 const { MICROSERVICE } = require('../../jdl/jhipster/application-types');
 const { OptionNames } = require('../../jdl/jhipster/application-options');
@@ -39,8 +40,6 @@ const {
   GENERATOR_SERVER,
 } = require('../generator-list');
 
-let useBlueprints;
-
 module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -293,8 +292,12 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
     this.existingProject = this.jhipsterConfig.baseName !== undefined && this.jhipsterConfig.applicationType !== undefined;
     // preserve old jhipsterVersion value for cleanup which occurs after new config is written into disk
     this.jhipsterOldVersion = this.jhipsterConfig.jhipsterVersion;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints('app');
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_APP);
+    }
   }
 
   _initializing() {
@@ -343,7 +346,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) {
+    if (this.delegateToBlueprint) {
       return;
     }
     return this._initializing();
@@ -358,7 +361,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return;
     return this._prompting();
   }
 
@@ -385,7 +388,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return;
     return this._configuring();
   }
 
@@ -402,16 +405,16 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
        * When composing in different tasks the result would be:
        * - composeCommon (app) -> initializing (common) -> prompting (common) -> ... -> composeServer (app) -> initializing (server) -> ...
        */
-      compose() {
-        this.composeWithJHipster(GENERATOR_COMMON, true);
+      async compose() {
+        await this.composeWithJHipster(GENERATOR_COMMON, true);
         if (!this.jhipsterConfig.skipServer) {
-          this.composeWithJHipster(GENERATOR_SERVER, true);
+          await this.composeWithJHipster(GENERATOR_SERVER, true);
         }
         if (!this.jhipsterConfig.skipClient) {
-          this.composeWithJHipster(GENERATOR_CLIENT, true);
+          await this.composeWithJHipster(GENERATOR_CLIENT, true);
         }
         if (!this.configOptions.skipI18n) {
-          this.composeWithJHipster(
+          await this.composeWithJHipster(
             GENERATOR_LANGUAGES,
             {
               regenerate: true,
@@ -441,26 +444,28 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
         this.config.set(config);
       },
 
-      composeEntities() {
+      async composeEntities() {
         if (!this.options.withEntities) return;
-        this.composeWithJHipster(GENERATOR_ENTITIES, { skipInstall: true }, true);
+        await this.composeWithJHipster(GENERATOR_ENTITIES, { skipInstall: true }, true);
       },
 
-      composePages() {
+      async composePages() {
         if (!this.jhipsterConfig.pages || this.jhipsterConfig.pages.length === 0 || this.configOptions.skipComposePage) return;
         this.configOptions.skipComposePage = true;
-        this.jhipsterConfig.pages.forEach(page => {
-          this.composeWithJHipster(page.generator || GENERATOR_PAGE, [page.name], {
-            skipInstall: true,
-            page,
-          });
-        });
+        await Promise.all(
+          this.jhipsterConfig.pages.map(page => {
+            return this.composeWithJHipster(page.generator || GENERATOR_PAGE, [page.name], {
+              skipInstall: true,
+              page,
+            });
+          })
+        );
       },
     };
   }
 
   get composing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return;
     return this._composing();
   }
 
@@ -479,7 +484,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return;
     return this._default();
   }
 
@@ -495,7 +500,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return;
     return this._writing();
   }
 
@@ -512,7 +517,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
   }
 
   get install() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return;
     return this._install();
   }
 
@@ -556,7 +561,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return;
     return this._end();
   }
 

package/generators/aws/index.js

@@ -28,12 +28,12 @@ const { BUILD_TOOL, BASE_NAME, PROD_DATABASE_TYPE } = OptionNames;
 
 const { MYSQL, POSTGRESQL, MARIADB } = require('../../jdl/jhipster/database-types');
 
-let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_AWS);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_AWS);
+    }
   }
 
   _initializing() {
@@ -90,7 +90,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -99,7 +99,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -128,7 +128,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -286,7 +286,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 };

package/generators/aws/lib/eb.js

@@ -214,7 +214,7 @@ function getLatestSolutionStackName(callback) {
   }
 
   function filterCriteria(element) {
-    return element.includes('Tomcat 8');
+    return element.includes('Tomcat 8.5 Corretto 11');
   }
 }
 

package/generators/azure-app-service/index.js

@@ -36,7 +36,6 @@ const AZURE_WEBAPP_MAVEN_PLUGIN_VERSION = '1.8.0';
 const AZURE_WEBAPP_RUNTIME = 'JAVA|11-java11';
 const AZURE_APP_INSIGHTS_STARTER_VERSION = '2.5.1';
 
-let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -63,7 +62,12 @@ module.exports = class extends BaseBlueprintGenerator {
     this.azureSpringCloudSkipBuild = this.options.skipBuild;
     this.azureSpringCloudSkipDeploy = this.options.skipDeploy || this.options.skipBuild;
     this.azureSpringCloudSkipInsights = this.options.skipInsights;
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_AZURE_APP_SERVICE);
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_AZURE_APP_SERVICE);
+    }
   }
 
   _initializing() {
@@ -99,7 +103,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -246,7 +250,7 @@ ${chalk.red('https://docs.microsoft.com/en-us/cli/azure/install-azure-cli/?WT.mc
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -265,7 +269,7 @@ ${chalk.red('https://docs.microsoft.com/en-us/cli/azure/install-azure-cli/?WT.mc
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -485,7 +489,7 @@ which is free for the first 30 days`);
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -506,7 +510,7 @@ which is free for the first 30 days`);
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -524,7 +528,7 @@ which is free for the first 30 days`);
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -648,7 +652,7 @@ You need a GitHub project correctly configured in order to use GitHub Actions.`
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/azure-spring-cloud/index.js

@@ -32,7 +32,6 @@ const NO_CACHE_PROVIDER = cacheTypes.NO;
 const { MAVEN } = require('../../jdl/jhipster/build-tool-types');
 const { GENERATOR_AZURE_SPRING_CLOUD } = require('../generator-list');
 
-let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -52,7 +51,12 @@ module.exports = class extends BaseBlueprintGenerator {
 
     this.azureSpringCloudSkipBuild = this.options.skipBuild;
     this.azureSpringCloudSkipDeploy = this.options.skipDeploy || this.options.skipBuild;
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_AZURE_SPRING_CLOUD);
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_AZURE_SPRING_CLOUD);
+    }
   }
 
   _initializing() {
@@ -89,7 +93,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -255,7 +259,7 @@ ${chalk.red('az extension add --name spring-cloud')}`
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -272,7 +276,7 @@ ${chalk.red('az extension add --name spring-cloud')}`
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -315,7 +319,7 @@ ${chalk.red('az extension add --name spring-cloud')}`
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -331,7 +335,7 @@ ${chalk.red('az extension add --name spring-cloud')}`
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -359,7 +363,7 @@ ${chalk.red('az extension add --name spring-cloud')}`
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -485,7 +489,7 @@ for more detailed information.`
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/bootstrap/index.js

@@ -17,15 +17,15 @@
  * limitations under the License.
  */
 const { State } = require('mem-fs-editor');
-const filter = require('gulp-filter');
 const _ = require('lodash');
-const path = require('path');
 const {
-  createEachFileTransform,
+  createConflicterCheckTransform,
   createConflicterStatusTransform,
   createYoRcTransform,
   createYoResolveTransform,
-} = require('yeoman-environment/lib/util/transform');
+  patternFilter,
+  patternSpy,
+} = require('yeoman-environment/transform');
 
 const { hasState, setModifiedFileState } = State;
 
@@ -101,17 +101,17 @@ module.exports = class extends BaseGenerator {
           this.debug('Skipping commit prettier');
           return;
         }
-        await this._commitSharedFs(this.env.sharedFs.stream().pipe(filter(['.prettierrc**', '.prettierignore'])), true);
+        await this._commitSharedFs(this.env.sharedFs.stream().pipe(patternFilter('**/{.prettierrc**,.prettierignore}')), true);
       },
       async commitFiles() {
         if (this.options.skipCommit) {
           this.debug('Skipping commit files');
           return;
         }
-        await this._commitSharedFs();
         this.env.sharedFs.once('change', () => {
           this._queueCommit();
         });
+        await this._commitSharedFs();
       },
     };
   }
@@ -128,11 +128,11 @@ module.exports = class extends BaseGenerator {
     this.queueTask(
       {
         method: async () => {
-          await this._commitSharedFs();
           this.debug('Adding queueCommit event listener');
           this.env.sharedFs.once('change', () => {
             this._queueCommit();
           });
+          await this._commitSharedFs();
         },
       },
       {
@@ -147,63 +147,53 @@ module.exports = class extends BaseGenerator {
    * @param {Stream} [stream] - files stream, defaults to this.sharedFs.stream().
    * @return {Promise}
    */
-  _commitSharedFs(stream = this.env.sharedFs.stream(), skipPrettier = this.options.skipPrettier) {
-    return new Promise((resolve, reject) => {
-      this.env.sharedFs.each(file => {
-        if (
-          file.contents &&
-          (path.basename(file.path) === '.yo-rc.json' ||
-            (path.extname(file.path) === '.json' && path.basename(path.dirname(file.path)) === '.jhipster'))
-        ) {
-          if (!hasState(file) && !this.options.reproducibleTests) {
-            setModifiedFileState(file);
-          }
+  async _commitSharedFs(stream = this.env.sharedFs.stream(), skipPrettier = this.options.skipPrettier) {
+    // JDL writes directly to disk, set the file as modified so prettier will be applied
+    stream = stream.pipe(
+      patternSpy(file => {
+        if (file.contents && !hasState(file) && !this.options.reproducibleTests) {
+          setModifiedFileState(file);
         }
-      });
-      const yoResolveTranform = this.options.skipYoResolve ? [] : [createYoResolveTransform(this.env.conflicter)];
-      const transformStreams = [
-        // multi-step changes the file path, should be executed earlier in the pipeline
-        new MultiStepTransform(),
-        ...yoResolveTranform,
-        createYoRcTransform(),
-        createEachFileTransform(file => {
-          if (path.extname(file.path) === '.json' && path.basename(path.dirname(file.path)) === '.jhipster') {
-            file.conflicter = 'force';
-          }
-          return file;
-        }),
-      ];
-
-      if (this.jhipsterConfig.withGeneratedFlag) {
-        transformStreams.push(generatedAnnotationTransform(this));
-      }
+      }, '**/{.yo-rc.json,.jhipster/*.json}').name('jhipster:config-files:modify')
+    );
 
-      if (!skipPrettier) {
-        const prettierOptions = { packageJson: true, java: !this.skipServer && !this.jhipsterConfig.skipServer };
-        // Prettier is clever, it uses correct rules and correct parser according to file extension.
-        const filterPatternForPrettier = `{,.,**/,**/.,.jhipster/**/}*.{${this.getPrettierExtensions()}}`;
-        // docker-compose modifies .yo-rc.json from others folder, match them all.
-        const prettierFilter = filter(['**/.yo-rc.json', filterPatternForPrettier], { restore: true });
-        // this pipe will pass through (restore) anything that doesn't match typescriptFilter
-        transformStreams.push(prettierFilter, prettierTransform(prettierOptions, this, this.options.ignoreErrors), prettierFilter.restore);
-      }
+    const conflicterStatus = {
+      fileActions: [
+        {
+          key: 'i',
+          name: 'ignore, do not overwrite and remember (experimental)',
+          value: ({ relativeFilePath }) => {
+            this.env.fs.append(`${this.env.cwd}/.yo-resolve`, `${relativeFilePath} skip`, { create: true });
+            return 'skip';
+          },
+        },
+      ],
+    };
 
-      transformStreams.push(
-        createEachFileTransform(file => this.env.conflicter.checkForCollision(file), { ordered: false, maxParallel: 10 }),
-        createConflicterStatusTransform()
-      );
+    const yoResolveTranform = this.options.skipYoResolve ? [] : [createYoResolveTransform(this.env.conflicter)];
+    const transformStreams = [
+      // multi-step changes the file path, should be executed earlier in the pipeline
+      new MultiStepTransform(),
+      ...yoResolveTranform,
+      createYoRcTransform(),
+      patternSpy(file => {
+        file.conflicter = 'force';
+      }, '**/.jhipster/*.json').name('jhipster:config-files:force'),
+    ];
+
+    if (this.jhipsterConfig.withGeneratedFlag) {
+      transformStreams.push(generatedAnnotationTransform(this));
+    }
 
-      this.env.fs.commit(transformStreams, stream, (error, value) => {
-        if (error) {
-          reject(error);
-          return;
-        }
+    if (!skipPrettier) {
+      const prettierOptions = { packageJson: true, java: !this.skipServer && !this.jhipsterConfig.skipServer };
+      // Prettier is clever, it uses correct rules and correct parser according to file extension.
+      transformStreams.push(prettierTransform(prettierOptions, this, this.options.ignoreErrors));
+    }
 
-        // Force to empty Conflicter queue.
-        this.env.conflicter.queue.once('end', () => resolve(value));
-        this.env.conflicter.queue.run();
-      });
-    });
+    transformStreams.push(createConflicterCheckTransform(this.env.conflicter, conflicterStatus), createConflicterStatusTransform());
+
+    await this.env.fs.commit(transformStreams, stream);
   }
 
   _createUserManagementEntities() {