Merge pull request #262 from jhipster/generator-jhipster-8.6.0

Update generator-jhipster to 8.6.0

.blueprint/cli/commands.mjs

@@ -22,6 +22,10 @@ const defaultCommands = {
     desc: 'Generate a test sample',
     blueprint: '@jhipster/jhipster-dev',
   },
+  'github-build-matrix': {
+    desc: 'Build a matrix of jobs for github actions',
+    blueprint: '@jhipster/jhipster-dev',
+  },
 };
 
 export default defaultCommands;

.blueprint/generate-sample/command.mjs

@@ -16,8 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { readdir } from 'node:fs/promises';
 import { GENERATOR_APP } from 'generator-jhipster/generators';
+import { getSamples } from './get-samples.mjs';
 
 /**
  * @type {import('generator-jhipster').JHipsterCommandDefinition}
@@ -34,7 +34,7 @@ const command = {
         when: !gen.all,
         type: 'list',
         message: 'which sample do you want to generate?',
-        choices: async () => readdir(gen.templatePath('samples')),
+        choices: async () => getSamples(gen.templatePath(gen.samplesFolder)),
       }),
       scope: 'generator',
     },
@@ -45,6 +45,14 @@ const command = {
       },
       scope: 'generator',
     },
+    samplesFolder: {
+      description: 'Path to the samples folder',
+      cli: {
+        type: String,
+      },
+      default: 'samples',
+      scope: 'generator',
+    },
   },
   options: {},
   import: [GENERATOR_APP],

.blueprint/generate-sample/generator.mjs

@@ -5,6 +5,7 @@ import BaseGenerator from 'generator-jhipster/generators/base';
 export default class extends BaseGenerator {
   sampleName;
   all;
+  samplesFolder;
 
   constructor(args, opts, features) {
     super(args, opts, { ...features, jhipsterBootstrap: false });
@@ -15,11 +16,6 @@ export default class extends BaseGenerator {
       async parseCommand() {
         await this.parseCurrentJHipsterCommand();
       },
-      async initializeOptions() {
-        if (this.sampleName && !this.sampleName.endsWith('.jdl')) {
-          this.sampleName += '.jdl';
-        }
-      },
     });
   }
 
@@ -31,13 +27,21 @@ export default class extends BaseGenerator {
     });
   }
 
+  get [BaseGenerator.LOADING]() {
+    return this.asLoadingTaskGroup({
+      async loadCommand() {
+        await this.loadCurrentJHipsterCommandConfig(this);
+      },
+    });
+  }
+
   get [BaseGenerator.WRITING]() {
     return this.asWritingTaskGroup({
       async copySample() {
         if (this.all) {
-          this.copyTemplate('samples/*.jdl', '');
+          this.copyTemplate(`${this.samplesFolder}/*.jdl`, '');
         } else {
-          this.copyTemplate(`samples/${this.sampleName}`, this.sampleName, { noGlob: true });
+          this.copyTemplate(`${this.samplesFolder}/${this.sampleName}`, this.sampleName, { noGlob: true });
         }
       },
     });

.blueprint/generate-sample/get-samples.mjs

@@ -0,0 +1,11 @@
+import { readdir, stat } from 'node:fs/promises';
+import { extname } from 'path';
+
+export const getSamples = async samplesFolder => {
+  const filenames = await readdir(samplesFolder);
+  const entries = await Promise.all(filenames.map(async filename => [filename, await stat(`${samplesFolder}/${filename}`)]));
+  return entries
+    .filter(([filename, statResult]) => extname(filename) === '.jdl' || statResult.isDirectory())
+    .map(([filename]) => filename)
+    .filter(filename => !filename.includes('disabled'));
+};

.blueprint/github-build-matrix/build-matrix.mjs

@@ -0,0 +1,24 @@
+import { RECOMMENDED_JAVA_VERSION, RECOMMENDED_NODE_VERSION } from 'generator-jhipster';
+import { fromMatrix } from 'generator-jhipster/testing';
+
+const defaultMatrix = {
+  os: ['ubuntu-latest'],
+  'node-version': [RECOMMENDED_NODE_VERSION],
+  'java-version': [RECOMMENDED_JAVA_VERSION],
+  'default-environment': ['prod'],
+};
+
+export const buildMatrix = ({ samples, samplesFolder }) => {
+  return {
+    include: Object.values(
+      fromMatrix({
+        ...defaultMatrix,
+        'sample-name': samples,
+      }),
+    ).map(sample => ({
+      ...sample,
+      'job-name': sample['sample-name'],
+      'extra-args': `--samples-folder ${samplesFolder}`,
+    })),
+  };
+};

.blueprint/github-build-matrix/command.mjs

@@ -0,0 +1,18 @@
+/**
+ * @type {import('generator-jhipster').JHipsterCommandDefinition}
+ */
+const command = {
+  configs: {
+    samplesFolder: {
+      description: 'Samples folder',
+      cli: {
+        type: String,
+      },
+      default: 'samples',
+      scope: 'generator',
+    },
+  },
+  options: {},
+};
+
+export default command;

