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

package/README.md

@@ -44,11 +44,6 @@ Support this project by becoming a sponsor! [Become a sponsor](https://opencolle
           <img width="200em" src="https://www.jhipster.tech/images/open-collective/entandoe.png">
         </a>
       </td>
-      <td align="center" valign="middle">
-        <a href="https://www.datastax.com/" target="_blank">
-          <img width="200em" src="https://www.jhipster.tech/images/open-collective/datastax.png">
-        </a>
-      </td>
     </tr>
   </tbody>
 </table>

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

@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "@angular/common": "16.0.5",
+    "@angular/common": "16.1.4",
     "@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",
+    "@ng-bootstrap/ng-bootstrap": "15.1.0",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@popperjs/core": "2.11.8",
@@ -13,26 +13,26 @@
     "ngx-cookie-service": "16.0.0",
     "ngx-infinite-scroll": "16.0.0",
     "rxjs": "7.8.1",
-    "tslib": "2.5.3",
-    "zone.js": "0.13.0"
+    "tslib": "2.6.0",
+    "zone.js": "0.13.1"
   },
   "devDependencies": {
-    "@angular-architects/module-federation-runtime": "16.0.3",
+    "@angular-architects/module-federation-runtime": "16.0.4",
     "@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/cli": "16.1.4",
+    "@types/jest": "29.5.3",
+    "@types/node": "18.16.19",
+    "@typescript-eslint/eslint-plugin": "5.61.0",
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "11.0.0",
-    "eslint": "8.42.0",
+    "eslint": "8.44.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-webpack-plugin": "4.0.1",
     "folder-hash": "4.0.4",
-    "jest": "29.5.0",
+    "jest": "29.6.1",
     "jest-date-mock": "1.0.8",
     "jest-junit": "16.0.0",
     "jest-preset-angular": "13.1.1",
@@ -40,9 +40,9 @@
     "merge-jsons-webpack-plugin": "2.0.1",
     "postcss-rtlcss": "4.0.6",
     "rimraf": "5.0.1",
-    "ts-jest": "29.1.0",
-    "typescript": "5.0.4",
-    "webpack": "5.86.0",
+    "ts-jest": "29.1.1",
+    "typescript": "5.1.6",
+    "webpack": "5.88.1",
     "webpack-bundle-analyzer": "4.9.0",
     "webpack-merge": "5.9.0",
     "webpack-notifier": "1.15.0"

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

package/dist/generators/app/prompts.mjs

@@ -85,7 +85,7 @@ export async function askForApplicationType({ control }) {
             type: 'confirm',
             name: 'microfrontend',
             message: `Do you want to enable ${chalk.yellow('*microfrontends*')}?`,
-            default: config.microfrontend,
+            default: config.microfrontend ?? false,
         },
         {
             when: answers => {

package/dist/generators/base/generator-base-blueprint.mjs

@@ -22,7 +22,7 @@ import path from 'path';
 import semver from 'semver';
 import { packageJson } from '../../lib/index.mjs';
 import { packageNameToNamespace } from './support/index.mjs';
-import JHipsterBaseGenerator from './generator-base.mjs';
+import JHipsterBaseGenerator from './generator-base-todo.mjs';
 import { mergeBlueprints, parseBluePrints, loadBlueprintsFromConfiguration, normalizeBlueprintName } from './internal/index.mjs';
 import { PRIORITY_NAMES } from './priorities.mjs';
 /**
@@ -40,6 +40,8 @@ export default class JHipsterBaseBlueprintGenerator extends JHipsterBaseGenerato
         if (this.options.help) {
             return;
         }
+        this.loadRuntimeOptions();
+        this.loadStoredAppOptions();
         this.sbsBlueprint = this.features.sbsBlueprint ?? false;
         this.fromBlueprint = this.rootGeneratorName() !== 'generator-jhipster';
         if (this.fromBlueprint) {
@@ -508,14 +510,14 @@ export default class JHipsterBaseBlueprintGenerator extends JHipsterBaseGenerato
                 this.log.verboseInfo(`Blueprint ${blueprintPkgName} contains generator-jhipster dependency with non comparable version`);
                 return;
             }
-            if (semver.satisfies(mainGeneratorJhipsterVersion, blueprintJhipsterVersion)) {
+            if (semver.satisfies(mainGeneratorJhipsterVersion, blueprintJhipsterVersion, { includePrerelease: true })) {
                 return;
             }
             throw new Error(`The installed ${chalk.yellow(blueprintPkgName)} blueprint targets JHipster v${blueprintJhipsterVersion} and is not compatible with this JHipster version. Either update the blueprint or JHipster. You can also disable this check using --skip-checks at your own risk`);
         }
         const blueprintPeerJhipsterVersion = blueprintPackageJson.peerDependencies && blueprintPackageJson.peerDependencies['generator-jhipster'];
         if (blueprintPeerJhipsterVersion) {
-            if (semver.satisfies(mainGeneratorJhipsterVersion, blueprintPeerJhipsterVersion)) {
+            if (semver.satisfies(mainGeneratorJhipsterVersion, blueprintPeerJhipsterVersion, { includePrerelease: true })) {
                 return;
             }
             throw new Error(`The installed ${chalk.yellow(blueprintPkgName)} blueprint targets JHipster ${blueprintPeerJhipsterVersion} and is not compatible with this JHipster version. Either update the blueprint or JHipster. You can also disable this check using --skip-checks at your own risk`);

package/dist/generators/base/generator-base-todo.mjs

@@ -23,9 +23,7 @@ import chalk from 'chalk';
 import fs from 'fs';
 import { exec } from 'child_process';
 import os from 'os';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
-import YeomanGenerator from 'yeoman-generator';
+import JHipsterBaseCoreGenerator from '../base-core/index.mjs';
 import { formatDateForChangelog, normalizePathEnd, createJHipster7Context, upperFirstCamelCase } from './support/index.mjs';
 import { packageJson } from '../../lib/index.mjs';
 import { detectLanguage, loadLanguagesConfig } from '../languages/support/index.mjs';
@@ -36,8 +34,6 @@ import { SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_T
 import { removeFieldsWithNullishValues, parseCreationTimestamp, getHipster } from './support/index.mjs';
 import { getDefaultAppName } from '../project-name/support/index.mjs';
 import { MESSAGE_BROKER_KAFKA, MESSAGE_BROKER_NO, MESSAGE_BROKER_PULSAR } from '../server/options/index.mjs';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
 const { ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const GENERATOR_JHIPSTER = 'generator-jhipster';
 const { ORACLE, MYSQL, POSTGRESQL, MARIADB, MSSQL, SQL, MONGODB, COUCHBASE, NEO4J, CASSANDRA, H2_MEMORY, H2_DISK } = databaseTypes;
@@ -59,7 +55,7 @@ const isWin32 = os.platform() === 'win32';
 /**
  * Class the contains the methods that should be refactored and converted to typescript.
  */
-export default class JHipsterBaseGenerator extends YeomanGenerator {
+export default class JHipsterBaseGenerator extends JHipsterBaseCoreGenerator {
     /**
      * @private
      * Add a new element in the "global.json" translations.
@@ -815,8 +811,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         dest.humanizedBaseName = config.humanizedBaseName;
         dest.projectDescription = config.projectDescription;
         dest.testFrameworks = config.testFrameworks || [];
-        dest.remotes =
-            Object.entries(config.applications || {}).map(([baseName, remoteConfig]) => ({ baseName, ...remoteConfig })) || [];
         dest.gatlingTests = dest.testFrameworks.includes(GATLING);
         dest.cucumberTests = dest.testFrameworks.includes(CUCUMBER);
         dest.cypressTests = dest.testFrameworks.includes(CYPRESS);
@@ -862,9 +856,8 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                 microfrontend.endpointPrefix = `services/${microfrontend.lowercaseBaseName}`;
             });
         }
-        else if ((!dest.microfrontends || dest.microfrontends.length === 0) && dest.remotes) {
-            dest.remotes.forEach(app => this.loadDerivedAppConfig(app));
-            dest.microfrontends = dest.remotes.filter(r => r.clientFramework && r.clientFramework !== CLIENT_FRAMEWORK_NO);
+        else if (dest.microfrontend) {
+            dest.microfrontends = [];
         }
         dest.microfrontend =
             dest.microfrontend ||
@@ -917,7 +910,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                 dest.microfrontend = dest.clientFrameworkAny;
             }
             else if (dest.applicationTypeGateway) {
-                dest.microfrontend = dest.microfrontends.length > 0;
+                dest.microfrontend = dest.microfrontends && dest.microfrontends.length > 0;
             }
         }
         dest.clientThemeNone = dest.clientTheme === 'none';

package/dist/generators/base/support/faker.mjs

@@ -31,7 +31,7 @@ class RandexpWithFaker extends Randexp {
         }
         // In order to have consistent results with RandExp, the RNG is seeded.
         this.randInt = (from, to) => {
-            return faker.datatype.number({ min: from, max: to });
+            return faker.number.int({ min: from, max: to });
         };
     }
 }
@@ -48,23 +48,21 @@ class FakerWithRandexp extends Faker {
 // eslint-disable-next-line import/prefer-default-export
 export async function createFaker(nativeLanguage = 'en') {
     nativeLanguage = languageToJavaLanguage(nativeLanguage);
-    let nativeFakerInstance;
+    let locale;
     // Faker >=6 doesn't exports locales by itself, it exports a faker instance with the locale.
     // We need a Faker instance for each entity, to build additional fake instances, use the locale from the exported localized faker instance.
     // See https://github.com/faker-js/faker/pull/642
     try {
-        // eslint-disable-next-line import/no-dynamic-require
-        nativeFakerInstance = (await import(`@faker-js/faker/locale/${nativeLanguage}`)).faker;
+        // eslint-disable-next-line import/no-dynamic-require, quotes
+        locale = (await import(`@faker-js/faker`))[nativeLanguage];
     }
     catch (error) {
         // Faker not implemented for the native language, fallback to en.
         // eslint-disable-next-line import/no-unresolved, import/no-dynamic-require
-        nativeFakerInstance = (await import('@faker-js/faker/locale/en')).faker;
+        locale = (await import('@faker-js/faker')).en;
     }
     const faker = new FakerWithRandexp({
-        locales: nativeFakerInstance.locales,
-        locale: nativeFakerInstance.locale,
-        localeFallback: nativeFakerInstance.localeFallback,
+        locale: [locale],
     });
     faker.createRandexp = (pattern, m) => new RandexpWithFaker(pattern, m, faker);
     return faker;

package/dist/generators/base-application/support/prepare-field.mjs

@@ -38,7 +38,7 @@ const fakeStringTemplateForFieldName = columnName => {
         fakeTemplate = 'name.jobTitle';
     }
     else if (columnName === 'telephone' || columnName === 'phone') {
-        fakeTemplate = 'phone.phoneNumber';
+        fakeTemplate = 'phone.number';
     }
     else if (columnName === 'zip_code' || columnName === 'post_code') {
         fakeTemplate = 'address.zipCode';
@@ -122,7 +122,7 @@ function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
     else if (field.fieldIsEnum) {
         if (field.fieldValues.length !== 0) {
             const enumValues = field.enumValues;
-            data = enumValues[faker.datatype.number(enumValues.length - 1)].name;
+            data = enumValues[faker.number.int(enumValues.length - 1)].name;
         }
         else {
             this.log.warn(`Enum ${field.fieldType} is not valid`);
@@ -130,18 +130,18 @@ function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
         }
     }
     else if (field.fieldType === DURATION && type === 'cypress') {
-        data = `PT${faker.datatype.number({ min: 1, max: 59 })}M`;
+        data = `PT${faker.number.int({ min: 1, max: 59 })}M`;
         // eslint-disable-next-line no-template-curly-in-string
     }
     else if ([INTEGER, LONG, FLOAT, '${floatType}', DOUBLE, BIG_DECIMAL, DURATION].includes(field.fieldType)) {
-        data = faker.datatype.number({
-            max: field.fieldValidateRulesMax ? parseInt(field.fieldValidateRulesMax, 10) : undefined,
-            min: field.fieldValidateRulesMin ? parseInt(field.fieldValidateRulesMin, 10) : undefined,
+        data = faker.number.int({
+            max: field.fieldValidateRulesMax ? parseInt(field.fieldValidateRulesMax, 10) : 32767,
+            min: field.fieldValidateRulesMin ? parseInt(field.fieldValidateRulesMin, 10) : 0,
         });
     }
     else if ([INSTANT, ZONED_DATE_TIME, LOCAL_DATE].includes(field.fieldType)) {
         // Iso: YYYY-MM-DDTHH:mm:ss.sssZ
-        const date = faker.date.recent(1, changelogDate);
+        const date = faker.date.recent({ days: 1, refDate: changelogDate });
         const isoDate = date.toISOString();
         if (field.fieldType === LOCAL_DATE) {
             data = isoDate.split('T')[0];
@@ -167,10 +167,10 @@ function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
         data = '../fake-data/blob/hipster.txt';
     }
     else if (field.fieldType === STRING) {
-        data = field.id ? faker.datatype.uuid() : faker.helpers.fake(fakeStringTemplateForFieldName(field.columnName));
+        data = field.id ? faker.string.uuid() : faker.helpers.fake(fakeStringTemplateForFieldName(field.columnName));
     }
     else if (field.fieldType === UUID) {
-        data = faker.datatype.uuid();
+        data = faker.string.uuid();
     }
     else if (field.fieldType === BOOLEAN) {
         data = faker.datatype.boolean();