From d2065d3616ff44d90a6bcee0dc3db6673940c95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Wed, 25 Sep 2024 10:18:19 +0200 Subject: [PATCH] feat(prettier): add prettier plugin 'prettier-plugin-organize-imports' on generator --- .../lite/generator/prettier/domain/PrettierModuleFactory.java | 1 + src/main/resources/generator/dependencies/common/package.json | 1 + src/main/resources/generator/prettier/.prettierrc.mustache | 1 + .../generator/prettier/domain/PrettierModuleFactoryTest.java | 2 ++ 4 files changed, 5 insertions(+) diff --git a/src/main/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactory.java index 853174848dc..847b8724cb8 100644 --- a/src/main/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactory.java @@ -31,6 +31,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) { .addDevDependency(packageName("prettier"), COMMON) .addDevDependency(packageName("prettier-plugin-gherkin"), COMMON) .addDevDependency(packageName("prettier-plugin-java"), COMMON) + .addDevDependency(packageName("prettier-plugin-organize-imports"), COMMON) .addDevDependency(packageName("prettier-plugin-packagejson"), COMMON) .addScript(scriptKey("prettier:check"), scriptCommand("prettier --check .")) .addScript(scriptKey("prettier:format"), scriptCommand("prettier --write .")) diff --git a/src/main/resources/generator/dependencies/common/package.json b/src/main/resources/generator/dependencies/common/package.json index c2bc16b3f6e..9c1aee65556 100644 --- a/src/main/resources/generator/dependencies/common/package.json +++ b/src/main/resources/generator/dependencies/common/package.json @@ -44,6 +44,7 @@ "prettier": "3.3.3", "prettier-plugin-gherkin": "3.1.0", "prettier-plugin-java": "2.6.4", + "prettier-plugin-organize-imports": "4.1.0", "prettier-plugin-packagejson": "2.5.2", "recursive-copy-cli": "1.0.20", "start-server-and-test": "2.0.8", diff --git a/src/main/resources/generator/prettier/.prettierrc.mustache b/src/main/resources/generator/prettier/.prettierrc.mustache index 71ed128e088..33f34cf353a 100644 --- a/src/main/resources/generator/prettier/.prettierrc.mustache +++ b/src/main/resources/generator/prettier/.prettierrc.mustache @@ -10,6 +10,7 @@ plugins: - '@prettier/plugin-xml' - prettier-plugin-gherkin - prettier-plugin-java + - prettier-plugin-organize-imports - prettier-plugin-packagejson # js and ts rules: diff --git a/src/test/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactoryTest.java index 5c9496a5e3f..9d2bbb6aab5 100644 --- a/src/test/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactoryTest.java @@ -44,6 +44,7 @@ void shouldBuildModuleWithoutPrettierLintStaged() { .containing("@prettier/plugin-xml") .containing("prettier-plugin-gherkin") .containing("prettier-plugin-java") + .containing("prettier-plugin-organize-imports") .containing("prettier-plugin-packagejson") .and() .hasFile("package.json") @@ -51,6 +52,7 @@ void shouldBuildModuleWithoutPrettierLintStaged() { .containing(nodeDependency("prettier")) .containing(nodeDependency("prettier-plugin-gherkin")) .containing(nodeDependency("prettier-plugin-java")) + .containing(nodeDependency("prettier-plugin-organize-imports")) .containing(nodeDependency("prettier-plugin-packagejson")) .containing(nodeScript("prettier:check", "prettier --check .")) .containing(nodeScript("prettier:format", "prettier --write ."));