generator-jhipster 8.0.0-beta.2 → 8.0.0-rc.1

package/dist/generators/client/generator.mjs

@@ -16,37 +16,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
 import BaseApplicationGenerator from '../base-application/index.mjs';
-import { askForAdminUi, askForClient, askForClientTheme, askForClientThemeVariant } from './prompts.mjs';
+import { askForClientTheme, askForClientThemeVariant } from './prompts.mjs';
 import { writeFiles as writeCommonFiles } from './files-common.mjs';
-import { writeEnumerationFiles } from './entity-files.mjs';
+import { addEnumerationFiles } from './entity-files.mjs';
 import { LOGIN_REGEX_JS } from '../generator-constants.mjs';
 import statistics from '../statistics.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_CYPRESS, GENERATOR_COMMON, GENERATOR_CLIENT } from '../generator-list.mjs';
 import { testFrameworkTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { createNeedleCallback } from '../base/support/index.mjs';
-const { ANGULAR, VUE, REACT } = clientFrameworkTypes;
+import { loadStoredAppOptions } from '../app/support/index.mjs';
+import command from './command.mjs';
+const { ANGULAR, VUE, REACT, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const { CYPRESS } = testFrameworkTypes;
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('./types.mjs').ClientApplication>}
- */
 export default class JHipsterClientGenerator extends BaseApplicationGenerator {
+    command = command;
     async beforeQueue() {
-        this.loadStoredAppOptions();
-        this.loadRuntimeOptions();
-        // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
-        await this.dependsOnJHipster(GENERATOR_COMMON);
+        loadStoredAppOptions.call(this);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_CLIENT);
         }
+        if (!this.delegateToBlueprint) {
+            // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
+            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnJHipster(GENERATOR_COMMON);
+        }
+    }
+    get initializing() {
+        return this.asInitializingTaskGroup({
+            loadOptions() {
+                this.parseJHipsterCommand(this.command);
+            },
+        });
+    }
+    get [BaseApplicationGenerator.INITIALIZING]() {
+        return this.delegateTasksToBlueprint(() => this.initializing);
     }
     get prompting() {
         return this.asPromptingTaskGroup({
-            askForClient,
-            askForAdminUi,
+            async prompting({ control }) {
+                if (control.existingProject && this.options.askAnswered !== true)
+                    return;
+                await this.prompt(this.prepareQuestions(this.command.configs));
+            },
             askForClientTheme,
             askForClientThemeVariant,
         });
@@ -56,6 +68,21 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     }
     get configuring() {
         return this.asConfiguringTaskGroup({
+            applyNoFramework() {
+                const { clientFramework } = this.jhipsterConfigWithDefaults;
+                if (clientFramework === CLIENT_FRAMEWORK_NO) {
+                    this.jhipsterConfig.skipClient = true;
+                    this.cancelCancellableTasks();
+                }
+            },
+            mergeTestConfig() {
+                if (this.jhipsterConfig.clientTestFrameworks) {
+                    this.jhipsterConfig.testFrameworks = [
+                        ...new Set([...(this.jhipsterConfig.testFrameworks ?? []), ...this.jhipsterConfig.clientTestFrameworks]),
+                    ];
+                    delete this.jhipsterConfig.clientTestFrameworks;
+                }
+            },
             upgradeAngular() {
                 if (this.jhipsterConfig.clientFramework === 'angularX') {
                     this.jhipsterConfig.clientFramework = ANGULAR;
@@ -83,7 +110,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     get composing() {
         return this.asComposingTaskGroup({
             async composing() {
-                const { clientFramework, testFrameworks, enableTranslation } = this.jhipsterConfigWithDefaults;
+                const { clientFramework, testFrameworks } = this.jhipsterConfigWithDefaults;
                 if ([ANGULAR, VUE, REACT].includes(clientFramework)) {
                     await this.composeWithJHipster(clientFramework);
                 }
@@ -123,6 +150,9 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
                 application.webappLoginRegExp = LOGIN_REGEX_JS;
             },
             addExternalResource({ application, source }) {
+                if (![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
+                    return;
+                }
                 source.addExternalResourceToRoot = ({ resource, comment }) => this.editFile(`${application.clientSrcDir}index.html`, createNeedleCallback({
                     needle: 'add-resources-to-root',
                     contentToAdd: [comment ? `<!-- ${comment} -->` : undefined, resource].filter(i => i).join('\n'),
@@ -164,7 +194,14 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     }
     get writingEntities() {
         return this.asWritingEntitiesTaskGroup({
-            writeEnumerationFiles,
+            async writeEnumerationFiles({ application, entities }) {
+                if (!application.webappEnumerationsDir || ![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
+                    return;
+                }
+                for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) {
+                    await addEnumerationFiles.call(this, { application, entity });
+                }
+            },
         });
     }
     get [BaseApplicationGenerator.WRITING_ENTITIES]() {
@@ -173,7 +210,10 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     get postWriting() {
         return this.asPostWritingTaskGroup({
             packageJsonScripts({ application }) {
-                const packageJsonStorage = this.createStorage('package.json');
+                if (![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
+                    return;
+                }
+                const packageJsonStorage = this.createStorage(this.destinationPath(application.clientRootDir, 'package.json'));
                 const scriptsStorage = packageJsonStorage.createStorage('scripts');
                 const packageJsonConfigStorage = packageJsonStorage.createStorage('config').createProxy();
                 if (process.env.JHI_PROFILE) {
@@ -190,15 +230,18 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
                     scriptsStorage.set('ci:frontend:test', 'npm run ci:frontend:build && npm test');
                 }
             },
-            microfrontend({ application }) {
-                if (!application.microfrontend)
+            microfrontend({ application, source }) {
+                if (!application.microfrontend || ![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
                     return;
+                }
                 if (application.clientFrameworkAngular) {
                     const conditional = application.applicationTypeMicroservice ? "targetOptions.target === 'serve' ? {} : " : '';
-                    this.addWebpackConfig(`${conditional}require('./webpack.microfrontend')(config, options, targetOptions)`, application.clientFramework);
+                    source.addWebpackConfig({
+                        config: `${conditional}require('./webpack.microfrontend')(config, options, targetOptions)`,
+                    });
                 }
                 else if (application.clientFrameworkVue || application.clientFrameworkReact) {
-                    this.addWebpackConfig("require('./webpack.microfrontend')({ serve: options.env.WEBPACK_SERVE })", application.clientFramework);
+                    source.addWebpackConfig({ config: "require('./webpack.microfrontend')({ serve: options.env.WEBPACK_SERVE })" });
                 }
                 else {
                     throw new Error(`Client framework ${application.clientFramework} doesn't support microfrontends`);

package/dist/generators/client/needle-api/needle-client-vue.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import needleClientBase from './needle-client.mjs';
 import { stripMargin } from '../../base/support/index.mjs';
 import { createNeedleCallback } from '../../base/support/needles.mjs';

package/dist/generators/client/prompts.mjs

@@ -16,46 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import chalk from 'chalk';
-import { clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { httpsGet } from '../base/support/index.mjs';
-const NO_CLIENT_FRAMEWORK = clientFrameworkTypes.NO;
-const { ANGULAR, REACT, VUE } = clientFrameworkTypes;
-export async function askForClient({ control }) {
-    if (control.existingProject && !this.options.askAnswered)
-        return;
-    const config = this.jhipsterConfigWithDefaults;
-    const choices = [
-        {
-            value: ANGULAR,
-            name: 'Angular',
-        },
-        {
-            value: REACT,
-            name: 'React',
-        },
-        {
-            value: VUE,
-            name: 'Vue',
-        },
-        {
-            value: 'no',
-            name: 'No client',
-        },
-    ];
-    const answers = await this.prompt({
-        type: 'list',
-        name: 'clientFramework',
-        when: () => this.jhipsterConfig.applicationType !== 'microservice',
-        message: `Which ${chalk.yellow('*Framework*')} would you like to use for the client?`,
-        choices,
-        default: config.clientFramework,
-    }, this.config);
-    if (answers.clientFramework === NO_CLIENT_FRAMEWORK) {
-        this.skipClient = this.jhipsterConfig.skipClient = true;
-        this.cancelCancellableTasks();
-    }
-}
 export async function askForClientTheme({ control }) {
     if (control.existingProject && !this.options.askAnswered)
         return;
@@ -63,7 +24,7 @@ export async function askForClientTheme({ control }) {
     await this.prompt({
         type: 'list',
         name: 'clientTheme',
-        when: () => !this.jhipsterConfig.skipClient,
+        when: () => ['angular', 'react', 'vue'].includes(config.clientFramework),
         message: 'Would you like to use a Bootswatch theme (https://bootswatch.com/)?',
         choices: async () => {
             const bootswatchChoices = await retrieveOnlineBootswatchThemes(this).catch(errorMessage => {
@@ -84,7 +45,7 @@ export async function askForClientTheme({ control }) {
 export async function askForClientThemeVariant({ control }) {
     if (control.existingProject && !this.options.askAnswered)
         return;
-    if (this.jhipsterConfig.clientTheme === 'none') {
+    if ((this.jhipsterConfig.clientTheme ?? 'none') === 'none') {
         return;
     }
     const config = this.jhipsterConfigWithDefaults;
@@ -101,18 +62,6 @@ export async function askForClientThemeVariant({ control }) {
         default: config.clientThemeVariant,
     }, this.config);
 }
-export async function askForAdminUi({ control }) {
-    if (control.existingProject && !this.options.askAnswered)
-        return;
-    const config = this.jhipsterConfigWithDefaults;
-    await this.prompt({
-        type: 'confirm',
-        name: 'withAdminUi',
-        when: () => !this.jhipsterConfig.skipClient,
-        message: 'Do you want to generate the admin UI?',
-        default: config.withAdminUi,
-    }, this.config);
-}
 async function retrieveOnlineBootswatchThemes(generator) {
     return _retrieveBootswatchThemes(generator, true);
 }

package/dist/generators/client/resources/package.json

@@ -1,16 +1,16 @@
 {
   "dependencies": {
-    "dayjs": "1.11.9"
+    "dayjs": "1.11.10"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.11.0",
+    "@cypress/code-coverage": "3.12.3",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
-    "cypress": "12.17.1",
+    "cypress": "13.3.1",
     "cypress-audit": "1.1.0",
-    "eslint-plugin-cypress": "2.13.3",
-    "lighthouse": "10.4.0",
+    "eslint-plugin-cypress": "2.15.1",
+    "lighthouse": "11.2.0",
     "nyc": "15.1.0",
-    "swagger-ui-dist": "5.1.0"
+    "swagger-ui-dist": "5.9.0"
   }
 }

package/dist/generators/client/support/config.mjs

@@ -0,0 +1,35 @@
+import { getFrontendAppName } from '../../base/support/basename.mjs';
+import { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR } from '../../generator-constants.mjs';
+/**
+ * Load client configs into application.
+ */
+export const loadClientConfig = ({ config, application }) => {
+    application.clientPackageManager = config.clientPackageManager;
+    application.clientFramework = config.clientFramework;
+    application.clientTheme = config.clientTheme;
+    application.clientThemeVariant = config.clientThemeVariant;
+    application.devServerPort = config.devServerPort;
+    application.clientRootDir = config.clientRootDir ?? '';
+    application.clientSrcDir = config.clientSrcDir ?? `${application.clientRootDir}${CLIENT_MAIN_SRC_DIR}`;
+    application.clientTestDir = config.clientTestDir ?? `${application.clientRootDir}${CLIENT_TEST_SRC_DIR}`;
+};
+/**
+ * Load client derived properties.
+ */
+export const loadDerivedClientConfig = ({ application }) => {
+    if (application.microfrontend === undefined) {
+        if (application.applicationTypeMicroservice) {
+            application.microfrontend = application.clientFrameworkAny;
+        }
+        else if (application.applicationTypeGateway) {
+            application.microfrontend = application.microfrontends && application.microfrontends.length > 0;
+        }
+    }
+    application.clientThemeNone = application.clientTheme === 'none';
+    application.clientThemePrimary = application.clientThemeVariant === 'primary';
+    application.clientThemeLight = application.clientThemeVariant === 'light';
+    application.clientThemeDark = application.clientThemeVariant === 'dark';
+    if (application.baseName) {
+        application.frontendAppName = getFrontendAppName({ baseName: application.baseName });
+    }
+};

package/dist/generators/client/support/entity-definition.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import getTypescriptKeyType from './types-utils.mjs';
-import { fieldTypes, validations, clientFrameworkTypes, relationshipTypes } from '../../../jdl/jhipster/index.mjs';
+import { fieldTypes, validations, clientFrameworkTypes } from '../../../jdl/jhipster/index.mjs';
 const dbTypes = fieldTypes;
 const { Validations: { REQUIRED }, } = validations;
 const { STRING: TYPE_STRING, INTEGER: TYPE_INTEGER, LONG: TYPE_LONG, BIG_DECIMAL: TYPE_BIG_DECIMAL, FLOAT: TYPE_FLOAT, DOUBLE: TYPE_DOUBLE, UUID: TYPE_UUID, BOOLEAN: TYPE_BOOLEAN, LOCAL_DATE: TYPE_LOCAL_DATE, ZONED_DATE_TIME: TYPE_ZONED_DATE_TIME, INSTANT: TYPE_INSTANT, DURATION: TYPE_DURATION, } = dbTypes.CommonDBTypes;

package/dist/generators/client/support/files.mjs

@@ -0,0 +1,47 @@
+import { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR } from '../../generator-constants.mjs';
+export const replaceEntityFilePath = (data, filepath) => filepath
+    .replace(/_entityFolder_/, data.entityFolderName)
+    .replace(/_entityFile_/, data.entityFileName)
+    .replace(/_entityModel_/, data.entityModelFileName);
+const CLIENT_TEMPLATES_SRC_DIR = CLIENT_MAIN_SRC_DIR;
+export function clientRootTemplatesBlock(blockOrRelativePath = '') {
+    return clientBlock({
+        srcPath: '',
+        destProperty: 'clientRootDir',
+        blockOrRelativePath,
+    });
+}
+export function clientSrcTemplatesBlock(blockOrRelativePath = '') {
+    return clientBlock({
+        srcPath: CLIENT_TEMPLATES_SRC_DIR,
+        destProperty: 'clientSrcDir',
+        blockOrRelativePath,
+    });
+}
+export function clientApplicationTemplatesBlock(blockOrRelativePath = '') {
+    return clientBlock({
+        srcPath: CLIENT_TEMPLATES_SRC_DIR,
+        relativeToSrc: 'app/',
+        destProperty: 'clientSrcDir',
+        blockOrRelativePath,
+    });
+}
+export function clientTestTemplatesBlock(blockOrRelativePath = '') {
+    return clientBlock({
+        srcPath: CLIENT_TEST_SRC_DIR,
+        destProperty: 'clientTestDir',
+        blockOrRelativePath,
+    });
+}
+function clientBlock({ srcPath, destProperty, blockOrRelativePath = '', relativeToSrc = '', }) {
+    const block = typeof blockOrRelativePath !== 'string' ? blockOrRelativePath : undefined;
+    const blockRenameTo = typeof block?.renameTo === 'function' ? block.renameTo : undefined;
+    const relativePath = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : blockOrRelativePath.relativePath ?? '';
+    return {
+        path: `${srcPath}${relativeToSrc}${relativePath}`,
+        ...block,
+        renameTo(data, filePath) {
+            return `${data[destProperty]}${relativeToSrc}${replaceEntityFilePath(data, relativePath) ?? ''}${replaceEntityFilePath(data, blockRenameTo?.call?.(this, data, filePath) ?? filePath) ?? ''}`;
+        },
+    };
+}

package/dist/generators/client/support/index.mjs

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export * from './config.mjs';
 export { default as getTypescriptKeyType, getTypescriptType } from './types-utils.mjs';
 export { default as generateEntityClientFields } from './entity-definition.mjs';
 export { default as prepareEntity } from './prepare-entity.mjs';
@@ -23,3 +24,4 @@ export * from './prepare-entity.mjs';
 export { default as prepareField } from './prepare-field.mjs';
 export * from './template-utils.mjs';
 export * from './update-languages.mjs';
+export * from './files.mjs';

package/dist/generators/client/support/prepare-entity.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import getTypescriptKeyType from './types-utils.mjs';
-export default function prepareEntity(entity) { }
+export default function prepareEntity() { }
 export function preparePostEntityClientDerivedProperties(entity) {
     if (entity.primaryKey) {
         entity.tsKeyType = getTypescriptKeyType(entity.primaryKey.type);

package/dist/generators/client/support/prepare-field.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export default function prepareField(entityWithConfig, field, generator) {
+export default function prepareField(entityWithConfig, field) {
     if (field.fieldValidateRulesPatternAngular === undefined) {
         field.fieldValidateRulesPatternAngular = field.fieldValidateRulesPattern
             ? field.fieldValidateRulesPattern.replace(/"/g, '"')

package/dist/generators/client/support/template-utils.mjs

@@ -17,8 +17,7 @@
  * limitations under the License.
  */
 import path from 'path';
-import { fieldTypes } from '../../../jdl/jhipster/index.mjs';
-import { clientFrameworkTypes } from '../../../jdl/jhipster/index.mjs';
+import { fieldTypes, clientFrameworkTypes } from '../../../jdl/jhipster/index.mjs';
 import { getEntryIfTypeOrTypeAttribute } from './types-utils.mjs';
 const { STRING: TYPE_STRING, UUID: TYPE_UUID } = fieldTypes.CommonDBTypes;
 const { ANGULAR, VUE } = clientFrameworkTypes;

package/dist/generators/client/support/update-languages.mjs

@@ -9,6 +9,7 @@
 export function updateLanguagesInDayjsConfigurationTask({ application, control = {} }, { configurationFile, commonjs = false }) {
     const { languagesDefinition = [] } = application;
     const { ignoreNeedlesError: ignoreNonExisting } = control;
-    const newContent = languagesDefinition.reduce((content, language) => `${content}import 'dayjs/${commonjs ? '' : 'esm/'}locale/${language.dayjsLocale}'\n`, '// jhipster-needle-i18n-language-dayjs-imports - JHipster will import languages from dayjs here\n');
+    const uniqueDayjsLocales = [...new Map(languagesDefinition.map(v => [v.dayjsLocale, v])).values()];
+    const newContent = uniqueDayjsLocales.reduce((content, language) => `${content}import 'dayjs/${commonjs ? '' : 'esm/'}locale/${language.dayjsLocale}'\n`, '// jhipster-needle-i18n-language-dayjs-imports - JHipster will import languages from dayjs here\n');
     this.editFile(configurationFile, { ignoreNonExisting }, content => content.replace(/\/\/ jhipster-needle-i18n-language-dayjs-imports[\s\S]+?(?=\/\/ DAYJS CONFIGURATION)/g, `${newContent}\n`));
 }

package/dist/generators/client/templates/.eslintignore.ejs

@@ -25,3 +25,4 @@ build/
 node/
 coverage/
 postcss.config.js
+<%- this.relativeDir(clientRootDir, clientDistDir) %>

package/dist/generators/client/templates/.prettierignore.jhi.client.ejs

@@ -0,0 +1,22 @@
+<%#
+ Copyright 2013-2023 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.section) { -&>
+# Generated by jhipster:client
+<%- clientDistDir %>
+<&_ } -&>

package/dist/generators/client/templates/src/main/webapp/content/css/loading.css.ejs

@@ -151,7 +151,7 @@
   left: -8px;
   width: 24px;
   height: 10px;
-  background-image: url('/content/images/logo-jhipster.png');
+  background-image: url('../images/logo-jhipster.png');
   background-size: contain;
   -webkit-animation: lds-pacman-3 1s linear infinite;
   animation: lds-pacman-3 1.5s linear infinite;

package/dist/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs

@@ -16,11 +16,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
     <title><%= baseName %> - Swagger UI</title>
+    <base href="/swagger-ui/" />
     <link rel="stylesheet" type="text/css" href="./swagger-ui.css" />
     <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
     <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
@@ -43,6 +44,7 @@
       };
 
       window.onload = async function () {
+        const serverBaseUri = document.baseURI.replace('swagger-ui/', '');
 <%_ if (authenticationUsesCsrf) { _%>
         function getCSRF() {
           var name = 'XSRF-TOKEN=';
@@ -54,7 +56,10 @@
           }
           return '';
         }
-        const axiosConfig = { timeout: 5000 };
+        const axiosConfig = {
+          timeout: 5000,
+          baseURL: serverBaseUri,
+        };
 <%_ } else { _%>
         const getBearerToken = () => {
           var authToken = localStorage.getItem('<%= jhiPrefixDashed %>-authenticationToken') || sessionStorage.getItem('<%= jhiPrefixDashed %>-authenticationToken');
@@ -68,37 +73,41 @@
         };
         const axiosConfig = {
           timeout: 5000,
+          baseURL: serverBaseUri,
           headers: { Authorization: getBearerToken() },
         };
 <%_ } _%>
 
-        const baseUrl = '/v3/api-docs';
+        const baseUrl = 'v3/api-docs';
         let urls;
 <%_ if (!applicationTypeMonolith && serviceDiscoveryAny) { _%>
 
         try {
           const response = await axios.get('/management/health/discoveryComposite', axiosConfig);
-          const services = response.data?.components?.discoveryClient?.details?.services;
+          const services = response.data?.components?.discoveryClient?.details?.services<% if (serviceDiscoveryConsul) { %>.filter(service => service !== 'consul')<% } %>;
           console.log(`Services`, services);
 
           if (services && services.length > 0) {
             urls = (
               await Promise.allSettled(
                 services.map(async service => {
-                  return axios.get(`/services/${service}/management/jhiopenapigroups`, axiosConfig).then(response => {
-                    if (Array.isArray(response.data)) {
-                      return response.data.map(({ group, description }) => ({
-                        name: description,
-                        url: `/services/${service}${baseUrl}/${group}`,
-                      }));
-                    }
-                    return undefined;
-                  }).catch(() => {
-                    return axios
-                      .get(`/services/${service}${baseUrl}`, axiosConfig)
-                      .then(() => [{ url: `/services/${service}${baseUrl}`, name: `${service} (default)` }]);
-                  });
-                })
+                  return axios
+                    .get(`/services/${service}/management/jhiopenapigroups`, axiosConfig)
+                    .then(response => {
+                      if (Array.isArray(response.data)) {
+                        return response.data.map(({ group, description }) => ({
+                          name: description,
+                          url: `/services/${service}/${baseUrl}/${group}`,
+                        }));
+                      }
+                      return undefined;
+                    })
+                    .catch(() => {
+                      return axios
+                        .get(`/services/${service}/${baseUrl}`, axiosConfig)
+                        .then(() => [{ url: `/services/${service}/${baseUrl}`, name: `${service} (default)` }]);
+                    });
+                }),
               )
             )
               .filter(settled => settled.status === 'fulfilled')
@@ -115,9 +124,9 @@
         if (!urls || urls.length === 0) {
           const response = await axios.get('/management/jhiopenapigroups', axiosConfig);
           if (Array.isArray(response.data)) {
-            urls = response.data.map(({ group, description }) => ({ name: description, url: `${baseUrl}/${group}` }));
+            urls = response.data.map(({ group, description }) => ({ name: description, url: `${serverBaseUri}${baseUrl}/${group}` }));
           } else {
-            urls = [{ name: 'default', url: baseUrl }];
+            urls = [{ name: 'default', url: `${serverBaseUri}${baseUrl}` }];
           }
         }
         console.log(`Swagger urls`, urls);

package/dist/generators/cloudfoundry/generator.mjs

@@ -27,6 +27,10 @@ import statistics from '../statistics.mjs';
 import { CLIENT_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
 import { GENERATOR_CLOUDFOUNDRY } from '../generator-list.mjs';
 import { cacheTypes, buildToolTypes, databaseTypes } from '../../jdl/jhipster/index.mjs';
+import { getFrontendAppName } from '../base/support/index.mjs';
+import { buildApplication } from '../server/internal/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
 const { MEMCACHED } = cacheTypes;
 const { GRADLE, MAVEN } = buildToolTypes;
 const cacheProviders = cacheTypes;
@@ -46,18 +50,19 @@ export default class CloudfoundryGenerator extends BaseGenerator {
                 this.log.log(chalk.bold('CloudFoundry configuration is starting'));
             },
             getSharedConfig() {
-                this.loadAppConfig();
-                this.loadServerConfig();
-                this.loadPlatformConfig();
-                this.loadDerivedAppConfig();
-                this.loadDerivedServerConfig();
+                loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+                loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadPlatformConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadDerivedAppConfig({ application: this });
+                loadDerivedPlatformConfig({ application: this });
+                loadDerivedServerConfig({ application: this });
             },
             getConfig() {
                 const configuration = this.config;
                 this.env.options.appPath = configuration.get('appPath') || CLIENT_MAIN_SRC_DIR;
                 this.cacheProvider = this.cacheProvider || NO_CACHE_PROVIDER;
                 this.enableHibernateCache = this.enableHibernateCache && ![NO_CACHE_PROVIDER, MEMCACHED].includes(this.cacheProvider);
-                this.frontendAppName = this.getFrontendAppName();
+                this.frontendAppName = getFrontendAppName({ baseName: this.jhipsterConfig.baseName });
             },
         };
     }
@@ -110,7 +115,7 @@ export default class CloudfoundryGenerator extends BaseGenerator {
                     return;
                 const done = this.async();
                 this.log.log(chalk.bold('\nChecking for an existing Cloud Foundry hosting environment...'));
-                exec(`cf app ${this.cloudfoundryDeployedName} `, {}, (err, stdout, stderr) => {
+                exec(`cf app ${this.cloudfoundryDeployedName} `, {}, (_err, stdout) => {
                     // Unauthenticated
                     if (stdout.search('cf login') >= 0) {
                         this.log.error("Error: Not authenticated. Run 'cf login' to login to your cloudfoundry account and try again.");
@@ -126,7 +131,7 @@ export default class CloudfoundryGenerator extends BaseGenerator {
                 this.log.log(chalk.bold('\nCreating your Cloud Foundry hosting environment, this may take a couple minutes...'));
                 if (this.databaseType !== 'no') {
                     this.log.log(chalk.bold('Creating the database'));
-                    const child = exec(`cf create-service ${this.cloudfoundryDatabaseServiceName} ${this.cloudfoundryDatabaseServicePlan} ${this.cloudfoundryDeployedName}`, {}, (err, stdout, stderr) => {
+                    const child = exec(`cf create-service ${this.cloudfoundryDatabaseServiceName} ${this.cloudfoundryDatabaseServicePlan} ${this.cloudfoundryDeployedName}`, {}, () => {
                         done();
                     });
                     child.stdout.on('data', data => {
@@ -142,7 +147,7 @@ export default class CloudfoundryGenerator extends BaseGenerator {
                     return;
                 const done = this.async();
                 this.log.log(chalk.bold(`\nBuilding the application with the ${this.cloudfoundryProfile} profile`));
-                const child = this.buildApplication(this.buildTool, this.cloudfoundryProfile, false, err => {
+                const child = buildApplication(this.buildTool, this.cloudfoundryProfile, false, err => {
                     if (err) {
                         this.log.error(err);
                     }
@@ -196,7 +201,7 @@ export default class CloudfoundryGenerator extends BaseGenerator {
                 if (this.abort || !this.cloudfoundry_remote_exists)
                     return;
                 this.log.log(chalk.bold('\nRestarting your cloudfoundry app.\n'));
-                exec(`cf restart ${this.cloudfoundryDeployedName}`, (err, stdout, stderr) => {
+                exec(`cf restart ${this.cloudfoundryDeployedName}`, () => {
                     this.log.log(chalk.green('\nYour app should now be live'));
                 });
             },