diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactory.java index 3ce6d2ac775..05b40099405 100644 --- a/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactory.java @@ -36,10 +36,6 @@ public JHipsterModule buildMavenModule(JHipsterModuleProperties properties) { .put("dasherizedBaseName", properties.projectBaseName().kebabCase()) .and() .prerequisites(JAVA_PREREQUISITES) - .gitIgnore() - .comment("Maven") - .pattern("/target/") - .and() .files() .add(SOURCE.template("pom.xml"), to("pom.xml")) .and() diff --git a/src/main/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java b/src/main/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java index ce433aaebd6..5128fa28e4c 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java @@ -3,6 +3,7 @@ import static tech.jhipster.lite.module.domain.JHipsterModule.*; import static tech.jhipster.lite.module.domain.npm.JHLiteNpmVersionSource.COMMON; import static tech.jhipster.lite.module.domain.npm.JHLiteNpmVersionSource.REACT; +import static tech.jhipster.lite.module.domain.replacement.ReplacementCondition.always; import java.util.function.Consumer; import tech.jhipster.lite.module.domain.Indentation; @@ -99,7 +100,7 @@ private Consumer patchEslintConfig(JHipsterModuleProperti .mandatoryReplacements() .in(path("eslint.config.js")) .add(lineAfterRegex("from 'typescript-eslint'"), "import react from 'eslint-plugin-react/configs/recommended.js';") - .add(regex("\\s+\\.\\.\\.typescript\\.configs\\.recommended.*"), "") + .add(regex(always(), "\\s+\\.\\.\\.typescript\\.configs\\.recommended.*"), "") .add(regex("[ \\t]+files: \\['src/\\*/webapp/\\*\\*\\/\\*\\.ts'],"), reactConfig) .add( lineAfterRegex("globals: \\{ \\.\\.\\.globals\\.browser },"), @@ -154,7 +155,7 @@ private Consumer patchVitestConfig(JHipsterModuleProperti .mandatoryReplacements() .in(path("vitest.config.ts")) .add(lineAfterRegex("from 'vitest/config';"), "import react from '@vitejs/plugin-react';") - .add(text( "plugins: ["), "plugins: [react(), ") + .add(text("plugins: ["), "plugins: [react(), ") .add(text("environment: 'node',"), "environment: 'jsdom',") .add(vitestCoverageExclusion(properties,"src/main/webapp/app/index.tsx")) .and(); diff --git a/src/main/resources/generator/init/gitignore b/src/main/resources/generator/init/gitignore index 90fb4ceade2..2d7245df789 100644 --- a/src/main/resources/generator/init/gitignore +++ b/src/main/resources/generator/init/gitignore @@ -69,6 +69,11 @@ out/ !.vscode/extensions.json *.code-workspace +###################### +# Maven +###################### +/target/ + ###################### # Package Files ###################### diff --git a/src/test/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactoryTest.java index 64e07d06807..ff5314b4e86 100644 --- a/src/test/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactoryTest.java @@ -25,14 +25,6 @@ void shouldBuildMavenModule() { JHipsterModule module = factory.buildMavenModule(properties); assertThatModuleWithFiles(module, readmeFile()) - .hasFile(".gitignore") - .containing( - """ - # Maven - /target/\ - """ - ) - .and() .hasFile("pom.xml") .containing("tech.jhipster.jhlitest") .containing("my-app")