Merge pull request #10450 from murdos/remove-common-client

refactor(client-common): remove ClientsModulesFactory that was only containing lintstaged configuration
jhipster · Jul 29, 2024 · 361a1e8 · 361a1e8
2 parents 37b3de5 + 5366cd5
commit 361a1e8
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 40 deletions.
diff --git a/...in/java/tech/jhipster/lite/generator/client/angular/core/domain/AngularModuleFactory.java b/...in/java/tech/jhipster/lite/generator/client/angular/core/domain/AngularModuleFactory.java
@@ -4,7 +4,6 @@
 import static tech.jhipster.lite.module.domain.packagejson.VersionSource.ANGULAR;
 import static tech.jhipster.lite.module.domain.packagejson.VersionSource.COMMON;
 
-import tech.jhipster.lite.generator.client.common.domain.ClientsModulesFactory;
 import tech.jhipster.lite.module.domain.Indentation;
 import tech.jhipster.lite.module.domain.JHipsterModule;
 import tech.jhipster.lite.module.domain.file.JHipsterSource;
@@ -22,7 +21,12 @@ public class AngularModuleFactory {
 
   public JHipsterModule buildModule(JHipsterModuleProperties properties) {
     //@formatter:off
-    return ClientsModulesFactory.clientModuleBuilder(properties)
+    return moduleBuilder(properties)
+      .optionalReplacements()
+        .in(path(".lintstagedrc.cjs"))
+          .add(lineBeforeRegex("\\['prettier --write'\\]"), "  '{src/**/,}*.ts': ['eslint --fix'],")
+          .and()
+        .and()
       .gitIgnore()
         .comment("Angular")
         .pattern(".angular/")

diff --git a/src/main/java/tech/jhipster/lite/generator/client/common/domain/ClientsModulesFactory.java b/src/main/java/tech/jhipster/lite/generator/client/common/domain/ClientsModulesFactory.java
diff --git a/src/main/java/tech/jhipster/lite/generator/client/common/package-info.java b/src/main/java/tech/jhipster/lite/generator/client/common/package-info.java
diff --git a/...n/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java b/...n/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java
@@ -4,7 +4,6 @@
 import static tech.jhipster.lite.module.domain.packagejson.VersionSource.COMMON;
 import static tech.jhipster.lite.module.domain.packagejson.VersionSource.REACT;
 
-import tech.jhipster.lite.generator.client.common.domain.ClientsModulesFactory;
 import tech.jhipster.lite.module.domain.JHipsterModule;
 import tech.jhipster.lite.module.domain.file.JHipsterDestination;
 import tech.jhipster.lite.module.domain.file.JHipsterSource;
@@ -31,7 +30,12 @@ public class ReactCoreModulesFactory {
 
   public JHipsterModule buildModule(JHipsterModuleProperties properties) {
     //@formatter:off
-    return ClientsModulesFactory.clientModuleBuilder(properties)
+    return moduleBuilder(properties)
+      .optionalReplacements()
+        .in(path(".lintstagedrc.cjs"))
+          .add(lineBeforeRegex("\\['prettier --write'\\]"), "  '{src/**/,}*.{ts,tsx}': ['eslint --fix'],")
+          .and()
+        .and()
       .packageJson()
         .addDevDependency(packageName("@testing-library/dom"), REACT)
         .addDevDependency(packageName("@testing-library/react"), REACT)

diff --git a/...main/java/tech/jhipster/lite/generator/client/svelte/core/domain/SvelteModuleFactory.java b/...main/java/tech/jhipster/lite/generator/client/svelte/core/domain/SvelteModuleFactory.java
@@ -1,6 +1,5 @@
 package tech.jhipster.lite.generator.client.svelte.core.domain;
 
-import static tech.jhipster.lite.generator.client.common.domain.ClientsModulesFactory.clientModuleBuilder;
 import static tech.jhipster.lite.module.domain.JHipsterModule.*;
 import static tech.jhipster.lite.module.domain.packagejson.VersionSource.SVELTE;
 
@@ -28,7 +27,12 @@ public JHipsterModule buildSvelteModule(JHipsterModuleProperties properties) {
     Assert.notNull("properties", properties);
 
     //@formatter:off
-    return clientModuleBuilder(properties)
+    return moduleBuilder(properties)
+      .optionalReplacements()
+        .in(path(".lintstagedrc.cjs"))
+        .add(lineBeforeRegex("\\['prettier --write'\\]"), "  '{src/**/,}*.ts': ['eslint --fix'],")
+        .and()
+      .and()
       .gitIgnore()
         .comment("Svelte")
         .pattern(".svelte-kit/")

diff --git a/src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java b/src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java
@@ -4,7 +4,6 @@
 import static tech.jhipster.lite.module.domain.packagejson.VersionSource.COMMON;
 import static tech.jhipster.lite.module.domain.packagejson.VersionSource.VUE;
 
-import tech.jhipster.lite.generator.client.common.domain.ClientsModulesFactory;
 import tech.jhipster.lite.module.domain.JHipsterModule;
 import tech.jhipster.lite.module.domain.file.JHipsterDestination;
 import tech.jhipster.lite.module.domain.file.JHipsterSource;
@@ -42,7 +41,12 @@ public class VueModulesFactory {
 
   public JHipsterModule buildVueModule(JHipsterModuleProperties properties) {
     //@formatter:off
-    return ClientsModulesFactory.clientModuleBuilder(properties)
+    return moduleBuilder(properties)
+      .optionalReplacements()
+        .in(path(".lintstagedrc.cjs"))
+          .add(lineBeforeRegex("\\['prettier --write'\\]"), "  '{src/**/,}*.{ts,vue}': ['eslint --fix'],")
+          .and()
+        .and()
       .documentation(documentationTitle("Vue"), DOCUMENTATION_SOURCE.file("vue.md"))
       .packageJson()
         .addType("module")

diff --git a/...generator/server/springboot/thymeleaf/template/domain/ThymeleafTemplateModuleFactory.java b/...generator/server/springboot/thymeleaf/template/domain/ThymeleafTemplateModuleFactory.java
@@ -4,7 +4,6 @@
 import static tech.jhipster.lite.module.domain.packagejson.VersionSource.COMMON;
 
 import java.util.regex.Pattern;
-import tech.jhipster.lite.generator.client.common.domain.ClientsModulesFactory;
 import tech.jhipster.lite.module.domain.JHipsterModule;
 import tech.jhipster.lite.module.domain.JHipsterProjectFilePath;
 import tech.jhipster.lite.module.domain.file.JHipsterDestination;
@@ -83,7 +82,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
     Assert.notNull(PROPERTIES, properties);
 
     //@formatter:off
-    return ClientsModulesFactory.clientModuleBuilder(properties)
+    return moduleBuilder(properties)
       .documentation(documentationTitle("Thymeleaf"), DOCUMENTATION_SOURCE.template("thymeleaf.md"))
       .packageJson()
         .addDevDependency(packageName("@babel/cli"), COMMON)
@@ -128,7 +127,7 @@ public JHipsterModule buildTailwindcssModule(JHipsterModuleProperties properties
     Assert.notNull(PROPERTIES, properties);
 
     //@formatter:off
-    return ClientsModulesFactory.clientModuleBuilder(properties)
+    return moduleBuilder(properties)
       .packageJson()
         .addDevDependency(packageName("tailwindcss"), COMMON)
         .addScript(scriptKey("watch:html"), scriptCommand("onchange 'src/main/resources/templates/**/*.html' -- npm-run-all --serial build:css build:html"))

diff --git a/...ava/tech/jhipster/lite/generator/client/angular/core/domain/AngularModuleFactoryTest.java b/...ava/tech/jhipster/lite/generator/client/angular/core/domain/AngularModuleFactoryTest.java
@@ -64,7 +64,7 @@ void shouldCreateAngularModule() {
       .containing(
         """
         module.exports = {
-          '{src/**/,}*.{js,ts,tsx,vue}': ['eslint --fix'],
+          '{src/**/,}*.ts': ['eslint --fix'],
           '*.{md,json,yml,html,css,scss,java,xml,feature}': ['prettier --write'],
         };
         """

diff --git a/...va/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactoryTest.java b/...va/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactoryTest.java
@@ -53,7 +53,7 @@ void shouldBuildModuleWithStyle() {
       .containing(
         """
         module.exports = {
-          '{src/**/,}*.{js,ts,tsx,vue}': ['eslint --fix'],
+          '{src/**/,}*.{ts,tsx}': ['eslint --fix'],
           '*.{md,json,yml,html,css,scss,java,xml,feature}': ['prettier --write'],
         };
         """

diff --git a/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java
@@ -59,7 +59,7 @@ void shouldCreateVueModule() {
         .containing(
           """
             module.exports = {
-              '{src/**/,}*.{js,ts,tsx,vue}': ['eslint --fix'],
+              '{src/**/,}*.{ts,vue}': ['eslint --fix'],
               '*.{md,json,yml,html,css,scss,java,xml,feature}': ['prettier --write'],
             };
             """