.blueprint/github-build-matrix/generator.mjs

@@ -0,0 +1,44 @@
+import { existsSync, appendFileSync } from 'node:fs';
+import os from 'node:os';
+import BaseGenerator from 'generator-jhipster/generators/base';
+import { getSamples } from '../generate-sample/get-samples.mjs';
+import { buildMatrix } from './build-matrix.mjs';
+
+export default class extends BaseGenerator {
+  samplesFolder;
+
+  constructor(args, opts, features) {
+    super(args, opts, { ...features, jhipsterBootstrap: false });
+  }
+
+  get [BaseGenerator.INITIALIZING]() {
+    return this.asInitializingTaskGroup({
+      async parseCommand() {
+        await this.parseCurrentJHipsterCommand();
+      },
+    });
+  }
+
+  get [BaseGenerator.LOADING]() {
+    return this.asLoadingTaskGroup({
+      async loadCommand() {
+        await this.loadCurrentJHipsterCommandConfig(this);
+      },
+    });
+  }
+
+  get [BaseGenerator.WRITING]() {
+    return this.asWritingTaskGroup({
+      async buildMatrix() {
+        const samples = await getSamples(this.templatePath(`../../generate-sample/templates/${this.samplesFolder}`));
+        const matrix = buildMatrix({ samples, samplesFolder: this.samplesFolder });
+        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' });
+        }
+      },
+    });
+  }
+}

.blueprint/github-build-matrix/index.mjs

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

.github/workflows/samples.yml

@@ -34,7 +34,7 @@ permissions:
   contents: read
 jobs:
   applications:
-    name: ${{ matrix.audit-framework }} ${{ matrix.build-tool }}) ${{ matrix.suite }} (${{ matrix.os }}
+    name: ${{ matrix.audit-framework }}, ${{ matrix.build-tool }}, ${{ matrix.suite }} (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -49,7 +49,7 @@ jobs:
         build-tool: [maven, gradle]
         audit-framework: [custom, javers]
         suite:
-          - postgresql-mvc-jwt
+          - postgresql-mvc-jwt.jdl
     steps:
       #----------------------------------------------------------------------
       # Install all tools and check configuration

.prettierignore

@@ -3,4 +3,4 @@ package-lock.json
 .git
 
 # blueprint rules:
-**/templates/**/
+generators/**/templates/**/

.yo-rc.json

@@ -48,6 +48,7 @@
         "written": true
       }
     },
+    "githubWorkflows": true,
     "jhipsterVersion": "7.9.2",
     "js": true,
     "localBlueprint": false,

eslint.config.js

@@ -0,0 +1,15 @@
+import globals from 'globals';
+import prettierRecommended from 'eslint-plugin-prettier/recommended';
+import jhipsterRecommended from 'generator-jhipster/eslint/recommended';
+
+export default [
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+  jhipsterRecommended,
+  prettierRecommended,
+];