generator-jhipster 8.2.1 → 8.4.0

package/dist/generators/bootstrap-application-base/utils.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as _ from 'lodash-es';
+import { defaults } from 'lodash-es';
 import { Validations, authenticationTypes, databaseTypes, fieldTypes } from '../../jdl/jhipster/index.js';
 import { loadRequiredConfigIntoEntity } from '../base-application/support/index.js';
 import { PaginationTypes } from '../../jdl/jhipster/entity-options.js';
@@ -285,7 +285,7 @@ function addOrExtendFields(fields, fieldsToAdd) {
             }
         }
         else {
-            _.defaults(field, fieldToAdd);
+            defaults(field, fieldToAdd);
         }
     }
 }
@@ -299,7 +299,7 @@ function addOrExtendRelationships(relationships, relationshipsToAdd) {
             relationships.push(relationship);
         }
         else {
-            _.defaults(relationship, relationshipToAdd);
+            defaults(relationship, relationshipToAdd);
         }
     }
 }

package/dist/generators/bootstrap-application-client/generator.js

@@ -18,7 +18,6 @@
  */
 import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties } from '../client/support/index.js';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_BOOTSTRAP_APPLICATION_CLIENT } from '../generator-list.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import clientCommand from '../client/command.js';
 import { loadConfig, loadDerivedConfig } from '../../lib/internal/index.js';
@@ -31,12 +30,12 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
     }
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_APPLICATION_CLIENT);
+            await this.composeWithBlueprints();
         }
         if (this.delegateToBlueprint) {
             throw new Error('Only sbs blueprint is supported');
         }
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
+        await this.dependsOnBootstrapApplicationBase();
     }
     get loading() {
         return this.asLoadingTaskGroup({

package/dist/generators/bootstrap-application-server/generator.js

@@ -16,17 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as _ from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_BOOTSTRAP_APPLICATION_SERVER } from '../generator-list.js';
 import { JAVA_VERSION, MAIN_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, TEST_DIR, dockerContainers, } from '../generator-constants.js';
 import { loadRequiredConfigIntoEntity, prepareEntityPrimaryKeyForTemplates } from '../base-application/support/index.js';
 import { loadRequiredConfigDerivedProperties, prepareEntity as prepareEntityServerForTemplates, addEntitiesOtherRelationships, hibernateSnakeCase, loadServerConfig, loadDerivedServerConfig, prepareRelationship, } from '../server/support/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/index.js';
 import { getPomVersionProperties } from '../maven/support/index.js';
 import { prepareField as prepareFieldForLiquibaseTemplates } from '../liquibase/support/index.js';
-import { dockerPlaceholderGenerator, getDockerfileContainers } from '../docker/utils.js';
-import { GRADLE_VERSION } from '../gradle/constants.js';
+import { getDockerfileContainers } from '../docker/utils.js';
 import { normalizePathEnd } from '../base/support/path.js';
 import { getFrontendAppName } from '../base/support/index.js';
 import { getMainClassName } from '../java/support/index.js';
@@ -38,35 +35,43 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
     }
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+            await this.composeWithBlueprints();
         }
         if (this.delegateToBlueprint) {
             throw new Error('Only sbs blueprint is supported');
         }
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
+        await this.dependsOnBootstrapApplicationBase();
     }
     get loading() {
         return this.asLoadingTaskGroup({
-            async loadApplication({ application }) {
+            async loadApplication({ application, applicationDefaults }) {
                 loadConfig(serverCommand.configs, { config: this.jhipsterConfigWithDefaults, application });
                 loadServerConfig({ config: this.jhipsterConfigWithDefaults, application });
-                application.gradleVersion = this.useVersionPlaceholders ? 'GRADLE_VERSION' : GRADLE_VERSION;
-                application.javaVersion = this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION;
-                application.backendType = this.jhipsterConfig.backendType ?? 'Java';
                 const pomFile = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/pom.xml'))?.toString();
                 const gradleLibsVersions = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/gradle/libs.versions.toml'))?.toString();
-                application.packageInfoJavadocs = [];
-                application.javaDependencies = this.prepareDependencies({
+                const applicationJavaDependencies = this.prepareDependencies({
                     ...getPomVersionProperties(pomFile),
                     ...getGradleLibsVersionsProperties(gradleLibsVersions),
-                }, 
-                // Gradle doesn't allows snakeCase
-                value => `'${_.kebabCase(value).toUpperCase()}-VERSION'`);
+                }, 'java');
                 const dockerfile = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/Dockerfile'));
-                application.dockerContainers = this.prepareDependencies({
+                const applicationDockerContainers = this.prepareDependencies({
                     ...dockerContainers,
                     ...getDockerfileContainers(dockerfile),
-                }, dockerPlaceholderGenerator);
+                }, 'docker');
+                applicationDefaults({
+                    javaVersion: this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION,
+                    packageInfoJavadocs: [],
+                    javaProperties: {},
+                    javaManagedProperties: {},
+                    javaDependencies: ({ javaDependencies }) => ({
+                        ...applicationJavaDependencies,
+                        ...javaDependencies,
+                    }),
+                    dockerContainers: ({ dockerContainers: currentDockerContainers = {} }) => ({
+                        ...applicationDockerContainers,
+                        ...currentDockerContainers,
+                    }),
+                });
             },
         });
     }
@@ -93,8 +98,6 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
                 application.testResourceDir = SERVER_TEST_RES_DIR;
                 application.srcMainDir = MAIN_DIR;
                 application.srcTestDir = TEST_DIR;
-                application.backendTypeSpringBoot = application.backendType === 'Java';
-                application.backendTypeJavaAny = application.backendTypeJavaAny ?? application.backendTypeSpringBoot;
             },
         });
     }

