generator-jhipster 8.6.0 → 8.7.0

package/dist/generators/maven/internal/pom-sort.js

@@ -0,0 +1,144 @@
+/**
+ * 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 sortKeys from 'sort-keys';
+export const formatPomFirstLevel = content => content.replace(/(\n {4}<(?:groupId|distributionManagement|repositories|pluginRepositories|properties|dependencyManagement|dependencies|build|profiles)>)/g, '\n$1');
+const rootAndProfileOrder = [
+    'id',
+    'activation',
+    'modelVersion',
+    'groupId',
+    'artifactId',
+    'version',
+    'packaging',
+    'name',
+    'description',
+    'parent',
+    'repositories',
+    'pluginRepositories',
+    'distributionManagement',
+    'properties',
+    'dependencyManagement',
+    'dependencies',
+    'build',
+    'profiles',
+];
+const propertiesOrder = [
+    'maven.version',
+    'java.version',
+    'node.version',
+    'npm.version',
+    'project.build.sourceEncoding',
+    'project.reporting.outputEncoding',
+    'maven.build.timestamp.format',
+    'maven.compiler.source',
+    'maven.compiler.target',
+    'start-class',
+    'argLine',
+    'm2e.apt.activation',
+    'run.addResources',
+    'jhipster-dependencies.version',
+    'spring-boot.version',
+];
+const groupIdOrder = [
+    'tech.jhipster',
+    'org.apache.maven.plugins',
+    'org.springframework.boot',
+    'org.springframework.security',
+    'org.springdoc',
+];
+const sortSection = section => {
+    return Object.fromEntries(Object.entries(section).sort(([key1, value1], [key2, value2]) => {
+        if (typeof value1 === typeof value2)
+            key1.localeCompare(key2);
+        if (typeof value1 === 'string')
+            return -1;
+        if (typeof value2 === 'string')
+            return 1;
+        return 0;
+    }));
+};
+const isComment = name => name.startsWith('#');
+const toMaxInt = nr => (nr === -1 ? Number.MAX_SAFE_INTEGER : nr);
+const sortWithTemplate = (template, a, b) => {
+    if (isComment(a))
+        return -1;
+    if (isComment(b))
+        return 1;
+    const indexOfA = toMaxInt(template.indexOf(a));
+    const indexOfB = toMaxInt(template.indexOf(b));
+    if (indexOfA === indexOfB) {
+        return a.localeCompare(b);
+    }
+    return indexOfA - indexOfB;
+};
+const comparator = (order) => (a, b) => sortWithTemplate(order, a, b);
+const sortProperties = properties => sortKeys(properties, { compare: comparator(propertiesOrder) });
+const sortArtifacts = (artifacts) => artifacts.sort((a, b) => {
+    if (a.scope === 'import' || b.scope === 'import') {
+        if (a.scope === b.scope) {
+            return 1;
+        }
+        return a.scope === 'import' ? -1 : 1;
+    }
+    if (a.groupId !== b.groupId) {
+        if (a.groupId === undefined) {
+            return -1;
+        }
+        if (b.groupId === undefined) {
+            return 1;
+        }
+        const groupIdCompared = sortWithTemplate(groupIdOrder, a.groupId, b.groupId);
+        if (groupIdCompared)
+            return groupIdCompared;
+    }
+    return a.artifactId.localeCompare(b.artifactId);
+});
+const sortProfiles = (profiles) => profiles.sort((a, b) => a.id?.localeCompare(b.id) ?? 1);
+const sortProjectLike = (projectLike) => {
+    projectLike = sortKeys(projectLike, { compare: comparator(rootAndProfileOrder) });
+    if (projectLike.properties) {
+        projectLike.properties = sortProperties(projectLike.properties);
+    }
+    if (Array.isArray(projectLike.dependencies?.dependency)) {
+        projectLike.dependencies.dependency = sortArtifacts(projectLike.dependencies.dependency);
+    }
+    if (Array.isArray(projectLike.dependencyManagement?.dependencies?.dependency)) {
+        projectLike.dependencyManagement.dependencies.dependency = sortArtifacts(projectLike.dependencyManagement.dependencies.dependency);
+    }
+    if (projectLike.build) {
+        projectLike.build = sortSection(projectLike.build);
+        if (Array.isArray(projectLike.build.plugins?.plugin)) {
+            projectLike.build.plugins.plugin = sortArtifacts(projectLike.build.plugins.plugin);
+        }
+        if (Array.isArray(projectLike.build.pluginManagement?.plugins?.plugin)) {
+            projectLike.build.pluginManagement.plugins.plugin = sortArtifacts(projectLike.build.pluginManagement.plugins.plugin);
+        }
+    }
+    return projectLike;
+};
+export const sortPomProject = (project) => {
+    project = sortProjectLike(project);
+    if (Array.isArray(project.profiles?.profile)) {
+        project.profiles.profile = sortProfiles(project.profiles.profile.map(profile => sortProjectLike(profile)));
+    }
+    else if (project.profiles?.profile) {
+        project.profiles.profile = sortProjectLike(project.profiles.profile);
+    }
+    return project;
+};

package/dist/generators/maven/internal/xml-store.js

@@ -17,18 +17,19 @@
  * limitations under the License.
  */
 import assert from 'assert';
