v8.7.1 adjusts (#273)

jhipster · Sep 26, 2024 · be1adab · be1adab
1 parent 8967fb8
commit be1adab
Show file tree

Hide file tree

Showing 8 changed files with 206 additions and 78 deletions.
diff --git a/.blueprint/github-build-matrix/generator.mjs b/.blueprint/github-build-matrix/generator.mjs
@@ -8,30 +8,15 @@ 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);
-      },
-    });
+    super(args, opts, { ...features, queueCommandTasks: true, jhipsterBootstrap: false });
   }
 
   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 samplesFolder = this.samplesFolder ?? 'samples';
+        const samples = await getSamples(this.templatePath(`../../generate-sample/templates/${samplesFolder}`));
+        const matrix = buildMatrix({ samples, samplesFolder });
         const matrixoutput = `matrix<<EOF${os.EOL}${JSON.stringify(matrix)}${os.EOL}EOF${os.EOL}`;
         const filePath = process.env.GITHUB_OUTPUT;
         console.log(matrixoutput);

diff --git a/.yo-rc.json b/.yo-rc.json
@@ -2,6 +2,7 @@
   "generator-jhipster": {
     "additionalSubGenerators": "angular-audit,java-audit,spring-boot-custom-audit,spring-boot-javers",
     "baseName": "entity-audit",
+    "caret": true,
     "cli": true,
     "entities": [],
     "generators": {

diff --git a/.yo-resolve b/.yo-resolve
@@ -0,0 +1 @@
+README.md
diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@
 > JHipster blueprint, entity-audit blueprint for JHipster
 
 [![NPM version][npm-image]][npm-url]
-[![Generator](https://github.com/hipster-labs/generator-jhipster-entity-audit/actions/workflows/generator.yml/badge.svg)](https://github.com/hipster-labs/generator-jhipster-entity-audit/actions/workflows/generator.yml)
-[![Integration Test](https://github.com/hipster-labs/generator-jhipster-entity-audit/actions/workflows/samples.yml/badge.svg)](https://github.com/hipster-labs/generator-jhipster-entity-audit/actions/workflows/samples.yml)
+[![Generator][github-generator-image]][github-generator-url]
+[![Samples][github-samples-image]][github-samples-url]
 
 # Introduction
 
@@ -26,9 +26,9 @@ The blueprint will add [spring-boot integration for javers](http://javers.org/do
 
 # Prerequisites
 
-As this is a [JHipster](https://www.jhipster.tech/) blueprint, we expect you have JHipster and its related tools already installed:
+As this is a [JHipster](https://www.jhipster.tech/) blueprint, we expect you have JHipster basic knowledge:
 
-- [Installing JHipster](https://www.jhipster.tech/installation/)
+- [JHipster](https://www.jhipster.tech/)
 
 # Installation
 
@@ -58,7 +58,7 @@ You can look for updated entity-audit blueprint specific options by running
 jhipster-entity-audit app --help
 ```
 
-And looking for `(blueprint option: entity-audit)` options.
+And looking for `(blueprint option: entity-audit)` like
 
 ## Pre-release
 
@@ -71,3 +71,7 @@ jhipster --blueprints entity-audit --skip-jhipster-dependencies
 
 [npm-image]: https://img.shields.io/npm/v/generator-jhipster-entity-audit.svg
 [npm-url]: https://npmjs.org/package/generator-jhipster-entity-audit
+[github-generator-image]: https://github.com/jhipster/generator-jhipster-entity-audit/actions/workflows/generator.yml/badge.svg
+[github-generator-url]: https://github.com/jhipster/generator-jhipster-entity-audit/actions/workflows/generator.yml
+[github-samples-image]: https://github.com/jhipster/generator-jhipster-entity-audit/actions/workflows/samples.yml/badge.svg
+[github-samples-url]: https://github.com/jhipster/generator-jhipster-entity-audit/actions/workflows/samples.yml
diff --git a/cli/cli-customizations.cjs b/cli/cli-customizations.cjs
@@ -0,0 +1,2 @@
+// This file will not be overwritten by generate-blueprint
+module.exports = {};
diff --git a/cli/cli.cjs b/cli/cli.cjs
@@ -23,10 +23,11 @@ const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packa
       [blueprint]: version,
     },
     printBlueprintLogo: () => {
-      console.log('===================== JHipster entity-audit =====================');
+      console.log('===================== JHipster Entity Audit =====================');
       console.log('');
     },
     lookups: [{ packagePaths: [packagePath] }],
+    ...require('./cli-customizations.cjs'),
   }).catch(done);
 
   process.on('unhandledRejection', up => {