generator-jhipster 8.5.0 → 8.7.0

package/dist/generators/spring-data-relational/generator.js

@@ -18,11 +18,11 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_LIQUIBASE } from '../generator-list.js';
+import { isReservedTableName } from '../../jdl/jhipster/reserved-keywords.js';
+import { databaseTypes } from '../../jdl/jhipster/index.js';
 import writeTask from './files.js';
 import cleanupTask from './cleanup.js';
 import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.js';
-import { isReservedTableName } from '../../jdl/jhipster/reserved-keywords.js';
-import { databaseTypes } from '../../jdl/jhipster/index.js';
 import { getDBCExtraOption, getJdbcUrl, getR2dbcUrl } from './support/index.js';
 import { getDatabaseDriverForDatabase, getDatabaseTypeMavenDefinition, getH2MavenDefinition } from './internal/dependencies.js';
 const { SQL } = databaseTypes;
@@ -35,16 +35,6 @@ export default class SqlGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster('jhipster:java:domain');
         }
     }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
     get composing() {
         return this.asComposingTaskGroup({
             async composing() {
@@ -130,54 +120,48 @@ export default class SqlGenerator extends BaseApplicationGenerator {
             },
             addDependencies({ application, source }) {
                 const { reactive, javaDependencies, packageFolder } = application;
-                if (reactive) {
-                    source.addJavaDependencies?.([
+                const { prodDatabaseType, devDatabaseTypeH2Any } = application;
+                const dbDefinitions = getDatabaseTypeMavenDefinition(prodDatabaseType, {
+                    inProfile: devDatabaseTypeH2Any ? 'prod' : undefined,
+                    javaDependencies,
+                });
+                const h2Definitions = devDatabaseTypeH2Any ? getH2MavenDefinition({ prodDatabaseType, packageFolder }) : undefined;
+                source.addJavaDefinitions?.({
+                    condition: reactive,
+                    dependencies: [
                         { groupId: 'commons-beanutils', artifactId: 'commons-beanutils', version: javaDependencies['commons-beanutils'] },
                         { groupId: 'jakarta.persistence', artifactId: 'jakarta.persistence-api' },
                         { groupId: 'org.springframework.boot', artifactId: 'spring-boot-starter-data-r2dbc' },
-                    ]);
-                }
-                else {
-                    source.addJavaDependencies?.([
+                    ],
+                    mavenDefinition: dbDefinitions.r2dbc,
+                }, {
+                    condition: !reactive,
+                    dependencies: [
                         { groupId: 'com.fasterxml.jackson.datatype', artifactId: 'jackson-datatype-hibernate6' },
                         { groupId: 'org.hibernate.orm', artifactId: 'hibernate-core' },
                         { groupId: 'org.hibernate.validator', artifactId: 'hibernate-validator' },
                         { groupId: 'org.springframework.boot', artifactId: 'spring-boot-starter-data-jpa' },
                         { groupId: 'org.springframework.security', artifactId: 'spring-security-data' },
                         { scope: 'annotationProcessor', groupId: 'org.hibernate.orm', artifactId: 'hibernate-jpamodelgen' },
-                    ]);
-                }
-                source.addJavaDependencies?.([
-                    { groupId: 'com.fasterxml.jackson.module', artifactId: 'jackson-module-jaxb-annotations' },
-                    { groupId: 'com.zaxxer', artifactId: 'HikariCP' },
-                    { scope: 'annotationProcessor', groupId: 'org.glassfish.jaxb', artifactId: 'jaxb-runtime' },
-                ]);
-                source.addJavaDependencies?.([
-                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'jdbc' },
-                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'junit-jupiter' },
-                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers' },
-                ]);
-                if (application.buildToolMaven) {
-                    const { prodDatabaseType, devDatabaseTypeH2Any } = application;
-                    const inProfile = devDatabaseTypeH2Any ? 'prod' : undefined;
-                    if (!reactive) {
-                        source.addMavenDefinition?.({
-                            dependencies: [{ inProfile: 'IDE', groupId: 'org.hibernate.orm', artifactId: 'hibernate-jpamodelgen' }],
-                        });
-                    }
-                    if (devDatabaseTypeH2Any) {
-                        const h2Definitions = getH2MavenDefinition({ prodDatabaseType, packageFolder });
-                        source.addMavenDefinition?.(h2Definitions.jdbc);
-                        if (reactive) {
-                            source.addMavenDefinition?.(h2Definitions.r2dbc);
-                        }
-                    }
-                    const dbDefinitions = getDatabaseTypeMavenDefinition(prodDatabaseType, { inProfile, javaDependencies });
-                    source.addMavenDefinition?.(dbDefinitions.jdbc);
-                    if (reactive) {
-                        source.addMavenDefinition?.(dbDefinitions.r2dbc);
-                    }
-                }
+                    ],
+                    mavenDefinition: { dependencies: [{ inProfile: 'IDE', groupId: 'org.hibernate.orm', artifactId: 'hibernate-jpamodelgen' }] },
+                }, {
+                    dependencies: [
+                        { groupId: 'com.fasterxml.jackson.module', artifactId: 'jackson-module-jaxb-annotations' },
+                        { groupId: 'com.zaxxer', artifactId: 'HikariCP' },
+                        { scope: 'annotationProcessor', groupId: 'org.glassfish.jaxb', artifactId: 'jaxb-runtime' },
+                        { scope: 'test', groupId: 'org.testcontainers', artifactId: 'jdbc' },
+                        { scope: 'test', groupId: 'org.testcontainers', artifactId: 'junit-jupiter' },
+                        { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers' },
+                    ],
+                    mavenDefinition: dbDefinitions.jdbc,
+                }, {
+                    condition: devDatabaseTypeH2Any,
+                    mavenDefinition: h2Definitions?.jdbc,
+                }, {
+                    condition: devDatabaseTypeH2Any && reactive,
+                    mavenDefinition: h2Definitions?.r2dbc,
+                });
             },
         });
     }

