From 00a3efe2b69f857e5f4194455999bd622b13ee9a Mon Sep 17 00:00:00 2001
From: Marcelo Shima <marceloshima@gmail.com>
Date: Sun, 22 Sep 2024 17:31:13 -0300
Subject: [PATCH 1/2] generate-blueprint: migrate tests to blueprint as array

---
 generators/generate-blueprint/generator.ts               | 9 +++++++++
 .../generators/generator/generator.spec.mjs.ejs          | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/generators/generate-blueprint/generator.ts b/generators/generate-blueprint/generator.ts
index 389123b2195c..98e136efe212 100644
--- a/generators/generate-blueprint/generator.ts
+++ b/generators/generate-blueprint/generator.ts
@@ -258,6 +258,15 @@ export default class extends BaseGenerator {
 
   get postWriting() {
     return this.asPostWritingTaskGroup({
+      upgrade() {
+        if (!this.application[GENERATORS]) return;
+        if (!this.isJhipsterVersionLessThan('8.7.2')) return;
+        for (const generator of Object.keys(this.application[GENERATORS])) {
+          const extension = this.application.js ? 'js' : 'mjs';
+          const generatorSpec = `${this.application.blueprintsPath}${generator}/generator.spec.${extension}`;
+          this.editFile(generatorSpec, content => content.replaceAll(/blueprint: '([\w-]*)'/g, "blueprint: ['$1']"));
+        }
+      },
       packageJson() {
         if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION]) return;
         const { packagejs } = this.application;
diff --git a/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs b/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs
index 2fce660b257e..3f66bcb0f357 100644
--- a/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs
+++ b/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs
@@ -36,7 +36,7 @@ describe('SubGenerator <%= subGenerator %> of <%= application.baseName %> JHipst
         .withOptions({
           ignoreNeedlesError: true,
 <%_ if (!customGenerator) { _%>
-          blueprint: '<%= application.baseName %>',
+          blueprint: ['<%= application.baseName %>'],
 <%_ } _%>
 <%_ if (subGenerator === 'jdl') { _%>
           inline: 'application { }',

From 211b129d7b48a8e102e3449943870c064c432d67 Mon Sep 17 00:00:00 2001
From: Marcelo Shima <marceloshima@gmail.com>
Date: Mon, 23 Sep 2024 12:35:39 -0300
Subject: [PATCH 2/2] blueprints: accept string blueprint option as backward
 compatibility

---
 generators/base/generator.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/generators/base/generator.ts b/generators/base/generator.ts
index 2b2b5285445f..b1a7b7f1dc54 100644
--- a/generators/base/generator.ts
+++ b/generators/base/generator.ts
@@ -540,8 +540,11 @@ export default class JHipsterBaseBlueprintGenerator<TaskTypes extends BaseTaskTy
   private async _configureBlueprints() {
     let argvBlueprints = this.options.blueprints || '';
     // check for old single blueprint declaration
-    const { blueprint } = this.options;
+    let { blueprint } = this.options;
     if (blueprint) {
+      if (typeof blueprint === 'string') {
+        blueprint = [blueprint];
+      }
       this.log.warn('--blueprint option is deprecated. Please use --blueprints instead');
       argvBlueprints = union(blueprint, argvBlueprints.split(',')).join(',');
     }