generator-jhipster 8.2.1 → 8.4.0

package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs

@@ -21,9 +21,8 @@ jest.mock('app/core/auth/account.service');
 import { waitForAsync, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { Router, TitleStrategy } from '@angular/router';
 import { Title } from '@angular/platform-browser';
-import { RouterTestingModule } from '@angular/router/testing';
 import { DOCUMENT } from '@angular/common';
-import { Component } from '@angular/core';
+import { Component, NgZone } from '@angular/core';
 import { of } from 'rxjs';
 <%_ if (enableTranslation) { _%>
 import { TranslateModule, TranslateService, LangChangeEvent } from '@ngx-translate/core';
@@ -48,6 +47,7 @@ describe('MainComponent', () => {
   <%_ } _%>
 <%_ } _%>
   let mockAccountService: AccountService;
+  let ngZone: NgZone;
   const routerState: any = { snapshot: { root: { data: {} } } };
   let router: Router;
   let document: Document;
@@ -58,7 +58,6 @@ describe('MainComponent', () => {
         imports: [
 <%_ if (enableTranslation) { _%>
           TranslateModule.forRoot(),
-          RouterTestingModule,
 <%_ } _%>
           MainComponent,
         ],
@@ -89,6 +88,7 @@ describe('MainComponent', () => {
     mockAccountService = TestBed.inject(AccountService);
     mockAccountService.identity = jest.fn(() => of(null));
     mockAccountService.getAuthenticationState = jest.fn(() => of(null));
+    ngZone = TestBed.inject(NgZone);
     router = TestBed.inject(Router);
     document = TestBed.inject(DOCUMENT);
   });
@@ -114,7 +114,7 @@ describe('MainComponent', () => {
     describe('navigation end', () => {
       it('should set page title to default title if pageTitle is missing on routes', fakeAsync(() => {
         // WHEN
-        router.navigateByUrl('');
+        ngZone.run(() => router.navigateByUrl(''));
         tick();
 
         // THEN
@@ -126,7 +126,7 @@ describe('MainComponent', () => {
         router.resetConfig([{ path: '', title: parentRoutePageTitle, component: BlankComponent }]);
 
         // WHEN
-        router.navigateByUrl('');
+        ngZone.run(() => router.navigateByUrl(''));
         tick();
 
         // THEN
@@ -146,7 +146,7 @@ describe('MainComponent', () => {
         ]);
 
         // WHEN
-        router.navigateByUrl('home');
+        ngZone.run(() => router.navigateByUrl('home'));
         tick();
 
         // THEN
@@ -166,22 +166,15 @@ describe('MainComponent', () => {
         ]);
 
         // WHEN
-        router.navigateByUrl('home');
+        ngZone.run(() => router.navigateByUrl('home'));
         tick();
 
         // THEN
         expect(document.title).toBe(parentRoutePageTitle<% if (enableTranslation) { %> + ' translated'<% } %>);
       }));
     });
-
-
-
-
-
-
-
-
 <%_ if (enableTranslation) { _%>
+
     describe('language change', () => {
       it('should set page title to default title if pageTitle is missing on routes', () => {
         // WHEN
@@ -197,7 +190,7 @@ describe('MainComponent', () => {
         router.resetConfig([{ path: '', title: parentRoutePageTitle, component: BlankComponent }]);
 
         // WHEN
-        router.navigateByUrl('');
+        ngZone.run(() => router.navigateByUrl(''));
         tick();
 
         // THEN
@@ -226,7 +219,7 @@ describe('MainComponent', () => {
         ]);
 
         // WHEN
-        router.navigateByUrl('home');
+        ngZone.run(() => router.navigateByUrl('home'));
         tick();
 
         // THEN
@@ -255,7 +248,7 @@ describe('MainComponent', () => {
         ]);
 
         // WHEN
-        router.navigateByUrl('home');
+        ngZone.run(() => router.navigateByUrl('home'));
         tick();
 
         // THEN

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

@@ -32,8 +32,8 @@ import FooterComponent from '../footer/footer.component';
 import PageRibbonComponent from '../profiles/page-ribbon.component';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-main',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-main',
   templateUrl: './main.component.html',
   providers: [AppPageTitleStrategy],
   imports: [RouterOutlet, FooterComponent, PageRibbonComponent],

package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs

@@ -20,7 +20,7 @@
   <div class="container-fluid">
   <a class="navbar-brand logo" routerLink="/" (click)="collapseNavbar()">
     <span class="logo-img"></span>
-    <span <%= jhiPrefix %>Translate="global.title" class="navbar-title">__jhiTransformTranslate__('global.title')</span>
+    <span class="navbar-title">__jhiTranslateTag__('global.title')</span>
     <span class="navbar-version">{{ version }}</span>
   </a>
   <a
@@ -41,7 +41,7 @@
         <a class="nav-link" routerLink="/" (click)="collapseNavbar()">
           <span>
             <fa-icon icon="home"></fa-icon>
-            <span <%= jhiPrefix %>Translate="global.menu.home">__jhiTransformTranslate__('global.menu.home')</span>
+            <span>__jhiTranslateTag__('global.menu.home')</span>
           </span>
         </a>
       </li>
@@ -57,7 +57,7 @@
           <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="entity-menu" data-cy="entity">
             <span>
               <fa-icon icon="th-list"></fa-icon>
-              <span <%= jhiPrefix %>Translate="global.menu.entities.main">__jhiTransformTranslate__('global.menu.entities.main')</span>
+              <span>__jhiTranslateTag__('global.menu.entities.main')</span>
             </span>
           </a>
           <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="entity-menu">
@@ -103,7 +103,7 @@
         <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="admin-menu" data-cy="adminMenu">
           <span>
             <fa-icon icon="users-cog"></fa-icon>
-            <span <%= jhiPrefix %>Translate="global.menu.admin.main">__jhiTransformTranslate__('global.menu.admin.main')</span>
+            <span>__jhiTranslateTag__('global.menu.admin.main')</span>
           </span>
         </a>
         <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="admin-menu">
@@ -112,7 +112,7 @@
           <li>
             <a class="dropdown-item" routerLink="/admin/gateway" routerLinkActive="active" (click)="collapseNavbar()">
               <fa-icon icon="road" [fixedWidth]="true"></fa-icon>
-              <span <%= jhiPrefix %>Translate="global.menu.admin.gateway">__jhiTransformTranslate__('global.menu.admin.gateway')</span>
+              <span>__jhiTranslateTag__('global.menu.admin.gateway')</span>
             </a>
           </li>
 <%_ } _%>
@@ -120,7 +120,7 @@
           <li>
             <a class="dropdown-item" routerLink="/admin/user-management" routerLinkActive="active" (click)="collapseNavbar()">
               <fa-icon icon="users" [fixedWidth]="true"></fa-icon>
-              <span <%= jhiPrefix %>Translate="global.menu.admin.userManagement">__jhiTransformTranslate__('global.menu.admin.userManagement')</span>
+              <span>__jhiTranslateTag__('global.menu.admin.userManagement')</span>
             </a>
           </li>
 <%_ } _%>
@@ -128,7 +128,7 @@
           <li>
             <a class="dropdown-item" routerLink="/admin/tracker" routerLinkActive="active" (click)="collapseNavbar()">
               <fa-icon icon="eye" [fixedWidth]="true"></fa-icon>
-              <span <%= jhiPrefix %>Translate="global.menu.admin.tracker">__jhiTransformTranslate__('global.menu.admin.tracker')</span>
+              <span>__jhiTranslateTag__('global.menu.admin.tracker')</span>
             </a>
           </li>
 <%_ } _%>
@@ -136,25 +136,25 @@
           <li>
             <a class="dropdown-item" routerLink="/admin/metrics" routerLinkActive="active" (click)="collapseNavbar()">
               <fa-icon icon="tachometer-alt" [fixedWidth]="true"></fa-icon>
-              <span <%= jhiPrefix %>Translate="global.menu.admin.metrics">__jhiTransformTranslate__('global.menu.admin.metrics')</span>
+              <span>__jhiTranslateTag__('global.menu.admin.metrics')</span>
             </a>
           </li>
           <li>
             <a class="dropdown-item" routerLink="/admin/health" routerLinkActive="active" (click)="collapseNavbar()">
               <fa-icon icon="heart" [fixedWidth]="true"></fa-icon>
-              <span <%= jhiPrefix %>Translate="global.menu.admin.health">__jhiTransformTranslate__('global.menu.admin.health')</span>
+              <span>__jhiTranslateTag__('global.menu.admin.health')</span>
             </a>
           </li>
           <li>
             <a class="dropdown-item" routerLink="/admin/configuration" routerLinkActive="active" (click)="collapseNavbar()">
               <fa-icon icon="cogs" [fixedWidth]="true"></fa-icon>
-              <span <%= jhiPrefix %>Translate="global.menu.admin.configuration">__jhiTransformTranslate__('global.menu.admin.configuration')</span>
+              <span>__jhiTranslateTag__('global.menu.admin.configuration')</span>
             </a>
           </li>
           <li>
             <a class="dropdown-item" routerLink="/admin/logs" routerLinkActive="active" (click)="collapseNavbar()">
               <fa-icon icon="tasks" [fixedWidth]="true"></fa-icon>
-              <span <%= jhiPrefix %>Translate="global.menu.admin.logs">__jhiTransformTranslate__('global.menu.admin.logs')</span>
+              <span>__jhiTranslateTag__('global.menu.admin.logs')</span>
             </a>
           </li>
 <%_ } _%>
@@ -163,7 +163,7 @@
           <li>
             <a class="dropdown-item" routerLink="/admin/docs" routerLinkActive="active" (click)="collapseNavbar()">
               <fa-icon icon="book" [fixedWidth]="true"></fa-icon>
-              <span <%= jhiPrefix %>Translate="global.menu.admin.apidocs">__jhiTransformTranslate__('global.menu.admin.apidocs')</span>
+              <span>__jhiTranslateTag__('global.menu.admin.apidocs')</span>
             </a>
           </li>
         }
@@ -173,7 +173,7 @@
           <li>
             <a class="dropdown-item" href="<% if (databaseTypeCouchbase) { %>http://localhost:8091/<% } else if (reactive) { %> http://localhost:8092/ <% } else { %>./h2-console/<% } %>" target="_tab" (click)="collapseNavbar()">
               <fa-icon icon="database" [fixedWidth]="true"></fa-icon>
-              <span <%= jhiPrefix %>Translate="global.menu.admin.database">__jhiTransformTranslate__('global.menu.admin.database')</span>
+              <span>__jhiTranslateTag__('global.menu.admin.database')</span>
             </a>
           </li>
         }
@@ -186,7 +186,7 @@
         <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="languagesnavBarDropdown">
           <span>
             <fa-icon icon="flag"></fa-icon>
-            <span <%= jhiPrefix %>Translate="global.menu.language">__jhiTransformTranslate__('global.menu.language')</span>
+            <span>__jhiTranslateTag__('global.menu.language')</span>
           </span>
         </a>
         <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="languagesnavBarDropdown">
@@ -204,7 +204,7 @@
         @if (!account()?.imageUrl) {
           <span>
             <fa-icon icon="user"></fa-icon>
-            <span <%= jhiPrefix %>Translate="global.menu.account.main">__jhiTransformTranslate__('global.menu.account.main')</span>
+            <span>__jhiTranslateTag__('global.menu.account.main')</span>
           </span>
         } @else {
           <span>
@@ -218,13 +218,13 @@
             <li>
               <a class="dropdown-item" routerLink="/account/settings" routerLinkActive="active" (click)="collapseNavbar()" data-cy="settings">
                 <fa-icon icon="wrench" [fixedWidth]="true"></fa-icon>
-                <span <%= jhiPrefix %>Translate="global.menu.account.settings">__jhiTransformTranslate__('global.menu.account.settings')</span>
+                <span>__jhiTranslateTag__('global.menu.account.settings')</span>
               </a>
             </li>
             <li>
               <a class="dropdown-item" routerLink="/account/password" routerLinkActive="active" (click)="collapseNavbar()" data-cy="passwordItem">
                 <fa-icon icon="lock" [fixedWidth]="true"></fa-icon>
-                <span <%= jhiPrefix %>Translate="global.menu.account.password">__jhiTransformTranslate__('global.menu.account.password')</span>
+                <span>__jhiTranslateTag__('global.menu.account.password')</span>
               </a>
             </li>
 <%_ } _%>
@@ -232,28 +232,28 @@
             <li>
               <a class="dropdown-item" routerLink="/account/sessions" routerLinkActive="active" (click)="collapseNavbar()">
                 <fa-icon icon="cloud" [fixedWidth]="true"></fa-icon>
-                <span <%= jhiPrefix %>Translate="global.menu.account.sessions">__jhiTransformTranslate__('global.menu.account.sessions')</span>
+                <span>__jhiTranslateTag__('global.menu.account.sessions')</span>
               </a>
             </li>
 <%_ } _%>
             <li>
               <a class="dropdown-item" (click)="logout()" id="logout" data-cy="logout">
                 <fa-icon icon="sign-out-alt" [fixedWidth]="true"></fa-icon>
-                <span <%= jhiPrefix %>Translate="global.menu.account.logout">__jhiTransformTranslate__('global.menu.account.logout')</span>
+                <span>__jhiTranslateTag__('global.menu.account.logout')</span>
               </a>
             </li>
           } @else {
             <li>
               <a class="dropdown-item" (click)="login()" id="login" data-cy="login">
                 <fa-icon icon="sign-in-alt" [fixedWidth]="true"></fa-icon>
-                <span <%= jhiPrefix %>Translate="global.menu.account.login">__jhiTransformTranslate__('global.menu.account.login')</span>
+                <span>__jhiTranslateTag__('global.menu.account.login')</span>
               </a>
             </li>
 <%_ if (generateUserManagement) { _%>
             <li>
               <a class="dropdown-item" routerLink="/account/register" routerLinkActive="active" (click)="collapseNavbar()" data-cy="register">
                 <fa-icon icon="user-plus" [fixedWidth]="true"></fa-icon>
-                <span <%= jhiPrefix %>Translate="global.menu.account.register">__jhiTransformTranslate__('global.menu.account.register')</span>
+                <span>__jhiTranslateTag__('global.menu.account.register')</span>
               </a>
             </li>
 <%_ } _%>

package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs

@@ -20,7 +20,6 @@ jest.mock('app/login/login.service');
 
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 <%_ if (enableTranslation) { _%>
 import { TranslateModule } from '@ngx-translate/core';
@@ -56,7 +55,6 @@ describe('Navbar Component', () => {
         imports: [
           NavbarComponent,
           HttpClientTestingModule,
-          RouterTestingModule.withRoutes([]),
 <%_ if (enableTranslation) { _%>
           TranslateModule.forRoot(),
 <%_ } _%>

package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs

@@ -29,7 +29,7 @@ import { ProfileService } from './profile.service';
   template: `
     @if (ribbonEnv$ | async; as ribbonEnv) {
       <div class="ribbon">
-        <a href=""<% if (enableTranslation) { %> <%= jhiPrefix %>Translate="global.ribbon.{{ ribbonEnv }}"<% } %>>{{ __jhiTransformTranslateStringify__('global.ribbon')[ribbonEnv] || '' }}</a>
+        <a href="">__jhiTranslateTagEnum__('global.ribbon', { "value": "ribbonEnv ?? ''" })</a>
       </div>
     }
   `,

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

@@ -19,22 +19,21 @@
 <div>
   <div class="d-flex justify-content-center">
     <div class="col-lg-6 col-md-8 col-sm-10">
-      <h1 <%= jhiPrefix %>Translate="login.title" data-cy="loginTitle">__jhiTransformTranslate__('login.title')</h1>
+      <h1 data-cy="loginTitle">__jhiTranslateTag__('login.title')</h1>
     @if (authenticationError()) {
       <div class="alert alert-danger"
-        <%= jhiPrefix %>Translate="login.messages.error.authentication"
         data-cy="loginError"
-      >__jhiTransformTranslate__('login.messages.error.authentication')</div>
+      >__jhiTranslateTag__('login.messages.error.authentication')</div>
     }
-      <form class="form" role="form" (ngSubmit)="login()" [formGroup]="loginForm">
+      <form class="form" (ngSubmit)="login()" [formGroup]="loginForm">
         <div class="mb-3">
-          <label class="username-label" for="username" <%= jhiPrefix %>Translate="global.form.username.label">__jhiTransformTranslate__('global.form["username.label"]')</label>
+          <label class="username-label" for="username">__jhiTranslateTag__('global.form.username.label')</label>
           <input
             type="text"
             class="form-control"
             name="username"
             id="username"
-            placeholder="{{ 'global.form.username.placeholder' | translate }}"
+            placeholder="__jhiTranslatePipe__('global.form.username.placeholder')"
             formControlName="username"
             #username
             data-cy="username"
@@ -42,13 +41,13 @@
         </div>
 
         <div class="mb-3">
-          <label for="password" <%= jhiPrefix %>Translate="login.form.password">__jhiTransformTranslate__('login.form.password')</label>
+          <label for="password">__jhiTranslateTag__('login.form.password')</label>
           <input
             type="password"
             class="form-control"
             name="password"
             id="password"
-            placeholder="{{ 'login.form.password.placeholder' | translate }}"
+            placeholder="__jhiTranslatePipe__('login.form.password.placeholder')"
             formControlName="password"
             data-cy="password"
           />
@@ -57,20 +56,20 @@
         <div class="form-check"<% if (authenticationTypeSession && databaseTypeNo) { %> hidden<% } %>>
           <label class="form-check-label" for="rememberMe">
             <input class="form-check-input" type="checkbox" name="rememberMe" id="rememberMe" formControlName="rememberMe" />
-            <span <%= jhiPrefix %>Translate="login.form.rememberme">__jhiTransformTranslate__('login.form.rememberme')</span>
+            <span>__jhiTranslateTag__('login.form.rememberme')</span>
           </label>
         </div>
 
-        <button type="submit" class="btn btn-primary" <%= jhiPrefix %>Translate="login.form.button" data-cy="submit">__jhiTransformTranslate__('login.form.button')</button>
+        <button type="submit" class="btn btn-primary" data-cy="submit">__jhiTranslateTag__('login.form.button')</button>
       </form>
 <%_ if (generateUserManagement) { _%>
       <div class="mt-3 alert alert-warning">
-        <a class="alert-link" routerLink="/account/reset/request" <%= jhiPrefix %>Translate="login.password.forgot" data-cy="forgetYourPasswordSelector">__jhiTransformTranslate__('login.password.forgot')</a>
+        <a class="alert-link" routerLink="/account/reset/request" data-cy="forgetYourPasswordSelector">__jhiTranslateTag__('login.password.forgot')</a>
       </div>
 
       <div class="alert alert-warning">
-        <span <%= jhiPrefix %>Translate="global.messages.info.register.noaccount">__jhiTransformTranslate__('global.messages.info.register.noaccount')</span>
-        <a class="alert-link" routerLink="/account/register" <%= jhiPrefix %>Translate="global.messages.info.register.link">__jhiTransformTranslate__('global.messages.info.register.link')</a>
+        <span>__jhiTranslateTag__('global.messages.info.register.noaccount')</span>
+        <a class="alert-link" routerLink="/account/register">__jhiTranslateTag__('global.messages.info.register.link')</a>
       </div>
 <%_ } _%>
     </div>

package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs

@@ -23,7 +23,6 @@ import { ElementRef } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { Router, Navigation } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
 import { of, throwError } from 'rxjs';
 
 import { AccountService } from 'app/core/auth/account.service';
@@ -41,7 +40,7 @@ describe('LoginComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [RouterTestingModule.withRoutes([]), LoginComponent],
+        imports: [LoginComponent],
         providers: [
           FormBuilder,
           AccountService,

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

@@ -25,8 +25,8 @@ import { LoginService } from 'app/login/login.service';
 import { AccountService } from 'app/core/auth/account.service';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-login',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-login',
   imports: [SharedModule, FormsModule, ReactiveFormsModule, RouterModule],
   templateUrl: './login.component.html',
 })

package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs

@@ -1,13 +1,13 @@
 @if (filters.hasAnyFilterSet()) {
 <div class="filter-display">
-  <span <%= jhiPrefix %>Translate="entity.filters.set">__jhiTransformTranslate__('entity.filters.set')</span>
-  <fa-icon icon="times" (click)="clearAllFilters()" title="<% if (enableTranslation) { %>{{ 'entity.filters.clearAll' | translate }}<% } else { %>__jhiTransformTranslate__('entity.filters.clearAll')<% } %>"></fa-icon>
+  <span>__jhiTranslateTag__('entity.filters.set')</span>
+  <fa-icon icon="times" (click)="clearAllFilters()" title="__jhiTranslatePipe__('entity.filters.clearAll')"></fa-icon>
   <ul>
 @for (filterOption of filters.filterOptions; track filterOption.name) {
   @for (value of filterOption.values; track value) {
     <li>
       <span>{{ filterOption.name }}:</span> {{ value }}
-      <fa-icon icon="times" (click)="clearFilter(filterOption.name, value)" title="<% if (enableTranslation) { %>{{ 'entity.filters.clear' | translate }}<% } else { %>__jhiTransformTranslate__('entity.filters.clear')<% } %>"></fa-icon>
+      <fa-icon icon="times" (click)="clearFilter(filterOption.name, value)" title="__jhiTranslatePipe__('entity.filters.clear')"></fa-icon>
     </li>
   }
 }

package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.ts.ejs

@@ -3,8 +3,8 @@ import { IFilterOptions } from './filter.model';
 import SharedModule from '../shared.module';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-filter',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-filter',
   imports: [SharedModule],
   templateUrl: './filter.component.html',
 })

package/dist/generators/angular/templates/webpack/webpack.custom.js.ejs

@@ -62,7 +62,7 @@ module.exports = async (config, options, targetOptions) => {
   }
 
   // configuring proxy for back end service
-  const tls = Boolean(config.devServer && config.devServer.https);
+  const tls = config.devServer?.server?.type === 'https';
   if (config.devServer) {
     config.devServer.proxy = proxyConfig({ tls });
   }

package/dist/generators/app/generator.js

@@ -18,19 +18,16 @@
  */
 /* eslint-disable consistent-return, import/no-named-as-default-member */
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { camelCase } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { checkNode, loadStoredAppOptions } from './support/index.js';
 import cleanupOldFilesTask from './cleanup.js';
-import { askForInsightOptIn } from './prompts.js';
-import statistics from '../statistics.js';
 import { GENERATOR_COMMON, GENERATOR_CLIENT, GENERATOR_SERVER } from '../generator-list.js';
 import { getDefaultAppName } from '../project-name/support/index.js';
 import { packageJson } from '../../lib/index.js';
-import { applicationTypes, applicationOptions } from '../../jdl/jhipster/index.js';
+import { applicationTypes } from '../../jdl/jhipster/index.js';
 import command from './command.js';
 const { MICROSERVICE } = applicationTypes;
-const { JHI_PREFIX, BASE_NAME, JWT_SECRET_KEY, PACKAGE_NAME, PACKAGE_FOLDER, REMEMBER_ME_KEY } = applicationOptions.OptionNames;
 export default class JHipsterAppGenerator extends BaseApplicationGenerator {
     command = command;
     async beforeQueue() {
@@ -39,7 +36,7 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
             await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnBootstrapAplicationBase();
+            await this.dependsOnBootstrapApplicationBase();
         }
     }
     get initializing() {
@@ -70,7 +67,6 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
     }
     get prompting() {
         return this.asPromptingTaskGroup({
-            askForInsightOptIn,
             async prompting({ control }) {
                 if (control.existingProject && this.options.askAnswered !== true)
                     return;
@@ -93,7 +89,7 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
             },
             fixConfig() {
                 if (this.jhipsterConfig.jhiPrefix) {
-                    this.jhipsterConfig.jhiPrefix = _.camelCase(this.jhipsterConfig.jhiPrefix);
+                    this.jhipsterConfig.jhiPrefix = camelCase(this.jhipsterConfig.jhiPrefix);
                 }
             },
             defaults() {
@@ -156,20 +152,6 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.COMPOSING]() {
         return this.delegateTasksToBlueprint(() => this.composing);
     }
-    get default() {
-        return this.asDefaultTaskGroup({
-            insight({ control }) {
-                const yorc = {
-                    ..._.omit(this.jhipsterConfig, [JHI_PREFIX, BASE_NAME, JWT_SECRET_KEY, PACKAGE_NAME, PACKAGE_FOLDER, REMEMBER_ME_KEY]),
-                };
-                yorc.applicationType = this.jhipsterConfig.applicationType;
-                statistics.sendYoRc(yorc, control.existingProject, this.jhipsterConfig.jhipsterVersion);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.DEFAULT]() {
-        return this.delegateTasksToBlueprint(() => this.default);
-    }
     get writing() {
         return this.asWritingTaskGroup({
             cleanupOldFilesTask,

package/dist/generators/app/support/config.js

@@ -10,7 +10,7 @@ import { packageJson } from '../../../lib/index.js';
 const { GATLING, CUCUMBER, CYPRESS } = testFrameworkTypes;
 const { GATEWAY, MONOLITH } = applicationTypes;
 const { JWT, OAUTH2, SESSION } = authenticationTypes;
-const { CASSANDRA, NO: NO_DATABASE } = databaseTypes;
+const { NO: NO_DATABASE } = databaseTypes;
 /**
  * Load common options to be stored.
  * @deprecated
@@ -159,6 +159,4 @@ export const loadDerivedAppConfig = ({ application }) => {
     application.generateUserManagement =
         !application.skipUserManagement && application.databaseType !== NO_DATABASE && authenticationApiWithUserManagement;
     application.generateInMemoryUserCredentials = !application.generateUserManagement && authenticationApiWithUserManagement;
-    application.generateBuiltInUserEntity = application.generateUserManagement || application.syncUserWithIdp;
-    application.generateBuiltInAuthorityEntity = application.generateBuiltInUserEntity && application.databaseType !== CASSANDRA;
 };

package/dist/generators/base/generator.js

@@ -20,7 +20,7 @@ import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
 import semver from 'semver';
-import * as _ from 'lodash-es';
+import { defaults } from 'lodash-es';
 import { packageJson } from '../../lib/index.js';
 import { packageNameToNamespace, removeFieldsWithNullishValues } from './support/index.js';
 import { mergeBlueprints, parseBluePrints, loadBlueprintsFromConfiguration, normalizeBlueprintName } from './internal/index.js';
@@ -29,7 +29,6 @@ import CoreGenerator from '../base-core/index.js';
 import { LOCAL_BLUEPRINT_PACKAGE_NAMESPACE } from './support/constants.js';
 import { getConfigWithDefaults } from '../../jdl/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
-const { defaults } = _;
 /**
  * Base class that contains blueprints support.
  */
@@ -385,6 +384,7 @@ export default class JHipsterBaseBlueprintGenerator extends CoreGenerator {
         const composedBlueprints = [];
         for (const blueprint of blueprints) {
             const blueprintGenerator = await this._composeBlueprint(blueprint.name, subGen, options);
+            let blueprintCommand;
             if (blueprintGenerator) {
                 composedBlueprints.push(blueprintGenerator);
                 if (blueprintGenerator.sbsBlueprint) {
@@ -396,6 +396,25 @@ export default class JHipsterBaseBlueprintGenerator extends CoreGenerator {
                     this.delegateToBlueprint = true;
                     this.checkBlueprintImplementsPriorities(blueprintGenerator);
                 }
+                const blueprintModule = (await blueprintGenerator._meta?.importModule?.());
+                blueprintCommand = blueprintModule?.command;
+            }
+            else {
+                const generatorName = packageNameToNamespace(normalizeBlueprintName(blueprint.name));
+                const generatorNamespace = `${generatorName}:${subGen}`;
+                const blueprintMeta = await this.env.findMeta(generatorNamespace);
+                const blueprintModule = (await blueprintMeta?.importModule?.());
+                blueprintCommand = blueprintModule?.command;
+                if (blueprintCommand?.compose) {
+                    this.generatorsToCompose.push(...blueprintCommand.compose);
+                }
+            }
+            if (blueprintCommand?.override) {
+                if (this.generatorCommand) {
+                    this.log.warn('Command already set, multiple blueprints may be overriding the command. Unexpected behavior may occur.');
+                }
+                // Use the blueprint command if it is set to override.
+                this.generatorCommand = blueprintCommand;
             }
         }
         return composedBlueprints;

package/dist/generators/base/shared-data.js

@@ -16,8 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as _ from 'lodash-es';
-const { defaults } = _;
+import { defaults } from 'lodash-es';
 export default class SharedData {
     _storage;
     constructor(storage, initialControl = {}) {

package/dist/generators/base/support/basename.js

@@ -1,5 +1,4 @@
-import * as _ from 'lodash-es';
-const { camelCase } = _;
+import { camelCase } from 'lodash-es';
 /**
  * get the frontend application name.
  */