generator-jhipster 8.7.0 → 8.7.2

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { asWriteFilesSection } from '../base-application/support/task-type-inference.js';
+import { asWriteFilesSection } from '../base-application/support/index.js';
 import { LOCAL_BLUEPRINT_OPTION } from './constants.js';
 export const files = asWriteFilesSection({
     baseFiles: [
@@ -29,11 +29,13 @@ export const files = asWriteFilesSection({
                 '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',
                 '.blueprint/generate-sample/index.mjs',
+                // Always write cli for devBlueprint usage
+                'cli/cli.cjs',
+                { sourceFile: 'cli/cli-customizations.cjs', override: false },
             ],
         },
         {
@@ -42,17 +44,15 @@ export const files = asWriteFilesSection({
                 '.blueprint/github-build-matrix/build-matrix.mjs',
                 '.blueprint/github-build-matrix/generator.mjs',
                 '.blueprint/github-build-matrix/index.mjs',
-                '.github/workflows/build-cache.yml',
-                '.github/workflows/samples.yml',
             ],
         },
         {
-            condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION] && !ctx.sampleWritten,
-            templates: ['.blueprint/generate-sample/templates/samples/sample.jdl'],
+            condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION] && ctx.githubWorkflows && !ctx.skipWorkflows,
+            templates: ['.github/workflows/build-cache.yml', '.github/workflows/samples.yml'],
         },
         {
-            condition: ctx => ctx.cli,
-            templates: ['cli/cli.cjs'],
+            condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION] && !ctx.sampleWritten,
+            templates: ['.blueprint/generate-sample/templates/samples/sample.jdl'],
         },
         {
             condition: ctx => ctx.commands.length > 0,
@@ -60,30 +60,28 @@ export const files = asWriteFilesSection({
         },
     ],
 });
-export const generatorFiles = {
+export const generatorFiles = asWriteFilesSection({
     generator: [
         {
             path: 'generators/generator',
             to: ctx => `${ctx.application.blueprintsPath}${ctx.generator}`,
             templates: [
-                { file: 'generator.mjs.jhi', renameTo: ctx => (ctx.js ? 'generator.js.jhi' : 'generator.mjs.jhi') },
-                { file: 'index.mjs', renameTo: ctx => (ctx.js ? 'index.js' : 'index.mjs') },
-            ],
-        },
-        {
-            path: 'generators/generator',
-            condition: ctx => ctx.priorities.find(priority => priority.name === 'initializing'),
-            to: ctx => `${ctx.application.blueprintsPath}${ctx.generator}`,
-            templates: [{ file: 'command.mjs', renameTo: ctx => (ctx.js ? 'command.js' : 'command.mjs') }],
-        },
-        {
-            path: 'generators/generator',
-            to: ctx => `${ctx.application.blueprintsPath}${ctx.generator}`,
-            condition: ctx => !ctx.generator.startsWith('entity') && !ctx.application[LOCAL_BLUEPRINT_OPTION],
-            templates: [
+                { sourceFile: 'index.mjs', destinationFile: ctx => `index.${ctx.blueprintMjsExtension}` },
                 {
-                    file: 'generator.spec.mjs',
-                    renameTo: ctx => (ctx.js ? 'generator.spec.js' : 'generator.spec.mjs'),
+                    sourceFile: 'command.mjs',
+                    destinationFile: ctx => `command.${ctx.blueprintMjsExtension}`,
+                    override: data => !data.ignoreExistingGenerators,
+                },
+                {
+                    sourceFile: 'generator.mjs.jhi',
+                    destinationFile: ctx => `generator.${ctx.blueprintMjsExtension}.jhi`,
+                    override: data => !data.ignoreExistingGenerators,
+                },
+                {
+                    condition: data => !data.generator.startsWith('entity') && !data.application[LOCAL_BLUEPRINT_OPTION],
+                    sourceFile: 'generator.spec.mjs',
+                    destinationFile: data => `generator.spec.${data.blueprintMjsExtension}`,
+                    override: data => !data.ignoreExistingGenerators,
                 },
             ],
         },
@@ -91,15 +89,15 @@ export const generatorFiles = {
             path: 'generators/generator',
             to: ctx => `${ctx.application.blueprintsPath}${ctx.generator}`,
             condition(ctx) {
-                return (this.options.force || !ctx.written) && ctx.priorities.find(priority => priority.name === 'writing');
+                return !ctx.written && ctx.priorities.find(priority => priority.name === 'writing');
             },
             transform: false,
             templates: [
                 {
-                    file: 'templates/template-file.ejs',
-                    renameTo: ctx => `templates/template-file-${ctx.generator}.ejs`,
+                    sourceFile: 'templates/template-file.ejs',
+                    destinationFile: ctx => `templates/template-file-${ctx.generator}.ejs`,
                 },
             ],
         },
     ],
-};
+});

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

