generator-jhipster 8.6.0 → 8.7.0

package/dist/generators/bootstrap-application-client/generator.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties, filterEntitiesAndPropertiesForClient, filterEntitiesForClient, } from '../client/support/index.js';
+import { filterEntitiesAndPropertiesForClient, filterEntitiesForClient, loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties, } from '../client/support/index.js';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import clientCommand from '../client/command.js';

package/dist/generators/bootstrap-application-server/generator.js

@@ -19,7 +19,7 @@
 import BaseApplicationGenerator from '../base-application/index.js';
 import { JAVA_VERSION, MAIN_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, TEST_DIR, dockerContainers, } from '../generator-constants.js';
 import { loadRequiredConfigIntoEntity, prepareEntityPrimaryKeyForTemplates } from '../base-application/support/index.js';
-import { loadRequiredConfigDerivedProperties, prepareEntity as prepareEntityServerForTemplates, addEntitiesOtherRelationships, hibernateSnakeCase, loadServerConfig, loadDerivedServerConfig, prepareRelationship, } from '../server/support/index.js';
+import { addEntitiesOtherRelationships, hibernateSnakeCase, loadDerivedServerConfig, loadRequiredConfigDerivedProperties, loadServerConfig, prepareEntity as prepareEntityServerForTemplates, prepareRelationship, } from '../server/support/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/index.js';
 import { getPomVersionProperties } from '../maven/support/index.js';
 import { prepareField as prepareFieldForLiquibaseTemplates } from '../liquibase/support/index.js';

package/dist/generators/ci-cd/command.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import { kebabCase, intersection } from 'lodash-es';
+import { intersection, kebabCase } from 'lodash-es';
 const includesValue = (prop, values) => answers => answers[prop] && intersection(answers[prop], values).length > 0;
 const command = {
     options: {},
@@ -168,7 +168,7 @@ const command = {
                 message: `${chalk.yellow('*Heroku*')}: name of your Heroku Application ?`,
             },
             scope: 'generator',
-            default: config => kebabCase(config.jhipsterConfigWithDefaults.baseName),
+            default: gen => kebabCase(gen.jhipsterConfigWithDefaults.baseName),
         },
     },
 };

package/dist/generators/ci-cd/generator.js

@@ -16,13 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable consistent-return */
 import chalk from 'chalk';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { createPomStorage } from '../maven/support/pom-store.js';
-import command from './command.js';
 import { loadConfig, loadDerivedConfig } from '../../lib/internal/config-def.js';
+import command from './command.js';
 const { REACT } = clientFrameworkTypes;
 export default class CiCdGenerator extends BaseApplicationGenerator {
     insideDocker;
@@ -40,26 +39,12 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
             sayHello() {
                 this.log.log(chalk.white('🚀 Welcome to the JHipster CI/CD Sub-Generator 🚀'));
             },
-            getConfig() {
-                this.parseJHipsterCommand(command);
-            },
         });
     }
     get [BaseApplicationGenerator.INITIALIZING]() {
         return this.delegateTasksToBlueprint(() => this.initializing);
     }
     // Public API method used by the getter and also by Blueprints
