generator-jhipster 8.5.0 → 8.7.0

package/README.md

@@ -18,10 +18,9 @@ We are honored by any contributions you may have small or large. Please refer to
 
 The following Java and Node combinations are tested and verified by GitHub Actions:
 
-| Java | Node | Status |
-| ---- | ---- | ------ |
-| 21   | 20   | ✅     |
-| 17   | 18   | ✅     |
+| Java     | Node  | Status |
+| -------- | ----- | ------ |
+| 17/21/22 | 18/20 | ✅     |
 
 ## Sponsors
 

package/dist/cli/commands.mjs

@@ -25,6 +25,7 @@ If you are interested in maintaining this sub-generator fill a feature request o
 const defaultCommands = {
     add: {
         desc: 'Add a feature to current project',
+        removed: removedV8,
     },
     app: {
         desc: '[Default] Create a new JHipster application based on the selected options',
@@ -134,6 +135,7 @@ const defaultCommands = {
     },
     page: {
         desc: 'Create a new page. (Supports vue clients)',
+        removed: removedV8,
     },
     'project-name': {
         desc: 'Configure project name (alpha)',

package/dist/cli/download.mjs

@@ -20,8 +20,8 @@ import { writeFile } from 'fs/promises';
 import path from 'path';
 import { inspect } from 'util';
 import axios from 'axios';
-import { logger } from './utils.mjs';
 import { packageJson } from '../lib/index.js';
+import { logger } from './utils.mjs';
 const downloadFile = async (url, filename) => {
     logger.verboseInfo(`Downloading file: ${url}`);
     const response = await axios.get(url);

package/dist/cli/environment-builder.mjs

@@ -24,9 +24,9 @@ import chalk from 'chalk';
 import { cloneDeep, mergeWith } from 'lodash-es';
 import Environment from 'yeoman-environment';
 import { QueuedAdapter } from '@yeoman/adapter';
-import { CLI_NAME, logger } from './utils.mjs';
 import { createJHipsterLogger, packageNameToNamespace } from '../generators/base/support/index.js';
-import { parseBlueprintInfo, loadBlueprintsFromConfiguration, mergeBlueprints } from '../generators/base/internal/index.js';
+import { loadBlueprintsFromConfiguration, mergeBlueprints, parseBlueprintInfo } from '../generators/base/internal/index.js';
+import { CLI_NAME, logger } from './utils.mjs';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const jhipsterDevBlueprintPath = process.env.JHIPSTER_DEV_BLUEPRINT === 'true' ? path.join(__dirname, '../.blueprint') : undefined;
@@ -86,6 +86,11 @@ export default class EnvironmentBuilder {
     static async createDefaultBuilder(...args) {
         return EnvironmentBuilder.create(...args).prepare();
     }
+    static async run(args, generatorOptions = {}, envOptions = {}) {
+        const envBuilder = await EnvironmentBuilder.createDefaultBuilder(envOptions);
+        const env = envBuilder.getEnvironment();
+        await env.run(args, generatorOptions);
+    }
     /**
      * Class to manipulate yeoman environment for jhipster needs.
      * - Registers jhipster generators.
@@ -357,8 +362,6 @@ export default class EnvironmentBuilder {
         }
         let result;
         for (const [blueprint, packagePath] of blueprintPackagePaths) {
-            /* eslint-disable import/no-dynamic-require */
-            /* eslint-disable global-require */
             let blueprintCommand;
             const blueprintCommandFile = `${packagePath}/cli/commands`;
             const blueprintCommandExtension = ['.js', '.cjs', '.mjs'].find(extension => existsSync(`${blueprintCommandFile}${extension}`));
@@ -372,7 +375,7 @@ export default class EnvironmentBuilder {
                     });
                     result = { ...result, ...blueprintCommands };
                 }
-                catch (e) {
+                catch {
                     const msg = `Error parsing custom commands found within blueprint: ${blueprint} at ${blueprintCommandsUrl}`;
                     /* eslint-disable no-console */
                     console.info(`${chalk.green.bold('INFO!')} ${msg}`);
@@ -409,8 +412,6 @@ export default class EnvironmentBuilder {
             return [objValue, srcValue];
         }
         async function loadSharedOptionsFromFile(sharedOptionsBase, msg, errorMsg) {
-            /* eslint-disable import/no-dynamic-require */
-            /* eslint-disable global-require */
             try {
                 const baseExtension = ['.js', '.cjs', '.mjs'].find(extension => existsSync(resolve(`${sharedOptionsBase}${extension}`)));
                 if (baseExtension) {

package/dist/cli/program.mjs

@@ -1,5 +1,3 @@
-/* eslint-disable global-require */
-/* eslint-disable import/no-dynamic-require */
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *
@@ -23,15 +21,16 @@ import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import didYouMean from 'didyoumean';
 import chalk from 'chalk';
-import logo from './logo.mjs';
-import EnvironmentBuilder from './environment-builder.mjs';
-import SUB_GENERATORS from './commands.mjs';
-import JHipsterCommand from './jhipster-command.mjs';
-import { CLI_NAME, logger, getCommand, done } from './utils.mjs';
 import { packageJson } from '../lib/index.js';
 import { packageNameToNamespace } from '../generators/base/support/index.js';
 import command from '../generators/base/command.js';
 import { GENERATOR_APP, GENERATOR_BOOTSTRAP, GENERATOR_JDL } from '../generators/generator-list.js';
+import { extractArgumentsFromConfigs } from '../generators/base/internal/command.js';
+import logo from './logo.mjs';
+import EnvironmentBuilder from './environment-builder.mjs';
+import SUB_GENERATORS from './commands.mjs';
+import JHipsterCommand from './jhipster-command.mjs';
+import { CLI_NAME, done, getCommand, logger } from './utils.mjs';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const { version: JHIPSTER_VERSION } = packageJson;
@@ -85,8 +84,13 @@ const buildAllDependencies = async (generatorNames, { env, blueprintNamespaces }
 const addCommandGeneratorOptions = async (command, generatorMeta, { root, blueprintOptionDescription, info } = {}) => {
     const generatorModule = await generatorMeta.importModule();
     if (generatorModule.command) {
-        command.addJHipsterOptions(generatorModule.command.options, blueprintOptionDescription);
-        command.addJHipsterConfigs(generatorModule.command.configs, blueprintOptionDescription);
+        const { options, configs } = generatorModule.command;
+        if (options) {
+            command.addJHipsterOptions(options, blueprintOptionDescription);
+        }
+        if (configs) {
+            command.addJHipsterConfigs(configs, blueprintOptionDescription);
+        }
     }
     try {
         if (root || !generatorModule.command || generatorModule.command.loadGeneratorOptions) {
@@ -105,7 +109,7 @@ const addCommandGeneratorOptions = async (command, generatorMeta, { root, bluepr
 const addCommandRootGeneratorOptions = async (command, generatorMeta, { usage = true } = {}) => {
     const generatorModule = await generatorMeta.importModule();
     if (generatorModule.command) {
-        command.addJHipsterArguments(generatorModule.command.arguments);
+        command.addJHipsterArguments(generatorModule.command.arguments ?? extractArgumentsFromConfigs(generatorModule.command.configs));
     }
     else {
         const generator = await generatorMeta.instantiateHelp();
@@ -158,7 +162,7 @@ export const buildCommands = async ({ program, commands = {}, envBuilder, env, l
     Object.entries(commands).forEach(([cmdName, opts]) => {
         const { desc, blueprint, argument, options: commandOptions, alias, help: commandHelp, cliOnly, removed, useOptions = {} } = opts;
         program
-            .command(cmdName, '', { isDefault: cmdName === defaultCommand })
+            .command(cmdName, '', { isDefault: cmdName === defaultCommand, hidden: Boolean(removed) })
             .description(desc + (blueprint ? chalk.yellow(` (blueprint: ${blueprint})`) : ''))
             .addCommandArguments(argument)
             .addCommandOptions(commandOptions)
@@ -262,13 +266,10 @@ export const buildCommands = async ({ program, commands = {}, envBuilder, env, l
         });
     });
 };
-export const buildJHipster = async ({ executableName, executableVersion, program = createProgram({ executableName, executableVersion }), blueprints, lookups, createEnvBuilder, envBuilder, commands, printLogo, printBlueprintLogo, devBlueprintPath, env, 
-/* eslint-disable-next-line global-require, import/no-dynamic-require */
-loadCommand = async (key) => {
+export const buildJHipster = async ({ executableName, executableVersion, program = createProgram({ executableName, executableVersion }), blueprints, lookups, createEnvBuilder, envBuilder, commands, printLogo, printBlueprintLogo, devBlueprintPath, env, loadCommand = async (key) => {
     const { default: command } = await import(`./${key}.mjs`);
     return command;
 }, defaultCommand, entrypointGenerator, } = {}) => {
-    // eslint-disable-next-line chai-friendly/no-unused-expressions
     createEnvBuilder =
         createEnvBuilder ?? (async (options) => EnvironmentBuilder.create(options).prepare({ blueprints, lookups, devBlueprintPath }));
     envBuilder = envBuilder ?? (await createEnvBuilder());

package/dist/cli/utils.mjs

@@ -16,9 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable no-console */
 import chalk from 'chalk';
-import { createJHipsterLogger, CLI_LOGGER } from '../generators/base/support/index.js';
+import { CLI_LOGGER, createJHipsterLogger } from '../generators/base/support/index.js';
 export const CLI_NAME = 'jhipster';
 export const GENERATOR_NAME = 'generator-jhipster';
 const SUCCESS_MESSAGE = `Congratulations, JHipster execution is complete!

package/dist/generators/angular/cleanup.js

@@ -21,7 +21,6 @@ import { CLIENT_WEBPACK_DIR } from '../generator-constants.js';
  * Removes files that where generated in previous JHipster versions and therefore
  * need to be removed.
  */
-// eslint-disable-next-line import/prefer-default-export
 export default function cleanupOldFilesTask({ application }) {
     if (this.isJhipsterVersionLessThan('3.2.0')) {
         // removeFile and removeFolder methods should be called here for files and folders to cleanup

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

@@ -1,6 +1,5 @@
 import { clientApplicationTemplatesBlock } from '../client/support/files.js';
 import { asWritingEntitiesTask } from '../base-application/support/task-type-inference.js';
-import { filterEntitiesAndPropertiesForClient, filterEntitiesForClient } from '../client/support/index.js';
 const entityModelFiles = clientApplicationTemplatesBlock({
     templates: ['entities/_entityFolder_/_entityFile_.model.ts', 'entities/_entityFolder_/_entityFile_.test-samples.ts'],
 });
@@ -69,8 +68,8 @@ export const userManagementFiles = {
         }),
     ],
 };
-export const writeEntitiesFiles = asWritingEntitiesTask(async function ({ application, entities }) {
-    for (const entity of filterEntitiesAndPropertiesForClient(entities)) {
+export const writeEntitiesFiles = asWritingEntitiesTask(async function ({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesAndPropertiesForClient ?? (entities => entities))(entities)) {
         if (entity.builtInUser) {
             await this.writeFiles({
                 sections: builtInFiles,
@@ -103,12 +102,12 @@ export const writeEntitiesFiles = asWritingEntitiesTask(async function ({ applic
     }
 });
 export async function postWriteEntitiesFiles(taskParam) {
-    const { source, application } = taskParam;
-    const entities = filterEntitiesForClient(taskParam.entities).filter(entity => !entity.builtInUser && !entity.embedded && !entity.entityClientModelOnly);
+    const { control, source, application } = taskParam;
+    const entities = (control.filterEntitiesForClient ?? (entities => entities))(taskParam.entities).filter(entity => !entity.builtInUser && !entity.embedded && !entity.entityClientModelOnly);
     source.addEntitiesToClient({ application, entities });
 }
-export function cleanupEntitiesFiles({ application, entities }) {
-    for (const entity of filterEntitiesForClient(entities).filter(entity => !entity.builtIn)) {
+export function cleanupEntitiesFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesForClient ?? (entities => entities))(entities).filter(entity => !entity.builtIn)) {
         const { entityFolderName, entityFileName, name: entityName } = entity;
         if (this.isJhipsterVersionLessThan('5.0.0')) {
             this.removeFile(`${application.clientSrcDir}app/entities/${entityName}/${entityName}.model.ts`);

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

@@ -26,8 +26,8 @@ export const files = {
     common: [
         clientRootTemplatesBlock({
             templates: [
-                '.eslintrc.json',
                 'angular.json',
+                { sourceFile: 'eslint.config.js.jhi.angular', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.angular` },
                 'ngsw-config.json',
                 'package.json',
                 'tsconfig.json',
@@ -234,7 +234,7 @@ export const files = {
             ],
         },
         {
-            condition: generator => generator.applicationTypeGateway && generator.serviceDiscoveryAny,
+            condition: ctx => ctx.applicationTypeGateway && ctx.gatewayServicesApiAvailable,
             ...clientApplicationTemplatesBlock(),
             templates: [
                 'admin/gateway/gateway-route.model.ts',

package/dist/generators/angular/generator.js

@@ -22,13 +22,14 @@ import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_ANGULAR, GENERATOR_CLIENT, GENERATOR_LANGUAGES } from '../generator-list.js';
 import { defaultLanguage } from '../languages/support/index.js';
-import { writeEntitiesFiles, postWriteEntitiesFiles, cleanupEntitiesFiles } from './entity-files-angular.js';
-import { writeFiles } from './files-angular.js';
-import cleanupOldFilesTask from './cleanup.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
-import { buildAngularFormPath as angularFormPath, addEntitiesRoute, addToEntitiesMenu, translateAngularFilesTransform, isTranslatedAngularFile, addRoute, addItemToAdminMenu, addIconImport, } from './support/index.js';
-import { generateEntityClientEnumImports as getClientEnumImportsFormat, getTypescriptKeyType as getTSKeyType, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, generateTypescriptTestEntity as generateTestEntity, } from '../client/support/index.js';
+import { generateTypescriptTestEntity as generateTestEntity, generateEntityClientEnumImports as getClientEnumImportsFormat, getTypescriptKeyType as getTSKeyType, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, } from '../client/support/index.js';
 import { createNeedleCallback, mutateData } from '../base/support/index.js';
+import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js';
+import { cleanupEntitiesFiles, postWriteEntitiesFiles, writeEntitiesFiles } from './entity-files-angular.js';
+import { writeFiles } from './files-angular.js';
+import cleanupOldFilesTask from './cleanup.js';
+import { addEntitiesRoute, addIconImport, addItemToAdminMenu, addRoute, addToEntitiesMenu, buildAngularFormPath as angularFormPath, isTranslatedAngularFile, translateAngularFilesTransform, } from './support/index.js';
 const { ANGULAR } = clientFrameworkTypes;
 export default class AngularGenerator extends BaseApplicationGenerator {
     localEntities;
@@ -46,6 +47,12 @@ export default class AngularGenerator extends BaseApplicationGenerator {
             loadPackageJson({ application }) {
                 this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster(GENERATOR_ANGULAR, 'resources', 'package.json'));
             },
+            applicationDefauts({ applicationDefaults }) {
+                applicationDefaults({
+                    __override__: true,
+                    typescriptEslint: true,
+                });
+            },
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
@@ -53,9 +60,14 @@ export default class AngularGenerator extends BaseApplicationGenerator {
     }
     get preparing() {
         return this.asPreparingTaskGroup({
-            prepareForTemplates({ application }) {
-                application.webappEnumerationsDir = `${application.clientSrcDir}app/entities/enumerations/`;
-                application.angularLocaleId = application.nativeLanguageDefinition.angularLocale ?? defaultLanguage.angularLocale;
+            applicationDefauts({ application, applicationDefaults }) {
+                applicationDefaults({
+                    __override__: true,
+                    eslintConfigFile: app => `eslint.config.${app.packageJsonType === 'module' ? 'js' : 'mjs'}`,
+                    webappEnumerationsDir: app => `${app.clientSrcDir}app/entities/enumerations/`,
+                    angularLocaleId: app => app.nativeLanguageDefinition.angularLocale ?? defaultLanguage.angularLocale,
+                });
+                application.addPrettierExtensions?.(['html', 'css', 'scss']);
             },
             addNeedles({ source, application }) {
                 source.addEntitiesToClient = param => {
@@ -87,7 +99,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
                     const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
                     this.editFile(webpackPath, { ignoreNonExisting }, createNeedleCallback({
                         needle: 'jhipster-needle-add-webpack-config',
-                        contentToAdd: `,${args.config}`,
+                        contentToAdd: `${args.config},`,
                     }));
                 };
             },
@@ -168,7 +180,13 @@ export default class AngularGenerator extends BaseApplicationGenerator {
     }
     get writing() {
         return this.asWritingTaskGroup({
+            cleanup({ control }) {
+                control.cleanupFiles({
+                    '8.6.1': ['.eslintrc.json', '.eslintignore'],
+                });
+            },
             cleanupOldFilesTask,
+            writeEslintClientRootConfigFile,
             writeFiles,
         });
     }

package/dist/generators/angular/resources/package.json

@@ -1,55 +1,57 @@
 {
   "dependencies": {
-    "@angular/common": "17.3.9",
-    "@fortawesome/angular-fontawesome": "0.14.1",
-    "@fortawesome/fontawesome-svg-core": "6.5.2",
-    "@fortawesome/free-solid-svg-icons": "6.5.2",
-    "@ng-bootstrap/ng-bootstrap": "16.0.0",
+    "@angular/common": "18.2.1",
+    "@fortawesome/angular-fontawesome": "0.15.0",
+    "@fortawesome/fontawesome-svg-core": "6.6.0",
+    "@fortawesome/free-solid-svg-icons": "6.6.0",
+    "@ng-bootstrap/ng-bootstrap": "17.0.0",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@popperjs/core": "2.11.8",
     "@stomp/rx-stomp": "2.0.0",
     "bootstrap": "5.3.3",
     "bootswatch": "5.3.3",
-    "ngx-cookie-service": "17.1.0",
-    "ngx-infinite-scroll": "17.0.0",
+    "ngx-cookie-service": "18.0.0",
+    "ngx-infinite-scroll": "18.0.0",
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
-    "tslib": "2.6.2",
-    "zone.js": "0.14.6"
+    "tslib": "2.7.0",
+    "zone.js": "0.14.10"
   },
   "devDependencies": {
-    "@angular-architects/module-federation": "17.0.8",
-    "@angular-architects/module-federation-runtime": "17.0.8",
-    "@angular-builders/custom-webpack": "17.0.2",
-    "@angular-builders/jest": "17.0.3",
-    "@angular-eslint/eslint-plugin": "17.5.2",
-    "@angular/cli": "17.3.7",
+    "@angular-architects/module-federation": "18.0.4",
+    "@angular-architects/module-federation-runtime": "18.0.4",
+    "@angular-builders/custom-webpack": "18.0.0",
+    "@angular-builders/jest": "18.0.0",
+    "@angular/cli": "18.2.1",
     "@types/jest": "29.5.12",
     "@types/node": "20.11.25",
     "@types/sockjs-client": "1.5.4",
-    "@typescript-eslint/eslint-plugin": "7.11.0",
+    "angular-eslint": "18.3.0",
     "browser-sync": "3.0.2",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
     "copy-webpack-plugin": "12.0.2",
-    "eslint": "8.57.0",
+    "eslint": "9.9.1",
     "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-prettier": "5.2.1",
     "eslint-webpack-plugin": "4.2.0",
     "folder-hash": "4.0.4",
+    "globals": "15.9.0",
     "jest": "29.7.0",
     "jest-date-mock": "1.0.10",
     "jest-junit": "16.0.0",
-    "jest-preset-angular": "14.1.0",
+    "jest-preset-angular": "14.2.2",
     "jest-sonar": "0.2.16",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "postcss-rtlcss": "5.3.0",
-    "rimraf": "5.0.7",
-    "ts-jest": "29.1.4",
+    "postcss-rtlcss": "5.3.1",
+    "rimraf": "5.0.8",
+    "ts-jest": "29.2.5",
     "typescript": "5.4.5",
-    "webpack": "5.91.0",
+    "typescript-eslint": "8.2.0",
+    "webpack": "5.94.0",
     "webpack-bundle-analyzer": "4.10.2",
-    "webpack-merge": "5.10.0",
+    "webpack-merge": "6.0.1",
     "webpack-notifier": "1.15.0"
   }
 }

package/dist/generators/angular/support/path-utils.js

@@ -24,7 +24,6 @@
  * @param {string[]} prefix
  * @return {string}
  */
-// eslint-disable-next-line import/prefer-default-export
 export const buildAngularFormPath = (reference, prefix = []) => {
     const formPath = [...prefix, ...reference.path].join("', '");
     return `'${formPath}'`;

package/dist/generators/angular/templates/eslint.config.js.jhi.angular.ejs

@@ -0,0 +1,141 @@
+<%#
+ 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.
+-%>
+<&_ if (fragment.importsSection) { -&>
+import eslint from '@eslint/js';
+// For a detailed explanation, visit: https://github.com/angular-eslint/angular-eslint/blob/main/docs/CONFIGURING_FLAT_CONFIG.md
+import angular from 'angular-eslint';
+<&_ } -&>
+<&_ if (fragment.configSection) { -&>
+  { ignores: ['<%- this.relativeDir(clientRootDir, clientDistDir) %>', '<%- temporaryDir %>'] },
+  eslint.configs.recommended,
+  {
+    files: ['**/*.{js,cjs,mjs}'],
+    rules: {
+      'no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+    },
+  },
+  {
+    files: ['<%- this.relativeDir(clientRootDir, clientSrcDir) %>**/*.ts'],
+    extends: [...tseslint.configs.strictTypeChecked, ...tseslint.configs.stylistic, ...angular.configs.tsRecommended],
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+      },
+      parserOptions: {
+        project: ['./tsconfig.app.json', './tsconfig.spec.json'],
+      },
+    },
+    processor: {
+      // https://github.com/angular-eslint/angular-eslint/issues/1917
+      meta:{
+        name:'extract-inline-html',
+      },
+      ...angular.processInlineTemplates,
+    },
+    rules: {
+      '@angular-eslint/component-selector': [
+        'error',
+        {
+          type: 'element',
+          prefix: '<%= jhiPrefixDashed %>',
+          style: 'kebab-case',
+        },
+      ],
+      '@angular-eslint/directive-selector': [
+        'error',
+        {
+          type: 'attribute',
+          prefix: '<%= jhiPrefix %>',
+          style: 'camelCase',
+        },
+      ],
+      '@angular-eslint/relative-url-prefix': 'error',
+      '@typescript-eslint/consistent-type-definitions': 'off',
+      '@typescript-eslint/explicit-function-return-type': ['error', { allowExpressions: true }],
+      '@typescript-eslint/explicit-module-boundary-types': 'off',
+      '@typescript-eslint/member-ordering': [
+        'error',
+        {
+          default: [
+            'public-static-field',
+            'protected-static-field',
+            'private-static-field',
+            'public-instance-field',
+            'protected-instance-field',
+            'private-instance-field',
+            'constructor',
+            'public-static-method',
+            'protected-static-method',
+            'private-static-method',
+            'public-instance-method',
+            'protected-instance-method',
+            'private-instance-method',
+          ],
+        },
+      ],
+      '@typescript-eslint/no-confusing-void-expression': 'off',
+      '@typescript-eslint/no-empty-object-type': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-extraneous-class': 'off',
+      '@typescript-eslint/no-floating-promises': 'off',
+      '@typescript-eslint/no-non-null-assertion': 'off',
+      '@typescript-eslint/no-shadow': ['error'],
+      '@typescript-eslint/no-unnecessary-condition': 'error',
+      '@typescript-eslint/no-unsafe-argument': 'off',
+      '@typescript-eslint/no-unsafe-assignment': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+      '@typescript-eslint/no-unused-vars': 'off',
+      '@typescript-eslint/prefer-nullish-coalescing': 'error',
+      '@typescript-eslint/prefer-optional-chain': 'error',
+      '@typescript-eslint/restrict-template-expressions': ['error', { allowNumber: true }],
+      '@typescript-eslint/unbound-method': 'off',
+      'arrow-body-style': 'error',
+      curly: 'error',
+      eqeqeq: ['error', 'always', { null: 'ignore' }],
+      'guard-for-in': 'error',
+      'no-bitwise': 'error',
+      'no-caller': 'error',
+      'no-console': ['error', { allow: ['warn', 'error'] }],
+      'no-eval': 'error',
+      'no-labels': 'error',
+      'no-new': 'error',
+      'no-new-wrappers': 'error',
+      'object-shorthand': ['error', 'always', { avoidExplicitReturnArrows: true }],
+      radix: 'error',
+      'spaced-comment': ['warn', 'always'],
+    },
+  },
+  {
+    files: ['<%- this.relativeDir(clientRootDir, clientSrcDir) %>**/*.spec.ts'],
+    rules: {
+      '@typescript-eslint/no-empty-function': 'off',
+    },
+  },
+  {
+    files: ['**/*.html'],
+    extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility],
+    rules: {},
+  },
+  {
+    // Html templates requires some work
+    ignores: ['**/*.html'],
+    extends: [prettier],
+  },
+<&_ } -&>

package/dist/generators/angular/templates/jest.conf.js.ejs

@@ -16,9 +16,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-const { pathsToModuleNameMapper } = require('ts-jest')
+const { pathsToModuleNameMapper } = require('ts-jest');
 
-const { compilerOptions: { paths = {}, baseUrl = './' } } = require('./tsconfig.json');
+const {
+  compilerOptions: { paths = {}, baseUrl = './' },
+} = require('./tsconfig.json');
 const environment = require('./webpack/environment');
 
 module.exports = {

package/dist/generators/angular/templates/package.json.ejs

@@ -77,18 +77,18 @@
     "@angular-builders/custom-webpack": "<%= nodeDependencies['@angular-builders/custom-webpack'] %>",
     "@angular-builders/jest": "<%= nodeDependencies['@angular-builders/jest'] %>",
     "@angular-devkit/build-angular": "<%= nodeDependencies['@angular/cli'] %>",
-    "@angular-eslint/eslint-plugin": "<%= nodeDependencies['@angular-eslint/eslint-plugin'] %>",
     "@types/jest": "<%= nodeDependencies['@types/jest'] %>",
     "@types/node": "<%= nodeDependencies['@types/node'] %>",
-    "@typescript-eslint/eslint-plugin": "<%= nodeDependencies['@typescript-eslint/eslint-plugin'] %>",
-    "@typescript-eslint/parser": "<%= nodeDependencies['@typescript-eslint/eslint-plugin'] %>",
+    "angular-eslint": "<%= nodeDependencies['angular-eslint'] %>",
     "browser-sync": "<%= nodeDependencies['browser-sync'] %>",
     "browser-sync-webpack-plugin": "<%= nodeDependencies['browser-sync-webpack-plugin'] %>",
     "buffer": "<%= nodeDependencies['buffer'] %>",
     "copy-webpack-plugin": "<%= nodeDependencies['copy-webpack-plugin'] %>",
     "eslint": "<%= nodeDependencies['eslint'] %>",
     "eslint-config-prettier": "<%= nodeDependencies['eslint-config-prettier'] %>",
+    "eslint-plugin-prettier": "<%= nodeDependencies['eslint-plugin-prettier'] %>",
     "eslint-webpack-plugin": "<%= nodeDependencies['eslint-webpack-plugin'] %>",
+    "globals": "<%= nodeDependencies.globals %>",
     "jest": "<%= nodeDependencies['jest'] %>",
     "jest-environment-jsdom": "<%= nodeDependencies['jest'] %>",
     "jest-preset-angular": "<%= nodeDependencies['jest-preset-angular'] %>",
@@ -102,6 +102,7 @@
     "swagger-ui-dist": "<%= nodeDependencies['swagger-ui-dist'] %>",
     "ts-jest": "<%= nodeDependencies['ts-jest'] %>",
     "typescript": "<%= nodeDependencies['typescript'] %>",
+    "typescript-eslint": "<%= nodeDependencies['typescript-eslint'] %>",
     "webpack-bundle-analyzer": "<%= nodeDependencies['webpack-bundle-analyzer'] %>",
     "webpack-merge": "<%= nodeDependencies['webpack-merge'] %>",
     "webpack-notifier": "<%= nodeDependencies['webpack-notifier'] %>"
@@ -119,7 +120,7 @@
   "scripts": {
     "prettier:check": "prettier --check \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
     "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
-    "lint": "eslint . --ext .js,.ts",
+    "lint": "eslint .",
     "lint:fix": "<%= clientPackageManager %> run lint -- --fix",
     "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>",
     "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>",

package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs

@@ -20,15 +20,15 @@
   <div class="d-flex justify-content-center">
     <div class="col-md-8">
       <h1>__jhiTranslateTag__('activate.title')</h1>
-    @if (success()) {
-      <div class="alert alert-success">
-        <span>__jhiTranslateTag__('activate.messages.success')</span>
-        <a class="alert-link" routerLink="/login">__jhiTranslateTag__('global.messages.info.authenticated.link')</a>.
-      </div>
-    }
-    @if (error()) {
-      <div class="alert alert-danger">__jhiTranslateTag__('activate.messages.error')</div>
-    }
+      @if (success()) {
+        <div class="alert alert-success">
+          <span>__jhiTranslateTag__('activate.messages.success')</span>
+          <a class="alert-link" routerLink="/login">__jhiTranslateTag__('global.messages.info.authenticated.link')</a>.
+        </div>
+      }
+      @if (error()) {
+        <div class="alert alert-danger">__jhiTranslateTag__('activate.messages.error')</div>
+      }
     </div>
   </div>
 </div>