update generator-jhipster to v8.7.1 (#1231)

.blueprint/generate-sample/generator.mjs

@@ -8,40 +8,17 @@ 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.PROMPTING]() {
-    return this.asPromptingTaskGroup({
-      async askForSample() {
-        await this.promptCurrentJHipsterCommand();
-      },
-    });
-  }
-
-  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 copySample() {
+        const samplesFolder = `${this.samplesFolder ?? 'samples'}/`;
         if (this.all) {
-          this.copyTemplate(`${this.samplesFolder}/*.jdl`, '');
+          this.copyTemplate(`${samplesFolder}*.jdl`, '');
         } else {
-          this.copyTemplate(`${this.samplesFolder}/${this.sampleName}`, this.sampleName, { noGlob: true });
+          this.copyTemplate(`${samplesFolder}${this.sampleName}`, this.sampleName, { noGlob: true });
         }
       },
     });

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

@@ -1,4 +1,4 @@
-import { existsSync, appendFileSync } from 'node:fs';
+import { appendFileSync, existsSync } from 'node:fs';
 import os from 'node:os';
 import BaseGenerator from 'generator-jhipster/generators/base';
 import { getSamples } from '../generate-sample/get-samples.mjs';
@@ -8,32 +8,17 @@ 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'];
+        const filePath = process.env.GITHUB_OUTPUT;
         console.log(matrixoutput);
         if (filePath && existsSync(filePath)) {
           appendFileSync(filePath, matrixoutput, { encoding: 'utf8' });

.github/workflows/ionic.yml

@@ -75,7 +75,7 @@ jobs:
         working-directory: ${{ github.workspace }}/generator-jhipster-ionic
       - name: Check Version
         run: $JHIPSTER_INSTALL/02-checkVersion.sh
-      - run: cli.cjs generate-sample ${{ matrix.jdl }} --force --no-insight --skip-checks --skip-install --skip-jhipster-dependencies
+      - run: cli.cjs generate-sample ${{ matrix.jdl }} --skip-jhipster-dependencies
       - uses: jhipster/actions/compare-sample@v0
         id: compare-backend
         if: >-
@@ -86,7 +86,7 @@ jobs:
           application-folder: backend
           compare-folder: backend
           generator-path: generator-jhipster-ionic
-          cmd: cli.cjs generate-sample ${{ matrix.jdl }} --force --no-insight --skip-checks --skip-git --skip-install --skip-jhipster-dependencies
+          cmd: cli.cjs generate-sample ${{ matrix.jdl }} --skip-git --skip-jhipster-dependencies --skip-install
       - uses: jhipster/actions/compare-sample@v0
         id: compare
         if: >-
@@ -97,7 +97,7 @@ jobs:
           application-folder: backend
           compare-folder: ionic4j
           generator-path: generator-jhipster-ionic
-          cmd: cli.cjs generate-sample ${{ matrix.jdl }} --force --no-insight --skip-checks --skip-git --skip-install --skip-jhipster-dependencies
+          cmd: cli.cjs generate-sample ${{ matrix.jdl }} --skip-git --skip-jhipster-dependencies --skip-install
       - name: Ionic tests
         run: cat package.json; npm install; npm test
         working-directory: ${{ github.workspace }}/ionic4j

.prettierrc.yml

@@ -1,9 +1,8 @@
-# Prettier configuration
-
 printWidth: 140
 singleQuote: true
 tabWidth: 2
 useTabs: false
-
-# js and ts rules:
 arrowParens: avoid
+bracketSameLine: false
+plugins:
+  - prettier-plugin-packagejson

.yo-rc.json

@@ -45,20 +45,22 @@
         "sbs": false,
         "written": true
       },
-      "server": {
+      "spring-boot": {
         "command": false,
         "priorities": ["writing", "postWriting"],
         "sbs": true,
         "written": true
       }
     },
     "githubWorkflows": true,
-    "jhipsterVersion": "7.8.1",
+    "jhipsterVersion": "8.7.1",
+    "js": false,
     "localBlueprint": false,
+    "packageJsonType": "module",
     "prettierDefaultIndent": 2,
     "projectName": "JHipster Ionic Blueprint",
     "sampleWritten": true,
     "skipCommitHook": true,
-    "subGenerators": ["app", "ionic", "project-name", "server"]
+    "subGenerators": ["app", "ionic", "project-name", "spring-boot"]
   }
 }

.yo-resolve

@@ -1,3 +1 @@
-.github/workflows/** skip
-generators/** skip
 README.md skip

cli/cli-customizations.cjs

@@ -0,0 +1,4 @@
+// This file will not be overwritten by generate-blueprint
+module.exports = {
+  defaultCommand: 'ionic',
+};

cli/cli.cjs

@@ -17,7 +17,7 @@ const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packa
   runJHipster({
     executableName,
     executableVersion: version,
-    defaultCommand: 'ionic',
+    defaultCommand: 'app',
     devBlueprintPath,
     blueprints: {
       [blueprint]: version,
@@ -27,6 +27,7 @@ const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packa
       console.log('');
     },
     lookups: [{ packagePaths: [packagePath] }],
+    ...require('./cli-customizations.cjs'),
   }).catch(done);
 
   process.on('unhandledRejection', up => {

eslint.config.js

@@ -1,6 +1,10 @@
 import globals from 'globals';
-import prettierRecommended from 'eslint-plugin-prettier/recommended';
-import jhipsterRecommended from 'generator-jhipster/eslint/recommended';
+import prettier from 'eslint-plugin-prettier/recommended';
+import jhipster from 'generator-jhipster/eslint/recommended';
+
+// Workaround for jhipster export issue.
+delete jhipster.recommended.recommended;
+// jhipster-needle-eslint-add-import - JHipster will add additional import here
 
 export default [
   {
@@ -10,6 +14,8 @@ export default [
       },
     },
   },
-  jhipsterRecommended,
-  prettierRecommended,
+  { ignores: ['coverage/**'] },
+  jhipster.recommended,
+  // jhipster-needle-eslint-add-config - JHipster will add additional config here
+  prettier,
 ];

generators/app/command.mjs

@@ -1,14 +1,11 @@
-/**
- * @type {import('generator-jhipster').JHipsterCommandDefinition}
- */
-const command = {
+import { asCommand } from 'generator-jhipster';
+
+export default asCommand({
   options: {
     ionicDir: {
       desc: 'Directory of JHipster application',
       type: String,
       scope: 'blueprint',
     },
   },
-};
-
-export default command;
+});