-import { XMLParser, XMLBuilder } from 'fast-xml-parser';
+import { XMLBuilder, XMLParser } from 'fast-xml-parser';
 import { merge } from 'lodash-es';
 const defaultXmlCommonOptions = {
     ignoreAttributes: false,
     attributeNamePrefix: '@@',
     commentPropName: '#comment',
-    parseAttributeValue: false,
 };
-const defaultXmlParserOptions = {
+export const defaultXmlParserOptions = {
+    parseAttributeValue: false,
+    parseTagValue: false,
     ...defaultXmlCommonOptions,
 };
-const defaultXmlBuildOptions = {
+export const defaultXmlBuildOptions = {
     ...defaultXmlCommonOptions,
     suppressBooleanAttributes: false,
     suppressEmptyNode: true,

package/dist/generators/maven/support/dependabot-maven.js

@@ -17,19 +17,20 @@
  * limitations under the License.
  */
 import { XMLParser } from 'fast-xml-parser';
+import { defaultXmlParserOptions } from '../internal/xml-store.js';
 /**
  * Extract properties from pom content
  * @param pomContent
  */
 export function getPomProperties(pomContent) {
-    return new XMLParser().parse(pomContent).project.properties;
+    return new XMLParser(defaultXmlParserOptions).parse(pomContent).project.properties;
 }
 /**
  * Extract version properties from pom content
  * @param fileContent
  */
 export function parseMavenPom(fileContent) {
-    return new XMLParser().parse(fileContent);
+    return new XMLParser(defaultXmlParserOptions).parse(fileContent);
 }
 /**
  * Extract version properties from pom content

package/dist/generators/maven/support/index.js

@@ -18,4 +18,5 @@
  */
 export * from './dependabot-maven.js';
 export { default as PomStorage } from './pom-store.js';
+export * from './pom-file-sort.js';
 export * from './pom-store.js';

package/dist/generators/maven/support/pom-file-sort.js

@@ -0,0 +1,28 @@
+/**
+ * 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 { XMLBuilder, XMLParser } from 'fast-xml-parser';
+import { defaultXmlBuildOptions, defaultXmlParserOptions } from '../internal/xml-store.js';
+import { formatPomFirstLevel, sortPomProject } from '../internal/pom-sort.js';
+export const sortPomFile = (pomFile, { xmlParserOptions, xmlBuildOptions } = {}) => {
+    const parser = new XMLParser({ ...defaultXmlParserOptions, ...xmlParserOptions });
+    const pomObject = parser.parse(pomFile);
+    pomObject.project = sortPomProject(pomObject.project);
+    const builder = new XMLBuilder({ ...defaultXmlBuildOptions, ...xmlBuildOptions });
+    return formatPomFirstLevel(builder.build(pomObject));
+};

package/dist/generators/maven/support/pom-store.js

@@ -16,72 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { set, get } from 'lodash-es';
-import sortKeys from 'sort-keys';
+import { get, set } from 'lodash-es';
 import XmlStorage from '../internal/xml-store.js';
-const rootOrder = [
-    'modelVersion',
-    'groupId',
-    'artifactId',
-    'version',
-    'packaging',
-    'name',
-    'description',
-    'parent',
-    'repositories',
-    'pluginRepositories',
-    'distributionManagement',
-    'properties',
-    'dependencyManagement',
-    'dependencies',
-    'build',
-    'profiles',
-];
-const propertiesOrder = [
-    'maven.version',
-    'java.version',
-    'node.version',
-    'npm.version',
-    'project.build.sourceEncoding',
-    'project.reporting.outputEncoding',
-    'maven.build.timestamp.format',
-    'maven.compiler.source',
-    'maven.compiler.target',
-    'start-class',
-    'argLine',
-    'm2e.apt.activation',
-    'run.addResources',
-    'jhipster-dependencies.version',
-    'spring-boot.version',
-];
-const formatFirstXmlLevel = content => content.replace(/(\n {4}<(?:groupId|distributionManagement|repositories|pluginRepositories|properties|dependencyManagement|dependencies|build|profiles)>)/g, '\n$1');
-const sortSection = section => {
-    return Object.fromEntries(Object.entries(section).sort(([key1, value1], [key2, value2]) => {
-        if (typeof value1 === typeof value2)
-            key1.localeCompare(key2);
-        if (typeof value1 === 'string')
-            return -1;
-        if (typeof value2 === 'string')
-            return 1;
-        return 0;
-    }));
-};
-const isComment = name => name.startsWith('#');
-const toMaxInt = nr => (nr === -1 ? Number.MAX_SAFE_INTEGER : nr);
-const sortWithTemplate = (template, a, b) => {
-    if (isComment(a))
-        return -1;
-    if (isComment(b))
-        return 1;
-    const indexOfA = toMaxInt(template.findIndex(item => item === a));
-    const indexOfB = toMaxInt(template.findIndex(item => item === b));
-    if (indexOfA === indexOfB) {
-        return a.localeCompare(b);
-    }
-    return indexOfA - indexOfB;
-};
-const comparator = (order) => (a, b) => sortWithTemplate(order, a, b);
-const sortProperties = properties => sortKeys(properties, { compare: comparator(propertiesOrder) });
+import { formatPomFirstLevel, sortPomProject } from '../internal/pom-sort.js';
 const artifactEquals = (a, b) => {
     return a.groupId === b.groupId && a.artifactId === b.artifactId;
 };
@@ -125,22 +62,6 @@ const ensureProfile = (project, profileId) => {
     const profileArray = ensureChildIsArray(project, 'profiles.profile');
     return appendOrGet(profileArray, { id: profileId }, idEquals);
 };
-const groupIdOrder = ['tech.jhipster', 'org.springframework.boot', 'org.springframework.security', 'org.springdoc'];
-const sortArtifacts = (artifacts) => artifacts.sort((a, b) => {
-    if (a.groupId !== b.groupId) {
-        if (a.groupId === undefined) {
-            return -1;
-        }
-        if (b.groupId === undefined) {
-            return 1;
-        }
-        const groupIdCompared = sortWithTemplate(groupIdOrder, a.groupId, b.groupId);
-        if (groupIdCompared)
-            return groupIdCompared;
-    }
-    return a.artifactId.localeCompare(b.artifactId);
-});
-const sortProfiles = (profiles) => profiles.sort((a, b) => a.id?.localeCompare(b.id) ?? 1);
 const ensureChildPath = (node, childPath) => {
     let child = get(node, childPath);
     if (child)
@@ -262,29 +183,7 @@ export default class PomStorage extends XmlStorage {
     }
     sort() {
         if (this.store.project) {
-            const project = sortKeys(this.store.project, { compare: comparator(rootOrder) });
-            this.store.project = project;
-            if (project.properties) {
-                project.properties = sortProperties(project.properties);
-            }
-            if (Array.isArray(project.dependencies?.dependency)) {
-                project.dependencies.dependency = sortArtifacts(project.dependencies.dependency);
-            }
-            if (Array.isArray(project.dependencyManagement?.dependencies?.dependency)) {
-                project.dependencyManagement.dependencies.dependency = sortArtifacts(project.dependencyManagement.dependencies.dependency);
-            }
-            if (project.build) {
-                project.build = sortSection(project.build);
-                if (Array.isArray(project.build.plugins?.plugin)) {
-                    project.build.plugins.plugin = sortArtifacts(project.build.plugins.plugin);
-                }
-                if (Array.isArray(project.build.pluginManagement?.plugins?.plugin)) {
-                    project.build.pluginManagement.plugins.plugin = sortArtifacts(project.build.pluginManagement.plugins.plugin);
-                }
-            }
-            if (Array.isArray(project.profiles?.profile)) {
-                project.profiles.profile = sortProfiles(project.profiles.profile);
-            }
+            this.store.project = sortPomProject(this.store.project);
         }
     }
 }
@@ -298,7 +197,7 @@ export const createPomStorage = (generator, { sortFile } = {}) => {
     const loadFile = () => generator.readDestination('pom.xml', { defaults: emptyPomFile })?.toString() ?? '';
     const pomStorage = new PomStorage({
         loadFile,
-        saveFile: content => generator.writeDestination('pom.xml', formatFirstXmlLevel(content)),
+        saveFile: content => generator.writeDestination('pom.xml', formatPomFirstLevel(content)),
         sortFile,
     });
     generator.fs.store.on('change', filename => {

package/dist/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties

@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 wrapperVersion=3.3.2
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

package/dist/generators/project-name/command.js

@@ -1,21 +1,3 @@
-/**
- * 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 { BASE_NAME, BASE_NAME_DESCRIPTION } from './constants.js';
 const command = {
     options: {

package/dist/generators/project-name/generator.js

@@ -16,12 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable consistent-return */
-import { defaults, kebabCase, upperFirst, camelCase, startCase } from 'lodash-es';
-import { getDefaultAppName } from './support/index.js';
+import { camelCase, defaults, kebabCase, startCase, upperFirst } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { BASE_NAME } from './constants.js';
 import { getHipster } from '../base/support/index.js';
+import { getDefaultAppName } from './support/index.js';
+import { BASE_NAME } from './constants.js';
 import { validateProjectName } from './support/name-resolver.js';
 /**
  * @class
@@ -38,9 +37,6 @@ export default class ProjectNameGenerator extends BaseApplicationGenerator {
     }
     get initializing() {
         return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
             parseOptions() {
                 if (this.options.defaults) {
                     if (!this.jhipsterConfig.baseName) {

package/dist/generators/project-name/support/index.js

@@ -16,5 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// eslint-disable-next-line import/prefer-default-export
 export { default as getDefaultAppName } from './name-resolver.js';

package/dist/generators/react/application/entities/index.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/prefer-default-export
 export function prepareEntity({ entity, application }) {
     entity.entityReactState = application.applicationTypeMonolith
         ? entity.entityInstance

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

@@ -16,13 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { asWriteFilesSection } from '../base-application/support/index.js';
 import { clientApplicationTemplatesBlock, clientRootTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.js';
-export const files = {
+export const files = asWriteFilesSection({
     common: [
         clientRootTemplatesBlock({
             templates: [
+                { sourceFile: 'eslint.config.js.jhi.react', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.react` },
                 'package.json',
-                '.eslintrc.json',
                 'tsconfig.json',
                 'tsconfig.test.json',
                 'jest.conf.js',
@@ -185,7 +186,7 @@ export const files = {
             ],
         },
         {
-            condition: generator => generator.applicationTypeGateway && generator.serviceDiscoveryAny,
+            condition: ctx => ctx.applicationTypeGateway && ctx.gatewayServicesApiAvailable,
             ...clientApplicationTemplatesBlock(),
             templates: ['modules/administration/gateway/gateway.tsx'],
         },
@@ -303,7 +304,7 @@ export const files = {
             templates: ['shared/reducers/user-management.spec.ts'],
         },
     ],
-};
+});
 export async function writeFiles({ application }) {
     if (!application.clientFrameworkReact)
         return;

package/dist/generators/react/generator.js

@@ -21,34 +21,32 @@ import chalk from 'chalk';
 import { camelCase, startCase } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_CLIENT, GENERATOR_LANGUAGES, GENERATOR_REACT } from '../generator-list.js';
-import { writeEntitiesFiles, postWriteEntitiesFiles, cleanupEntitiesFiles } from './entity-files-react.js';
+import { clientFrameworkTypes, fieldTypes } from '../../jdl/jhipster/index.js';
+import { generateEntityClientImports as formatEntityClientImports, generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, } from '../client/support/index.js';
+import { createNeedleCallback, upperFirstCamelCase } from '../base/support/index.js';
+import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js';
+import { cleanupEntitiesFiles, postWriteEntitiesFiles, writeEntitiesFiles } from './entity-files-react.js';
 import cleanupOldFilesTask from './cleanup.js';
 import { writeFiles } from './files-react.js';
 import { prepareEntity } from './application/entities/index.js';
-import { fieldTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js';
-import { generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, generateEntityClientImports as formatEntityClientImports, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, } from '../client/support/index.js';
 import { isTranslatedReactFile, translateReactFilesTransform } from './support/index.js';
-import { createNeedleCallback, upperFirstCamelCase } from '../base/support/index.js';
 const { CommonDBTypes } = fieldTypes;
 const TYPE_BOOLEAN = CommonDBTypes.BOOLEAN;
 const { REACT } = clientFrameworkTypes;
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('../client/types.js').ClientApplication>}
- */
 export default class ReactGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster('jhipster:javascript:bootstrap');
             await this.dependsOnJHipster(GENERATOR_CLIENT);
             await this.dependsOnJHipster(GENERATOR_LANGUAGES);
         }
     }
     get composing() {
         return this.asComposingTaskGroup({
-            async composeClientCommon() {
+            async composing() {
                 await this.composeWithJHipster('jhipster:client:common');
             },
         });
@@ -61,6 +59,12 @@ export default class ReactGenerator extends BaseApplicationGenerator {
             loadPackageJson({ application }) {
                 this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster(GENERATOR_REACT, 'resources', 'package.json'));
             },
+            applicationDefauts({ applicationDefaults }) {
+                applicationDefaults({
+                    __override__: true,
+                    typescriptEslint: true,
+                });
+            },
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
@@ -68,8 +72,15 @@ export default class ReactGenerator extends BaseApplicationGenerator {
     }
     get preparing() {
         return this.asPreparingTaskGroup({
+            applicationDefauts({ application, applicationDefaults }) {
+                application.addPrettierExtensions?.(['html', 'tsx', 'css', 'scss']);
+                applicationDefaults({
+                    __override__: true,
+                    eslintConfigFile: app => `eslint.config.${app.packageJsonType === 'module' ? 'js' : 'mjs'}`,
+                    webappEnumerationsDir: app => `${app.clientSrcDir}app/shared/model/enumerations/`,
+                });
+            },
             prepareForTemplates({ application, source }) {
-                application.webappEnumerationsDir = `${application.clientSrcDir}app/shared/model/enumerations/`;
                 source.addWebpackConfig = args => {
                     const webpackPath = `${application.clientRootDir}webpack/webpack.common.js`;
                     const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
@@ -111,10 +122,16 @@ export default class ReactGenerator extends BaseApplicationGenerator {
         return this.delegateTasksToBlueprint(() => this.default);
     }
     get writing() {
-        return {
+        return this.asWritingTaskGroup({
+            cleanup({ control }) {
+                control.cleanupFiles({
+                    '8.6.1': ['.eslintrc.json', '.eslintignore'],
+                });
+            },
             cleanupOldFilesTask,
+            writeEslintClientRootConfigFile,
             writeFiles,
-        };
+        });
     }
     get [BaseApplicationGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);