rename .lintstagedrc to cjs

mshima · Oct 19, 2023 · 14ccc18 · 14ccc18
1 parent 6cb7722
commit 14ccc18
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/generators/common/__snapshots__/generator.spec.mjs.snap b/generators/common/__snapshots__/generator.spec.mjs.snap
@@ -38,7 +38,7 @@ trim_trailing_whitespace = false
 ",
     "stateCleared": "modified",
   },
-  ".lintstagedrc.js": {
+  ".lintstagedrc.cjs": {
     "contents": "module.exports = {
   '{,**/}*.{md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,java}': ['prettier --write'],
 };

diff --git a/generators/common/files.mjs b/generators/common/files.mjs
@@ -43,7 +43,7 @@ export const commonFiles = {
   commitHooks: [
     {
       condition: generator => !generator.skipCommitHook,
-      templates: ['.lintstagedrc.js', '.husky/pre-commit'],
+      templates: ['.lintstagedrc.cjs', '.husky/pre-commit'],
     },
   ],
 };

diff --git a/generators/common/generator.mjs b/generators/common/generator.mjs
@@ -192,6 +192,11 @@ export default class CommonGenerator extends BaseApplicationGenerator {
             this.removeFile('npmw.cmd');
           }
         }
+        if (this.isJhipsterVersionLessThan('8.0.0-rc.2')) {
+          if (!application.skipCommitHook) {
+            this.removeFile('.lintstagedrc.js');
+          }
+        }
       },
       writePrettierConfig({ application }) {
         return this.writeFiles({

diff --git a/generators/common/generator.spec.mjs b/generators/common/generator.spec.mjs
@@ -73,7 +73,7 @@ describe(`generator - ${generator}`, () => {
       });
 
       it('uses custom prettier formatting to js file', () => {
-        runResult.assertFileContent('.lintstagedrc.js', / {10}'{/);
+        runResult.assertFileContent('.lintstagedrc.cjs', / {10}'{/);
       });
     });
   });

diff --git a/...ors/common/templates/.lintstagedrc.js.ejs → ...rs/common/templates/.lintstagedrc.cjs.ejs b/...ors/common/templates/.lintstagedrc.js.ejs → ...rs/common/templates/.lintstagedrc.cjs.ejs
diff --git a/generators/server/__snapshots__/generator.spec.mjs.snap b/generators/server/__snapshots__/generator.spec.mjs.snap
@@ -710,7 +710,7 @@ exports[`generator - server with entities should match files snapshot 1`] = `
   ".jhipster/Foo.json": {
     "stateCleared": "modified",
   },
-  ".lintstagedrc.js": {
+  ".lintstagedrc.cjs": {
     "stateCleared": "modified",
   },
   ".mvn/jvm.config": {