generator-jhipster 8.0.0-beta.2 → 8.0.0-rc.1

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"><%- getWebappTranslation('global.title') %></span>
+    <span <%= jhiPrefix %>Translate="global.title" class="navbar-title">__jhiTransformTranslate__('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"><%- getWebappTranslation('global.menu.home') %></span>
+            <span <%= jhiPrefix %>Translate="global.menu.home">__jhiTransformTranslate__('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"><%- getWebappTranslation('global.menu.entities.main') %></span>
+            <span <%= jhiPrefix %>Translate="global.menu.entities.main">__jhiTransformTranslate__('global.menu.entities.main')</span>
           </span>
         </a>
         <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="entity-menu">
@@ -98,7 +98,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"><%- getWebappTranslation('global.menu.admin.main') %></span>
+            <span <%= jhiPrefix %>Translate="global.menu.admin.main">__jhiTransformTranslate__('global.menu.admin.main')</span>
           </span>
         </a>
         <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="admin-menu">
@@ -106,7 +106,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"><%- getWebappTranslation('global.menu.admin.gateway') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.admin.gateway">__jhiTransformTranslate__('global.menu.admin.gateway')</span>
             </a>
           </li>
 <%_ } _%>
@@ -114,7 +114,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"><%- getWebappTranslation('global.menu.admin.userManagement') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.admin.userManagement">__jhiTransformTranslate__('global.menu.admin.userManagement')</span>
             </a>
           </li>
 <%_ } _%>
@@ -122,7 +122,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"><%- getWebappTranslation('global.menu.admin.tracker') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.admin.tracker">__jhiTransformTranslate__('global.menu.admin.tracker')</span>
             </a>
           </li>
 <%_ } _%>
@@ -130,25 +130,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"><%- getWebappTranslation('global.menu.admin.metrics') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.admin.metrics">__jhiTransformTranslate__('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"><%- getWebappTranslation('global.menu.admin.health') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.admin.health">__jhiTransformTranslate__('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"><%- getWebappTranslation('global.menu.admin.configuration') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.admin.configuration">__jhiTransformTranslate__('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"><%- getWebappTranslation('global.menu.admin.logs') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.admin.logs">__jhiTransformTranslate__('global.menu.admin.logs')</span>
             </a>
           </li>
 <%_ } _%>
@@ -156,7 +156,7 @@
           <li *ngIf="openAPIEnabled">
             <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"><%- getWebappTranslation('global.menu.admin.apidocs') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.admin.apidocs">__jhiTransformTranslate__('global.menu.admin.apidocs')</span>
             </a>
           </li>
 <%_ } _%>
@@ -165,7 +165,7 @@
           <li *ngIf="!inProduction">
             <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"><%- getWebappTranslation('global.menu.admin.database') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.admin.database">__jhiTransformTranslate__('global.menu.admin.database')</span>
             </a>
           </li>
 <%_ } _%>
@@ -176,7 +176,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"><%- getWebappTranslation('global.menu.language') %></span>
+            <span <%= jhiPrefix %>Translate="global.menu.language">__jhiTransformTranslate__('global.menu.language')</span>
           </span>
         </a>
         <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="languagesnavBarDropdown">
@@ -190,7 +190,7 @@
         <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="account-menu" data-cy="accountMenu">
           <span *ngIf="!account?.imageUrl">
             <fa-icon icon="user"></fa-icon>
-            <span <%= jhiPrefix %>Translate="global.menu.account.main"><%- getWebappTranslation('global.menu.account.main') %></span>
+            <span <%= jhiPrefix %>Translate="global.menu.account.main">__jhiTransformTranslate__('global.menu.account.main')</span>
           </span>
           <span *ngIf="account?.imageUrl">
             <img [src]="account!.imageUrl" class="profile-image rounded-circle" alt="Avatar" />
@@ -201,13 +201,13 @@
           <li *ngSwitchCase="true">
             <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"><%- getWebappTranslation('global.menu.account.settings') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.account.settings">__jhiTransformTranslate__('global.menu.account.settings')</span>
             </a>
           </li>
           <li *ngSwitchCase="true">
             <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"><%- getWebappTranslation('global.menu.account.password') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.account.password">__jhiTransformTranslate__('global.menu.account.password')</span>
             </a>
           </li>
 <%_ } _%>
