generator-jhipster 8.2.1 → 8.4.0

package/dist/cli/environment-builder.mjs

@@ -21,7 +21,7 @@ import { existsSync, readFileSync } from 'fs';
 import path, { dirname, resolve } from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { cloneDeep, mergeWith } from 'lodash-es';
 import Environment from 'yeoman-environment';
 import { QueuedAdapter } from '@yeoman/adapter';
 import { CLI_NAME, logger } from './utils.mjs';
@@ -366,7 +366,7 @@ export default class EnvironmentBuilder {
                 const blueprintCommandsUrl = pathToFileURL(resolve(`${blueprintCommandFile}${blueprintCommandExtension}`));
                 try {
                     blueprintCommand = (await import(blueprintCommandsUrl)).default;
-                    const blueprintCommands = _.cloneDeep(blueprintCommand);
+                    const blueprintCommands = cloneDeep(blueprintCommand);
                     Object.entries(blueprintCommands).forEach(([_command, commandSpec]) => {
                         commandSpec.blueprint = commandSpec.blueprint || blueprint;
                     });
@@ -437,7 +437,7 @@ export default class EnvironmentBuilder {
         for (const [blueprint, packagePath] of blueprintPackagePaths) {
             const errorMsg = `No custom sharedOptions found within blueprint: ${blueprint} at ${packagePath}`;
             const opts = await loadSharedOptionsFromFile(`${packagePath}/cli/sharedOptions`, undefined, errorMsg);
-            result = _.mergeWith(result, opts, joiner);
+            result = mergeWith(result, opts, joiner);
         }
         return result;
     }

package/dist/cli/jhipster-command.mjs

@@ -18,9 +18,8 @@
  */
 import chalk from 'chalk';
 import { Command, Option } from 'commander';
-import lodash from 'lodash';
+import { kebabCase } from 'lodash-es';
 import { convertConfigToOption } from '../lib/internal/index.js';
-const { kebabCase } = lodash;
 export default class JHipsterCommand extends Command {
     createCommand(name) {
         return new JHipsterCommand(name);

package/dist/generators/angular/command.js

@@ -0,0 +1,5 @@
+const command = {
+    options: {},
+    import: [],
+};
+export default command;

package/dist/generators/angular/generator.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 { camelCase } from 'lodash-es';
 import chalk from 'chalk';
 import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.js';
@@ -34,7 +34,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
     localEntities;
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_ANGULAR);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
             await this.dependsOnJHipster(GENERATOR_CLIENT);
@@ -49,7 +49,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
-        return this.asLoadingTaskGroup(this.delegateTasksToBlueprint(() => this.loading));
+        return this.delegateTasksToBlueprint(() => this.loading);
     }
     get preparing() {
         return this.asPreparingTaskGroup({
@@ -94,7 +94,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.PREPARING]() {
-        return this.asPreparingTaskGroup(this.delegateTasksToBlueprint(() => this.preparing));
+        return this.delegateTasksToBlueprint(() => this.preparing);
     }
     get preparingEachEntity() {
         return this.asPreparingEachEntityTaskGroup({
@@ -113,6 +113,40 @@ export default class AngularGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING_EACH_ENTITY]() {
         return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
     }
+    get preparingEachEntityField() {
+        return this.asPreparingEachEntityFieldTaskGroup({
+            prepareField({ field }) {
+                mutateData(field, {
+                    fieldTsDefaultValue: ({ fieldTsDefaultValue, defaultValue, fieldTypeCharSequence, fieldTypeTimed }) => {
+                        let returnValue;
+                        if (fieldTsDefaultValue !== undefined || defaultValue !== undefined) {
+                            let fieldDefaultValue;
+                            if (fieldTsDefaultValue !== undefined) {
+                                fieldDefaultValue = fieldTsDefaultValue;
+                            }
+                            else {
+                                fieldDefaultValue = defaultValue;
+                            }
+                            fieldDefaultValue = String(fieldDefaultValue).replace(/'/g, "\\'");
+                            if (fieldTypeCharSequence) {
+                                returnValue = `'${fieldDefaultValue}'`;
+                            }
+                            else if (fieldTypeTimed) {
+                                returnValue = `dayjs('${fieldDefaultValue}')`;
+                            }
+                            else {
+                                returnValue = fieldDefaultValue;
+                            }
+                        }
+                        return returnValue;
+                    },
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING_EACH_ENTITY_FIELD]() {
+        return this.delegateTasksToBlueprint(() => this.preparingEachEntityField);
+    }
     get default() {
         return this.asDefaultTaskGroup({
             loadEntities() {
@@ -120,16 +154,17 @@ export default class AngularGenerator extends BaseApplicationGenerator {
                 this.localEntities = entities.filter(entity => !entity.builtIn && !entity.skipClient);
             },
             queueTranslateTransform({ control, application }) {
+                const { enableTranslation, jhiPrefix } = application;
                 this.queueTransformStream({
                     name: 'translating angular application',
                     filter: file => isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && isTranslatedAngularFile(file),
                     refresh: false,
-                }, translateAngularFilesTransform(control.getWebappTranslation, application.enableTranslation));
+                }, translateAngularFilesTransform(control.getWebappTranslation, { enableTranslation, jhiPrefix }));
             },
         });
     }
     get [BaseApplicationGenerator.DEFAULT]() {
-        return this.asDefaultTaskGroup(this.delegateTasksToBlueprint(() => this.default));
+        return this.delegateTasksToBlueprint(() => this.default);
     }
     get writing() {
         return this.asWritingTaskGroup({
@@ -149,6 +184,32 @@ export default class AngularGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.WRITING_ENTITIES]() {
         return this.delegateTasksToBlueprint(() => this.writingEntities);
     }
+    get postWriting() {
+        return this.asPostWritingTaskGroup({
+            addWebsocketDependencies({ application }) {
+                const { authenticationTypeSession, communicationSpringWebsocket, nodeDependencies } = application;
+                const dependencies = {};
+                if (communicationSpringWebsocket) {
+                    if (authenticationTypeSession) {
+                        dependencies['ngx-cookie-service'] = nodeDependencies['ngx-cookie-service'];
+                    }
+                    this.packageJson.merge({
+                        dependencies: {
+                            'sockjs-client': nodeDependencies['sockjs-client'],
+                            '@stomp/rx-stomp': nodeDependencies['@stomp/rx-stomp'],
+                            ...dependencies,
+                        },
+                        devDependencies: {
+                            '@types/sockjs-client': nodeDependencies['@types/sockjs-client'],
+                        },
+                    });
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.postWriting);
+    }
     get postWritingEntities() {
         return this.asPostWritingEntitiesTaskGroup({
             postWriteEntitiesFiles,
@@ -168,7 +229,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.END]() {
-        return this.asEndTaskGroup(this.delegateTasksToBlueprint(() => this.end));
+        return this.delegateTasksToBlueprint(() => this.end);
     }
     /**
      * @private
@@ -239,7 +300,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
      * @param {boolean} enableTranslation - If translations are enabled or not
      * @param {string} translationKeyMenu - i18n key for entry in the admin menu
      */
-    addElementToAdminMenu(routerName, iconName, enableTranslation, translationKeyMenu = _.camelCase(routerName), jhiPrefix) {
+    addElementToAdminMenu(routerName, iconName, enableTranslation, translationKeyMenu = camelCase(routerName), jhiPrefix) {
         this.needleApi.clientAngular.addElementToAdminMenu(routerName, iconName, enableTranslation, translationKeyMenu, jhiPrefix);
     }
     addEntitiesToMenu({ application, entities }) {
@@ -344,7 +405,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
      * @param {string} clientFramework - The name of the client framework
      * @param {string} translationKeyMenu - i18n key for entry in the menu
      */
-    addElementToMenu(routerName, iconName, enableTranslation, clientFramework, translationKeyMenu = _.camelCase(routerName)) {
+    addElementToMenu(routerName, iconName, enableTranslation, clientFramework, translationKeyMenu = camelCase(routerName)) {
         this.needleApi.clientAngular.addElementToMenu(routerName, iconName, enableTranslation, translationKeyMenu);
     }
 }

package/dist/generators/angular/index.js

@@ -17,3 +17,4 @@
  * limitations under the License.
  */
 export { default } from './generator.js';
+export { default as command } from './command.js';

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

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { startCase } from 'lodash-es';
 import needleClientBase from '../../client/needle-api/needle-client.js';
 import { LINE_LENGTH } from '../../generator-constants.js';
 import { stripMargin, upperFirstCamelCase } from '../../base/support/index.js';
@@ -82,7 +82,7 @@ export default class extends needleClientBase {
         const entityEntry = `<li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
                                 <a class="nav-link" ${routerLink} (click)="collapseNavbar()">
                                     <fa-icon icon="${iconName}" [fixedWidth]="true"></fa-icon>
-                                    <span${enableTranslation ? ` ${jhiPrefix}Translate="global.menu.${translationKeyMenu}"` : ''}>${_.startCase(routerName)}</span>
+                                    <span${enableTranslation ? ` ${jhiPrefix}Translate="global.menu.${translationKeyMenu}"` : ''}>${startCase(routerName)}</span>
                                 </a>
                             </li>`;
         const rewriteFileModel = this.generateFileModel(entityMenuPath, 'jhipster-needle-add-element-to-menu', entityEntry);
@@ -98,7 +98,7 @@ export default class extends needleClientBase {
         const entityEntry = `<li>
                         <a class="dropdown-item" ${routerLink} routerLinkActive="active" (click)="collapseNavbar()">
                             <fa-icon icon="${iconName}" [fixedWidth]="true"></fa-icon>
-                            <span${enableTranslation ? ` ${jhiPrefix}Translate="global.menu.admin.${translationKeyMenu}"` : ''}>${_.startCase(routerName)}</span>
+                            <span${enableTranslation ? ` ${jhiPrefix}Translate="global.menu.admin.${translationKeyMenu}"` : ''}>${startCase(routerName)}</span>
                         </a>
                     </li>`;
         const rewriteFileModel = this.generateFileModel(navbarAdminPath, 'jhipster-needle-add-element-to-admin-menu', entityEntry);

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

@@ -1,31 +1,34 @@
 {
   "dependencies": {
-    "@angular/common": "17.3.0",
+    "@angular/common": "17.3.6",
     "@fortawesome/angular-fontawesome": "0.14.1",
-    "@fortawesome/fontawesome-svg-core": "6.5.1",
-    "@fortawesome/free-solid-svg-icons": "6.5.1",
+    "@fortawesome/fontawesome-svg-core": "6.5.2",
+    "@fortawesome/free-solid-svg-icons": "6.5.2",
     "@ng-bootstrap/ng-bootstrap": "16.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",
     "rxjs": "7.8.1",
+    "sockjs-client": "1.6.1",
     "tslib": "2.6.2",
     "zone.js": "0.14.4"
   },
   "devDependencies": {
     "@angular-architects/module-federation": "17.0.8",
     "@angular-architects/module-federation-runtime": "17.0.8",
-    "@angular-builders/custom-webpack": "17.0.1",
-    "@angular-builders/jest": "17.0.2",
+    "@angular-builders/custom-webpack": "17.0.2",
+    "@angular-builders/jest": "17.0.3",
     "@angular-eslint/eslint-plugin": "17.3.0",
-    "@angular/cli": "17.3.0",
+    "@angular/cli": "17.3.6",
     "@types/jest": "29.5.12",
     "@types/node": "20.11.25",
-    "@typescript-eslint/eslint-plugin": "7.3.1",
+    "@types/sockjs-client": "1.5.4",
+    "@typescript-eslint/eslint-plugin": "7.7.1",
     "browser-sync": "3.0.2",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
@@ -35,17 +38,17 @@
     "eslint-webpack-plugin": "4.1.0",
     "folder-hash": "4.0.4",
     "jest": "29.7.0",
-    "jest-date-mock": "1.0.8",
+    "jest-date-mock": "1.0.10",
     "jest-junit": "16.0.0",
     "jest-preset-angular": "14.0.3",
     "jest-sonar": "0.2.16",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "postcss-rtlcss": "5.1.0",
+    "postcss-rtlcss": "5.1.2",
     "rimraf": "5.0.5",
     "ts-jest": "29.1.2",
-    "typescript": "5.4.2",
-    "webpack": "5.90.3",
-    "webpack-bundle-analyzer": "4.10.1",
+    "typescript": "5.4.5",
+    "webpack": "5.91.0",
+    "webpack-bundle-analyzer": "4.10.2",
     "webpack-merge": "5.10.0",
     "webpack-notifier": "1.15.0"
   }

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

@@ -20,5 +20,4 @@ export * from './needles.js';
 export * from './path-utils.js';
 export * from './reserved-keywords.js';
 export * from './translate-angular.js';
-export { default as translateAngularFilesTransform } from './translate-angular.js';
 export { default as updateLanguagesTask } from './update-languages.js';

package/dist/generators/angular/support/translate-angular.js

@@ -16,9 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { extname } from 'node:path';
 import { passthrough } from '@yeoman/transform';
 import { Minimatch } from 'minimatch';
-import { createJhiTransformTranslateReplacer, createJhiTransformTranslateStringifyReplacer } from '../../languages/support/index.js';
+import { createJhiTransformTranslateReplacer, createJhiTransformTranslateStringifyReplacer, createJhiTranslateReplacer, escapeHtmlTranslationValue, escapeTsTranslationValue, } from '../../languages/support/index.js';
 const PLACEHOLDER_REGEX = /(?:placeholder|title)=['|"](\{\{\s?['|"]([a-zA-Z0-9.\-_]+)['|"]\s?\|\s?translate\s?\}\})['|"]/.source;
 const JHI_TRANSLATE_REGEX = /(\n?\s*[a-z][a-zA-Z]*Translate="[a-zA-Z0-9 +{}'_!?.]+")/.source;
 const TRANSLATE_VALUES_REGEX = /(\n?\s*\[translateValues\]="\{(?:(?!\}").)*?\}")/.source;
@@ -35,9 +36,10 @@ function getTranslationValue(getWebappTranslation, key, data) {
  * @param {object} [options]
  * @param {number} [options.keyIndex]
  * @param {number} [options.replacementIndex]
+ * @param {any} [options.escape]
  * @returns {string}
  */
-function replaceTranslationKeysWithText(getWebappTranslation, content, regexSource, { keyIndex = 1, replacementIndex = 1, escape } = {}) {
+function replaceTranslationKeysWithText(getWebappTranslation, content, regexSource, { keyIndex = 1, replacementIndex = 1, escape, } = {}) {
     const regex = new RegExp(regexSource, 'g');
     const allMatches = content.matchAll(regex);
     for (const match of allMatches) {
@@ -87,15 +89,145 @@ function replacePlaceholders(getWebappTranslation, content) {
 function replaceErrorMessage(getWebappTranslation, content) {
     return replaceJSTranslation(getWebappTranslation, content, 'errorMessage');
 }
+/**
+ * Creates a `jhiTranslate` attribute with optional translateValues.
+ * Or the translation value if translation is disabled.
+ */
+const tagTranslation = (getWebappTranslation, { enableTranslation, jhiPrefix }, { key, parsedInterpolate, prefix, suffix }) => {
+    const translatedValueInterpolate = parsedInterpolate
+        ? Object.fromEntries(Object.entries(parsedInterpolate).map(([key, value]) => [key, `{{ ${value} }}`]))
+        : undefined;
+    const translatedValue = escapeHtmlTranslationValue(getTranslationValue(getWebappTranslation, key, translatedValueInterpolate));
+    if (enableTranslation) {
+        const translateValuesAttr = parsedInterpolate
+            ? ` [translateValues]="{ ${Object.entries(parsedInterpolate)
+                .map(([key, value]) => `${key}: ${value}`)
+                .join(', ')} }"`
+            : '';
+        return ` ${jhiPrefix}Translate="${key}"${translateValuesAttr}${prefix}${translatedValue}${suffix}`;
+    }
+    return `${prefix}${translatedValue}${suffix}`;
+};
+/**
+ * Creates a `jhiTranslate` attribute with translateValues.
+ * Or the translation value if translation is disabled.
+ */
+const validationTagTranslation = (getWebappTranslation, { enableTranslation, jhiPrefix }, { key, parsedInterpolate, prefix, suffix }) => {
+    if (!parsedInterpolate || Object.keys(parsedInterpolate).length === 0) {
+        throw new Error(`No interpolation values found for translation key ${key}, use __jhiTranslateTag__ instead.`);
+    }
+    const translatedValue = escapeHtmlTranslationValue(getTranslationValue(getWebappTranslation, key, parsedInterpolate));
+    if (enableTranslation) {
+        const translateValuesAttr = parsedInterpolate
+            ? ` [translateValues]="{ ${Object.entries(parsedInterpolate)
+                .map(([key, value]) => `${key}: '${value}'`)
+                .join(', ')} }"`
+            : '';
+        return ` ${jhiPrefix}Translate="${key}"${translateValuesAttr}${prefix}${translatedValue}${suffix}`;
+    }
+    return `${prefix}${translatedValue}${suffix}`;
+};
+/**
+ * Creates a `jhiTranslate` attribute with optional translateValues.
+ * Or the translation value if translation is disabled.
+ */
+const tagPipeTranslation = (getWebappTranslation, { enableTranslation, jhiPrefix }, { key, parsedInterpolate, prefix, suffix }) => {
+    if (!parsedInterpolate || Object.keys(parsedInterpolate).length === 0) {
+        throw new Error(`No interpolation values found for translation key ${key}, use __jhiTranslateTag__ instead.`);
+    }
+    const translatedValueInterpolate = Object.fromEntries(Object.entries(parsedInterpolate).map(([key, value]) => [key, getWebappTranslation(value)]));
+    const translatedValue = escapeHtmlTranslationValue(getTranslationValue(getWebappTranslation, key, translatedValueInterpolate));
+    if (enableTranslation) {
+        const translateValuesAttr = ` [translateValues]="{ ${Object.entries(parsedInterpolate)
+            .map(([key, value]) => `${key}: ('${value}' | translate)`)
+            .join(', ')} }"`;
+        return ` ${jhiPrefix}Translate="${key}"${translateValuesAttr}${prefix}${translatedValue}${suffix}`;
+    }
+    return `${prefix}${translatedValue}${suffix}`;
+};
+/**
+ * Creates a `jhiTranslate` attribute with optional translateValues.
+ * Or the translation value if translation is disabled.
+ */
+const tagEnumTranslation = (getWebappTranslation, { enableTranslation, jhiPrefix }, { key, parsedInterpolate, prefix, suffix }) => {
+    if (!parsedInterpolate?.value) {
+        throw new Error(`Value is required for TagEnum ${key}.`);
+    }
+    const { value, fallback } = parsedInterpolate;
+    const translatedValue = `{{ ${JSON.stringify(getTranslationValue(getWebappTranslation, key))}[${value}]${fallback ? ` || ${fallback}` : ''} }}`;
+    if (enableTranslation) {
+        return ` [${jhiPrefix}Translate]="'${key}.' + (${parsedInterpolate?.value})"${prefix}${translatedValue}${suffix}`;
+    }
+    return `${prefix}${translatedValue}${suffix}`;
+};
+/**
+ * Creates a `translate` pipe.
+ * Or the translation value if translation is disabled.
+ */
+const pipeTranslation = (getWebappTranslation, { enableTranslation }, { key, prefix, suffix }) => {
+    if (enableTranslation) {
+        return `${prefix}{{ '${key}' | translate }}${suffix}`;
+    }
+    return `${prefix}${escapeHtmlTranslationValue(getTranslationValue(getWebappTranslation, key))}${suffix}`;
+};
+/**
+ * Get translation value.
+ */
+const valueTranslation = (getWebappTranslation, _replacerOptions, { filePath, key, prefix, suffix }) => {
+    let translationValue = getTranslationValue(getWebappTranslation, key);
+    const fileExtension = extname(filePath);
+    if (fileExtension === '.html') {
+        translationValue = escapeHtmlTranslationValue(translationValue);
+    }
+    else if (fileExtension === '.ts') {
+        translationValue = escapeTsTranslationValue(translationValue);
+    }
+    return `${prefix}${translationValue}${suffix}`;
+};
+/**
+ * Creates a `translate` pipe.
+ * Or the translation value if translation is disabled.
+ */
+const pipeEnumTranslation = (getWebappTranslation, { enableTranslation }, { key, parsedInterpolate, prefix, suffix }) => {
+    if (!parsedInterpolate?.value) {
+        throw new Error(`Value is required for TagEnum ${key}.`);
+    }
+    const { value, fallback } = parsedInterpolate;
+    if (enableTranslation) {
+        return `${prefix}{{ '${key}.' + ${value} | translate }}${suffix}`;
+    }
+    const translatedValue = `{{ ${JSON.stringify(getTranslationValue(getWebappTranslation, key))}[${value}]${fallback ? ` ?? ${fallback}` : ''} }}`;
+    return `${prefix}${translatedValue}${suffix}`;
+};
+const replaceImplementations = {
+    Tag: tagTranslation,
+    TagPipe: tagPipeTranslation,
+    TagEnum: tagEnumTranslation,
+    ValidationTag: validationTagTranslation,
+    Pipe: pipeTranslation,
+    PipeEnum: pipeEnumTranslation,
+    Value: valueTranslation,
+};
 /**
  * Replace and cleanup translations.
  *
  * @type {import('../generator-base.js').EditFileCallback}
  * @this {import('../generator-base.js')}
  */
-export const createTranslationReplacer = (getWebappTranslation, enableTranslation) => {
+export const createTranslationReplacer = (getWebappTranslation, opts) => {
     const htmlJhiTranslateReplacer = createJhiTransformTranslateReplacer(getWebappTranslation, { escapeHtml: true });
-    const htmlJhiTranslateStringifyReplacer = createJhiTransformTranslateStringifyReplacer(getWebappTranslation, { escapeHtml: true });
+    const htmlJhiTranslateStringifyReplacer = createJhiTransformTranslateStringifyReplacer(getWebappTranslation);
+    let translationReplacer;
+    const enableTranslation = typeof opts === 'boolean' ? opts : opts.enableTranslation;
+    if (typeof opts !== 'boolean') {
+        translationReplacer = createJhiTranslateReplacer(optsReplacer => {
+            const replacer = replaceImplementations[optsReplacer.type] ??
+                (() => {
+                    throw new Error(`Translation type not supported ${optsReplacer.type}`);
+                });
+            return replacer(getWebappTranslation, opts, optsReplacer);
+        }, { prefixPattern: '>\\s*', suffixPattern: '\\s*<' });
+    }
     return function replaceAngularTranslations(content, filePath) {
         if (/\.html$/.test(filePath)) {
             if (!enableTranslation) {
@@ -108,6 +240,9 @@ export const createTranslationReplacer = (getWebappTranslation, enableTranslatio
             content = htmlJhiTranslateReplacer(content);
             content = htmlJhiTranslateStringifyReplacer(content);
         }
+        if (/(:?\.html|.ts)$/.test(filePath)) {
+            content = translationReplacer?.(content, filePath);
+        }
         if (!enableTranslation) {
             if (/(:?route|module)\.ts$/.test(filePath)) {
                 content = replacePageTitles(getWebappTranslation, content);
@@ -119,12 +254,11 @@ export const createTranslationReplacer = (getWebappTranslation, enableTranslatio
         return content;
     };
 };
-const minimatch = new Minimatch('**/*{.html,.component.ts,.route.ts,.module.ts}');
+const minimatch = new Minimatch('**/*{.html,.ts}');
 export const isTranslatedAngularFile = file => minimatch.match(file.path);
-const translateAngularFilesTransform = (getWebappTranslation, enableTranslation) => {
-    const translate = createTranslationReplacer(getWebappTranslation, enableTranslation);
+export const translateAngularFilesTransform = (getWebappTranslation, opts) => {
+    const translate = createTranslationReplacer(getWebappTranslation, opts);
     return passthrough(file => {
         file.contents = Buffer.from(translate(file.contents.toString(), file.path));
     });
 };
-export default translateAngularFilesTransform;

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

@@ -48,16 +48,9 @@
     "bootswatch": "<%= nodeDependencies.bootswatch %>",
     <%_ } _%>
     "dayjs": "<%= nodeDependencies['dayjs'] %>",
-    <%_ if (authenticationTypeSession && communicationSpringWebsocket) { _%>
-    "ngx-cookie-service": "<%= nodeDependencies['ngx-cookie-service'] %>",
-    <%_ } _%>
     "ngx-infinite-scroll": "<%= nodeDependencies['ngx-infinite-scroll'] %>",
     "@popperjs/core": "<%= nodeDependencies['@popperjs/core'] %>",
     "rxjs": "<%= nodeDependencies['rxjs'] %>",
-<%_ if (communicationSpringWebsocket) { _%>
-    "sockjs-client": "1.6.1",
-    "@stomp/rx-stomp": "1.2.0",
-<%_ } _%>
     "tslib": "<%= nodeDependencies['tslib'] %>",
     "zone.js": "<%= nodeDependencies['zone.js'] %>"
   },
@@ -71,9 +64,6 @@
   <%_ } _%>
     "@angular-architects/module-federation": "<%= nodeDependencies['@angular-architects/module-federation'] %>",
 <%_ } _%>
-<%_ if (communicationSpringWebsocket) { _%>
-    "@types/sockjs-client": "1.5.1",
-<%_ } _%>
 <%_ if (cypressTests) { _%>
     "cypress": "<%= nodeDependencies['cypress'] %>",
 <%_ } _%>

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

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

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

@@ -24,8 +24,8 @@ import SharedModule from 'app/shared/shared.module';
 import { ActivateService } from './activate.service';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-activate',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-activate',
   imports: [SharedModule, RouterModule],
   templateUrl: './activate.component.html',
 })

package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <div id="strength">
-  <small<% if (enableTranslation) { %> <%= jhiPrefix %>Translate="global.messages.validate.newpassword.strength"<% } %>>__jhiTransformTranslate__('global.messages.validate.newpassword.strength')</small>
+  <small>__jhiTranslateTag__('global.messages.validate.newpassword.strength')</small>
   <ul id="strengthBar">
     <li class="point"></li>
     <li class="point"></li>

package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs

@@ -21,8 +21,8 @@ import { Component, ElementRef, inject, Input, Renderer2 } from '@angular/core';
 import SharedModule from 'app/shared/shared.module';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-password-strength-bar',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-password-strength-bar',
   imports: [SharedModule],
   templateUrl: './password-strength-bar.component.html',
   styleUrl: './password-strength-bar.component.scss',