@@ -0,0 +1,21 @@
+import BaseGenerator from '../base-application/index.js';
+export default class extends BaseGenerator {
+    application: any;
+    recreatePackageLock: boolean;
+    skipWorkflows: boolean;
+    ignoreExistingGenerators: boolean;
+    _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">;
+    get configuring(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "requiredConfig" | "conditionalConfig">;
+    get composing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "compose" | "storeCurrentVersion">;
+    get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<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>>>, "load" | "createContext">;
+    get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<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>>>, "prepare" | "prepareCommands" | "preparePath">;
+    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>>>, "writing" | "cleanup" | "writingGenerators">;
+    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>>>, "upgrade" | "packageJson" | "addCliToPackageJson" | "addGeneratorJHipsterDependency">;
+    get postInstall(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplication<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>>>, "addSnapshot">;
+    get end(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplication<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>>>, "end">;
+    getSubGeneratorStorage(subGenerator: any): import("yeoman-generator").Storage;
+    validateGitHubName(input: any): true | "Your username is mandatory, cannot contain special characters or a blank space";
+    validateModuleName(input: any): true | "Your blueprint name is mandatory, cannot contain special characters or a blank space, using the default name instead";
+}

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

@@ -1,3 +1,4 @@
+// @ts-nocheck
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *
@@ -16,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { rm } from 'node:fs/promises';
 import chalk from 'chalk';
 import { camelCase, snakeCase, upperFirst } from 'lodash-es';
 import BaseGenerator from '../base-application/index.js';
@@ -28,6 +30,10 @@ import { ADDITIONAL_SUB_GENERATORS, ALL_GENERATORS, ALL_PRIORITIES, DYNAMIC, GEN
 const { GENERATOR_PROJECT_NAME, GENERATOR_INIT } = GENERATOR_LIST;
 const defaultPublishedFiles = ['generators', '!**/__*', '!**/*.snap', '!**/*.spec.?(c|m)js'];
 export default class extends BaseGenerator {
+    application;
+    recreatePackageLock;
+    skipWorkflows;
+    ignoreExistingGenerators;
     async _beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
@@ -52,7 +58,7 @@ export default class extends BaseGenerator {
         return this.delegateTasksToBlueprint(() => this.initializing);
     }
     get prompting() {
-        return {
+        return this.asPromptingTaskGroup({
             async prompting() {
                 await this.prompt(prompts(this), this.config);
             },
@@ -83,13 +89,13 @@ export default class extends BaseGenerator {
                     await this.prompt(subGeneratorPrompts({ subGenerator, localBlueprint, additionalSubGenerator: true }), subGeneratorStorage);
                 }
             },
-        };
+        });
     }
     get [BaseGenerator.PROMPTING]() {
         return this.delegateTasksToBlueprint(() => this.prompting);
     }
     get configuring() {
-        return {
+        return this.asConfiguringTaskGroup({
             requiredConfig() {
                 this.config.defaults(requiredConfig());
             },
@@ -101,20 +107,23 @@ export default class extends BaseGenerator {
                     });
                 }
             },
-        };
+        });
     }
     get [BaseGenerator.CONFIGURING]() {
         return this.delegateTasksToBlueprint(() => this.configuring);
     }
     get composing() {
-        return {
+        return this.asComposingTaskGroup({
+            storeCurrentVersion() {
+                this.storeCurrentJHipsterVersion();
+            },
             async compose() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
                 const initGenerator = await this.composeWithJHipster(GENERATOR_INIT, { generatorOptions: { packageJsonType: 'module' } });
                 initGenerator.generateReadme = false;
             },
-        };
+        });
     }
     get [BaseGenerator.COMPOSING]() {
         return this.delegateTasksToBlueprint(() => this.composing);
@@ -150,9 +159,10 @@ export default class extends BaseGenerator {
             preparePath() {
                 this.application.blueprintsPath = this.application[LOCAL_BLUEPRINT_OPTION] ? '.blueprint/' : 'generators/';
             },
-            prepare() {
+            prepare({ application }) {
                 const { cli, cliName, baseName } = this.application;
                 this.application.githubRepository = this.jhipsterConfig.githubRepository ?? `jhipster/generator-jhipster-${baseName}`;
+                application.blueprintMjsExtension = this.application.js ? 'js' : 'mjs';
                 if (cli) {
                     this.application.cliName = cliName ?? `jhipster-${baseName}`;
                 }
@@ -165,19 +175,29 @@ export default class extends BaseGenerator {
     get writing() {
         return this.asWritingTaskGroup({
             async cleanup({ control }) {
-                await control.cleanupFiles({ '8.5.1': ['.eslintrc.json'] });
+                await control.cleanupFiles({
+                    '8.5.1': ['.eslintrc.json'],
+                    '8.7.2': ['.eslintignore', 'vitest.test-setup.ts'],
+                });
             },
-            async writing() {
+            async writing({ application }) {
                 this.application.sampleWritten = this.jhipsterConfig.sampleWritten;
+                const { skipWorkflows, ignoreExistingGenerators } = this;
                 await this.writeFiles({
                     sections: files,
-                    context: this.application,
+                    context: {
+                        ...application,
+                        skipWorkflows,
+                        ignoreExistingGenerators,
+                        ...this.application,
+                    },
                 });
                 this.jhipsterConfig.sampleWritten = true;
             },
-            async writingGenerators() {
+            async writingGenerators({ application }) {
                 if (!this.application[GENERATORS])
                     return;
+                const { skipWorkflows, ignoreExistingGenerators } = this;
                 for (const generator of Object.keys(this.application[GENERATORS])) {
                     const subGeneratorStorage = this.getSubGeneratorStorage(generator);
                     const subGeneratorConfig = subGeneratorStorage.getAll();
@@ -189,7 +209,9 @@ export default class extends BaseGenerator {
                     const customGenerator = !Object.values(GENERATOR_LIST).includes(generator);
                     const jhipsterGenerator = customGenerator || subGeneratorConfig.sbs ? 'base-application' : generator;
                     const subTemplateData = {
-                        js: this.application.js,
+                        ...application,
+                        skipWorkflows,
+                        ignoreExistingGenerators,
                         application: this.application,
                         ...defaultSubGeneratorConfig(),
                         ...subGeneratorConfig,
@@ -214,6 +236,26 @@ export default class extends BaseGenerator {
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
+            upgrade({ application }) {
+                if (!this.application[GENERATORS])
+                    return;
+                if (!this.isJhipsterVersionLessThan('8.7.2'))
+                    return;
+                for (const generator of Object.keys(this.application[GENERATORS])) {
+                    const commandFile = `${this.application.blueprintsPath}${generator}/command.${application.blueprintMjsExtension}`;
+                    this.editFile(commandFile, content => content
+                        .replace(`/**
+ * @type {import('generator-jhipster').JHipsterCommandDefinition}
+ */`, `import { asCommand } from 'generator-jhipster';
+`)
+                        .replace('const command = ', 'export default asCommand(')
+                        .replace(`
+};`, '});')
+                        .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']"));
+                }
+            },
             packageJson() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
@@ -268,27 +310,23 @@ export default class extends BaseGenerator {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
                 const { packagejs } = this.application;
+                const exactDependency = {
+                    'generator-jhipster': `${packagejs.version}`,
+                };
+                const caretDependency = {
+                    'generator-jhipster': `^${packagejs.version}`,
+                };
                 if (this.jhipsterConfig.dynamic) {
                     this.packageJson.merge({
-                        devDependencies: {
-                            'generator-jhipster': `${packagejs.version}`,
-                        },
-                        peerDependencies: {
-                            'generator-jhipster': `^${packagejs.version}`,
-                        },
-                        engines: {
-                            'generator-jhipster': `^${packagejs.version}`,
-                        },
+                        devDependencies: exactDependency,
+                        peerDependencies: caretDependency,
+                        engines: caretDependency,
                     });
                 }
                 else {
                     this.packageJson.merge({
-                        dependencies: {
-                            'generator-jhipster': `${packagejs.version}`,
-                        },
-                        engines: {
-                            'generator-jhipster': `${packagejs.version}`,
-                        },
+                        dependencies: exactDependency,
+                        engines: this.jhipsterConfig.caret ? caretDependency : exactDependency,
                     });
                 }
             },
@@ -298,12 +336,17 @@ export default class extends BaseGenerator {
         return this.delegateTasksToBlueprint(() => this.postWriting);
     }
     get postInstall() {
-        return {
-            async addSnapshot() {
+        return this.asPostInstallTaskGroup({
+            async addSnapshot({ control }) {
                 const { [LOCAL_BLUEPRINT_OPTION]: localBlueprint } = this.jhipsterConfig;
                 const { skipInstall, skipGit, existed, [GENERATE_SNAPSHOTS]: generateSnapshots = !localBlueprint && !skipInstall && !skipGit && !existed, } = this.options;
                 if (!generateSnapshots)
                     return;
+                if (this.recreatePackageLock) {
+                    await rm(this.destinationPath('package-lock.json'), { force: true });
+                    await rm(this.destinationPath('node_modules'), { force: true, recursive: true });
+                    await this.spawnCommand('npm', ['install'], { stdio: 'inherit' });
+                }
                 try {
                     if (this.options[LINK_JHIPSTER_DEPENDENCY]) {
                         this.log.verboseInfo('Linking generator-jhipster');
@@ -321,14 +364,29 @@ This is a new blueprint, executing '${chalk.yellow('npm run update-snapshot')}'
                     }
                     this.log.warn('Fail to generate snapshots');
                 }
+                if (control.jhipsterOldVersion) {
+                    // Apply prettier and eslint to fix non generated files on upgrade.
+                    try {
+                        await this.spawnCommand('npm', ['run', 'prettier-format']);
+                    }
+                    catch {
+                        // Ignore error
+                    }
+                    try {
+                        await this.spawnCommand('npm', ['run', 'lint-fix']);
+                    }
+                    catch {
+                        // Ignore error
+                    }
+                }
             },
-        };
+        });
     }
     get [BaseGenerator.POST_INSTALL]() {
         return this.delegateTasksToBlueprint(() => this.postInstall);
     }
     get end() {
-        return {
+        return this.asEndTaskGroup({
             end() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
@@ -344,7 +402,7 @@ To begin to work:
 - then, come back here, and begin to code!
 `);
             },
-        };
+        });
     }
     get [BaseGenerator.END]() {
         return this.delegateTasksToBlueprint(() => this.end);

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

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './generator.js';
+export { default as command } from './command.js';
+export { files, generatorFiles } from './files.js';

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

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "eslint": "9.9.1",
-    "globals": "15.9.0",
-    "vitest": "2.0.5"
+    "eslint": "9.13.0",
+    "globals": "15.11.0",
+    "vitest": "2.1.4"
   }
 }

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

@@ -26,7 +26,7 @@ jobs:
           npm install
           ./cli/cli.cjs github-build-matrix
   samples:
-    name: ${{ matrix.sample-name }}
+    name: ${{ matrix.job-name || matrix.sample-name }}
     runs-on: ubuntu-latest
     needs: build-matrix
     defaults:
@@ -48,11 +48,9 @@ jobs:
           maven-cache: true
           gradle-cache: true
           binary-dir: ${{ github.workspace }}/generator-jhipster-<%= baseName %>/cli/
-      - name: 'Install blueprint'
-        run: npm install
+      - run: npm install
         working-directory: ${{ github.workspace }}/generator-jhipster-<%= baseName %>
-      - name: 'Generate Project'
-        run: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --force
+      - run: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies ${{ matrix.extra-args }}
       - uses: jhipster/actions/compare-sample@v0
         id: compare
         if: >-
@@ -60,7 +58,7 @@ 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 --force --skip-install
+          cmd: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --skip-install ${{ matrix.extra-args }}
       - run: npm run ci:backend:test
         if: steps.compare.outputs.equals != 'true'
         id: backend
@@ -73,7 +71,7 @@ jobs:
       - run: npm run ci:e2e:run --if-present
         if: steps.compare.outputs.equals != 'true'
         id: e2e
-      - name: 'BACKEND: Store failure logs'
+      - name: Store backend test failure logs
         uses: actions/upload-artifact@v4
         if: always() && steps.backend.outcome == 'failure'
         with:
@@ -81,7 +79,7 @@ jobs:
           path: |
             ${{ github.workspace }}/app/build/test-results/**/*.xml
             ${{ github.workspace }}/app/target/surefire-reports
-      - name: 'E2E: Store failure screenshots'
+      - name: Store cypress screenshots
         uses: actions/upload-artifact@v4
         if: always() && steps.e2e.outcome == 'failure'
         with:

package/dist/generators/generate-blueprint/templates/README.md.ejs

@@ -46,13 +46,23 @@ npm install -g generator-jhipster-<%= baseName %>
 
 To use this blueprint, run the below command
 
-```bash
 <%_ if (cli) { _%>
+```bash
 <%= cliName %>
+  <%_ if (caret) { _%>
+```
+
+or
+
+```bash
+jhipster --blueprints <%= baseName %>
+```
+  <%_ } _%>
 <%_ } else { _%>
+```bash
 jhipster --blueprints <%= baseName %>
-<%_ } _%>
 ```
+<%_ } _%>
 
 You can look for updated <%= baseName %> blueprint specific options by running
 

package/dist/generators/generate-blueprint/templates/cli/cli-customizations.cjs.ejs

@@ -0,0 +1,2 @@
+// This file will not be overwritten by generate-blueprint
+module.exports = {};

package/dist/generators/generate-blueprint/templates/cli/cli.cjs.ejs

@@ -23,10 +23,11 @@ const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packa
       [blueprint]: version,
     },
     printBlueprintLogo: () => {
-      console.log('===================== JHipster <%= baseName %> =====================');
+      console.log('===================== JHipster <%= humanizedBaseName %> =====================');
       console.log('');
     },
     lookups: [{ packagePaths: [packagePath] }],
+    ...require('./cli-customizations.cjs'),
   }).catch(done);
 
   process.on('unhandledRejection', up => {

package/dist/generators/generate-blueprint/templates/cli/commands.cjs.ejs

@@ -19,7 +19,7 @@
 module.exports = {
 <% for (const command of commands) { %>
   '<%= command %>': {
-    description: 'Run <%= command %> sub-generator (<%= baseName %> blueprint)',
+    desc: 'Run <%= command %> sub-generator (<%= baseName %> blueprint)',
     blueprint: 'generator-jhipster-<%= baseName %>',
   },
 <% } %>

package/dist/generators/generate-blueprint/templates/eslint.config.js.jhi.blueprint.ejs

@@ -17,8 +17,9 @@
  limitations under the License.
 -%>
 <&_ if (fragment.importsSection) { -&>
-import jhipster from 'generator-jhipster/eslint/recommended';
+import jhipster from 'generator-jhipster/eslint';
 <&_ } -&>
 <&_ if (fragment.configSection) { -&>
-  jhipster,
+  { ignores: ['coverage/**'] },
+  jhipster.recommended,
 <&_ } -&>

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

@@ -16,29 +16,25 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+import { asCommand } from 'generator-jhipster';
 <%_ if (!sbs && !customGenerator) { _%>
 import { command as jhipsterCommand } from 'generator-jhipster/generators/<%- subGenerator %>';
-
 <%_ } _%>
-/**
- * @type {import('generator-jhipster').JHipsterCommandDefinition}
- */
-const command = {
-  options: {
+
+export default asCommand({
 <%_ if (!sbs && !customGenerator) { _%>
+  options: {
     ...jhipsterCommand.options,
-<%_ } _%>
   },
+<%_ } _%>
   configs: {
 <%_ if (!sbs && !customGenerator) { _%>
     ...jhipsterCommand.configs,
 <%_ } _%>
   },
-  arguments: {
 <%_ if (!sbs && !customGenerator) { _%>
+  arguments: {
     ...jhipsterCommand.arguments,
-<%_ } _%>
   },
-};
-
-export default command;
+<%_ } _%>
+});

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

@@ -28,7 +28,7 @@
 import <%= generatorClass %>Generator from 'generator-jhipster/generators/<%= jhipsterGenerator %>';
 <%_ } _%>
 <%_ if (priorities.find(priority => priority.name === 'initializing')) { _%>
-import command from './command.<%- js ? '' : 'm' %>js';
+import command from './command.<%- blueprintMjsExtension %>';
 <%_ } _%>
 
 <%_ if (application.dynamic) { _%>
@@ -48,21 +48,21 @@ export async function createGenerator(env) {
 <%_ } else { _%>
 export default class extends <%= generatorClass %>Generator {
 <%_ } _%>
-<%_ if (sbs) { _%>
-  constructor(args, opts, features) {
-    super(args, opts, { ...features, sbsBlueprint: true });
-  }
-
-<%_ } else if (!customGenerator) { _%>
   constructor(args, opts, features) {
     super(args, opts, {
       ...features,
+      queueCommandTasks: true,
+<%_ if (sbs) { _%>
+      sbsBlueprint: true,
+<%_ } else if (!customGenerator) { _%>
       checkBlueprint: true,
       // Dropped it once migration is done.
       jhipster7Migration: true,
+<%_ } _%>
     });
   }
 
+<%_ if (!sbs && !customGenerator) { _%>
   async beforeQueue() {
     await super.beforeQueue();
   }
@@ -82,10 +82,7 @@ export default class extends <%= generatorClass %>Generator {
         { application }
   <%_ } _%>
       ) {
-  <%_ if (priority.name === 'initializing') { _%>
-        this.parseJHipsterArguments(command.arguments);
-        this.parseJHipsterOptions(command.options);
-  <%_ } else if (priority.name === 'writing') { _%>
+  <%_ if (priority.name === 'writing') { _%>
         await this.writeFiles({
           sections: {
             files: [

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

@@ -36,13 +36,13 @@ describe('SubGenerator <%= subGenerator %> of <%= application.baseName %> JHipst
         .withOptions({
           ignoreNeedlesError: true,
 <%_ if (!customGenerator) { _%>
-          blueprint: '<%= application.baseName %>',
+          blueprint: ['<%= application.baseName %>'],
 <%_ } _%>
 <%_ if (subGenerator === 'jdl') { _%>
           inline: 'application { }',
 <%_ } _%>
         })
-        .withJHipsterLookup()
+        .withJHipsterGenerators()
         .withParentBlueprintLookup();
     });