@@ -215,27 +215,27 @@
           <li *ngSwitchCase="true">
             <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"><%- getWebappTranslation('global.menu.account.sessions') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.account.sessions">__jhiTransformTranslate__('global.menu.account.sessions')</span>
             </a>
           </li>
 <%_ } _%>
           <li *ngSwitchCase="true">
             <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"><%- getWebappTranslation('global.menu.account.logout') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.account.logout">__jhiTransformTranslate__('global.menu.account.logout')</span>
             </a>
           </li>
           <li *ngSwitchCase="false">
             <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"><%- getWebappTranslation('global.menu.account.login') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.account.login">__jhiTransformTranslate__('global.menu.account.login')</span>
             </a>
           </li>
 <%_ if (generateUserManagement) { _%>
           <li *ngSwitchCase="false">
             <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"><%- getWebappTranslation('global.menu.account.register') %></span>
+              <span <%= jhiPrefix %>Translate="global.menu.account.register">__jhiTransformTranslate__('global.menu.account.register')</span>
             </a>
           </li>
 <%_ } _%>

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

@@ -67,6 +67,6 @@ Logo styles
   width: 45px;
   display: inline-block;
   vertical-align: middle;
-  background: url('/content/images/logo-jhipster.png') no-repeat center center;
+  background: url('../../../content/images/logo-jhipster.png') no-repeat center center;
   background-size: contain;
 }

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

@@ -28,7 +28,7 @@ import { ProfileService } from './profile.service';
   selector: '<%= jhiPrefixDashed %>-page-ribbon',
   template: `
     <div class="ribbon" *ngIf="ribbonEnv$ | async as ribbonEnv">
-      <a href=""<% if (enableTranslation) { %> <%= jhiPrefix %>Translate="global.ribbon.{{ ribbonEnv }}"<% } %>>{{ <%- JSON.stringify(getWebappTranslation('global.ribbon')) %>[ribbonEnv] || '' }}</a>
+      <a href=""<% if (enableTranslation) { %> <%= jhiPrefix %>Translate="global.ribbon.{{ ribbonEnv }}"<% } %>>{{ __jhiTransformTranslateStringify__('global.ribbon')[ribbonEnv] || '' }}</a>
     </div>
   `,
   styleUrls: ['./page-ribbon.component.scss'],

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

@@ -19,18 +19,16 @@
 <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"><%- getWebappTranslation('login.title') %></h1>
+      <h1 <%= jhiPrefix %>Translate="login.title" data-cy="loginTitle">__jhiTransformTranslate__('login.title')</h1>
       <div
         class="alert alert-danger"
         *ngIf="authenticationError"
         <%= jhiPrefix %>Translate="login.messages.error.authentication"
         data-cy="loginError"
-      >
-        <%- getWebappTranslation('login.messages.error.authentication') %>
-      </div>
+      >__jhiTransformTranslate__('login.messages.error.authentication')</div>
       <form class="form" role="form" (ngSubmit)="login()" [formGroup]="loginForm">
         <div class="mb-3">
-          <label class="username-label" for="username" <%= jhiPrefix %>Translate="global.form.username.label"><%- getWebappTranslation('global.form["username.label"]') %></label>
+          <label class="username-label" for="username" <%= jhiPrefix %>Translate="global.form.username.label">__jhiTransformTranslate__('global.form["username.label"]')</label>
           <input
             type="text"
             class="form-control"
@@ -44,7 +42,7 @@
         </div>
 
         <div class="mb-3">
-          <label for="password" <%= jhiPrefix %>Translate="login.form.password"><%- getWebappTranslation('login.form.password') %></label>
+          <label for="password" <%= jhiPrefix %>Translate="login.form.password">__jhiTransformTranslate__('login.form.password')</label>
           <input
             type="password"
             class="form-control"
@@ -59,20 +57,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"><%- getWebappTranslation('login.form.rememberme') %></span>
+            <span <%= jhiPrefix %>Translate="login.form.rememberme">__jhiTransformTranslate__('login.form.rememberme')</span>
           </label>
         </div>
 
-        <button type="submit" class="btn btn-primary" <%= jhiPrefix %>Translate="login.form.button" data-cy="submit"><%- getWebappTranslation('login.form.button') %></button>
+        <button type="submit" class="btn btn-primary" <%= jhiPrefix %>Translate="login.form.button" data-cy="submit">__jhiTransformTranslate__('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"><%- getWebappTranslation('login.password.forgot') %></a>
+        <a class="alert-link" routerLink="/account/reset/request" <%= jhiPrefix %>Translate="login.password.forgot" data-cy="forgetYourPasswordSelector">__jhiTransformTranslate__('login.password.forgot')</a>
       </div>
 
       <div class="alert alert-warning">
-        <span <%= jhiPrefix %>Translate="global.messages.info.register.noaccount"><%- getWebappTranslation('global.messages.info.register.noaccount') %></span>
-        <a class="alert-link" routerLink="/account/register" <%= jhiPrefix %>Translate="global.messages.info.register.link"><%- getWebappTranslation('global.messages.info.register.link') %></a>
+        <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>
       </div>
 <%_ } _%>
     </div>

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

