generator-jhipster 8.7.1 → 8.7.2

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

@@ -1,21 +1,98 @@
-/**
- * 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.
- */
-import type { JHipsterCommandDefinition } from '../../lib/command/index.js';
-declare const command: JHipsterCommandDefinition;
+declare const command: {
+    readonly configs: {
+        readonly caret: {
+            readonly cli: {
+                readonly description: "Use caret in package.json engines";
+                readonly type: BooleanConstructor;
+            };
+            readonly scope: "storage";
+        };
+        readonly recreatePackageLock: {
+            readonly description: "Recreate package lock";
+            readonly cli: {
+                readonly type: BooleanConstructor;
+            };
+            readonly scope: "generator";
+        };
+        readonly skipWorkflows: {
+            readonly description: "Skip github workflows";
+            readonly cli: {
+                readonly type: BooleanConstructor;
+            };
+            readonly scope: "generator";
+        };
+        readonly ignoreExistingGenerators: {
+            readonly description: "Ignore existing generators";
+            readonly cli: {
+                readonly type: BooleanConstructor;
+            };
+            readonly scope: "generator";
+        };
+        readonly githubRepository: {
+            readonly cli: {
+                readonly description: "Github Repository";
+                readonly type: StringConstructor;
+            };
+            readonly scope: "storage";
+        };
+        readonly githubWorkflows: {
+            readonly cli: {
+                readonly description: "Generate github workflows";
+                readonly type: BooleanConstructor;
+            };
+            readonly scope: "storage";
+        };
+    };
+    readonly options: {
+        readonly generateSnapshots: {
+            readonly description: "Generate test snapshots";
+            readonly type: BooleanConstructor;
+        };
+        readonly linkJhipsterDependency: {
+            readonly description: "Link JHipster dependency for testing";
+            readonly type: BooleanConstructor;
+            readonly hide: true;
+        };
+        readonly subGenerators: {
+            readonly description: "Sub generators to generate";
+            readonly type: ArrayConstructor;
+            readonly scope: "storage";
+        };
+        readonly additionalSubGenerators: {
+            readonly description: "Comma separated additional sub generators to generate";
+            readonly type: StringConstructor;
+            readonly scope: "storage";
+        };
+        readonly dynamic: {
+            readonly description: "Generate dynamic generators (advanced)";
+            readonly type: BooleanConstructor;
+            readonly scope: "storage";
+        };
+        readonly js: {
+            readonly description: "Use js extension";
+            readonly type: BooleanConstructor;
+            readonly scope: "storage";
+        };
+        readonly localBlueprint: {
+            readonly description: "Generate a local blueprint";
+            readonly type: BooleanConstructor;
+            readonly scope: "storage";
+        };
+        readonly cli: {
+            readonly description: "Generate a cli for the blueprint";
+            readonly type: BooleanConstructor;
+            readonly scope: "storage";
+        };
+        readonly allGenerators: {
+            readonly description: "Generate every sub generator";
+            readonly type: BooleanConstructor;
+            readonly scope: "generator";
+        };
+        readonly allPriorities: {
+            readonly description: "Generate every priority";
+            readonly type: BooleanConstructor;
+        };
+    };
+    readonly import: readonly ["init"];
+};
 export default command;

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

