fix: allow applying other front module after vitest config being formatted with prettier

src/main/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java

@@ -1,5 +1,8 @@
 package tech.jhipster.lite.generator.client.react.core.domain;
 
+import static tech.jhipster.lite.generator.typescript.common.domain.EslintShortcuts.eslintTypescriptRule;
+import static tech.jhipster.lite.generator.typescript.common.domain.TsConfigShortcuts.tsConfigCompilerOption;
+import static tech.jhipster.lite.generator.typescript.common.domain.VitestShortcuts.vitestCoverageExclusion;
 import static tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder;
 import static tech.jhipster.lite.module.domain.JHipsterModule.LINE_BREAK;
 import static tech.jhipster.lite.module.domain.JHipsterModule.from;
@@ -19,13 +22,11 @@
 import static tech.jhipster.lite.module.domain.replacement.ReplacementCondition.always;
 
 import java.util.function.Consumer;
-import tech.jhipster.lite.module.domain.Indentation;
 import tech.jhipster.lite.module.domain.JHipsterModule;
 import tech.jhipster.lite.module.domain.file.JHipsterDestination;
 import tech.jhipster.lite.module.domain.file.JHipsterSource;
 import tech.jhipster.lite.module.domain.npm.NpmLazyInstaller;
 import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties;
