generator-jhipster 7.8.0 → 7.9.1

package/generators/server/templates/src/test/resources/config/application.yml.ejs

@@ -60,11 +60,6 @@ mongock:
 
 <%_ } _%>
 spring:
-<%_ if (databaseTypeSql && devDatabaseTypeH2Any) { _%>
-  profiles:
-    # Uncomment the following line to enable tests against production database type rather than H2, using Testcontainers
-    #active: testcontainers
-<%_ } _%>
   application:
     name: <%= baseName %>
 <%_ if (applicationTypeGateway && reactive) { _%>
@@ -104,58 +99,18 @@ spring:
             content-type: text/plain
             group: <%= dasherizedBaseName %>
 <%_ } _%>
-
-<%_ if (databaseTypeSql && !reactive) { _%>
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    url: <%- getJDBCUrl('h2Memory', { databaseName: lowercaseBaseName }) %>
-    name:
-    username:
-    password:
-    hikari:
-      auto-commit: false
+<%_ if (databaseTypeSql) { _%>
+  # Replace by 'prod, faker' to add the faker context and have sample data loaded in production
+  liquibase:
+    contexts: test
 <%_ } _%>
   jackson:
     serialization:
       write-durations-as-timestamps: false
-<%_ if (databaseTypeSql && !reactive) { _%>
-  jpa:
-    database-platform: tech.jhipster.domain.util.FixedH2Dialect
-    open-in-view: false
-    hibernate:
-      ddl-auto: none
-      naming:
-        physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
-        implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
-    properties:
-      hibernate.id.new_generator_mappings: true
-      hibernate.connection.provider_disables_autocommit: true
-      hibernate.cache.use_second_level_cache: false
-      hibernate.cache.use_query_cache: false
-      hibernate.generate_statistics: false
-      hibernate.hbm2ddl.auto: validate
-      hibernate.jdbc.time_zone: UTC
-      hibernate.query.fail_on_pagination_over_collection_fetch: true
-<%_ } _%>
-<%_ if (databaseTypeMongodb || databaseTypeCassandra) { _%>
-  data:
-<%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
+  data:
     cassandra:
       compression: NONE
-<%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
-  couchbase:
-    bucket:
-      name: jhipster
-      password: password
-<%_ } _%>
-<%_ if (databaseTypeSql) { _%>
-  liquibase:
-    contexts: test
-  <%_ if (reactive) { _%>
-    url: <%- getJDBCUrl('h2Memory', { databaseName: lowercaseBaseName }) %>
-  <%_ } _%>
 <%_ } _%>
   mail:
     host: localhost
@@ -168,12 +123,6 @@ spring:
 <%_ } _%>
   messages:
     basename: i18n/messages
-<%_ if (databaseTypeSql && reactive) { _%>
-  r2dbc:
-    url: <%- getR2DBCUrl('h2Memory', { databaseName: lowercaseBaseName }) %>
-    username: r2dbc
-    password:
-<%_ } _%>
 <%_ if (skipUserManagement && (applicationTypeMonolith || applicationTypeGateway) && authenticationTypeJwt) { _%>
   security:
     user:
@@ -200,7 +149,7 @@ spring:
       client:
         provider:
           oidc:
-            issuer-uri: http://DO_NOT_CALL:9080/auth/realms/jhipster
+            issuer-uri: http://DO_NOT_CALL:9080/realms/jhipster
 <%_ } _%>
 
 server:
@@ -215,6 +164,9 @@ server:
 jhipster:
   clientApp:
     name: "<%= frontendAppName %>"
+  mail:
+    from: <%= baseName %>@localhost.com
+    base-url: http://127.0.0.1:8080
   logging:
     # To test json console appender
     use-json-format: false
@@ -223,11 +175,6 @@ jhipster:
       host: localhost
       port: 5000
       queue-size: 512
-<%_ if (!skipUserManagement || authenticationTypeOauth2) { _%>
-  mail:
-    from: test@localhost
-    base-url: http://127.0.0.1:8080
-<%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
   security:
     authentication:
@@ -254,3 +201,7 @@ jhipster:
 # ===================================================================
 
 # application:
+management:
+  health:
+    mail:
+      enabled: false

package/generators/server/templates/src/test/resources/junit-platform.properties.ejs

@@ -10,3 +10,4 @@ junit.jupiter.execution.timeout.beforeall.method.default = 60 s
 cucumber.publish.enabled=true
 cucumber.plugin=pretty, html:target/cucumber-reports/Cucumber.html
 <%_ } _%>
