update to generator-jhipster 8.0.0-rc.1 (#212)

* update jhipster branch * update snapshots * make java-audit compose with java * use command.configs * update jhipster branch * adjusts * bump generator-jhipster to 8.0.0-rc.1. * move app generator to server * cleanup * Update command.mjs * adjusts * update snapshot * add comment about command import
jhipster · Oct 15, 2023 · c96ed2b · c96ed2b
1 parent 31f8919
commit c96ed2b
Show file tree

Hide file tree

Showing 29 changed files with 1,157 additions and 2,190 deletions.
diff --git a/.blueprint/cli/commands.mjs b/.blueprint/cli/commands.mjs
@@ -20,7 +20,6 @@
 const defaultCommands = {
   'generate-sample': {
     desc: 'Generate a test sample',
-    blueprint: '@jhipster/jhipster-dev',
   },
 };
 

diff --git a/.blueprint/generate-sample/command.mjs b/.blueprint/generate-sample/command.mjs
@@ -27,7 +27,11 @@ const command = {
     },
   },
   options: {},
-  import: [GENERATOR_APP, `jhipster-entity-audit:${GENERATOR_APP}`],
+  import: [
+    GENERATOR_APP,
+    // Add blueprint server generator because RC.1 is not loading blueprints options for blueprint generator command.
+    `jhipster-entity-audit:server`,
+  ],
 };
 
 export default command;
diff --git a/.blueprint/generate-sample/generator.mjs b/.blueprint/generate-sample/generator.mjs
@@ -50,9 +50,13 @@ export default class extends BaseGenerator {
             skipJhipsterDependencies: true,
             insight: false,
             skipChecks: true,
+            skipInstall: true,
           },
         });
       },
+      async jhipsterInfo() {
+        await this.composeWithJHipster('info');
+      },
     });
   }
 }
diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 18

diff --git a/.yo-rc.json b/.yo-rc.json
@@ -11,12 +11,6 @@
         "sbs": null,
         "written": true
       },
-      "app": {
-        "command": false,
-        "priorities": ["initializing", "prompting", "composing"],
-        "sbs": true,
-        "written": true
-      },
       "client": {
         "command": false,
         "priorities": ["composing"],
@@ -35,6 +29,12 @@
         "sbs": true,
         "written": true
       },
+      "server": {
+        "command": false,
+        "priorities": ["initializing", "prompting", "composing"],
+        "sbs": true,
+        "written": true
+      },
       "spring-boot-custom-audit": {
         "command": false,
         "priorities": ["configuring", "loading", "writing", "postWriting"],

diff --git a/cli/cli.cjs b/cli/cli.cjs
@@ -8,6 +8,7 @@ const { version, bin } = require('../package.json');
 const packagePath = dirname(__dirname);
 const packageFolderName = basename(packagePath);
 const devBlueprintPath = join(packagePath, '.blueprint');
+const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packageFolderName}` : packageFolderName;
 
 (async () => {
   const { runJHipster, done, logger } = await import('generator-jhipster/cli');
@@ -19,7 +20,7 @@ const devBlueprintPath = join(packagePath, '.blueprint');
     defaultCommand: 'app',
     devBlueprintPath,
     blueprints: {
-      [packageFolderName]: version,
+      [blueprint]: version,
     },
     printBlueprintLogo: () => {
       console.log('===================== JHipster entity-audit =====================');

diff --git a/generators/angular-audit/generator.mjs b/generators/angular-audit/generator.mjs
@@ -4,7 +4,7 @@ import { clientApplicationTemplatesBlock } from 'generator-jhipster/generators/c
 export default class extends BaseApplicationGenerator {
   ngxDiff;
 
-  async _postConstruct() {
+  async beforeQueue() {
     await this.dependsOnJHipster('bootstrap-application');
   }