-import tech.jhipster.lite.module.domain.replacement.MandatoryReplacer;
 
 public class ReactCoreModulesFactory {
 
@@ -142,10 +143,6 @@ private Consumer<JHipsterModuleBuilder> patchEslintConfig(JHipsterModuleProperti
             .add(
               regex("[ \\t]+quotes: \\['error', 'single', \\{ avoidEscape: true }],"),
               """
-              \t\t\t'react/react-in-jsx-scope': 'off',
-              \t\t\t'@typescript-eslint/no-explicit-any': 'off',
-              \t\t\t'@typescript-eslint/await-thenable': 'off',
-              \t\t\t'@typescript-eslint/consistent-type-imports': 'error',
               \t\t\t'@typescript-eslint/no-misused-promises': [
               \t\t\t\t'error',
               \t\t\t\t{
@@ -155,7 +152,11 @@ private Consumer<JHipsterModuleBuilder> patchEslintConfig(JHipsterModuleProperti
               """.replace("\t", properties.indentation().spaces())
             )
           .and()
-          .and();
+        .and()
+      .apply(eslintTypescriptRule("'@typescript-eslint/consistent-type-imports': 'error'", properties.indentation()))
+      .apply(eslintTypescriptRule("'@typescript-eslint/await-thenable': 'off'", properties.indentation()))
+      .apply(eslintTypescriptRule("'@typescript-eslint/no-explicit-any': 'off'", properties.indentation()))
+      .apply(eslintTypescriptRule("'react/react-in-jsx-scope': 'off'", properties.indentation()));
     //@formatter:on
   }
 
@@ -167,20 +168,15 @@ private Consumer<JHipsterModuleBuilder> patchTsConfig(JHipsterModuleProperties p
       .mandatoryReplacements()
         .in(path("tsconfig.json"))
           .add(text("@tsconfig/recommended/tsconfig.json"), "@tsconfig/vite-react/tsconfig.json")
-          .add(tsConfigCompilerOption("composite", false, properties.indentation()))
-          .add(tsConfigCompilerOption("forceConsistentCasingInFileNames", true, properties.indentation()))
-          .add(tsConfigCompilerOption("allowSyntheticDefaultImports", true, properties.indentation()))
           .add(text(DEFAULT_TSCONFIG_PATH), pathsReplacement)
           .and()
-      .and();
+      .and()
+      .apply(tsConfigCompilerOption("composite", false, properties.indentation()))
+      .apply(tsConfigCompilerOption("forceConsistentCasingInFileNames", true, properties.indentation()))
+      .apply(tsConfigCompilerOption("allowSyntheticDefaultImports", true, properties.indentation()));
     //@formatter:on
   }
 
-  private static MandatoryReplacer tsConfigCompilerOption(String optionName, boolean optionValue, Indentation indentation) {
-    String compilerOption = indentation.times(2) + "\"%s\": %s,".formatted(optionName, optionValue);
-    return new MandatoryReplacer(lineAfterRegex("\"compilerOptions\":"), compilerOption);
-  }
-
   private Consumer<JHipsterModuleBuilder> patchVitestConfig(JHipsterModuleProperties properties) {
     //@formatter:off
     return moduleBuilder -> moduleBuilder
@@ -189,14 +185,10 @@ private Consumer<JHipsterModuleBuilder> patchVitestConfig(JHipsterModuleProperti
           .add(lineAfterRegex("from 'vitest/config';"), "import react from '@vitejs/plugin-react';")
           .add(text("plugins: ["), "plugins: [react(), ")
           .add(text("environment: 'node',"), "environment: 'jsdom',")
-          .add(vitestCoverageExclusion(properties,"src/main/webapp/app/index.tsx"))
-          .add(vitestCoverageExclusion(properties,"src/main/webapp/app/injections.ts"))
-          .and();
+          .and()
+      .and()
+      .apply(vitestCoverageExclusion("src/main/webapp/app/index.tsx"))
+      .apply(vitestCoverageExclusion("src/main/webapp/app/injections.ts"));
     //@formatter:on
   }
-
-  private static MandatoryReplacer vitestCoverageExclusion(JHipsterModuleProperties properties, String filePattern) {
-    Indentation indentation = properties.indentation();
-    return new MandatoryReplacer(lineAfterRegex("configDefaults.coverage.exclude"), indentation.times(4) + "'" + filePattern + "',");
-  }
 }

src/main/java/tech/jhipster/lite/generator/client/react/i18n/domain/ReactI18nModuleFactory.java

@@ -1,5 +1,6 @@
 package tech.jhipster.lite.generator.client.react.i18n.domain;
 
+import static tech.jhipster.lite.generator.typescript.common.domain.VitestShortcuts.vitestCoverageExclusion;
 import static tech.jhipster.lite.module.domain.JHipsterModule.LINE_BREAK;
 import static tech.jhipster.lite.module.domain.JHipsterModule.append;
 import static tech.jhipster.lite.module.domain.JHipsterModule.from;
@@ -75,10 +76,8 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
              });
            });""" )
         .and()
-        .in(path("./vitest.config.ts"))
-          .add(lineAfterText("'src/main/webapp/app/index.tsx',"), properties.indentation().times(4) + "'src/main/webapp/app/i18n.ts',")
-        .and()
       .and()
+      .apply(vitestCoverageExclusion("src/main/webapp/app/i18n.ts"))
       .build();
     //@formatter:off
   }

src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java

@@ -1,5 +1,8 @@
 package tech.jhipster.lite.generator.client.vue.core.domain;
 
+import static tech.jhipster.lite.generator.typescript.common.domain.EslintShortcuts.eslintTypescriptRule;
+import static tech.jhipster.lite.generator.typescript.common.domain.TsConfigShortcuts.tsConfigCompilerOption;
+import static tech.jhipster.lite.generator.typescript.common.domain.VitestShortcuts.vitestCoverageExclusion;
 import static tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder;
 import static tech.jhipster.lite.module.domain.JHipsterModule.documentationTitle;
 import static tech.jhipster.lite.module.domain.JHipsterModule.from;
@@ -18,13 +21,11 @@
 import static tech.jhipster.lite.module.domain.npm.JHLiteNpmVersionSource.VUE;
 
 import java.util.function.Consumer;
-import tech.jhipster.lite.module.domain.Indentation;
 import tech.jhipster.lite.module.domain.JHipsterModule;
 import tech.jhipster.lite.module.domain.file.JHipsterDestination;
 import tech.jhipster.lite.module.domain.file.JHipsterSource;
 import tech.jhipster.lite.module.domain.npm.NpmLazyInstaller;
 import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties;
-import tech.jhipster.lite.module.domain.replacement.MandatoryReplacer;
 import tech.jhipster.lite.shared.error.domain.Assert;
 
 public class VueModulesFactory {
@@ -122,7 +123,7 @@ public JHipsterModule buildVueModule(JHipsterModuleProperties properties) {
         .and()
       .apply(patchEslintConfig(properties))
       .apply(patchTsConfig(properties))
-      .apply(patchVitestConfig(properties))
+      .apply(patchVitestConfig())
       .build();
     //@formatter:on
   }
@@ -146,59 +147,46 @@ private Consumer<JHipsterModuleBuilder> patchEslintConfig(JHipsterModuleProperti
           .add(lineAfterRegex("from '@eslint/js'"), "import vue from 'eslint-plugin-vue';")
           .add(lineAfterRegex("...typescript.configs.recommended"), vuePluginConfig)
           .add(text("files: ['src/*/webapp/**/*.ts']"), "files: ['src/*/webapp/**/*.vue', 'src/*/webapp/**/*.ts']")
-          .add(eslintTypescriptVueRule("'vue/html-self-closing': 'off',", properties.indentation()))
-          .add(eslintTypescriptVueRule("'@typescript-eslint/no-explicit-any': 'off',", properties.indentation()))
-          .add(eslintTypescriptVueRule("'@typescript-eslint/no-empty-object-type': 'off',", properties.indentation()))
-          .add(eslintTypescriptVueRule("'@typescript-eslint/consistent-type-imports': 'error',", properties.indentation()))
           .and()
-        .and();
+        .and()
+      .apply(eslintTypescriptRule("'vue/html-self-closing': 'off'", properties.indentation()))
+      .apply(eslintTypescriptRule("'@typescript-eslint/no-explicit-any': 'off'", properties.indentation()))
+      .apply(eslintTypescriptRule("'@typescript-eslint/no-empty-object-type': 'off'", properties.indentation()))
+      .apply(eslintTypescriptRule("'@typescript-eslint/consistent-type-imports': 'error'", properties.indentation()));
     //@formatter:on
   }
 
-  private static MandatoryReplacer eslintTypescriptVueRule(String rule, Indentation indentation) {
-    return new MandatoryReplacer(lineAfterRegex("quotes: \\['error', 'single'"), indentation.times(3) + rule);
-  }
-
   private Consumer<JHipsterModuleBuilder> patchTsConfig(JHipsterModuleProperties properties) {
     //@formatter:off
     return moduleBuilder -> moduleBuilder
       .mandatoryReplacements()
         .in(path("tsconfig.json"))
           .add(text("@tsconfig/recommended/tsconfig.json"), "@vue/tsconfig/tsconfig.dom.json")
-          .add(tsConfigCompilerOption("sourceMap", true, properties.indentation()))
-          .add(tsConfigCompilerOption("allowJs", true, properties.indentation()))
           .add(text("\"types\": ["), "\"types\": [\"vite/client\", ")
           .and()
-        .and();
+        .and()
+      .apply(tsConfigCompilerOption("sourceMap", true, properties.indentation()))
+      .apply(tsConfigCompilerOption("allowJs", true, properties.indentation()));
     //@formatter:on
   }
 
-  private static MandatoryReplacer tsConfigCompilerOption(String optionName, boolean optionValue, Indentation indentation) {
-    String compilerOption = indentation.times(2) + "\"%s\": %s,".formatted(optionName, optionValue);
-    return new MandatoryReplacer(lineAfterRegex("\"compilerOptions\":"), compilerOption);
-  }
-
-  private Consumer<JHipsterModuleBuilder> patchVitestConfig(JHipsterModuleProperties properties) {
+  private Consumer<JHipsterModuleBuilder> patchVitestConfig() {
     //@formatter:off
     return moduleBuilder -> moduleBuilder
       .mandatoryReplacements()
         .in(path("vitest.config.ts"))
           .add(lineAfterRegex("from 'vitest/config';"), "import vue from '@vitejs/plugin-vue';")
           .add(text("plugins: ["), "plugins: [vue(), ")
           .add(text("environment: 'node',"), "environment: 'jsdom',")
-          .add(vitestCoverageExclusion(properties,"src/main/webapp/**/*.component.ts"))
-          .add(vitestCoverageExclusion(properties,"src/main/webapp/app/router.ts"))
-          .add(vitestCoverageExclusion(properties,"src/main/webapp/app/injections.ts"))
-          .add(vitestCoverageExclusion(properties,"src/main/webapp/app/main.ts"))
-        .and();
+        .and()
+      .and()
+      .apply(vitestCoverageExclusion("src/main/webapp/**/*.component.ts"))
+      .apply(vitestCoverageExclusion("src/main/webapp/app/router.ts"))
+      .apply(vitestCoverageExclusion("src/main/webapp/app/injections.ts"))
+      .apply(vitestCoverageExclusion("src/main/webapp/app/main.ts"));
     //@formatter:on
   }
 
-  private static MandatoryReplacer vitestCoverageExclusion(JHipsterModuleProperties properties, String filePattern) {
-    Indentation indentation = properties.indentation();
-    return new MandatoryReplacer(lineAfterRegex("configDefaults.coverage.exclude"), indentation.times(4) + "'" + filePattern + "',");
-  }
-
   public JHipsterModule buildPiniaModule(JHipsterModuleProperties properties) {
     Assert.notNull("properties", properties);
 

src/main/java/tech/jhipster/lite/generator/typescript/common/domain/EslintShortcuts.java

@@ -0,0 +1,29 @@
+package tech.jhipster.lite.generator.typescript.common.domain;
+
+import static tech.jhipster.lite.module.domain.JHipsterModule.lineAfterRegex;
+import static tech.jhipster.lite.module.domain.JHipsterModule.path;
+
+import java.util.function.Consumer;
+import tech.jhipster.lite.module.domain.Indentation;
+import tech.jhipster.lite.module.domain.JHipsterModule;
+import tech.jhipster.lite.module.domain.replacement.MandatoryReplacer;
+
+public final class EslintShortcuts {
+
+  private EslintShortcuts() {}
+
+  public static Consumer<JHipsterModule.JHipsterModuleBuilder> eslintTypescriptRule(String rule, Indentation indentation) {
+    //@formatter:off
+    return moduleBuilder -> moduleBuilder
+      .mandatoryReplacements()
+        .in(path("eslint.config.js"))
+        .add(eslintTypescriptVueRuleReplacement(rule, indentation))
+        .and()
+      .and();
+    //@formatter:on
+  }
+
+  private static MandatoryReplacer eslintTypescriptVueRuleReplacement(String rule, Indentation indentation) {
+    return new MandatoryReplacer(lineAfterRegex("rules: \\{"), indentation.times(3) + rule + ",");
+  }
+}

src/main/java/tech/jhipster/lite/generator/typescript/common/domain/TsConfigShortcuts.java

@@ -0,0 +1,33 @@
+package tech.jhipster.lite.generator.typescript.common.domain;
+
+import static tech.jhipster.lite.module.domain.JHipsterModule.lineAfterRegex;
+import static tech.jhipster.lite.module.domain.JHipsterModule.path;
+
+import java.util.function.Consumer;
+import tech.jhipster.lite.module.domain.Indentation;
+import tech.jhipster.lite.module.domain.JHipsterModule;
+import tech.jhipster.lite.module.domain.replacement.MandatoryReplacer;
+
+public final class TsConfigShortcuts {
+
+  private TsConfigShortcuts() {}
+
+  public static Consumer<JHipsterModule.JHipsterModuleBuilder> tsConfigCompilerOption(
+    String optionName,
+    boolean optionValue,
+    Indentation indentation
+  ) {
+    //@formatter:off
+    return moduleBuilder -> moduleBuilder
+      .mandatoryReplacements()
+        .in(path("tsconfig.json"))
+        .add(tsConfigCompilerOptionReplacement(optionName, optionValue, indentation))
+        .and();
+    //@formatter:on
+  }
+
+  private static MandatoryReplacer tsConfigCompilerOptionReplacement(String optionName, boolean optionValue, Indentation indentation) {
+    String compilerOption = indentation.times(2) + "\"%s\": %s,".formatted(optionName, optionValue);
+    return new MandatoryReplacer(lineAfterRegex("\"compilerOptions\":"), compilerOption);
+  }
+}

src/main/java/tech/jhipster/lite/generator/typescript/common/domain/VitestShortcuts.java

@@ -0,0 +1,29 @@
+package tech.jhipster.lite.generator.typescript.common.domain;
+
+import static tech.jhipster.lite.module.domain.JHipsterModule.path;
+import static tech.jhipster.lite.module.domain.JHipsterModule.text;
+
+import java.util.function.Consumer;
+import tech.jhipster.lite.module.domain.JHipsterModule;
+import tech.jhipster.lite.module.domain.replacement.MandatoryReplacer;
+
+public final class VitestShortcuts {
+
+  private VitestShortcuts() {}
+
+  public static Consumer<JHipsterModule.JHipsterModuleBuilder> vitestCoverageExclusion(String exclusionFilePattern) {
+    //@formatter:off
+    return moduleBuilder -> moduleBuilder
+      .mandatoryReplacements()
+        .in(path("vitest.config.ts"))
+        .add(vitestCoverageExclusionReplacement(exclusionFilePattern));
+    //@formatter:on
+  }
+
+  private static MandatoryReplacer vitestCoverageExclusionReplacement(String filePattern) {
+    return new MandatoryReplacer(
+      text("(configDefaults.coverage.exclude as string[])"),
+      "(configDefaults.coverage.exclude as string[])" + ", '%s'".formatted(filePattern)
+    );
+  }
+}

src/main/java/tech/jhipster/lite/generator/typescript/common/package-info.java

@@ -0,0 +1,2 @@
+@tech.jhipster.lite.SharedKernel
+package tech.jhipster.lite.generator.typescript.common;

src/main/resources/generator/typescript/vitest.config.ts.mustache

@@ -28,10 +28,7 @@ export default defineConfig({
         100: true,
       },
       include: ['src/main/webapp/**/*.ts?(x)'],
-      exclude: [
-        // keep this comment to be able to apply another front module after prettier format
-        ...(configDefaults.coverage.exclude as string[]),
-      ],
+      exclude: [...(configDefaults.coverage.exclude as string[])],
       provider: 'istanbul',
       reportsDirectory: '{{projectBuildDirectory}}/test-results/',
       reporter: ['html', 'json-summary', 'text', 'text-summary', 'lcov', 'clover'],

src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java

@@ -79,7 +79,7 @@ void shouldCreateVueModule() {
             """
         )
       .and()
