Merge pull request #26828 from mshima/editorconfig

convert editorconfig to multistep template
jhipster · Jul 26, 2024 · 4e9ff87 · 4e9ff87
2 parents 2105b09 + 173ff10
commit 4e9ff87
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/generators/common/__snapshots__/generator.spec.js.snap b/generators/common/__snapshots__/generator.spec.js.snap
@@ -19,9 +19,6 @@ insert_final_newline = true
 
 # Change these settings to your own preference
 indent_style = space
-indent_size = 4
-
-[*.{ts,tsx,js,jsx,json,css,scss,yml,html,vue}]
 indent_size = 2
 
 [*.md]

diff --git a/generators/common/files.js b/generators/common/files.js
@@ -24,7 +24,7 @@
 export const commonFiles = {
   global: [
     {
-      templates: ['README.md.jhi', '.editorconfig'],
+      templates: ['README.md.jhi', '.editorconfig.jhi'],
     },
   ],
   sonar: [

diff --git a/...rators/common/templates/.editorconfig.ejs → ...rs/common/templates/.editorconfig.jhi.ejs b/...rators/common/templates/.editorconfig.ejs → ...rs/common/templates/.editorconfig.jhi.ejs
@@ -14,10 +14,9 @@ insert_final_newline = true
 
 # Change these settings to your own preference
 indent_style = space
-indent_size = 4
-
-[*.{ts,tsx,js,jsx,json,css,scss,yml,html,vue}]
-indent_size = 2
+indent_size = <%= prettierTabWidth %>
 
 [*.md]
 trim_trailing_whitespace = false
+
+<&- fragments.render({ join: '\n\n' }) &>
diff --git a/generators/init/generator.spec.ts b/generators/init/generator.spec.ts
@@ -54,7 +54,7 @@ describe(`generator - ${generator}`, () => {
         await helpers
           .runJHipster('init')
           .withMockedJHipsterGenerators(['bootstrap'])
-          .withSharedApplication({ projectDescription: 'projectDescription' })
+          .withSharedApplication({ projectDescription: 'projectDescription', prettierTabWidth: 'prettierTabWidth' })
           .withJHipsterConfig();
       });
       it('should write files and match snapshot', () => {

diff --git a/generators/init/templates/.editorconfig.jhi.ejs b/generators/init/templates/.editorconfig.jhi.ejs
@@ -32,7 +32,7 @@ insert_final_newline = true
 
 # Change these settings to your own preference
 indent_style = space
-indent_size = 2
+indent_size = <%= prettierTabWidth %>
 
 [*.md]
 trim_trailing_whitespace = false

diff --git a/generators/java/generators/bootstrap/generator.ts b/generators/java/generators/bootstrap/generator.ts
@@ -172,6 +172,7 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
             javaMainPackageTemplatesBlock({
               templates: ['GeneratedByJHipster.java'],
             }),
+            { templates: ['.editorconfig.jhi.java'] },
           ],
           context: application,
         });

diff --git a/generators/java/generators/bootstrap/templates/.editorconfig.jhi.java.ejs b/generators/java/generators/bootstrap/templates/.editorconfig.jhi.java.ejs
@@ -0,0 +1,3 @@
+# Generated by jhipster:java:bootstrap generator
+[*.java]
+indent_size = 4