generator-jhipster 8.7.1 → 8.7.2

package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs

@@ -105,66 +105,9 @@ if (hasFieldConstraint) { _%>
         Added the relationship constraints for entity <%= entityClass %>.
     -->
     <changeSet id="<%= changelogDate %>-relationship-foreign-keys" author="jhipster">
-    <%_ for (idx in addedRelationships) {
-        const relationship = addedRelationships[idx];
-        onDelete = relationship.onDelete,
-        onUpdate = relationship.onUpdate;
-
-        if (relationship.shouldWriteRelationship) {
-            const constraintName = this.getFKConstraintName(entityTableName, relationship.columnName, prodDatabaseType);
-            let baseColumnName = relationship.columnName + '_id';
-            if (relationship.relationshipType === 'one-to-one' && relationship.id === true) {
-                baseColumnName = 'id';
-            }
-    _%>
-        <addForeignKeyConstraint baseColumnNames="<%= baseColumnName %>"
-                                 baseTableName="<%= entityTableName %>"
-                                 constraintName="<%= constraintName %>"
-                                 referencedColumnNames="id"
-                                 referencedTableName="<%= relationship.otherEntityTableName %>"
-            <%_ if (onDelete) { _%>                                 
-                                 onDelete="<%= onDelete %>"
-            <%_ } _%>
-            <%_ if (onUpdate) { _%>
-                                 onUpdate="<%= onUpdate %>"
-            <%_ } _%>
-                                 />
-    <%_ } else if (relationship.shouldWriteJoinTable) {
-            const constraintName = this.getFKConstraintName(relationship.joinTable.name, entityTableName, prodDatabaseType);
-            const otherEntityConstraintName = this.getFKConstraintName(relationship.joinTable.name, relationship.columnName, prodDatabaseType);
-    _%>
-
-        <addForeignKeyConstraint baseColumnNames="<%= entity.primaryKey.fields.map(field => entity.entityTableName + '_' + field.columnName).join(', ') %>"
-                                 baseTableName="<%= relationship.joinTable.name %>"
-                                 constraintName="<%= constraintName %>"
-                                 referencedColumnNames="<%= entity.primaryKey.fields.map(field => field.columnName).join(', ') %>"
-                                 referencedTableName="<%= entityTableName %>"
-            <%_ if (onDelete) { _%>                                 
-                                 onDelete="<%= onDelete %>"
-            <%_ } _%>
-            <%_ if (onUpdate) { _%>
-                                 onUpdate="<%= onUpdate %>"
-            <%_ } _%>
-                                 />
-
-        <addForeignKeyConstraint baseColumnNames="<%= relationship.otherEntity.primaryKey.fields.map(field => relationship.columnName + '_' + field.columnName).join(', ') %>"
-                                 baseTableName="<%= relationship.joinTable.name %>"
-                                 constraintName="<%= otherEntityConstraintName %>"
-                                 referencedColumnNames="<%= relationship.otherEntity.primaryKey.fields.map(field => field.columnName).join(', ') %>"
-                                 referencedTableName="<%= relationship.otherEntityTableName %>"
-            <%_ if (relationship.otherRelationship) { 
-                // User object is not supporting this right now
-                _%>
-                <%_ if (relationship.otherRelationship.onDelete) { _%>                                 
-                                 onDelete="<%= relationship.otherRelationship.onDelete %>"
-                <%_ } _%>
-                <%_ if (relationship.otherRelationship.onUpdate) { _%>
-                                 onUpdate="<%= relationship.otherRelationship.onUpdate %>"
-                <%_ } _%>
-            <%_ } _%>
-                                 />
-    <%_ }
-    } _%>
+    <%_ for (relationship of addedRelationships) { _%>
+<%- include('./add_relationship_constraints', { entity, relationship, prodDatabaseType }) -%>
+    <%_ } _%>
     </changeSet>
 <%_ } _%>
 </databaseChangeLog>

package/dist/generators/maven/generators/frontend-plugin/generator.js