-      .hasPrefixedFiles("", "eslint.config.js", "tsconfig.build.json", "vite.config.ts", "vitest.config.ts")
+      .hasPrefixedFiles("", "eslint.config.js", "tsconfig.build.json", "vite.config.ts")
       .hasFile("tsconfig.json")
         .matchingSavedSnapshot()
         .and()

src/test/resources/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactoryTest.shouldBuildModuleWithStyle.vitest.config.ts.approved.txt

@@ -29,12 +29,7 @@ export default defineConfig({
         100: true,
       },
       include: ['src/main/webapp/**/*.ts?(x)'],
-      exclude: [
-        // keep this comment to be able to apply another front module after prettier format
-        ...(configDefaults.coverage.exclude as string[]),
-        'src/main/webapp/app/injections.ts',
-        'src/main/webapp/app/index.tsx',
-      ],
+      exclude: [...(configDefaults.coverage.exclude as string[]), 'src/main/webapp/app/injections.ts', 'src/main/webapp/app/index.tsx'],
       provider: 'istanbul',
       reportsDirectory: 'target/test-results/',
       reporter: ['html', 'json-summary', 'text', 'text-summary', 'lcov', 'clover'],

src/test/resources/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.shouldCreateVueModule.eslint.config.js.approved.txt

@@ -30,11 +30,11 @@ export default typescript.config(
       globals: { ...globals.browser },
     },
     rules: {
-      quotes: ['error', 'single', { avoidEscape: true }],
       '@typescript-eslint/consistent-type-imports': 'error',
       '@typescript-eslint/no-empty-object-type': 'off',
       '@typescript-eslint/no-explicit-any': 'off',
       'vue/html-self-closing': 'off',
+      quotes: ['error', 'single', { avoidEscape: true }],
     },
   },
 );

src/test/resources/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.shouldCreateVueModule.vitest.config.ts.approved.txt

@@ -29,14 +29,7 @@ export default defineConfig({
         100: true,
       },
       include: ['src/main/webapp/**/*.ts?(x)'],
-      exclude: [
-        // keep this comment to be able to apply another front module after prettier format
-        ...(configDefaults.coverage.exclude as string[]),
-        'src/main/webapp/app/main.ts',
-        'src/main/webapp/app/injections.ts',
-        'src/main/webapp/app/router.ts',
-        'src/main/webapp/**/*.component.ts',
-      ],
+      exclude: [...(configDefaults.coverage.exclude as string[]), 'src/main/webapp/app/main.ts', 'src/main/webapp/app/injections.ts', 'src/main/webapp/app/router.ts', 'src/main/webapp/**/*.component.ts'],
       provider: 'istanbul',
       reportsDirectory: 'target/test-results/',
       reporter: ['html', 'json-summary', 'text', 'text-summary', 'lcov', 'clover'],