Merge branch 'jhipster:main' into main

.blueprint/generate-sample/generator.mjs

@@ -1,6 +1,7 @@
 import { extname } from 'path';
 import { transform } from '@yeoman/transform';
 import BaseGenerator from '../../generators/base/index.js';
+import { packageJson } from '../../lib/index.js';
 import { generateSample } from './support/generate-sample.js';
 import { promptSamplesFolder } from '../support.mjs';
 import { GENERATOR_APP, GENERATOR_JDL } from '../../generators/generator-list.js';
@@ -9,12 +10,16 @@ export default class extends BaseGenerator {
   sampleName;
   global;
   projectFolder;
+  projectVersion;
 
   get [BaseGenerator.INITIALIZING]() {
     return this.asInitializingTaskGroup({
       async parseCommand() {
         await this.parseCurrentJHipsterCommand();
       },
+      projectVersion() {
+        this.projectVersion = `${packageJson.version}-git`;
+      },
     });
   }
 
@@ -35,6 +40,7 @@ export default class extends BaseGenerator {
 
         await this.composeWithJHipster(GENERATOR_JDL, {
           generatorArgs: [this.templatePath('samples', this.sampleName)],
+          generatorOptions: { projectVersion: this.projectVersion },
         });
       },
       async generateSample() {
@@ -52,7 +58,7 @@ export default class extends BaseGenerator {
           transform(() => {}),
         );
 
-        let generatorOptions = { ...sample.sample.generatorOptions };
+        let generatorOptions = { projectVersion: this.projectVersion, ...sample.sample.generatorOptions };
         if (sample.sample.workspaces && sample.sample.workspaces !== 'false') {
           generatorOptions = { ...generatorOptions, workspaces: true, monorepository: true };
         }

.devcontainer/devcontainer.json

@@ -25,7 +25,12 @@
     "vscode": {
       // Set *default* container specific settings.json values on container create.
       "settings": {
-        "java.jdt.ls.java.home": "/docker-java-home"
+        "java.jdt.ls.java.home": "/docker-java-home",
+        "mochaExplorer.files": "**/*.spec.*(j|t)s",
+        "mochaExplorer.require": "@node-loaders/esbuildx,esmocha",
+        "mochaExplorer.parallel": true,
+        "mochaExplorer.timeout": 50000,
+        "mochaExplorer.configFile": ".mocharc.cjs"
       },
 
       // Add the IDs of extensions you want installed when the container is created.

.github/workflows/angular.yml

@@ -96,20 +96,18 @@ jobs:
           npm-version: ${{ matrix.npm-version }}
           maven-cache: true
           gradle-cache: ${{ matrix.gradle-cache }}
+          binary-dir: ${{ github.workspace }}/generator-jhipster/bin
       #----------------------------------------------------------------------
       # Install JHipster and generate project+entities
       #----------------------------------------------------------------------
       - run: npm ci --ignore-scripts
         working-directory: ${{ github.workspace }}/generator-jhipster
-      - uses: ./generator-jhipster/.github/actions/setup-generator-jhipster-jit
-        with:
-          generator-path: generator-jhipster
       - name: 'GENERATION: project'
-        run: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
+        run: jhipster.cjs generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
         env:
           JHI_FOLDER_APP: ${{ github.workspace }}/app
           JHIPSTER_DEPENDENCIES_VERSION: ${{ matrix.jhipster-bom-cicd-version }}
-      - run: jh info
+      - run: jhipster.cjs info
       #----------------------------------------------------------------------
       # Detect changes against base commit
       #----------------------------------------------------------------------
@@ -120,7 +118,7 @@ jobs:
           !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
         with:
           generator-path: generator-jhipster
-          cmd: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
+          cmd: jhipster.cjs generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
         env:
           # generate-sample uses JHI_FOLDER_APP to generate the application.
           JHI_FOLDER_APP: ${{ github.workspace }}/base/app

.github/workflows/auto-merge.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v2.0.0
+        uses: dependabot/fetch-metadata@v2.1.0
       - name: Enable auto-merge for Dependabot PRs
         if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
         run: gh pr merge --auto --merge "$PR_URL"

.github/workflows/react.yml

@@ -96,28 +96,26 @@ jobs:
           npm-version: ${{ matrix.npm-version }}
           maven-cache: true
           gradle-cache: ${{ matrix.gradle-cache }}
+          binary-dir: ${{ github.workspace }}/generator-jhipster/bin
       #----------------------------------------------------------------------
       # Install JHipster and generate project+entities
       #----------------------------------------------------------------------
       - run: npm ci --ignore-scripts
         working-directory: ${{ github.workspace }}/generator-jhipster
-      - uses: ./generator-jhipster/.github/actions/setup-generator-jhipster-jit
-        with:
-          generator-path: generator-jhipster
       - name: 'GENERATION: project'
-        run: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
+        run: jhipster.cjs generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
         env:
           JHI_FOLDER_APP: ${{ github.workspace }}/app
           JHIPSTER_DEPENDENCIES_VERSION: ${{ matrix.jhipster-bom-cicd-version }}
-      - run: jh info
+      - run: jhipster.cjs info
       #----------------------------------------------------------------------
       # Detect changes against base commit
       #----------------------------------------------------------------------
       - uses: jhipster/actions/compare-sample@v0
         id: compare
         with:
           generator-path: generator-jhipster
-          cmd: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
+          cmd: jhipster.cjs generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
         if: >-
           github.event.pull_request &&
           !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')

.github/workflows/vue.yml

@@ -96,20 +96,18 @@ jobs:
           npm-version: ${{ matrix.npm-version }}
           maven-cache: true
           gradle-cache: ${{ matrix.gradle-cache }}
+          binary-dir: ${{ github.workspace }}/generator-jhipster/bin
       #----------------------------------------------------------------------
       # Install JHipster and generate project+entities
       #----------------------------------------------------------------------
       - run: npm ci --ignore-scripts
         working-directory: ${{ github.workspace }}/generator-jhipster
-      - uses: ./generator-jhipster/.github/actions/setup-generator-jhipster-jit
-        with:
-          generator-path: generator-jhipster
       - name: 'GENERATION: project'
-        run: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
+        run: jhipster.cjs generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
         env:
           JHI_FOLDER_APP: ${{ github.workspace }}/app
           JHIPSTER_DEPENDENCIES_VERSION: ${{ matrix.jhipster-bom-cicd-version }}
-      - run: jh info
+      - run: jhipster.cjs info
       #----------------------------------------------------------------------
       # Detect changes against base commit
       #----------------------------------------------------------------------
@@ -120,7 +118,7 @@ jobs:
           !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
         with:
           generator-path: generator-jhipster
-          cmd: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
+          cmd: jhipster.cjs generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
         env:
           # generate-sample uses JHI_FOLDER_APP to generate the application.
           JHI_FOLDER_APP: ${{ github.workspace }}/base/app

generators/angular/__snapshots__/generator.spec.ts.snap

@@ -1006,6 +1006,69 @@ exports[`generator - angular gateway-oauth2-withAdminUi(true)-skipJhipsterDepend
   "clientRoot/src/main/webapp/app/core/util/parse-links.service.ts": {
     "stateCleared": "modified",
   },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/authority.model.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/authority.routes.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/authority.test-samples.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/delete/authority-delete-dialog.component.html": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/delete/authority-delete-dialog.component.spec.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/delete/authority-delete-dialog.component.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/detail/authority-detail.component.html": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/detail/authority-detail.component.spec.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/detail/authority-detail.component.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/list/authority.component.html": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/list/authority.component.spec.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/list/authority.component.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/route/authority-routing-resolve.service.spec.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/route/authority-routing-resolve.service.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/service/authority.service.spec.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/service/authority.service.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/update/authority-form.service.spec.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/update/authority-form.service.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/update/authority-update.component.html": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/update/authority-update.component.spec.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/admin/authority/update/authority-update.component.ts": {
+    "stateCleared": "modified",
+  },
   "clientRoot/src/main/webapp/app/entities/entity-navbar-items.ts": {
     "stateCleared": "modified",
   },
@@ -1201,6 +1264,18 @@ exports[`generator - angular gateway-oauth2-withAdminUi(true)-skipJhipsterDepend
   "clientRoot/src/main/webapp/app/entities/simple/update/simple-update.component.ts": {
     "stateCleared": "modified",
   },
+  "clientRoot/src/main/webapp/app/entities/user/service/user.service.spec.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/user/service/user.service.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/user/user.model.ts": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/src/main/webapp/app/entities/user/user.test-samples.ts": {
+    "stateCleared": "modified",
+  },
   "clientRoot/src/main/webapp/app/home/home.component.html": {
     "stateCleared": "modified",
   },

generators/angular/resources/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@angular/common": "17.3.5",
+    "@angular/common": "17.3.8",
     "@fortawesome/angular-fontawesome": "0.14.1",
     "@fortawesome/fontawesome-svg-core": "6.5.2",
     "@fortawesome/free-solid-svg-icons": "6.5.2",
@@ -16,19 +16,19 @@
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
     "tslib": "2.6.2",
-    "zone.js": "0.14.4"
+    "zone.js": "0.14.5"
   },
   "devDependencies": {
     "@angular-architects/module-federation": "17.0.8",
     "@angular-architects/module-federation-runtime": "17.0.8",
     "@angular-builders/custom-webpack": "17.0.2",
     "@angular-builders/jest": "17.0.3",
-    "@angular-eslint/eslint-plugin": "17.3.0",
-    "@angular/cli": "17.3.5",
+    "@angular-eslint/eslint-plugin": "17.4.0",
+    "@angular/cli": "17.3.7",
     "@types/jest": "29.5.12",
     "@types/node": "20.11.25",
     "@types/sockjs-client": "1.5.4",
-    "@typescript-eslint/eslint-plugin": "7.7.0",
+    "@typescript-eslint/eslint-plugin": "7.8.0",
     "browser-sync": "3.0.2",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
@@ -38,9 +38,9 @@
     "eslint-webpack-plugin": "4.1.0",
     "folder-hash": "4.0.4",
     "jest": "29.7.0",
-    "jest-date-mock": "1.0.9",
+    "jest-date-mock": "1.0.10",
     "jest-junit": "16.0.0",
-    "jest-preset-angular": "14.0.3",
+    "jest-preset-angular": "14.0.4",
     "jest-sonar": "0.2.16",
     "merge-jsons-webpack-plugin": "2.0.1",
     "postcss-rtlcss": "5.1.2",

generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs

@@ -50,7 +50,7 @@
 
     @if (key() && !success()) {
       <div>
-        <form name="form" role="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
+        <form name="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
           <div class="mb-3">
             <label class="form-label" for="newPassword">__jhiTranslateTag__('global.form.newpassword.label')</label>
             <input

generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs

@@ -27,7 +27,7 @@
       <div class="alert alert-warning">
         <span>__jhiTranslateTag__('reset.request.messages.info')</span>
       </div>
-      <form name="form" role="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
+      <form name="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
         <div class="mb-3">
           <label class="form-label" for="email">__jhiTranslateTag__('global.form.email.label')</label>
           <input

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

@@ -32,7 +32,7 @@
       <div class="alert alert-danger">__jhiTranslateTag__('global.messages.error.dontmatch')</div>
     }
 
-      <form name="form" role="form" (ngSubmit)="changePassword()" [formGroup]="passwordForm">
+      <form name="form" (ngSubmit)="changePassword()" [formGroup]="passwordForm">
         <div class="mb-3">
           <label class="form-label" for="currentPassword">__jhiTranslateTag__('global.form.currentpassword.label')</label>
           <input

generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs

@@ -46,7 +46,7 @@
   <div class="d-flex justify-content-center">
     <div class="col-md-8">
     @if (!success()) {
-      <form name="form" role="form" (ngSubmit)="register()" [formGroup]="registerForm">
+      <form name="form" (ngSubmit)="register()" [formGroup]="registerForm">
         <div class="mb-3">
           <label class="form-label" for="login">__jhiTranslateTag__('global.form.username.label')</label>
           <input

generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs

@@ -30,7 +30,7 @@
       <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
 
     @if (settingsForm.value.login) {
-      <form name="form" role="form" (ngSubmit)="save()" [formGroup]="settingsForm" novalidate>
+      <form name="form" (ngSubmit)="save()" [formGroup]="settingsForm" novalidate>
         <div class="mb-3">
           <label class="form-label" for="firstName">__jhiTranslateTag__('settings.form.firstname')</label>
           <input

generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs

@@ -18,7 +18,7 @@
 -%>
 <div class="d-flex justify-content-center">
   <div class="col-8">
-    <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
+    <form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
       <h2 id="myUserLabel">__jhiTranslateTag__('userManagement.home.createOrEditLabel')</h2>
 
       <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>

generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs

@@ -18,7 +18,7 @@
 -%>
 <div class="d-flex justify-content-center">
     <div class="col-8">
-        <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
+        <form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
             <h2 id="<%= jhiPrefixDashed %>-<%= entityFileName %>-heading" data-cy="<%= entityClass %>CreateUpdateHeading">__jhiTranslateTag__('<%- i18nKeyPrefix %>.home.createOrEditLabel')</h2>
 
             <div>

generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs

@@ -51,15 +51,15 @@
     <p>__jhiTranslateTag__('home.question')</p>
 
     <ul>
-      <li><a href="https://www.jhipster.tech/" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.homepage')</a></li>
-      <li><a href="https://stackoverflow.com/tags/jhipster/info" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.stackoverflow')</a></li>
-      <li><a href="https://github.com/jhipster/generator-jhipster/issues?state=open" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.bugtracker')</a></li>
-      <li><a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.chat')</a></li>
-      <li><a href="https://twitter.com/jhipster" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.follow')</a></li>
+      <li><a href="<%- hipsterDocumentationLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.homepage')</a></li>
+      <li><a href="<%- hipsterStackoverflowLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.stackoverflow')</a></li>
+      <li><a href="<%- hipsterBugTrackerLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.bugtracker')</a></li>
+      <li><a href="<%- hipsterChatLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.chat')</a></li>
+      <li><a href="<%- hipsterTwitterLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.follow')</a></li>
     </ul>
 
     <p>
-      <span>__jhiTranslateTag__('home.like')</span> <a href="https://github.com/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.github')</a>!
+      <span>__jhiTranslateTag__('home.like')</span> <a href="<%- hipsterProjectLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.github')</a>!
     </p>
   </div>
 </div>

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

@@ -25,7 +25,7 @@
         data-cy="loginError"
       >__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">__jhiTranslateTag__('global.form.username.label')</label>
           <input