@@ -2,6 +2,34 @@ import { GENERATOR_INIT } from '../generator-list.js';
 import { ADDITIONAL_SUB_GENERATORS, ALL_GENERATORS, ALL_PRIORITIES, CLI_OPTION, DYNAMIC, GENERATE_SNAPSHOTS, JS, LINK_JHIPSTER_DEPENDENCY, LOCAL_BLUEPRINT_OPTION, SUB_GENERATORS, } from './constants.js';
 const command = {
     configs: {
+        caret: {
+            cli: {
+                description: 'Use caret in package.json engines',
+                type: Boolean,
+            },
+            scope: 'storage',
+        },
+        recreatePackageLock: {
+            description: 'Recreate package lock',
+            cli: {
+                type: Boolean,
+            },
+            scope: 'generator',
+        },
+        skipWorkflows: {
+            description: 'Skip github workflows',
+            cli: {
+                type: Boolean,
+            },
+            scope: 'generator',
+        },
+        ignoreExistingGenerators: {
+            description: 'Ignore existing generators',
+            cli: {
+                type: Boolean,
+            },
+            scope: 'generator',
+        },
         githubRepository: {
             cli: {
                 description: 'Github Repository',

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

@@ -37,7 +37,7 @@ export declare const defaultSubGeneratorConfig: () => {
     priorities: never[];
 };
 export declare const allGeneratorsConfig: () => {
-    subGenerators: ("base" | "upgrade" | "info" | "angular" | "react" | "vue" | "maven" | "gradle" | "cypress" | "cucumber" | "gatling" | "spring-websocket" | "languages" | "bootstrap" | "bootstrap-application-base" | "common" | "server" | "client" | "git" | "workspaces" | "spring-boot" | "liquibase" | "java" | "spring-data-relational" | "app" | "base-application" | "base-core" | "base-entity-changes" | "base-workspaces" | "bootstrap-application" | "bootstrap-application-client" | "bootstrap-application-server" | "bootstrap-workspaces" | "ci-cd" | "docker" | "docker-compose" | "entities" | "entity" | "export-jdl" | "feign-client" | "generate-blueprint" | "heroku" | "init" | "jdl" | "kubernetes" | "kubernetes-helm" | "kubernetes-knative" | "project-name" | "spring-cache" | "spring-cloud-stream" | "spring-data-cassandra" | "spring-data-couchbase" | "spring-data-elasticsearch" | "spring-data-mongodb" | "spring-data-neo4j")[];
+    subGenerators: ("base" | "upgrade" | "info" | "angular" | "react" | "vue" | "maven" | "gradle" | "cypress" | "cucumber" | "gatling" | "spring-websocket" | "languages" | "jdl" | "bootstrap" | "bootstrap-application-base" | "common" | "server" | "client" | "git" | "workspaces" | "spring-boot" | "liquibase" | "java" | "spring-data-relational" | "app" | "base-application" | "base-core" | "base-entity-changes" | "base-workspaces" | "bootstrap-application" | "bootstrap-application-client" | "bootstrap-application-server" | "bootstrap-workspaces" | "ci-cd" | "docker" | "docker-compose" | "entities" | "entity" | "export-jdl" | "feign-client" | "generate-blueprint" | "heroku" | "init" | "kubernetes" | "kubernetes-helm" | "kubernetes-knative" | "project-name" | "spring-cache" | "spring-cloud-stream" | "spring-data-cassandra" | "spring-data-couchbase" | "spring-data-elasticsearch" | "spring-data-mongodb" | "spring-data-neo4j")[];
     additionalSubGenerators: string;
     dynamic: boolean;
     js: boolean;
@@ -63,7 +63,7 @@ export declare const prompts: () => ({
     type: string;
     name: string;
     message: string;
-    choices: ("base" | "upgrade" | "info" | "angular" | "react" | "vue" | "maven" | "gradle" | "cypress" | "cucumber" | "gatling" | "spring-websocket" | "languages" | "bootstrap" | "bootstrap-application-base" | "common" | "server" | "client" | "git" | "workspaces" | "spring-boot" | "liquibase" | "java" | "spring-data-relational" | "app" | "base-application" | "base-core" | "base-entity-changes" | "base-workspaces" | "bootstrap-application" | "bootstrap-application-client" | "bootstrap-application-server" | "bootstrap-workspaces" | "ci-cd" | "docker" | "docker-compose" | "entities" | "entity" | "export-jdl" | "feign-client" | "generate-blueprint" | "heroku" | "init" | "jdl" | "kubernetes" | "kubernetes-helm" | "kubernetes-knative" | "project-name" | "spring-cache" | "spring-cloud-stream" | "spring-data-cassandra" | "spring-data-couchbase" | "spring-data-elasticsearch" | "spring-data-mongodb" | "spring-data-neo4j")[];
+    choices: ("base" | "upgrade" | "info" | "angular" | "react" | "vue" | "maven" | "gradle" | "cypress" | "cucumber" | "gatling" | "spring-websocket" | "languages" | "jdl" | "bootstrap" | "bootstrap-application-base" | "common" | "server" | "client" | "git" | "workspaces" | "spring-boot" | "liquibase" | "java" | "spring-data-relational" | "app" | "base-application" | "base-core" | "base-entity-changes" | "base-workspaces" | "bootstrap-application" | "bootstrap-application-client" | "bootstrap-application-server" | "bootstrap-workspaces" | "ci-cd" | "docker" | "docker-compose" | "entities" | "entity" | "export-jdl" | "feign-client" | "generate-blueprint" | "heroku" | "init" | "kubernetes" | "kubernetes-helm" | "kubernetes-knative" | "project-name" | "spring-cache" | "spring-cloud-stream" | "spring-data-cassandra" | "spring-data-couchbase" | "spring-data-elasticsearch" | "spring-data-mongodb" | "spring-data-neo4j")[];
     pageSize: number;
     loop: boolean;
     default?: undefined;

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

@@ -1,43 +1,2 @@
 export declare const files: import("../base/api.js").WriteFileSection<any>;
-export declare const generatorFiles: {
-    generator: ({
-        path: string;
-        to: (ctx: any) => string;
-        templates: ({
-            file: string;
-            renameTo: (ctx: any) => "generator.mjs.jhi" | "generator.js.jhi";
-        } | {
-            file: string;
-            renameTo: (ctx: any) => "index.mjs" | "index.js";
-        })[];
-        condition?: undefined;
-        transform?: undefined;
-    } | {
-        path: string;
-        condition: (ctx: any) => any;
-        to: (ctx: any) => string;
-        templates: {
-            file: string;
-            renameTo: (ctx: any) => "command.mjs" | "command.js";
-        }[];
-        transform?: undefined;
-    } | {
-        path: string;
-        to: (ctx: any) => string;
-        condition: (ctx: any) => boolean;
-        templates: {
-            file: string;
-            renameTo: (ctx: any) => "generator.spec.mjs" | "generator.spec.js";
-        }[];
-        transform?: undefined;
-    } | {
-        path: string;
-        to: (ctx: any) => string;
-        condition(ctx: any): any;
-        transform: boolean;
-        templates: {
-            file: string;
-            renameTo: (ctx: any) => string;
-        }[];
-    })[];
-};
+export declare const generatorFiles: import("../base/api.js").WriteFileSection<any>;

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

@@ -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

@@ -1,15 +1,18 @@
 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">;
+    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>>>, "packageJson" | "addCliToPackageJson" | "addGeneratorJHipsterDependency">;
+    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;

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

@@ -17,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';
@@ -30,6 +31,9 @@ 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();
@@ -110,6 +114,9 @@ export default class extends BaseGenerator {
     }
     get composing() {
         return this.asComposingTaskGroup({
+            storeCurrentVersion() {
+                this.storeCurrentJHipsterVersion();
+            },
             async compose() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
@@ -152,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}`;
                 }
@@ -167,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();
@@ -191,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,
@@ -216,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;
@@ -270,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,
                     });
                 }
             },
@@ -301,11 +337,16 @@ export default class extends BaseGenerator {
     }
     get postInstall() {
         return this.asPostInstallTaskGroup({
-            async addSnapshot() {
+            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');
@@ -323,6 +364,21 @@ 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
+                    }
+                }
             },
         });
     }

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

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "eslint": "9.10.0",
-    "globals": "15.9.0",
-    "vitest": "2.1.1"
+    "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 => {