npmw created after ./npmw started

qmonmert · Sep 12, 2024 · 5f3f9a8 · 5f3f9a8
1 parent 15cdb67
commit 5f3f9a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/generators/server/generator.ts b/generators/server/generator.ts
@@ -349,7 +349,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
 
           if (field.fieldType === BYTE_BUFFER) {
             this.log.warn(
-              `Cannot use validation in .jhipster/${entityName}.json for field ${stringifyApplicationData(field)} 
+              `Cannot use validation in .jhipster/${entityName}.json for field ${stringifyApplicationData(field)}
 Hibernate JPA 2 Metamodel does not work with Bean Validation 2 for LOB fields, so LOB validation is disabled`,
             );
             field.fieldValidate = false;

diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts
@@ -146,8 +146,6 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
           searchEngine,
           websocket,
           cacheProvider,
-          skipClient,
-          clientFramework,
           testFrameworks,
           feignClient,
           enableSwaggerCodegen,
@@ -157,10 +155,6 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
         await this.composeWithJHipster('jhipster:java:jib');
         await this.composeWithJHipster('jhipster:java:code-quality');
 
-        if (!skipClient && clientFramework !== 'no') {
-          await this.composeWithJHipster('jhipster:java:node');
-        }
-
         if (enableSwaggerCodegen) {
           await this.composeWithJHipster('jhipster:java:openapi-generator');
         }
@@ -212,6 +206,13 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
 
   get composingComponent() {
     return this.asComposingComponentTaskGroup({
+      async composing() {
+        const { clientFramework, skipClient } = this.jhipsterConfigWithDefaults;
+        if (!skipClient && clientFramework !== 'no') {
+          // When using prompts, clientFramework will only be known after composing priority.
+          await this.composeWithJHipster('jhipster:java:node');
+        }
+      },
       async composeLanguages() {
         if (this.jhipsterConfigWithDefaults.enableTranslation) {
           await this.composeWithJHipster(GENERATOR_LANGUAGES);