+junit.jupiter.testclass.order.default=<%= packageName %>.config.SpringBootTestClassOrderer

package/generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
+  <head>
+    <title th:text="#{email.activation.title}">JHipster activation</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  </head>
+  <body>
+    <p th:text="#{email.activation.greeting(${user.login})}">Dear</p>
+    <p th:text="#{email.activation.text1}">Your JHipster account has been created, please click on the URL below to activate it:</p>
+    <p>
+      <a th:with="url=(@{|${baseUrl}/account/activate?key=${user.activationKey}|})" th:href="${url}" th:text="${url}">Activation link</a>
+    </p>
+    <p>
+      <span th:text="#{email.activation.text2}">Regards, </span>
+      <br />
+      <em th:text="#{email.signature}">JHipster.</em>
+    </p>
+  </body>
+</html>

package/generators/server/templates/src/test/resources/templates/mail/creationEmail.html.ejs

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
+  <head>
+    <title th:text="#{email.activation.title}">JHipster creation</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  </head>
+  <body>
+    <p th:text="#{email.activation.greeting(${user.login})}">Dear</p>
+    <p th:text="#{email.creation.text1}">Your JHipster account has been created, please click on the URL below to access it:</p>
+    <p>
+      <a th:with="url=(@{|${baseUrl}/account/reset/finish?key=${user.resetKey}|})" th:href="${url}" th:text="${url}">Login link</a>
+    </p>
+    <p>
+      <span th:text="#{email.activation.text2}">Regards, </span>
+      <br />
+      <em th:text="#{email.signature}">JHipster.</em>
+    </p>
+  </body>
+</html>

package/generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
+  <head>
+    <title th:text="#{email.reset.title}">JHipster password reset</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  </head>
+  <body>
+    <p th:text="#{email.reset.greeting(${user.login})}">Dear</p>
+    <p th:text="#{email.reset.text1}">
+      For your JHipster account a password reset was requested, please click on the URL below to reset it:
+    </p>
+    <p>
+      <a th:with="url=(@{|${baseUrl}/account/reset/finish?key=${user.resetKey}|})" th:href="${url}" th:text="${url}">Login link</a>
+    </p>
+    <p>
+      <span th:text="#{email.reset.text2}">Regards, </span>
+      <br />
+      <em th:text="#{email.signature}">JHipster.</em>
+    </p>
+  </body>
+</html>

package/generators/spring-controller/index.js

@@ -21,7 +21,7 @@ const _ = require('lodash');
 const chalk = require('chalk');
 
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
-const { INITIALIZING_PRIORITY, PROMPTING_PRIORITY, DEFAULT_PRIORITY, WRITING_PRIORITY } =
+const { INITIALIZING_PRIORITY, PROMPTING_PRIORITY, LOADING_PRIORITY, DEFAULT_PRIORITY, WRITING_PRIORITY } =
   require('../../lib/constants/priorities.cjs').compat;
 
 const constants = require('../generator-constants');
@@ -116,6 +116,21 @@ module.exports = class extends BaseBlueprintGenerator {
     return this._prompting();
   }
 
