generator-jhipster 8.7.3 → 8.8.0

package/dist/generators/java/generators/graalvm/templates/gradle/native.gradle.ejs

@@ -9,7 +9,7 @@ graalvmNative {
       //  vendor = JvmVendorSpec.matching("GraalVM Community")
       //}
       buildArgs.add("-Duser.language=<%- nativeLanguageDefinition.languageTag %>")
-      buildArgs.add("-H:IncludeLocales=<%- languagesDefinition.map(def => def.languageTag).join(',') %>")
+      buildArgs.add("-H:IncludeLocales=<%- languagesDefinition?.map(def => def.languageTag)?.join(',') ?? nativeLanguageDefinition.languageTag %>")
     }
   }
   binaries.all {
@@ -17,6 +17,10 @@ graalvmNative {
     jvmArgs.add('-Xms4g')
     jvmArgs.add('-Xmx10g')
   }
+  metadataRepository {
+    enabled = true
+    version = '<%- graalvmReachabilityMetadata %>'
+  }
 }
 
 processTestAot {

package/dist/generators/java/generators/jib/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class JibGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     get composing(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/base/tasks.js").TaskParamWithControl, "compose">;
     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>>>, "write">;

package/dist/generators/java/generators/node/generator.d.ts

@@ -1,12 +1,14 @@
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class NodeGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     get composing(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/base/tasks.js").TaskParamWithControl, "compose">;
+    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>>>, "javaNodeBuildPaths">;
     get postPreparing(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/base/tasks.js").TaskParamWithControl & {
         source: import("../../../../lib/types/application/application.js").BaseApplicationSource;
     } & {
         application: import("../../../../lib/types/application/application.js").ApplicationType<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>>;
-    }, "useNpmWrapper">;
+    }, "useNpmWrapper" | "sortBuildFiles">;
     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">;
     useNpmWrapperInstallTask(): void;
 }

package/dist/generators/java/generators/node/generator.js

@@ -44,8 +44,30 @@ export default class NodeGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.COMPOSING]() {
         return this.delegateTasksToBlueprint(() => this.composing);
     }
