generator-jhipster 8.5.0 → 8.7.0

package/dist/generators/entity/prompts.js

@@ -19,7 +19,7 @@
 import fs from 'fs';
 import chalk from 'chalk';
 import { isArray, lowerFirst, snakeCase, uniq, upperFirst } from 'lodash-es';
-import { reservedKeywords, databaseTypes, applicationTypes, entityOptions, fieldTypes, validations, clientFrameworkTypes, } from '../../jdl/jhipster/index.js';
+import { applicationTypes, clientFrameworkTypes, databaseTypes, entityOptions, fieldTypes, reservedKeywords, validations, } from '../../jdl/jhipster/index.js';
 import { inputIsNumber, inputIsSignedDecimalNumber, inputIsSignedNumber } from './support/index.js';
 const { isReservedPaginationWords, isReservedFieldName, isReservedTableName } = reservedKeywords;
 const { NO: NO_DATABASE, CASSANDRA, SQL } = databaseTypes;

package/dist/generators/entity/support/index.js

@@ -16,5 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// eslint-disable-next-line import/prefer-default-export
 export { isNumber as inputIsNumber, isSignedNumber as inputIsSignedNumber, isSignedDecimalNumber as inputIsSignedDecimalNumber, } from './asserts.js';

package/dist/generators/export-jdl/generator.js

@@ -45,7 +45,6 @@ export default class extends BaseGenerator {
                     }
                 }
                 catch (error) {
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     throw new Error(`An error occurred while exporting to JDL: ${error.message}\n${error}`, { cause: error });
                 }
             },

package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizationHeaderUtil.java.ejs

@@ -56,7 +56,7 @@ public class AuthorizationHeaderUtil {
 
     private final OAuth2AuthorizedClientService clientService;
     private final RestTemplateBuilder restTemplateBuilder;
-    private final Logger log = LoggerFactory.getLogger(AuthorizationHeaderUtil.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AuthorizationHeaderUtil.class);
 
     public AuthorizationHeaderUtil(OAuth2AuthorizedClientService clientService, RestTemplateBuilder restTemplateBuilder) {
         this.clientService = clientService;
@@ -82,7 +82,7 @@ public class AuthorizationHeaderUtil {
                 String tokenType = accessToken.getTokenType().getValue();
                 String accessTokenValue = accessToken.getTokenValue();
                 if (isExpired(accessToken)) {
-                    log.info("AccessToken expired, refreshing automatically");
+                    LOG.info("AccessToken expired, refreshing automatically");
                     accessTokenValue = refreshToken(client, oauthToken);
                     if (null == accessTokenValue) {
                         SecurityContextHolder.getContext().setAuthentication(null);
@@ -105,7 +105,7 @@ public class AuthorizationHeaderUtil {
     private String refreshToken(OAuth2AuthorizedClient client, OAuth2AuthenticationToken oauthToken) {
         OAuth2AccessTokenResponse atr = refreshTokenClient(client);
         if (atr == null || atr.getAccessToken() == null) {
-            log.info("Failed to refresh token for user");
+            LOG.info("Failed to refresh token for user");
             return null;
         }
 
@@ -136,7 +136,7 @@ public class AuthorizationHeaderUtil {
             ResponseEntity<OAuthIdpTokenResponseDTO> responseEntity = r.exchange(requestEntity, OAuthIdpTokenResponseDTO.class);
             return toOAuth2AccessTokenResponse(responseEntity.getBody());
         } catch (OAuth2AuthorizationException e) {
-            log.error("Unable to refresh token", e);
+            LOG.error("Unable to refresh token", e);
             throw new OAuth2AuthenticationException(e.getError(), e);
         }
     }

package/dist/generators/gatling/entity-files.js

@@ -1,3 +1,21 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { TEST_DIR } from '../generator-constants.js';
 export const gatlingFiles = {
     gatlingFiles: [

package/dist/generators/gatling/files.js

@@ -1,4 +1,22 @@
-import { TEST_DIR, GRADLE_BUILD_SRC_MAIN_DIR } from '../generator-constants.js';
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { GRADLE_BUILD_SRC_MAIN_DIR, TEST_DIR } from '../generator-constants.js';
 const gatlingFiles = {
     gatlingFiles: [
         {

package/dist/generators/gatling/generator.js

@@ -71,7 +71,6 @@ export default class GatlingGenerator extends BaseApplicationGenerator {
                                 additionalContent: `
 <configuration>
     <runMultipleSimulations>true</runMultipleSimulations>
-    <resourcesFolder>\${project.basedir}/src/test/gatling/conf</resourcesFolder>
 </configuration>
 `,
                             },

package/dist/generators/gatling/templates/src/test/java/gatling/simulations/_entityClass_GatlingTest.java.ejs

@@ -60,12 +60,12 @@ public class <%= entityClass %>GatlingTest extends Simulation {
 <%_ } _%>
         ;
 
-    Map<String, String> headers_http = Map.of(
+    Map<String, String> headersHttp = Map.of(
         "Accept", "application/json"
     );
 <%_ if (authenticationUsesCsrf) { _%>
 
-    Map<String, String> headers_http_authenticated = Map.of(
+    Map<String, String> headersHttpAuthenticated = Map.of(
         "Accept", "application/json",
         "X-XSRF-TOKEN", "${xsrf_token}"
     );
@@ -77,12 +77,12 @@ public class <%= entityClass %>GatlingTest extends Simulation {
 <%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
 
-    Map<String, String> headers_http_authentication = Map.of(
+    Map<String, String> headersHttpAuthentication = Map.of(
         "Content-Type", "application/json",
         "Accept", "application/json"
     );
 
-    Map<String, String> headers_http_authenticated = Map.of(
+    Map<String, String> headersHttpAuthenticated = Map.of(
         "Accept", "application/json",
         "Authorization", "${access_token}"
     );
@@ -90,7 +90,7 @@ public class <%= entityClass %>GatlingTest extends Simulation {
 
     ChainBuilder scn = exec(http("First unauthenticated request")
         .get("/api/account")
-        .headers(headers_http)
+        .headers(headersHttp)
 <%_ if ((applicationTypeMicroservice || applicationTypeGateway) && authenticationTypeOauth2) { _%>
         .check(status().is(302))
 <%_ } else { _%>
@@ -104,7 +104,7 @@ public class <%= entityClass %>GatlingTest extends Simulation {
         .exec(http("Authentication")
 <%_ if (authenticationTypeSession) { _%>
         .post("/api/authentication")
-        .headers(headers_http_authenticated)
+        .headers(headersHttpAuthenticated)
         .formParam("username", "admin")
         .formParam("password", "admin")
         .formParam("remember-me", "true")
@@ -143,25 +143,25 @@ public class <%= entityClass %>GatlingTest extends Simulation {
         .check(status().is(200))).exitHereIfFailed()
 <%_ } else if (authenticationTypeJwt) { _%>
         .post("/api/authenticate")
-        .headers(headers_http_authentication)
+        .headers(headersHttpAuthentication)
         .body(StringBody("{\"username\":\"admin\", \"password\":\"admin\"}")).asJson()
         .check(header("Authorization").saveAs("access_token"))).exitHereIfFailed()
 <%_ } _%>
         .pause(2)
         .exec(http("Authenticated request")
         .get("/api/account")
-        .headers(headers_http_authenticated)
+        .headers(headersHttpAuthenticated)
         .check(status().is(200)))
         .pause(10)
         .repeat(2).on(
             exec(http("Get all <%= entityInstancePlural %>")
             .get("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>/api/<%= entityApiUrl %>")
-            .headers(headers_http_authenticated)
+            .headers(headersHttpAuthenticated)
             .check(status().is(200)))
             .pause(Duration.ofSeconds(10), Duration.ofSeconds(20))
             .exec(http("Create new <%= entityInstance %>")
             .post("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>/api/<%= entityApiUrl %>")
-            .headers(headers_http_authenticated)
+            .headers(headersHttpAuthenticated)
             .body(StringBody("{" +
 <%_ fields.filter(f => !(f.id && f.autoGenerate)).forEach((field, idx) => { _%>
                 "<%= idx === 0 ? '' : ', ' %>\"<%= field.fieldName %>\": <% if (field.fieldTypeString) { %>\"SAMPLE_TEXT\"<% } else if (field.fieldTypeNumeric) { %>0<% } else if (field.fieldTypeTemporal) { %>\"2020-01-01T00:00:00.000Z\"<% } else if (field.fieldIsEnum) { %>\"<%= field.enumValues[0].name %>\"<% } else { %>null<% } %>" +
@@ -173,12 +173,12 @@ public class <%= entityClass %>GatlingTest extends Simulation {
             .repeat(5).on(
                 exec(http("Get created <%= entityInstance %>")
                 .get("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>${new_<%= entityInstance %>_url}")
-                .headers(headers_http_authenticated))
+                .headers(headersHttpAuthenticated))
                 .pause(10)
             )
             .exec(http("Delete created <%= entityInstance %>")
             .delete("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>${new_<%= entityInstance %>_url}")
-            .headers(headers_http_authenticated))
+            .headers(headersHttpAuthenticated))
             .pause(10)
         );
 

package/dist/generators/generate-blueprint/files.js

@@ -16,15 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { asWriteFilesSection } from '../base-application/support/task-type-inference.js';
 import { LOCAL_BLUEPRINT_OPTION } from './constants.js';
-export const files = {
+export const files = asWriteFilesSection({
     baseFiles: [
         {
             condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION],
             templates: [
-                '.eslintrc.json',
                 '.github/workflows/generator.yml',
                 '.prettierignore.jhi.blueprint',
+                { sourceFile: 'eslint.config.js.jhi.blueprint', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.blueprint` },
                 'README.md',
                 'tsconfig.json',
                 'vitest.config.ts',
@@ -41,6 +42,8 @@ export const files = {
                 '.blueprint/github-build-matrix/build-matrix.mjs',
                 '.blueprint/github-build-matrix/generator.mjs',
                 '.blueprint/github-build-matrix/index.mjs',
+                '.github/workflows/build-cache.yml',
+                '.github/workflows/samples.yml',
             ],
         },
         {
@@ -56,7 +59,7 @@ export const files = {
             templates: ['cli/commands.cjs'],
         },
     ],
-};
+});
 export const generatorFiles = {
     generator: [
         {

package/dist/generators/generate-blueprint/generator.js

@@ -17,16 +17,16 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import { camelCase, upperFirst, snakeCase } from 'lodash-es';
-import BaseGenerator from '../base/index.js';
+import { camelCase, snakeCase, upperFirst } from 'lodash-es';
+import BaseGenerator from '../base-application/index.js';
 import { PRIORITY_NAMES_LIST as BASE_PRIORITY_NAMES_LIST } from '../base/priorities.js';
-import { requiredConfig, defaultConfig, defaultSubGeneratorConfig, allGeneratorsConfig, prompts, subGeneratorPrompts, GENERATE_SNAPSHOTS, LINK_JHIPSTER_DEPENDENCY, ALL_GENERATORS, GENERATORS, PRIORITIES, SUB_GENERATORS, ADDITIONAL_SUB_GENERATORS, WRITTEN, LOCAL_BLUEPRINT_OPTION, ALL_PRIORITIES, DYNAMIC, } from './constants.js';
 import * as GENERATOR_LIST from '../generator-list.js';
-import { files, generatorFiles } from './files.js';
 import { packageJson } from '../../lib/index.js';
-import { SKIP_COMMIT_HOOK } from '../init/constants.js';
 import { BLUEPRINT_API_VERSION, NODE_VERSION } from '../generator-constants.js';
+import { files, generatorFiles } from './files.js';
+import { ADDITIONAL_SUB_GENERATORS, ALL_GENERATORS, ALL_PRIORITIES, DYNAMIC, GENERATE_SNAPSHOTS, GENERATORS, LINK_JHIPSTER_DEPENDENCY, LOCAL_BLUEPRINT_OPTION, PRIORITIES, SUB_GENERATORS, WRITTEN, allGeneratorsConfig, defaultConfig, defaultSubGeneratorConfig, prompts, requiredConfig, subGeneratorPrompts, } from './constants.js';
 const { GENERATOR_PROJECT_NAME, GENERATOR_INIT } = GENERATOR_LIST;
+const defaultPublishedFiles = ['generators', '!**/__*', '!**/*.snap', '!**/*.spec.?(c|m)js'];
 export default class extends BaseGenerator {
     async _beforeQueue() {
         if (!this.fromBlueprint) {
@@ -39,7 +39,6 @@ export default class extends BaseGenerator {
     get initializing() {
         return this.asInitializingTaskGroup({
             async loadOptions() {
-                await this.parseCurrentJHipsterCommand();
                 if (this[ALL_GENERATORS]) {
                     this.config.set(allGeneratorsConfig());
                 }
@@ -97,7 +96,6 @@ export default class extends BaseGenerator {
             conditionalConfig() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION]) {
                     this.config.defaults({
-                        [SKIP_COMMIT_HOOK]: true,
                         [DYNAMIC]: true,
                         js: false,
                     });
@@ -113,7 +111,7 @@ export default class extends BaseGenerator {
             async compose() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
-                const initGenerator = await this.composeWithJHipster(GENERATOR_INIT);
+                const initGenerator = await this.composeWithJHipster(GENERATOR_INIT, { generatorOptions: { packageJsonType: 'module' } });
                 initGenerator.generateReadme = false;
             },
         };
@@ -136,7 +134,7 @@ export default class extends BaseGenerator {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
     get preparing() {
-        return {
+        return this.asPreparingTaskGroup({
             prepareCommands() {
                 this.application.commands = [];
                 this.application.nodeVersion = NODE_VERSION;
@@ -159,13 +157,16 @@ export default class extends BaseGenerator {
                     this.application.cliName = cliName ?? `jhipster-${baseName}`;
                 }
             },
-        };
+        });
     }
     get [BaseGenerator.PREPARING]() {
         return this.delegateTasksToBlueprint(() => this.preparing);
     }
     get writing() {
-        return {
+        return this.asWritingTaskGroup({
+            async cleanup({ control }) {
+                await control.cleanupFiles({ '8.5.1': ['.eslintrc.json'] });
+            },
             async writing() {
                 this.application.sampleWritten = this.jhipsterConfig.sampleWritten;
                 await this.writeFiles({
@@ -206,7 +207,7 @@ export default class extends BaseGenerator {
                     subGeneratorStorage.set(WRITTEN, true);
                 }
             },
-        };
+        });
     }
     get [BaseGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
@@ -225,8 +226,7 @@ export default class extends BaseGenerator {
                 this.packageJson.merge({
                     name: `generator-jhipster-${this.jhipsterConfig.baseName}`,
                     keywords: ['yeoman-generator', 'jhipster-blueprint', BLUEPRINT_API_VERSION],
-                    type: 'module',
-                    files: ['generators'],
+                    files: defaultPublishedFiles,
                     scripts: {
                         ejslint: 'ejslint generators/**/*.ejs',
                         lint: 'eslint .',
@@ -239,9 +239,7 @@ export default class extends BaseGenerator {
                     devDependencies: {
                         'ejs-lint': `${mainDependencies['ejs-lint']}`,
                         eslint: `${mainDependencies.eslint}`,
-                        'eslint-config-prettier': `${mainDependencies['eslint-config-prettier']}`,
-                        'eslint-plugin-import': `${mainDependencies['eslint-plugin-import']}`,
-                        'eslint-plugin-prettier': `${mainDependencies['eslint-plugin-prettier']}`,
+                        globals: `${mainDependencies.globals}`,
                         vitest: mainDependencies.vitest,
                         prettier: `${mainDependencies.prettier}`,
                         /*
@@ -263,7 +261,7 @@ export default class extends BaseGenerator {
                     bin: {
                         [cliName]: 'cli/cli.cjs',
                     },
-                    files: ['cli', 'generators'],
+                    files: ['cli', ...defaultPublishedFiles],
                 });
             },
             addGeneratorJHipsterDependency() {
@@ -278,6 +276,9 @@ export default class extends BaseGenerator {
                         peerDependencies: {
                             'generator-jhipster': `^${packagejs.version}`,
                         },
+                        engines: {
+                            'generator-jhipster': `^${packagejs.version}`,
+                        },
                     });
                 }
                 else {
@@ -285,6 +286,9 @@ export default class extends BaseGenerator {
                         dependencies: {
                             'generator-jhipster': `${packagejs.version}`,
                         },
+                        engines: {
+                            'generator-jhipster': `${packagejs.version}`,
+                        },
                     });
                 }
             },

package/dist/generators/generate-blueprint/resources/package.json

@@ -1,5 +1,7 @@
 {
   "dependencies": {
-    "vitest": "1.6.0"
+    "eslint": "9.9.1",
+    "globals": "15.9.0",
+    "vitest": "2.0.5"
   }
 }

package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs

@@ -12,9 +12,6 @@ export default class extends BaseGenerator {
 
   get [BaseGenerator.INITIALIZING]() {
     return this.asInitializingTaskGroup({
-      async parseCommand() {
-        await this.parseCurrentJHipsterCommand();
-      },
       async initializeOptions() {
         if (this.sampleName && !this.sampleName.endsWith('.jdl')) {
           this.sampleName += '.jdl';

package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/generator.mjs.ejs

@@ -1,6 +1,7 @@
 import { existsSync, appendFileSync } from 'node:fs';
 import os from 'node:os';
 import BaseGenerator from 'generator-jhipster/generators/base';
+import { setGithubTaskOutput } from 'generator-jhipster/testing';
 import { buildMatrix } from './build-matrix.mjs';
 
 export default class extends BaseGenerator {
@@ -12,12 +13,7 @@ export default class extends BaseGenerator {
     return this.asWritingTaskGroup({
       async buildMatrix() {
         const matrix = await buildMatrix(this.templatePath('../../generate-sample/templates/samples'));
-        const matrixoutput = `matrix<<EOF${os.EOL}${JSON.stringify(matrix)}${os.EOL}EOF${os.EOL}`;
-        const filePath = process.env['GITHUB_OUTPUT'];
-        console.log(matrixoutput);
-        if (filePath && existsSync(filePath)) {
-          appendFileSync(filePath, matrixoutput, { encoding: 'utf8' });
-        }
+        setGithubTaskOutput('matrix', matrix);
       },
     });
   }

package/dist/generators/generate-blueprint/templates/.github/workflows/build-cache.yml.ejs

@@ -0,0 +1,39 @@
+name: build-cache
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
+jobs:
+  build-cache:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ${{ github.workspace }}/app
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: generator-jhipster-<%= baseName %>
+      - uses: jhipster/actions/setup-runner@v0
+        with:
+          node-version: 20
+          binary-dir: ${{ github.workspace }}/generator-jhipster-<%= baseName %>/cli/
+      - uses: jhipster/actions/cache-npm-dependencies@v0
+        with:
+          generator-path: generator-jhipster-<%= baseName %>
+        if: always()
+      - run: cli.cjs generate-sample --all
+        continue-on-error: true
+      - run: npm run backend:build-cache --workspaces
+        continue-on-error: true
+      - uses: jhipster/actions/save-cache@v0
+        if: always()
+        with:
+          key: ${{ github.run_id }}
+          npm: true
+          maven: true
+          gradle: true
+      - uses: jhipster/actions/restore-cache@v0
+        with:
+          npm: true
+          maven: true
+          gradle: true

package/dist/generators/generate-blueprint/templates/.github/workflows/samples.yml.ejs

@@ -0,0 +1,105 @@
+name: Verify Sample Projects
+on:
+  push:
+    branches:
+      - 'main'
+      - '**maintenance'
+    paths-ignore:
+      - 'package*.json'
+  pull_request:
+    branches:
+      - '*'
+permissions:
+  contents: read
+jobs:
+  build-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.build.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: <%- nodeVersion.split('.', 2)[0] %>
+      - id: build
+        run: |
+          npm install
+          ./cli/cli.cjs github-build-matrix
+  samples:
+    name: ${{ matrix.sample-name }}
+    runs-on: ubuntu-latest
+    needs: build-matrix
+    defaults:
+      run:
+        working-directory: ${{ github.workspace }}/app
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.build-matrix.outputs.matrix)}}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: generator-jhipster-<%= baseName %>
+          fetch-depth: 2
+      - uses: jhipster/actions/setup-runner@v0
+        with:
+          java-version: ${{ matrix.java-version }}
+          node-version: ${{ matrix.node-version }}
+          maven-cache: true
+          gradle-cache: true
+          binary-dir: ${{ github.workspace }}/generator-jhipster-<%= baseName %>/cli/
+      - name: 'Install blueprint'
+        run: npm install
+        working-directory: ${{ github.workspace }}/generator-jhipster-<%= baseName %>
+      - name: 'Generate Project'
+        run: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --force
+      - uses: jhipster/actions/compare-sample@v0
+        id: compare
+        if: >-
+          github.event.pull_request &&
+          !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
+        with:
+          generator-path: generator-jhipster-<%= baseName %>
+          cmd: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --force --skip-install
+      - run: npm run ci:backend:test
+        if: steps.compare.outputs.equals != 'true'
+        id: backend
+      - run: npm run ci:frontend:test --if-present
+        if: steps.compare.outputs.equals != 'true'
+      - run: npm run ci:e2e:package
+        if: steps.compare.outputs.equals != 'true'
+      - run: npm run ci:e2e:prepare
+        if: steps.compare.outputs.equals != 'true'
+      - run: npm run ci:e2e:run --if-present
+        if: steps.compare.outputs.equals != 'true'
+        id: e2e
+      - name: 'BACKEND: Store failure logs'
+        uses: actions/upload-artifact@v4
+        if: always() && steps.backend.outcome == 'failure'
+        with:
+          name: log-${{ matrix.sample-name }}
+          path: |
+            ${{ github.workspace }}/app/build/test-results/**/*.xml
+            ${{ github.workspace }}/app/target/surefire-reports
+      - name: 'E2E: Store failure screenshots'
+        uses: actions/upload-artifact@v4
+        if: always() && steps.e2e.outcome == 'failure'
+        with:
+          name: screenshots-${{ matrix.sample-name }}
+          path: ${{ github.workspace }}/app/**/cypress/screenshots
+      - name: Dump docker logs
+        if: always()
+        uses: jwalton/gh-docker-logs@v2
+  check-samples:
+    permissions:
+      contents: none
+    runs-on: ubuntu-latest
+    needs: [samples]
+    if: always()
+    steps:
+      - run: |
+          echo '${{ toJSON(needs) }}'
+          if [ 'skipped' == '${{ needs.samples.result }}' ] || [ 'success' == '${{ needs.samples.result }}' ] || [ 'closed' == '${{ github.event.action }}' ]; then
+            exit 0
+          fi
+          exit 1

package/dist/generators/generate-blueprint/templates/.prettierignore.jhi.blueprint.ejs

@@ -18,5 +18,5 @@
 -%>
 <&_ if (!fragment.section) { -&>
 # blueprint rules:
-**/templates/**/
+generators/**/templates/**/
 <&_ } -&>

package/dist/generators/{init/templates/.lintstagedrc.cjs.ejs → generate-blueprint/templates/eslint.config.js.jhi.blueprint.ejs}

@@ -16,6 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-module.exports = {
-  '{,src/**/,webpack/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}': ['prettier --write'],
-};
+<&_ if (fragment.importsSection) { -&>
+import jhipster from 'generator-jhipster/eslint/recommended';
+<&_ } -&>
+<&_ if (fragment.configSection) { -&>
+  jhipster,
+<&_ } -&>

package/dist/generators/generator-constants.js

@@ -21,10 +21,11 @@ import { join } from 'path';
 import { fileURLToPath } from 'url';
 export const BLUEPRINT_API_VERSION = 'jhipster-8';
 // jhipster-bom version
-export const JHIPSTER_DEPENDENCIES_VERSION = '8.5.0';
+export const JHIPSTER_DEPENDENCIES_VERSION = '8.7.0';
 // Version of Java
 export const JAVA_VERSION = '17';
-export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];
+// Supported Java versions, https://www.oracle.com/java/technologies/java-se-support-roadmap.html
+export const JAVA_COMPATIBLE_VERSIONS = ['17', '21', '22'];
 // Force spring milestone repository. Spring Boot milestones are detected.
 export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 // Version of Node, NPM

package/dist/generators/git/command.js

@@ -1,13 +1,24 @@
 const command = {
-    options: {
+    configs: {
         skipGit: {
             description: 'Skip git repository initialization',
-            type: Boolean,
+            cli: {
+                type: Boolean,
+            },
+            scope: 'generator',
+        },
+        forceGit: {
+            description: 'Force commit to git repository',
+            cli: {
+                type: Boolean,
+            },
             scope: 'generator',
         },
         monorepository: {
-            type: Boolean,
             description: 'Use monorepository',
+            cli: {
+                type: Boolean,
+            },
             scope: 'storage',
         },
     },

package/dist/generators/git/files.js

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// eslint-disable-next-line import/prefer-default-export
 export const files = {
     git: [
         {