generator-jhipster 8.6.0 → 8.7.1

package/dist/generators/react/generator.js

@@ -21,34 +21,32 @@ import chalk from 'chalk';
 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 { writeEntitiesFiles, postWriteEntitiesFiles, cleanupEntitiesFiles } from './entity-files-react.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 { 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';
 import cleanupOldFilesTask from './cleanup.js';
 import { writeFiles } from './files-react.js';
 import { prepareEntity } from './application/entities/index.js';
-import { fieldTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js';
-import { generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, generateEntityClientImports as formatEntityClientImports, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, } from '../client/support/index.js';
 import { isTranslatedReactFile, translateReactFilesTransform } from './support/index.js';
-import { createNeedleCallback, upperFirstCamelCase } from '../base/support/index.js';
 const { CommonDBTypes } = fieldTypes;
 const TYPE_BOOLEAN = CommonDBTypes.BOOLEAN;
 const { REACT } = clientFrameworkTypes;
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('../client/types.js').ClientApplication>}
- */
 export default class ReactGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster('jhipster:javascript:bootstrap');
             await this.dependsOnJHipster(GENERATOR_CLIENT);
             await this.dependsOnJHipster(GENERATOR_LANGUAGES);
         }
     }
     get composing() {
         return this.asComposingTaskGroup({
-            async composeClientCommon() {
+            async composing() {
                 await this.composeWithJHipster('jhipster:client:common');
             },
         });
@@ -61,6 +59,12 @@ export default class ReactGenerator extends BaseApplicationGenerator {
             loadPackageJson({ application }) {
                 this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster(GENERATOR_REACT, 'resources', 'package.json'));
             },
+            applicationDefauts({ applicationDefaults }) {
+                applicationDefaults({
+                    __override__: true,
+                    typescriptEslint: true,
+                });
+            },
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
@@ -68,8 +72,15 @@ export default class ReactGenerator extends BaseApplicationGenerator {
     }
     get preparing() {
         return this.asPreparingTaskGroup({
+            applicationDefauts({ application, applicationDefaults }) {
+                application.addPrettierExtensions?.(['html', 'tsx', 'css', 'scss']);
+                applicationDefaults({
+                    __override__: true,
+                    eslintConfigFile: app => `eslint.config.${app.packageJsonType === 'module' ? 'js' : 'mjs'}`,
+                    webappEnumerationsDir: app => `${app.clientSrcDir}app/shared/model/enumerations/`,
+                });
+            },
             prepareForTemplates({ application, source }) {
-                application.webappEnumerationsDir = `${application.clientSrcDir}app/shared/model/enumerations/`;
                 source.addWebpackConfig = args => {
                     const webpackPath = `${application.clientRootDir}webpack/webpack.common.js`;
                     const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
@@ -111,10 +122,16 @@ export default class ReactGenerator extends BaseApplicationGenerator {
         return this.delegateTasksToBlueprint(() => this.default);
     }
     get writing() {
-        return {
+        return this.asWritingTaskGroup({
+            cleanup({ control }) {
+                control.cleanupFiles({
+                    '8.6.1': ['.eslintrc.json', '.eslintignore'],
+                });
+            },
             cleanupOldFilesTask,
+            writeEslintClientRootConfigFile,
             writeFiles,
-        };
+        });
     }
     get [BaseApplicationGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
@@ -195,7 +212,7 @@ export default class ReactGenerator extends BaseApplicationGenerator {
      * @param {boolean} readOnly - If the entity is read-only or not
      * @param {string} pageTitle - The translation key or the text for the page title in the browser
      */
-    addEntityToModule(entityInstance = this.entityInstance, entityClass = this.entityClass, entityName = this.entityAngularName, entityFolderName = this.entityFolderName, entityFileName = this.entityFileName, { applicationTypeMicroservice, clientSrcDir }) {
+    addEntityToModule(entityInstance, entityClass, entityName, entityFolderName, entityFileName, { applicationTypeMicroservice, clientSrcDir }) {
         this.needleApi.clientReact.addEntityToModule(entityInstance, entityClass, entityName, entityFolderName, entityFileName, {
             applicationTypeMicroservice,
             clientSrcDir,

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

@@ -0,0 +1,19 @@
+/**
+ * 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';

package/dist/generators/react/needle-api/needle-client-react.d.ts

@@ -0,0 +1,9 @@
+import needleClientBase from '../../client/needle-api/needle-client.js';
+export default class extends needleClientBase {
+    addAppSCSSStyle(style: string, comment?: string): void;
+    addEntityToMenu(routerName: string, enableTranslation: boolean, entityTranslationKeyMenu: string, entityTranslationValue?: string): void;
+    addEntityToModule(entityInstance: string, entityClass: string, entityName: string, entityFolderName: string, entityFileName: string, { applicationTypeMicroservice, clientSrcDir }: {
+        applicationTypeMicroservice: boolean;
+        clientSrcDir: string;
+    }): void;
+}

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

@@ -1,22 +1,22 @@
 {
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "6.5.2",
-    "@fortawesome/free-solid-svg-icons": "6.5.2",
+    "@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.5",
-    "axios": "1.7.2",
+    "@reduxjs/toolkit": "2.2.7",
+    "axios": "1.7.7",
     "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.52.0",
+    "react-hook-form": "7.53.0",
     "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.23.1",
+    "react-router-dom": "6.26.2",
     "react-toastify": "10.0.5",
     "react-transition-group": "4.4.5",
     "reactstrap": "9.2.2",
@@ -24,34 +24,34 @@
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
     "sonar-scanner": "3.1.0",
-    "tslib": "2.6.3",
+    "tslib": "2.7.0",
     "uuid": "10.0.0",
     "webstomp-client": "1.2.6"
   },
   "devDependencies": {
-    "@module-federation/utilities": "3.0.3-0",
-    "@testing-library/react": "16.0.0",
-    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.5",
+    "@eslint/js": "9.10.0",
+    "@module-federation/utilities": "3.1.12",
+    "@testing-library/react": "16.0.1",
+    "@types/jest": "29.5.13",
+    "@types/lodash": "4.17.7",
     "@types/node": "20.11.25",
-    "@types/react": "18.3.3",
+    "@types/react": "18.3.8",
     "@types/react-dom": "18.3.0",
     "@types/react-redux": "7.1.33",
     "@types/redux": "3.6.31",
     "@types/webpack-env": "1.18.5",
-    "@typescript-eslint/eslint-plugin": "7.13.1",
-    "@typescript-eslint/parser": "7.13.1",
-    "autoprefixer": "10.4.19",
+    "autoprefixer": "10.4.20",
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "12.0.2",
-    "core-js": "3.37.1",
+    "core-js": "3.38.1",
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "8.57.0",
+    "eslint": "9.10.0",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-react": "7.34.3",
+    "eslint-plugin-prettier": "5.2.1",
+    "eslint-plugin-react": "7.36.1",
     "eslint-webpack-plugin": "4.2.0",
     "folder-hash": "4.0.4",
     "fork-ts-checker-webpack-plugin": "9.0.2",
@@ -63,28 +63,29 @@
     "jest-sonar": "0.2.16",
     "json-loader": "0.5.7",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "mini-css-extract-plugin": "2.9.0",
+    "mini-css-extract-plugin": "2.9.1",
     "postcss-loader": "8.1.1",
-    "postcss-rtlcss": "5.3.0",
+    "postcss-rtlcss": "5.4.0",
     "react-infinite-scroll-component": "6.1.0",
     "redux-mock-store": "1.5.4",
-    "rimraf": "5.0.7",
-    "sass": "1.77.6",
-    "sass-loader": "14.2.1",
+    "rimraf": "5.0.8",
+    "sass": "1.79.2",
+    "sass-loader": "16.0.1",
     "simple-progress-webpack-plugin": "2.0.0",
-    "sinon": "18.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",
-    "thread-loader": "4.0.2",
-    "ts-jest": "29.1.5",
+    "thread-loader": "4.0.4",
+    "ts-jest": "29.2.5",
     "ts-loader": "9.5.1",
-    "typescript": "5.5.2",
-    "webpack": "5.92.1",
+    "typescript": "5.6.2",
+    "typescript-eslint": "8.6.0",
+    "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
-    "webpack-dev-server": "5.0.4",
-    "webpack-merge": "5.10.0",
+    "webpack-dev-server": "5.1.0",
+    "webpack-merge": "6.0.1",
     "webpack-notifier": "1.15.0",
     "workbox-webpack-plugin": "7.1.0"
   }

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

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

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

@@ -26,9 +26,6 @@ const CONTENT_TYPE_ATTRIBUTE = 'contentKey=(?:"(?<key>[^"]+)"|\\{[^\\}]+\\})\\s*
 const INTERPOLATE_ATTRIBUTE = 'interpolate=\\{(?<interpolate>\\{[^\\}]+\\})\\}\\s*';
 const COMPONENT_ATTRIBUTE = 'component="(?<component>[^"]+)"\\s*';
 const TRANSLATE_TAG = `<Translate\\s*(?:(?:${COMPONENT_ATTRIBUTE}|${INTERPOLATE_ATTRIBUTE}|${CONTENT_TYPE_ATTRIBUTE})+)>(?<translation>[\\s\\S]*?)<\\/Translate>`;
-function getTranslationValue(getWebappTranslation, key, data) {
-    return getWebappTranslation(key, data) || undefined;
-}
 const replaceTranslationKeysWithText = (getWebappTranslation, body, regexp, { keyPattern, interpolatePattern, wrapTranslation, escapeHtml } = {}) => {
     const matches = body.matchAll(new RegExp(regexp, 'g'));
     if (typeof wrapTranslation === 'string') {
@@ -36,26 +33,26 @@ const replaceTranslationKeysWithText = (getWebappTranslation, body, regexp, { ke
     }
     for (const match of matches) {
         const target = match[0];
-        let key = match.groups && match.groups.key;
+        let key = match.groups?.key;
         if (!key && keyPattern) {
-            const keyMatch = target.match(new RegExp(keyPattern));
-            key = keyMatch && keyMatch.groups && keyMatch.groups.key;
+            const keyMatch = new RegExp(keyPattern).exec(target);
+            key = keyMatch?.groups?.key;
         }
         if (!key) {
             throw new Error(`Translation key not found for ${target}`);
         }
-        let interpolate = match.groups && match.groups.interpolate;
+        let interpolate = match.groups?.interpolate;
         if (!interpolate && interpolatePattern) {
-            const interpolateMatch = target.match(new RegExp(interpolatePattern));
-            interpolate = interpolateMatch && interpolateMatch.groups && interpolateMatch.groups.interpolate;
+            const interpolateMatch = new RegExp(interpolatePattern).exec(target);
+            interpolate = interpolateMatch?.groups?.interpolate;
         }
         let data;
         if (interpolate) {
             const interpolateMatches = interpolate.matchAll(/(?<field>[^{\s:,}]+)(?::\s*(?<value>[^,}]+))?/g);
             data = {};
             for (const interpolateMatch of interpolateMatches) {
-                const field = interpolateMatch.groups.field;
-                let value = interpolateMatch.groups.value;
+                const field = interpolateMatch?.groups?.field;
+                let value = interpolateMatch?.groups?.value;
                 if (value === undefined) {
                     value = key;
                 }
@@ -75,7 +72,7 @@ const replaceTranslationKeysWithText = (getWebappTranslation, body, regexp, { ke
                 data[field] = value;
             }
         }
-        const translation = getTranslationValue(getWebappTranslation, key, data);
+        const translation = getWebappTranslation(key, data);
         let replacement = translation;
         if (!replacement) {
             replacement = wrapTranslation ? `${wrapTranslation[0]}${wrapTranslation[1]}` : '';
@@ -97,7 +94,7 @@ const replaceTranslationKeysWithText = (getWebappTranslation, body, regexp, { ke
  * @return {import('../../base/api.js').EditFileCallback}
  */
 export const createTranslationReplacer = getWebappTranslation => function replaceReactTranslations(body, filePath) {
-    if (/\.tsx$/.test(filePath)) {
+    if (filePath.endsWith('.tsx')) {
         body = body.replace(new RegExp(TRANSLATE_IMPORT, 'g'), '');
         body = replaceTranslationKeysWithText(getWebappTranslation, body, `\\{\\s*${TRANSLATE_FUNCTION}\\s*\\}`, { wrapTranslation: '"' });
         body = replaceTranslationKeysWithText(getWebappTranslation, body, TRANSLATE_FUNCTION, { wrapTranslation: '"' });

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

@@ -0,0 +1,100 @@
+<%#
+ 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.
+-%>
+<&_ if (fragment.importsSection) { -&>
+import eslint from '@eslint/js';
+import react from 'eslint-plugin-react/configs/recommended.js';
+<&_ } -&>
+<&_ if (fragment.configSection) { -&>
+  { ignores: ['<%- this.relativeDir(clientRootDir, clientDistDir) %>', '<%- temporaryDir %>'] },
+  eslint.configs.recommended,
+  {
+    files: ['**/*.{js,cjs,mjs}'],
+    rules: {
+      'no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+    },
+  },
+  {
+    files: ['<%- this.relativeDir(clientRootDir, clientSrcDir) %>**/*.{ts,tsx}'],
+    extends: [...tseslint.configs.recommendedTypeChecked, react],
+    settings: {
+      react: {
+        version: 'detect',
+      },
+    },
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+      },
+      parserOptions: {
+        project: ['./tsconfig.json', './tsconfig.test.json'],
+      },
+    },
+    rules: {
+      '@typescript-eslint/member-ordering': [
+        'error',
+        {
+          default: ['static-field', 'instance-field', 'constructor', 'static-method', 'instance-method'],
+        },
+      ],
+      '@typescript-eslint/no-unused-vars': 'off',
+      '@typescript-eslint/explicit-member-accessibility': 'off',
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-unsafe-argument': 'off',
+      '@typescript-eslint/no-unsafe-return': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
+      '@typescript-eslint/no-unsafe-assignment': 'off',
+      '@typescript-eslint/explicit-module-boundary-types': 'off',
+      '@typescript-eslint/restrict-template-expressions': 'off',
+      '@typescript-eslint/restrict-plus-operands': 'off',
+      '@typescript-eslint/no-floating-promises': 'off',
+      '@typescript-eslint/interface-name-prefix': 'off',
+      '@typescript-eslint/no-empty-function': 'off',
+      '@typescript-eslint/unbound-method': 'off',
+      '@typescript-eslint/array-type': 'off',
+      '@typescript-eslint/no-shadow': 'error',
+      'spaced-comment': ['warn', 'always'],
+      'guard-for-in': 'error',
+      'no-labels': 'error',
+      'no-caller': 'error',
+      'no-bitwise': 'error',
+      'no-console': ['error', { allow: ['warn', 'error'] }],
+      'no-new-wrappers': 'error',
+      'no-eval': 'error',
+      'no-new': 'error',
+      'no-var': 'error',
+      radix: 'error',
+      eqeqeq: ['error', 'always', { null: 'ignore' }],
+      'prefer-const': 'error',
+      'object-shorthand': ['error', 'always', { avoidExplicitReturnArrows: true }],
+      'default-case': 'error',
+      complexity: ['warn', 40],
+      'no-invalid-this': 'off',
+      'react/prop-types': 'off',
+      'react/display-name': 'off',
+    },
+  },
+  {
+    files: ['<%- this.relativeDir(clientRootDir, clientSrcDir) %>**/*.spec.ts'],
+    rules: {
+      '@typescript-eslint/no-empty-function': 'off',
+    },
+  },
+<&_ } -&>

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

@@ -3,11 +3,14 @@ const tsconfig = require('./tsconfig.test.json');
 module.exports = {
   testEnvironment: 'jsdom',
   transform: {
-    '^.+\\.tsx?$': ['ts-jest', {
-      tsconfig: './tsconfig.test.json',
-      compiler: 'typescript',
-      diagnostics: false,
-    }],
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        tsconfig: './tsconfig.test.json',
+        compiler: 'typescript',
+        diagnostics: false,
+      },
+    ],
   },
   testEnvironmentOptions: {
     url: 'http://localhost/',
@@ -16,21 +19,17 @@ module.exports = {
   coverageDirectory: '<rootDir>/<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/',
   testMatch: ['<rootDir>/<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/**/@(*.)@(spec.ts?(x))'],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
-  coveragePathIgnorePatterns: [
-    '<rootDir>/<%= this.relativeDir(clientRootDir, clientTestDir) %>',
-  ],
+  coveragePathIgnorePatterns: ['<rootDir>/<%= this.relativeDir(clientRootDir, clientTestDir) %>'],
   moduleNameMapper: mapTypescriptAliasToJestAlias({
     '\\.(css|scss)$': 'identity-obj-proxy',
-    'sinon': require.resolve('sinon/pkg/sinon.js')
+    sinon: require.resolve('sinon/pkg/sinon.js'),
   }),
   reporters: [
     'default',
     ['jest-junit', { outputDirectory: './<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/', outputName: 'TESTS-results-jest.xml' }],
     ['jest-sonar', { outputDirectory: './<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/jest', outputName: 'TESTS-results-sonar.xml' }],
   ],
-  testPathIgnorePatterns: [
-    '<rootDir>/node_modules/'
-  ],
+  testPathIgnorePatterns: ['<rootDir>/node_modules/'],
   setupFiles: ['<rootDir>/<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/setup-tests.ts'],
   globals: {
 <%_ if (enableTranslation) { _%>
@@ -38,34 +37,34 @@ module.exports = {
 <%_ } _%>
     ...require('./webpack/environment'),
     DEVELOPMENT: false,
-  }
+  },
 };
 
 function mapTypescriptAliasToJestAlias(alias = {}) {
-    const jestAliases = { ...alias };
-    if (!tsconfig.compilerOptions.paths) {
-      return jestAliases;
-    }
-    Object.entries(tsconfig.compilerOptions.paths)
-      .filter(([key, value]) => {
-        // use Typescript alias in Jest only if this has value
-        if (value.length) {
-          return true;
-        }
-        return false;
-      })
-      .map(([key, value]) => {
-        // if Typescript alias ends with /* then in Jest:
-        // - alias key must end with /(.*)
-        // - alias value must end with /$1
-        const regexToReplace = /(.*)\/\*$/;
-        const aliasKey = key.replace(regexToReplace, '$1/(.*)');
-        const aliasValue = value[0].replace(regexToReplace, '$1/$$1');
-        return [aliasKey, `<rootDir>/${aliasValue}`];
-      })
-      .reduce((aliases, [key, value]) => {
-        aliases[key] = value;
-        return aliases;
-      }, jestAliases);
+  const jestAliases = { ...alias };
+  if (!tsconfig.compilerOptions.paths) {
     return jestAliases;
   }
+  Object.entries(tsconfig.compilerOptions.paths)
+    .filter(([_key, value]) => {
+      // use Typescript alias in Jest only if this has value
+      if (value.length) {
+        return true;
+      }
+      return false;
+    })
+    .map(([key, value]) => {
+      // if Typescript alias ends with /* then in Jest:
+      // - alias key must end with /(.*)
+      // - alias value must end with /$1
+      const regexToReplace = /(.*)\/\*$/;
+      const aliasKey = key.replace(regexToReplace, '$1/(.*)');
+      const aliasValue = value[0].replace(regexToReplace, '$1/$$1');
+      return [aliasKey, `<rootDir>/${aliasValue}`];
+    })
+    .reduce((aliases, [key, value]) => {
+      aliases[key] = value;
+      return aliases;
+    }, jestAliases);
+  return jestAliases;
+}

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

@@ -26,6 +26,7 @@
     "node_modules"
   ],
   "dependencies": {
+    "@eslint/js": null,
     "@fortawesome/fontawesome-svg-core": "<%= nodeDependencies['@fortawesome/fontawesome-svg-core'] %>",
     "@fortawesome/free-solid-svg-icons": "<%= nodeDependencies['@fortawesome/free-solid-svg-icons'] %>",
     "@fortawesome/react-fontawesome": "<%= nodeDependencies['@fortawesome/react-fontawesome'] %>",
@@ -70,8 +71,6 @@
     "@types/react-redux": "<%= nodeDependencies['@types/react-redux'] %>",
     "@types/redux": "<%= nodeDependencies['@types/redux'] %>",
     "@types/webpack-env": "<%= nodeDependencies['@types/webpack-env'] %>",
-    "@typescript-eslint/eslint-plugin": "<%= nodeDependencies['@typescript-eslint/eslint-plugin'] %>",
-    "@typescript-eslint/parser": "<%= nodeDependencies['@typescript-eslint/parser'] %>",
     "autoprefixer": "<%= nodeDependencies['autoprefixer'] %>",
     "browser-sync": "<%= nodeDependencies['browser-sync'] %>",
     "browser-sync-webpack-plugin": "<%= nodeDependencies['browser-sync-webpack-plugin'] %>",
@@ -82,6 +81,7 @@
     "css-minimizer-webpack-plugin": "<%= nodeDependencies['css-minimizer-webpack-plugin'] %>",
     "eslint": "<%= nodeDependencies['eslint'] %>",
     "eslint-config-prettier": "<%= nodeDependencies['eslint-config-prettier'] %>",
+    "eslint-plugin-prettier": "<%= nodeDependencies['eslint-plugin-prettier'] %>",
     "eslint-plugin-react": "<%= nodeDependencies['eslint-plugin-react'] %>",
     "eslint-webpack-plugin": "<%= nodeDependencies['eslint-webpack-plugin'] %>",
     "fork-ts-checker-webpack-plugin": "<%= nodeDependencies['fork-ts-checker-webpack-plugin'] %>",
@@ -120,6 +120,7 @@
     "cypress": "<%= nodeDependencies['cypress'] %>",
 <%_ } _%>
     "typescript": "<%= nodeDependencies['typescript'] %>",
+    "typescript-eslint": "<%= nodeDependencies['typescript-eslint'] %>",
     "webpack": "<%= nodeDependencies['webpack'] %>",
     "webpack-cli": "<%= nodeDependencies['webpack-cli'] %>",
     "webpack-dev-server": "<%= nodeDependencies['webpack-dev-server'] %>",
@@ -136,7 +137,7 @@
   "scripts": {
     "prettier:check": "prettier --check \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
     "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
-    "lint": "eslint . --ext .js,.ts,.jsx,.tsx",
+    "lint": "eslint .",
     "lint:fix": "<%= clientPackageManager %> run lint -- --fix",
     "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>",
     "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>",

package/dist/generators/react/templates/postcss.config.js.ejs

@@ -17,7 +17,5 @@
  limitations under the License.
 -%>
 module.exports = {
-  plugins: [
-    require('autoprefixer')
-  ]
+  plugins: [require('autoprefixer')],
 };

package/dist/generators/react/templates/src/main/webapp/app/_bootstrap-variables.scss.ejs

@@ -26,23 +26,23 @@
 <%_ if (clientThemeNone) { _%>
 // Options:
 // Quickly modify global styling by enabling or disabling optional features.
-$enable-rounded:            true;
-$enable-shadows:            false;
-$enable-gradients:          false;
-$enable-transitions:        true;
-$enable-hover-media-query:  false;
-$enable-grid-classes:       true;
-$enable-print-styles:       true;
+$enable-rounded: true;
+$enable-shadows: false;
+$enable-gradients: false;
+$enable-transitions: true;
+$enable-hover-media-query: false;
+$enable-grid-classes: true;
+$enable-print-styles: true;
 
 // Components:
 // Define common padding and border radius sizes and more.
 
-$border-radius:          .15rem;
-$border-radius-lg:       .125rem;
-$border-radius-sm:       .1rem;
+$border-radius: 0.15rem;
+$border-radius-lg: 0.125rem;
+$border-radius-sm: 0.1rem;
 
 // Body:
 // Settings for the `<body>` element.
 
-$body-bg:                   #ffffff;
+$body-bg: #ffffff;
 <%_ } _%>