generator-jhipster 8.0.0-beta.2 → 8.0.0-rc.1

package/dist/generators/gae/generator.mjs

@@ -18,20 +18,24 @@
  */
 /* eslint-disable consistent-return */
 import os from 'os';
-import shelljs from 'shelljs';
 import fs from 'fs';
+import shelljs from 'shelljs';
 import chalk from 'chalk';
 import _ from 'lodash';
 import runAsync from 'run-async';
 import BaseGenerator from '../base/index.mjs';
 import { GENERATOR_GAE } from '../generator-list.mjs';
 import statistics from '../statistics.mjs';
-import dockerPrompts from '../base-docker/docker-prompts.mjs';
+import dockerPrompts from '../base-workspaces/internal/docker-prompts.mjs';
 import { CLIENT_MAIN_SRC_DIR, MAIN_DIR, SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
 import { applicationTypes, buildToolTypes, cacheTypes, databaseTypes } from '../../jdl/jhipster/index.mjs';
 import { mavenProdProfileContent, mavenPluginConfiguration, mavenProfileContent } from './templates.mjs';
 import { createPomStorage } from '../maven/support/pom-store.mjs';
 import { addGradleDependencyCallback, addGradlePluginCallback, applyFromGradleCallback } from '../gradle/internal/needles.mjs';
+import { getFrontendAppName } from '../base/support/index.mjs';
+import { getMainClassName } from '../java/support/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedServerConfig, loadServerConfig } from '../server/support/index.mjs';
 const cacheProviders = cacheTypes;
 const { MEMCACHED } = cacheTypes;
 const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes;
@@ -66,7 +70,7 @@ export default class GaeGenerator extends BaseGenerator {
                     return;
                 const done = this.async();
                 const component = 'app-engine-java';
-                shelljs.exec('gcloud components list --quiet --filter="Status=Installed OR Status=\\"Update Available\\"" --format="value(id)"', { silent: true }, (err, stdout, srderr) => {
+                shelljs.exec('gcloud components list --quiet --filter="Status=Installed OR Status=\\"Update Available\\"" --format="value(id)"', { silent: true }, (err, stdout) => {
                     if (_.includes(stdout, component)) {
                         done();
                     }
@@ -84,18 +88,18 @@ export default class GaeGenerator extends BaseGenerator {
                 });
             }),
             loadCommonConfig() {
-                this.loadAppConfig();
-                this.loadServerConfig();
-                this.loadDerivedAppConfig();
-                this.loadDerivedServerConfig();
+                loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+                loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadDerivedAppConfig({ application: this });
+                loadDerivedServerConfig({ application: this });
             },
             loadConfig() {
                 const configuration = this.config;
                 this.env.options.appPath = configuration.get('appPath') || CLIENT_MAIN_SRC_DIR;
-                this.mainClass = this.getMainClassName();
+                this.mainClass = getMainClassName({ baseName: this.jhipsterConfig.baseName });
                 this.cacheProvider = this.cacheProvider || NO_CACHE_PROVIDER;
                 this.enableHibernateCache = this.enableHibernateCache && ![NO_CACHE_PROVIDER, MEMCACHED].includes(this.cacheProvider);
-                this.frontendAppName = this.getFrontendAppName();
+                this.frontendAppName = getFrontendAppName({ baseName: this.jhipsterConfig.baseName });
                 this.gcpProjectId = configuration.get('gcpProjectId');
                 this.gcpCloudSqlInstanceName = configuration.get('gcpCloudSqlInstanceName');
                 this.gcpCloudSqlUserName = configuration.get('gcpCloudSqlUserName');
@@ -640,7 +644,7 @@ export default class GaeGenerator extends BaseGenerator {
                 const done = this.async();
                 this.log.log(chalk.bold('\nConfiguring Cloud SQL Login'));
                 const name = this.gcpCloudSqlInstanceName.split(':')[2];
-                shelljs.exec(`gcloud sql users list -i jhipster --format="value(name)" --project="${this.gcpProjectId}"`, { silent: true }, (code, stdout, err) => {
+                shelljs.exec(`gcloud sql users list -i jhipster --format="value(name)" --project="${this.gcpProjectId}"`, { silent: true }, (_code, stdout) => {
                     if (_.includes(stdout, this.gcpCloudSqlUserName)) {
                         this.log.log(chalk.bold(`... User "${chalk.cyan(this.gcpCloudSqlUserName)}" already exists`));
                         const cmd = `gcloud sql users set-password "${this.gcpCloudSqlUserName}" -i "${name}" --host="%" --project="${this.gcpProjectId}" --password="..."`;
@@ -704,7 +708,7 @@ export default class GaeGenerator extends BaseGenerator {
     get loading() {
         return {
             loadSharedConfig() {
-                this.loadDerivedAppConfig();
+                loadDerivedAppConfig({ application: this });
             },
         };
     }
@@ -815,7 +819,7 @@ export default class GaeGenerator extends BaseGenerator {
                         const done = this.async();
                         this.log.log(chalk.bold('\nBuilding application'));
         
-                        const child = this.buildApplication(this.buildTool, 'prod', (err) => {
+                        const child = buildApplication(this.buildTool, 'prod', (err) => {
                             if (err) {
                                 this.abort = true;
                                 this.log.error(err);

package/dist/generators/gae/templates.mjs

@@ -1,16 +1,16 @@
-export const mavenPluginConfiguration = data => `
+export const mavenPluginConfiguration = () => `
                 <configuration>
                     <deploy.projectId><%= gcpProjectId %></deploy.projectId>
                     <deploy.version>1</deploy.version>
                 </configuration>
 `;
-export const mavenProdProfileContent = data => `                        <properties>
+export const mavenProdProfileContent = () => `                        <properties>
           <spring.profiles.active>prod\${profile.api-docs}${
 // eslint-disable-next-line no-template-curly-in-string
 this.databaseTypeSql ? '${profile.no-liquibase},prod-gae' : ''}</spring.profiles.active>
       </properties>
 `;
-export const mavenProfileContent = data => `                        <dependencies>
+export const mavenProfileContent = () => `                        <dependencies>
           <dependency>
               <groupId>org.springframework.boot</groupId>
               <artifactId>spring-boot-starter-undertow</artifactId>

package/dist/generators/gatling/cleanup.mjs

@@ -1,5 +1,23 @@
+/**
+ * Copyright 2013-2023 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.
+ */
 /**
  * Removes server files that where generated in previous JHipster versions and therefore
  * need to be removed.
  */
-export default function cleanupTask({ application }) { }
+export default function cleanupTask() { }

package/dist/generators/gatling/entity-files.mjs

@@ -5,14 +5,14 @@ export const gatlingFiles = {
             path: TEST_DIR,
             templates: [
                 {
-                    file: 'java/gatling/simulations/_EntityClass_GatlingTest.java',
+                    file: 'java/gatling/simulations/_entityClass_GatlingTest.java',
                     renameTo: generator => `java/gatling/simulations/${generator.entityClass}GatlingTest.java`,
                 },
             ],
         },
     ],
 };
-export function cleanupEntitiesTask({ application, entities }) { }
+export function cleanupEntitiesTask() { }
 export default async function writeEntitiesTask({ application, entities }) {
     for (const entity of entities.filter(entity => !entity.builtIn && !entity.skipServer)) {
         await this.writeFiles({

package/dist/generators/gatling/files.mjs

@@ -1,6 +1,9 @@
 import { TEST_DIR } from '../generator-constants.mjs';
 const gatlingFiles = {
     gatlingFiles: [
+        {
+            templates: ['README.md.jhi.gatling'],
+        },
         {
             path: TEST_DIR,
             templates: [

package/dist/generators/gatling/generator.mjs

@@ -23,10 +23,12 @@ import cleanupTask from './cleanup.mjs';
 import writeEntityTask, { cleanupEntitiesTask } from './entity-files.mjs';
 export default class GatlingGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_GATLING);
         }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+        }
     }
     get writing() {
         return this.asWritingTaskGroup({

package/dist/generators/gatling/templates/README.md.jhi.gatling.ejs

@@ -0,0 +1,19 @@
+<&_ if (fragment.testingSection) { -&>
+### Gatling
+
+Performance tests are run by [Gatling][] and written in Scala. They're located in [src/test/java/gatling/simulations](src/test/java/gatling/simulations).
+
+You can execute all Gatling tests with
+```
+<%_ if (buildToolMaven) { _%>
+./mvnw gatling:test
+<%_ } else { _%>
+./gradlew gatlingRun.
+<%_ } _%>
+```
+
+<&_ } -&>
+
+<&_ if (fragment.referenceSection) { -&>
+[Gatling]: https://gatling.io/
+<&_ } -&>

package/dist/generators/gatling/templates/src/test/java/gatling/simulations/_entityClass_GatlingTest.java.ejs

@@ -0,0 +1,200 @@
+<%#
+ Copyright 2013-2023 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.
+-%>
+package gatling.simulations;
+
+import static io.gatling.javaapi.core.CoreDsl.StringBody;
+import static io.gatling.javaapi.core.CoreDsl.css;
+import static io.gatling.javaapi.core.CoreDsl.exec;
+import static io.gatling.javaapi.core.CoreDsl.rampUsers;
+import static io.gatling.javaapi.core.CoreDsl.scenario;
+import static io.gatling.javaapi.http.HttpDsl.header;
+import static io.gatling.javaapi.http.HttpDsl.headerRegex;
+import static io.gatling.javaapi.http.HttpDsl.http;
+import static io.gatling.javaapi.http.HttpDsl.status;
+
+import ch.qos.logback.classic.LoggerContext;
+import java.time.Duration;
+import java.util.Map;
+import java.util.Optional;
+import io.gatling.javaapi.core.ChainBuilder;
+import io.gatling.javaapi.core.ScenarioBuilder;
+import io.gatling.javaapi.core.Simulation;
+import io.gatling.javaapi.http.HttpProtocolBuilder;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Performance test for the <%= entityClass %> entity.
+ */
+public class <%= entityClass %>GatlingTest extends Simulation {
+
+    LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
+    {
+        // Log all HTTP requests
+        //context.getLogger("io.gatling.http").setLevel(Level.valueOf("TRACE"));
+        // Log failed HTTP requests
+        //context.getLogger("io.gatling.http").setLevel(Level.valueOf("DEBUG"));
+    }
+
+    String baseURL = Optional.ofNullable(System.getProperty("baseURL")).orElse("http://localhost:<%= serverPort %>");
+
+    HttpProtocolBuilder httpConf = http
+        .baseUrl(baseURL)
+        .inferHtmlResources()
+        .acceptHeader("*/*")
+        .acceptEncodingHeader("gzip, deflate")
+        .acceptLanguageHeader("fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3")
+        .connectionHeader("keep-alive")
+        .userAgentHeader("Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:33.0) Gecko/20100101 Firefox/33.0")
+        .silentResources() // Silence all resources like css or css so they don't clutter the results
+<%_ if (authenticationTypeOauth2) { _%>
+        .disableFollowRedirect() // We must follow redirects manually to get the xsrf token from the keycloak redirect
+        .disableAutoReferer()
+<%_ } _%>
+        ;
+
+    Map<String, String> headers_http = Map.of(
+        "Accept", "application/json"
+    );
+<%_ if (authenticationUsesCsrf) { _%>
+
+    Map<String, String> headers_http_authenticated = Map.of(
+        "Accept", "application/json",
+        "X-XSRF-TOKEN", "${xsrf_token}"
+    );
+
+    Map<String, String> keycloakHeaders = Map.of(
+        "Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        "Upgrade-Insecure-Requests", "1"
+    );
+<%_ } _%>
+<%_ if (authenticationTypeJwt) { _%>
+
+    Map<String, String> headers_http_authentication = Map.of(
+        "Content-Type", "application/json",
+        "Accept", "application/json"
+    );
+
+    Map<String, String> headers_http_authenticated = Map.of(
+        "Accept", "application/json",
+        "Authorization", "${access_token}"
+    );
+<%_ } _%>
+
+    ChainBuilder scn = exec(http("First unauthenticated request")
+        .get("/api/account")
+        .headers(headers_http)
+<%_ if ((applicationTypeMicroservice || applicationTypeGateway) && authenticationTypeOauth2) { _%>
+        .check(status().is(302))
+<%_ } else { _%>
+        .check(status().is(401))
+<%_ } _%>
+<%_ if (authenticationUsesCsrf) { _%>
+        .check(headerRegex("Set-Cookie", "XSRF-TOKEN=(.*);[\\s]").saveAs("xsrf_token"))
+<%_ } _%>
+        ).exitHereIfFailed()
+        .pause(10)
+        .exec(http("Authentication")
+<%_ if (authenticationTypeSession) { _%>
+        .post("/api/authentication")
+        .headers(headers_http_authenticated)
+        .formParam("username", "admin")
+        .formParam("password", "admin")
+        .formParam("remember-me", "true")
+        .formParam("submit", "Login")
+        .check(headerRegex("Set-Cookie", "XSRF-TOKEN=(.*);[\\s]").saveAs("xsrf_token"))).exitHereIfFailed()
+<%_ } else if (authenticationTypeOauth2) { _%>
+        .get("/oauth2/authorization/oidc")
+        .check(status().is(302))
+        .check(header("Location").saveAs("loginUrl"))).exitHereIfFailed()
+        .pause(2)
+        .exec(http("Login Redirect")
+        .get("${loginUrl}")
+        .silent()
+        .headers(keycloakHeaders)
+        .check(css("#kc-form-login", "action").saveAs("kc-form-login"))).exitHereIfFailed()
+        .pause(10)
+        .exec(http("Authenticate")
+        .post("${kc-form-login}")
+        .silent()
+        .headers(keycloakHeaders)
+        .formParam("username", "admin")
+        .formParam("password", "admin")
+        .formParam("submit", "Login")
+        .check(status().is(302))
+        .check(header("Location").saveAs("afterLoginUrl"))).exitHereIfFailed()
+        .pause(2)
+        .exec(http("After Login Redirect")
+        .get("${afterLoginUrl}")
+        .silent()
+        .check(status().is(302))
+        .check(header("Location").saveAs("finalRedirectUrl"))
+        .check(headerRegex("Set-Cookie", "XSRF-TOKEN=(.*);[\\s]").saveAs("xsrf_token")))
+        .exec(http("Final Redirect")
+        .get("${finalRedirectUrl}")
+        .silent()
+        .check(status().is(200))).exitHereIfFailed()
+<%_ } else if (authenticationTypeJwt) { _%>
+        .post("/api/authenticate")
+        .headers(headers_http_authentication)
+        .body(StringBody("{\"username\":\"admin\", \"password\":\"admin\"}")).asJson()
+        .check(header("Authorization").saveAs("access_token"))).exitHereIfFailed()
+<%_ } _%>
+        .pause(2)
+        .exec(http("Authenticated request")
+        .get("/api/account")
+        .headers(headers_http_authenticated)
+        .check(status().is(200)))
+        .pause(10)
+        .repeat(2).on(
+            exec(http("Get all <%= entityInstancePlural %>")
+            .get("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>/api/<%= entityApiUrl %>")
+            .headers(headers_http_authenticated)
+            .check(status().is(200)))
+            .pause(Duration.ofSeconds(10), Duration.ofSeconds(20))
+            .exec(http("Create new <%= entityInstance %>")
+            .post("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>/api/<%= entityApiUrl %>")
+            .headers(headers_http_authenticated)
+            .body(StringBody("{" +
+<%_ fields.filter(f => !(f.id && f.autoGenerate)).forEach((field, idx) => { _%>
+                "<%= idx === 0 ? '' : ', ' %>\"<%= field.fieldName %>\": <% if (field.fieldTypeString) { %>\"SAMPLE_TEXT\"<% } else if (field.fieldTypeNumeric) { %>0<% } else if (field.fieldTypeTemporal) { %>\"2020-01-01T00:00:00.000Z\"<% } else if (field.fieldIsEnum) { %>\"<%= field.enumValues[0].name %>\"<% } else { %>null<% } %>" +
+<%_ }); _%>
+                "}")).asJson()
+            .check(status().is(201))
+            .check(headerRegex("Location", "(.*)").saveAs("new_<%= entityInstance %>_url"))).exitHereIfFailed()
+            .pause(10)
+            .repeat(5).on(
+                exec(http("Get created <%= entityInstance %>")
+                .get("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>${new_<%= entityInstance %>_url}")
+                .headers(headers_http_authenticated))
+                .pause(10)
+            )
+            .exec(http("Delete created <%= entityInstance %>")
+            .delete("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>${new_<%= entityInstance %>_url}")
+            .headers(headers_http_authenticated))
+            .pause(10)
+        );
+
+    ScenarioBuilder users = scenario("Test the <%= entityClass %> entity").exec(scn);
+
+    {
+        setUp(
+            users.injectOpen(rampUsers(Integer.getInteger("users", 100)).during(Duration.ofMinutes(Integer.getInteger("ramp", 1))))
+        ).protocols(httpConf);
+    }
+}

package/dist/generators/generate-blueprint/constants.mjs

@@ -19,7 +19,7 @@
 import chalk from 'chalk';
 import * as GENERATOR_LIST from '../generator-list.mjs';
 import { PRIORITY_NAMES_LIST } from '../base-application/priorities.mjs';
-const prioritiesForSub = subGenerator => PRIORITY_NAMES_LIST;
+const prioritiesForSub = () => PRIORITY_NAMES_LIST;
 export const GENERATE_SNAPSHOTS = 'generateSnapshots';
 export const LINK_JHIPSTER_DEPENDENCY = 'linkJhipsterDependency';
 export const GENERATORS = 'generators';

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

@@ -22,18 +22,25 @@ export const files = {
         {
             condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION],
             templates: [
-                '.github/workflows/generator.yml',
                 '.eslintrc.json',
-                '.mocharc.cjs',
+                '.github/workflows/generator.yml',
+                '.prettierignore.jhi.blueprint',
                 'README.md',
-                'test/utils.mjs',
                 'tsconfig.json',
-                '.prettierignore.jhi.blueprint',
+                'vitest.config.ts',
+                '.blueprint/cli/commands.mjs',
+                '.blueprint/generate-sample/command.mjs',
+                '.blueprint/generate-sample/generator.mjs',
+                '.blueprint/generate-sample/index.mjs',
             ],
         },
+        {
+            condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION] && !ctx.sampleWritten,
+            templates: ['.blueprint/generate-sample/templates/samples/sample.jdl'],
+        },
         {
             condition: ctx => ctx.cli,
-            templates: [{ file: 'cli/cli.mjs', renameTo: ctx => (ctx.js ? 'cli/cli.cjs' : 'cli/cli.mjs') }],
+            templates: ['cli/cli.cjs'],
         },
         {
             condition: ctx => ctx.commands.length > 0,
@@ -46,12 +53,16 @@ export const generatorFiles = {
         {
             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') }],
+            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: 'index.mjs', renameTo: ctx => (ctx.js ? 'index.js' : 'index.mjs') }],
+            templates: [{ file: 'command.mjs', renameTo: ctx => (ctx.js ? 'command.js' : 'command.mjs') }],
         },
         {
             path: 'generators/generator',

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

@@ -26,15 +26,17 @@ import { files, generatorFiles } from './files.mjs';
 import { packageJson } from '../../lib/index.mjs';
 import { SKIP_COMMIT_HOOK } from '../init/constants.mjs';
 import command from './command.mjs';
-import { NODE_VERSION } from '../generator-constants.mjs';
+import { BLUEPRINT_API_VERSION, NODE_VERSION } from '../generator-constants.mjs';
 const { camelCase, upperFirst, snakeCase } = lodash;
 const { GENERATOR_PROJECT_NAME, GENERATOR_INIT, GENERATOR_GENERATE_BLUEPRINT } = GENERATOR_LIST;
 export default class extends BaseGenerator {
     async _beforeQueue() {
-        await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_GENERATE_BLUEPRINT);
         }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
+        }
     }
     get initializing() {
         return {
@@ -47,9 +49,6 @@ export default class extends BaseGenerator {
                     this.config.defaults(defaultConfig({ config: this.jhipsterConfig }));
                 }
             },
-            loadRuntimeOptions() {
-                this.loadRuntimeOptions();
-            },
         };
     }
     get [BaseGenerator.INITIALIZING]() {
@@ -159,10 +158,12 @@ export default class extends BaseGenerator {
     get writing() {
         return {
             async writing() {
+                this.application.sampleWritten = this.jhipsterConfig.sampleWritten;
                 await this.writeFiles({
                     sections: files,
                     context: this.application,
                 });
+                this.jhipsterConfig.sampleWritten = true;
             },
             async writingGenerators() {
                 if (!this.application[GENERATORS])
@@ -172,11 +173,13 @@ export default class extends BaseGenerator {
                     const subGeneratorConfig = subGeneratorStorage.getAll();
                     const priorities = (subGeneratorConfig[PRIORITIES] || []).map(priority => ({
                         name: priority,
+                        asTaskGroup: `as${upperFirst(priority)}TaskGroup`,
                         constant: `${snakeCase(priority).toUpperCase()}`,
                     }));
                     const customGenerator = !Object.values(GENERATOR_LIST).includes(generator);
-                    const jhipsterGenerator = customGenerator ? 'base' : generator;
+                    const jhipsterGenerator = customGenerator || subGeneratorConfig.sbs ? 'base-application' : generator;
                     const subTemplateData = {
+                        js: this.jhipsterConfig.js,
                         application: this.application,
                         ...defaultSubGeneratorConfig(),
                         ...subGeneratorConfig,
@@ -200,44 +203,47 @@ export default class extends BaseGenerator {
         return this.delegateTasksToBlueprint(() => this.writing);
     }
     get postWriting() {
-        return {
+        return this.asPostWritingTaskGroup({
             packageJson() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
                 const { packagejs } = this.application;
+                const mainDependencies = {
+                    ...packagejs.dependencies,
+                    ...packagejs.devDependencies,
+                };
+                this.loadNodeDependenciesFromPackageJson(mainDependencies, this.fetchFromInstalledJHipster('generate-blueprint/resources/package.json'));
                 this.packageJson.merge({
                     name: `generator-jhipster-${this.jhipsterConfig.baseName}`,
-                    keywords: ['yeoman-generator', 'jhipster-blueprint', 'jhipster-7'],
+                    keywords: ['yeoman-generator', 'jhipster-blueprint', BLUEPRINT_API_VERSION],
                     type: 'module',
                     files: ['generators'],
                     scripts: {
-                        ejslint: "ejslint generators/**/*.ejs && ejslint generators/**/*.ejs -d '&'",
+                        ejslint: 'ejslint generators/**/*.ejs',
                         lint: 'eslint .',
                         'lint-fix': 'npm run ejslint && npm run lint -- --fix',
-                        esmocha: 'esmocha generators --no-insight --forbid-only',
-                        pretest: 'npm run prettier:check && npm run lint',
-                        test: 'npm run esmocha',
-                        'update-snapshot': 'npm run esmocha -- --update-snapshot',
-                    },
-                    dependencies: {
-                        chalk: `${packagejs.dependencies.chalk}`,
+                        pretest: 'npm run prettier-check && npm run lint',
+                        test: 'vitest run',
+                        'update-snapshot': 'vitest run --update',
+                        vitest: 'vitest',
                     },
                     devDependencies: {
-                        'ejs-lint': `${packagejs.devDependencies['ejs-lint']}`,
-                        eslint: `${packagejs.devDependencies.eslint}`,
-                        'eslint-config-airbnb-base': `${packagejs.devDependencies['eslint-config-airbnb-base']}`,
-                        'eslint-config-prettier': `${packagejs.devDependencies['eslint-config-prettier']}`,
-                        'eslint-plugin-import': `${packagejs.devDependencies['eslint-plugin-import']}`,
-                        'eslint-plugin-prettier': `${packagejs.devDependencies['eslint-plugin-prettier']}`,
-                        esmocha: `${packagejs.devDependencies.esmocha}`,
-                        prettier: `${packagejs.dependencies.prettier}`,
-                        'yeoman-test': `${packagejs.devDependencies['yeoman-test']}`,
+                        'ejs-lint': `${mainDependencies['ejs-lint']}`,
+                        eslint: `${mainDependencies.eslint}`,
+                        'eslint-config-airbnb-base': `${mainDependencies['eslint-config-airbnb-base']}`,
+                        'eslint-config-prettier': `${mainDependencies['eslint-config-prettier']}`,
+                        'eslint-plugin-import': `${mainDependencies['eslint-plugin-import']}`,
+                        'eslint-plugin-prettier': `${mainDependencies['eslint-plugin-prettier']}`,
+                        vitest: mainDependencies.vitest,
+                        prettier: `${mainDependencies.prettier}`,
+                        /*
+                         * yeoman-test version is loaded through generator-jhipster peer dependency.
+                         * generator-jhipster uses a fixed version, blueprints must set a compatible range.
+                         */
+                        'yeoman-test': '>=8.0.0-rc.1',
                     },
                     engines: {
-                        node: `>=${packagejs.engines.node}`,
-                    },
-                    imports: {
-                        '#test-utils': './test/utils.mjs',
+                        node: packagejs.engines.node,
                     },
                 });
             },
@@ -247,7 +253,7 @@ export default class extends BaseGenerator {
                 const { baseName, cliName = `jhipster-${baseName}` } = this.application;
                 this.packageJson.merge({
                     bin: {
-                        [cliName]: `cli/cli.${this.jhipsterConfig.js ? '' : 'm'}js`,
+                        [cliName]: 'cli/cli.cjs',
                     },
                     files: ['cli', 'generators'],
                 });
@@ -274,7 +280,7 @@ export default class extends BaseGenerator {
                     });
                 }
             },
-        };
+        });
     }
     get [BaseGenerator.POST_WRITING]() {
         return this.delegateTasksToBlueprint(() => this.postWriting);

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

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "vitest": "0.34.6"
+  }
+}

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

@@ -0,0 +1,27 @@
+/**
+ * Copyright 2013-2023 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.
+ */
+
+const defaultCommands = {
+  'generate-sample': {
+    desc: 'Generate a test sample',
+    blueprint: '@jhipster/jhipster-dev',
+  },
+};
+
+export default defaultCommands;