generator-jhipster 7.8.0 → 7.9.1

package/README.md

@@ -8,7 +8,7 @@ Greetings, Java Hipster!
 
 Full documentation and information is available on our website at [https://www.jhipster.tech/][jhipster-url]
 
-Please read our [guidelines](/CONTRIBUTING.md#submitting-an-issue) before submitting an issue. If your issue is a bug, please use the bug template pre-populated [here][issue-template]. For feature requests and queries you can use [this template][feature-template].
+Please read our [guidelines](/CONTRIBUTING.md#submitting-an-issue) before submitting an issue. If your issue is a bug, please use the bug template pre-populated [here][issue-template]. For feature requests and queries you can use [this template][feature-template]. If you have found a potential security issue, please read our security policy and contact us privately first: https://github.com/jhipster/generator-jhipster/security/policy
 
 ## Contributing
 

package/cli/environment-builder.js

@@ -41,7 +41,9 @@ module.exports = class EnvironmentBuilder {
   /**
    * Creates a new EnvironmentBuilder with a new Environment.
    *
-   * @param {...any} args - Arguments passed to Environment.createEnv().
+   * @param {any} args - Arguments passed to Environment.createEnv().
+   * @param {Object} [options] - options passed to Environment.createEnv().
+   * @param [adapter] - adapter passed to Environment.createEnv().
    * @return {EnvironmentBuilder} envBuilder
    */
   static create(args, options = {}, adapter) {

package/cli/import-jdl.js

@@ -140,10 +140,10 @@ function writeApplicationConfig(applicationWithEntities, basePath) {
  * @param {string} options.cwd
  * @param {boolean} options.fork
  * @param {Environment} options.env
- * @param {Object} generatorOptions
- * @param {Promise}
+ * @param {Object} [generatorOptions]
  */
-function runGenerator(command, { cwd, fork, env }, generatorOptions = {}) {
+function runGenerator(command, { cwd, fork, env, createEnvBuilder }, generatorOptions = {}) {
+  const { workspaces } = generatorOptions;
   generatorOptions = {
     ...generatorOptions,
     // Remove jdl command exclusive options
@@ -161,6 +161,9 @@ function runGenerator(command, { cwd, fork, env }, generatorOptions = {}) {
     commandName: undefined,
     fromJdl: true,
   };
+  if (workspaces) {
+    generatorOptions.skipInstall = true;
+  }
   if (!generatorOptions.blueprints) {
     delete generatorOptions.blueprints;
   }
@@ -168,7 +171,7 @@ function runGenerator(command, { cwd, fork, env }, generatorOptions = {}) {
   if (!fork) {
     const oldCwd = process.cwd();
     process.chdir(cwd);
-    env = env || EnvironmentBuilder.createDefaultBuilder(undefined, { cwd }).getEnvironment();
+    env = env || createEnvBuilder(undefined, { cwd }).getEnvironment();
     return env
       .run(`${CLI_NAME}:${command}`, generatorOptions)
       .then(
@@ -260,10 +263,11 @@ const generateDeploymentFiles = ({ processor, deployment }) => {
   logger.info(`Generating deployment ${deploymentType} in a new parallel process`);
   logger.debug(`Generating deployment: ${JSON.stringify(deployment[GENERATOR_NAME], null, 2)}`);
 
-  const cwd = path.join(processor.pwd, deploymentType);
+  const { pwd, createEnvBuilder } = processor;
+  const cwd = path.join(pwd, deploymentType);
   logger.debug(`Child process will be triggered for ${jhipsterCli} with cwd: ${cwd}`);
 
-  return runGenerator(deploymentType, { cwd, fork: false }, { force: true, ...processor.options, skipPrompts: true });
+  return runGenerator(deploymentType, { cwd, fork: false, createEnvBuilder }, { force: true, ...processor.options, skipPrompts: true });
 };
 
 /**
@@ -273,7 +277,7 @@ const generateDeploymentFiles = ({ processor, deployment }) => {
  */
 const generateApplicationFiles = ({ processor, applicationWithEntities }) => {
   logger.debug(`Generating application: ${JSON.stringify(applicationWithEntities.config, null, 2)}`);
-  const { inFolder, fork, force, reproducible } = processor;
+  const { inFolder, fork, force, reproducible, createEnvBuilder } = processor;
   const baseName = applicationWithEntities.config.baseName;
   const cwd = inFolder ? path.join(processor.pwd, baseName) : processor.pwd;
   if (processor.options.jsonOnly) {
@@ -290,7 +294,7 @@ const generateApplicationFiles = ({ processor, applicationWithEntities }) => {
     generatorOptions.applicationWithEntities = applicationWithEntities;
   }
 
-  return runGenerator('app', { cwd, fork }, generatorOptions);
+  return runGenerator('app', { cwd, fork, createEnvBuilder }, generatorOptions);
 };
 
 /**
@@ -301,7 +305,7 @@ const generateApplicationFiles = ({ processor, applicationWithEntities }) => {
  * @return Promise
  */
 const generateEntityFiles = (processor, exportedEntities, env) => {
-  const { fork, inFolder, force } = processor;
+  const { fork, inFolder, force, createEnvBuilder } = processor;
   const generatorOptions = {
     force,
     ...processor.options,
@@ -325,7 +329,7 @@ const generateEntityFiles = (processor, exportedEntities, env) => {
     logger.info(`Generating entities for application ${baseName} in a new parallel process`);
 
     logger.debug(`Child process will be triggered for ${jhipsterCli} with cwd: ${cwd}`);
-    return runGenerator('entities', { cwd, env, fork }, generatorOptions);
+    return runGenerator('entities', { cwd, env, fork, createEnvBuilder }, generatorOptions);
   };
 
   if (fork) {
@@ -343,7 +347,7 @@ const generateEntityFiles = (processor, exportedEntities, env) => {
 };
 
 class JDLProcessor {
-  constructor(jdlFiles, jdlContent, options) {
+  constructor(jdlFiles, jdlContent, options, createEnvBuilder) {
     logger.debug(
       `JDLProcessor started with ${jdlContent ? `content: ${jdlContent}` : `files: ${jdlFiles}`} and options: ${toString(options)}`
     );
@@ -351,6 +355,7 @@ class JDLProcessor {
     this.jdlContent = jdlContent;
     this.options = options;
     this.pwd = process.cwd();
+    this.createEnvBuilder = createEnvBuilder;
   }
 
   importJDL() {
@@ -387,13 +392,10 @@ class JDLProcessor {
     statistics.sendSubGenEvent('generator', 'import-jdl');
   }
 
-  generateWorkspaces(options) {
-    if (!options.workspaces || !multiplesApplications(this)) {
-      return Promise.resolve();
-    }
-    return EnvironmentBuilder.createDefaultBuilder()
+  generateWorkspaces(options, generateJdl) {
+    return this.createEnvBuilder()
       .getEnvironment()
-      .run('jhipster:workspaces', { workspaces: false, ...options, importState: this.importState });
+      .run('jhipster:workspaces', { workspaces: false, ...options, importState: this.importState, generateJdl });
   }
 
   generateApplications() {
@@ -425,21 +427,35 @@ class JDLProcessor {
       })
     );
 
-    applicationsWithEntities.forEach((applicationWithEntities, idx) => {
+    applicationsWithEntities.forEach(applicationWithEntities => {
+      const microfrontends = applicationWithEntities.config.microfrontends || [];
+
       const relatedApplications = Object.entries(allApplications).filter(
         ([baseName]) =>
           applicationWithEntities.config.baseName !== baseName &&
-          applicationWithEntities.entities.find(entity => entity.microserviceName === baseName)
+          (applicationWithEntities.entities.find(entity => entity.microserviceName === baseName) || microfrontends.includes(baseName))
       );
-      const { serverPort: gatewayServerPort } = applicationWithEntities.config;
+      const { serverPort: gatewayServerPort, clientFramework: gatewayClientFramework } = applicationWithEntities.config;
       if (relatedApplications.length > 0) {
         applicationWithEntities.config.applications = Object.fromEntries(
           relatedApplications.map(([baseName, config]) => {
-            config.gatewayServerPort = gatewayServerPort;
+            config.gatewayServerPort = config.gatewayServerPort || gatewayServerPort;
             const { clientFramework, serverPort, applicationIndex, devServerPort } = config;
             return [baseName, { clientFramework, serverPort, applicationIndex, devServerPort }];
           })
         );
+
+        const differentClientFrameworks = relatedApplications.filter(
+          ([_baseName, { clientFramework }]) => clientFramework && clientFramework !== 'no' && clientFramework !== gatewayClientFramework
+        );
+
+        if (differentClientFrameworks.length > 0) {
+          throw Error(
+            `Using different client frameworks in microfrontends is not supported. Tried to use: ${gatewayClientFramework} with ${differentClientFrameworks
+              .map(([baseName, { clientFramework }]) => `${clientFramework} (${baseName})`)
+              .join(', ')}`
+          );
+        }
       }
     });
 
@@ -501,28 +517,38 @@ class JDLProcessor {
 
 /**
  * Import-JDL sub generator
- * @param {any} args arguments passed for import-jdl
- * @param {any} options options passed from CLI
- * @param {any} env the yeoman environment
+ * @param {any} jdlFiles jdl files
+ * @param {any} [options] options passed from CLI
+ * @param {any} [env] the yeoman environment
  */
-module.exports = (jdlFiles, options = {}, env) => {
+module.exports = (jdlFiles, options = {}, env, _envBuilder, createEnvBuilder = EnvironmentBuilder.createDefaultBuilder) => {
   logger.info(chalk.yellow(`Executing import-jdl ${options.inline ? 'with inline content' : jdlFiles.join(' ')}`));
   logger.debug(chalk.yellow(`Options: ${toString({ ...options, inline: options.inline ? 'inline content' : '' })}`));
   try {
-    const jdlImporter = new JDLProcessor(jdlFiles, options.inline, options);
+    const jdlImporter = new JDLProcessor(jdlFiles, options.inline, options, createEnvBuilder);
     jdlImporter.importJDL();
     jdlImporter.sendInsight();
     jdlImporter.config();
 
-    return jdlImporter
-      .generateWorkspaces(options)
-      .then(() => jdlImporter.generateApplications())
-      .then(() => jdlImporter.generateEntities(env))
-      .then(() => jdlImporter.generateDeployments())
-      .then(() => {
-        printSuccess();
-        return jdlFiles;
-      });
+    const generateJdl = () =>
+      jdlImporter
+        .generateApplications()
+        .then(() => jdlImporter.generateEntities(env))
+        .then(() => jdlImporter.generateDeployments());
+
+    let generation;
+    if (!options.workspaces || !multiplesApplications(jdlImporter)) {
+      generation = generateJdl();
+    } else {
+      // Wrap generation inside workspaces root generation.
+      // generate applications after git initialization and before root npm install
+      generation = jdlImporter.generateWorkspaces(options, generateJdl);
+    }
+
+    return generation.then(() => {
+      printSuccess();
+      return jdlFiles;
+    });
   } catch (e) {
     logger.error(`Error during import-jdl: ${e}`, e);
     return Promise.reject(new Error(`Error during import-jdl: ${e.message}`));

package/cli/jdl.js

@@ -41,13 +41,14 @@ const toJdlFile = file => {
  * @param {string[]} args[0] jdl files
  * @param {any} options options passed from CLI
  * @param {any} env the yeoman environment
- * @param {function} forkProcess the method to use for process forking
+ * @param {EnvironmentBuilder} envBuilder
+ * @param {(string[], object) => EnvironmentBuilder} createEnvBuilder
  */
-module.exports = ([jdlFiles = []], options = {}, env, forkProcess) => {
+module.exports = ([jdlFiles = []], options = {}, env, envBuilder, createEnvBuilder) => {
   logger.debug('cmd: import-jdl from ./import-jdl');
   logger.debug(`jdlFiles: ${toString(jdlFiles)}`);
   if (options.inline) {
-    return importJdl(jdlFiles, options, env, forkProcess);
+    return importJdl(jdlFiles, options, env, envBuilder, createEnvBuilder);
   }
   if (!jdlFiles || jdlFiles.length === 0) {
     logger.fatal(chalk.red('\nAt least one jdl file is required.\n'));
@@ -59,5 +60,5 @@ module.exports = ([jdlFiles = []], options = {}, env, forkProcess) => {
     }
     return Promise.resolve(filename);
   });
-  return Promise.all(promises).then(jdlFiles => importJdl(jdlFiles.flat(), options, env, forkProcess));
+  return Promise.all(promises).then(jdlFiles => importJdl(jdlFiles.flat(), options, env, envBuilder, createEnvBuilder));
 };

package/cli/jhipster-command.js

@@ -117,7 +117,7 @@ class JHipsterCommand extends Command {
 
   /**
    * Register options using cli/commands.js structure.
-   * @param {object[]} lazyBuildCommandCallBack
+   * @param {object[]} [opts]
    * @return {JHipsterCommand} this;
    */
   addCommandOptions(opts = []) {

package/cli/program.js

@@ -101,6 +101,7 @@ const buildCommands = ({
   defaultCommand = 'app',
   printLogo = printJHipsterLogo,
   printBlueprintLogo = () => {},
+  createEnvBuilder,
 }) => {
   /* create commands */
   Object.entries(commands).forEach(([cmdName, opts]) => {
@@ -224,7 +225,7 @@ const buildCommands = ({
 
         if (cliOnly) {
           logger.debug('Executing CLI only script');
-          return loadCommand(cmdName)(args, options, env, envBuilder);
+          return loadCommand(cmdName)(args, options, env, envBuilder, createEnvBuilder);
         }
         await env.composeWith('jhipster:bootstrap', options);
 
@@ -247,7 +248,8 @@ const buildJHipster = ({
   program = createProgram({ executableName, executableVersion }),
   blueprints,
   lookups,
-  envBuilder = EnvironmentBuilder.create().prepare({ blueprints, lookups }),
+  createEnvBuilder = (args, options) => EnvironmentBuilder.create(args, options).prepare({ blueprints, lookups }),
+  envBuilder = createEnvBuilder(),
   commands = { ...SUB_GENERATORS, ...envBuilder.getBlueprintCommands() },
   printLogo,
   printBlueprintLogo,
@@ -259,7 +261,7 @@ const buildJHipster = ({
   /* setup debugging */
   logger.init(program);
 
-  buildCommands({ program, commands, envBuilder, env, loadCommand, defaultCommand, printLogo, printBlueprintLogo });
+  buildCommands({ program, commands, envBuilder, env, loadCommand, defaultCommand, printLogo, printBlueprintLogo, createEnvBuilder });
 
   return program;
 };

package/generators/app/index.js

@@ -234,6 +234,12 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
       required: false,
     });
 
+    this.option('enable-translation', {
+      desc: 'Enable translation',
+      type: Boolean,
+      required: false,
+    });
+
     this.option('language', {
       alias: 'l',
       desc: 'Language to be added to application (existing languages are not removed)',
@@ -260,6 +266,11 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
       type: Boolean,
     });
 
+    this.option('cypress-audit', {
+      desc: 'Enable cypress-audit/lighthouse report generation',
+      type: Boolean,
+    });
+
     this.option('microfrontend', {
       desc: 'Force generation of experimental microfrontend support',
       type: Boolean,

package/generators/app/prompts.js

@@ -19,7 +19,7 @@
 const chalk = require('chalk');
 const statistics = require('../statistics');
 const packagejs = require('../../package.json');
-const { appDefaultConfig } = require('../generator-defaults');
+const { appDefaultConfig, defaultConfigMicroservice } = require('../generator-defaults');
 const { GATEWAY, MONOLITH, MICROSERVICE } = require('../../jdl/jhipster/application-types');
 const { GATLING, CUCUMBER, PROTRACTOR, CYPRESS } = require('../../jdl/jhipster/test-framework-types');
 
@@ -44,8 +44,18 @@ async function askForInsightOptIn() {
   }
 }
 
+const microfrontendsToPromptValue = answer => (Array.isArray(answer) ? answer.map(({ baseName }) => baseName).join(',') : answer);
+const promptValueToMicrofrontends = answer =>
+  answer
+    ? answer
+        .split(',')
+        .map(baseName => baseName.trim())
+        .filter(Boolean)
+        .map(baseName => ({ baseName }))
+    : [];
+
 async function askForApplicationType() {
-  if (this.existingProject) return;
+  if (this.existingProject && this.options.askAnswered !== true) return;
 
   const applicationTypeChoices = [
     {
@@ -62,16 +72,53 @@ async function askForApplicationType() {
     },
   ];
 
-  const answers = await this.prompt([
-    {
-      type: 'list',
-      name: 'applicationType',
-      message: `Which ${chalk.yellow('*type*')} of application would you like to create?`,
-      choices: applicationTypeChoices,
-      default: appDefaultConfig.applicationType,
-    },
-  ]);
-  this.applicationType = this.jhipsterConfig.applicationType = answers.applicationType;
+  await this.prompt(
+    [
+      {
+        type: 'list',
+        name: 'applicationType',
+        message: `Which ${chalk.yellow('*type*')} of application would you like to create?`,
+        choices: applicationTypeChoices,
+        default: appDefaultConfig.applicationType,
+      },
+      {
+        when: answers => {
+          const { applicationType } = answers;
+          const askForMicrofrontend = [GATEWAY, MICROSERVICE].includes(applicationType);
+          if (!askForMicrofrontend) {
+            answers.microfrontend = false;
+          }
+          return askForMicrofrontend;
+        },
+        type: 'confirm',
+        name: 'microfrontend',
+        message: `Do you want to enable ${chalk.yellow('*microfrontends*')}?`,
+        default: defaultConfigMicroservice.microfrontend,
+      },
+      {
+        when: answers => {
+          const { applicationType, microfrontend, microfrontends } = answers;
+          const askForMicrofrontends = applicationType === GATEWAY && microfrontend;
+          if (askForMicrofrontends) {
+            answers.microfrontends = microfrontendsToPromptValue(microfrontends);
+          } else {
+            answers.microfrontends = [];
+          }
+          return askForMicrofrontends;
+        },
+        type: 'input',
+        name: 'microfrontends',
+        message: `Comma separated ${chalk.yellow('*microfrontend*')} app names.`,
+        filter: promptValueToMicrofrontends,
+        transformer: microfrontendsToPromptValue,
+      },
+    ],
+    this.config
+  );
+
+  const { applicationType } = this.jhipsterConfig;
+  // TODO drop for v8, setting the generator with config is deprecated
+  this.applicationType = applicationType;
 }
 
 function askForModuleName() {
@@ -150,6 +197,7 @@ function askModulesToBeInstalled(done, generator) {
             .then(answers => {
               // [ {name: [moduleName], version:[version]}, ...]
               answers.otherModules.forEach(module => {
+                generator.otherModules = generator.otherModules || [];
                 generator.otherModules.push({ name: module.name, version: module.version });
               });
               generator.jhipsterConfig.otherModules = generator.otherModules;

package/generators/azure-app-service/templates/github/workflows/azure-app-service.yml.ejs

@@ -9,14 +9,14 @@ jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK <%= JAVA_VERSION %>
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: <%= JAVA_VERSION %>
     - name: Cache Maven archetypes
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

package/generators/azure-spring-cloud/templates/github/workflows/azure-spring-cloud.yml.ejs

@@ -9,14 +9,14 @@ jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK <%= JAVA_VERSION %>
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: <%= JAVA_VERSION %>
     - name: Cache Maven archetypes
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

package/generators/bootstrap/index.js

@@ -156,6 +156,7 @@ module.exports = class extends BaseGenerator {
   /**
    * Commits the MemFs to the disc.
    * @param {Stream} [stream] - files stream, defaults to this.sharedFs.stream().
+   * @param {boolean} [skipPrettier]
    * @return {Promise}
    */
   async _commitSharedFs(stream = this.env.sharedFs.stream(), skipPrettier = this.options.skipPrettier) {

package/generators/bootstrap-application/generator.mjs

@@ -301,6 +301,7 @@ export default class extends BaseEntityGenerator {
         entity.fieldsContainBigDecimal = fieldsType.includes(BIG_DECIMAL);
         entity.fieldsContainUUID = fieldsType.includes(UUID);
         entity.fieldsContainDate = intersection(fieldsType, [ZONED_DATE_TIME, INSTANT, LOCAL_DATE]).length > 0;
+        entity.fieldsContainTimed = intersection(fieldsType, [ZONED_DATE_TIME, INSTANT]).length > 0;
 
         entity.fieldsContainBlob = intersection(fieldsType, [BYTES, BYTE_BUFFER]).length > 0;
         if (entity.fieldsContainBlob) {

package/generators/ci-cd/templates/.gitlab-ci.yml.ejs

@@ -106,7 +106,7 @@ gradle-integration-test:
 
     stage: test
     script:
-        - ./gradlew integrationTest -PnodeInstall --no-daemon <% if (insideDocker && databaseTypeSql && !reactive) { %>-Ptestcontainers<% } %>
+        - ./gradlew integrationTest -PnodeInstall --no-daemon
     artifacts:
         reports:
             junit: build/test-results/integrationTest/TEST-*.xml
@@ -218,7 +218,6 @@ maven-compile:
 maven-test:
     <%_ if (insideDocker) { _%>
         <%_ if (cacheProviderRedis || databaseTypeSql || databaseTypeCassandra || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
-    # DinD service is required for Testcontainers
     services:
         - docker:dind
 
@@ -232,7 +231,7 @@ maven-test:
 
     stage: test
     script:
-        - ./mvnw -ntp verify -P-webapp -Dmaven.repo.local=$MAVEN_USER_HOME <% if (insideDocker && databaseTypeSql) { %>-Dspring.profiles.active=testcontainers<% } %>
+        - ./mvnw -ntp verify -P-webapp -Dmaven.repo.local=$MAVEN_USER_HOME
     artifacts:
         reports:
             junit: