generator-jhipster 8.7.2 → 8.8.0

package/dist/generators/docker-compose/generator.d.ts

@@ -4,6 +4,7 @@ import BaseWorkspacesGenerator from '../base-workspaces/index.js';
  * @extends {import('../base/index.js')}
  */
 export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
+    [x: string]: any;
     existingDeployment: any;
     jwtSecretKey: string;
     beforeQueue(): Promise<void>;

package/dist/generators/docker-compose/generator.js

@@ -173,6 +173,9 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
                         if (appConfig.devServerPort !== undefined) {
                             deployment.keycloakRedirectUris += `"http://localhost:${appConfig.devServerPort}/*", `;
                         }
+                        if (appConfig.devServerPortProxy !== undefined) {
+                            deployment.keycloakRedirectUris += `"http://localhost:${appConfig.devServerPortProxy}/*", `;
+                        }
                         // Split ports by ":" and take last 2 elements to skip the hostname/IP if present
                         const ports = yamlConfig.ports[0].split(':').slice(-2);
                         ports[0] = appConfig.composePort;

package/dist/generators/docker-compose/templates/README-DOCKER-COMPOSE.md.ejs

@@ -32,7 +32,6 @@ Launch all your infrastructure by running: `docker compose up -d`.
 <%_ } _%>
 <%_ if (useKafka === true) { _%>
 - Kafka
-- Zookeeper
 <%_ } _%>
 <%_ if (usePulsar === true) { _%>
 - Pulsar

package/dist/generators/docker-compose/templates/docker-compose.yml.ejs

@@ -21,19 +21,17 @@ services:
 <%- appsYaml[i] %>
 <%_ } _%>
 <%_ if (useKafka) { _%>
-  zookeeper:
-    image: <%- dockerContainers.zookeeper %>
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-      ZOOKEEPER_SYNC_LIMIT: 2
   kafka:
     image: <%- dockerContainers.kafka %>
     environment:
+      KAFKA_NODE_ID: 1
+      KAFKA_PROCESS_ROLES: broker,controller
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_BROKER_ID: 2
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_LISTENERS: PLAINTEXT://:9092,CONTROLLER://localhost:9093
+      KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      KAFKA_CONTROLLER_QUORUM_VOTERS: 1@localhost:9093
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
       #ports:
       # - 9092:9092 # Uncomment to make Kafka available externally
 <%_ } _%>

package/dist/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs

@@ -1074,14 +1074,12 @@
         <%- keycloakRedirectUris %>
         "http://localhost:8100/*",
         "http://127.0.0.1:8761/*",
-        "http://localhost:9000/*",
         "dev.localhost.ionic:*"
       ],
       "webOrigins": [
         <%- keycloakRedirectUris.replace(/\/\*/g, "") %>
         "http://localhost:8100",
-        "http://127.0.0.1:8761",
-        "http://localhost:9000"
+        "http://127.0.0.1:8761"
       ],
       "notBefore": 0,
       "bearerOnly": false,

package/dist/generators/entities/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class EntitiesGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     entities: any;
     beforeQueue(): Promise<void>;
     get initializing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "loadArguments">;

package/dist/generators/entity/generator.d.ts

@@ -20,6 +20,7 @@ import type { Storage } from 'yeoman-generator';
 import BaseApplicationGenerator from '../base-application/index.js';
 import type { Entity } from '../../lib/types/application/entity.js';
 export default class EntityGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     name: string;
     application: any;
     entityStorage: Storage;

package/dist/generators/export-jdl/generator.d.ts

@@ -1,6 +1,7 @@
 import BaseGenerator from '../base/index.js';
 import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js';
 export default class extends BaseGenerator {
+    [x: string]: any;
     baseName: string;
     jdlFile: string;
     jdlContent?: string;

package/dist/generators/feign-client/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class FeignClientGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     get writing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cleanupTask" | "writeTask">;
     get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "addDependencies">;

package/dist/generators/gatling/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class GatlingGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     get writing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cleanupTask" | "writeTask">;
     get writingEntities(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cleanupEntitiesTask" | "writeEntityTask">;

package/dist/generators/generate-blueprint/command.d.ts

@@ -7,6 +7,21 @@ declare const command: {
             };
             readonly scope: "storage";
         };
+        readonly gitDependency: {
+            readonly cli: {
+                readonly description: "Use git dependency";
+                readonly type: StringConstructor;
+            };
+            readonly default: "github:jhipster/generator-jhipster#main";
+            readonly scope: "generator";
+        };
+        readonly cliName: {
+            readonly cli: {
+                readonly description: "CLI name";
+                readonly type: StringConstructor;
+            };
+            readonly scope: "storage";
+        };
         readonly recreatePackageLock: {
             readonly description: "Recreate package lock";
             readonly cli: {

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

@@ -9,6 +9,21 @@ const command = {
             },
             scope: 'storage',
         },
+        gitDependency: {
+            cli: {
+                description: 'Use git dependency',
+                type: String,
+            },
+            default: 'github:jhipster/generator-jhipster#main',
+            scope: 'generator',
+        },
+        cliName: {
+            cli: {
+                description: 'CLI name',
+                type: String,
+            },
+            scope: 'storage',
+        },
         recreatePackageLock: {
             description: 'Recreate package lock',
             cli: {

package/dist/generators/generate-blueprint/constants.d.ts

@@ -37,7 +37,7 @@ export declare const defaultSubGeneratorConfig: () => {
     priorities: never[];
 };
 export declare const allGeneratorsConfig: () => {
-    subGenerators: ("base" | "upgrade" | "info" | "angular" | "react" | "vue" | "maven" | "gradle" | "cypress" | "cucumber" | "gatling" | "spring-websocket" | "languages" | "jdl" | "bootstrap" | "bootstrap-application-base" | "common" | "server" | "client" | "git" | "workspaces" | "spring-boot" | "liquibase" | "java" | "spring-data-relational" | "app" | "base-application" | "base-core" | "base-entity-changes" | "base-workspaces" | "bootstrap-application" | "bootstrap-application-client" | "bootstrap-application-server" | "bootstrap-workspaces" | "ci-cd" | "docker" | "docker-compose" | "entities" | "entity" | "export-jdl" | "feign-client" | "generate-blueprint" | "heroku" | "init" | "kubernetes" | "kubernetes-helm" | "kubernetes-knative" | "project-name" | "spring-cache" | "spring-cloud-stream" | "spring-data-cassandra" | "spring-data-couchbase" | "spring-data-elasticsearch" | "spring-data-mongodb" | "spring-data-neo4j")[];
+    subGenerators: ("base" | "upgrade" | "info" | "react" | "jdl" | "angular" | "vue" | "maven" | "gradle" | "cypress" | "cucumber" | "gatling" | "spring-websocket" | "languages" | "bootstrap" | "bootstrap-application-base" | "common" | "server" | "client" | "git" | "workspaces" | "spring-boot" | "liquibase" | "java" | "spring-data-relational" | "app" | "base-application" | "base-core" | "base-entity-changes" | "base-workspaces" | "bootstrap-application" | "bootstrap-application-client" | "bootstrap-application-server" | "bootstrap-workspaces" | "ci-cd" | "docker" | "docker-compose" | "entities" | "entity" | "export-jdl" | "feign-client" | "generate-blueprint" | "heroku" | "init" | "kubernetes" | "kubernetes-helm" | "kubernetes-knative" | "project-name" | "spring-cache" | "spring-cloud-stream" | "spring-data-cassandra" | "spring-data-couchbase" | "spring-data-elasticsearch" | "spring-data-mongodb" | "spring-data-neo4j")[];
     additionalSubGenerators: string;
     dynamic: boolean;
     js: boolean;
@@ -63,7 +63,7 @@ export declare const prompts: () => ({
     type: string;
     name: string;
     message: string;
-    choices: ("base" | "upgrade" | "info" | "angular" | "react" | "vue" | "maven" | "gradle" | "cypress" | "cucumber" | "gatling" | "spring-websocket" | "languages" | "jdl" | "bootstrap" | "bootstrap-application-base" | "common" | "server" | "client" | "git" | "workspaces" | "spring-boot" | "liquibase" | "java" | "spring-data-relational" | "app" | "base-application" | "base-core" | "base-entity-changes" | "base-workspaces" | "bootstrap-application" | "bootstrap-application-client" | "bootstrap-application-server" | "bootstrap-workspaces" | "ci-cd" | "docker" | "docker-compose" | "entities" | "entity" | "export-jdl" | "feign-client" | "generate-blueprint" | "heroku" | "init" | "kubernetes" | "kubernetes-helm" | "kubernetes-knative" | "project-name" | "spring-cache" | "spring-cloud-stream" | "spring-data-cassandra" | "spring-data-couchbase" | "spring-data-elasticsearch" | "spring-data-mongodb" | "spring-data-neo4j")[];
+    choices: ("base" | "upgrade" | "info" | "react" | "jdl" | "angular" | "vue" | "maven" | "gradle" | "cypress" | "cucumber" | "gatling" | "spring-websocket" | "languages" | "bootstrap" | "bootstrap-application-base" | "common" | "server" | "client" | "git" | "workspaces" | "spring-boot" | "liquibase" | "java" | "spring-data-relational" | "app" | "base-application" | "base-core" | "base-entity-changes" | "base-workspaces" | "bootstrap-application" | "bootstrap-application-client" | "bootstrap-application-server" | "bootstrap-workspaces" | "ci-cd" | "docker" | "docker-compose" | "entities" | "entity" | "export-jdl" | "feign-client" | "generate-blueprint" | "heroku" | "init" | "kubernetes" | "kubernetes-helm" | "kubernetes-knative" | "project-name" | "spring-cache" | "spring-cloud-stream" | "spring-data-cassandra" | "spring-data-couchbase" | "spring-data-elasticsearch" | "spring-data-mongodb" | "spring-data-neo4j")[];
     pageSize: number;
     loop: boolean;
     default?: undefined;

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

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *
@@ -20,7 +19,7 @@
 import chalk from 'chalk';
 import * as GENERATOR_LIST from '../generator-list.js';
 import { PRIORITY_NAMES_LIST } from '../base-application/priorities.js';
-const prioritiesForSub = () => PRIORITY_NAMES_LIST;
+const prioritiesForSub = (_subGen) => PRIORITY_NAMES_LIST;
 export const GENERATE_SNAPSHOTS = 'generateSnapshots';
 export const LINK_JHIPSTER_DEPENDENCY = 'linkJhipsterDependency';
 export const GENERATORS = 'generators';

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

@@ -24,11 +24,13 @@ export const files = asWriteFilesSection({
             condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION],
             templates: [
                 '.github/workflows/generator.yml',
+                '.gitignore.jhi.blueprint',
                 '.prettierignore.jhi.blueprint',
                 { sourceFile: 'eslint.config.js.jhi.blueprint', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.blueprint` },
                 'README.md',
                 'tsconfig.json',
                 'vitest.config.ts',
+                'vitest.test-setup.ts',
                 '.blueprint/cli/commands.mjs',
                 '.blueprint/generate-sample/command.mjs',
                 '.blueprint/generate-sample/generator.mjs',
@@ -41,8 +43,9 @@ export const files = asWriteFilesSection({
         {
             condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION] && ctx.githubWorkflows,
             templates: [
-                '.blueprint/github-build-matrix/build-matrix.mjs',
+                '.blueprint/github-build-matrix/command.mjs',
                 '.blueprint/github-build-matrix/generator.mjs',
+                '.blueprint/github-build-matrix/generator.spec.mjs',
                 '.blueprint/github-build-matrix/index.mjs',
             ],
         },

package/dist/generators/generate-blueprint/generator.d.ts

@@ -1,9 +1,11 @@
 import BaseGenerator from '../base-application/index.js';
 export default class extends BaseGenerator {
+    [x: string]: any;
     application: any;
     recreatePackageLock: boolean;
     skipWorkflows: boolean;
     ignoreExistingGenerators: boolean;
+    gitDependency: string;
     _beforeQueue(): Promise<void>;
     get initializing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "loadOptions">;
     get prompting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "prompting" | "eachSubGenerator" | "eachAdditionalSubGenerator">;

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

@@ -34,6 +34,7 @@ export default class extends BaseGenerator {
     recreatePackageLock;
     skipWorkflows;
     ignoreExistingGenerators;
+    gitDependency;
     async _beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
@@ -178,6 +179,7 @@ export default class extends BaseGenerator {
                 await control.cleanupFiles({
                     '8.5.1': ['.eslintrc.json'],
                     '8.7.2': ['.eslintignore', 'vitest.test-setup.ts'],
+                    '8.7.4': ['.blueprint/generate-sample/get-samples.mjs', '.blueprint/github-build-matrix/build-matrix.mjs'],
                 });
             },
             async writing({ application }) {
@@ -243,7 +245,7 @@ export default class extends BaseGenerator {
                     return;
                 for (const generator of Object.keys(this.application[GENERATORS])) {
                     const commandFile = `${this.application.blueprintsPath}${generator}/command.${application.blueprintMjsExtension}`;
-                    this.editFile(commandFile, content => content
+                    this.editFile(commandFile, { ignoreNonExisting: true }, content => content
                         .replace(`/**
  * @type {import('generator-jhipster').JHipsterCommandDefinition}
  */`, `import { asCommand } from 'generator-jhipster';
@@ -253,7 +255,7 @@ export default class extends BaseGenerator {
 };`, '});')
                         .replace('export default command;', ''));
                     const generatorSpec = `${this.application.blueprintsPath}${generator}/generator.spec.${application.blueprintMjsExtension}`;
-                    this.editFile(generatorSpec, content => content.replaceAll(/blueprint: '([\w-]*)'/g, "blueprint: ['$1']"));
+                    this.editFile(generatorSpec, { ignoreNonExisting: true }, content => content.replaceAll(/blueprint: '([\w-]*)'/g, "blueprint: ['$1']"));
                 }
             },
             packageJson() {
@@ -325,7 +327,7 @@ export default class extends BaseGenerator {
                 }
                 else {
                     this.packageJson.merge({
-                        dependencies: exactDependency,
+                        dependencies: this.gitDependency ? { 'generator-jhipster': this.gitDependency } : exactDependency,
                         engines: this.jhipsterConfig.caret ? caretDependency : exactDependency,
                     });
                 }

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

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "eslint": "9.13.0",
-    "globals": "15.11.0",
-    "vitest": "2.1.4"
+    "eslint": "9.17.0",
+    "globals": "15.14.0",
+    "vitest": "2.1.8"
   }
 }

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

@@ -18,6 +18,7 @@
  */
 import { readdir } from 'node:fs/promises';
 import { GENERATOR_APP } from 'generator-jhipster/generators';
+import { getGithubSamplesGroups } from 'generator-jhipster/testing';
 
 /**
  * @type {import('generator-jhipster').JHipsterCommandDefinition}
@@ -29,12 +30,20 @@ const command = {
     },
   },
   configs: {
+    samplesFolder: {
+      description: 'Path to the samples folder',
+      cli: {
+        type: String,
+      },
+      default: 'samples',
+      scope: 'generator',
+    },
     sampleName: {
       prompt: gen => ({
         when: !gen.all,
         type: 'list',
         message: 'which sample do you want to generate?',
-        choices: async () => readdir(gen.templatePath('samples')),
+        choices: async () => getGithubSamplesGroups(gen.templatePath(gen.samplesFolder)),
       }),
       scope: 'generator',
     },

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

@@ -1,40 +1,58 @@
 import { readdir } from 'node:fs/promises';
 import { readFileSync } from 'node:fs';
+import { extname, join } from 'node:path';
 import BaseGenerator from 'generator-jhipster/generators/base';
+import { getGithubSamplesGroup } from 'generator-jhipster/testing';
 
 export default class extends BaseGenerator {
+  /** @type {string} */
   sampleName;
+  /** @type {boolean} */
   all;
+  /** @type {string} */
+  samplesFolder;
+  /** @type {string} */
+  sampleType;
+  /** @type {string} */
+  sampleFile;
+  /** @type {any} */
+  generatorOptions;
 
   constructor(args, opts, features) {
-    super(args, opts, { ...features, jhipsterBootstrap: false });
-  }
-
-  get [BaseGenerator.INITIALIZING]() {
-    return this.asInitializingTaskGroup({
-      async initializeOptions() {
-        if (this.sampleName && !this.sampleName.endsWith('.jdl')) {
-          this.sampleName += '.jdl';
-        }
-      },
-    });
-  }
-
-  get [BaseGenerator.PROMPTING]() {
-    return this.asPromptingTaskGroup({
-      async askForSample() {
-        await this.promptCurrentJHipsterCommand();
-      },
-    });
+    super(args, opts, { ...features, queueCommandTasks: true, jhipsterBootstrap: false });
   }
 
   get [BaseGenerator.WRITING]() {
     return this.asWritingTaskGroup({
       async copySample() {
-        if (this.all) {
-          this.copyTemplate('samples/*.jdl', '');
+        const { samplesFolder, all, sampleName } = this;
+        if (all) {
+          this.copyTemplate(`${samplesFolder}/*.jdl`, '');
+          this.sampleType = 'jdl';
+        } else if (extname(sampleName) === '.jdl') {
+          this.copyTemplate(join(samplesFolder, sampleName), sampleName, { noGlob: true });
+          this.sampleType = 'jdl';
         } else {
-          this.copyTemplate(`samples/${this.sampleName}`, this.sampleName, { noGlob: true });
+          const { samples } = await getGithubSamplesGroup(this.templatePath(), samplesFolder);
+          const {
+            'sample-type': sampleType,
+            'sample-file': sampleFile = sampleName,
+            'sample-folder': sampleFolder = samplesFolder,
+            generatorOptions,
+          } = samples[sampleName];
+
+          this.generatorOptions = generatorOptions;
+          this.sampleType = sampleType;
+
+          if (sampleType === 'jdl') {
+            const jdlFile = `${sampleFile}.jdl`;
+            this.copyTemplate(join(sampleFolder, jdlFile), jdlFile, { noGlob: true });
+          } else if (sampleType === 'yo-rc') {
+            this.copyTemplate('**', '', {
+              fromBasePath: this.templatePath(sampleFolder, sampleFile),
+              globOptions: { dot: true },
+            });
+          }
         }
       },
     });
@@ -42,17 +60,23 @@ export default class extends BaseGenerator {
 
   get [BaseGenerator.END]() {
     return this.asEndTaskGroup({
-      async generateSample() {
-        const packageJson = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url)));
-        const projectVersion = `${packageJson.version}-git`;
+      async generateYoRcSample() {
+        if (this.sampleType !== 'yo-rc') return;
+
+        const generatorOptions = this.getDefaultComposeOptions();
+        await this.composeWithJHipster('app', { generatorOptions });
+      },
+      async generateJdlSample() {
+        if (this.sampleType !== 'jdl') return;
+
+        const generatorOptions = this.getDefaultComposeOptions();
+        const folderContent = await readdir(this.destinationPath());
+        const jdlFiles = folderContent.filter(file => file.endsWith('.jdl'));
 
         await this.composeWithJHipster('jdl', {
-          generatorArgs: this.all ? await readdir(this.templatePath('samples')) : [this.sampleName],
+          generatorArgs: jdlFiles,
           generatorOptions: {
-            skipJhipsterDependencies: true,
-            insight: false,
-            skipChecks: true,
-            projectVersion,
+            ...generatorOptions,
             ...(this.all ? { workspaces: true, monorepository: true } : { skipInstall: true }),
           },
         });
@@ -62,4 +86,14 @@ export default class extends BaseGenerator {
       },
     });
   }
+
+  getDefaultComposeOptions() {
+    const packageJson = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url)));
+    const projectVersion = `${packageJson.version}-git`;
+    return {
+      skipJhipsterDependencies: true,
+      projectVersion,
+      ...this.generatorOptions,
+    };
+  }
 }

package/dist/generators/{angular/templates/src/main/webapp/app/app.constants.ts.ejs → generate-blueprint/templates/.blueprint/github-build-matrix/command.mjs.ejs}

@@ -16,12 +16,28 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-// These constants are injected via webpack DefinePlugin variables.
-// You can add more variables in webpack.common.js or in profile specific webpack.<dev|prod>.js files.
-// If you change the values in the webpack config files, you need to re run webpack to update the application
+/**
+ * @type {import('generator-jhipster').JHipsterCommandDefinition}
+ */
+const command = {
+  configs: {
+    samplesFolder: {
+      description: 'Samples folder',
+      cli: {
+        type: String,
+      },
+      scope: 'generator',
+    },
+    samplesGroup: {
+      description: 'Samples Group',
+      argument: {
+        type: String,
+      },
+      default: 'samples',
+      scope: 'generator',
+    },
+  },
+  options: {},
+};
 
-declare const __DEBUG_INFO_ENABLED__: boolean;
-declare const __VERSION__: string;
-
-export const VERSION = __VERSION__;
-export const DEBUG_INFO_ENABLED = __DEBUG_INFO_ENABLED__;
+export default command;

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

@@ -1,19 +1,35 @@
-import { existsSync, appendFileSync } from 'node:fs';
-import os from 'node:os';
+import { join } from 'node:path';
 import BaseGenerator from 'generator-jhipster/generators/base';
-import { setGithubTaskOutput } from 'generator-jhipster/testing';
-import { buildMatrix } from './build-matrix.mjs';
+import { convertToGitHubMatrix, getGithubOutputFile, getGithubSamplesGroup, setGithubTaskOutput } from 'generator-jhipster/testing';
 
 export default class extends BaseGenerator {
+  /** @type {string} */
+  samplesFolder;
+  /** @type {string} */
+  samplesGroup;
+  /** @type {object} */
+  matrix;
+
   constructor(args, opts, features) {
-    super(args, opts, { ...features, jhipsterBootstrap: false });
+    super(args, opts, { ...features, queueCommandTasks: true, jhipsterBootstrap: false });
   }
 
   get [BaseGenerator.WRITING]() {
     return this.asWritingTaskGroup({
       async buildMatrix() {
-        const matrix = await buildMatrix(this.templatePath('../../generate-sample/templates/samples'));
-        setGithubTaskOutput('matrix', matrix);
+        const { samplesGroup = 'samples' } = this;
+        const templatePath = this.templatePath('../../generate-sample/templates/');
+        const samplesFolder = this.samplesFolder ? join(templatePath, this.samplesFolder) : templatePath;
+        const { samples, warnings } = await getGithubSamplesGroup(samplesFolder, samplesGroup);
+        if (warnings.length > 0) {
+          this.log.info(warnings.join('\n'));
+        }
+        this.matrix = convertToGitHubMatrix(samples);
+        const githubOutputFile = getGithubOutputFile();
+        this.log.info('matrix', this.matrix);
+        if (githubOutputFile) {
+          setGithubTaskOutput('matrix', JSON.stringify(this.matrix));
+        }
       },
     });
   }

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

@@ -0,0 +1,24 @@
+import { basename, dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+import { beforeAll, describe, expect, it } from 'vitest';
+import { getGithubSamplesGroups, defaultHelpers as helpers, runResult } from 'generator-jhipster/testing';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`generator - ${generator}`, async () => {
+  const groups = await getGithubSamplesGroups(join(__dirname, '../generate-sample/templates/'));
+  for (const workflow of groups.map(sample => sample.split('.')[0])) {
+    describe(`with ${workflow}`, () => {
+      beforeAll(async () => {
+        await helpers.runJHipster(join(__dirname, 'index.mjs'), { useEnvironmentBuilder: true }).withArguments(workflow);
+      });
+
+      it('should match matrix value', () => {
+        expect(runResult.generator.matrix).toMatchSnapshot();
+      });
+    });
+  }
+});

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

@@ -1 +1,2 @@
 export { default } from './generator.mjs';
+export { default as command } from './command.mjs';

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

@@ -1,4 +1,8 @@
 name: Verify Sample Projects
+concurrency:
+  # Group PRs by head_ref, push to main branch by commit id, and others branch by ref.
+  group: ${{ github.workflow }}-${{ github.head_ref || (github.ref == 'refs/heads/main' && github.sha) || github.ref }}
+  cancel-in-progress: true
 on:
   push:
     branches:
@@ -11,6 +15,8 @@ on:
       - '*'
 permissions:
   contents: read
+env:
+  FORCE_COLOR: 2
 jobs:
   build-matrix:
     runs-on: ubuntu-latest
@@ -26,8 +32,8 @@ jobs:
           npm install
           ./cli/cli.cjs github-build-matrix
   samples:
-    name: ${{ matrix.job-name || matrix.sample-name }}
-    runs-on: ubuntu-latest
+    name: ${{ matrix.job-name || matrix.sample }}
+    runs-on: ${{ matrix.os }}
     needs: build-matrix
     defaults:
       run:
@@ -50,7 +56,7 @@ jobs:
           binary-dir: ${{ github.workspace }}/generator-jhipster-<%= baseName %>/cli/
       - run: npm install
         working-directory: ${{ github.workspace }}/generator-jhipster-<%= baseName %>
-      - run: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies ${{ matrix.extra-args }}
+      - run: cli.cjs generate-sample ${{ matrix.sample }} --skip-jhipster-dependencies --skip-install ${{ matrix.extra-args }}
       - uses: jhipster/actions/compare-sample@v0
         id: compare
         if: >-
@@ -58,14 +64,14 @@ jobs:
           !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 --skip-install ${{ matrix.extra-args }}
+          cmd: cli.cjs generate-sample ${{ matrix.sample }} --skip-jhipster-dependencies --skip-install ${{ matrix.extra-args }}
       - 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:frontend:test --if-present
+        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
@@ -75,7 +81,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always() && steps.backend.outcome == 'failure'
         with:
-          name: log-${{ matrix.sample-name }}
+          name: log-${{ matrix.job-name || matrix.sample }}
           path: |
             ${{ github.workspace }}/app/build/test-results/**/*.xml
             ${{ github.workspace }}/app/target/surefire-reports
@@ -83,7 +89,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always() && steps.e2e.outcome == 'failure'
         with:
-          name: screenshots-${{ matrix.sample-name }}
+          name: screenshots-${{ matrix.job-name || matrix.sample }}
           path: ${{ github.workspace }}/app/**/cypress/screenshots
       - name: Dump docker logs
         if: always()