prettier also for css and scss files

fix jhipster#7451

generators/client/templates/angular/.prettierrc.ejs

@@ -1,7 +1,18 @@
 # Prettier configuration
+
 printWidth: 140
 singleQuote: true
-jsxBracketSameLine: false
-parser: typescript
-arrowParens: avoid
 tabWidth: 4
+useTabs: false
+overrides:
+- files: "src/**/{*.ts,*.tsx}"
+  options:
+    jsxBracketSameLine: false
+    arrowParens: avoid
+    parser: typescript
+- files: "src/**/*.css"
+  options:
+    parser: css
+- files: "src/**/*.scss"
+  options:
+    parser: scss

generators/client/templates/react/.prettierrc.ejs

@@ -1,6 +1,18 @@
 # Prettier configuration
+
 printWidth: 140
 singleQuote: true
-jsxBracketSameLine: false
-parser: typescript
-arrowParens: avoid
+tabWidth: 2
+useTabs: false
+overrides:
+- files: "src/**/{*.ts,*.tsx}"
+  options:
+    jsxBracketSameLine: false
+    arrowParens: avoid
+    parser: typescript
+- files: "src/**/*.css"
+  options:
+    parser: css
+- files: "src/**/*.scss"
+  options:
+    parser: scss

generators/generator-base-private.js

@@ -33,7 +33,7 @@ const filter = require('gulp-filter');
 const packagejs = require('../package.json');
 const jhipsterUtils = require('./utils');
 const constants = require('./generator-constants');
-const { prettierTransform, defaultTsPrettierOptions } = require('./generator-transforms');
+const { prettierTransform, defaultTsPrettierOptions, defaultCssPrettierOptions, defaultScssPrettierOptions } = require('./generator-transforms');
 
 const CLIENT_MAIN_SRC_DIR = constants.CLIENT_MAIN_SRC_DIR;
 
@@ -1078,6 +1078,18 @@ module.exports = class extends Generator {
                 prettierTransform(defaultTsPrettierOptions),
                 typescriptFilter.restore
             ]);
+            const scssFilter = filter(['**/*.scss'], { restore: true });
+            generator.registerTransformStream([
+                scssFilter,
+                prettierTransform(defaultScssPrettierOptions),
+                scssFilter.restore
+            ]);
+            const cssFilter = filter(['**/*.css'], { restore: true });
+            generator.registerTransformStream([
+                cssFilter,
+                prettierTransform(defaultCssPrettierOptions),
+                cssFilter.restore
+            ]);
         }
     }
 };

generators/generator-transforms.js

@@ -1,13 +1,26 @@
 const through = require('through2');
 const prettier = require('prettier');
 
-const defaultTsPrettierOptions = {
+const defaultPrettierOptions = {
     printWidth: 140,
     singleQuote: true,
+    useTabs: false
+};
+
+const defaultTsPrettierOptions = Object.assign(defaultPrettierOptions, {
     jsxBracketSameLine: false,
-    parser: 'typescript',
     arrowParens: 'avoid',
-};
+    parser: 'typescript',
+});
+
+const defaultCssPrettierOptions = Object.assign(defaultPrettierOptions, {
+    parser: 'css',
+});
+
+const defaultScssPrettierOptions = Object.assign(defaultPrettierOptions, {
+    parser: 'scss',
+});
+
 
 const prettierTransform = function (defaultOptions) {
     const transform = (file, encoding, callback) => {
@@ -29,5 +42,7 @@ const prettierTransform = function (defaultOptions) {
 
 module.exports = {
     prettierTransform,
-    defaultTsPrettierOptions
+    defaultTsPrettierOptions,
+    defaultCssPrettierOptions,
+    defaultScssPrettierOptions
 };