package/dist/generators/bootstrap-workspaces/generator.js

@@ -17,7 +17,6 @@
  * limitations under the License.
  */
 import BaseWorkspacesGenerator from '../base-workspaces/index.js';
-import { GENERATOR_BOOTSTRAP_WORKSPACES } from '../generator-list.js';
 import command from './command.js';
 export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
     sharedWorkspaces;
@@ -27,7 +26,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
         this.sharedWorkspaces.existingWorkspaces = this.sharedWorkspaces.existingWorkspaces ?? Boolean(this.jhipsterConfig.appsFolders);
         this.parseJHipsterOptions(command.options);
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_WORKSPACES);
+            await this.composeWithBlueprints();
         }
     }
     get prompting() {

package/dist/generators/ci-cd/command.js

@@ -17,8 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
-const { kebabCase, intersection } = _;
+import { kebabCase, intersection } from 'lodash-es';
 const includesValue = (prop, values) => answers => answers[prop] && intersection(answers[prop], values).length > 0;
 const command = {
     options: {},

package/dist/generators/ci-cd/generator.js

@@ -19,8 +19,6 @@
 /* eslint-disable consistent-return */
 import chalk from 'chalk';
 import BaseApplicationGenerator from '../base-application/index.js';
-import statistics from '../statistics.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_CI_CD } from '../generator-list.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { createPomStorage } from '../maven/support/pom-store.js';
 import command from './command.js';
@@ -30,10 +28,10 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
     insideDocker;
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_CI_CD);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     // Public API method used by the getter and also by Blueprints
@@ -97,9 +95,6 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
     // Public API method used by the getter and also by Blueprints
     get writing() {
         return this.asWritingTaskGroup({
-            insight() {
-                statistics.sendSubGenEvent('generator', GENERATOR_CI_CD);
-            },
             async writeFiles({ application }) {
                 await this.writeFiles({
                     blocks: [

package/dist/generators/client/command.js

@@ -17,12 +17,11 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { intersection } from 'lodash-es';
 import { testFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, clientFrameworkTypes } from '../../jdl/index.js';
 import { GENERATOR_COMMON } from '../generator-list.js';
 const { CYPRESS } = testFrameworkTypes;
-const { intersection } = _;
 const { ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const microfrontendsToPromptValue = answer => (Array.isArray(answer) ? answer.map(({ baseName }) => baseName).join(',') : answer);
 const promptValueToMicrofrontends = answer => answer

package/dist/generators/client/generator.js

@@ -21,8 +21,7 @@ import { askForClientTheme, askForClientThemeVariant } from './prompts.js';
 import { writeFiles as writeCommonFiles } from './files-common.js';
 import { addEnumerationFiles } from './entity-files.js';
 import { LOGIN_REGEX_JS } from '../generator-constants.js';
-import statistics from '../statistics.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_CYPRESS, GENERATOR_COMMON, GENERATOR_CLIENT } from '../generator-list.js';
+import { GENERATOR_CYPRESS, GENERATOR_COMMON, GENERATOR_CLIENT } from '../generator-list.js';
 import { testFrameworkTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { createNeedleCallback } from '../base/support/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
@@ -35,11 +34,11 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         loadStoredAppOptions.call(this);
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_CLIENT);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
             // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
             await this.dependsOnJHipster(GENERATOR_COMMON);
         }
     }
@@ -65,7 +64,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.PROMPTING]() {
-        return this.asPromptingTaskGroup(this.delegateTasksToBlueprint(() => this.prompting));
+        return this.delegateTasksToBlueprint(() => this.prompting);
     }
     get configuring() {
         return this.asConfiguringTaskGroup({
@@ -106,7 +105,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.CONFIGURING]() {
-        return this.asConfiguringTaskGroup(this.delegateTasksToBlueprint(() => this.configuring));
+        return this.delegateTasksToBlueprint(() => this.configuring);
     }
     get composing() {
         return this.asComposingTaskGroup({
@@ -122,7 +121,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.COMPOSING]() {
-        return this.asComposingTaskGroup(this.delegateTasksToBlueprint(() => this.composing));
+        return this.delegateTasksToBlueprint(() => this.composing);
     }
     get loading() {
         return this.asLoadingTaskGroup({
@@ -137,7 +136,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
-        return this.asLoadingTaskGroup(this.delegateTasksToBlueprint(() => this.loading));
+        return this.delegateTasksToBlueprint(() => this.loading);
     }
     // Public API method used by the getter and also by Blueprints
     get preparing() {
@@ -162,7 +161,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.PREPARING]() {
-        return this.asPreparingTaskGroup(this.delegateTasksToBlueprint(() => this.preparing));
+        return this.delegateTasksToBlueprint(() => this.preparing);
     }
     get preparingEachEntity() {
         return {
@@ -176,23 +175,6 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING_EACH_ENTITY]() {
         return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
     }
-    get default() {
-        return this.asDefaultTaskGroup({
-            insight({ application }) {
-                statistics.sendSubGenEvent('generator', GENERATOR_CLIENT, {
-                    app: {
-                        clientFramework: application.clientFramework,
-                        enableTranslation: application.enableTranslation,
-                        nativeLanguage: application.nativeLanguage,
-                        languages: application.languages,
-                    },
-                });
-            },
-        });
-    }
-    get [BaseApplicationGenerator.DEFAULT]() {
-        return this.asDefaultTaskGroup(this.delegateTasksToBlueprint(() => this.default));
-    }
     // Public API method used by the getter and also by Blueprints
     get writing() {
         return this.asWritingTaskGroup({
@@ -203,7 +185,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.WRITING]() {
-        return this.asWritingTaskGroup(this.delegateTasksToBlueprint(() => this.writing));
+        return this.delegateTasksToBlueprint(() => this.writing);
     }
     get writingEntities() {
         return this.asWritingEntitiesTaskGroup({
@@ -218,7 +200,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.WRITING_ENTITIES]() {
-        return this.asWritingEntitiesTaskGroup(this.delegateTasksToBlueprint(() => this.writingEntities));
+        return this.delegateTasksToBlueprint(() => this.writingEntities);
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
@@ -228,10 +210,6 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
                 }
                 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) {
-                    packageJsonConfigStorage.default_environment = process.env.JHI_PROFILE.includes('dev') ? 'dev' : 'prod';
-                }
                 const devDependencies = packageJsonStorage.createStorage('devDependencies');
                 devDependencies.set('wait-on', application.nodeDependencies['wait-on']);
                 devDependencies.set('concurrently', application.nodeDependencies.concurrently);
@@ -263,6 +241,6 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
 }

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

@@ -17,12 +17,12 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { startCase } from 'lodash-es';
 import needleClientBase from './needle-client.js';
 import { stripMargin } from '../../base/support/index.js';
 import { createNeedleCallback } from '../../base/support/needles.js';
 export default class extends needleClientBase {
-    addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue = _.startCase(routerName)) {
+    addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue = startCase(routerName)) {
         const ignoreNonExisting = this.generator.sharedData.getControl().ignoreNeedlesError &&
             `${chalk.yellow('Reference to ') + routerName} ${chalk.yellow('not added to menu.\n')}`;
         const filePath = `${this.clientSrcDir}/app/entities/entities-menu.vue`;

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

@@ -1,16 +1,16 @@
 {
   "dependencies": {
-    "dayjs": "1.11.10"
+    "dayjs": "1.11.11"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.12.30",
+    "@cypress/code-coverage": "3.12.37",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
-    "cypress": "13.7.0",
+    "cypress": "13.8.1",
     "cypress-audit": "1.1.0",
-    "eslint-plugin-cypress": "2.15.1",
-    "lighthouse": "11.6.0",
+    "eslint-plugin-cypress": "3.0.2",
+    "lighthouse": "12.0.0",
     "nyc": "15.1.0",
-    "swagger-ui-dist": "5.12.0"
+    "swagger-ui-dist": "5.17.2"
   }
 }

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <!DOCTYPE html>
-<html class="no-js" lang="<% if (enableTranslation) { %><%= nativeLanguage %><% } else { %>en<% } %>" dir="ltr">
+<html class="no-js" lang="<%= nativeLanguage %>" dir="ltr">
   <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -89,7 +89,7 @@
 
           <h3>If you want to chat with contributors and other users</h3>
           <p>
-            Join our chat room on <a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">Gitter.im</a>. Please note that this is a public chat room, and that we expect you to respect other people and write in a correct English language!
+            Join our chat room on <a href="<%- hipsterChatLink %>" target="_blank" rel="noopener noreferrer">Gitter.im</a>. Please note that this is a public chat room, and that we expect you to respect other people and write in a correct English language!
           </p>
           <!-- end of troubleshooting content -->
         </div>

package/dist/generators/common/command.js

@@ -12,6 +12,19 @@ const command = {
             scope: 'storage',
         },
     },
+    configs: {
+        defaultEnvironment: {
+            description: 'Default environment for the application',
+            cli: {
+                type: String,
+                hide: true,
+                env: 'JHI_PROFILE',
+            },
+            choices: ['prod', 'dev'],
+            default: 'prod',
+            scope: 'storage',
+        },
+    },
     import: [GENERATOR_BOOTSTRAP_APPLICATION_BASE],
 };
 export default command;

package/dist/generators/common/generator.js

@@ -22,7 +22,7 @@ import BaseApplicationGenerator from '../base-application/index.js';
 import { writeFiles, prettierConfigFiles } from './files.js';
 import { MAIN_DIR, TEST_DIR, SERVER_MAIN_RES_DIR, JHIPSTER_DOCUMENTATION_URL, JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, } from '../generator-constants.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
-import { GENERATOR_COMMON, GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_GIT } from '../generator-list.js';
+import { GENERATOR_COMMON, GENERATOR_GIT } from '../generator-list.js';
 import command from './command.js';
 import { createPrettierTransform } from '../bootstrap/support/prettier-support.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
@@ -32,17 +32,17 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         loadStoredAppOptions.call(this);
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_COMMON);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
             await this.dependsOnJHipster(GENERATOR_GIT);
         }
     }
     get initializing() {
         return this.asInitializingTaskGroup({
-            loadOptions() {
-                this.parseJHipsterCommand(this.command);
+            async loadOptions() {
+                await this.parseCurrentJHipsterCommand();
             },
         });
     }
@@ -54,12 +54,12 @@ export default class CommonGenerator extends BaseApplicationGenerator {
             async prompting({ control }) {
                 if (control.existingProject && this.options.askAnswered !== true)
                     return;
-                await this.prompt(this.prepareQuestions(this.command.configs));
+                await this.promptCurrentJHipsterCommand();
             },
         });
     }
     get [BaseApplicationGenerator.PROMPTING]() {
-        return this.asPromptingTaskGroup(this.delegateTasksToBlueprint(() => this.prompting));
+        return this.delegateTasksToBlueprint(() => this.prompting);
     }
     // Public API method used by the getter and also by Blueprints
     get configuring() {
@@ -117,6 +117,9 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     // Public API method used by the getter and also by Blueprints
     get loading() {
         return this.asLoadingTaskGroup({
+            async loadCommand({ application }) {
+                await this.loadCurrentJHipsterCommandConfig(application);
+            },
             loadPackageJson({ application }) {
                 this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster(GENERATOR_COMMON, 'resources', 'package.json'));
             },
@@ -161,7 +164,7 @@ export default class CommonGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.DEFAULT]() {
-        return this.asDefaultTaskGroup(this.delegateTasksToBlueprint(() => this.default));
+        return this.delegateTasksToBlueprint(() => this.default);
     }
     // Public API method used by the getter and also by Blueprints
     get writing() {
@@ -198,6 +201,12 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
+            setConfig({ application }) {
+                const packageJsonConfigStorage = this.packageJson.createStorage('config').createProxy();
+                if (application.defaultEnvironment) {
+                    packageJsonConfigStorage.default_environment = application.defaultEnvironment;
+                }
+            },
             addJHipsterDependencies({ application }) {
                 if (application.skipJhipsterDependencies)
                     return;

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

@@ -3,7 +3,7 @@
     "concurrently": "8.2.2",
     "husky": "9.0.11",
     "lint-staged": "15.2.2",
-    "npm": "10.5.0",
+    "npm": "10.6.0",
     "wait-on": "7.2.0"
   }
 }

package/dist/generators/cucumber/generator.js

@@ -17,16 +17,15 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_CUCUMBER, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import writeTask from './files.js';
 import cleanupTask from './cleanup.js';
 export default class CucumberGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_CUCUMBER);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnJHipster('jhipster:java:build-tool');
         }
     }
     get writing() {
@@ -41,15 +40,23 @@ export default class CucumberGenerator extends BaseApplicationGenerator {
     get postWriting() {
         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?.({
-                        dependencies: [
-                            { 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' },
-                        ],
                         plugins: [{ groupId: 'org.apache.maven.plugins', artifactId: 'maven-antrun-plugin' }],
                         pluginManagement: [
                             {

package/dist/generators/cucumber/templates/buildSrc/src/main/groovy/jhipster.cucumber-conventions.gradle.ejs

@@ -1,9 +1,5 @@
 dependencies {
-    testImplementation "io.cucumber:cucumber-junit-platform-engine"
-    testImplementation "io.cucumber:cucumber-java"
-    testImplementation "io.cucumber:cucumber-spring"
-    testImplementation "org.junit.platform:junit-platform-console"
-    testImplementation "org.testng:testng"
+    // jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
 }
 
 tasks.register('consoleLauncherTest', JavaExec) {

package/dist/generators/cypress/generator.js

@@ -21,17 +21,16 @@ 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 { GENERATOR_CYPRESS, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import { generateTestEntity as entityWithFakeValues } from '../client/support/index.js';
 const { ANGULAR } = clientFrameworkTypes;
 export default class CypressGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_CYPRESS);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
             // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get prompting() {

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

@@ -97,4 +97,14 @@ describe('/admin', () => {
       });
     });
   });
+<%_ if (communicationSpringWebsocket) { _%>
+
+  describe('/tracker', () => {
+    it('should load the page', () => {
+      cy.clickOnAdminMenuItem('tracker');
+      cy.get('[data-cy="trackerPageHeading"]').should('be.visible');
+      cy.get('[data-cy="trackerTable"] > tbody > tr').should('have.length', 1)
+    });
+  });
+<%_ } _%>
 });

package/dist/generators/docker/generator.js

@@ -17,24 +17,22 @@
  * limitations under the License.
  */
 /* eslint-disable camelcase */
-import * as _ from 'lodash-es';
+import { intersection } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { createDockerComposeFile, createDockerExtendedServices } from '../docker/support/index.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION_SERVER, GENERATOR_DOCKER } from '../generator-list.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';
-const { intersection } = _;
 export default class DockerGenerator extends BaseApplicationGenerator {
     hasServicesFile = false;
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_DOCKER);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
             // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_SERVER.
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+            await this.dependsOnBootstrapApplicationServer();
         }
     }
     get loading() {
@@ -47,7 +45,7 @@ export default class DockerGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
-        return this.asLoadingTaskGroup(this.delegateTasksToBlueprint(() => this.loading));
+        return this.delegateTasksToBlueprint(() => this.loading);
     }
     get preparing() {
         return this.asPreparingTaskGroup({