From d868354cc2562dd47ad107e93a24345172e54047 Mon Sep 17 00:00:00 2001
From: Quentin <quentin.monmert@gmail.com>
Date: Thu, 12 Sep 2024 18:07:15 +0200
Subject: [PATCH] npmw created after ./npmw started

---
 generators/app/generator.spec.ts | 8 ++++----
 generators/server/generator.ts   | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/generators/app/generator.spec.ts b/generators/app/generator.spec.ts
index d0288ce07ee0..3b13fad55f13 100644
--- a/generators/app/generator.spec.ts
+++ b/generators/app/generator.spec.ts
@@ -175,9 +175,9 @@ describe(`generator - ${generator}`, () => {
         expect(runResult.askedQuestions.map(({ name }) => name)).toMatchInlineSnapshot(`
 [
   "baseName",
-  "applicationType",
   "packageName",
   "buildTool",
+  "applicationType",
   "reactive",
   "authenticationType",
   "serverTestFrameworks",
@@ -211,9 +211,10 @@ describe(`generator - ${generator}`, () => {
         expect(runResult.askedQuestions.map(({ name }) => name)).toMatchInlineSnapshot(`
 [
   "baseName",
-  "applicationType",
   "packageName",
   "buildTool",
+  "applicationType",
+  "enableGradleEnterprise",
   "serverPort",
   "serviceDiscoveryType",
   "authenticationType",
@@ -224,7 +225,6 @@ describe(`generator - ${generator}`, () => {
   "cacheProvider",
   "enableHibernateCache",
   "serverSideOptions",
-  "enableGradleEnterprise",
   "clientFramework",
   "microfrontend",
   "clientTestFrameworks",
@@ -250,9 +250,9 @@ describe(`generator - ${generator}`, () => {
         expect(runResult.askedQuestions.map(({ name }) => name)).toMatchInlineSnapshot(`
 [
   "baseName",
-  "applicationType",
   "packageName",
   "buildTool",
+  "applicationType",
   "reactive",
   "serverPort",
   "serviceDiscoveryType",
diff --git a/generators/server/generator.ts b/generators/server/generator.ts
index e224eb488b95..7a6f6dece8dd 100644
--- a/generators/server/generator.ts
+++ b/generators/server/generator.ts
@@ -105,6 +105,8 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
   projectVersion;
 
   async beforeQueue() {
+    const { skipClient, clientFramework } = this.jhipsterConfigWithDefaults;
+
     if (!this.fromBlueprint) {
       loadStoredAppOptions.call(this);
       await this.composeWithBlueprints();
@@ -113,6 +115,9 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     if (!this.delegateToBlueprint) {
       await this.dependsOnBootstrapApplication();
       await this.dependsOnJHipster(GENERATOR_COMMON);
+      if (!skipClient && clientFramework !== 'no') {
+        await this.dependsOnJHipster('jhipster:java:node');
+      }
     }
   }
 
@@ -349,7 +354,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;