generator-jhipster 8.5.0 → 8.7.0

package/dist/generators/cucumber/generator.js

@@ -41,22 +41,22 @@ export default class CucumberGenerator extends BaseApplicationGenerator {
         return this.asPostWritingTaskGroup({
             addDependencies({ application, source }) {
                 const { javaDependencies, gradleBuildSrc } = application;
-                source.addJavaDependencies?.([
-                    {
-                        groupId: 'io.cucumber',
-                        artifactId: 'cucumber-bom',
-                        version: javaDependencies['cucumber-bom'],
-                        type: 'pom',
-                        scope: 'import',
-                    },
-                    { groupId: 'io.cucumber', artifactId: 'cucumber-junit-platform-engine', scope: 'test' },
-                    { groupId: 'io.cucumber', artifactId: 'cucumber-java', scope: 'test' },
-                    { groupId: 'io.cucumber', artifactId: 'cucumber-spring', scope: 'test' },
-                    { groupId: 'org.junit.platform', artifactId: 'junit-platform-console', scope: 'test' },
-                    { groupId: 'org.testng', artifactId: 'testng', scope: 'test', version: javaDependencies.testng },
-                ], { gradleFile: `${gradleBuildSrc}src/main/groovy/jhipster.cucumber-conventions.gradle` });
-                if (application.buildToolMaven) {
-                    source.addMavenDefinition?.({
+                source.addJavaDefinitions?.({ gradleFile: `${gradleBuildSrc}src/main/groovy/jhipster.cucumber-conventions.gradle` }, {
+                    dependencies: [
+                        {
+                            groupId: 'io.cucumber',
+                            artifactId: 'cucumber-bom',
+                            version: javaDependencies['cucumber-bom'],
+                            type: 'pom',
+                            scope: 'import',
+                        },
+                        { groupId: 'io.cucumber', artifactId: 'cucumber-junit-platform-engine', scope: 'test' },
+                        { groupId: 'io.cucumber', artifactId: 'cucumber-java', scope: 'test' },
+                        { groupId: 'io.cucumber', artifactId: 'cucumber-spring', scope: 'test' },
+                        { groupId: 'org.junit.platform', artifactId: 'junit-platform-console', scope: 'test' },
+                        { groupId: 'org.testng', artifactId: 'testng', scope: 'test', version: javaDependencies.testng },
+                    ],
+                    mavenDefinition: {
                         plugins: [{ groupId: 'org.apache.maven.plugins', artifactId: 'maven-antrun-plugin' }],
                         pluginManagement: [
                             {
@@ -96,8 +96,8 @@ export default class CucumberGenerator extends BaseApplicationGenerator {
 `,
                             },
                         ],
-                    });
-                }
+                    },
+                });
                 if (application.buildToolGradle) {
                     source.addGradlePlugin?.({ id: 'jhipster.cucumber-conventions' });
                 }

package/dist/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberIT.java.ejs

@@ -19,10 +19,6 @@
 package <%= packageName %>.cucumber;
 
 import <%= packageName %>.IntegrationTest;
-import io.cucumber.junit.platform.engine.Cucumber;
 
-@Cucumber
 @IntegrationTest
-class CucumberIT {
-
-}
+class CucumberIT {}

package/dist/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberTestContextConfiguration.java.ejs

@@ -25,6 +25,4 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @CucumberContextConfiguration
 @IntegrationTest
 @WebAppConfiguration
-public class CucumberTestContextConfiguration {
-
-}
+public class CucumberTestContextConfiguration {}

package/dist/generators/cypress/files.js

@@ -27,13 +27,16 @@ export const cypressFiles = {
         clientRootTemplatesBlock({
             templates: ['cypress.config.ts'],
         }),
+        clientRootTemplatesBlock({
+            condition: ctx => Boolean(ctx.eslintConfigFile),
+            templates: [{ sourceFile: 'eslint.config.js.jhi.cypress', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.cypress` }],
+        }),
     ],
     clientTestFw: [
         {
             path: CYPRESS_TEMPLATE_SOURCE_DIR,
             renameTo: (ctx, file) => `${ctx.cypressDir}${file}`,
             templates: [
-                '.eslintrc.json',
                 'fixtures/integration-test.png',
                 'plugins/index.ts',
                 'e2e/administration/administration.cy.ts',

package/dist/generators/cypress/generator.js

@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { stringHashCode, createFaker } from '../base/support/index.js';
+import { createFaker, stringHashCode } from '../base/support/index.js';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { cypressFiles, cypressEntityFiles } from './files.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js';
 import { generateTestEntity as entityWithFakeValues } from '../client/support/index.js';
+import { cypressEntityFiles, cypressFiles } from './files.js';
 const { ANGULAR } = clientFrameworkTypes;
 export default class CypressGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
@@ -72,9 +72,9 @@ export default class CypressGenerator extends BaseApplicationGenerator {
     get preparing() {
         return this.asPreparingTaskGroup({
             prepareForTemplates({ application }) {
-                application.cypressDir = application.cypressDir ?? application.clientTestDir ? `${application.clientTestDir}cypress/` : 'cypress';
+                application.cypressDir = (application.cypressDir ?? application.clientTestDir) ? `${application.clientTestDir}cypress/` : 'cypress';
                 application.cypressTemporaryDir =
-                    application.cypressTemporaryDir ?? application.temporaryDir ? `${application.temporaryDir}cypress/` : '.cypress/';
+                    (application.cypressTemporaryDir ?? application.temporaryDir) ? `${application.temporaryDir}cypress/` : '.cypress/';
                 application.cypressBootstrapEntities = application.cypressBootstrapEntities ?? true;
             },
         });
@@ -94,7 +94,7 @@ export default class CypressGenerator extends BaseApplicationGenerator {
     }
     get writing() {
         return this.asWritingTaskGroup({
-            cleanup({ application: { authenticationTypeOauth2, generateUserManagement, cypressDir } }) {
+            async cleanup({ control, application: { authenticationTypeOauth2, generateUserManagement, cypressDir } }) {
                 if (this.isJhipsterVersionLessThan('7.0.0-beta.1')) {
                     this.removeFile(`${cypressDir}support/keycloak-oauth2.ts`);
                     this.removeFile(`${cypressDir}fixtures/users/user.json`);
@@ -114,6 +114,7 @@ export default class CypressGenerator extends BaseApplicationGenerator {
                         this.removeFile(`${cypressDir}integration/account/reset-password-page.spec.ts`);
                     }
                 }
+                await control.cleanupFiles({ '8.6.1': [`${cypressDir}.eslintrc.json`] });
             },
             async writeFiles({ application }) {
                 const faker = await createFaker();
@@ -185,9 +186,7 @@ export default class CypressGenerator extends BaseApplicationGenerator {
                     scripts: {
                         '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 --config-file cypress-audits.config.js',
+                        'e2e:cypress:audits': 'cypress run --e2e --browser chrome --config-file cypress-audits.config.js',
                     },
                 });
             },

package/dist/generators/cypress/index.js

@@ -18,5 +18,4 @@
  */
 export { default } from './generator.js';
 export { default as command } from './command.js';
-export * from './generator.js';
 export { cypressFiles, cypressEntityFiles } from './files.js';

package/dist/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs

@@ -0,0 +1,40 @@
+<%#
+ Copyright 2013-2024 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.
+-%>
+<&_ if (fragment.importsSection) { -&>
+import cypress from 'eslint-plugin-cypress/flat';
+<&_ } -&>
+<&_ if (fragment.configSection) { -&>
+  {
+    files: ['<%- this.relativeDir(clientRootDir, cypressDir) %>**/*.ts'],
+    extends: [...tseslint.configs.recommendedTypeChecked, cypress.configs.recommended],
+    languageOptions: {
+      parserOptions: {
+        "project": ["./<%= this.relativeDir(clientRootDir, cypressDir) %>tsconfig.json"],
+      },
+    },
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-unsafe-argument': 'off',
+      '@typescript-eslint/no-unsafe-assignment': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+      '@typescript-eslint/unbound-method': 'off',
+    },
+  },
+<&_ } -&>

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs

@@ -52,7 +52,9 @@ describe('<%= entityClass %> e2e test', () => {
   const <%= entityInstance %>PageUrlPattern = new RegExp('/<%= entityPage %>(\\?.*)?$');
   const username = Cypress.env('E2E_USERNAME') ?? '<%- adminEntity ? 'admin' : 'user' %>';
   const password = Cypress.env('E2E_PASSWORD') ?? '<%- adminEntity ? 'admin' : 'user' %>';
+<%_ if (!readOnly) { _%>
   <% if (skipCreateTest) { %>// <% } %>const <%= entityInstance %>Sample = <%- JSON.stringify(this.generateTestEntity(sampleFields.map(field => field.reference))) %>;
+<%_ } _%>
 
   let <%= entityInstance %>;
 <%_ for (otherEntity of requiredOtherEntities) { _%>
@@ -179,7 +181,7 @@ describe('<%= entityClass %> e2e test', () => {
 
 <%_ } _%>
     describe('with existing value', () => {
-<% if (!readOnly) { %>
+<%_ if (!readOnly) { _%>
   <%_ if (skipCreateTest) { _%>
       /* Disabled due to incompatibility
   <%_ } _%>

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

@@ -33,7 +33,7 @@ import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { lighthouse, pa11y, prepareAudit } from 'cypress-audit';
 <%_ } _%>
 
-export default async (on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions) => {
+export default <% if (cypressCoverage) { %>async <% } %>(on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions) => {
   on('before:browser:launch', (browser, launchOptions) => {
 <%_ if (cypressAudit) { _%>
     prepareAudit(launchOptions);
@@ -60,7 +60,9 @@ export default async (on: Cypress.PluginEvents, config: Cypress.PluginConfigOpti
   on('task', {
     lighthouse: lighthouse(async (lighthouseReport) => {
       const { default: ReportGenerator } = await import('lighthouse/report/generator/report-generator');
-      !existsSync('<%= cypressTemporaryDir %>') && mkdirSync('<%= cypressTemporaryDir %>', { recursive: true });
+      if (!existsSync('<%= cypressTemporaryDir %>')) {
+        mkdirSync('<%= cypressTemporaryDir %>', { recursive: true });
+      }
       writeFileSync('<%= cypressTemporaryDir %>lhreport.html', ReportGenerator.generateReport(lighthouseReport.lhr, 'html'));
     }),
     pa11y: pa11y(),

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-namespace */
 export type Account = Record<string, string | boolean | number>;
 
 Cypress.Commands.add('getAccount', () => {

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

@@ -17,9 +17,6 @@
  limitations under the License.
 -%>
 /* eslint-disable @typescript-eslint/no-namespace */
-/* eslint-disable @typescript-eslint/no-use-before-define */
-// eslint-disable-next-line spaced-comment
-/// <reference types="cypress" />
 
 // ***********************************************
 // This commands.ts shows you how to

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

@@ -17,9 +17,6 @@
  limitations under the License.
 -%>
 /* eslint-disable @typescript-eslint/no-namespace */
-/* eslint-disable @typescript-eslint/no-use-before-define */
-// eslint-disable-next-line spaced-comment
-/// <reference types="cypress" />
 
 // ***********************************************
 // Begin Specific Selector Attributes for Cypress

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 /* eslint-disable @typescript-eslint/no-namespace */
-/* eslint-disable @typescript-eslint/no-use-before-define */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 
 Cypress.Commands.add('getManagementInfo', () => {
   return cy.request({

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

@@ -17,7 +17,6 @@
  limitations under the License.
 -%>
 /* eslint-disable @typescript-eslint/no-namespace */
-/* eslint-disable @typescript-eslint/no-use-before-define */
 
 import {
   navbarSelector,

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

@@ -16,8 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-// eslint-disable-next-line spaced-comment
-/// <reference types="cypress" />
+/* eslint-disable @typescript-eslint/no-namespace */
 
 Cypress.Commands.add('getOauth2Data', () => {
   cy.request({
@@ -157,6 +156,7 @@ Cypress.Commands.add('oauthLogout', () => {
 
 declare global {
   namespace Cypress {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     interface Chainable<Subject> {
       getOauth2Data(): Cypress.Chainable;
       oauthLogin(oauth2Data, username: string, password: string): Cypress.Chainable;

package/dist/generators/docker/files.js

@@ -1,7 +1,12 @@
 import { TEMPLATES_DOCKER_DIR } from '../generator-constants.js';
 const renameTo = (ctx, filepath) => `${ctx.dockerServicesDir}${filepath}`.replace('/_eureka_', '').replace('/_consul_', '');
-// eslint-disable-next-line import/prefer-default-export
 export const dockerFiles = {
+    commonFiles: [
+        {
+            condition: ctx => ctx.eslintConfigFile,
+            templates: [{ sourceFile: 'eslint.config.js.jhi.docker', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.docker` }],
+        },
+    ],
     sqlDatabasesFiles: [
         {
             condition: ctx => ctx.dockerServices.some(service => ['postgresql', 'mariadb', 'mysql', 'mssql'].includes(service)),

package/dist/generators/docker/generator.js

@@ -16,14 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable camelcase */
 import { intersection } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { createDockerComposeFile, createDockerExtendedServices } from '../docker/support/index.js';
+import { createFaker, stringHashCode } from '../base/support/index.js';
+import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js';
 import { dockerFiles } from './files.js';
 import { SERVICE_COMPLETED_SUCCESSFULLY, SERVICE_HEALTHY } from './constants.js';
-import { stringHashCode, createFaker } from '../base/support/index.js';
-import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js';
 export default class DockerGenerator extends BaseApplicationGenerator {
     hasServicesFile = false;
     async beforeQueue() {

package/dist/generators/docker/templates/docker/grafana/provisioning/datasources/datasource.yml.ejs

@@ -55,14 +55,14 @@ datasources:
     isDefault: true
     # <map> fields that will be converted to json and stored in json_data
     jsonData:
-      graphiteVersion: "1.1"
+      graphiteVersion: '1.1'
       tlsAuth: false
       tlsAuthWithCACert: false
     # <string> json object of data that will be encrypted.
     secureJsonData:
-      tlsCACert: "..."
-      tlsClientCert: "..."
-      tlsClientKey: "..."
+      tlsCACert: '...'
+      tlsClientCert: '...'
+      tlsClientKey: '...'
     version: 1
     # <bool> allow users to edit datasources from the UI.
     editable: true

package/dist/generators/docker/templates/docker/keycloak.yml.ejs

@@ -33,6 +33,7 @@ services:
       - KC_HTTP_PORT=9080
       - KC_HTTPS_PORT=9443
       - KC_HEALTH_ENABLED=true
+      - KC_HTTP_MANAGEMENT_PORT=9990
     # If you want to expose these ports outside your dev PC,
     # remove the "127.0.0.1:" prefix
     ports:
@@ -42,5 +43,5 @@ services:
       test: 'bash /opt/keycloak/health-check.sh'
       interval: 5s
       timeout: 5s
-      retries: 20
+      retries: 40
       start_period: 10s

package/dist/generators/docker/templates/docker/mariadb.yml.ejs

@@ -32,7 +32,7 @@ services:
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:3306:3306
-    command: mariadbd --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
+    command: mariadbd --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
     healthcheck:
       test: ["CMD", "/usr/local/bin/healthcheck.sh", "--connect", "--innodb_initialized"]
       interval: 5s

package/dist/generators/docker/templates/docker/monitoring.yml.ejs

@@ -46,4 +46,4 @@ services:
       - 127.0.0.1:3000:3000
     # On MacOS, remove next line and replace localhost by host.docker.internal in prometheus/prometheus.yml and
     # grafana/provisioning/datasources/datasource.yml
-    network_mode: "host" # to test locally running service
+    network_mode: 'host' # to test locally running service

package/dist/generators/docker/templates/docker/mysql.yml.ejs

@@ -23,7 +23,6 @@ services:
     image: <%- dockerContainers.mysql %>
     volumes:
       - ./config/mysql:/etc/mysql/conf.d
-    #   - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
       - MYSQL_DATABASE=<%= baseName.toLowerCase() %>
@@ -31,7 +30,7 @@ services:
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:3306:3306
-    command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
+    command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
     healthcheck:
       test: ["CMD", "mysql", "-e", "SHOW DATABASES;"]
       interval: 5s

package/dist/generators/docker/templates/docker/prometheus/prometheus.yml.ejs

@@ -18,7 +18,7 @@
 -%>
 # Sample global config for monitoring JHipster applications
 global:
-  scrape_interval:     15s # By default, scrape targets every 15 seconds.
+  scrape_interval: 15s # By default, scrape targets every 15 seconds.
   evaluation_interval: 15s # By default, scrape targets every 15 seconds.
   # scrape_timeout is set to the global default (10s).
 

package/dist/generators/docker/templates/docker/realm-config/keycloak-health-check.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-exec 3<>/dev/tcp/localhost/9080
+exec 3<>/dev/tcp/localhost/9990
 
-echo -e "GET /health/ready HTTP/1.1\nhost: localhost:9080\n" >&3
+echo -e "GET /health/ready HTTP/1.1\nhost: localhost:9990\n" >&3
 
 timeout --preserve-status 1 cat <&3 | grep -m 1 status | grep -m 1 UP
 ERROR=$?

package/dist/generators/docker/templates/docker/sonar.yml.ejs

@@ -30,4 +30,4 @@ services:
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:9001:9000
-      - 127.0.0.1:9000:9000
+      - 127.0.0.1:9000:9000

package/dist/generators/{init/templates/.eslintignore.jhi.ejs → docker/templates/eslint.config.js.jhi.docker.ejs}

@@ -16,6 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-node_modules/
-
-<&- fragments.render({ join: '\n\n' }) &>
+<&_ if (fragment.configSection) { -&>
+  { ignores: ['<%- dockerServicesDir %>'] },
+<&_ } -&>

package/dist/generators/docker-compose/files.js

@@ -20,7 +20,6 @@ import { applicationTypes, authenticationTypes, monitoringTypes } from '../../jd
 const { PROMETHEUS } = monitoringTypes;
 const { MICROSERVICE } = applicationTypes;
 const { OAUTH2 } = authenticationTypes;
-// eslint-disable-next-line import/prefer-default-export
 export function writeFiles() {
     return {
         cleanup() {

package/dist/generators/docker-compose/generator.js

@@ -19,22 +19,21 @@
 import { existsSync } from 'fs';
 import pathjs from 'path';
 import chalk from 'chalk';
-import jsyaml from 'js-yaml';
+import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
 import normalize from 'normalize-path';
 import { defaults } from 'lodash-es';
 import BaseWorkspacesGenerator from '../base-workspaces/index.js';
-import { writeFiles } from './files.js';
 import { deploymentOptions, monitoringTypes, serviceDiscoveryTypes } from '../../jdl/jhipster/index.js';
 import { GENERATOR_BOOTSTRAP_WORKSPACES } from '../generator-list.js';
-import { stringHashCode, createFaker, convertSecretToBase64, createBase64Secret } from '../base/support/index.js';
+import { convertSecretToBase64, createBase64Secret, createFaker, stringHashCode } from '../base/support/index.js';
 import { checkDocker } from '../base-workspaces/internal/docker-base.js';
 import { loadDockerDependenciesTask } from '../base-workspaces/internal/index.js';
-import command from './command.js';
 import { loadDerivedPlatformConfig, loadPlatformConfig } from '../server/support/index.js';
+import command from './command.js';
+import { writeFiles } from './files.js';
 const { PROMETHEUS, NO: NO_MONITORING } = monitoringTypes;
 const { CONSUL, EUREKA, NO: NO_SERVICE_DISCOVERY } = serviceDiscoveryTypes;
 const { Options: DeploymentOptions } = deploymentOptions;
-/* eslint-disable consistent-return */
 /**
  * @class
  * @extends {import('../base/index.js')}
@@ -57,9 +56,6 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
                 this.log.log(chalk.white(`${chalk.bold('🐳')}  Welcome to the JHipster Docker Compose Sub-Generator ${chalk.bold('🐳')}`));
                 this.log.log(chalk.white(`Files will be generated in folder: ${chalk.yellow(this.destinationRoot())}`));
             },
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
             checkDocker,
             async checkDockerCompose() {
                 if (this.skipChecks)
@@ -156,7 +152,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
                     const parentConfiguration = {};
                     const path = this.destinationPath(workspaces.directoryPath, appConfig.appFolder);
                     // Add application configuration
-                    const yaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/app.yml`));
+                    const yaml = parseYaml(this.fs.read(`${path}/src/main/docker/app.yml`));
                     const yamlConfig = yaml.services.app;
                     if (yamlConfig.depends_on) {
                         yamlConfig.depends_on = Object.fromEntries(Object.entries(yamlConfig.depends_on).map(([serviceName, config]) => {
@@ -225,14 +221,14 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
                     if (appConfig.databaseTypeAny && !appConfig.prodDatabaseTypeOracle) {
                         const database = appConfig.databaseTypeSql ? appConfig.prodDatabaseType : appConfig.databaseType;
                         const relativePath = normalize(pathjs.relative(this.destinationRoot(), `${path}/src/main/docker`));
-                        const databaseYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/${database}.yml`));
+                        const databaseYaml = parseYaml(this.fs.read(`${path}/src/main/docker/${database}.yml`));
                         const databaseServiceName = `${lowercaseBaseName}-${database}`;
                         let databaseYamlConfig = databaseYaml.services[database];
                         // Don't export database ports
                         delete databaseYamlConfig.ports;
                         if (appConfig.databaseTypeCassandra) {
                             // migration service config
-                            const cassandraMigrationYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/cassandra-migration.yml`));
+                            const cassandraMigrationYaml = parseYaml(this.fs.read(`${path}/src/main/docker/cassandra-migration.yml`));
                             const cassandraMigrationConfig = cassandraMigrationYaml.services[`${database}-migration`];
                             cassandraMigrationConfig.build.context = relativePath;
                             const cqlFilesRelativePath = normalize(pathjs.relative(this.destinationRoot(), `${path}/src/main/resources/config/cql`));
@@ -243,7 +239,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
                             databaseYamlConfig.build.context = relativePath;
                         }
                         if (appConfig.clusteredDb) {
-                            const clusterDbYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/${database}-cluster.yml`));
+                            const clusterDbYaml = parseYaml(this.fs.read(`${path}/src/main/docker/${database}-cluster.yml`));
                             const dbNodeConfig = clusterDbYaml.services[`${database}-node`];
                             dbNodeConfig.build.context = relativePath;
                             databaseYamlConfig = clusterDbYaml.services[database];
@@ -261,21 +257,21 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
                     if (appConfig.searchEngineElasticsearch) {
                         // Add search engine configuration
                         const searchEngine = appConfig.searchEngine;
-                        const searchEngineYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/${searchEngine}.yml`));
+                        const searchEngineYaml = parseYaml(this.fs.read(`${path}/src/main/docker/${searchEngine}.yml`));
                         const searchEngineConfig = searchEngineYaml.services[searchEngine];
                         delete searchEngineConfig.ports;
                         parentConfiguration[`${lowercaseBaseName}-${searchEngine}`] = searchEngineConfig;
                     }
                     // Add Memcached support
                     if (appConfig.cacheProviderMemcached) {
-                        const memcachedYaml = jsyaml.load(this.readDestination(`${path}/src/main/docker/memcached.yml`));
+                        const memcachedYaml = parseYaml(this.readDestination(`${path}/src/main/docker/memcached.yml`));
                         const memcachedConfig = memcachedYaml.services.memcached;
                         delete memcachedConfig.ports;
                         parentConfiguration[`${lowercaseBaseName}-memcached`] = memcachedConfig;
                     }
                     // Add Redis support
                     if (appConfig.cacheProviderRedis) {
-                        const redisYaml = jsyaml.load(this.readDestination(`${path}/src/main/docker/redis.yml`));
+                        const redisYaml = parseYaml(this.readDestination(`${path}/src/main/docker/redis.yml`));
                         const redisConfig = redisYaml.services.redis;
                         delete redisConfig.ports;
                         parentConfiguration[`${lowercaseBaseName}-redis`] = redisConfig;
@@ -283,7 +279,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
                     // Expose authenticationType
                     deployment.authenticationType = appConfig.authenticationType;
                     // Dump the file
-                    let yamlString = jsyaml.dump(parentConfiguration, { indent: 2, lineWidth: -1 });
+                    let yamlString = stringifyYaml(parentConfiguration, { indent: 2, lineWidth: 0 });
                     // Add extra indentation for each lines
                     const yamlArray = yamlString.split('\n');
                     for (let j = 0; j < yamlArray.length; j++) {

package/dist/generators/docker-compose/templates/docker-compose.yml.ejs

@@ -122,6 +122,7 @@ services:
       - KC_HTTP_PORT=9080
       - KC_HTTPS_PORT=9443
       - KC_HEALTH_ENABLED=true
+      - KC_HTTP_MANAGEMENT_PORT=9990
     ports:
       - 9080:9080
       - 9443:9443

package/dist/generators/docker-compose/templates/realm-config/keycloak-health-check.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-exec 3<>/dev/tcp/localhost/9080
+exec 3<>/dev/tcp/localhost/9990
 
-echo -e "GET /health/ready HTTP/1.1\nhost: localhost:9080\n" >&3
+echo -e "GET /health/ready HTTP/1.1\nhost: localhost:9990\n" >&3
 
 timeout --preserve-status 1 cat <&3 | grep -m 1 status | grep -m 1 UP
 ERROR=$?

package/dist/generators/entities/generator.js

@@ -45,9 +45,6 @@ export default class EntitiesGenerator extends BaseApplicationGenerator {
                     this.log.verboseInfo('Generating entities', ...this.entities);
                 }
             },
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
         });
     }
     get [BaseApplicationGenerator.INITIALIZING]() {

package/dist/generators/entity/generator.js

@@ -16,17 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable consistent-return */
 import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
 import { upperFirst } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
-import prompts from './prompts.js';
 import { JHIPSTER_CONFIG_DIR } from '../generator-constants.js';
 import { applicationTypes, reservedKeywords } from '../../jdl/jhipster/index.js';
 import { GENERATOR_ENTITIES } from '../generator-list.js';
 import { getDBTypeFromDBValue, hibernateSnakeCase } from '../server/support/index.js';
+import prompts from './prompts.js';
 const { GATEWAY, MICROSERVICE } = applicationTypes;
 const { isReservedClassName } = reservedKeywords;
 export default class EntityGenerator extends BaseApplicationGenerator {
@@ -46,9 +45,6 @@ export default class EntityGenerator extends BaseApplicationGenerator {
     // Public API method used by the getter and also by Blueprints
     get initializing() {
         return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
             parseOptions() {
                 const name = upperFirst(this.name).replace('.json', '');
                 this.entityStorage = this.getEntityConfig(name, true);