Merge pull request #10975 from murdos/prettier-plugin-organize-imports

feat(prettier): add prettier plugin 'prettier-plugin-organize-imports' to prettier module
jhipster · Sep 25, 2024 · ff99f26 · ff99f26
2 parents b47bc39 + d2065d3
commit ff99f26
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -44,13 +44,15 @@ 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")
       .containing(nodeDependency("@prettier/plugin-xml"))
       .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 ."));