generator-jhipster 8.7.3 → 8.8.0

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

@@ -16,7 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import path from 'path';
+import assert from 'node:assert';
+import path from 'node:path';
 import { clientFrameworkTypes, fieldTypes } from '../../../lib/jhipster/index.js';
 import { getEntryIfTypeOrTypeAttribute } from './types-utils.js';
 const { STRING: TYPE_STRING, UUID: TYPE_UUID } = fieldTypes.CommonDBTypes;
@@ -70,9 +71,9 @@ export const generateEntityClientImports = (relationships, dto, clientFramework)
 export const generateEntityClientEnumImports = (fields, clientFramework) => {
     const typeImports = new Map();
     const uniqueEnums = {};
-    fields.forEach(field => {
+    for (const field of fields) {
         const { enumFileName, fieldType } = field;
-        if (field.fieldIsEnum && (!uniqueEnums[fieldType] || (uniqueEnums[fieldType] && field.fieldValues.length !== 0))) {
+        if (field.fieldIsEnum && (!uniqueEnums[fieldType] || (uniqueEnums[fieldType] && field.fieldValues?.length !== 0))) {
             const importType = `${fieldType}`;
             const basePath = clientFramework === VUE ? '@' : 'app';
             const modelPath = clientFramework === ANGULAR ? 'entities' : 'shared/model';
@@ -80,46 +81,73 @@ export const generateEntityClientEnumImports = (fields, clientFramework) => {
             uniqueEnums[fieldType] = field.fieldType;
             typeImports.set(importType, importPath);
         }
-    });
+    }
     return typeImports;
 };
 /**
  * @private
  * Generate a primary key, according to the type
- *
- * @param {any} primaryKey - primary key definition
- * @param {number} index - the index of the primary key, currently it's possible to generate 2 values, index = 0 - first key (default), otherwise second key
- * @param {boolean} [wrapped=true] - wrapped values for required types.
  */
 export const generateTestEntityId = (primaryKey, index = 0, wrapped = true) => {
-    primaryKey = getEntryIfTypeOrTypeAttribute(primaryKey);
+    if (index === 'random' && typeof primaryKey === 'object') {
+        return primaryKey.fields[0].generateFakeData('ts');
+    }
+    assert(index === 0 || index === 1, 'index must be 0 or 1');
+    const primaryKeyType = getEntryIfTypeOrTypeAttribute(primaryKey);
     let value;
-    if (primaryKey === TYPE_STRING) {
+    if (primaryKeyType === TYPE_STRING) {
         value = index === 0 ? 'ABC' : 'CBA';
     }
-    else if (primaryKey === TYPE_UUID) {
+    else if (primaryKeyType === TYPE_UUID) {
         value = index === 0 ? '9fec3727-3421-4967-b213-ba36557ca194' : '1361f429-3817-4123-8ee3-fdf8943310b2';
     }
     else {
         value = index === 0 ? 123 : 456;
     }
-    if (wrapped && [TYPE_UUID, TYPE_STRING].includes(primaryKey)) {
+    if (wrapped && [TYPE_UUID, TYPE_STRING].includes(primaryKeyType)) {
         return `'${value}'`;
     }
     return value;
 };
+/**
+ * Generate a test entity, according to the type
+ */
+export const generateTsTestEntityForFields = (fields) => {
+    const entries = fields
+        .map(field => {
+        const { fieldWithContentType, contentTypeFieldName, fieldTypeTimed, fieldTypeLocalDate } = field;
+        const fakeData = field.generateFakeData('ts');
+        if (fieldWithContentType) {
+            return [
+                [field.propertyName, fakeData],
+                [contentTypeFieldName, "'unknown'"],
+            ];
+        }
+        if (fieldTypeTimed || fieldTypeLocalDate) {
+            return [[field.propertyName, `dayjs(${fakeData})`]];
+        }
+        return [[field.propertyName, fakeData]];
+    })
+        .flat();
+    return Object.fromEntries(entries);
+};
+export const stringifyTsEntity = (data, options = {}) => {
+    const entries = Object.entries(data);
+    const { sep = entries.length > 1 ? '\n  ' : '' } = options;
+    return `{${sep}${entries.map(([key, value]) => `${key}: ${value}`).join(`,${sep}`)}${sep.trim()}}`;
+};
 /**
  * @private
+ * @deprecated
  * Generate a test entity, according to the type
  *
  * @param references
  * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
  */
 export const generateTestEntity = (references, index = 'random') => {
-    const random = index === 'random';
     const entries = references
         .map(reference => {
-        if (random && reference.field) {
+        if (index === 'random') {
             const field = reference.field;
             const { fieldWithContentType, contentTypeFieldName } = field;
             const fakeData = field.generateFakeData('json-serializable');
@@ -137,6 +165,7 @@ export const generateTestEntity = (references, index = 'random') => {
     return Object.fromEntries(entries);
 };
 /**
+ * @deprecated
  * Generate a test entity, according to the references
  *
  * @param references
@@ -172,10 +201,8 @@ export const generateTypescriptTestEntity = (references, additionalFields = {})
 }`;
 };
 /**
+ * @deprecated
  * Generate a test entity for the PK references (when the PK is a composite key)
- *
- * @param {any} primaryKey - primary key definition.
- * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
  */
 export const generateTestEntityPrimaryKey = (primaryKey, index) => {
     return JSON.stringify(generateTestEntity(primaryKey.fields.map(f => f.reference), index));
@@ -185,7 +212,7 @@ export const generateTestEntityPrimaryKey = (primaryKey, index) => {
  * Get a parent folder path addition for entity
  * @param {string} clientRootFolder
  */
-export const getEntityParentPathAddition = clientRootFolder => {
+export const getEntityParentPathAddition = (clientRootFolder) => {
     if (!clientRootFolder) {
         return '';
     }

package/dist/generators/client/support/update-languages.d.ts

@@ -17,11 +17,10 @@
  * limitations under the License.
  */
 import type { CommonClientServerApplication } from '../../base-application/types.js';
-import type BaseGenerator from '../../base/index.js';
+import type BaseGenerator from '../../base-core/index.js';
+type UpdateLanguagesApplication = Pick<CommonClientServerApplication<any>, 'clientBundlerWebpack' | 'clientSrcDir' | 'clientRootDir' | 'enableTranslation' | 'languagesDefinition' | 'languages'>;
 export type UpdateClientLanguagesTaskParam = {
-    application: CommonClientServerApplication<any> & {
-        enableTranslation: true;
-    };
+    application: UpdateLanguagesApplication;
     control?: any;
 };
 /**
@@ -35,3 +34,4 @@ export declare function updateLanguagesInDayjsConfigurationTask(this: BaseGenera
     configurationFile: string;
     commonjs?: boolean;
 }): void;
+export {};

package/dist/generators/client/types.d.ts

@@ -1,22 +1,28 @@
 import type { addIconImport, addItemToMenu, addRoute } from '../angular/support/needles.js';
-import type { AngularApplication } from '../angular/types.js';
 import type { ExportApplicationPropertiesFromCommand } from '../../lib/command/index.js';
 import type { CypressApplication } from '../cypress/types.js';
 import type { JavaScriptApplication, JavaScriptSourceType } from '../javascript/types.js';
 import type { PostWritingEntitiesTaskParam } from '../../lib/types/application/tasks.js';
+import type { PartialAngularApplication } from '../angular/types-partial.js';
+import type { Language } from '../languages/support/languages.ts';
 import type Command from './command.ts';
 
 type ApplicationClientProperties = ExportApplicationPropertiesFromCommand<typeof Command>;
 
-export type ClientApplication = ApplicationClientProperties &
+export type FrontendApplication = ApplicationClientProperties &
   JavaScriptApplication &
-  AngularApplication &
   CypressApplication & {
     webappLoginRegExp: string;
+    clientWebappDir?: string;
     webappEnumerationsDir?: string;
     clientFrameworkBuiltIn?: boolean;
   };
 
+/**
+ * @deprecated in favor of frontend application.
+ */
+export type ClientApplication = JavaScriptApplication & PartialAngularApplication & FrontendApplication;
+
 export type ClientResources = {
   /**
    * resources added to root file.
@@ -41,4 +47,5 @@ export type ClientSourceType = JavaScriptSourceType & {
    * Add webpack config.
    */
   addWebpackConfig?(args: { config: string });
+  addLanguagesInFrontend?(args: { languagesDefinition: readonly Language[] });
 };

package/dist/generators/common/files.d.ts

@@ -29,7 +29,5 @@ export declare const commonFiles: {
     }[];
 };
 export declare function writeFiles(): {
-    writeFiles({ application }: {
-        application: any;
-    }): any;
+    writeFiles: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>) => void;
 };

package/dist/generators/common/files.js

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *
@@ -17,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { asWritingTask } from '../base-application/support/task-type-inference.js';
 /**
  * The default is to use a file path string. It implies use of the template method.
  * For any other config an object { file:.., method:.., template:.. } can be used
@@ -35,11 +35,11 @@ export const commonFiles = {
 };
 export function writeFiles() {
     return {
-        writeFiles({ application }) {
+        writeFiles: asWritingTask(function ({ application }) {
             return this.writeFiles({
                 sections: commonFiles,
                 context: application,
             });
-        },
+        }),
     };
 }

package/dist/generators/common/generator.d.ts

@@ -18,12 +18,10 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class CommonGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     command: import("../index.js").JHipsterCommandDefinition;
     beforeQueue(): Promise<void>;
-    get configuring(): {
-        configureMonorepository(): Promise<void>;
-        configureCommitHook(): void;
-    };
+    get configuring(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "configureMonorepository" | "configureCommitHook">;
     get composing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "composing">;
     get configuringEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").ConfiguringEachEntityTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "migrateEntity">;
     get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "loadPackageJson" | "loadConfig">;

package/dist/generators/common/generator.js

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *
@@ -18,6 +17,7 @@
  * limitations under the License.
  */
 import { isFileStateModified } from 'mem-fs-editor/state';
+import { CheckRepoActions } from 'simple-git';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, JHIPSTER_DOCUMENTATION_URL, MAIN_DIR, SERVER_MAIN_RES_DIR, TEST_DIR, } from '../generator-constants.js';
 import { clientFrameworkTypes } from '../../lib/jhipster/index.js';
@@ -41,12 +41,12 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     }
     // Public API method used by the getter and also by Blueprints
     get configuring() {
-        return {
+        return this.asConfiguringTaskGroup({
             async configureMonorepository() {
                 if (this.jhipsterConfig.monorepository)
                     return;
                 const git = this.createGit();
-                if ((await git.checkIsRepo()) && !(await git.checkIsRepo('root'))) {
+                if ((await git.checkIsRepo()) && !(await git.checkIsRepo(CheckRepoActions.IS_REPO_ROOT))) {
                     this.jhipsterConfig.monorepository = true;
                 }
             },
@@ -55,7 +55,7 @@ export default class CommonGenerator extends BaseApplicationGenerator {
                     this.jhipsterConfig.skipCommitHook = true;
                 }
             },
-        };
+        });
     }
     get [BaseApplicationGenerator.CONFIGURING]() {
         return this.delegateTasksToBlueprint(() => this.configuring);
@@ -78,11 +78,11 @@ export default class CommonGenerator extends BaseApplicationGenerator {
             migrateEntity({ entityConfig, entityStorage }) {
                 for (const field of entityConfig.fields) {
                     if (field.javadoc) {
-                        field.documentation = field.javadoc;
+                        field.documentation ??= field.javadoc;
                         delete field.javadoc;
                     }
                     if (field.fieldTypeJavadoc) {
-                        field.fieldTypeDocumentation = field.fieldTypeJavadoc;
+                        field.fieldTypeDocumentation ??= field.fieldTypeJavadoc;
                         delete field.fieldTypeJavadoc;
                     }
                 }
@@ -129,16 +129,18 @@ export default class CommonGenerator extends BaseApplicationGenerator {
                     throw new Error('Entities cannot be generated as the entity suffix and DTO suffix are equals!');
                 }
             },
-            setupConstants({ application }) {
+            setupConstants({ applicationDefaults }) {
                 // Make constants available in templates
-                application.MAIN_DIR = MAIN_DIR;
-                application.TEST_DIR = TEST_DIR;
-                application.SERVER_MAIN_RES_DIR = SERVER_MAIN_RES_DIR;
-                application.ANGULAR = ANGULAR;
-                application.REACT = REACT;
-                // Make documentation URL available in templates
-                application.DOCUMENTATION_URL = JHIPSTER_DOCUMENTATION_URL;
-                application.DOCUMENTATION_ARCHIVE_PATH = JHIPSTER_DOCUMENTATION_ARCHIVE_PATH;
+                applicationDefaults({
+                    MAIN_DIR,
+                    TEST_DIR,
+                    SERVER_MAIN_RES_DIR,
+                    ANGULAR,
+                    REACT,
+                    // Make documentation URL available in templates
+                    DOCUMENTATION_URL: JHIPSTER_DOCUMENTATION_URL,
+                    DOCUMENTATION_ARCHIVE_PATH: JHIPSTER_DOCUMENTATION_ARCHIVE_PATH,
+                });
             },
         });
     }

package/dist/generators/common/resources/package.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
-    "concurrently": "9.0.1",
-    "npm": "10.9.0",
+    "concurrently": "9.1.0",
+    "npm": "11.0.0",
     "wait-on": "8.0.1"
   }
 }

package/dist/generators/common/templates/sonar-project.properties.ejs

@@ -37,45 +37,45 @@ sonar.javascript.lcov.reportPaths=<%_ if (buildToolMaven) { _%>target<%_ } else
 
 sonar.sourceEncoding=UTF-8
 sonar.exclusions=<%= clientSrcDir %>content/**/*.*, <%= clientSrcDir %>i18n/*.js, <%= clientDistDir %>**/*.*
-<%_ if (!skipServer) { _%>
+<%_ if (!skipServer && backendTypeJavaAny) { _%>
 
 sonar.issue.ignore.multicriteria=\
-<%_ if (backendTypeSpringBoot) { _%>
+  <%_ if (backendTypeSpringBoot) { _%>
   S6437,\
-<%_ } _%>
-<%_ if (cacheProviderAny) { _%>
+  <%_ } _%>
+  <%_ if (cacheProviderAny) { _%>
   S1192,\
-<%_ } _%>
-<%_ if (backendTypeSpringBoot) { _%>
+  <%_ } _%>
+  <%_ if (backendTypeSpringBoot) { _%>
   S125,\
-<%_ } _%>
-<%_ if (gatlingTests) { _%>
+  <%_ } _%>
+  <%_ if (gatlingTests) { _%>
   S2187,\
-<%_ } _%>
+  <%_ } _%>
   S3437,\
-<%_ if (authenticationTypeJwt) { _%>
+  <%_ if (authenticationTypeJwt) { _%>
   S4502,\
-<%_ } _%>
+  <%_ } _%>
   S4684,S5145,S7027-domain,S7027-dto,UndocumentedApi
 
-<%_ if (backendTypeSpringBoot) { _%>
+  <%_ if (backendTypeSpringBoot) { _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-6437 is ignored, hardcoded passwords are provided for development purposes
 sonar.issue.ignore.multicriteria.S6437.resourceKey=<%= srcMainResources %>config/*
 sonar.issue.ignore.multicriteria.S6437.ruleKey=java:S6437
-<%_ } _%>
-<%_ if (gatlingTests) { _%>
+  <%_ } _%>
+  <%_ if (gatlingTests) { _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-2187 is ignored, gatling tests are not supported by sonar
 sonar.issue.ignore.multicriteria.S2187.resourceKey= <%- srcTestJava %>gatling/**/*
 sonar.issue.ignore.multicriteria.S2187.ruleKey=java:S2187
-<%_ } _%>
+  <%_ } _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-3437 is ignored, as a JPA-managed field cannot be transient
 sonar.issue.ignore.multicriteria.S3437.resourceKey= <%- srcMainJava %>**/*
 sonar.issue.ignore.multicriteria.S3437.ruleKey=squid:S3437
-<%_ if (authenticationTypeJwt) { _%>
+  <%_ if (authenticationTypeJwt) { _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-4502 is ignored, as for JWT tokens we are not subject to CSRF attack
 sonar.issue.ignore.multicriteria.S4502.resourceKey= <%- srcMainJava %>**/*
 sonar.issue.ignore.multicriteria.S4502.ruleKey=java:S4502
-<%_ } _%>
+  <%_ } _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-4684
 sonar.issue.ignore.multicriteria.S4684.resourceKey= <%- srcMainJava %>**/*
 sonar.issue.ignore.multicriteria.S4684.ruleKey=java:S4684
@@ -91,14 +91,14 @@ sonar.issue.ignore.multicriteria.S7027-dto.ruleKey = javaarchitecture:S7027
 # Rule https://rules.sonarsource.com/java/RSPEC-1176 is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names should be self-explanatory
 sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey= <%- srcMainJava %>**/*
 sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey=squid:UndocumentedApi
-<%_ } _%>
-<%_ if (cacheProviderAny) { _%>
+  <%_ if (cacheProviderAny) { _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-1192
 sonar.issue.ignore.multicriteria.S1192.resourceKey = src/main/java/**/CacheConfiguration.java
 sonar.issue.ignore.multicriteria.S1192.ruleKey = java:S1192
-<%_ } _%>
-<%_ if (backendTypeSpringBoot) { _%>
+  <%_ } _%>
+  <%_ if (backendTypeSpringBoot) { _%>
 # Rule https://rules.sonarsource.com/xml/RSPEC-125
 sonar.issue.ignore.multicriteria.S125.resourceKey = src/main/resources/logback-spring.xml
 sonar.issue.ignore.multicriteria.S125.ruleKey = xml:S125
+  <%_ } _%>
 <%_ } _%>

package/dist/generators/cucumber/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class CucumberGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     get writing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cleanupTask" | "writeTask">;
     get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "addDependencies">;

package/dist/generators/cypress/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class CypressGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     get prompting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "askForCypressOptions">;
     get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareForTemplates">;

package/dist/generators/cypress/generator.js

@@ -23,6 +23,7 @@ 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;
+const WAIT_TIMEOUT = 3 * 60000;
 export default class CypressGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
@@ -159,18 +160,24 @@ export default class CypressGenerator extends BaseApplicationGenerator {
                 this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster('client', 'resources', 'package.json'));
             },
             configure({ application }) {
+                const { devServerPort, devServerPortProxy: devServerPortE2e = devServerPort } = application;
                 const clientPackageJson = this.createStorage(this.destinationPath(application.clientRootDir, 'package.json'));
                 clientPackageJson.merge({
                     devDependencies: {
                         'eslint-plugin-cypress': application.nodeDependencies['eslint-plugin-cypress'],
                     },
                     scripts: {
+                        'ci:e2e:run': 'concurrently -k -s first -n application,e2e -c red,blue npm:ci:e2e:server:start npm:e2e:headless',
+                        'ci:e2e:dev': `concurrently -k -s first -n application,e2e -c red,blue npm:app:start npm:e2e:headless`,
+                        cypress: 'cypress open --e2e',
                         e2e: 'npm run e2e:cypress:headed --',
-                        'e2e:headless': 'npm run e2e:cypress --',
-                        'e2e:cypress:headed': 'npm run e2e:cypress -- --headed',
                         'e2e:cypress': 'cypress run --e2e --browser chrome',
+                        'e2e:cypress:headed': 'npm run e2e:cypress -- --headed',
                         'e2e:cypress:record': 'npm run e2e:cypress -- --record',
-                        cypress: 'cypress open --e2e',
+                        'e2e:dev': `concurrently -k -s first -n application,e2e -c red,blue npm:app:start npm:e2e`,
+                        'e2e:devserver': `concurrently -k -s first -n backend,frontend,e2e -c red,yellow,blue npm:backend:start npm:start "wait-on -t ${WAIT_TIMEOUT} http-get://127.0.0.1:${devServerPortE2e} && npm run e2e:headless -- -c baseUrl=http://localhost:${devServerPortE2e}"`,
+                        'pree2e:headless': 'npm run ci:server:await',
+                        'e2e:headless': 'npm run e2e:cypress --',
                     },
                 });
             },
@@ -191,7 +198,7 @@ export default class CypressGenerator extends BaseApplicationGenerator {
                 });
             },
             configureCoverage({ application, source }) {
-                const { cypressCoverage, clientFrameworkAngular, dasherizedBaseName } = application;
+                const { cypressCoverage, clientFrameworkAngular, clientRootDir, dasherizedBaseName } = application;
                 if (!cypressCoverage)
                     return;
                 const clientPackageJson = this.createStorage(this.destinationPath(application.clientRootDir, 'package.json'));
@@ -213,7 +220,7 @@ export default class CypressGenerator extends BaseApplicationGenerator {
                 });
                 if (clientFrameworkAngular) {
                     // Add 'ng build --configuration instrumenter' support
-                    this.createStorage('angular.json').setPath(`projects.${dasherizedBaseName}.architect.build.configurations.instrumenter`, {});
+                    this.createStorage(`${clientRootDir}angular.json`).setPath(`projects.${dasherizedBaseName}.architect.build.configurations.instrumenter`, {});
                     source.addWebpackConfig?.({
                         config: `targetOptions.configuration === 'instrumenter'
       ? {

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/register-page.cy.ts.ejs

@@ -122,7 +122,7 @@ describe('<%= registerPage %>', () => {
 
   it('register a valid user', () => {
     const randomEmail = '<%= faker.internet.email() %>';
-    const randomUsername = '<%= faker.internet.userName() %>';
+    const randomUsername = '<%= faker.internet.username() %>';
     cy.get(usernameRegisterSelector).type(randomUsername);
     cy.get(emailRegisterSelector).type(randomEmail);
     cy.get(firstPasswordRegisterSelector).type('jondoe');

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

@@ -263,7 +263,8 @@ describe('<%= entityClass %> e2e test', () => {
         cy.url().should('match', <%= entityInstance %>PageUrlPattern);
       });
 
-      it<% if (jpaMetamodelFiltering && (clientFrameworkAngular || clientFrameworkVue)) { %>.skip<% } %>('edit button click should load edit <%= entityClass %> page and save', () => {
+      <% if (jpaMetamodelFiltering && clientFrameworkVue && requiredRelationships.length) { %>// Reason: jpaMetamodelFiltering with required relationship missbehavior<% } %>
+      it<% if (jpaMetamodelFiltering && clientFrameworkVue && requiredRelationships.length) { %>.skip<% } %>('edit button click should load edit <%= entityClass %> page and save', () => {
         cy.get(entityEditButtonSelector).first().click();
         cy.getEntityCreateUpdateHeading('<%= entityClass %>');
         cy.get(entityCreateSaveButtonSelector).click();
@@ -275,6 +276,7 @@ describe('<%= entityClass %> e2e test', () => {
 
 <%_ } _%>
 <%_ if (!readOnly) { _%>
+      <% if (skipCreateTest) { %>// Reason: cannot create a required entity with relationship with required relationships.<% } %>
       it<%= skipCreateTest %>('last delete button click should delete instance of <%= entityClass %>', () => {
   <%_ if (clientFrameworkReact) { _%>
         cy.intercept('GET', '/<%= baseApi + entityApiUrl %>/*').as('dialogDeleteRequest');
@@ -308,6 +310,7 @@ describe('<%= entityClass %> e2e test', () => {
       cy.getEntityCreateUpdateHeading('<%= entityClass %>');
     });
 
+    <% if (skipCreateTest) { %>// Reason: cannot create a required entity with relationship with required relationships.<% } %>
     it<%= skipCreateTest %>('should create an instance of <%= entityClass %>', () => {
   <%_ fields.filter(field => (!field.id || !field.autoGenerate) && !field.hidden && !field.readonly).forEach((field) => {
     const fieldName = field.fieldName;

package/dist/generators/docker/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class DockerGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     hasServicesFile: boolean;
     beforeQueue(): Promise<void>;
     get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "loading">;

package/dist/generators/docker/generator.js

@@ -190,7 +190,7 @@ export default class DockerGenerator extends BaseApplicationGenerator {
                     source.addDockerExtendedServiceToApplicationAndServices({ serviceName: 'consul' }, { serviceFile: './consul.yml', serviceName: 'consul-config-loader' });
                 }
                 if (application.dockerServices.includes('kafka')) {
-                    source.addDockerExtendedServiceToApplicationAndServices({ serviceName: 'kafka' }, { serviceFile: './kafka.yml', serviceName: 'zookeeper' });
+                    source.addDockerExtendedServiceToApplicationAndServices({ serviceName: 'kafka' });
                 }
             },
             packageJsonScripts({ application }) {

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

@@ -34,9 +34,9 @@ services:
     environment:
       - BUCKET=<%= baseName %>
     healthcheck:
-      test: ['CMD', 'curl', '-f', 'http://localhost:8091/ui/index.html']
+      test: ['CMD-SHELL', 'curl -f "http://localhost:8091/ui/index.html" && sleep 20']
       interval: 5s
-      timeout: 5s
+      timeout: 25s
       retries: 10
     # volumes:
     #   - ~/volumes/jhipster/<%= baseName.toLowerCase() %>/couchbase/:/opt/couchbase/var

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

@@ -26,22 +26,14 @@ services:
     ports:
       - 127.0.0.1:9092:9092
     environment:
-      KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      KAFKA_ADVERTISED_HOST_NAME: kafka
-<%_ if (backendTypeSpringBoot) { _%>
-    labels:
-      org.springframework.boot.ignore: true
-<%_ } _%>
-  zookeeper:
-    image: <%- dockerContainers.zookeeper %>
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
+      KAFKA_NODE_ID: 1
+      KAFKA_PROCESS_ROLES: broker,controller
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
+      KAFKA_LISTENERS: PLAINTEXT://:9092,CONTROLLER://localhost:9093
+      KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      KAFKA_CONTROLLER_QUORUM_VOTERS: 1@localhost:9093
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
 <%_ if (backendTypeSpringBoot) { _%>
     labels:
       org.springframework.boot.ignore: true

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

@@ -35,7 +35,7 @@ services:
       - 127.0.0.1:3306:3306
     command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
     healthcheck:
-      test: ["CMD", "mysql", "-e", "SHOW DATABASES;"]
+      test: ['CMD-SHELL', 'mysql -e "SHOW DATABASES;" && sleep 5']
       interval: 5s
-      timeout: 5s
+      timeout: 10s
       retries: 10

package/dist/generators/docker-compose/generator.d.ts

@@ -4,6 +4,7 @@ import BaseWorkspacesGenerator from '../base-workspaces/index.js';
  * @extends {import('../base/index.js')}
  */
 export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
+    [x: string]: any;
     existingDeployment: any;
     jwtSecretKey: string;
     beforeQueue(): Promise<void>;

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

@@ -173,6 +173,9 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
                         if (appConfig.devServerPort !== undefined) {
                             deployment.keycloakRedirectUris += `"http://localhost:${appConfig.devServerPort}/*", `;
                         }
+                        if (appConfig.devServerPortProxy !== undefined) {
+                            deployment.keycloakRedirectUris += `"http://localhost:${appConfig.devServerPortProxy}/*", `;
+                        }
                         // Split ports by ":" and take last 2 elements to skip the hostname/IP if present
                         const ports = yamlConfig.ports[0].split(':').slice(-2);
                         ports[0] = appConfig.composePort;

package/dist/generators/docker-compose/templates/README-DOCKER-COMPOSE.md.ejs

@@ -32,7 +32,6 @@ Launch all your infrastructure by running: `docker compose up -d`.
 <%_ } _%>
 <%_ if (useKafka === true) { _%>
 - Kafka
-- Zookeeper
 <%_ } _%>
 <%_ if (usePulsar === true) { _%>
 - Pulsar