generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.3

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

@@ -1,49 +1,50 @@
 {
   "dependencies": {
-    "@angular/common": "16.0.5",
+    "@angular/common": "16.2.3",
     "@fortawesome/angular-fontawesome": "0.13.0",
-    "@fortawesome/fontawesome-svg-core": "6.4.0",
-    "@fortawesome/free-solid-svg-icons": "6.4.0",
-    "@ng-bootstrap/ng-bootstrap": "15.0.1",
+    "@fortawesome/fontawesome-svg-core": "6.4.2",
+    "@fortawesome/free-solid-svg-icons": "6.4.2",
+    "@ng-bootstrap/ng-bootstrap": "15.1.1",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@popperjs/core": "2.11.8",
-    "bootstrap": "5.3.0",
-    "bootswatch": "5.3.0",
-    "ngx-cookie-service": "16.0.0",
+    "bootstrap": "5.3.1",
+    "bootswatch": "5.3.1",
+    "ngx-cookie-service": "16.0.1",
     "ngx-infinite-scroll": "16.0.0",
     "rxjs": "7.8.1",
-    "tslib": "2.5.3",
-    "zone.js": "0.13.0"
+    "tslib": "2.6.2",
+    "zone.js": "0.13.1"
   },
   "devDependencies": {
-    "@angular-architects/module-federation-runtime": "16.0.3",
-    "@angular-builders/custom-webpack": "16.0.0",
-    "@angular-builders/jest": "16.0.0",
-    "@angular-eslint/eslint-plugin": "16.0.2",
-    "@angular/cli": "16.0.5",
-    "@types/jest": "29.5.1",
-    "@types/node": "16.18.34",
-    "@typescript-eslint/eslint-plugin": "5.59.9",
+    "@angular-architects/module-federation-runtime": "16.0.4",
+    "@angular-builders/custom-webpack": "16.0.1",
+    "@angular-builders/jest": "16.0.1",
+    "@angular-eslint/eslint-plugin": "16.1.1",
+    "@angular/cli": "16.2.1",
+    "@types/jest": "29.5.4",
+    "@types/node": "18.17.14",
+    "@typescript-eslint/eslint-plugin": "6.6.0",
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
+    "buffer": "6.0.3",
     "copy-webpack-plugin": "11.0.0",
-    "eslint": "8.42.0",
-    "eslint-config-prettier": "8.8.0",
+    "eslint": "8.48.0",
+    "eslint-config-prettier": "9.0.0",
     "eslint-webpack-plugin": "4.0.1",
     "folder-hash": "4.0.4",
-    "jest": "29.5.0",
+    "jest": "29.6.4",
     "jest-date-mock": "1.0.8",
     "jest-junit": "16.0.0",
     "jest-preset-angular": "13.1.1",
     "jest-sonar": "0.2.16",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "postcss-rtlcss": "4.0.6",
+    "postcss-rtlcss": "4.0.7",
     "rimraf": "5.0.1",
-    "ts-jest": "29.1.0",
-    "typescript": "5.0.4",
-    "webpack": "5.86.0",
-    "webpack-bundle-analyzer": "4.9.0",
+    "ts-jest": "29.1.1",
+    "typescript": "5.1.6",
+    "webpack": "5.88.2",
+    "webpack-bundle-analyzer": "4.9.1",
     "webpack-merge": "5.9.0",
     "webpack-notifier": "1.15.0"
   }

package/dist/generators/angular/support/needles.mjs

@@ -1,13 +1,15 @@
 import { createNeedleCallback } from '../../base/support/needles.mjs';
+import { upperFirstCamelCase } from '../../base/support/string.mjs';
 import { joinCallbacks } from '../../base/support/write-files.mjs';
-export function addRoute({ needle, route, pageTitle, modulePath, moduleName, }) {
+export function addRoute({ needle, route, pageTitle, title, modulePath, moduleName, component, }) {
     const routePath = `path: '${route}',`;
     // prettier-ignore
     const contentToAdd = `
     {
       ${routePath}${pageTitle ? `
-      data: { pageTitle: '${pageTitle}' },` : ''}
-      loadChildren: () => import('${modulePath}')${moduleName ? `.then(m => m.${moduleName})` : ''},
+      data: { pageTitle: '${pageTitle}' },` : ''}${title ? `
+      title: '${title}',` : ''}
+      load${component ? 'Component' : 'Children'}: () => import('${modulePath}')${moduleName ? `.then(m => m.${moduleName})` : ''},
     },`;
     return createNeedleCallback({
         needle,
@@ -29,6 +31,33 @@ export function addEntitiesRoute({ application, entities }) {
         });
     }));
 }
+export function addItemToMenu({ needle, enableTranslation, jhiPrefix, icon = 'asterisk', route, translationKey, name = '', }) {
+    const routerLink = `routerLink="/${route}"`;
+    const contentToAdd = `
+        <li>
+          <a class="dropdown-item" ${routerLink} routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }" (click)="collapseNavbar()">
+            <fa-icon icon="${icon}" [fixedWidth]="true"></fa-icon>
+            <span${enableTranslation ? ` ${jhiPrefix}Translate="${translationKey}"` : ''}>${name}</span>
+          </a>
+        </li>`;
+    return createNeedleCallback({
+        needle,
+        contentToAdd,
+        contentToCheck: routerLink,
+    });
+}
+export const addItemToAdminMenu = (menu) => addItemToMenu({
+    needle: 'add-element-to-admin-menu',
+    ...menu,
+});
+export const addIconImport = ({ icon }) => {
+    const iconImport = `fa${upperFirstCamelCase(icon)}`;
+    return createNeedleCallback({
+        needle: 'jhipster-needle-add-icon-import',
+        contentToCheck: new RegExp(`\\b${iconImport}\\b`),
+        contentToAdd: (content, { indentPrefix }) => content.replace(/(\r?\n)(\s*)\/\/ jhipster-needle-add-icon-import/g, `\n${indentPrefix}${iconImport},\n${indentPrefix}// jhipster-needle-add-icon-import`),
+    });
+};
 export function addToEntitiesMenu({ application, entities }) {
     const { enableTranslation, jhiPrefix } = application;
     return joinCallbacks(...entities.map(entity => {

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

@@ -36,14 +36,17 @@ function getTranslationValue(getWebappTranslation, key, data) {
  * @param {number} [options.replacementIndex]
  * @returns {string}
  */
-function replaceTranslationKeysWithText(getWebappTranslation, content, regexSource, { keyIndex = 1, replacementIndex = 1 } = {}) {
+function replaceTranslationKeysWithText(getWebappTranslation, content, regexSource, { keyIndex = 1, replacementIndex = 1, escape } = {}) {
     const regex = new RegExp(regexSource, 'g');
     let match = regex.exec(content);
     while (match !== null) {
         // match is now the next match, in array form and our key is at index 1, index 1 is replace target.
         const key = match[keyIndex];
         const target = match[replacementIndex];
-        const translation = getTranslationValue(getWebappTranslation, key);
+        let translation = getTranslationValue(getWebappTranslation, key);
+        if (escape) {
+            translation = escape(translation, match);
+        }
         content = content.replace(target, translation);
         match = regex.exec(content);
     }
@@ -54,10 +57,12 @@ function replaceTranslationKeysWithText(getWebappTranslation, content, regexSour
  * @param {import('../generator-base.js')} generator reference to the generator
  * @param {string} content html content
  * @param {string} jsKey
- * @returns string with pageTitle replaced
+ * @returns string with jsKey value replaced
  */
 function replaceJSTranslation(getWebappTranslation, content, jsKey) {
-    return replaceTranslationKeysWithText(getWebappTranslation, content, `${jsKey}\\s?:\\s?['|"]([a-zA-Z0-9.\\-_]+)['|"]`);
+    return replaceTranslationKeysWithText(getWebappTranslation, content, `${jsKey}\\s?:\\s?['|"]([a-zA-Z0-9.\\-_]+)['|"]`, {
+        escape: (translation, match) => translation.replaceAll(match[0].slice(-1), `\\${match[0].slice(-1)}`),
+    });
 }
 /**
  *

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

@@ -95,13 +95,13 @@
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-floating-promises": "off",
     "@typescript-eslint/no-non-null-assertion": "off",
-    "@typescript-eslint/no-parameter-properties": ["warn", { "allows": ["public", "private", "protected"] }],
     "@typescript-eslint/no-shadow": ["error"],
     "@typescript-eslint/no-unnecessary-condition": "error",
     "@typescript-eslint/no-unsafe-argument": "off",
     "@typescript-eslint/no-unsafe-assignment": "off",
     "@typescript-eslint/no-unsafe-call": "off",
     "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/no-unused-vars": "off",
     "@typescript-eslint/prefer-nullish-coalescing": "error",
     "@typescript-eslint/prefer-optional-chain": "error",
     "@typescript-eslint/unbound-method": "off",

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

@@ -94,6 +94,7 @@
     "@typescript-eslint/parser": "<%= nodeDependencies['@typescript-eslint/eslint-plugin'] %>",
     "browser-sync": "<%= nodeDependencies['browser-sync'] %>",
     "browser-sync-webpack-plugin": "<%= nodeDependencies['browser-sync-webpack-plugin'] %>",
+    "buffer": "<%= nodeDependencies['buffer'] %>",
     "copy-webpack-plugin": "<%= nodeDependencies['copy-webpack-plugin'] %>",
     "eslint": "<%= nodeDependencies['eslint'] %>",
     "eslint-config-prettier": "<%= nodeDependencies['eslint-config-prettier'] %>",

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { Component, OnInit } from '@angular/core';
-import { finalize, map } from 'rxjs/operators';
+import { finalize<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>, map<%_ } _%> } from 'rxjs/operators';
 
 import SharedModule from 'app/shared/shared.module';
 import { FormsModule } from '@angular/forms';

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs

@@ -17,10 +17,9 @@
  limitations under the License.
 -%>
 import { Component, OnInit } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import { RouterModule<%_ if (!databaseTypeCassandra) { _%>, ActivatedRoute, Router<%_ } _%> } from '@angular/router';
 import { HttpResponse<%_ if (!databaseTypeCassandra) { %>, HttpHeaders <% } %>} from '@angular/common/http';
 <%_ if (!databaseTypeCassandra) { _%>
-import { ActivatedRoute, Router } from '@angular/router';
 import { combineLatest } from 'rxjs';
 <%_ } _%>
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs

@@ -16,9 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Injectable } from '@angular/core';
-import { Resolve, ActivatedRouteSnapshot, Routes } from '@angular/router';
-import { Observable, of } from 'rxjs';
+import { inject } from '@angular/core';
+import { ActivatedRouteSnapshot, Routes, ResolveFn } from '@angular/router';
+import { of } from 'rxjs';
 
 import { IUser } from './user-management.model';
 import { UserManagementService } from './service/user-management.service';
@@ -26,18 +26,13 @@ import UserManagementComponent from './list/user-management.component';
 import UserManagementDetailComponent from './detail/user-management-detail.component';
 import UserManagementUpdateComponent from './update/user-management-update.component';
 
-@Injectable({ providedIn: 'root' })
-export class UserManagementResolve implements Resolve<IUser | null> {
-  constructor(private service: UserManagementService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<IUser | null> {
-    const id = route.params['login'];
-    if (id) {
-      return this.service.find(id);
-    }
-    return of(null);
+export const UserManagementResolve: ResolveFn<IUser | null> = (route: ActivatedRouteSnapshot) => {
+  const login = route.paramMap.get('login');
+  if (login) {
+    return inject(UserManagementService).find(login);
   }
-}
+  return of(null);
+};
 
 const userManagementRoute: Routes = [
   {

package/dist/generators/angular/templates/src/main/webapp/app/app-routing.module.ts.ejs

@@ -75,7 +75,7 @@ import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'
           path: '<%= applicationTypeMicroservice ? lowercaseBaseName : '' %>',
           loadChildren: () => import(`./entities/entity-routing.module`).then(({ EntityRoutingModule }) => EntityRoutingModule),
         },
-<%_ if (applicationTypeGateway) { _%>
+<%_ if (applicationTypeGateway && microfrontend) { _%>
   <%_ for (const remote of microfrontends) { _%>
         {
           path: '<%= remote.lowercaseBaseName %>',

package/dist/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs

@@ -16,9 +16,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Injectable, isDevMode } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
+import { inject, isDevMode } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivateFn, Router, RouterStateSnapshot } from '@angular/router';
 import { map } from 'rxjs/operators';
 
 import { AccountService } from 'app/core/auth/account.service';
@@ -27,42 +26,36 @@ import { LoginService } from 'app/login/login.service';
 <%_ } _%>
 import { StateStorageService } from './state-storage.service';
 
-@Injectable({ providedIn: 'root' })
-export class UserRouteAccessService implements CanActivate {
-  constructor(
-    private router: Router,
+export const UserRouteAccessService: CanActivateFn = (next: ActivatedRouteSnapshot, state: RouterStateSnapshot) => {
+  const accountService = inject(AccountService);
+  const router = inject(Router);
+  const stateStorageService = inject(StateStorageService);
 <%_ if (authenticationTypeOauth2) { _%>
-    private loginService: LoginService,
+  const loginService = inject(LoginService);
 <%_ } _%>
-    private accountService: AccountService,
-    private stateStorageService: StateStorageService
-  ) {}
+  return accountService.identity().pipe(
+    map(account => {
+      if (account) {
+        const authorities = next.data['authorities'];
 
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
-    return this.accountService.identity().pipe(
-      map(account => {
-        if (account) {
-          const authorities = route.data['authorities'];
-
-          if (!authorities || authorities.length === 0 || this.accountService.hasAnyAuthority(authorities)) {
-            return true;
-          }
+        if (!authorities || authorities.length === 0 || accountService.hasAnyAuthority(authorities)) {
+          return true;
+        }
 
-          if (isDevMode()) {
-            console.error('User has not any of required authorities: ', authorities);
-          }
-          this.router.navigate(['accessdenied']);
-          return false;
+        if (isDevMode()) {
+          console.error('User has not any of required authorities: ', authorities);
         }
+        router.navigate(['accessdenied']);
+        return false;
+      }
 
-        this.stateStorageService.storeUrl(state.url);
+      stateStorageService.storeUrl(state.url);
 <%_ if (!authenticationTypeOauth2) { _%>
-        this.router.navigate(['/login']);
+      router.navigate(['/login']);
 <%_ } else { _%>
-        this.loginService.login();
+      loginService.login();
 <%_ } _%>
-        return false;
-      })
-    );
-  }
-}
+      return false;
+    })
+  );
+};

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/route/_entityFile-routing-resolve.service.spec.ts.ejs

@@ -22,7 +22,7 @@ _%>
 import { TestBed } from '@angular/core/testing';
 import { HttpResponse } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { ActivatedRouteSnapshot, ActivatedRoute, Router, convertToParamMap, RouterStateSnapshot } from '@angular/router';
+import { ActivatedRouteSnapshot, ActivatedRoute, Router, convertToParamMap } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/service/_entityFile.service.spec.ts.ejs

@@ -72,7 +72,6 @@ describe('<%= entityAngularName %> Service', () => {
 
 <%_ if (!readOnly) { _%>
         it('should create a <%= entityAngularName %>', () => {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const <%= entityInstance %> = { ...sampleWithNewData };
             const returnedFromService = { ...requireRestSample };
             const expected = { ...sampleWithRequiredData };
@@ -134,7 +133,7 @@ describe('<%= entityAngularName %> Service', () => {
         });
 <%_ } _%>
 
-<%_ if (searchEngineElasticsearch) { _%>
+<%_ if (searchEngineAny) { _%>
         it('should handle exceptions for searching a <%= entityAngularName %>', () => {
             const queryObject: any = {
                 page: 0,

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/service/_entityFile.service.ts.ejs

@@ -24,9 +24,9 @@ if (paginationPagination || paginationInfiniteScroll) {
 _%>
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpResponse } from '@angular/common/http';
-import { Observable<%_ if (searchEngineElasticsearch) { _%>, asapScheduler, scheduled<%_ } _%> } from 'rxjs';
+import { Observable<%_ if (searchEngineAny) { _%>, asapScheduler, scheduled<%_ } _%> } from 'rxjs';
 
-<%_ if (searchEngineElasticsearch) {
+<%_ if (searchEngineAny) {
   if (anyFieldIsDateDerived) { _%>
 import { catchError, map } from 'rxjs/operators';
 <% } else { %>

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-form.service.spec.ts.ejs

@@ -63,7 +63,6 @@ describe('<%= entityAngularName %> Form Service', () => {
 
     describe('get<%= entityAngularName %>', () => {
       it('should return New<%= entityAngularName %> for default <%= entityAngularName %> initial value', () => {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const formGroup = service.create<%= entityAngularName %>FormGroup(sampleWithNewData);
 
         const <%= entityInstance %> = service.get<%= entityAngularName %>(formGroup) as any;

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

@@ -24,7 +24,7 @@ Main page styles
   display: inline-block;
   width: 347px;
   height: 497px;
-  background: url('/content/images/<%= hipster %>.svg') no-repeat center top;
+  background: url('../../content/images/<%= hipster %>.svg') no-repeat center top;
   background-size: contain;
 }
 
@@ -35,7 +35,7 @@ Main page styles
   only screen and (min-resolution: 192dpi),
   only screen and (min-resolution: 2dppx) {
   .hipster {
-    background: url('/content/images/<%= hipster %>.svg') no-repeat center top;
+    background: url('../../content/images/<%= hipster %>.svg') no-repeat center top;
     background-size: contain;
   }
 }

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

@@ -61,7 +61,7 @@
           </span>
         </a>
         <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="entity-menu">
-<%_ if (applicationTypeGateway) { _%>
+<%_ if (applicationTypeGateway && microfrontend) { _%>
   <%_ for (const remote of microfrontends) { _%>
           <li *ngIf="<%= remote.lowercaseBaseName %>EntityNavbarItems.length === 0">
             <span class="dropdown-item">Failed to load <%= remote.lowercaseBaseName %> entities</span>

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/navbar/navbar.component.ts.ejs

@@ -64,7 +64,7 @@ export default class NavbarComponent implements OnInit {
   version = '';
   account: Account | null = null;
   entitiesNavbarItems: NavbarItem[] = [];
-<%_ if (applicationTypeGateway) { _%>
+<%_ if (applicationTypeGateway && microfrontend) { _%>
   <%_ for (const remote of microfrontends) { _%>
   <%= remote.lowercaseBaseName %>EntityNavbarItems: NavbarItem[] = [];
   <%_ } _%>

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

@@ -97,7 +97,7 @@ export class FilterOptions implements IFilterOptions {
     params.keys
       .filter(paramKey => filterRegex.test(paramKey))
       .forEach(matchingParam => {
-        const matches = matchingParam.match(filterRegex);
+        const matches = filterRegex.exec(matchingParam);
         if (matches && matches.length > 1) {
           this.getFilterOptionByName(matches[1], true).addValue(...params.getAll(matchingParam));
         }

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

@@ -37,7 +37,7 @@
     "target": "es2022",
     "module": "es2020",
     "types": [],
-    "lib": ["es2018", "dom"]
+    "lib": ["es2018", "es2020", "dom"]
   },
   "references": [
     {

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/app/generator.mjs

@@ -20,9 +20,9 @@
 import chalk from 'chalk';
 import _ from 'lodash';
 import BaseApplicationGenerator from '../base-application/index.mjs';
-import { checkNode } from './support/index.mjs';
+import { checkNode, loadStoredAppOptions } from './support/index.mjs';
 import cleanupOldFilesTask from './cleanup.mjs';
-import prompts from './prompts.mjs';
+import { askForApplicationType, askForInsightOptIn } from './prompts.mjs';
 import statistics from '../statistics.mjs';
 import { GENERATOR_APP, GENERATOR_COMMON, GENERATOR_LANGUAGES, GENERATOR_CLIENT, GENERATOR_PAGE, GENERATOR_SERVER, GENERATOR_BOOTSTRAP_APPLICATION_BASE, } from '../generator-list.mjs';
 import { applicationTypes, applicationOptions, clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
@@ -35,7 +35,6 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
         this.option('defaults', {
             description: 'Execute jhipster with default config',
             type: Boolean,
-            default: false,
         });
         this.option('base-name', {
             description: 'Application base name',
@@ -79,12 +78,6 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
             description: 'Skip generation of fake data for development',
             type: Boolean,
         });
-        // This adds support for a `--with-entities` flag
-        this.option('with-entities', {
-            alias: 'e',
-            description: 'Regenerate the existing entities if any',
-            type: Boolean,
-        });
         // This adds support for a `--jhi-prefix` flag
         this.option('jhi-prefix', {
             description: 'Add prefix before services, controllers and states name',
@@ -135,11 +128,6 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
             description: 'A comma separated list of one or more generator blueprints to use for the sub generators, e.g. --blueprints kotlin,vuejs',
             type: String,
         });
-        // This adds support for a `--creation-timestamp` flag which can be used create reproducible builds
-        this.option('creation-timestamp', {
-            description: 'Project creation timestamp (used for reproducible builds)',
-            type: String,
-        });
         this.option('incremental-changelog', {
             description: 'Creates incremental database changelogs',
             type: Boolean,
@@ -176,10 +164,6 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
             description: 'Default primary key type (beta)',
             type: String,
         });
-        this.option('reproducible', {
-            description: 'Try to reproduce changelog',
-            type: Boolean,
-        });
         this.option('client-package-manager', {
             description: 'Force an unsupported client package manager',
             type: String,
@@ -218,8 +202,7 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
         });
     }
     async beforeQueue() {
-        this.loadStoredAppOptions();
-        this.loadRuntimeOptions();
+        loadStoredAppOptions.call(this);
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_APP);
@@ -239,7 +222,7 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
                 }
             },
             validate() {
-                if (this.skipServer && this.skipClient) {
+                if (!this.skipChecks && this.jhipsterConfig.skipServer && this.jhipsterConfig.skipClient) {
                     throw new Error(`You can not pass both ${chalk.yellow('--skip-client')} and ${chalk.yellow('--skip-server')} together`);
                 }
             },
@@ -250,8 +233,8 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
     }
     get prompting() {
         return {
-            askForInsightOptIn: prompts.askForInsightOptIn,
-            askForApplicationType: prompts.askForApplicationType,
+            askForInsightOptIn,
+            askForApplicationType,
         };
     }
     get [BaseApplicationGenerator.PROMPTING]() {
@@ -313,12 +296,10 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
                     await this.composeWithJHipster(GENERATOR_CLIENT);
                 }
             },
-            askForTestOpts: prompts.askForTestOpts,
             /**
              * At this point every other generator should already be configured, so, enforce defaults fallback.
              */
             saveConfigWithDefaults() {
-                this.setConfigDefaults();
                 this._validateAppConfiguration();
             },
             async composePages() {
@@ -361,7 +342,7 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
     }
-    _validateAppConfiguration(config = this.jhipsterConfig) {
+    _validateAppConfiguration(config = this.jhipsterConfigWithDefaults) {
         if (config.entitySuffix === config.dtoSuffix) {
             throw new Error('Entities cannot be generated as the entity suffix and DTO suffix are equals !');
         }