generators/app/generator.spec.mjs

@@ -17,7 +17,7 @@ describe('SubGenerator app of ionic JHipster blueprint', () => {
         })
         .withOptions({
           ignoreNeedlesError: true,
-          blueprint: 'ionic',
+          blueprint: ['ionic'],
         })
         .withJHipsterLookup()
         .withParentBlueprintLookup();
@@ -40,7 +40,7 @@ describe('SubGenerator app of ionic JHipster blueprint', () => {
         .withOptions({
           skipChecks: true,
           ignoreNeedlesError: true,
-          blueprint: 'ionic',
+          blueprint: ['ionic'],
           ionicDir: '../ionic-app',
         })
         .withJHipsterLookup()

generators/app/index.mjs

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

generators/ionic/command.mjs

@@ -1,7 +1,6 @@
-/**
- * @type {import('generator-jhipster').JHipsterCommandDefinition}
- */
-const command = {
+import { asCommand } from 'generator-jhipster';
+
+export default asCommand({
   options: {
     skipCommitHook: {
       desc: 'Skip adding husky commit hooks',
@@ -29,6 +28,4 @@ const command = {
       type: Boolean,
     },
   },
-};
-
-export default command;
+});

generators/ionic/generator.mjs

@@ -126,15 +126,6 @@ export default class extends BaseApplicationGenerator {
     });
   }
 
-  get [BaseApplicationGenerator.PREPARING]() {
-    return this.asPreparingTaskGroup({
-      husky({ application }) {
-        application.nodeDependencies.husky = '9.0.11';
-        application.nodeDependencies['lint-staged'] = '15.2.5';
-      },
-    });
-  }
-
   get [BaseApplicationGenerator.WRITING]() {
     return this.asWritingTaskGroup({
       async writingTemplateTask({ application }) {
@@ -197,6 +188,12 @@ export default class extends BaseApplicationGenerator {
 
   get [BaseApplicationGenerator.POST_WRITING]() {
     return this.asPostWritingTaskGroup({
+      ignoreEslint9ConfigFile({ application }) {
+        const eslintConfigFile = this.env.sharedFs.get(this.destinationPath(application.eslintConfigFile));
+        if (eslintConfigFile) {
+          delete eslintConfigFile.state;
+        }
+      },
       customizePackageJson({ application }) {
         const { baseName } = this.jhipsterConfig;
         this.packageJson.merge({
@@ -235,9 +232,9 @@ export default class extends BaseApplicationGenerator {
       async install() {
         try {
           if (this.env.sharedFs.get(this.destinationPath('package.json'))?.committed) {
-            await this.spawnCommand('npm', ['install']);
+            await this.spawnCommand('npm install');
           }
-        } catch (error) {
+        } catch {
           this.log.error(`Error executing 'npm install', execute by yourself.`);
         }
       },

generators/ionic/generator.spec.mjs

@@ -18,7 +18,7 @@ describe('SubGenerator ionic of ionic JHipster blueprint', () => {
         .run(SUB_GENERATOR_NAMESPACE)
         .withJHipsterConfig()
         .withOptions({
-          blueprint: 'ionic',
+          blueprint: ['ionic'],
           appDir: false,
           baseName: 'jhipster',
           ignoreNeedlesError: true,
@@ -42,7 +42,7 @@ describe('SubGenerator ionic of ionic JHipster blueprint', () => {
         .run(SUB_GENERATOR_NAMESPACE)
         .withJHipsterConfig()
         .withOptions({
-          blueprint: 'ionic',
+          blueprint: ['ionic'],
           appDir: false,
           baseName: 'jhipster',
           authenticationType: 'oauth2',

generators/project-name/command.mjs

@@ -1,8 +1,5 @@
-/**
- * @type {import('generator-jhipster').JHipsterCommandDefinition}
- */
-const command = {
-  options: {},
-};
+import { asCommand } from 'generator-jhipster';
 
-export default command;
+export default asCommand({
+  options: {},
+});

generators/project-name/generator.spec.mjs

@@ -13,7 +13,7 @@ describe('SubGenerator project-name of ionic JHipster blueprint', () => {
         .withJHipsterConfig()
         .withOptions({
           ignoreNeedlesError: true,
-          blueprint: 'ionic',
+          blueprint: ['ionic'],
         })
         .withJHipsterLookup()
         .withParentBlueprintLookup();

generators/spring-boot/command.mjs

@@ -0,0 +1,5 @@
+import { asCommand } from 'generator-jhipster';
+
+export default asCommand({
+  configs: {},
+});

generators/spring-boot/generator.spec.mjs

@@ -13,7 +13,7 @@ describe('SubGenerator spring-boot of ionic JHipster blueprint', () => {
         .withJHipsterConfig()
         .withOptions({
           ignoreNeedlesError: true,
-          blueprint: 'ionic',
+          blueprint: ['ionic'],
         })
         .withJHipsterLookup()
         .withParentBlueprintLookup();

generators/spring-boot/index.mjs

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