@@ -30,7 +30,7 @@ export default class FrontendPluginGenerator extends BaseApplicationGenerator {
     get postWriting() {
         return this.asPostWritingTaskGroup({
             customize({ application, source }) {
-                const { javaDependencies, nodeDependencies, nodeVersion, clientFrameworkAngular, clientFrameworkReact, clientFrameworkVue, microfrontend, srcMainWebapp, } = application;
+                const { javaDependencies, nodeDependencies, nodeVersion, clientFrameworkAngular, clientFrameworkReact, clientFrameworkVue, clientFrameworkBuiltIn, clientBundlerVite, clientBundlerWebpack, microfrontend, srcMainWebapp, } = application;
                 const checksumIncludedFiles = [
                     `${srcMainWebapp}**/*.*`,
                     'target/classes/static/**/*.*',
@@ -39,18 +39,23 @@ export default class FrontendPluginGenerator extends BaseApplicationGenerator {
                     'tsconfig.json',
                 ];
                 if (clientFrameworkAngular) {
-                    checksumIncludedFiles.push('tsconfig.app.json', 'webpack/*.*');
+                    checksumIncludedFiles.push('tsconfig.app.json');
                 }
                 else if (clientFrameworkReact) {
-                    checksumIncludedFiles.push('.postcss.config.js', 'webpack/*.*');
+                    checksumIncludedFiles.push('.postcss.config.js');
                 }
                 else if (clientFrameworkVue) {
                     checksumIncludedFiles.push('.postcssrc.js', 'tsconfig.app.json');
                     if (microfrontend) {
+                        checksumIncludedFiles.push('module-federation.config.cjs');
+                    }
+                }
+                if (clientFrameworkBuiltIn) {
+                    if (clientBundlerWebpack) {
                         checksumIncludedFiles.push('webpack/*.*');
                     }
-                    else {
-                        checksumIncludedFiles.push('vite.config.ts');
+                    else if (clientBundlerVite) {
+                        checksumIncludedFiles.push('vite.config.mts');
                     }
                 }
                 source.addMavenDefinition({

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

@@ -17,9 +17,9 @@
  * limitations under the License.
  */
 
-export type MavenArtifact = {
-  groupId?: string;
-  artifactId: string;
+import type { JavaArtifact } from '../java/types.js';
+
+export type MavenArtifact = JavaArtifact & {
   version?: string;
   inProfile?: string;
 };
@@ -40,9 +40,6 @@ export type MavenRepository = {
 };
 
 export type MavenDependency = MavenArtifact & {
-  type?: string;
-  scope?: string;
-  classifier?: string;
   optional?: boolean;
   additionalContent?: string;
 };

package/dist/generators/project-name/command.d.ts

@@ -1,21 +1,26 @@
-/**
- * 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 defaultBaseName: {
+            readonly internal: true;
+            readonly scope: "generator";
+        };
+        readonly validateBaseName: {
+            readonly internal: true;
+            readonly scope: "generator";
+        };
+        readonly baseName: {
+            readonly description: "Application base name";
+            readonly cli: {
+                readonly type: StringConstructor;
+            };
+            readonly prompt: (gen: any) => {
+                type: "input";
+                validate: (input: any) => any;
+                message: string;
+                default: () => any;
+            };
+            readonly scope: "storage";
+        };
+    };
+};
 export default command;

package/dist/generators/project-name/command.js

@@ -1,9 +1,25 @@
-import { BASE_NAME, BASE_NAME_DESCRIPTION } from './constants.js';
+import { BASE_NAME_DESCRIPTION } from './constants.js';
 const command = {
-    options: {
-        [BASE_NAME]: {
+    configs: {
+        defaultBaseName: {
+            internal: true,
+            scope: 'generator',
+        },
+        validateBaseName: {
+            internal: true,
+            scope: 'generator',
+        },
+        baseName: {
             description: BASE_NAME_DESCRIPTION,
-            type: String,
+            cli: {
+                type: String,
+            },
+            prompt: gen => ({
+                type: 'input',
+                validate: input => gen.validateBaseName(input),
+                message: 'What is the base name of your application?',
+                default: () => gen.defaultBaseName(),
+            }),
             scope: 'storage',
         },
     },

package/dist/generators/project-name/generator.d.ts

@@ -17,21 +17,12 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('../base-application/types.js').BaseApplication>}
- */
 export default class ProjectNameGenerator extends BaseApplicationGenerator {
-    javaApplication: any;
+    javaApplication?: boolean;
+    defaultBaseName: () => string;
+    validateBaseName: (input: string) => boolean | string;
     beforeQueue(): Promise<void>;
     get initializing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "parseOptions">;
-    get prompting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "showPrompts">;
     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>>>, "load">;
     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>>>, "preparing">;
-    /**
-     * Validates baseName
-     * @param {String} input - Base name to be checked
-     * @returns Boolean
-     */
-    validateBaseName(input: any): true | "Your base name cannot contain special characters or a blank space" | "Your base name cannot contain underscores as this does not meet the URI spec" | "Your base name cannot be named 'application' as this is a reserved name for Spring Boot";
 }

package/dist/generators/project-name/generator.js

@@ -20,14 +20,14 @@ import { camelCase, defaults, kebabCase, startCase, upperFirst } from 'lodash-es
 import BaseApplicationGenerator from '../base-application/index.js';
 import { getHipster } from '../base/support/index.js';
 import { getDefaultAppName } from './support/index.js';
-import { BASE_NAME } from './constants.js';
 import { validateProjectName } from './support/name-resolver.js';
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('../base-application/types.js').BaseApplication>}
- */
 export default class ProjectNameGenerator extends BaseApplicationGenerator {
     javaApplication;
+    defaultBaseName = () => getDefaultAppName({
+        reproducible: this.options.reproducible,
+        javaApplication: this.javaApplication,
+    });
+    validateBaseName = (input) => validateProjectName(input, { javaApplication: this.javaApplication });
     async beforeQueue() {
         this.sharedData.getControl().existingProject = Boolean(this.options.defaults || this.options.applicationWithConfig || (this.jhipsterConfig.baseName !== undefined && this.config.existed));
         if (!this.fromBlueprint) {
@@ -39,10 +39,7 @@ export default class ProjectNameGenerator extends BaseApplicationGenerator {
             parseOptions() {
                 if (this.options.defaults) {
                     if (!this.jhipsterConfig.baseName) {
-                        this.jhipsterConfig.baseName = getDefaultAppName({
-                            reproducible: this.options.reproducible,
-                            javaApplication: this.javaApplication,
-                        });
+                        this.jhipsterConfig.baseName = this.defaultBaseName();
                     }
                 }
             },
@@ -51,24 +48,6 @@ export default class ProjectNameGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.INITIALIZING]() {
         return this.delegateTasksToBlueprint(() => this.initializing);
     }
-    get prompting() {
-        return this.asPromptingTaskGroup({
-            async showPrompts() {
-                await this.prompt([
-                    {
-                        name: BASE_NAME,
-                        type: 'input',
-                        validate: input => this.validateBaseName(input),
-                        message: 'What is the base name of your application?',
-                        default: () => getDefaultAppName({ reproducible: this.options.reproducible, javaApplication: this.javaApplication }),
-                    },
-                ], this.config);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
     get loading() {
         return this.asLoadingTaskGroup({
             load({ application }) {
@@ -102,15 +81,4 @@ export default class ProjectNameGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING]() {
         return this.delegateTasksToBlueprint(() => this.preparing);
     }
-    /*
-     * Start of local public API, blueprints may override to customize the generator behavior.
-     */
-    /**
-     * Validates baseName
-     * @param {String} input - Base name to be checked
-     * @returns Boolean
-     */
-    validateBaseName(input) {
-        return validateProjectName(input, { javaApplication: this.javaApplication });
-    }
 }

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

@@ -14,7 +14,7 @@ export default class ReactGenerator extends BaseApplicationGenerator {
     get postWritingEntities(): {
         postWriteEntitiesFiles: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").PostWritingEntitiesTaskParam<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>>>) => 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>>>, "addWebsocketDependencies">;
+    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>>>, "addWebsocketDependencies" | "addMicrofrontendDependencies">;
     get end(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplication<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>>>, "end">;
     /**
      * @private

package/dist/generators/react/generator.js

@@ -123,8 +123,8 @@ export default class ReactGenerator extends BaseApplicationGenerator {
     }
     get writing() {
         return this.asWritingTaskGroup({
-            cleanup({ control }) {
-                control.cleanupFiles({
+            async cleanup({ control }) {
+                await control.cleanupFiles({
                     '8.6.1': ['.eslintrc.json', '.eslintignore'],
                 });
             },
@@ -152,6 +152,19 @@ export default class ReactGenerator extends BaseApplicationGenerator {
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
+            addMicrofrontendDependencies({ application }) {
+                if (!application.microfrontend)
+                    return;
+                const { applicationTypeGateway } = application;
+                if (applicationTypeGateway) {
+                    this.packageJson.merge({
+                        devDependencies: { '@module-federation/utilities': null },
+                    });
+                }
+                this.packageJson.merge({
+                    devDependencies: { '@module-federation/enhanced': null },
+                });
+            },
             addWebsocketDependencies({ application }) {
                 const { communicationSpringWebsocket, nodeDependencies } = application;
                 if (communicationSpringWebsocket) {

package/dist/generators/react/resources/package.json

@@ -3,7 +3,7 @@
     "@fortawesome/fontawesome-svg-core": "6.6.0",
     "@fortawesome/free-solid-svg-icons": "6.6.0",
     "@fortawesome/react-fontawesome": "0.2.2",
-    "@reduxjs/toolkit": "2.2.7",
+    "@reduxjs/toolkit": "2.3.0",
     "axios": "1.7.7",
     "bootstrap": "5.3.3",
     "bootswatch": "5.3.3",
@@ -11,33 +11,34 @@
     "path-browserify": "1.0.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-hook-form": "7.53.0",
+    "react-hook-form": "7.53.1",
     "react-jhipster": "0.25.3",
     "react-loadable": "5.5.0",
     "react-redux": "9.1.2",
     "react-redux-loading-bar": "5.0.8",
-    "react-router-dom": "6.26.2",
-    "react-toastify": "10.0.5",
+    "react-router-dom": "6.27.0",
+    "react-toastify": "10.0.6",
     "react-transition-group": "4.4.5",
-    "reactstrap": "9.2.2",
+    "reactstrap": "9.2.3",
     "redux": "5.0.1",
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
     "sonar-scanner": "3.1.0",
-    "tslib": "2.7.0",
-    "uuid": "10.0.0",
+    "tslib": "2.8.0",
+    "uuid": "11.0.1",
     "webstomp-client": "1.2.6"
   },
   "devDependencies": {
-    "@eslint/js": "9.10.0",
-    "@module-federation/utilities": "3.1.12",
+    "@eslint/js": "9.13.0",
+    "@module-federation/enhanced": "0.6.13",
+    "@module-federation/utilities": "3.1.19",
     "@testing-library/react": "16.0.1",
-    "@types/jest": "29.5.13",
-    "@types/lodash": "4.17.7",
+    "@types/jest": "29.5.14",
+    "@types/lodash": "4.17.12",
     "@types/node": "20.11.25",
-    "@types/react": "18.3.8",
-    "@types/react-dom": "18.3.0",
-    "@types/react-redux": "7.1.33",
+    "@types/react": "18.3.12",
+    "@types/react-dom": "18.3.1",
+    "@types/react-redux": "7.1.34",
     "@types/redux": "3.6.31",
     "@types/webpack-env": "1.18.5",
     "autoprefixer": "10.4.20",
@@ -48,14 +49,14 @@
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.10.0",
+    "eslint": "9.13.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-react": "7.36.1",
+    "eslint-plugin-react": "7.37.2",
     "eslint-webpack-plugin": "4.2.0",
     "folder-hash": "4.0.4",
     "fork-ts-checker-webpack-plugin": "9.0.2",
-    "html-webpack-plugin": "5.6.0",
+    "html-webpack-plugin": "5.6.3",
     "identity-obj-proxy": "3.0.0",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
@@ -65,12 +66,12 @@
     "merge-jsons-webpack-plugin": "2.0.1",
     "mini-css-extract-plugin": "2.9.1",
     "postcss-loader": "8.1.1",
-    "postcss-rtlcss": "5.4.0",
+    "postcss-rtlcss": "5.5.0",
     "react-infinite-scroll-component": "6.1.0",
-    "redux-mock-store": "1.5.4",
+    "redux-mock-store": "1.5.5",
     "rimraf": "5.0.8",
-    "sass": "1.79.2",
-    "sass-loader": "16.0.1",
+    "sass": "1.77.6",
+    "sass-loader": "16.0.2",
     "simple-progress-webpack-plugin": "2.0.0",
     "sinon": "19.0.2",
     "source-map-loader": "5.0.0",
@@ -80,9 +81,9 @@
     "thread-loader": "4.0.4",
     "ts-jest": "29.2.5",
     "ts-loader": "9.5.1",
-    "typescript": "5.6.2",
-    "typescript-eslint": "8.6.0",
-    "webpack": "5.94.0",
+    "typescript": "5.6.3",
+    "typescript-eslint": "8.11.0",
+    "webpack": "5.95.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.1.0",
     "webpack-merge": "6.0.1",

package/dist/generators/react/templates/package.json.ejs

@@ -59,9 +59,6 @@
     "uuid": "<%= nodeDependencies['uuid'] %>"
   },
   "devDependencies": {
-<%_ if (applicationTypeGateway && microfrontend) { _%>
-    "@module-federation/utilities": "<%= nodeDependencies['@module-federation/utilities'] %>",
-<%_ } _%>
     "@testing-library/react": "<%= nodeDependencies['@testing-library/react'] %>",
     "@types/jest": "<%= nodeDependencies['@types/jest'] %>",
     "@types/lodash": "<%= nodeDependencies['@types/lodash'] %>",

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

@@ -26,25 +26,19 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     get composing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "composeBackendType">;
     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>>>, "loadEnvironmentVariables" | "setupServerconsts">;
     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>>>, "blockhound">;
-    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">;
     get configuringEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").ConfiguringEachEntityTaskParam<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>>>, "configureFields" | "configureRelationships" | "configureMicroservice" | "configureGateway" | "configureEntitySearchEngine" | "configureModelFiltering" | "configurePagination" | "configureEntityTable">;
     get loadingEntities(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").LoadingEntitiesTaskParam<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>>>, "loadEntityConfig">;
     get preparingEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityTaskParam<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>>>, "prepareEntity">;
     get postPreparingEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityTaskParam<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>>>, "checkForTableName">;
     /** @inheritdoc */
     get default(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithEntities<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>>>, "checkCompositeIds">;
-    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>>>, "packageJsonE2eScripts" | "packageJsonScripts" | "packageJsonBackendScripts">;
+    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">;
     /**
      * Validate the entityTableName
      * @return {true|string} true for a valid value or error message.
      */
     _validateTableName(entityTableName: any, prodDatabaseType: any, entity: any): string | true;
     _validateField(entityName: any, field: any): void;
-    useNpmWrapperInstallTask(): void;
     _validateRelationship(entityName: any, relationship: any): void;
     /**
      * @private

package/dist/generators/server/generator.js

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *
@@ -18,7 +17,6 @@
  * limitations under the License.
  */
 import { existsSync } from 'fs';
-import chalk from 'chalk';
 import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { packageJson } from '../../lib/index.js';
@@ -82,19 +80,24 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                     this.log.info(`Using ${application.defaultPackaging} as default packaging`);
                 }
             },
-            setupServerconsts({ application }) {
+            setupServerconsts({ application, applicationDefaults }) {
                 // Make constants available in templates
-                application.MAIN_DIR = MAIN_DIR;
-                application.TEST_DIR = TEST_DIR;
-                application.LOGIN_REGEX = LOGIN_REGEX;
-                application.CLIENT_WEBPACK_DIR = CLIENT_WEBPACK_DIR;
-                application.SERVER_MAIN_SRC_DIR = SERVER_MAIN_SRC_DIR;
-                application.SERVER_MAIN_RES_DIR = SERVER_MAIN_RES_DIR;
-                application.SERVER_TEST_SRC_DIR = SERVER_TEST_SRC_DIR;
-                application.SERVER_TEST_RES_DIR = SERVER_TEST_RES_DIR;
-                application.JAVA_VERSION = this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION;
-                application.JAVA_COMPATIBLE_VERSIONS = JAVA_COMPATIBLE_VERSIONS;
-                application.javaCompatibleVersions = JAVA_COMPATIBLE_VERSIONS;
+                applicationDefaults({
+                    MAIN_DIR,
+                    TEST_DIR,
+                    LOGIN_REGEX,
+                    CLIENT_WEBPACK_DIR,
+                    SERVER_MAIN_SRC_DIR,
+                    SERVER_MAIN_RES_DIR,
+                    SERVER_TEST_SRC_DIR,
+                    SERVER_TEST_RES_DIR,
+                    JAVA_VERSION: this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION,
+                    JAVA_COMPATIBLE_VERSIONS,
+                    javaCompatibleVersions: JAVA_COMPATIBLE_VERSIONS,
+                    ANGULAR,
+                    VUE,
+                    REACT,
+                });
                 if (this.projectVersion) {
                     application.projectVersion = this.projectVersion;
                     this.log.info(`Using projectVersion: ${application.projectVersion}`);
@@ -112,10 +115,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 else {
                     application.jhipsterDependenciesVersion = JHIPSTER_DEPENDENCIES_VERSION;
                 }
-                application.ANGULAR = ANGULAR;
-                application.VUE = VUE;
-                application.REACT = REACT;
-                this.packagejs = packageJson;
                 application.jhipsterPackageJson = packageJson;
             },
         });
@@ -140,18 +139,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING]() {
         return this.delegateTasksToBlueprint(() => this.preparing);
     }
-    get postPreparing() {
-        return this.asPostPreparingTaskGroup({
-            useNpmWrapper({ application }) {
-                if (application.useNpmWrapper) {
-                    this.useNpmWrapperInstallTask();
-                }
-            },
-        });
-    }
-    get [BaseApplicationGenerator.POST_PREPARING]() {
-        return this.delegateTasksToBlueprint(() => this.postPreparing);
-    }
     get configuringEachEntity() {
         return this.asConfiguringEachEntityTaskGroup({
             configureMicroservice({ application, entityConfig }) {
@@ -273,9 +260,11 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                         relationship.relationshipName = relationship.otherEntityName;
                         this.log.warn(`relationshipName is missing in .jhipster/${entityName}.json for relationship ${stringifyApplicationData(relationship)}, using ${relationship.otherEntityName} as fallback`);
                     }
+                    // @ts-ignore deprecated property
                     if (relationship.useJPADerivedIdentifier) {
                         this.log.verboseInfo('Option useJPADerivedIdentifier is deprecated, use id instead');
-                        relationship.id = true;
+                        relationship.options ??= {};
+                        relationship.options.id = true;
                     }
                 });
                 entityConfig.relationships = relationships;
@@ -408,7 +397,8 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             packageJsonE2eScripts({ application }) {
                 const scriptsStorage = this.packageJson.createStorage('scripts');
                 const buildCmd = application.buildToolGradle ? 'gradlew' : 'mvnw -ntp';
-                const applicationWaitTimeout = WAIT_TIMEOUT * (application.applicationTypeGateway ? 2 : 1);
+                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';
@@ -497,24 +487,6 @@ ${instructions}`);
             }
         }
     }
-    useNpmWrapperInstallTask() {
-        this.setFeatures({
-            customInstallTask: async function customInstallTask(preferredPm, defaultInstallTask) {
-                const buildTool = this.jhipsterConfigWithDefaults.buildTool;
-                if ((preferredPm && preferredPm !== 'npm') || this.jhipsterConfig.skipClient || (buildTool !== GRADLE && buildTool !== MAVEN)) {
-                    return defaultInstallTask();
-                }
-                const npmCommand = process.platform === 'win32' ? 'npmw' : './npmw';
-                try {
-                    await this.spawnCommand(npmCommand, ['install'], { preferLocal: true });
-                }
-                catch (error) {
-                    this.log.error(chalk.red(`Error executing '${npmCommand} install', please execute it yourself. (${error.shortMessage})`));
-                }
-                return true;
-            }.bind(this),
-        });
-    }
     _validateRelationship(entityName, relationship) {
         if (relationship.otherEntityName === undefined) {
             throw new Error(`otherEntityName is missing in .jhipster/${entityName}.json for relationship ${stringifyApplicationData(relationship)}`);