generator-jhipster 9.0.0 → 9.2.0

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

@@ -21,7 +21,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "<%= dasherizedBaseName %>": {
+    "<%- dasherizedBaseName %>": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -32,8 +32,8 @@
         }
       },
       "root": "",
-      "sourceRoot": "<%= this.relativeDir(clientRootDir, clientSrcDir).replace(/\/$/, "") %>",
-      "prefix": "<%= jhiPrefixDashed %>",
+      "sourceRoot": "<%- this.relativeDir(clientRootDir, clientSrcDir).replace(/\/$/, '') %>",
+      "prefix": "<%- jhiPrefixDashed %>",
       "architect": {
         "build": {
           "builder": "@angular-builders/custom-esbuild:application",
@@ -45,41 +45,31 @@
               "build-plugins/define-esbuild.ts"
             ],
             "outputPath": {
-              "base": "<%= this.relativeDir(clientRootDir, clientDistDir) %>",
+              "base": "<%- this.relativeDir(clientRootDir, clientDistDir) %>",
               "browser": "",
               "server": "node-server",
               "media": "resources"
             },
-            "index": "<%= this.relativeDir(clientRootDir, clientSrcDir) %>index.html",
-            "browser": "<%= this.relativeDir(clientRootDir, clientSrcDir) %>main.ts",
+            "index": "<%- this.relativeDir(clientRootDir, clientSrcDir) %>index.html",
+            "browser": "<%- this.relativeDir(clientRootDir, clientSrcDir) %>main.ts",
             "polyfills": [
 <%_ if (communicationSpringWebsocket) { _%>
-              "./<%= this.relativeDir(clientRootDir, clientSrcDir) %>sockjs-client.polyfill",
+              "./<%- this.relativeDir(clientRootDir, clientSrcDir) %>sockjs-client.polyfill",
 <%_ } _%>
               "@angular/localize/init"
             ],
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
-              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>content",
-              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>favicon.ico",
-              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>manifest.webapp",
-              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>robots.txt",
-              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui",
-              {
-                "glob": "axios.min.js",
-                "input": "node_modules/axios/dist/",
-                "output": "swagger-ui/"
-              },
-              {
-                "glob": "{*.{png,css},swagger-ui-{bundle,standalone-preset}.js}",
-                "input": "node_modules/swagger-ui-dist/",
-                "output": "swagger-ui/"
-              }
+              "<%- this.relativeDir(clientRootDir, clientSrcDir) %>content",
+              "<%- this.relativeDir(clientRootDir, clientSrcDir) %>favicon.ico",
+              "<%- this.relativeDir(clientRootDir, clientSrcDir) %>manifest.webapp",
+              "<%- this.relativeDir(clientRootDir, clientSrcDir) %>robots.txt",
+              "<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui"
             ],
             "styles": [
-              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/scss/vendor.scss",
-              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/scss/global.scss"
+              "<%- this.relativeDir(clientRootDir, clientSrcDir) %>content/scss/vendor.scss",
+              "<%- this.relativeDir(clientRootDir, clientSrcDir) %>content/scss/global.scss"
             ],
             "scripts": [],
             "define": {
@@ -91,7 +81,7 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "namedChunks": <%= Boolean(microfrontend) %>,
+              "namedChunks": <%- new Boolean(microfrontend) %>,
               "extractLicenses": true,
               "budgets": [
                 {
@@ -113,8 +103,8 @@
               "namedChunks": true,
               "fileReplacements": [
                 {
-                  "replace": "<%= this.relativeDir(clientRootDir, clientSrcDir) %>environments/environment.ts",
-                  "with": "<%= this.relativeDir(clientRootDir, clientSrcDir) %>environments/environment.development.ts"
+                  "replace": "<%- this.relativeDir(clientRootDir, clientSrcDir) %>environments/environment.ts",
+                  "with": "<%- this.relativeDir(clientRootDir, clientSrcDir) %>environments/environment.development.ts"
                 }
               ]
             }
@@ -124,17 +114,17 @@
         "serve": {
           "builder": "@angular-builders/custom-esbuild:dev-server",
           "options": {
-            "buildTarget": "<%= dasherizedBaseName %>:build:development",
+            "buildTarget": "<%- dasherizedBaseName %>:build:development",
             "open": true,
             "proxyConfig": "proxy.config.mjs",
-            "port": <%= devServerPort %>
+            "port": <%- devServerPort %>
           },
           "configurations": {
             "production": {
-              "buildTarget": "<%= dasherizedBaseName %>:build:production"
+              "buildTarget": "<%- dasherizedBaseName %>:build:production"
             },
             "development": {
-              "buildTarget": "<%= dasherizedBaseName %>:build:development"
+              "buildTarget": "<%- dasherizedBaseName %>:build:development"
             }
           },
           "defaultConfiguration": "development"
@@ -148,8 +138,9 @@
             "coverageReporters": ["text", "lcov"],
             "reporters": [
               "default",
-              ["vitest-sonar-reporter", { "outputFile": "./<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/TESTS-results-sonar-vitest.xml" }]
+              ["vitest-sonar-reporter", { "outputFile": "./<%- this.relativeDir(clientRootDir, temporaryDir) %>test-results/TESTS-results-sonar-vitest.xml" }]
             ],
+            "watch": false,
             "tsConfig": "tsconfig.spec.json"
           }
         }
@@ -159,7 +150,7 @@
   "cli": {
     "cache": {
       "enabled": true,
-      "path": "./<%= this.relativeDir(clientRootDir, temporaryDir) %>angular/",
+      "path": "./<%- this.relativeDir(clientRootDir, temporaryDir) %>angular/",
       "environment": "all"
     },
     "packageManager": "<%- nodePackageManager %>"

package/dist/generators/angular/templates/build-plugins/define-esbuild.ts.ejs

@@ -1,21 +1,23 @@
+import { copyFileSync, mkdirSync } from 'node:fs';
 import path from 'node:path';
 
 import type { ApplicationBuilderOptions } from '@angular/build';
 import type { Target } from '@angular-devkit/architect';
 import type { Plugin } from 'esbuild';
+import { globSync } from 'tinyglobby';
 
-export default (builderOptions: ApplicationBuilderOptions, _target: Target): Plugin => {
-  for (const asset of builderOptions.assets?.filter(asset => typeof asset === 'object') ?? []) {
-    if (asset.input.startsWith('node_modules/')) {
-      // Replace with resolved path to avoid issues when building.
-      if (asset.input.startsWith('node_modules/axios/')) {
-        asset.input = asset.input.replace('node_modules/axios', path.dirname(require.resolve('axios/package.json')));
-      } else if (asset.input.startsWith('node_modules/swagger-ui-dist/')) {
-        // https://github.com/swagger-api/swagger-ui/blob/v4.6.1/swagger-ui-dist-package/README.md
-        asset.input = require('swagger-ui-dist').getAbsoluteFSPath();
-      }
-    }
+const swaggerUiDir = path.resolve(__dirname, '../<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui');
+
+const copyFromPackage = (sourceDir: string, glob: string): void => {
+  for (const file of globSync(glob, { cwd: sourceDir })) {
+    copyFileSync(path.join(sourceDir, file), path.join(swaggerUiDir, path.basename(file)));
   }
+};
+
+export default (builderOptions: ApplicationBuilderOptions, _target: Target): Plugin => {
+  mkdirSync(swaggerUiDir, { recursive: true });
+  copyFromPackage(path.join(path.dirname(require.resolve('axios/package.json')), 'dist'), 'axios.min.js');
+  copyFromPackage(require('swagger-ui-dist').getAbsoluteFSPath(), '{*.{png,css},swagger-ui-{bundle,standalone-preset}.js}');
 
   builderOptions.define ??= {};
   builderOptions.define.__VERSION__ = JSON.stringify(process.env.APP_VERSION ?? 'unknown');

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

@@ -22,7 +22,7 @@ import eslint from '@eslint/js';
 import angular from 'angular-eslint';
 <&_ } -&>
 <&_ if (fragment.configSection) { -&>
-  { ignores: ['<%- this.relativeDir(clientRootDir, clientDistDir) %>', '<%- temporaryDir %>'<% if (clientTestFrameworkVitest) { %>, 'dist/'<% } %>] },
+  { ignores: ['<%- this.relativeDir(clientRootDir, clientDistDir) %>', '<%- temporaryDir %>', '<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/', 'dist/'] },
   eslint.configs.recommended,
   {
     files: ['**/*.{js,cjs,mjs}'],
@@ -47,7 +47,7 @@ import angular from 'angular-eslint';
         'error',
         {
           type: 'element',
-          prefix: '<%= jhiPrefixDashed %>',
+          prefix: '<%- jhiPrefixDashed %>',
           style: 'kebab-case',
         },
       ],
@@ -55,7 +55,7 @@ import angular from 'angular-eslint';
         'error',
         {
           type: 'attribute',
-          prefix: '<%= jhiPrefix %>',
+          prefix: '<%- jhiPrefix %>',
           style: 'camelCase',
         },
       ],
@@ -92,6 +92,7 @@ import angular from 'angular-eslint';
       '@typescript-eslint/no-non-null-assertion': 'off',
       '@typescript-eslint/no-shadow': ['error'],
       '@typescript-eslint/no-unnecessary-condition': 'error',
+      '@typescript-eslint/no-unnecessary-type-arguments': 'off',
       '@typescript-eslint/no-unsafe-argument': 'off',
       '@typescript-eslint/no-unsafe-assignment': 'off',
       '@typescript-eslint/no-unsafe-call': 'off',
@@ -124,7 +125,7 @@ import angular from 'angular-eslint';
     },
   },
   {
-    files: ['**/*.html'],
+    files: ['<%- this.relativeDir(clientRootDir, clientSrcDir) %>**/*.html'],
     extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility],
     rules: {
       '@angular-eslint/template/click-events-have-key-events': 'off',

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

@@ -18,35 +18,35 @@
 -%>
 
 {
-  "name": "<%= dasherizedBaseName %>",
+  "name": "<%- dasherizedBaseName %>",
   "version": "0.0.1-SNAPSHOT",
-  "description": "<%= projectDescription %>",
+  "description": "<%- projectDescription %>",
   "private": true,
   "license": "UNLICENSED",
   "type": "module",
   "dependencies": {
-    "@angular/common": "<%= nodeDependencies['@angular/common'] %>",
-    "@angular/compiler": "<%= nodeDependencies['@angular/common'] %>",
-    "@angular/core": "<%= nodeDependencies['@angular/common'] %>",
-    "@angular/forms": "<%= nodeDependencies['@angular/common'] %>",
-    "@angular/localize": "<%= nodeDependencies['@angular/common'] %>",
-    "@angular/platform-browser": "<%= nodeDependencies['@angular/common'] %>",
-    "@angular/router": "<%= nodeDependencies['@angular/common'] %>",
-    "@fortawesome/angular-fontawesome": "<%= nodeDependencies['@fortawesome/angular-fontawesome'] %>",
-    "@fortawesome/free-solid-svg-icons": "<%= nodeDependencies['@fortawesome/free-solid-svg-icons'] %>",
-    "@ng-bootstrap/ng-bootstrap": "<%= nodeDependencies['@ng-bootstrap/ng-bootstrap'] %>",
+    "@angular/common": "<%- nodeDependencies['@angular/common'] %>",
+    "@angular/compiler": "<%- nodeDependencies['@angular/common'] %>",
+    "@angular/core": "<%- nodeDependencies['@angular/common'] %>",
+    "@angular/forms": "<%- nodeDependencies['@angular/common'] %>",
+    "@angular/localize": "<%- nodeDependencies['@angular/common'] %>",
+    "@angular/platform-browser": "<%- nodeDependencies['@angular/common'] %>",
+    "@angular/router": "<%- nodeDependencies['@angular/common'] %>",
+    "@fortawesome/angular-fontawesome": "<%- nodeDependencies['@fortawesome/angular-fontawesome'] %>",
+    "@fortawesome/free-solid-svg-icons": "<%- nodeDependencies['@fortawesome/free-solid-svg-icons'] %>",
+    "@ng-bootstrap/ng-bootstrap": "<%- nodeDependencies['@ng-bootstrap/ng-bootstrap'] %>",
 <%_ if (enableTranslation) { _%>
-    "@ngx-translate/core": "<%= nodeDependencies['@ngx-translate/core'] %>",
-    "@ngx-translate/http-loader": "<%= nodeDependencies['@ngx-translate/http-loader'] %>",
+    "@ngx-translate/core": "<%- nodeDependencies['@ngx-translate/core'] %>",
+    "@ngx-translate/http-loader": "<%- nodeDependencies['@ngx-translate/http-loader'] %>",
 <%_ } _%>
-    "bootstrap": "<%= nodeDependencies.bootstrap %>",
+    "bootstrap": "<%- nodeDependencies.bootstrap %>",
 <%_ if (!clientThemeNone) { _%>
-    "bootswatch": "<%= nodeDependencies.bootswatch %>",
+    "bootswatch": "<%- nodeDependencies.bootswatch %>",
 <%_ } _%>
-    "dayjs": "<%= nodeDependencies['dayjs'] %>",
-    "ngx-infinite-scroll": "<%= nodeDependencies['ngx-infinite-scroll'] %>",
-    "rxjs": "<%= nodeDependencies['rxjs'] %>",
-    "tslib": "<%= nodeDependencies['tslib'] %>"
+    "dayjs": "<%- nodeDependencies.dayjs %>",
+    "ngx-infinite-scroll": "<%- nodeDependencies['ngx-infinite-scroll'] %>",
+    "rxjs": "<%- nodeDependencies.rxjs %>",
+    "tslib": "<%- nodeDependencies.tslib %>"
   },
   "devDependencies": {
 <%_ if (skipServer) { _%>
@@ -54,37 +54,37 @@
 <%_ } _%>
 <%_ if (microfrontend) { _%>
   <%_ if (applicationTypeGateway) { _%>
-    "@angular-architects/module-federation-runtime": "<%= nodeDependencies['@angular-architects/module-federation-runtime'] %>",
+    "@angular-architects/module-federation-runtime": "<%- nodeDependencies['@angular-architects/module-federation-runtime'] %>",
   <%_ } _%>
-    "@angular-architects/module-federation": "<%= nodeDependencies['@angular-architects/module-federation'] %>",
+    "@angular-architects/module-federation": "<%- nodeDependencies['@angular-architects/module-federation'] %>",
 <%_ } _%>
-    "@vitest/coverage-v8": "<%= nodeDependencies.vitest %>",
-    "@angular/build": "<%= nodeDependencies['@angular/cli'] %>",
-    "@angular/cli": "<%= nodeDependencies['@angular/cli'] %>",
-    "@angular/compiler-cli": "<%= nodeDependencies['@angular/common'] %>",
-    "@angular/service-worker": "<%= nodeDependencies['@angular/common'] %>",
+    "@vitest/coverage-v8": "<%- nodeDependencies.vitest %>",
+    "@angular/build": "<%- nodeDependencies['@angular/cli'] %>",
+    "@angular/cli": "<%- nodeDependencies['@angular/cli'] %>",
+    "@angular/compiler-cli": "<%- nodeDependencies['@angular/common'] %>",
+    "@angular/service-worker": "<%- nodeDependencies['@angular/common'] %>",
     "@eslint/js": null,
-    "@types/node": "<%= nodeDependencies['@types/node'] %>",
-    "angular-eslint": "<%= nodeDependencies['angular-eslint'] %>",
-    "browser-sync": "<%= nodeDependencies['browser-sync'] %>",
-    "eslint": "<%= nodeDependencies['eslint'] %>",
-    "eslint-config-prettier": "<%= nodeDependencies['eslint-config-prettier'] %>",
-    "eslint-plugin-prettier": "<%= nodeDependencies['eslint-plugin-prettier'] %>",
-    "globals": "<%= nodeDependencies.globals %>",
+    "@types/node": "<%- nodeDependencies['@types/node'] %>",
+    "angular-eslint": "<%- nodeDependencies['angular-eslint'] %>",
+    "browser-sync": "<%- nodeDependencies['browser-sync'] %>",
+    "eslint": "<%- nodeDependencies.eslint %>",
+    "eslint-config-prettier": "<%- nodeDependencies['eslint-config-prettier'] %>",
+    "eslint-plugin-prettier": "<%- nodeDependencies['eslint-plugin-prettier'] %>",
+    "globals": "<%- nodeDependencies.globals %>",
     "jiti": null,
     "jsdom": null,
 <%_ if (enableI18nRTL) { _%>
-    "postcss-rtlcss": "<%= nodeDependencies['postcss-rtlcss'] %>",
+    "postcss-rtlcss": "<%- nodeDependencies['postcss-rtlcss'] %>",
 <%_ } _%>
-    "rimraf": "<%= nodeDependencies['rimraf'] %>",
-    "swagger-ui-dist": "<%= nodeDependencies['swagger-ui-dist'] %>",
-    "typescript": "<%= nodeDependencies['typescript'] %>",
-    "typescript-eslint": "<%= nodeDependencies['typescript-eslint'] %>",
+    "rimraf": "<%- nodeDependencies.rimraf %>",
+    "swagger-ui-dist": "<%- nodeDependencies['swagger-ui-dist'] %>",
+    "typescript": "<%- nodeDependencies.typescript %>",
+    "typescript-eslint": "<%- nodeDependencies['typescript-eslint'] %>",
     "vitest": null,
     "vitest-sonar-reporter": null
   },
   "engines": {
-    "node": ">=<%= nodeVersion %>"
+    "node": ">=<%- nodeVersion %>"
   },
   "config": {
     "default_environment": "prod"
@@ -92,9 +92,9 @@
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "<%- nodePackageManager %> run lint -- --fix",
-    "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>",
-    "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>",
-    "start": "ng serve<% if (!microfrontend) { %> --hmr<% } %>",
+    "cleanup": "rimraf <%- this.relativeDir(clientRootDir, temporaryDir) %>",
+    "clean-www": "rimraf <%- this.relativeDir(clientRootDir, clientDistDir) %>",
+    "start": "ng serve<%- microfrontend ? '' : ' --hmr' %>",
     "start-tls": "<%- nodePackageManager %> run webapp:dev-ssl",
 <%_ if (skipServer) { _%>
     "sonar": "sonar-scanner",
@@ -104,8 +104,8 @@
     "pretest": "<%- nodePackageManager %> run lint",
     "test": "ng test --coverage",
     "test:watch": "<%- nodePackageManager %> run test -- --watch",
-    "watch": "concurrently npm:start<% if(!skipServer) { %> npm:backend:start<% } %>",
-    "build-watch": "concurrently 'npm run webapp:build:dev -- --watch'<% if(!skipServer) { %> npm:backend:start<% } %>",
+    "watch": "concurrently npm:start<%- skipServer ? '' : ' npm:backend:start' %>",
+    "build-watch": "concurrently 'npm run webapp:build:dev -- --watch'<%- skipServer ? '' : ' npm:backend:start' %>",
     "webapp:build": "<%- nodePackageManager %> run clean-www && <%- nodePackageManager %> run webapp:build:dev",
     "webapp:build:dev": "ng build --configuration development",
     "webapp:build:prod": "ng build --configuration production",

package/dist/generators/angular/templates/proxy.config.mjs.ejs

@@ -1,5 +1,5 @@
 const backendHost = '127.0.0.1';
-const backendPort = <%= applicationTypeMicroservice ? gatewayServerPort : serverPort %>;
+const backendPort = <%- applicationTypeMicroservice ? gatewayServerPort : serverPort %>;
 
 <%_ if (clientBundlerEsbuild) { _%>
 /**
@@ -13,7 +13,7 @@ export default {
     ws: true,
   },
 <%_ } _%>
-  '^/(api|management|v3/api-docs<% if (locals.databaseTypeSql && locals.devDatabaseTypeH2Any) { %>|h2-console<% } %><% if (authenticationTypeOauth2) { %>|oauth2|login<% } %><% if (authenticationTypeSession) { %>|login<% } %><% if (applicationTypeGateway || applicationTypeMicroservice) { %>|services<% } %>)': {
+  '^/(api|management|v3/api-docs<%- locals.databaseTypeSql && locals.devDatabaseTypeH2Any ? '|h2-console' : '' %><%- authenticationTypeOauth2 ? '|oauth2|login' : '' %><%- authenticationTypeSession ? '|login' : '' %><%- applicationTypeGateway || applicationTypeMicroservice ? '|services' : '' %>)': {
 <%_ if (clientBundlerEsbuild) { _%>
     target: `http://${backendHost}:${backendPort}`,
 <%_ } else { _%>

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

@@ -34,9 +34,9 @@ const accountRoutes: Routes = [
   passwordResetFinishRoute,
   passwordResetInitRoute,
   registerRoute,
-  <%_ if (authenticationTypeSession) { _%>
+<%_ if (authenticationTypeSession) { _%>
   sessionsRoute,
-  <%_ } _%>
+<%_ } _%>
   settingsRoute,
 ];
 

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

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 

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

@@ -16,13 +16,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed, inject } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of, throwError } from 'rxjs';
 
@@ -34,8 +32,10 @@ describe('Activate', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      <%_ if (enableTranslation) { _%>imports: [TranslateModule.forRoot()],<%_ } _%>
       providers: [
+<%_ if (enableTranslation) { _%>
+        provideTranslateService(),
+<%_ } _%>
         {
           provide: ActivatedRoute,
           useValue: { queryParams: of({ key: 'ABC123' }) },
@@ -50,7 +50,7 @@ describe('Activate', () => {
   });
 
   it('calls activate.get with the key from params', inject([ActivateService], (service: ActivateService) => {
-    <%= clientTestFramework %>.spyOn(service, 'get').mockReturnValue(of());
+    vitest.spyOn(service, 'get').mockReturnValue(of());
 
     comp.ngOnInit();
 
@@ -58,7 +58,7 @@ describe('Activate', () => {
   }));
 
   it('should set success to true upon successful activation', inject([ActivateService], (service: ActivateService) => {
-    <%= clientTestFramework %>.spyOn(service, 'get').mockReturnValue(of({}));
+    vitest.spyOn(service, 'get').mockReturnValue(of({}));
 
     comp.ngOnInit();
 
@@ -67,7 +67,7 @@ describe('Activate', () => {
   }));
 
   it('should set error to true upon activation failure', inject([ActivateService], (service: ActivateService) => {
-    <%= clientTestFramework %>.spyOn(service, 'get').mockReturnValue(throwError(Error));
+    vitest.spyOn(service, 'get').mockReturnValue(throwError(Error));
 
     comp.ngOnInit();
 

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

@@ -16,19 +16,19 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, inject, OnInit, signal } from '@angular/core';
+import { Component, ChangeDetectionStrategy, inject, OnInit, signal } from '@angular/core';
 import { ActivatedRoute, RouterLink } from '@angular/router';
-import { mergeMap } from 'rxjs/operators';
+import { mergeMap } from 'rxjs';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { ActivateService } from './activate.service';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-activate',
-  imports: [RouterLink<% if (enableTranslation) { %>, TranslateDirective, TranslateModule<% } %>],
+  selector: '<%- jhiPrefixDashed %>-activate',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [RouterLink<%- enableTranslation ? ', TranslateDirective' : '' %>],
   templateUrl: './activate.html',
 })
 export default class Activate implements OnInit {

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

@@ -16,12 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 
 import PasswordStrengthBar from './password-strength-bar';
@@ -30,14 +28,14 @@ describe('PasswordStrengthBar', () => {
   let comp: PasswordStrengthBar;
   let fixture: ComponentFixture<PasswordStrengthBar>;
 
-  <%_ if (enableTranslation) { _%>
+<%_ if (enableTranslation) { _%>
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
+      providers: [provideTranslateService()],
     });
   });
-  <%_ } _%>
 
+<%_ } _%>
   beforeEach(() => {
     fixture = TestBed.createComponent(PasswordStrengthBar);
     comp = fixture.componentInstance;

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

@@ -16,20 +16,22 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, ElementRef, Renderer2, effect, inject, input } from '@angular/core';
+import { Component, ChangeDetectionStrategy, ElementRef, Renderer2, effect, inject, input } from '@angular/core';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-password-strength-bar',
-  <%_ if (enableTranslation) { _%>imports: [TranslateDirective, TranslateModule],<%_ } _%>
+  selector: '<%- jhiPrefixDashed %>-password-strength-bar',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+<%_ if (enableTranslation) { _%>
+  imports: [TranslateDirective],
+<%_ } _%>
   templateUrl: './password-strength-bar.html',
   styleUrl: './password-strength-bar.scss',
 })
 export default class PasswordStrengthBar {
-  readonly passwordToCheck = input<string>('');
+  readonly passwordToCheck = input('');
 
   colors = ['#F00', '#F90', '#FF0', '#9F0', '#0F0'];
 

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

@@ -93,7 +93,7 @@
           </div>
         }
 
-          <<%= jhiPrefixDashed %>-password-strength-bar [passwordToCheck]="newPasswordRef.value" />
+          <<%- jhiPrefixDashed %>-password-strength-bar [passwordToCheck]="newPasswordRef.value" />
         </div>
 
         <div class="mb-3">

package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs

@@ -1,6 +1,4 @@
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 

package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { HttpResponse } from '@angular/common/http';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
@@ -40,7 +38,7 @@ describe('Password', () => {
         {
           provide: AccountService,
           useValue: {
-            isAuthenticated: <%= clientTestFramework %>.fn(),
+            isAuthenticated: vitest.fn(),
           },
         },
       ],
@@ -74,7 +72,7 @@ describe('Password', () => {
       newPassword: 'myPassword',
     };
 
-    <%= clientTestFramework %>.spyOn(service, 'save').mockReturnValue(of(new HttpResponse({ body: true })));
+    vitest.spyOn(service, 'save').mockReturnValue(of(new HttpResponse({ body: true })));
 
     comp.passwordForm.patchValue({
       currentPassword: passwordValues.currentPassword,
@@ -91,7 +89,7 @@ describe('Password', () => {
 
   it('should set success to true upon success', () => {
     // GIVEN
-    <%= clientTestFramework %>.spyOn(service, 'save').mockReturnValue(of(new HttpResponse({ body: true })));
+    vitest.spyOn(service, 'save').mockReturnValue(of(new HttpResponse({ body: true })));
     comp.passwordForm.patchValue({
       newPassword: 'myPassword',
       confirmPassword: 'myPassword',
@@ -108,7 +106,7 @@ describe('Password', () => {
 
   it('should notify of error if change password fails', () => {
     // GIVEN
-    <%= clientTestFramework %>.spyOn(service, 'save').mockReturnValue(throwError(Error));
+    vitest.spyOn(service, 'save').mockReturnValue(throwError(Error));
     comp.passwordForm.patchValue({
       newPassword: 'myPassword',
       confirmPassword: 'myPassword',

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

@@ -16,12 +16,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, inject, signal } from '@angular/core';
+import { Component, ChangeDetectionStrategy, inject, signal } from '@angular/core';
 import { FormGroup, FormControl, Validators, ReactiveFormsModule } from '@angular/forms';
 
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 <%_ } _%>
 import { AccountService } from 'app/core/auth/account.service';
 import { Account } from 'app/core/auth/account.model';
@@ -29,8 +29,16 @@ import { PasswordService } from './password.service';
 import PasswordStrengthBar from './password-strength-bar/password-strength-bar';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-password',
-  imports: [<%_ if (enableTranslation) { _%>TranslateDirective, TranslateModule, <%_ } _%>ReactiveFormsModule, PasswordStrengthBar],
+  selector: '<%- jhiPrefixDashed %>-password',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+<%_ if (enableTranslation) { _%>
+    TranslateDirective,
+    TranslatePipe,
+<%_ } _%>
+    ReactiveFormsModule,
+    PasswordStrengthBar,
+  ],
   templateUrl: './password.html',
 })
 export default class Password {