+  // Public API method used by the getter and also by Blueprints
+  _loading() {
+    return {
+      loadSharedConfig() {
+        this.loadServerConfig();
+        this.loadDerivedServerConfig();
+      },
+    };
+  }
+
+  get [LOADING_PRIORITY]() {
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
+  }
+
   // Public API method used by the getter and also by Blueprints
   _default() {
     return {

package/generators/sql-constants.js

@@ -0,0 +1,85 @@
+/**
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const databaseTypes = require('../jdl/jhipster/database-types');
+
+const { H2_DISK, H2_MEMORY, MARIADB, MSSQL, MYSQL, ORACLE, POSTGRESQL } = databaseTypes;
+
+const databaseData = {
+  [MSSQL]: {
+    protocolSuffix: 'sqlserver://',
+    port: ':1433;database=',
+    r2dbc: {
+      protocolSuffix: 'mssql://',
+      port: ':1433/',
+    },
+  },
+  [MARIADB]: {
+    name: 'MariaDB',
+    tableNameMaxLength: 64,
+    constraintNameMaxLength: 64,
+    protocolSuffix: 'mariadb://',
+    port: ':3306/',
+    extraOptions: '?useLegacyDatetimeCode=false&serverTimezone=UTC',
+  },
+  [MYSQL]: {
+    name: 'MySQL',
+    tableNameMaxLength: 64,
+    constraintNameMaxLength: 64,
+    protocolSuffix: 'mysql://',
+    port: ':3306/',
+    extraOptions:
+      '?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true',
+    r2dbc: {
+      protocolSuffix: 'mariadb://',
+    },
+  },
+  [ORACLE]: {
+    name: 'Oracle',
+    tableNameMaxLength: 128,
+    constraintNameMaxLength: 128,
+    protocolSuffix: 'oracle:thin:@',
+    port: ':1521:',
+  },
+  [POSTGRESQL]: {
+    name: 'PostgreSQL',
+    tableNameMaxLength: 63,
+    constraintNameMaxLength: 63,
+    protocolSuffix: 'postgresql://',
+    port: ':5432/',
+  },
+  [H2_DISK]: {
+    protocolSuffix: 'h2:file:',
+    useDirectory: true,
+    extraOptions: ';DB_CLOSE_DELAY=-1',
+    r2dbc: {
+      protocolSuffix: 'h2:file://',
+    },
+  },
+  [H2_MEMORY]: {
+    protocolSuffix: 'h2:mem:',
+    extraOptions: ';DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE',
+    r2dbc: {
+      protocolSuffix: 'h2:mem:///',
+    },
+  },
+};
+
+module.exports = {
+  databaseData,
+};

package/generators/statistics.js

@@ -44,7 +44,7 @@ class Statistics {
     this.doNotAskCounter = this.config.get('doNotAskCounter');
     this.optOut = this.config.get('optOut');
     this.isLinked = this.config.get('isLinked');
-    this.noInsight = process.argv.includes('--no-insight') || process.env.CI === 'true';
+    this.noInsight = process.argv.includes('--no-insight') || process.env.CI === 'true' || process.env.MOCHA_WORKER_ID;
     this.forceInsight = process.argv.includes('--force-insight');
     this.configInsight();
 
@@ -202,13 +202,14 @@ class Statistics {
    * @param {any} eventObject events that you want to send
    */
   sendInsightSubGenEvents(prefix, eventObject) {
-    if (this.noInsight) return;
+    if (this.noInsight || eventObject === null || eventObject === undefined) return;
     if (typeof eventObject === 'object') {
       Object.keys(eventObject).forEach(key => {
+        const value = eventObject[key];
         if (typeof eventObject[key] === 'object') {
-          this.sendInsightSubGenEvents(`${prefix}/${key}`, eventObject[key]);
-        } else if (eventObject[key]) {
-          this.insight.track(`${prefix}/${key}`, eventObject[key]);
+          this.sendInsightSubGenEvents(`${prefix}/${key}`, value);
+        } else {
+          this.insight.track(`${prefix}/${key}`, value);
         }
       });
     } else {

package/generators/upgrade/index.js

@@ -146,7 +146,7 @@ module.exports = class extends BaseGenerator {
   }
 
   _cleanUp() {
-    const ignoredFiles = gitignore(fs.readFileSync('.gitignore'));
+    const ignoredFiles = gitignore(fs.readFileSync('.gitignore')).patterns || [];
     const filesToKeep = ['.yo-rc.json', '.jhipster', 'node_modules', '.git', '.idea', '.mvn', ...ignoredFiles];
     shelljs.ls('-A').forEach(file => {
       if (!filesToKeep.includes(file)) {

package/generators/utils.js

@@ -56,7 +56,6 @@ module.exports = {
   stringHashCode,
   gitExec,
   isGitInstalled,
-  vueReplaceTranslation,
   vueAddPageToRouterImport,
   vueAddPageToRouter,
   vueAddPageServiceToMainImport,
@@ -78,11 +77,12 @@ const SQL = databaseTypes.SQL;
  * @param {object} generator reference to the generator
  */
 function rewriteFile(args, generator) {
+  const { path: rewritePath, file } = args;
   let fullPath;
-  if (args.path) {
-    fullPath = generator.destinationPath(path.join(args.path, args.file));
+  if (rewritePath) {
+    fullPath = generator.destinationPath(path.join(rewritePath, file));
   } else {
-    fullPath = generator.destinationPath(args.file);
+    fullPath = generator.destinationPath(file);
   }
   if (!generator.env.sharedFs.existsInMemory(fullPath) && generator.env.sharedFs.existsInMemory(`${fullPath}.jhi`)) {
     fullPath = `${fullPath}.jhi`;
@@ -152,8 +152,11 @@ function convertToPrettierExpressions(str) {
  * @param {object} args arguments object (containing splicable, haystack, needle properties) to be used
  * @param {string[]} args.splicable       - content to be added.
  * @param {boolean} [args.prettierAware]  - apply prettier aware expressions before looking for applied needles.
- * @param {string|RegExp} [args.regexp]    - use another content for looking for applied needles.
- * @returns {*} re-written file
+ * @param {string|RegExp} [args.regexp]   - use another content to looking for applied needles.
+ * @param {string} [args.haystack]        - file content
+ * @param {string} [args.needle]          - needle to be looked for
+ * @param {string} [args.file]            - file path for logging purposes
+ * @returns {string} re-written content
  */
 function rewrite(args) {
   // check if splicable is already in the body text
@@ -259,6 +262,7 @@ function copyWebResource(source, dest, regex, type, generator, opt = {}, templat
       switch (type) {
         case 'html':
           body = replacePlaceholders(body, generator);
+          body = replaceTitleAttributes(body, generator);
           break;
         case 'js':
           body = replaceTitle(body, generator);
@@ -368,7 +372,28 @@ function replaceTranslationKeysWithText(body, generator, regex) {
  * @returns string with placeholders replaced
  */
 function replacePlaceholders(body, generator) {
-  const re = /placeholder=['|"]([{]{2}\s*['|"]([a-zA-Z0-9.\-_]+)['|"][\s][|][\s](translate)\s*[}]{2})['|"]/g;
+  return replaceAttributeWithTranslation('placeholder', body, generator);
+}
+
+/**
+ *
+ * @param {string} body html body
+ * @param {object} generator reference to the generator
+ * @returns string with titles replaced
+ */
+function replaceTitleAttributes(body, generator) {
+  return replaceAttributeWithTranslation('title', body, generator);
+}
+
+/**
+ *
+ * @param {string} attributeName
+ * @param {string} body html body
+ * @param {object} generator reference to the generator
+ * @returns string with attributeName replaced
+ */
+function replaceAttributeWithTranslation(attributeName, body, generator) {
+  const re = new RegExp(`${attributeName}=['|"]([{]{2}\\s*['|"]([a-zA-Z0-9.\\-_]+)['|"][\\s][|][\\s](translate)\\s*[}]{2})['|"]`, 'g');
   let match;
 
   // eslint-disable-next-line no-cond-assign
@@ -783,29 +808,6 @@ function isGitInstalled(callback) {
   return code === 0;
 }
 
-/**
- * Replace translation for Vue application
- * @param {*} generator
- * @param {*} files
- */
-function vueReplaceTranslation(generator, files) {
-  for (let i = 0; i < files.length; i++) {
-    const filePath = `${generator.CLIENT_MAIN_SRC_DIR}${files[i]}`;
-    // Match the below attributes and the $t() method
-    const regexp = ['v-text', 'v-bind:placeholder', 'v-html', 'v-bind:title', 'v-bind:label', 'v-bind:value', 'v-bind:html']
-      .map(s => `${s}="\\$t\\(.*?\\)"`)
-      .join(')|(');
-    replaceContent(
-      {
-        file: filePath,
-        pattern: new RegExp(` ?(${regexp})`, 'g'),
-        content: '',
-      },
-      generator
-    );
-  }
-}
-
 function vueAddPageToRouterImport(generator, pageName, pageFolderName, pageFilename = pageFolderName) {
   rewriteFile(
     {

package/generators/workspaces/index.js

@@ -20,7 +20,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const { CONFIGURING_PRIORITY, LOADING_PRIORITY, WRITING_PRIORITY, POST_WRITING_PRIORITY, INSTALL_PRIORITY } =
+const { INITIALIZING_PRIORITY, CONFIGURING_PRIORITY, LOADING_PRIORITY, WRITING_PRIORITY, POST_WRITING_PRIORITY } =
   require('../../lib/constants/priorities.cjs').compat;
 
 const { GENERATOR_JHIPSTER } = require('../generator-constants');
@@ -60,6 +60,26 @@ module.exports = class extends BaseBlueprintGenerator {
     this.loadRuntimeOptions();
   }
 
+  _initializing() {
+    return {
+      initializeGit() {
+        if (!this.options.monorepository) return;
+        this.checkGit();
+        this.initializeGitRepository();
+      },
+
+      generateJdl() {
+        const { generateJdl } = this.options;
+        return generateJdl();
+      },
+    };
+  }
+
+  get [INITIALIZING_PRIORITY]() {
+    if (this.delegateToBlueprint) return {};
+    return this._initializing();
+  }
+
   _configuring() {
     return {
       async configureUsingImportState() {
@@ -126,6 +146,11 @@ module.exports = class extends BaseBlueprintGenerator {
         this.packages = this.workspacesConfig.packages;
         this.env.options.nodePackageManager = this.workspacesConfig.clientPackageManager;
       },
+      loadDependabotPackageJson() {
+        if (!this.generateWorkspaces) return;
+
+        this._.merge(this.dependabotPackageJson, this.fs.readJSON(this.fetchFromInstalledJHipster('common', 'templates', 'package.json')));
+      },
     };
   }
 
@@ -161,20 +186,19 @@ module.exports = class extends BaseBlueprintGenerator {
 
   _postWriting() {
     return {
-      loadDependabotPackageJson() {
-        if (!this.generateWorkspaces) return;
-
-        this._.merge(this.dependabotPackageJson, this.fs.readJSON(this.fetchFromInstalledJHipster('common', 'templates', 'package.json')));
-      },
       generatePackageJson() {
         if (!this.generateWorkspaces) return;
 
+        const {
+          dependencies: { rxjs },
+        } = this.fs.readJSON(this.fetchFromInstalledJHipster('client', 'templates', 'angular', 'package.json'));
+
         this.packageJson.merge({
           workspaces: {
             packages: this.packages,
           },
           devDependencies: {
-            rxjs: '^7', // Not required, workaround https://github.com/npm/cli/issues/4437
+            rxjs, // Set version to workaround https://github.com/npm/cli/issues/4437
             concurrently: this.dependabotPackageJson.devDependencies.concurrently,
           },
           scripts: {
@@ -194,27 +218,6 @@ module.exports = class extends BaseBlueprintGenerator {
     return this._postWriting();
   }
 
-  // Public API method used by the getter and also by Blueprints
-  _install() {
-    return {
-      validateGit() {
-        if (!this.options.monorepository) return;
-        this.checkGit();
-      },
-
-      /** Initialize git repository before package manager install for commit hooks */
-      initGitRepo() {
-        if (!this.options.monorepository) return;
-        this.initializeGitRepository();
-      },
-    };
-  }
-
-  get [INSTALL_PRIORITY]() {
-    if (this.delegateToBlueprint) return {};
-    return this._install();
-  }
-
   _detectNodePackageManager() {
     if (this.options.clientPackageManager !== undefined) {
       return this.options.clientPackageManager;

package/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js

@@ -85,9 +85,8 @@ function setRelationshipsFromEntity(relatedRelationships, entityName, conversion
       relationshipType: _.kebabCase(relationshipToConvert.type),
       otherEntityName: camelCase(relationshipToConvert.to),
     };
-    if (!unidirectionalRelationships || otherSplitField.relationshipName) {
-      convertedRelationship.otherEntityRelationshipName =
-        lowerFirst(otherSplitField.relationshipName) || camelCase(relationshipToConvert.from);
+    if (otherSplitField.relationshipName) {
+      convertedRelationship.otherEntityRelationshipName = lowerFirst(otherSplitField.relationshipName);
     }
     if (unidirectionalRelationships) {
       convertedRelationship.unidirectional = !otherSplitField.relationshipName;

package/jdl/converters/json-to-jdl-converter.js

@@ -30,6 +30,7 @@ const { OptionNames } = require('../jhipster/application-options');
 
 module.exports = {
   convertToJDL,
+  convertSingleContentToJDL,
 };
 
 /**
@@ -40,7 +41,12 @@ module.exports = {
 function convertToJDL(directory = '.', output = 'app.jdl') {
   let jdlObject;
   if (doesFileExist(path.join(directory, '.yo-rc.json'))) {
-    jdlObject = getJDLObjectFromSingleApplication(directory);
+    const yoRcFileContent = readJSONFile(path.join(directory, '.yo-rc.json'));
+    let entities;
+    if (doesDirectoryExist(path.join(directory, '.jhipster'))) {
+      entities = getJSONEntityFiles(directory);
+    }
+    jdlObject = getJDLObjectFromSingleApplication(yoRcFileContent, entities);
   } else {
     try {
       jdlObject = getJDLObjectFromMultipleApplications(directory);
@@ -51,6 +57,10 @@ function convertToJDL(directory = '.', output = 'app.jdl') {
   exportJDLObject(jdlObject, path.join(directory, output));
 }
 
+function convertSingleContentToJDL(yoRcFileContent, entities) {
+  return getJDLObjectFromSingleApplication(yoRcFileContent, entities).toString();
+}
+
 function getJDLObjectFromMultipleApplications(directory) {
   const subDirectories = getSubdirectories(directory);
   if (subDirectories.length === 0) {
@@ -58,20 +68,24 @@ function getJDLObjectFromMultipleApplications(directory) {
   }
   let jdlObject = new JDLObject();
   subDirectories.forEach(subDirectory => {
-    jdlObject = getJDLObjectFromSingleApplication(path.join(directory, subDirectory), jdlObject);
+    const applicationDirectory = path.join(directory, subDirectory);
+    const yoRcFileContent = readJSONFile(path.join(applicationDirectory, '.yo-rc.json'));
+    let entities;
+    if (doesDirectoryExist(path.join(applicationDirectory, '.jhipster'))) {
+      entities = getJSONEntityFiles(applicationDirectory);
+    }
+    jdlObject = getJDLObjectFromSingleApplication(yoRcFileContent, entities, jdlObject);
   });
   return jdlObject;
 }
 
-function getJDLObjectFromSingleApplication(directory, existingJDLObject = new JDLObject()) {
-  const yoRcFileContent = readJSONFile(path.join(directory, '.yo-rc.json'));
+function getJDLObjectFromSingleApplication(yoRcFileContent, entities, existingJDLObject = new JDLObject()) {
   const cleanedYoRcFileContent = cleanYoRcFileContent(yoRcFileContent);
   const jdlApplication = convertApplicationToJDL({ application: cleanedYoRcFileContent });
-  if (!doesDirectoryExist(path.join(directory, '.jhipster'))) {
+  if (!entities) {
     existingJDLObject.addApplication(jdlApplication);
     return existingJDLObject;
   }
-  const entities = getJSONEntityFiles(directory);
   const skippedUserManagement = jdlApplication.getConfigurationOptionValue(OptionNames.SKIP_USER_MANAGEMENT);
   const jdlObject = convertEntitiesToJDL({ entities, skippedUserManagement });
   entities.forEach((entity, entityName) => jdlApplication.addEntityName(entityName));
@@ -85,6 +99,9 @@ function cleanYoRcFileContent(yoRcFileContent) {
   if (yoRcFileContent[generatorName].blueprints) {
     yoRcFileContent[generatorName].blueprints = yoRcFileContent[generatorName].blueprints.map(blueprint => blueprint.name);
   }
+  if (yoRcFileContent[generatorName].microfrontends) {
+    yoRcFileContent[generatorName].microfrontends = yoRcFileContent[generatorName].microfrontends.map(({ baseName }) => baseName);
+  }
   if (yoRcFileContent[generatorName].otherModules) {
     yoRcFileContent[generatorName].otherModules = yoRcFileContent[generatorName].otherModules.map(module => module.name);
   }

package/jdl/exporters/applications/jhipster-application-formatter.js

@@ -27,6 +27,7 @@ module.exports = {
 /**
  * Exports JDL applications to JDL files in separate folders (based on application base names).
  * @param applications the applications to exporters (key: application name, value: a JDLApplication).
+ * @param {Object} [configuration]
  * @return object[] exported applications in their final form.
  */
 function formatApplicationsToExport(applications, configuration) {
@@ -41,6 +42,7 @@ function formatApplicationsToExport(applications, configuration) {
 /**
  * Exports JDL a application to a JDL file in the current directory.
  * @param {Object} application - the JDL application to export.
+ * @param {Object} [configuration]
  * @return {Object} the exported application in its final form.
  */
 function formatApplicationToExport(application, configuration = {}) {
@@ -78,6 +80,11 @@ function cleanUpOptions(application) {
       name: blueprintName,
     }));
   }
+  if (application[GENERATOR_NAME].microfrontends) {
+    application[GENERATOR_NAME].microfrontends = application[GENERATOR_NAME].microfrontends.map(baseName => ({
+      baseName,
+    }));
+  }
   if (application[GENERATOR_NAME].otherModules) {
     application[GENERATOR_NAME].otherModules = application[GENERATOR_NAME].otherModules.map(moduleName => ({
       name: moduleName,