@@ -106,7 +106,7 @@ describe('LoginComponent', () => {
   });
 
   describe('ngAfterViewInit', () => {
-    it('shoult set focus to username input after the view has been initialized', () => {
+    it('should set focus to username input after the view has been initialized', () => {
       // GIVEN
       const node = {
         focus: jest.fn(),

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

@@ -1,11 +1,11 @@
 <div class="filter-display" *ngIf="filters.hasAnyFilterSet()">
-  <span <%= jhiPrefix %>Translate="entity.filters.set"><%- getWebappTranslation('entity.filters.set') %></span>
-  <fa-icon icon="times" (click)="clearAllFilters()" title="<% if (enableTranslation) { %>{{ 'entity.filters.clearAll' | translate }}<% } else { %><%- getWebappTranslation('entity.filters.clearAll') %><% } %>"></fa-icon>
+  <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>
   <ul>
     <ng-container *ngFor="let filterOption of filters.filterOptions">
       <li *ngFor="let value of filterOption.values">
         <span>{{ filterOption.name }}:</span> {{ value }}
-        <fa-icon icon="times" (click)="clearFilter(filterOption.name, value)" title="<% if (enableTranslation) { %>{{ 'entity.filters.clear' | translate }}<% } else { %><%- getWebappTranslation('entity.filters.clear') %><% } %>"></fa-icon>
+        <fa-icon icon="times" (click)="clearFilter(filterOption.name, value)" title="<% if (enableTranslation) { %>{{ 'entity.filters.clear' | translate }}<% } else { %>__jhiTransformTranslate__('entity.filters.clear')<% } %>"></fa-icon>
       </li>
     </ng-container>
   </ul>

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

@@ -211,7 +211,7 @@ describe('FilterModel Tests', () => {
         expect(filters.filterOptions).toMatchObject([]);
       });
 
-      it('should parse from Params and have a parameter with 2 values and one aditional value', () => {
+      it('should parse from Params and have a parameter with 2 values and one additional value', () => {
         const filters: FilterOptions = new FilterOptions([new FilterOption('hello.in', ['world'])]);
         jest.spyOn(filters.filterChanges, 'next');
 

package/dist/generators/angular/templates/src/main/webapp/app/shared/pagination/item-count.component.ts.ejs

@@ -31,7 +31,7 @@ import TranslateDirective from '../language/translate.directive';
 <%_ if (enableTranslation) { _%>
     <div <%= jhiPrefix %>Translate="global.item-count" [translateValues]="{ first: first, second: second, total: total }"></div>
 <%_ } else { _%>
-    <div><%- getWebappTranslation('global.item-count') %></div>
+    <div>__jhiTransformTranslate__('global.item-count')</div>
 <%_ } _%>
   `,
 <%_ if (enableTranslation) { _%>

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

@@ -19,14 +19,14 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./<%= clientDistDir %>app",
+    "outDir": "./<%= this.relativeDir(clientRootDir, temporaryDir) %>out-tsc/app",
     "types": ["@angular/localize"]
   },
   "files": [
 <%_ if (communicationSpringWebsocket) { _%>
-    "<%= clientSrcDir %>sockjs-client.polyfill.ts",
+    "<%= this.relativeDir(clientRootDir, clientSrcDir) %>sockjs-client.polyfill.ts",
 <%_ } _%>
-    "<%= clientSrcDir %>main.ts"
+    "<%= this.relativeDir(clientRootDir, clientSrcDir) %>main.ts"
   ],
-  "include": ["<%= clientSrcDir %>**/*.d.ts"]
+  "include": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>**/*.d.ts"]
 }

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

@@ -18,8 +18,8 @@
 -%>
 {
   "compilerOptions": {
-    "baseUrl": "<%= clientSrcDir %>",
-    "outDir": "./<%= clientDistDir %>",
+    "baseUrl": "<%- this.relativeDir(clientRootDir, clientSrcDir) %>",
+    "outDir": "./<%- this.relativeDir(clientRootDir, temporaryDir) %>out-tsc/root",
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "strictNullChecks": true,
@@ -37,7 +37,7 @@
     "target": "es2022",
     "module": "es2020",
     "types": [],
-    "lib": ["es2018", "dom"]
+    "lib": ["es2018", "es2020", "dom"]
   },
   "references": [
     {

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

@@ -18,10 +18,10 @@
 -%>
 {
   "extends": "./tsconfig.json",
-  "include": ["<%= clientSrcDir %>**/*.ts"],
+  "include": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>**/*.ts"],
   "compilerOptions": {
     "composite": true,
-    "outDir": "<%= temporaryDir %>out-tsc/spec",
+    "outDir": "<%= this.relativeDir(clientRootDir, temporaryDir) %>out-tsc/spec",
     "types": ["jest", "node"]
   }
 }

package/dist/generators/angular/templates/webpack/proxy.conf.js.ejs

@@ -17,21 +17,22 @@
  limitations under the License.
 -%>
 function setupProxy({ tls }) {
-  const conf = [
-    {
-      context: [
-        '/api',
-        '/services',
-        '/management',
-        '/v3/api-docs',
-        '/h2-console',
+  const serverResources = [
+    '/api',
+    '/services',
+    '/management',
+    '/v3/api-docs',
+    '/h2-console',
 <%_ if (authenticationTypeOauth2) { _%>
-        '/oauth2',
-        '/login',
+    '/oauth2',
+    '/login',
 <%_ } _%>
-        '/auth',
-        '/health',
-      ],
+    '/auth',
+    '/health',
+  ];
+  const conf = [
+    {
+      context: serverResources,
       target: `http${tls ? 's' : ''}://localhost:<%= applicationTypeMicroservice ? gatewayServerPort : serverPort %>`,
       secure: false,
       changeOrigin: tls,

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

@@ -37,7 +37,7 @@ const proxyConfig = require('./proxy.conf');
 
 module.exports = async (config, options, targetOptions) => {
 <%_ if (enableTranslation) { _%>
-  const languagesHash = await hashElement(path.resolve(__dirname, '../<%= clientSrcDir %>i18n'), {
+  const languagesHash = await hashElement(path.resolve(__dirname, '<%= this.relativeDir(clientRootDir + 'webpack/', clientSrcDir) %>i18n'), {
     algo: 'md5',
     encoding: 'hex',
     files: { include: ['*.json'] },
@@ -107,8 +107,8 @@ module.exports = async (config, options, targetOptions) => {
       new BundleAnalyzerPlugin({
         analyzerMode: 'static',
         openAnalyzer: false,
-        // Webpack statistics in target folder
-        reportFilename: '../stats.html',
+        // Webpack statistics in temporary folder
+        reportFilename: '<%- this.relativeDir(clientDistDir, temporaryDir) %>stats.html',
       })
     );
   }
@@ -125,7 +125,7 @@ module.exports = async (config, options, targetOptions) => {
       from: path.join(path.dirname(require.resolve('axios/package.json')), 'dist/axios.min.js'),
       to: 'swagger-ui/',
     },
-    { from: './<%= clientSrcDir %>swagger-ui/', to: 'swagger-ui/' },
+    { from: './<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/', to: 'swagger-ui/' },
     // jhipster-needle-add-assets-to-webpack - JHipster will add/remove third-party resources in this array
   ];
 

package/dist/generators/app/command.mjs

@@ -1,7 +1,71 @@
-import { GENERATOR_COMMON, GENERATOR_GIT, GENERATOR_SERVER } from '../generator-list.mjs';
+import { GENERATOR_BOOTSTRAP, GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_CYPRESS, GENERATOR_GIT, GENERATOR_LANGUAGES, GENERATOR_SERVER, } from '../generator-list.mjs';
 const command = {
-    options: {},
-    loadGeneratorOptions: true,
-    import: [GENERATOR_SERVER, GENERATOR_COMMON, GENERATOR_GIT],
+    options: {
+        defaults: {
+            description: 'Execute jhipster with default config',
+            type: Boolean,
+        },
+        skipClient: {
+            description: 'Skip the client-side application generation',
+            type: Boolean,
+            scope: 'storage',
+        },
+        skipServer: {
+            description: 'Skip the server-side application generation',
+            type: Boolean,
+            scope: 'storage',
+        },
+        jhiPrefix: {
+            description: 'Add prefix before services, controllers and states name',
+            type: String,
+            scope: 'storage',
+        },
+        entitySuffix: {
+            description: 'Add suffix after entities name',
+            type: String,
+            scope: 'storage',
+        },
+        dtoSuffix: {
+            description: 'Add suffix after dtos name',
+            type: String,
+            scope: 'storage',
+        },
+        blueprint: {
+            description: 'DEPRECATED: Specify a generator blueprint to use for the sub generators',
+            type: Array,
+        },
+        blueprints: {
+            description: 'A comma separated list of one or more generator blueprints to use for the sub generators, e.g. --blueprints kotlin,vuejs',
+            type: String,
+        },
+        ignoreErrors: {
+            description: "Don't fail on prettier errors.",
+            type: Boolean,
+        },
+        pkType: {
+            description: 'Default primary key type (beta)',
+            type: String,
+            scope: 'storage',
+        },
+        clientPackageManager: {
+            description: 'Force an unsupported client package manager',
+            type: String,
+            scope: 'storage',
+        },
+        testFrameworks: {
+            description: 'Test frameworks to be generated',
+            type: Array,
+        },
+    },
+    configs: {},
+    import: [
+        GENERATOR_BOOTSTRAP,
+        GENERATOR_SERVER,
+        GENERATOR_CLIENT,
+        GENERATOR_COMMON,
+        GENERATOR_GIT,
+        GENERATOR_CYPRESS,
+        GENERATOR_LANGUAGES,
+    ],
 };
 export default command;