generator-jhipster 8.7.3 → 8.8.0

package/dist/generators/maven/generators/code-quality/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class CodeQualityGenerator 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>>>, "sonar" | "jacoco" | "checkstyle" | "spotless" | "modernizer">;
 }

package/dist/generators/maven/generators/frontend-plugin/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class FrontendPluginGenerator 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>>>, "customize">;
 }

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

@@ -25,39 +25,13 @@ export default class FrontendPluginGenerator extends BaseApplicationGenerator {
         if (!this.delegateToBlueprint) {
             await this.dependsOnBootstrapApplication();
             await this.dependsOnJHipster('maven');
+            await this.dependsOnJHipster('jhipster:java:node');
         }
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
             customize({ application, source }) {
-                const { javaDependencies, nodeDependencies, nodeVersion, clientFrameworkAngular, clientFrameworkReact, clientFrameworkVue, clientFrameworkBuiltIn, clientBundlerVite, clientBundlerWebpack, microfrontend, srcMainWebapp, } = application;
-                const checksumIncludedFiles = [
-                    `${srcMainWebapp}**/*.*`,
-                    'target/classes/static/**/*.*',
-                    'package-lock.json',
-                    'package.json',
-                    'tsconfig.json',
-                ];
-                if (clientFrameworkAngular) {
-                    checksumIncludedFiles.push('tsconfig.app.json');
-                }
-                else if (clientFrameworkReact) {
-                    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 if (clientBundlerVite) {
-                        checksumIncludedFiles.push('vite.config.mts');
-                    }
-                }
+                const { javaDependencies, nodeDependencies, nodeVersion } = application;
                 source.addMavenDefinition({
                     properties: [
                         { property: 'node.version', value: `v${nodeVersion}` },
@@ -129,9 +103,9 @@ export default class FrontendPluginGenerator extends BaseApplicationGenerator {
                       <fileSets>
                           <fileSet>
                               <directory>\${project.basedir}</directory>
-                              <includes>${checksumIncludedFiles
-                                .map(file => `
-                                  <include>${file}</include>`)
+                              <includes>${application.javaNodeBuildPaths
+                                ?.map(file => `
+                                  <include>${file.endsWith('/') ? `${file}**/*.*` : file}</include>`)
                                 .join('')}
                               </includes>
                               <excludes>

package/dist/generators/maven/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 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>>>, "addJibPlugin">;
 }

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

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class ProjectNameGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     javaApplication?: boolean;
     defaultBaseName: () => string;
     validateBaseName: (input: string) => boolean | string;

package/dist/generators/react/files-react.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { asWriteFilesSection, asWritingTask } from '../base-application/support/index.js';
-import { clientApplicationTemplatesBlock, clientRootTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.js';
+import { clientApplicationTemplatesBlock, clientRootTemplatesBlock } from '../client/support/files.js';
 export const files = asWriteFilesSection({
     common: [
         clientRootTemplatesBlock({
@@ -254,11 +254,6 @@ export const files = asWriteFilesSection({
             ...clientApplicationTemplatesBlock(),
             templates: ['main.tsx', 'shared/error/error-loading.tsx'],
         },
-        {
-            condition: generator => generator.microfrontend && generator.applicationTypeGateway,
-            ...clientSrcTemplatesBlock(),
-            templates: ['microfrontends/entities-menu.tsx', 'microfrontends/entities-routes.tsx'],
-        },
     ],
     clientTestFw: [
         {

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

@@ -1,9 +1,10 @@
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class ReactGenerator 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, "composing">;
     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>>>, "loadPackageJson" | "applicationDefauts">;
-    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>>>, "applicationDefauts" | "prepareForTemplates">;
+    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" | "applicationDefauts" | "prepareForTemplates">;
     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>>>, "react">;
     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>>>, "queueTranslateTransform">;
     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>>>, "cleanup" | "cleanupOldFilesTask" | "writeEslintClientRootConfigFile" | "writeFiles">;
@@ -53,11 +54,9 @@ export default class ReactGenerator extends BaseApplicationGenerator {
      * @returns {Array} defaultVariablesValues
      */
     generateEntityClientFieldDefaultValues(fields: any): {};
-    generateEntityClientFields(primaryKey: any, fields: any, relationships: any, dto: any, customDateType?: string, embedded?: boolean): never[];
+    generateEntityClientFields(primaryKey: any, fields: any, relationships: any, dto: any, customDateType?: string, embedded?: boolean): string[];
     generateEntityClientImports(relationships: any, dto: any): Map<any, any>;
     generateEntityClientEnumImports(fields: any): Map<any, any>;
-    generateTestEntityId(primaryKey: any, index?: number, wrapped?: boolean): any;
-    generateTestEntityPrimaryKey(primaryKey: any, index: any): string;
     /**
      * @private
      * Add new scss style to the react application in "app.scss".

package/dist/generators/react/generator.js

@@ -22,7 +22,7 @@ import { camelCase, startCase } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_CLIENT, GENERATOR_LANGUAGES, GENERATOR_REACT } from '../generator-list.js';
 import { clientFrameworkTypes, fieldTypes } from '../../lib/jhipster/index.js';
-import { generateEntityClientImports as formatEntityClientImports, generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, } from '../client/support/index.js';
+import { generateEntityClientImports as formatEntityClientImports, generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, } from '../client/support/index.js';
 import { createNeedleCallback, upperFirstCamelCase } from '../base/support/index.js';
 import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js';
 import { cleanupEntitiesFiles, postWriteEntitiesFiles, writeEntitiesFiles } from './entity-files-react.js';
@@ -80,6 +80,13 @@ export default class ReactGenerator extends BaseApplicationGenerator {
                     webappEnumerationsDir: app => `${app.clientSrcDir}app/shared/model/enumerations/`,
                 });
             },
+            async javaNodeBuildPaths({ application }) {
+                const { clientBundlerWebpack, javaNodeBuildPaths } = application;
+                javaNodeBuildPaths?.push('.postcss.config.js', 'tsconfig.json');
+                if (clientBundlerWebpack) {
+                    javaNodeBuildPaths?.push('webpack/');
+                }
+            },
             prepareForTemplates({ application, source }) {
                 source.addWebpackConfig = args => {
                     const webpackPath = `${application.clientRootDir}webpack/webpack.common.js`;
@@ -123,9 +130,16 @@ export default class ReactGenerator extends BaseApplicationGenerator {
     }
     get writing() {
         return this.asWritingTaskGroup({
-            async cleanup({ control }) {
+            async cleanup({ control, application }) {
                 await control.cleanupFiles({
                     '8.6.1': ['.eslintrc.json', '.eslintignore'],
+                    '8.7.4': [
+                        [
+                            Boolean(application.microfrontend && application.applicationTypeGateway),
+                            `${application.srcMainWebapp}microfrontends/entities-menu.tsx`,
+                            `${application.srcMainWebapp}microfrontends/entities-routes.tsx`,
+                        ],
+                    ],
                 });
             },
             cleanupOldFilesTask,
@@ -152,23 +166,23 @@ export default class ReactGenerator extends BaseApplicationGenerator {
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
-            addMicrofrontendDependencies({ application }) {
+            addMicrofrontendDependencies({ application, source }) {
                 if (!application.microfrontend)
                     return;
                 const { applicationTypeGateway } = application;
                 if (applicationTypeGateway) {
-                    this.packageJson.merge({
+                    source.mergeClientPackageJson({
                         devDependencies: { '@module-federation/utilities': null },
                     });
                 }
-                this.packageJson.merge({
+                source.mergeClientPackageJson({
                     devDependencies: { '@module-federation/enhanced': null },
                 });
             },
-            addWebsocketDependencies({ application }) {
+            addWebsocketDependencies({ application, source }) {
                 const { communicationSpringWebsocket, nodeDependencies } = application;
                 if (communicationSpringWebsocket) {
-                    this.packageJson.merge({
+                    source.mergeClientPackageJson({
                         dependencies: {
                             rxjs: nodeDependencies.rxjs,
                             'sockjs-client': nodeDependencies['sockjs-client'],
@@ -258,12 +272,6 @@ export default class ReactGenerator extends BaseApplicationGenerator {
     generateEntityClientEnumImports(fields) {
         return getClientEnumImportsFormat(fields, REACT);
     }
-    generateTestEntityId(primaryKey, index = 0, wrapped = true) {
-        return getTestEntityId(primaryKey, index, wrapped);
-    }
-    generateTestEntityPrimaryKey(primaryKey, index) {
-        return getTestEntityPrimaryKey(primaryKey, index);
-    }
     /**
      * @private
      * Add new scss style to the react application in "app.scss".

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

@@ -1,38 +1,38 @@
 {
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "6.6.0",
-    "@fortawesome/free-solid-svg-icons": "6.6.0",
+    "@fortawesome/fontawesome-svg-core": "6.7.2",
+    "@fortawesome/free-solid-svg-icons": "6.7.2",
     "@fortawesome/react-fontawesome": "0.2.2",
-    "@reduxjs/toolkit": "2.3.0",
-    "axios": "1.7.7",
+    "@reduxjs/toolkit": "2.5.0",
+    "axios": "1.7.9",
     "bootstrap": "5.3.3",
     "bootswatch": "5.3.3",
     "lodash": "4.17.21",
     "path-browserify": "1.0.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-hook-form": "7.53.1",
+    "react-hook-form": "7.54.2",
     "react-jhipster": "0.25.3",
     "react-loadable": "5.5.0",
-    "react-redux": "9.1.2",
+    "react-redux": "9.2.0",
     "react-redux-loading-bar": "5.0.8",
-    "react-router-dom": "6.27.0",
-    "react-toastify": "10.0.6",
+    "react-router-dom": "7.1.0",
+    "react-toastify": "11.0.2",
     "react-transition-group": "4.4.5",
     "reactstrap": "9.2.3",
     "redux": "5.0.1",
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
     "sonar-scanner": "3.1.0",
-    "tslib": "2.8.0",
-    "uuid": "11.0.2",
+    "tslib": "2.8.1",
+    "uuid": "11.0.3",
     "webstomp-client": "1.2.6"
   },
   "devDependencies": {
-    "@eslint/js": "9.13.0",
-    "@module-federation/enhanced": "0.6.13",
-    "@module-federation/utilities": "3.1.19",
-    "@testing-library/react": "16.0.1",
+    "@eslint/js": "9.17.0",
+    "@module-federation/enhanced": "0.8.5",
+    "@module-federation/utilities": "3.1.36",
+    "@testing-library/react": "16.1.0",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.13",
     "@types/node": "20.11.25",
@@ -45,11 +45,11 @@
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "12.0.2",
-    "core-js": "3.38.1",
+    "core-js": "3.39.0",
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.13.0",
+    "eslint": "9.17.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
     "eslint-plugin-react": "7.37.2",
@@ -60,32 +60,33 @@
     "identity-obj-proxy": "3.0.0",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
+    "jest-fixed-jsdom": "0.0.9",
     "jest-junit": "16.0.0",
     "jest-sonar": "0.2.16",
     "json-loader": "0.5.7",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "mini-css-extract-plugin": "2.9.1",
+    "mini-css-extract-plugin": "2.9.2",
     "postcss-loader": "8.1.1",
-    "postcss-rtlcss": "5.5.0",
+    "postcss-rtlcss": "5.6.0",
     "react-infinite-scroll-component": "6.1.0",
     "redux-mock-store": "1.5.5",
     "rimraf": "5.0.8",
     "sass": "1.77.6",
-    "sass-loader": "16.0.2",
+    "sass-loader": "16.0.4",
     "simple-progress-webpack-plugin": "2.0.0",
     "sinon": "19.0.2",
     "source-map-loader": "5.0.0",
     "sourcemap-istanbul-instrumenter-loader": "0.2.0",
     "style-loader": "4.0.0",
-    "terser-webpack-plugin": "5.3.10",
+    "terser-webpack-plugin": "5.3.11",
     "thread-loader": "4.0.4",
     "ts-jest": "29.2.5",
     "ts-loader": "9.5.1",
-    "typescript": "5.6.3",
-    "typescript-eslint": "8.12.2",
-    "webpack": "5.95.0",
-    "webpack-cli": "5.1.4",
-    "webpack-dev-server": "5.1.0",
+    "typescript": "5.7.2",
+    "typescript-eslint": "8.18.1",
+    "webpack": "5.97.1",
+    "webpack-cli": "6.0.1",
+    "webpack-dev-server": "5.2.0",
     "webpack-merge": "6.0.1",
     "webpack-notifier": "1.15.0",
     "workbox-webpack-plugin": "7.3.0"

package/dist/generators/react/support/translate-react.d.ts

@@ -1,9 +1,10 @@
+import type { GetWebappTranslationCallback } from '../../../lib/types/base/translation.js';
 /**
  * Replace and cleanup translations.
  *
  * @return {import('../../base/api.js').EditFileCallback}
  */
-export declare const createTranslationReplacer: (getWebappTranslation: any) => (body: string, filePath: string) => string;
+export declare const createTranslationReplacer: (getWebappTranslation: GetWebappTranslationCallback) => (body: string, filePath: string) => string;
 export declare const isTranslatedReactFile: (file: any) => boolean;
-declare const translateReactFilesTransform: (getWebappTranslation: any) => import("stream").Transform;
+declare const translateReactFilesTransform: (getWebappTranslation: GetWebappTranslationCallback) => import("stream").Transform;
 export default translateReactFilesTransform;

package/dist/generators/react/support/translate-react.js

@@ -93,7 +93,7 @@ const replaceTranslationKeysWithText = (getWebappTranslation, body, regexp, { ke
  *
  * @return {import('../../base/api.js').EditFileCallback}
  */
-export const createTranslationReplacer = getWebappTranslation => function replaceReactTranslations(body, filePath) {
+export const createTranslationReplacer = (getWebappTranslation) => function replaceReactTranslations(body, filePath) {
     if (filePath.endsWith('.tsx')) {
         body = body.replace(new RegExp(TRANSLATE_IMPORT, 'g'), '');
         body = replaceTranslationKeysWithText(getWebappTranslation, body, `\\{\\s*${TRANSLATE_FUNCTION}\\s*\\}`, { wrapTranslation: '"' });
@@ -108,7 +108,7 @@ export const createTranslationReplacer = getWebappTranslation => function replac
 };
 const minimatch = new Minimatch('**/*.tsx');
 export const isTranslatedReactFile = file => minimatch.match(file.path);
-const translateReactFilesTransform = getWebappTranslation => {
+const translateReactFilesTransform = (getWebappTranslation) => {
     const translate = createTranslationReplacer(getWebappTranslation);
     return passthrough(file => {
         file.contents = Buffer.from(translate(file.contents.toString(), file.path));

package/dist/generators/react/support/update-languages.d.ts

@@ -16,6 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type BaseGenerator from '../../base/index.js';
+import type BaseGenerator from '../../base-core/index.js';
 import { type UpdateClientLanguagesTaskParam } from '../../client/support/index.js';
 export default function updateLanguagesTask(this: BaseGenerator, taskParam: UpdateClientLanguagesTaskParam): void;

package/dist/generators/react/templates/eslint.config.js.jhi.react.ejs

@@ -69,6 +69,7 @@ import react from 'eslint-plugin-react/configs/recommended.js';
       '@typescript-eslint/no-empty-function': 'off',
       '@typescript-eslint/unbound-method': 'off',
       '@typescript-eslint/array-type': 'off',
+      '@typescript-eslint/no-misused-promises': 'off',
       '@typescript-eslint/no-shadow': 'error',
       'spaced-comment': ['warn', 'always'],
       'guard-for-in': 'error',

package/dist/generators/react/templates/jest.conf.js.ejs

@@ -1,7 +1,7 @@
 const tsconfig = require('./tsconfig.test.json');
 
 module.exports = {
-  testEnvironment: 'jsdom',
+  testEnvironment: 'jest-fixed-jsdom',
   transform: {
     '^.+\\.tsx?$': [
       'ts-jest',

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

@@ -86,6 +86,7 @@
     "identity-obj-proxy": "<%= nodeDependencies['identity-obj-proxy'] %>",
     "jest": "<%= nodeDependencies['jest'] %>",
     "jest-environment-jsdom": "<%= nodeDependencies['jest-environment-jsdom'] %>",
+    "jest-fixed-jsdom": "<%= nodeDependencies['jest-fixed-jsdom'] %>",
     "jest-junit": "<%= nodeDependencies['jest-junit'] %>",
     "jest-sonar": "<%= nodeDependencies['jest-sonar'] %>",
     "json-loader": "<%= nodeDependencies['json-loader'] %>",
@@ -132,8 +133,6 @@
     "default_environment": "prod"
   },
   "scripts": {
-    "prettier:check": "prettier --check \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
-    "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
     "lint": "eslint .",
     "lint:fix": "<%= clientPackageManager %> run lint -- --fix",
     "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>",

package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs

@@ -25,7 +25,7 @@ import { isAxiosError } from 'axios';
 import { FieldErrorVM, isProblemWithMessage } from 'app/shared/jhipster/problem-details';
 import { getMessageFromHeaders } from 'app/shared/jhipster/headers';
 
-type TostMessage = {
+type ToastMessage = {
   message?: string;
 <%_ if (enableTranslation) { _%>
   key?: string;
@@ -33,7 +33,7 @@ type TostMessage = {
 <%_ } _%>
 };
 
-const addErrorAlert = (message: TostMessage) => {
+const addErrorAlert = (message: ToastMessage) => {
 <%_ if (enableTranslation) { _%>
   toast.error(message.key ? translate(message.key, message.data) ?? message.message : message.message);
 <%_ } else { _%>
@@ -41,7 +41,7 @@ const addErrorAlert = (message: TostMessage) => {
 <%_ } _%>
 };
 
-const getFieldErrorsTosts = (fieldErrors: FieldErrorVM[]): TostMessage[] =>
+const getFieldErrorsToasts = (fieldErrors: FieldErrorVM[]): ToastMessage[] =>
   fieldErrors.map(fieldError => {
     if (['Min', 'Max', 'DecimalMin', 'DecimalMax'].includes(fieldError.message)) {
       fieldError.message = 'Size';
@@ -102,7 +102,7 @@ export default () => next => action => {
         const { data } = response;
         const problem = isProblemWithMessage(data) ? data : null;
         if (problem?.fieldErrors) {
-          getFieldErrorsTosts(problem.fieldErrors).forEach(message => addErrorAlert(message));
+          getFieldErrorsToasts(problem.fieldErrors).forEach(message => addErrorAlert(message));
         } else {
           const { error: toastError<% if (enableTranslation) { %>, param<% } %> } = getMessageFromHeaders((response.headers as any) ?? {});
           if (toastError) {

package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-reducer.spec.ts.ejs

@@ -316,7 +316,7 @@ describe('Entities reducer tests', () => {
 
 <%_ if (!readOnly) { _%>
     it('dispatches CREATE_<%= entityActionName %> actions', async () => {
-      const arg = <%- this.generateTestEntityPrimaryKey(primaryKey, 1) %>;
+      const arg = <%- tsPrimaryKeySamples[1] %>;
 
       const result = await createEntity(arg)(dispatch, getState, extra);
 
@@ -326,7 +326,7 @@ describe('Entities reducer tests', () => {
     });
 
     it('dispatches UPDATE_<%= entityActionName %> actions', async () => {
-      const arg = <%- this.generateTestEntityPrimaryKey(primaryKey, 1) %>;
+      const arg = <%- tsPrimaryKeySamples[1] %>;
 
       const result = await updateEntity(arg)(dispatch, getState, extra);
 
@@ -336,7 +336,7 @@ describe('Entities reducer tests', () => {
     });
 
     it('dispatches PARTIAL_UPDATE_<%= entityActionName %> actions', async () => {
-      const arg = { <%- primaryKey.name %>: <%- this.generateTestEntityId(primaryKey.type) %> };
+      const arg = { <%- primaryKey.name %>: <%- primaryKey.tsSampleValues[0] %> };
 
       const result = await partialUpdateEntity(arg)(dispatch, getState, extra);
 

package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/index.tsx.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import React from 'react';
-import { Route } from 'react-router-dom';
+import { Route } from 'react-router';
 
 import ErrorBoundaryRoutes from 'app/shared/error/error-boundary-routes';
 

package/dist/generators/react/templates/src/main/webapp/app/entities/routes.tsx.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import React from 'react';
-import { Route } from 'react-router-dom';
+import { Route } from 'react-router';
 
 import ErrorBoundaryRoutes from 'app/shared/error/error-boundary-routes';
 

package/dist/generators/react/templates/src/main/webapp/app/modules/account/index.tsx.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import React from 'react';
-import { Route } from 'react-router-dom';
+import { Route } from 'react-router';
 
 import ErrorBoundaryRoutes from 'app/shared/error/error-boundary-routes';
 

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/index.tsx.ejs

@@ -18,7 +18,7 @@
 -%>
 import React from 'react';
 
-import { Route } from 'react-router-dom';
+import { Route } from 'react-router';
 import ErrorBoundaryRoutes from 'app/shared/error/error-boundary-routes';
 <%_ if (generateUserManagement) { _%>
 import UserManagement from './user-management';

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/index.tsx.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import React from 'react';
-import { Route } from 'react-router-dom';
+import { Route } from 'react-router';
 
 import ErrorBoundaryRoutes from 'app/shared/error/error-boundary-routes';
 import UserManagement from './user-management';

package/dist/generators/react/templates/src/main/webapp/app/routes.tsx.ejs

@@ -17,7 +17,10 @@
  limitations under the License.
 -%>
 import React<% if (applicationTypeGateway && microfrontend) { %>, { Suspense }<% } %> from 'react';
-import { Route <% if (communicationSpringWebsocket) { %>, useLocation <% } %>} from 'react-router-dom';
+import { Route } from 'react-router';
+<% if (communicationSpringWebsocket) { %>
+import { useLocation } from 'react-router-dom';
+<% } %>
 import Loadable from 'react-loadable';
 <%_ if (applicationTypeGateway && microfrontend) { _%>
 import { importRemote } from '@module-federation/utilities';

package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.spec.tsx.ejs

@@ -1,5 +1,5 @@
 import React from 'react';
-import { MemoryRouter, Route, Routes } from 'react-router-dom';
+import { MemoryRouter, Route, Routes } from 'react-router';
 import { render } from '@testing-library/react';
 <%_ if (enableTranslation) { _%>
 import { TranslatorContext } from 'react-jhipster';

package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx.ejs

@@ -1,5 +1,5 @@
 import React from 'react';
-import { MemoryRouter, Route } from 'react-router-dom';
+import { MemoryRouter, Route } from 'react-router';
 import { render } from '@testing-library/react';
 
 import ErrorBoundaryRoutes from './error-boundary-routes';

package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary-routes.tsx.ejs

@@ -1,5 +1,6 @@
 import React from 'react';
-import { Outlet, Route, Routes, RoutesProps } from 'react-router-dom';
+import { Routes, Route } from 'react-router';
+import { Outlet, RoutesProps } from 'react-router-dom';
 import ErrorBoundary from 'app/shared/error/error-boundary';
 
 const ErrorBoundaryRoutes = ({ children }: RoutesProps) => {

package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs

@@ -19,10 +19,16 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { Provider } from 'react-redux';
-import { MemoryRouter } from 'react-router-dom';
+import { MemoryRouter } from 'react-router';
 
 import initStore from 'app/config/store';
 import Header from './header';
+<%_ if (applicationTypeGateway && microfrontend) { _%>
+
+jest.mock('@module-federation/utilities', () => ({
+  importRemote: jest.fn(() => Promise.reject(new Error('Test only'))),
+}));
+<%_ } _%>
 
 describe('Header', () => {
   let mountedWrapper;

package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/account.spec.tsx.ejs

@@ -18,7 +18,7 @@
 -%>
 import React from 'react';
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
+import { MemoryRouter } from 'react-router';
 
 
 <%_ if (authenticationTypeOauth2) { _%>

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

@@ -22,11 +22,6 @@
   "exclude": [],
   "compilerOptions": {
     "paths": {
-<%_ if (microfrontend && applicationTypeGateway) { _%>
-  <%_ for (const remote of microfrontends) { _%>
-      "@<%= remote.lowercaseBaseName %>/*": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>microfrontends/*"],
-  <%_ } _%>
-<%_ } _%>
       "app/*": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/*"]
    },
     "types": ["jest", "webpack-env"]

package/dist/generators/react/templates/webpack/webpack.dev.js.ejs

@@ -115,7 +115,7 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
       {
         https: options.tls,
         host: 'localhost',
-        port: 9000,
+        port: <%- devServerPortProxy %>,
         proxy: {
           target: `http${options.tls ? 's' : ''}://localhost:${options.watch ? '<%= applicationTypeMicroservice ? gatewayServerPort : serverPort %>' : '<%= devServerPort %>'}`,
           ws: true,