generator-jhipster 7.8.0 → 7.9.1

package/generators/cypress/files.js

@@ -24,29 +24,22 @@
 
 const faker = require('@faker-js/faker');
 
-const constants = require('../generator-constants');
-
 const { stringHashCode } = require('../utils');
 
-const TEST_SRC_DIR = constants.CLIENT_TEST_SRC_DIR;
-
 const cypressFiles = {
   common: [
     {
-      condition: generator => generator.cypressTests,
-      templates: ['cypress.json', 'cypress-audits.json'],
+      templates: ['cypress.config.ts'],
     },
   ],
   clientTestFw: [
     {
-      condition: generator => generator.cypressTests,
-      path: `${TEST_SRC_DIR}/cypress/`,
+      path: generator => generator.cypressFolder,
       templates: [
         '.eslintrc.json',
         'fixtures/integration-test.png',
         'plugins/index.ts',
-        'integration/administration/administration.spec.ts',
-        'integration/lighthouse.audits.ts',
+        'e2e/administration/administration.cy.ts',
         'support/commands.ts',
         'support/navbar.ts',
         'support/index.ts',
@@ -56,27 +49,46 @@ const cypressFiles = {
       ],
     },
     {
-      condition: generator => generator.cypressTests && !generator.authenticationTypeOauth2,
-      path: `${TEST_SRC_DIR}/cypress/`,
-      templates: ['integration/account/login-page.spec.ts'],
+      condition: generator => !generator.authenticationTypeOauth2,
+      path: generator => generator.cypressFolder,
+      templates: ['e2e/account/login-page.cy.ts'],
     },
     {
-      condition: generator => generator.cypressTests && !generator.authenticationTypeOauth2 && !generator.databaseTypeNo,
-      path: `${TEST_SRC_DIR}/cypress/`,
+      condition: generator => !generator.authenticationTypeOauth2 && !generator.databaseTypeNo && !generator.applicationTypeMicroservice,
+      path: generator => generator.cypressFolder,
       templates: [
-        'integration/account/register-page.spec.ts',
-        'integration/account/settings-page.spec.ts',
-        'integration/account/password-page.spec.ts',
-        'integration/account/reset-password-page.spec.ts',
+        'e2e/account/register-page.cy.ts',
+        'e2e/account/settings-page.cy.ts',
+        'e2e/account/password-page.cy.ts',
+        'e2e/account/reset-password-page.cy.ts',
       ],
     },
     {
-      condition: generator => generator.cypressTests && generator.authenticationTypeOauth2,
-      path: `${TEST_SRC_DIR}/cypress/`,
+      condition: generator => generator.authenticationTypeOauth2,
+      path: generator => generator.cypressFolder,
       templates: ['support/oauth2.ts'],
     },
   ],
+  audit: [
+    {
+      condition: generator => generator.cypressAudit,
+      path: generator => generator.cypressFolder,
+      templates: ['e2e/lighthouse.audits.ts'],
+    },
+    {
+      condition: generator => generator.cypressAudit,
+      templates: ['cypress-audits.config.ts'],
+    },
+  ],
+  coverage: [
+    {
+      condition: generator => generator.cypressCoverage,
+      path: generator => generator.cypressFolder,
+      templates: ['plugins/global.d.ts'],
+    },
+  ],
 };
+
 module.exports = {
   writeFiles,
   files: cypressFiles,
@@ -87,7 +99,7 @@ function writeFiles() {
     writeFiles() {
       faker.seed(stringHashCode(this.jhipsterConfig.baseName || 'jhipsterSample'));
       this.faker = faker;
-      return this.writeFilesToDisk(cypressFiles);
+      return this.writeFiles({ sections: cypressFiles });
     },
   };
 }

package/generators/cypress/index.js

@@ -68,22 +68,26 @@ module.exports = class extends BaseBlueprintGenerator {
 
   _prompting() {
     return {
-      async askForCypressCoverage() {
-        if (
-          this.options.existingProject ||
-          this.jhipsterConfig.clientFramework !== constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR ||
-          !this.jhipsterConfig.testFrameworks.includes(CYPRESS)
-        ) {
+      async askForCypressOptions() {
+        if (this.options.existingProject || !this.jhipsterConfig.testFrameworks.includes(CYPRESS)) {
           return;
         }
-        const answers = await this.prompt({
-          type: 'confirm',
-          name: 'cypressCoverage',
-          message: 'Would you like to generate code coverage for Cypress tests? [Experimental]',
-          default: this.jhipsterConfig.cypressCoverage || false,
-        });
-
-        this.cypressCoverage = this.jhipsterConfig.cypressCoverage = answers.cypressCoverage;
+        await this.prompt(
+          [
+            {
+              when: this.jhipsterConfig.clientFramework === constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR,
+              type: 'confirm',
+              name: 'cypressCoverage',
+              message: 'Would you like to generate code coverage for Cypress tests? [Experimental]',
+            },
+            {
+              type: 'confirm',
+              name: 'cypressAudit',
+              message: 'Would you like to audit Cypress tests?',
+            },
+          ],
+          this.config
+        );
       },
     };
   }
@@ -119,6 +123,7 @@ module.exports = class extends BaseBlueprintGenerator {
       prepareForTemplates() {
         this.BUILD_DIR = this.getBuildDirectoryForBuildTool(this.buildTool);
         this.CLIENT_DIST_DIR = this.getResourceBuildDirectoryForBuildTool(this.buildTool) + constants.CLIENT_DIST_DIR;
+        this.cypressFolder = `${this.CLIENT_TEST_SRC_DIR}cypress/`;
       },
     };
   }
@@ -142,10 +147,26 @@ module.exports = class extends BaseBlueprintGenerator {
   _writing() {
     return {
       cleanup() {
-        if (this.isJhipsterVersionLessThan('7.0.0-beta.1') && this.jhipsterConfig.cypressTests) {
+        if (this.isJhipsterVersionLessThan('7.0.0-beta.1')) {
           this.removeFile(`${this.TEST_SRC_DIR}/cypress/support/keycloak-oauth2.ts`);
           this.removeFile(`${this.TEST_SRC_DIR}/cypress/fixtures/users/user.json`);
         }
+        if (this.isJhipsterVersionLessThan('7.8.2')) {
+          this.removeFile('cypress.json');
+          this.removeFile('cypress-audits.json');
+
+          this.removeFile(`${this.cypressFolder}integration/administration/administration.spec.ts`);
+          this.removeFile(`${this.cypressFolder}integration/lighthouse.audits.ts`);
+          if (!this.authenticationTypeOauth2) {
+            this.removeFile(`${this.cypressFolder}integration/account/login-page.spec.ts`);
+          }
+          if (!this.authenticationTypeOauth2 && !this.databaseTypeNo && !this.applicationTypeMicroservice) {
+            this.removeFile(`${this.cypressFolder}integration/account/register-page.spec.ts`);
+            this.removeFile(`${this.cypressFolder}integration/account/settings-page.spec.ts`);
+            this.removeFile(`${this.cypressFolder}integration/account/password-page.spec.ts`);
+            this.removeFile(`${this.cypressFolder}integration/account/reset-password-page.spec.ts`);
+          }
+        }
       },
       ...writeFiles(),
       ...super._missingPostWriting(),
@@ -176,16 +197,18 @@ module.exports = class extends BaseBlueprintGenerator {
       },
 
       configureAudits() {
+        if (!this.cypressAudit) return;
         this.packageJson.merge({
           devDependencies: {
             lighthouse: this.dependabotPackageJson.devDependencies.lighthouse,
             'cypress-audit': this.dependabotPackageJson.devDependencies['cypress-audit'],
           },
           scripts: {
-            'cypress:audits': 'cypress open --config-file cypress-audits.json',
-            'e2e:cypress:audits:headless': 'npm run e2e:cypress -- --config-file cypress-audits.json',
-            // eslint-disable-next-line no-template-curly-in-string
-            'e2e:cypress:audits': 'cypress run --browser chrome --record ${CYPRESS_ENABLE_RECORD:-false} --config-file cypress-audits.json',
+            'cypress:audits': 'cypress open --e2e --config-file cypress-audits.config.js',
+            'e2e:cypress:audits:headless': 'npm run e2e:cypress -- --config-file cypress-audits.config.js',
+            'e2e:cypress:audits':
+              // eslint-disable-next-line no-template-curly-in-string
+              'cypress run --e2e --browser chrome --record ${CYPRESS_ENABLE_RECORD:-false} --config-file cypress-audits.config.js',
           },
         });
       },

package/generators/cypress/templates/cypress-audits.config.ts.ejs

@@ -0,0 +1,28 @@
+<%#
+ 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.
+-%>
+import { defineConfig } from 'cypress';
+import { defaultConfig } from './cypress.config';
+
+export default defineConfig({
+  ...defaultConfig,
+  e2e: {
+    ...defaultConfig.e2e,
+    specPattern: '<%= cypressFolder %>e2e/**/*.audits.ts',
+  },
+});

package/generators/cypress/templates/cypress.config.ts.ejs

@@ -0,0 +1,57 @@
+<%#
+ 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.
+-%>
+import { defineConfig } from 'cypress';
+
+export const defaultConfig = {
+  video: false,
+  fixturesFolder: '<%= cypressFolder %>fixtures',
+  screenshotsFolder: '<%= BUILD_DIR %>cypress/screenshots',
+  downloadsFolder: '<%= BUILD_DIR %>cypress/downloads',
+  videosFolder: '<%= BUILD_DIR %>cypress/videos',
+  chromeWebSecurity: true,
+  viewportWidth: 1200,
+  viewportHeight: 720,
+  retries: 2,
+<%_ if (clientFrameworkReact) { _%>
+  scrollBehavior: 'center',
+<%_ } _%>
+<%_ if (authenticationTypeJwt) { _%>
+  env: {
+    authenticationUrl: '/api/authenticate',
+    jwtStorageName: '<%= jhiPrefixDashed %>-authenticationToken',
+  },
+<%_ } else if (authenticationTypeSession) { _%>
+  env: {
+    authenticationUrl: '/api/authentication',
+  },
+<%_ } _%>
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    async setupNodeEvents(on, config) {
+      return (await import('./<%= cypressFolder %>plugins/index')).default(on, config);
+    },
+    baseUrl: 'http://localhost:<%= gatewayServerPort || serverPort %>/',
+    specPattern: '<%= cypressFolder %>e2e/**/*.cy.ts',
+    supportFile: '<%= cypressFolder %>support/index.ts',
+    experimentalSessionAndOrigin: true,
+  },
+};
+
+export default defineConfig(defaultConfig);

package/generators/cypress/templates/src/test/javascript/cypress/{integration/administration/administration.spec.ts.ejs → e2e/administration/administration.cy.ts.ejs}

@@ -86,7 +86,7 @@ describe('/admin', () => {
           cy.get(swaggerFrameSelector).should('be.visible').then(() => {
             // Wait iframe to load
             cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
-            cy.get(swaggerFrameSelector).its('0.contentDocument.body').find(swaggerPageSelector).should('be.visible');
+            cy.get(swaggerFrameSelector).its('0.contentDocument.body').find(swaggerPageSelector, { timeout: 15000 }).should('be.visible');
           });
         }
       });

package/generators/cypress/templates/src/test/javascript/cypress/plugins/global.d.ts.ejs

@@ -0,0 +1,25 @@
+<%#
+ 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.
+-%>
+// workaround missing typings https://github.com/cypress-io/code-coverage/issues/257
+declare module '@cypress/code-coverage/task' {
+  export default function codecov(
+    on: Cypress.PluginEvents,
+    config: Cypress.PluginConfigOptions
+  ): void;
+}

package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs

@@ -28,35 +28,34 @@
 
 // This function is called when a project is opened or re-opened (e.g. due to
 // the project's config changing)
-import fs = require('fs');
+<%_ if (cypressAudit) { _%>
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { lighthouse, pa11y, prepareAudit } from 'cypress-audit';
-import ReportGenerator = require('lighthouse/report/generator/report-generator');
-/**
- * @type {Cypress.PluginConfig}
- */
-module.exports = async (on<% if (cypressCoverage) { %>, config<% } %>) => {
-  // `on` is used to hook into various events Cypress emits
-<%_ if (cypressCoverage) { _%>
-  // `config` is the resolved Cypress config
+import ReportGenerator from 'lighthouse/report/generator/report-generator';
 <%_ } _%>
+
+export default async (on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions) => {
   on('before:browser:launch', (browser, launchOptions) => {
+<%_ if (cypressAudit) { _%>
     prepareAudit(launchOptions);
+<%_ } _%>
     if (browser.name === 'chrome' && browser.isHeadless) {
       launchOptions.args.push('--disable-gpu');
       return launchOptions;
     }
   });
 
+<%_ if (cypressAudit) { _%>
   on('task', {
     lighthouse: lighthouse((lighthouseReport) => {
-      !fs.existsSync('<%= BUILD_DIR %>cypress') && fs.mkdirSync('<%= BUILD_DIR %>cypress', { recursive: true });
-      fs.writeFileSync('<%= BUILD_DIR %>cypress/lhreport.html', ReportGenerator.generateReport(lighthouseReport.lhr, 'html'));
+      !existsSync('<%= BUILD_DIR %>cypress') && mkdirSync('<%= BUILD_DIR %>cypress', { recursive: true });
+      writeFileSync('<%= BUILD_DIR %>cypress/lhreport.html', ReportGenerator.generateReport(lighthouseReport.lhr, 'html'));
     }),
     pa11y: pa11y(),
   });
+<%_ } _%>
 <%_ if (cypressCoverage) { _%>
-  const coverageTask = await import('@cypress/code-coverage/task.js');
-  coverageTask(on, config);
-  return config;
+  (await import('@cypress/code-coverage/task')).default(on, config);
 <%_ } _%>
+  return config;
 }

package/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs

@@ -104,7 +104,7 @@ export const classValid = <%_ if (clientFrameworkAngular) { _%>'ng-valid';
 <%_ } else if (clientFrameworkReact) { _%>'is-valid';
 <%_ } else { _%>'valid';<%_ } _%>
 
-Cypress.Commands.add('authenticatedRequest', (data: any) => {
+Cypress.Commands.add('authenticatedRequest', (data) => {
 <%_ if (authenticationTypeJwt) { _%>
   <%_ if (clientFrameworkAngular || clientFrameworkReact) { _%>
   const bearerToken = JSON.parse(sessionStorage.getItem(Cypress.env('jwtStorageName')));
@@ -173,14 +173,14 @@ Cypress.Commands.add('login', (username: string, password: string) => {
 declare global {
   namespace Cypress {
     interface Chainable {
-<%_ if (!authenticationTypeOauth2) { _%>
+      authenticatedRequest(data): Cypress.Chainable;
       login(username: string, password: string): Cypress.Chainable;
-<%_ } _%>
-      authenticatedRequest(data: any): Cypress.Chainable;
     }
   }
 }
 
+<%_ if (cypressAudit) { _%>
 import 'cypress-audit/commands';
+<%_ } _%>
 // Convert this to a module instead of script (allows import/export)
 export {};

package/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs

@@ -56,7 +56,7 @@ Cypress.Commands.add('clickOnAdminMenuItem', (item: string) => {
 });
 
 Cypress.Commands.add('clickOnEntityMenuItem', (entityName: string) => {
-  return cy.get(navbarSelector).get(entityItemSelector).click().get(`.dropdown-item[href="/${entityName}"]`).click();
+  return cy.get(navbarSelector).get(entityItemSelector).click().get(`.dropdown-item[href="/${entityName}"]`).click(<% if(clientFrameworkAngular) { %>{ force: true }<% } %>);
 });
 
 declare global {

package/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs

@@ -31,7 +31,7 @@ Cypress.Commands.add('getOauth2Data', () => {
   });
 });
 
-Cypress.Commands.add('oauthLogin', (oauth2Data: any, username: string, password: string) => {
+Cypress.Commands.add('oauthLogin', (oauth2Data, username: string, password: string) => {
   const url = new URL(oauth2Data.url);
   if (url.origin.includes('okta')) {
     cy.oktaLogin(oauth2Data, username, password);
@@ -42,7 +42,7 @@ Cypress.Commands.add('oauthLogin', (oauth2Data: any, username: string, password:
   }
 });
 
-Cypress.Commands.add('keycloakLogin', (oauth2Data: any, username: string, password: string) => {
+Cypress.Commands.add('keycloakLogin', (oauth2Data, username: string, password: string) => {
   cy.request({
     url: `${oauth2Data.url}`,
     followRedirect: false,
@@ -75,7 +75,7 @@ Cypress.Commands.add('keycloakLogin', (oauth2Data: any, username: string, passwo
   })
 });
 
-Cypress.Commands.add('auth0Login', (oauth2Data: any, username: string, password: string) => {
+Cypress.Commands.add('auth0Login', (oauth2Data, username: string, password: string) => {
   cy.request({
     url: `${oauth2Data.url}`,
     followRedirect: true,
@@ -107,7 +107,7 @@ Cypress.Commands.add('auth0Login', (oauth2Data: any, username: string, password:
     });
 });
 
-Cypress.Commands.add('oktaLogin', (oauth2Data: any, username, password) => {
+Cypress.Commands.add('oktaLogin', (oauth2Data, username, password) => {
   const url = new URL(oauth2Data.url);
   cy.request({
     method: 'POST',
@@ -159,10 +159,10 @@ declare global {
   namespace Cypress {
     interface Chainable<Subject> {
       getOauth2Data(): Cypress.Chainable;
-      oauthLogin(oauth2Data: any, username: string, password: string): Cypress.Chainable;
-      keycloakLogin(oauth2Data: any, username: string, password: string): Cypress.Chainable;
-      auth0Login(oauth2Data: any, username: string, password: string): Cypress.Chainable;
-      oktaLogin(oauth2Data: any, username: string, password: string): Cypress.Chainable;
+      oauthLogin(oauth2Data, username: string, password: string): Cypress.Chainable;
+      keycloakLogin(oauth2Data, username: string, password: string): Cypress.Chainable;
+      auth0Login(oauth2Data, username: string, password: string): Cypress.Chainable;
+      oktaLogin(oauth2Data, username: string, password: string): Cypress.Chainable;
       oauthLogout(): Cypress.Chainable;
     }
   }

package/generators/cypress/templates/src/test/javascript/cypress/tsconfig.json.ejs

@@ -17,9 +17,12 @@
  limitations under the License.
 -%>
 {
-  "references": [
-    {
-      "path": "./../../../../tsconfig.json"
-    }
-  ]
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "../../../../<%= BUILD_DIR %>out-tsc/cypress",
+    "target": "es2018",
+    "types": ["cypress", "node"]
+  },
+  "include": ["./../../../../cypress*.config.ts", "./**/*.ts"]
 }

package/generators/database-changelog-liquibase/files.js

@@ -110,7 +110,7 @@ const fakeFiles = {
             interpolate: INTERPOLATE_REGEX,
           },
           renameTo: generator => {
-            if (!generator.jhipsterConfig.incrementalChangelog) {
+            if (!generator.jhipsterConfig.incrementalChangelog || generator.configOptions.recreateInitialChangelog) {
               return `config/liquibase/fake-data/${generator.entity.entityTableName}.csv`;
             }
 

package/generators/database-changelog-liquibase/index.js

@@ -38,6 +38,7 @@ const TYPE_LONG = CommonDBTypes.LONG;
 
 const constants = require('../generator-constants');
 
+// TODO v8: Remove this constant
 const { LIQUIBASE_DTD_VERSION } = constants;
 const { prepareFieldForTemplates } = require('../../utils/field');
 const { prepareRelationshipForTemplates } = require('../../utils/relationship');
@@ -122,6 +123,7 @@ module.exports = class extends BaseBlueprintGenerator {
             const uniqueRelationships = this.entity.relationships.filter(rel => rel.unique && (rel.relationshipRequired || rel.id));
             return _.min([this.entity.liquibaseFakeData.length, ...uniqueRelationships.map(rel => rel.otherEntity.fakeDataCount)]);
           },
+          configurable: true,
         });
 
         for (let rowNumber = 0; rowNumber < this.numberOfRows; rowNumber++) {
@@ -215,6 +217,7 @@ module.exports = class extends BaseBlueprintGenerator {
     return {
       setupConstants() {
         // Make constants available in templates
+        // TODO v8: Remove this constant
         this.LIQUIBASE_DTD_VERSION = LIQUIBASE_DTD_VERSION;
       },
     };

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs

@@ -21,7 +21,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
     <!--

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity_constraints.xml.ejs

@@ -20,7 +20,7 @@
 <databaseChangeLog
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd">
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
     <!--
         Added the constraints for entity <%= entity.entityClass %>.
     -->

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs

@@ -21,7 +21,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 <%_ if (addedFields && addedFields.length) { _%>
 

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs

@@ -20,7 +20,7 @@
 <databaseChangeLog
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd">
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
 <%_
 const entityTableName = entity.entityTableName;
 const entityClass = entity.entityClass;
@@ -36,7 +36,7 @@ if (hasFieldConstraint) { _%>
     _%>
         <addUniqueConstraint tableName="<%= entityTableName %>"
             columnNames="<%= field.columnName %>"
-            constraintName="<%= field.getUXConstraintName(entityTableName) %>"/>
+            constraintName="<%= field.uniqueConstraintName %>"/>
     <%_ }
         if (!field.nullable) {
     _%>

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_migrate.xml.ejs

@@ -21,7 +21,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
 <%_ const entityTableName = entity.entityTableName;

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs

@@ -29,14 +29,14 @@ for (field of fieldsToGenerate) {
   }
 }
 for (relationship of relationships) {
-  const relationshipType = relationship.relationshipType
+  const { relationshipType, joinColumnNames } = relationship;
   if (
     (relationshipType === "many-to-one"
       || (relationshipType === "one-to-one" && relationship.ownerSide === true
          && (relationship.id == null || relationship.id === false))
     ) && (relationship.relationshipValidate === true && relationship.relationshipRequired)
   ) {
-    header.push(getColumnName(relationship.relationshipName) + "_id");
+    header.push(joinColumnNames[0]);
   }
 }
 table.push(header);

package/generators/docker-base.js

@@ -20,7 +20,6 @@ const shelljs = require('shelljs');
 const chalk = require('chalk');
 const _ = require('lodash');
 
-const { defaultConfig } = require('./generator-defaults');
 const dockerUtils = require('./docker-utils');
 const { getBase64Secret } = require('./utils');
 const { MAVEN } = require('../jdl/jhipster/build-tool-types');
@@ -103,17 +102,21 @@ function loadConfigs() {
   this.gatewayNb = 0;
   this.monolithicNb = 0;
   this.microserviceNb = 0;
+  const serverPort = 8080;
 
   // Loading configs
   this.debug(`Apps folders: ${this.appsFolders}`);
-  this.appsFolders.forEach(appFolder => {
+  this.appsFolders.forEach((appFolder, index) => {
     const path = this.destinationPath(`${this.directoryPath + appFolder}`);
     if (this.fs.exists(`${path}/.yo-rc.json`)) {
       const config = this.getJhipsterConfig(`${path}/.yo-rc.json`).getAll();
-      _.defaults(config, defaultConfig);
+      config.composePort = serverPort + index;
+      _.defaults(config, this.getDefaultConfigForApplicationType(config.applicationType));
+      this.loadAppConfig(config, config);
       this.loadServerConfig(config, config);
       this.loadDerivedPlatformConfig(config);
       this.loadDerivedAppConfig(config);
+      this.loadDerivedServerConfig(config);
 
       if (config.applicationType === MONOLITH) {
         this.monolithicNb++;