+    get preparing() {
+        return this.asPreparingTaskGroup({
+            async javaNodeBuildPaths({ application }) {
+                const { buildToolMaven, srcMainWebapp, javaNodeBuildPaths, clientDistDir } = application;
+                javaNodeBuildPaths.push(srcMainWebapp, 'package-lock.json', 'package.json');
+                if (buildToolMaven) {
+                    // Gradle throws an error if the directory does not exist
+                    javaNodeBuildPaths.push(clientDistDir);
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING]() {
+        return this.delegateTasksToBlueprint(() => this.preparing);
+    }
     get postPreparing() {
         return this.asPostPreparingTaskGroup({
+            sortBuildFiles({ application }) {
+                const { javaNodeBuildPaths } = application;
+                if (javaNodeBuildPaths) {
+                    const files = [...new Set(javaNodeBuildPaths)];
+                    javaNodeBuildPaths.splice(0, javaNodeBuildPaths.length, ...files.sort());
+                }
+            },
             useNpmWrapper({ application }) {
                 if (application.useNpmWrapper) {
                     this.useNpmWrapperInstallTask();
@@ -63,7 +85,6 @@ export default class NodeGenerator extends BaseApplicationGenerator {
                     blocks: [
                         {
                             condition: (ctx) => ctx.useNpmWrapper,
-                            transform: false,
                             templates: ['npmw', 'npmw.cmd'],
                         },
                     ],

package/dist/generators/java/generators/node/templates/{npmw.cmd → npmw.cmd.ejs}

@@ -4,17 +4,17 @@ setlocal
 
 set NPMW_DIR=%~dp0
 
-if exist "%NPMW_DIR%mvnw.cmd" (
-  set NODE_EXE=^"^"
-  set NODE_PATH=%NPMW_DIR%target\node\
-  set NPM_EXE=^"%NPMW_DIR%target\node\npm.cmd^"
-  set INSTALL_NPM_COMMAND=^"%NPMW_DIR%mvnw.cmd^" -Pwebapp frontend:install-node-and-npm@install-node-and-npm
-) else (
-  set NODE_EXE=^"%NPMW_DIR%build\node\bin\node.exe^"
-  set NODE_PATH=%NPMW_DIR%build\node\bin\
-  set NPM_EXE=^"%NPMW_DIR%build\node\lib\node_modules\npm\bin\npm-cli.js^"
-  set INSTALL_NPM_COMMAND=^"%NPMW_DIR%gradlew.bat^" npmSetup
-)
+<%_ if (buildToolMaven) { _%>
+set NODE_EXE=^"^"
+set NODE_PATH=%NPMW_DIR%target\node\
+set NPM_EXE=^"%NPMW_DIR%target\node\npm.cmd^"
+set INSTALL_NPM_COMMAND=^"%NPMW_DIR%mvnw.cmd^" -Pwebapp frontend:install-node-and-npm@install-node-and-npm
+<%_ } else if (buildToolGradle) { _%>
+set NODE_EXE=^"%NPMW_DIR%build\node\bin\node.exe^"
+set NODE_PATH=%NPMW_DIR%build\node\bin\
+set NPM_EXE=^"%NPMW_DIR%build\node\lib\node_modules\npm\bin\npm-cli.js^"
+set INSTALL_NPM_COMMAND=^"%NPMW_DIR%gradlew.bat^" npmSetup --no-daemon
+<%_ } _%>
 
 if not exist %NPM_EXE% (
   call %INSTALL_NPM_COMMAND%

package/dist/generators/java/generators/node/templates/{npmw → npmw.ejs}

@@ -2,14 +2,17 @@
 
 basedir=$(dirname "$0")
 
+<%_ if (buildToolMaven) { _%>
 if [ -f "$basedir/mvnw" ]; then
   bindir="$basedir/target/node"
   repodir="$basedir/target/node/node_modules"
   installCommand="$basedir/mvnw --batch-mode -ntp -Pwebapp frontend:install-node-and-npm@install-node-and-npm"
-elif [ -f "$basedir/gradlew" ]; then
+<%_ } else if (buildToolGradle) { _%>
+if [ -f "$basedir/gradlew" ]; then
   bindir="$basedir/build/node/bin"
   repodir="$basedir/build/node/lib/node_modules"
-  installCommand="$basedir/gradlew npmSetup"
+  installCommand="$basedir/gradlew npmSetup --no-daemon"
+<%_ } _%>
 else
   echo "Using npm installed globally"
   exec npm "$@"

package/dist/generators/java/generators/openapi-generator/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class OpenapiGeneratorGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     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">;
     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>>>, "addDependencies">;

package/dist/generators/java/generators/server/command.d.ts

@@ -0,0 +1,5 @@
+declare const command: {
+    readonly configs: {};
+    readonly import: readonly [];
+};
+export default command;

package/dist/generators/java/generators/server/command.js

@@ -0,0 +1,5 @@
+const command = {
+    configs: {},
+    import: [],
+};
+export default command;

package/dist/generators/java/generators/server/generator.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 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 BaseApplicationGenerator from '../../../base-application/index.js';
+export default class ServerGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
+    beforeQueue(): Promise<void>;
+    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>>>, "packageJsonScripts" | "packageJsonBackendScripts" | "packageJsonE2eScripts">;
+}

package/dist/generators/java/generators/server/generator.js

@@ -0,0 +1,107 @@
+/**
+ * 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 BaseApplicationGenerator from '../../../base-application/index.js';
+const WAIT_TIMEOUT = 3 * 60000;
+export default class ServerGenerator extends BaseApplicationGenerator {
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnBootstrapApplication();
+        }
+    }
+    get postWriting() {
+        return this.asPostWritingTaskGroup({
+            packageJsonScripts({ application }) {
+                const packageJsonConfigStorage = this.packageJson.createStorage('config').createProxy();
+                packageJsonConfigStorage.backend_port = application.gatewayServerPort || application.serverPort;
+                packageJsonConfigStorage.packaging = application.defaultPackaging;
+            },
+            packageJsonBackendScripts({ application }) {
+                const scriptsStorage = this.packageJson.createStorage('scripts');
+                const javaCommonLog = `-Dlogging.level.ROOT=OFF -Dlogging.level.tech.jhipster=OFF -Dlogging.level.${application.packageName}=OFF`;
+                const javaTestLog = '-Dlogging.level.org.springframework=OFF -Dlogging.level.org.springframework.web=OFF -Dlogging.level.org.springframework.security=OFF';
+                const buildTool = application.buildTool;
+                let e2ePackage = 'target/e2e';
+                if (buildTool === 'maven') {
+                    const excludeWebapp = application.skipClient ? '' : ' -Dskip.installnodenpm -Dskip.npm';
+                    scriptsStorage.set({
+                        'app:start': './mvnw -ntp --batch-mode',
+                        'backend:info': './mvnw --version',
+                        'backend:doc:test': './mvnw -ntp javadoc:javadoc --batch-mode',
+                        'backend:nohttp:test': './mvnw -ntp checkstyle:check --batch-mode',
+                        'backend:start': `./mvnw${excludeWebapp} -ntp --batch-mode`,
+                        'java:jar': './mvnw -ntp verify -DskipTests --batch-mode',
+                        'java:war': './mvnw -ntp verify -DskipTests --batch-mode -Pwar',
+                        'java:docker': './mvnw -ntp verify -DskipTests -Pprod jib:dockerBuild',
+                        'java:docker:arm64': 'npm run java:docker -- -Djib-maven-plugin.architecture=arm64',
+                        'backend:unit:test': `./mvnw -ntp${excludeWebapp} verify --batch-mode ${javaCommonLog} ${javaTestLog}`,
+                        'backend:build-cache': './mvnw dependency:go-offline -ntp',
+                        'backend:debug': './mvnw -Dspring-boot.run.jvmArguments="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000"',
+                    });
+                }
+                else if (buildTool === 'gradle') {
+                    const excludeWebapp = application.skipClient ? '' : '-x webapp -x webapp_test';
+                    e2ePackage = 'e2e';
+                    scriptsStorage.set({
+                        'app:start': './gradlew',
+                        'backend:info': './gradlew -v',
+                        'backend:doc:test': `./gradlew javadoc ${excludeWebapp}`,
+                        'backend:nohttp:test': `./gradlew checkstyleNohttp ${excludeWebapp}`,
+                        'backend:start': `./gradlew ${excludeWebapp}`,
+                        'java:jar': './gradlew bootJar -x test -x integrationTest',
+                        'java:war': './gradlew bootWar -Pwar -x test -x integrationTest',
+                        'java:docker': './gradlew bootJar -Pprod jibDockerBuild',
+                        'java:docker:arm64': 'npm run java:docker -- -PjibArchitecture=arm64',
+                        'backend:unit:test': `./gradlew test integrationTest ${excludeWebapp} ${javaCommonLog} ${javaTestLog}`,
+                        'postci:e2e:package': 'cp build/libs/*.$npm_package_config_packaging e2e.$npm_package_config_packaging',
+                        'backend:build-cache': 'npm run backend:info && npm run backend:nohttp:test && npm run ci:e2e:package -- -x webapp -x webapp_test',
+                    });
+                }
+                scriptsStorage.set({
+                    'java:jar:dev': 'npm run java:jar -- -Pdev,webapp',
+                    'java:jar:prod': 'npm run java:jar -- -Pprod',
+                    'java:war:dev': 'npm run java:war -- -Pdev,webapp',
+                    'java:war:prod': 'npm run java:war -- -Pprod',
+                    'java:docker:dev': 'npm run java:docker -- -Pdev,webapp',
+                    'java:docker:prod': 'npm run java:docker -- -Pprod',
+                    'ci:backend:test': 'npm run backend:info && npm run backend:doc:test && npm run backend:nohttp:test && npm run backend:unit:test -- -P$npm_package_config_default_environment',
+                    'ci:e2e:package': 'npm run java:$npm_package_config_packaging:$npm_package_config_default_environment -- -Pe2e -Denforcer.skip=true',
+                    'preci:e2e:server:start': 'npm run services:db:await --if-present && npm run services:others:await --if-present',
+                    'ci:e2e:server:start': `java -jar ${e2ePackage}.$npm_package_config_packaging --spring.profiles.active=e2e,$npm_package_config_default_environment ${javaCommonLog} ${javaTestLog} --logging.level.org.springframework.web=ERROR`,
+                });
+            },
+            packageJsonE2eScripts({ application }) {
+                const scriptsStorage = this.packageJson.createStorage('scripts');
+                let applicationWaitTimeout = WAIT_TIMEOUT * (application.applicationTypeGateway ? 2 : 1);
+                applicationWaitTimeout = application.authenticationTypeOauth2 ? applicationWaitTimeout * 2 : applicationWaitTimeout;
+                const applicationEndpoint = application.applicationTypeMicroservice
+                    ? `http-get://127.0.0.1:${application.gatewayServerPort}/${application.endpointPrefix}/management/health/readiness`
+                    : 'http-get://127.0.0.1:$npm_package_config_backend_port/management/health';
+                scriptsStorage.set({
+                    'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${applicationWaitTimeout} ${applicationEndpoint} && echo "Server at port $npm_package_config_backend_port started"`,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.postWriting);
+    }
+}

package/dist/generators/java/generators/server/index.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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.
+ */
+export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/java/generators/server/index.js

@@ -0,0 +1,20 @@
+/**
+ * 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.
+ */
+export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/java/types.d.ts

@@ -74,6 +74,9 @@ export type JavaApplication = JavaBootstrapStorageProperties &
     imperativeOrReactive: string;
 
     addOpenapiGeneratorPlugin: boolean;
+    useNpmWrapper: boolean;
+    graalvmReachabilityMetadata: string;
+    javaNodeBuildPaths: string[];
   };
 
 export type ConditionalJavaDefinition = JavaDefinition & { condition?: boolean };

package/dist/generators/javascript/generators/bootstrap/generator.d.ts

@@ -1,7 +1,9 @@
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class BootstrapGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     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>>>, "loadNodeDependencies" | "jsExtensions">;
+    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>>>, "addSource">;
     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">;
-    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>>>, "addPrettierDependencies">;
+    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>>>, "mergePackageJson">;
 }

package/dist/generators/javascript/generators/bootstrap/generator.js

@@ -36,7 +36,7 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
             jsExtensions({ applicationDefaults, application }) {
                 applicationDefaults({
                     cjsExtension: application.packageJsonTypeCommonjs ? '.js' : '.cjs',
-                    mjsExtension: application.packageJsonTypeCommonjs ? '.js' : '.mjs',
+                    mjsExtension: application.packageJsonTypeModule ? '.js' : '.mjs',
                 });
             },
         });
@@ -44,6 +44,18 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.LOADING]() {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
+    get preparing() {
+        return this.asPreparingTaskGroup({
+            addSource({ application, source }) {
+                source.mergeClientPackageJson = args => {
+                    this.mergeDestinationJson(`${application.clientRootDir}package.json`, args);
+                };
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING]() {
+        return this.delegateTasksToBlueprint(() => this.preparing);
+    }
     get writing() {
         return this.asWritingTaskGroup({
             async writing({ application }) {
@@ -59,8 +71,8 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
-            addPrettierDependencies({ application }) {
-                const { packageJsonNodeEngine, packageJsonType, dasherizedBaseName, projectDescription, packageJsonScripts } = application;
+            mergePackageJson({ application, source }) {
+                const { packageJsonNodeEngine, packageJsonType, dasherizedBaseName, projectDescription, packageJsonScripts, clientPackageJsonScripts, } = application;
                 this.packageJson.merge({ scripts: packageJsonScripts });
                 this.packageJson.defaults({
                     name: dasherizedBaseName,
@@ -78,6 +90,9 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
                         node: typeof packageJsonNodeEngine === 'string' ? packageJsonNodeEngine : packageJson.engines.node,
                     });
                 }
+                if (clientPackageJsonScripts && Object.keys(clientPackageJsonScripts).length > 0) {
+                    source.mergeClientPackageJson({ scripts: clientPackageJsonScripts });
+                }
             },
         });
     }

package/dist/generators/javascript/generators/eslint/command.d.ts

@@ -1,21 +1,13 @@
-/**
- * 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 typescriptEslint: {
+            readonly cli: {
+                readonly type: BooleanConstructor;
+                readonly hide: true;
+            };
+            readonly scope: "storage";
+        };
+    };
+    readonly import: readonly [];
+};
 export default command;

package/dist/generators/javascript/generators/eslint/command.js

@@ -3,7 +3,9 @@ const command = {
         typescriptEslint: {
             cli: {
                 type: Boolean,
+                hide: true,
             },
+            scope: 'storage',
         },
     },
     import: [],

package/dist/generators/javascript/generators/eslint/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class EslintGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     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>>>, "loadNodeDependencies">;
     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>>>, "source">;

package/dist/generators/javascript/generators/husky/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class HuskyGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     constructor(args: any, options: any, features: any);
     beforeQueue(): Promise<void>;
     get configuring(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/base/tasks.js").TaskParamWithControl, "configureNodeOptions">;

package/dist/generators/javascript/generators/prettier/generator.d.ts

@@ -1,5 +1,6 @@
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class PrettierGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     fromInit?: boolean;
     prettierConfigFile: string;
     monorepositoryRoot?: boolean;

package/dist/generators/javascript/generators/prettier/generator.js

@@ -95,12 +95,13 @@ export default class PrettierGenerator extends BaseApplicationGenerator {
     get postWriting() {
         return this.asPostWritingTaskGroup({
             addPrettierDependencies({ application }) {
+                const { clientBundlerWebpack, clientFrameworkBuiltIn, clientFrameworkNo, monorepository, nodeDependencies, prettierExtensions } = application;
                 this.packageJson.merge({
                     devDependencies: {
-                        prettier: application.nodeDependencies.prettier,
+                        prettier: nodeDependencies.prettier,
                     },
                 });
-                if (application.monorepository && !this.monorepositoryRoot)
+                if (monorepository && !this.monorepositoryRoot)
                     return;
                 if (this.fromInit) {
                     this.packageJson.merge({
@@ -110,6 +111,15 @@ export default class PrettierGenerator extends BaseApplicationGenerator {
                         },
                     });
                 }
+                else if (clientFrameworkBuiltIn || clientFrameworkNo) {
+                    const folders = ['', 'src/**/', ...(clientBundlerWebpack ? ['webpack/'] : []), '.blueprint/**/'];
+                    this.packageJson.merge({
+                        scripts: {
+                            'prettier:check': `prettier --check "{${folders.join(',')}}*.{${prettierExtensions}}"`,
+                            'prettier:format': `prettier --write "{${folders.join(',')}}*.{${prettierExtensions}}"`,
+                        },
+                    });
+                }
             },
             addPrettierPackagejson({ application, source }) {
                 source.mergePrettierConfig({ plugins: ['prettier-plugin-packagejson'] });

package/dist/generators/javascript/resources/package.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
-    "husky": "9.1.6",
-    "lint-staged": "15.2.10"
+    "husky": "9.1.7",
+    "lint-staged": "15.2.11"
   }
 }

package/dist/generators/javascript/types.d.ts

@@ -1,7 +1,10 @@
+/* eslint-disable @typescript-eslint/consistent-type-imports */
+import type { Merge, PackageJson, Simplify } from 'type-fest';
 import type { ExportApplicationPropertiesFromCommand } from '../../lib/command/types.js';
-import type JavascriptBootstrapCommand from './generators/bootstrap/command.ts';
+import type JavascriptBootstrapCommand from './generators/bootstrap/command.js';
 
 type JavascriptBootstrapProperties = ExportApplicationPropertiesFromCommand<typeof JavascriptBootstrapCommand>;
+type DependencyValue = string | undefined | null;
 
 export type JavaScriptSourceType = {
   mergePrettierConfig?: (config: Record<string, unknown>) => void;
@@ -9,14 +12,26 @@ export type JavaScriptSourceType = {
 
   addEslintIgnore?: (opts: { ignorePattern: string }) => void;
   addEslintConfig?: (opts: { import?: string | string[]; config?: string | string[] }) => void;
+
+  /** Merge data to client's package.json */
+  mergeClientPackageJson?(
+    args: Simplify<
+      Merge<PackageJson, { dependencies?: Record<string, DependencyValue>; devDependencies?: Record<string, DependencyValue> }>
+    >,
+  ): void;
 };
 
-export type JavaScriptApplication = JavascriptBootstrapProperties & {
-  packageJsonNodeEngine?: boolean | string;
-  eslintConfigFile?: string;
-  cjsExtension?: string;
-  mjsExtension?: string;
-  packageJsonScripts: Record<string, string>;
+export type JavaScriptApplication = JavascriptBootstrapProperties &
+  ExportApplicationPropertiesFromCommand<typeof import('./generators/eslint/command.js').default> &
+  ExportApplicationPropertiesFromCommand<typeof import('./generators/prettier/command.js').default> & {
+    packageJsonNodeEngine?: boolean | string;
+    eslintConfigFile?: string;
+    cjsExtension?: string;
+    mjsExtension?: string;
+    /** Root package.json scripts */
+    packageJsonScripts: Record<string, string>;
+    /** Root package.json scripts */
+    clientPackageJsonScripts: Record<string, string>;
 
-  addPrettierExtensions?: (extensions: string[]) => void;
-};
+    addPrettierExtensions?: (extensions: string[]) => void;
+  };

package/dist/generators/jdl/generator.d.ts

@@ -7,6 +7,7 @@ type ApplicationWithEntitiesAndPath = ApplicationWithEntities & {
     sharedFs?: MemFs;
 };
 export default class JdlGenerator extends BaseGenerator {
+    [x: string]: any;
     jdlFiles?: string[];
     inline?: string;
     jdlContents: string[];

package/dist/generators/kubernetes/files.js

@@ -106,6 +106,9 @@ export function writeFiles() {
                     if (appConfig.devServerPort !== undefined) {
                         this.keycloakRedirectUris += `"http://localhost:${appConfig.devServerPort}/*", `;
                     }
+                    if (appConfig.devServerPortProxy !== undefined) {
+                        this.keycloakRedirectUris += `"http://localhost:${appConfig.devServerPortProxy}/*", `;
+                    }
                     this.debug(chalk.red.bold(`${appConfig.baseName} has redirect URIs ${this.keycloakRedirectUris}`));
                     this.debug(chalk.red.bold(`AppConfig is ${JSON.stringify(appConfig)}`));
                 }