package/dist/generators/spring-data-relational/internal/dependencies.js

@@ -71,7 +71,6 @@ export const getH2MavenDefinition = ({ prodDatabaseType, packageFolder, }) => {
         },
     };
 };
-// eslint-disable-next-line import/prefer-default-export
 export const getDatabaseTypeMavenDefinition = (databaseType, { inProfile }) => {
     const dependenciesForType = {
         mariadb: {

package/dist/generators/spring-data-relational/support/application-properties.js

@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { databaseTypes } from '../../../jdl/jhipster/index.js';
 import { getDatabaseData } from './database-data.js';
 import { getJdbcUrl, getR2dbcUrl } from './database-url.js';
-import { databaseTypes } from '../../../jdl/jhipster/index.js';
 const { ORACLE, MYSQL, POSTGRESQL, MARIADB, MSSQL, H2_MEMORY, H2_DISK } = databaseTypes;
 export default function prepareSqlApplicationProperties({ application }) {
     application.prodDatabaseTypeMariadb = application.prodDatabaseType === MARIADB;

package/dist/generators/spring-data-relational/support/database-data.js

@@ -41,7 +41,7 @@ const h2GetProdDatabaseData = (databaseType, { extraOptions = '' }, { prodDataba
     if (itests && H2_MEMORY === databaseType) {
         data.port = ':12344';
     }
-    const h2ProdDatabaseMode = prodDatabaseType ? H2_PROD_DATABASE_MODE[prodDatabaseType] ?? '' : '';
+    const h2ProdDatabaseMode = prodDatabaseType ? (H2_PROD_DATABASE_MODE[prodDatabaseType] ?? '') : '';
     return {
         ...data,
         localDirectory,

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs

@@ -97,7 +97,7 @@ import java.util.UUID;
 public class DatabaseConfiguration {
 
 <%_ if (devDatabaseTypeH2Any) { _%>
-    private final Logger log = LoggerFactory.getLogger(DatabaseConfiguration.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DatabaseConfiguration.class);
 
     private final Environment env;
 
@@ -115,7 +115,7 @@ public class DatabaseConfiguration {
     @Profile(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)
     public Object h2TCPServer() throws SQLException {
         String port = getValidPortForH2();
-        log.debug("H2 database is available on port {}", port);
+        LOG.debug("H2 database is available on port {}", port);
         return H2ConfigurationHelper.createServer(port);
     }
 

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs

@@ -42,7 +42,6 @@ import org.springframework.data.relational.core.sql.render.SqlRenderer;
 import org.springframework.r2dbc.core.Parameter;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -52,10 +51,12 @@ import reactor.core.publisher.Mono;
  */
 @Component
 public class EntityManager {
-    public final static String ENTITY_ALIAS = "e";
-    public final static String ALIAS_PREFIX = "e_";
+
+    public static final String ENTITY_ALIAS = "e";
+    public static final String ALIAS_PREFIX = "e_";
 
     public static class LinkTable {
+
         final String tableName;
         final String idColumn;
         final String referenceColumn;
@@ -125,9 +126,17 @@ public class EntityManager {
     public String createSelect(SelectFromAndJoinCondition selectFrom, Class<?> entityType, Pageable pageable, Condition where) {
         if (pageable != null) {
             if (where != null) {
-                return createSelectImpl(selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()).where(where), entityType, pageable.getSort());
+                return createSelectImpl(
+                    selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()).where(where),
+                    entityType,
+                    pageable.getSort()
+                );
             } else {
-                return createSelectImpl(selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()), entityType, pageable.getSort());
+                return createSelectImpl(
+                    selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()),
+                    entityType,
+                    pageable.getSort()
+                );
             }
         } else {
             if (where != null) {
@@ -184,30 +193,28 @@ public class EntityManager {
      * @return the number of inserted rows.
      */
     public Mono<Long> updateLinkTable(LinkTable table, Object entityId, Stream<?> referencedIds) {
-        return deleteFromLinkTable(table, entityId)
-                .then(
-                    Flux.fromStream(referencedIds)
-                        .flatMap((Object referenceId) -> {
-                            StatementMapper.InsertSpec insert = r2dbcEntityTemplate
-                                .getDataAccessStrategy()
-                                .getStatementMapper()
-                                .createInsert(table.tableName)
-                                .withColumn(table.idColumn, Parameter.from(entityId))
-                                .withColumn(table.referenceColumn, Parameter.from(referenceId));
-
-                            return r2dbcEntityTemplate
-                                .getDatabaseClient()
-                                .sql(statementMapper.getMappedObject(insert))
-                                .fetch()
-                                .rowsUpdated();
-                            })
-                        .collectList()
-                        .map((List<Long> updates) -> updates.stream().reduce(Long::sum).orElse(0l)));
+        return deleteFromLinkTable(table, entityId).then(
+            Flux.fromStream(referencedIds)
+                .flatMap((Object referenceId) -> {
+                    StatementMapper.InsertSpec insert = r2dbcEntityTemplate
+                        .getDataAccessStrategy()
+                        .getStatementMapper()
+                        .createInsert(table.tableName)
+                        .withColumn(table.idColumn, Parameter.from(entityId))
+                        .withColumn(table.referenceColumn, Parameter.from(referenceId));
+
+                    return r2dbcEntityTemplate.getDatabaseClient().sql(statementMapper.getMappedObject(insert)).fetch().rowsUpdated();
+                })
+                .collectList()
+                .map((List<Long> updates) -> updates.stream().reduce(Long::sum).orElse(0l))
+        );
     }
 
     public Mono<Void> deleteFromLinkTable(LinkTable table, Object entityId) {
         Assert.notNull(entityId, "entityId is null");
-        StatementMapper.DeleteSpec deleteSpec = r2dbcEntityTemplate.getDataAccessStrategy().getStatementMapper()
+        StatementMapper.DeleteSpec deleteSpec = r2dbcEntityTemplate
+            .getDataAccessStrategy()
+            .getStatementMapper()
             .createDelete(table.tableName)
             .withCriteria(Criteria.from(Criteria.where(table.idColumn).is(entityId)));
         return r2dbcEntityTemplate.getDatabaseClient().sql(statementMapper.getMappedObject(deleteSpec)).then();
@@ -218,7 +225,9 @@ public class EntityManager {
             RelationalPersistentEntity<?> entity = getPersistentEntity(entityType);
             if (entity != null) {
                 Sort sort = updateMapper.getMappedObject(sortParameter, entity);
-                selectFrom = selectFrom.orderBy(createOrderByFields(Table.create(entity.getTableName()).as(EntityManager.ENTITY_ALIAS), sort));
+                selectFrom = selectFrom.orderBy(
+                    createOrderByFields(Table.create(entity.getTableName()).as(EntityManager.ENTITY_ALIAS), sort)
+                );
             }
         }
         return createSelect(selectFrom.build());
@@ -229,11 +238,9 @@ public class EntityManager {
     }
 
     private static Collection<? extends OrderByField> createOrderByFields(Table table, Sort sortToUse) {
-
         List<OrderByField> fields = new ArrayList<>();
 
         for (Sort.Order order : sortToUse) {
-
             String propertyName = order.getProperty();
             OrderByField orderByField = !propertyName.contains(".")
                 ? OrderByField.from(table.column(propertyName).as(EntityManager.ALIAS_PREFIX + propertyName))

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/UserSqlHelper_reactive.java.ejs

@@ -25,6 +25,7 @@ import org.springframework.data.relational.core.sql.Expression;
 import org.springframework.data.relational.core.sql.Table;
 
 public class UserSqlHelper {
+
     public static List<Expression> getColumns(Table table, String columnPrefix) {
         List<Expression> columns = new ArrayList<>();
         columns.add(Column.aliased("id", table, columnPrefix + "_id"));

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/ColumnConverter_reactive.java.ejs

@@ -52,7 +52,6 @@ public class ColumnConverter implements ColumnConverterReactive {
     @Override
     @SuppressWarnings("unchecked")
     public <T> T convert(@Nullable Object value, @Nullable Class<T> target) {
-
         if (value == null || target == null || ClassUtils.isAssignableValue(target, value)) {
             return (T) value;
         }
@@ -85,5 +84,4 @@ public class ColumnConverter implements ColumnConverterReactive {
             return convert(obj, target);
         }
     }
-
 }

package/dist/generators/spring-data-relational/templates/src/main/resources/.h2.server.properties.ejs

@@ -1,6 +1,6 @@
 #H2 Server Properties
 <%_ if (devDatabaseTypeH2Memory) { _%>
-0=JHipster H2 (Memory)|org.h2.Driver|jdbc\:h2\:mem\:<%= lowercaseBaseName %>|<%= baseName %>
+0=JHipster H2 (Memory)|org.h2.Driver|jdbc\:h2\:mem\:<%= baseName %>|<%= baseName %>
 <%_ } _%>
 <%_ if (devDatabaseTypeH2Disk) { _%>
 0=JHipster H2 (Disk)|org.h2.Driver|jdbc\:h2\:file\:./<%= temporaryDir %>h2db/db/<%= lowercaseBaseName %>|<%= baseName %>

package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MariadbTestContainer.java.ejs

@@ -28,7 +28,7 @@ import java.util.Collections;
 
 public class MariadbTestContainer implements SqlTestContainer {
 
-    private static final Logger log = LoggerFactory.getLogger(MariadbTestContainer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MariadbTestContainer.class);
 
     private MariaDBContainer<?> mariaDBContainer;
 
@@ -45,7 +45,7 @@ public class MariadbTestContainer implements SqlTestContainer {
             mariaDBContainer = new MariaDBContainer<>("<%- dockerContainers.mariadb %>")
                 .withDatabaseName("<%= baseName %>")
                 .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
-                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withLogConsumer(new Slf4jLogConsumer(LOG))
                 .withReuse(true);
         }
         if (!mariaDBContainer.isRunning()) {

package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MsSqlTestContainer.java.ejs

@@ -28,7 +28,7 @@ import java.util.Collections;
 
 public class MsSqlTestContainer implements SqlTestContainer {
 
-    private static final Logger log = LoggerFactory.getLogger(MsSqlTestContainer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MsSqlTestContainer.class);
 
     private MSSQLServerContainer<?> mSSQLServerContainer;
 
@@ -46,7 +46,7 @@ public class MsSqlTestContainer implements SqlTestContainer {
                 // Refer to https://java.testcontainers.org/modules/databases/mssqlserver/
                 //.acceptLicense()
                 .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
-                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withLogConsumer(new Slf4jLogConsumer(LOG))
                 .withReuse(true);
         }
         if (!mSSQLServerContainer.isRunning()) {

package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MysqlTestContainer.java.ejs

@@ -28,7 +28,7 @@ import java.util.Collections;
 
 public class MysqlTestContainer implements SqlTestContainer {
 
-    private static final Logger log = LoggerFactory.getLogger(MysqlTestContainer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MysqlTestContainer.class);
 
     private MySQLContainer<?> mysqlContainer;
 
@@ -44,7 +44,7 @@ public class MysqlTestContainer implements SqlTestContainer {
             mysqlContainer = new MySQLContainer<>("<%- dockerContainers.mysql %>")
                 .withDatabaseName("<%= baseName %>")
                 .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
-                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withLogConsumer(new Slf4jLogConsumer(LOG))
                 .withReuse(true);
         }
         if (!mysqlContainer.isRunning()) {

package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/PostgreSqlTestContainer.java.ejs

@@ -27,7 +27,7 @@ import java.util.Collections;
 
 public class PostgreSqlTestContainer implements SqlTestContainer {
 
-    private static final Logger log = LoggerFactory.getLogger(PostgreSqlTestContainer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PostgreSqlTestContainer.class);
 
 
     private PostgreSQLContainer<?> postgreSQLContainer;
@@ -44,7 +44,7 @@ public class PostgreSqlTestContainer implements SqlTestContainer {
             postgreSQLContainer = new PostgreSQLContainer<>("<%- dockerContainers.postgresql %>")
                 .withDatabaseName("<%= baseName %>")
                 .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
-                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withLogConsumer(new Slf4jLogConsumer(LOG))
                 .withReuse(true);
         }
         if (!postgreSQLContainer.isRunning()) {

package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainer.java.ejs

@@ -23,6 +23,5 @@ import org.springframework.beans.factory.InitializingBean;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 
 public interface SqlTestContainer extends InitializingBean, DisposableBean {
-
     JdbcDatabaseContainer<?> getTestContainer();
 }

package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs

@@ -49,8 +49,7 @@ public class SqlTestContainersSpringContextCustomizerFactory implements ContextC
     public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
         return new ContextCustomizer() {
             @Override
-            public void customizeContext(ConfigurableApplicationContext context,
-                    MergedContextConfiguration mergedConfig) {
+            public void customizeContext(ConfigurableApplicationContext context, MergedContextConfiguration mergedConfig) {
                 ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
                 TestPropertyValues testValues = TestPropertyValues.empty();
                 EmbeddedSQL sqlAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedSQL.class);

package/dist/generators/spring-data-relational/templates/src/test/java/_package_/repository/timezone/DateTimeWrapperRepository.java.ejs

@@ -25,6 +25,4 @@ import org.springframework.stereotype.Repository;
  * Spring Data JPA repository for the {@link DateTimeWrapper} entity.
  */
 @Repository
-public interface DateTimeWrapperRepository extends JpaRepository<DateTimeWrapper, Long> {
-
-}
+public interface DateTimeWrapperRepository extends JpaRepository<DateTimeWrapper, Long> {}

package/dist/generators/spring-websocket/files.js

@@ -1,3 +1,21 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { moveToJavaPackageSrcDir } from '../server/support/index.js';
 import { SERVER_MAIN_SRC_DIR } from '../generator-constants.js';
 const files = {

package/dist/generators/spring-websocket/templates/src/main/java/_package_/web/websocket/ActivityService.java.ejs

@@ -37,7 +37,7 @@ import org.springframework.web.socket.messaging.SessionDisconnectEvent;
 @Controller
 public class ActivityService implements ApplicationListener<SessionDisconnectEvent> {
 
-    private static final Logger log = LoggerFactory.getLogger(ActivityService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActivityService.class);
 
     private final SimpMessageSendingOperations messagingTemplate;
 
@@ -52,7 +52,7 @@ public class ActivityService implements ApplicationListener<SessionDisconnectEve
         activityDTO.setSessionId(stompHeaderAccessor.getSessionId());
         activityDTO.setIpAddress(stompHeaderAccessor.getSessionAttributes().get(IP_ADDRESS).toString());
         activityDTO.setTime(Instant.now());
-        log.debug("Sending user tracking data {}", activityDTO);
+        LOG.debug("Sending user tracking data {}", activityDTO);
         return activityDTO;
     }
 

package/dist/generators/upgrade/generator.js

@@ -25,8 +25,8 @@ import { ResetMode } from 'simple-git';
 import BaseGenerator from '../base/index.js';
 import { packageJson } from '../../lib/index.js';
 import EnvironmentBuilder from '../../cli/environment-builder.mjs';
-import { GIT_VERSION_NOT_ALLOW_MERGE_UNRELATED_HISTORIES, UPGRADE_BRANCH } from './support/index.js';
 import { SERVER_MAIN_RES_DIR } from '../generator-constants.js';
+import { GIT_VERSION_NOT_ALLOW_MERGE_UNRELATED_HISTORIES, UPGRADE_BRANCH } from './support/index.js';
 /* Constants used throughout */
 const GENERATOR_JHIPSTER = 'generator-jhipster';
 const GENERATOR_APP = 'app';
@@ -61,9 +61,6 @@ export default class UpgradeGenerator extends BaseGenerator {
                 this.log.log(chalk.green('For advanced options, please use the jhipster-migrate blueprint (https://github.com/jhipster/generator-jhipster-migrate/)'));
                 this.log.log('');
             },
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
             initializeOptions() {
                 if (this.silent) {
                     this.spawnStdio = 'ignore';
@@ -252,7 +249,7 @@ export default class UpgradeGenerator extends BaseGenerator {
      */
     async cleanUp() {
         const gitignoreContent = this.readDestination('.gitignore', { defaults: '' });
-        const ignoredFiles = gitignoreContent ? gitignore(gitignoreContent).patterns ?? [] : [];
+        const ignoredFiles = gitignoreContent ? (gitignore(gitignoreContent).patterns ?? []) : [];
         const filesToKeep = ['.yo-rc.json', '.jhipster', 'package.json', 'package-lock.json', 'node_modules', '.git', ...ignoredFiles];
         for (const file of await readdir(this.destinationPath())) {
             if (!filesToKeep.includes(file)) {

package/dist/generators/vue/entity-files-vue.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientApplicationTemplatesBlock, filterEntitiesAndPropertiesForClient, filterEntitiesForClient } from '../client/support/index.js';
+import { clientApplicationTemplatesBlock } from '../client/support/index.js';
 export const entityFiles = {
     client: [
         clientApplicationTemplatesBlock({
@@ -48,16 +48,16 @@ export const entityFiles = {
         },
     ],
 };
-export async function writeEntityFiles({ application, entities }) {
-    for (const entity of filterEntitiesAndPropertiesForClient(entities).filter(entity => !entity.skipClient && !entity.builtInUser)) {
+export async function writeEntityFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesAndPropertiesForClient ?? (entities => entities))(entities).filter(entity => !entity.skipClient && !entity.builtInUser)) {
         await this.writeFiles({
             sections: entityFiles,
             context: { ...application, ...entity },
         });
     }
 }
-export async function postWriteEntityFiles({ application, entities }) {
-    for (const entity of filterEntitiesForClient(entities).filter(entity => !entity.builtInUser)) {
+export async function postWriteEntityFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesForClient ?? (entities => entities))(entities).filter(entity => !entity.builtInUser)) {
         if (!entity.embedded) {
             const { enableTranslation } = application;
             const { entityInstance, entityClass, entityAngularName, entityFolderName, entityFileName, entityUrl, microserviceName, readOnly, entityClassPlural, i18nKeyPrefix, pageTitle = enableTranslation ? `${i18nKeyPrefix}.home.title` : entityClassPlural, } = entity;
@@ -66,8 +66,8 @@ export async function postWriteEntityFiles({ application, entities }) {
         }
     }
 }
-export function cleanupEntitiesFiles({ application, entities }) {
-    for (const entity of filterEntitiesForClient(entities).filter(entity => !entity.builtInUser)) {
+export function cleanupEntitiesFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesForClient ?? (entities => entities))(entities).filter(entity => !entity.builtInUser)) {
         const { entityFolderName, entityFileName } = entity;
         if (this.isJhipsterVersionLessThan('8.0.0-beta.3')) {
             this.removeFile(`${application.clientTestDir}/spec/app/entities/${entityFolderName}/${entityFileName}.component.spec.ts`);

package/dist/generators/vue/files-vue.js

@@ -21,13 +21,13 @@ export const vueFiles = {
     common: [
         clientRootTemplatesBlock({
             templates: [
+                '.postcssrc.js',
+                { sourceFile: 'eslint.config.js.jhi.vue', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.vue` },
                 'package.json',
                 'tsconfig.json',
                 'tsconfig.app.json',
                 'tsconfig.node.json',
                 'tsconfig.vitest.json',
-                '.postcssrc.js',
-                '.eslintrc.cjs',
                 'vite.config.mts',
                 'vitest.config.mts',
             ],
@@ -260,7 +260,7 @@ export const vueFiles = {
             ],
         },
         {
-            condition: generator => generator.applicationTypeGateway && generator.serviceDiscoveryAny,
+            condition: ctx => ctx.applicationTypeGateway && ctx.gatewayServicesApiAvailable,
             ...clientApplicationTemplatesBlock(),
             templates: [
                 'admin/gateway/gateway.vue',

package/dist/generators/vue/generator.js

@@ -21,14 +21,15 @@ import chalk from 'chalk';
 import { isFileStateModified } from 'mem-fs-editor/state';
 import { camelCase, startCase } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { fieldTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js';
-import { GENERATOR_VUE, GENERATOR_CLIENT, GENERATOR_LANGUAGES } from '../generator-list.js';
-import { writeEntityFiles, postWriteEntityFiles, cleanupEntitiesFiles } from './entity-files-vue.js';
+import { clientFrameworkTypes, fieldTypes } from '../../jdl/jhipster/index.js';
+import { GENERATOR_CLIENT, GENERATOR_LANGUAGES, GENERATOR_VUE } from '../generator-list.js';
+import { generateEntityClientImports as formatEntityClientImports, generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, getTypescriptKeyType as getTSKeyType, generateTestEntityId as getTestEntityId, } from '../client/support/index.js';
+import { createNeedleCallback } from '../base/support/index.js';
+import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js';
+import { cleanupEntitiesFiles, postWriteEntityFiles, writeEntityFiles } from './entity-files-vue.js';
 import cleanupOldFilesTask from './cleanup.js';
-import { writeFiles, writeEntitiesFiles } from './files-vue.js';
-import { generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, generateEntityClientImports as formatEntityClientImports, generateTestEntityId as getTestEntityId, getTypescriptKeyType as getTSKeyType, } from '../client/support/index.js';
+import { writeEntitiesFiles, writeFiles } from './files-vue.js';
 import { convertTranslationsSupport, isTranslatedVueFile, translateVueFilesTransform } from './support/index.js';
-import { createNeedleCallback } from '../base/support/index.js';
 const { CommonDBTypes } = fieldTypes;
 const { VUE } = clientFrameworkTypes;
 const TYPE_BOOLEAN = CommonDBTypes.BOOLEAN;
@@ -47,6 +48,12 @@ export default class VueGenerator extends BaseApplicationGenerator {
             loadPackageJson({ application }) {
                 this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster(GENERATOR_VUE, 'resources', 'package.json'));
             },
+            applicationDefauts({ applicationDefaults }) {
+                applicationDefaults({
+                    __override__: true,
+                    typescriptEslint: true,
+                });
+            },
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
@@ -54,13 +61,16 @@ export default class VueGenerator extends BaseApplicationGenerator {
     }
     get preparing() {
         return this.asPreparingTaskGroup({
+            applicationDefauts({ applicationDefaults }) {
+                applicationDefaults({
+                    __override__: true,
+                    eslintConfigFile: app => `eslint.config.${app.packageJsonType === 'module' ? 'js' : 'mjs'}`,
+                    clientWebappDir: app => `${app.clientSrcDir}app/`,
+                    webappEnumerationsDir: app => `${app.clientWebappDir}shared/model/enumerations/`,
+                });
+            },
             prepareForTemplates({ application, source }) {
-                application.clientWebappDir = `${application.clientSrcDir}app/`;
-                application.webappEnumerationsDir = `${application.clientWebappDir}shared/model/enumerations/`;
-                application.clientSpecDir = `${application.clientTestDir}spec/`;
-                // Can be dropped if tests are moved near implementation
-                application.applicationRootRelativeToClientTestDir = `${relative(application.clientSpecDir, '.')}/`;
-                application.clientSrcDirRelativeToClientTestDir = `${relative(application.clientSpecDir, application.clientWebappDir)}/`;
+                application.addPrettierExtensions?.(['html', 'vue', 'css', 'scss']);
                 source.addWebpackConfig = args => {
                     const webpackPath = `${application.clientRootDir}webpack/webpack.common.js`;
                     const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
@@ -112,7 +122,13 @@ export default class VueGenerator extends BaseApplicationGenerator {
     }
     get writing() {
         return this.asWritingTaskGroup({
+            cleanup({ control }) {
+                control.cleanupFiles({
+                    '8.6.1': ['.eslintrc.json', '.eslintignore'],
+                });
+            },
             cleanupOldFilesTask,
+            writeEslintClientRootConfigFile,
             writeFiles,
         });
     }