-    get prompting() {
-        return this.asPromptingTaskGroup({
-            async prompting() {
-                await this.prompt(this.prepareQuestions(command.configs));
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
-    // Public API method used by the getter and also by Blueprints
     get loading() {
         return {
             loadSharedConfig({ application }) {
@@ -172,4 +157,7 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.POST_WRITING]() {
         return this.delegateTasksToBlueprint(() => this.postWriting);
     }
+    shouldAskForPrompts() {
+        return true;
+    }
 }

package/dist/generators/ci-cd/index.js

@@ -17,3 +17,4 @@
  * limitations under the License.
  */
 export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/client/files-common.js

@@ -16,17 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientRootTemplatesBlock, clientSrcTemplatesBlock } from './support/files.js';
 import { clientFrameworkTypes } from '../../jdl/index.js';
+import { clientRootTemplatesBlock, clientSrcTemplatesBlock } from './support/files.js';
 const { ANGULAR, REACT, VUE } = clientFrameworkTypes;
 export const files = {
     common: [
         {
             templates: ['README.md.jhi.client', '.prettierignore.jhi.client'],
         },
-        clientRootTemplatesBlock({
-            templates: ['.eslintignore'],
-        }),
         clientRootTemplatesBlock({
             condition: generator => generator.microfrontend && (generator.clientFrameworkVue || generator.clientFrameworkReact),
             templates: ['webpack/webpack.microfrontend.js.jhi'],

package/dist/generators/client/generator.js

@@ -17,19 +17,17 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { askForClientTheme, askForClientThemeVariant } from './prompts.js';
-import { writeFiles as writeCommonFiles } from './files-common.js';
-import { addEnumerationFiles } from './entity-files.js';
 import { LOGIN_REGEX_JS } from '../generator-constants.js';
-import { GENERATOR_CYPRESS, GENERATOR_COMMON, GENERATOR_CLIENT } from '../generator-list.js';
-import { testFrameworkTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js';
+import { GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_CYPRESS } from '../generator-list.js';
+import { clientFrameworkTypes, testFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { createNeedleCallback } from '../base/support/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
-import command from './command.js';
+import { addEnumerationFiles } from './entity-files.js';
+import { writeFiles as writeCommonFiles } from './files-common.js';
+import { askForClientTheme, askForClientThemeVariant } from './prompts.js';
 const { ANGULAR, VUE, REACT, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const { CYPRESS } = testFrameworkTypes;
 export default class JHipsterClientGenerator extends BaseApplicationGenerator {
-    command = command;
     async beforeQueue() {
         loadStoredAppOptions.call(this);
         if (!this.fromBlueprint) {
@@ -41,23 +39,8 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster(GENERATOR_COMMON);
         }
     }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            loadOptions() {
-                this.parseJHipsterCommand(this.command);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
     get prompting() {
         return this.asPromptingTaskGroup({
-            async prompting({ control }) {
-                if (control.existingProject && this.options.askAnswered !== true)
-                    return;
-                await this.prompt(this.prepareQuestions(this.command.configs));
-            },
             askForClientTheme,
             askForClientThemeVariant,
         });

package/dist/generators/client/generators/common/generator.js

@@ -27,38 +27,6 @@ export default class CommonGenerator extends BaseApplicationGenerator {
             await this.dependsOnBootstrapApplication();
         }
     }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
-    get prompting() {
-        return this.asPromptingTaskGroup({
-            async promptCommand({ control }) {
-                if (control.existingProject && this.options.askAnswered !== true)
-                    return;
-                await this.promptCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
-    get loading() {
-        return this.asLoadingTaskGroup({
-            async loadConfig({ application }) {
-                await this.loadCurrentJHipsterCommandConfig(application);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.LOADING]() {
-        return this.delegateTasksToBlueprint(() => this.loading);
-    }
     get writing() {
         return this.asWritingTaskGroup({
             async writing({ application }) {

package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs

@@ -36,7 +36,7 @@ const headerToString = (headerValue: any): string => {
     throw new Error('Header value is not a string');
   }
   return headerValue;
-}
+};
 
 const decodeHeaderValue = (headerValue: string): string => decodeURIComponent(headerValue.replace(/\+/g, ' '));
 

package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs

@@ -31,7 +31,7 @@ export type ProblemDetails = {
   detail: string;
   /** A URI reference that identifies the specific occurrence of the problem */
   instance: string;
-}
+};
 
 export const ProblemWithMessageType = 'https://www.jhipster.tech/problem/problem-with-message';
 

package/dist/generators/client/needle-api/needle-client-vue.js

@@ -18,9 +18,9 @@
  */
 import chalk from 'chalk';
 import { startCase } from 'lodash-es';
-import needleClientBase from './needle-client.js';
 import { stripMargin } from '../../base/support/index.js';
 import { createNeedleCallback } from '../../base/support/needles.js';
+import needleClientBase from './needle-client.js';
 export default class extends needleClientBase {
     addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue = startCase(routerName)) {
         const ignoreNonExisting = this.generator.sharedData.getControl().ignoreNeedlesError &&

package/dist/generators/client/prompts.js

@@ -109,7 +109,7 @@ async function _retrieveBootswatchThemes(generator, useApi) {
                 }));
                 resolve(bootswatchChoices);
             }
-            catch (err) {
+            catch {
                 reject(errorMessage);
             }
         }, () => {

package/dist/generators/client/resources/package.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "dayjs": "1.11.11"
+    "dayjs": "1.11.13"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.12.39",
+    "@cypress/code-coverage": "3.12.45",
     "babel-loader": "9.1.3",
-    "babel-plugin-istanbul": "6.1.1",
-    "cypress": "13.12.0",
+    "babel-plugin-istanbul": "7.0.0",
+    "cypress": "13.13.3",
     "cypress-audit": "1.1.0",
-    "eslint-plugin-cypress": "3.3.0",
-    "lighthouse": "12.1.0",
+    "eslint-plugin-cypress": "3.5.0",
+    "lighthouse": "12.2.0",
     "nyc": "17.0.0",
     "swagger-ui-dist": "5.17.14"
   }

package/dist/generators/client/support/entity-definition.js

@@ -16,8 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { clientFrameworkTypes, fieldTypes, validations } from '../../../jdl/jhipster/index.js';
 import getTypescriptKeyType from './types-utils.js';
-import { fieldTypes, validations, clientFrameworkTypes } from '../../../jdl/jhipster/index.js';
 import { filterRelevantRelationships } from './template-utils.js';
 const dbTypes = fieldTypes;
 const { Validations: { REQUIRED }, } = validations;

package/dist/generators/client/support/files.js

@@ -36,7 +36,7 @@ export function clientTestTemplatesBlock(blockOrRelativePath = '') {
 function clientBlock({ srcPath, destProperty, blockOrRelativePath = '', relativeToSrc = '', }) {
     const block = typeof blockOrRelativePath !== 'string' ? blockOrRelativePath : undefined;
     const blockRenameTo = typeof block?.renameTo === 'function' ? block.renameTo : undefined;
-    const relativePath = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : blockOrRelativePath.relativePath ?? '';
+    const relativePath = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : (blockOrRelativePath.relativePath ?? '');
     return {
         path: `${srcPath}${relativeToSrc}${relativePath}`,
         ...block,

package/dist/generators/client/support/template-utils.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import path from 'path';
-import { fieldTypes, clientFrameworkTypes } from '../../../jdl/jhipster/index.js';
+import { clientFrameworkTypes, fieldTypes } from '../../../jdl/jhipster/index.js';
 import { getEntryIfTypeOrTypeAttribute } from './types-utils.js';
 const { STRING: TYPE_STRING, UUID: TYPE_UUID } = fieldTypes.CommonDBTypes;
 const { ANGULAR, VUE } = clientFrameworkTypes;

package/dist/generators/client/support/update-languages.js

@@ -5,7 +5,6 @@
  * @param configurationFile
  * @param commonjs
  */
-// eslint-disable-next-line import/prefer-default-export
 export function updateLanguagesInDayjsConfigurationTask({ application, control = {} }, { configurationFile, commonjs = false }) {
     const { languagesDefinition = [] } = application;
     const { ignoreNeedlesError: ignoreNonExisting } = control;

package/dist/generators/client/templates/src/main/webapp/index.html.ejs

@@ -39,7 +39,8 @@
   <body>
     <!--[if lt IE 9]>
       <p class="browserupgrade">
-        You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.
+        You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve
+        your experience.
       </p>
     <![endif]-->
 <%_ if (clientFrameworkAngular) { _%>
@@ -49,8 +50,16 @@
 <%_ } _%>
       <div class="app-loading">
         <div class="lds-pacman">
-          <div><div></div><div></div><div></div></div>
-          <div><div></div><div></div><div></div></div>
+          <div>
+            <div></div>
+            <div></div>
+            <div></div>
+          </div>
+          <div>
+            <div></div>
+            <div></div>
+            <div></div>
+          </div>
         </div>
       </div>
       <div class="app-loading">
@@ -76,15 +85,22 @@
 
           <h3>If you have a question on how to use JHipster</h3>
           <p>
-            Go to Stack Overflow with the <a href="http://stackoverflow.com/tags/jhipster" target="_blank" rel="noopener noreferrer">"jhipster"</a> tag.
+            Go to Stack Overflow with the
+            <a href="http://stackoverflow.com/tags/jhipster" target="_blank" rel="noopener noreferrer">"jhipster"</a> tag.
           </p>
 
           <h3>If you have a bug or a feature request</h3>
           <p>
-            First read our <a href="https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md" target="_blank" rel="noopener noreferrer">contributing guidelines</a>.
+            First read our
+            <a href="https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md" target="_blank" rel="noopener noreferrer"
+              >contributing guidelines</a
+            >.
           </p>
           <p>
-            Then, fill a ticket on our <a href="https://github.com/jhipster/generator-jhipster/issues/new/choose" target="_blank" rel="noopener noreferrer">bug tracker</a>, we'll be happy to resolve your issue!
+            Then, fill a ticket on our
+            <a href="https://github.com/jhipster/generator-jhipster/issues/new/choose" target="_blank" rel="noopener noreferrer"
+              >bug tracker</a
+            >, we'll be happy to resolve your issue!
           </p>
 
           <h3>If you want to chat with contributors and other users</h3>

package/dist/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs

@@ -79,11 +79,15 @@
 
       async function fetchUrls(serverBaseUri, axiosConfig, baseUrl) {
         let urls;
-<%_ if (!applicationTypeMonolith && serviceDiscoveryAny) { _%>
+<%_ if ((!applicationTypeMonolith && serviceDiscoveryAny) || (gatewayRoutes ?? []).length > 0) { _%>
 
         try {
+  <%_ if ((gatewayRoutes ?? []).length > 0) { _%>
+          const services = [<%- [{ route: lowercaseBaseName }, ...(gatewayRoutes ?? [])].map(({ route }) => `'${route}'`) %>];
+  <%_ } else { _%>
           const response = await axios.get('/management/health/discoveryComposite', axiosConfig);
           const services = response.data?.components?.discoveryClient?.details?.services<% if (serviceDiscoveryConsul) { %>.filter(service => service !== 'consul')<% } %>;
+  <%_ } _%>
           console.log(`Services`, services);
 
           if (services && services.length > 0) {
@@ -169,10 +173,7 @@
             req.headers['Authorization'] = getBearerToken();
 <%_ } _%>
             // Remove the sample Swagger UI request body if present
-            if (
-              req.method === 'GET' &&
-              req.body === '{"additionalProp1":"string","additionalProp2":"string","additionalProp3":"string"}'
-            ) {
+            if (req.method === 'GET' && req.body === '{"additionalProp1":"string","additionalProp2":"string","additionalProp3":"string"}') {
               req.body = undefined;
             }
             return req;

package/dist/generators/client/templates/webpack/webpack.microfrontend.js.jhi.ejs

@@ -42,7 +42,7 @@ const shareDependencies = ({ skipList = [] } = {}) =>
       .map(([dependency, version]) => [dependency, { ...sharedDefaults, version, requiredVersion: version }]),
   );
 
-module.exports = ({ serve }) => {
+module.exports = () => {
   return {
     optimization: {
       moduleIds: 'named',

package/dist/generators/common/command.js

@@ -1,17 +1,5 @@
 import { GENERATOR_BOOTSTRAP_APPLICATION_BASE } from '../generator-list.js';
 const command = {
-    options: {
-        prettierTabWidth: {
-            description: 'Default tab width for prettier',
-            type: Number,
-            scope: 'storage',
-        },
-        skipCommitHook: {
-            description: 'Skip adding husky commit hooks',
-            type: Boolean,
-            scope: 'storage',
-        },
-    },
     configs: {
         defaultEnvironment: {
             description: 'Default environment for the application',
@@ -25,6 +13,6 @@ const command = {
             scope: 'storage',
         },
     },
-    import: [GENERATOR_BOOTSTRAP_APPLICATION_BASE],
+    import: [GENERATOR_BOOTSTRAP_APPLICATION_BASE, 'jhipster:javascript:prettier', 'jhipster:javascript:husky'],
 };
 export default command;

package/dist/generators/common/files.js

@@ -20,17 +20,10 @@
  * The default is to use a file path string. It implies use of the template method.
  * For any other config an object { file:.., method:.., template:.. } can be used
  */
-export const prettierConfigFiles = {
-    global: [
-        {
-            templates: ['.prettierrc', '.prettierignore.jhi'],
-        },
-    ],
-};
 export const commonFiles = {
     global: [
         {
-            templates: ['README.md.jhi', '.editorconfig'],
+            templates: ['README.md.jhi', '.editorconfig.jhi'],
         },
     ],
     sonar: [
@@ -38,12 +31,6 @@ export const commonFiles = {
             templates: ['sonar-project.properties'],
         },
     ],
-    commitHooks: [
-        {
-            condition: generator => !generator.skipCommitHook,
-            templates: ['.lintstagedrc.cjs', '.husky/pre-commit'],
-        },
-    ],
 };
 export function writeFiles() {
     return {

package/dist/generators/common/generator.js

@@ -16,16 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable consistent-return */
 import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { writeFiles, prettierConfigFiles } from './files.js';
-import { MAIN_DIR, TEST_DIR, SERVER_MAIN_RES_DIR, JHIPSTER_DOCUMENTATION_URL, JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, } from '../generator-constants.js';
+import { JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, JHIPSTER_DOCUMENTATION_URL, MAIN_DIR, SERVER_MAIN_RES_DIR, TEST_DIR, } from '../generator-constants.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { GENERATOR_COMMON, GENERATOR_GIT } from '../generator-list.js';
-import command from './command.js';
 import { createPrettierTransform } from '../bootstrap/support/prettier-support.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
+import command from './command.js';
+import { writeFiles } from './files.js';
 const { REACT, ANGULAR } = clientFrameworkTypes;
 export default class CommonGenerator extends BaseApplicationGenerator {
     command = command;
@@ -39,28 +38,6 @@ export default class CommonGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster(GENERATOR_GIT);
         }
     }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            async loadOptions() {
-                await this.parseCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
-    get prompting() {
-        return this.asPromptingTaskGroup({
-            async prompting({ control }) {
-                if (control.existingProject && this.options.askAnswered !== true)
-                    return;
-                await this.promptCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
     // Public API method used by the getter and also by Blueprints
     get configuring() {
         return {
@@ -82,6 +59,19 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.CONFIGURING]() {
         return this.delegateTasksToBlueprint(() => this.configuring);
     }
+    get composing() {
+        return this.asComposingTaskGroup({
+            async composing() {
+                await this.composeWithJHipster('jhipster:javascript:prettier');
+                if (!this.jhipsterConfig.skipCommitHook) {
+                    await this.composeWithJHipster('jhipster:javascript:husky');
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.COMPOSING]() {
+        return this.delegateTasksToBlueprint(() => this.composing);
+    }
     get configuringEachEntity() {
         return this.asConfiguringEachEntityTaskGroup({
             migrateEntity({ entityConfig, entityStorage }) {
@@ -117,9 +107,6 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     // Public API method used by the getter and also by Blueprints
     get loading() {
         return this.asLoadingTaskGroup({
-            async loadCommand({ application }) {
-                await this.loadCurrentJHipsterCommandConfig(application);
-            },
             loadPackageJson({ application }) {
                 this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster(GENERATOR_COMMON, 'resources', 'package.json'));
             },
@@ -173,33 +160,16 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     }
     // Public API method used by the getter and also by Blueprints
     get writing() {
-        return {
-            cleanup({ application }) {
-                if (this.isJhipsterVersionLessThan('7.1.1')) {
-                    if (!application.skipCommitHook) {
-                        this.removeFile('.huskyrc');
-                    }
-                }
-                if (this.isJhipsterVersionLessThan('7.6.1')) {
-                    if (application.skipClient) {
-                        this.removeFile('npmw');
-                        this.removeFile('npmw.cmd');
-                    }
-                }
-                if (this.isJhipsterVersionLessThan('8.0.0-rc.2')) {
-                    if (!application.skipCommitHook) {
-                        this.removeFile('.lintstagedrc.js');
-                    }
-                }
-            },
-            writePrettierConfig({ application }) {
-                return this.writeFiles({
-                    sections: prettierConfigFiles,
-                    context: application,
+        return this.asWritingTaskGroup({
+            cleanup({ application, control }) {
+                control.cleanupFiles({
+                    '7.1.1': [[!application.skipCommitHook, '.huskyrc']],
+                    '7.6.1': [[application.skipClient, 'npmw', 'npmw.cmd']],
+                    '8.0.0-rc.2': [[!application.skipCommitHook, '.lintstagedrc.js']],
                 });
             },
             ...writeFiles(),
-        };
+        });
     }
     get [BaseApplicationGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
@@ -222,28 +192,6 @@ export default class CommonGenerator extends BaseApplicationGenerator {
                     },
                 });
             },
-            addCommitHookDependencies({ application }) {
-                if (application.skipCommitHook)
-                    return;
-                this.packageJson.merge({
-                    scripts: {
-                        prepare: 'husky',
-                    },
-                    devDependencies: {
-                        husky: application.nodeDependencies.husky,
-                        'lint-staged': application.nodeDependencies['lint-staged'],
-                        prettier: application.nodeDependencies.prettier,
-                        'prettier-plugin-packagejson': application.nodeDependencies['prettier-plugin-packagejson'],
-                    },
-                });
-                if (application.backendTypeJavaAny) {
-                    this.packageJson.merge({
-                        devDependencies: {
-                            'prettier-plugin-java': application.nodeDependencies['prettier-plugin-java'],
-                        },
-                    });
-                }
-            },
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {

package/dist/generators/common/resources/package.json

@@ -1,9 +1,7 @@
 {
   "devDependencies": {
     "concurrently": "8.2.2",
-    "husky": "9.0.11",
-    "lint-staged": "15.2.7",
-    "npm": "10.8.1",
-    "wait-on": "7.2.0"
+    "npm": "10.8.2",
+    "wait-on": "8.0.0"
   }
 }

package/dist/generators/common/templates/{.editorconfig.ejs → .editorconfig.jhi.ejs}

@@ -14,10 +14,9 @@ insert_final_newline = true
 
 # Change these settings to your own preference
 indent_style = space
-indent_size = 4
-
-[*.{ts,tsx,js,jsx,json,css,scss,yml,html,vue}]
-indent_size = 2
+indent_size = <%= prettierTabWidth %>
 
 [*.md]
 trim_trailing_whitespace = false
+
+<&- fragments.render({ join: '\n\n' }) &>