revert "let prettier choose the correct parser" + let prettirignore w…

…ith fodler travis

This reverts commit 7fcd4b0.

generators/client/templates/angular/.prettierignore.ejs

@@ -1,2 +1 @@
 node_modules
-target

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

@@ -4,6 +4,15 @@ printWidth: 140
 singleQuote: true
 tabWidth: 4
 useTabs: false
-# js and ts rules. Prettier is clever, it uses correct rules and correct parser according to file extension.
-jsxBracketSameLine: false
-arrowParens: avoid
+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/.prettierignore.ejs

@@ -1,2 +1 @@
 node_modules
-target

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

@@ -4,6 +4,15 @@ printWidth: 140
 singleQuote: true
 tabWidth: 2
 useTabs: false
-# js and ts rules. Prettier is clever, it uses correct rules and correct parser according to file extension.
-jsxBracketSameLine: false
-arrowParens: avoid
+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

@@ -35,7 +35,9 @@ const jhipsterUtils = require('./utils');
 const constants = require('./generator-constants');
 const {
     prettierTransform,
-    prettierOptions
+    defaultTsPrettierOptions,
+    defaultCssPrettierOptions,
+    defaultScssPrettierOptions
 } = require('./generator-transforms');
 
 const CLIENT_MAIN_SRC_DIR = constants.CLIENT_MAIN_SRC_DIR;
@@ -1074,12 +1076,24 @@ module.exports = class extends Generator {
      */
     registerClientTransforms(generator = this) {
         if (!generator.skipClient) {
-            const myFilter = filter(['src/**/*.{ts,tsx,scss,css}'], { restore: true });
+            const typescriptFilter = filter(['src/**/*.{ts,tsx}'], { restore: true });
             // this pipe will pass through (restore) anything that doesn't match typescriptFilter
             generator.registerTransformStream([
-                myFilter,
-                prettierTransform(prettierOptions),
-                myFilter.restore
+                typescriptFilter,
+                prettierTransform(defaultTsPrettierOptions),
+                typescriptFilter.restore
+            ]);
+            const scssFilter = filter(['src/**/*.scss'], { restore: true });
+            generator.registerTransformStream([
+                scssFilter,
+                prettierTransform(defaultScssPrettierOptions),
+                scssFilter.restore
+            ]);
+            const cssFilter = filter(['src/**/*.css'], { restore: true });
+            generator.registerTransformStream([
+                cssFilter,
+                prettierTransform(defaultCssPrettierOptions),
+                cssFilter.restore
             ]);
         }
     }

generators/generator-transforms.js

@@ -1,14 +1,26 @@
 const through = require('through2');
 const prettier = require('prettier');
 
-const prettierOptions = {
+const defaultPrettierOptions = {
     printWidth: 140,
     singleQuote: true,
-    useTabs: false,
-    // js and ts rules. Prettier is clever, it uses correct rules and correct parser according to file extension.
+    useTabs: false
+};
+
+const defaultTsPrettierOptions = Object.assign(defaultPrettierOptions, {
     jsxBracketSameLine: false,
     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) => {
@@ -30,5 +42,7 @@ const prettierTransform = function (defaultOptions) {
 
 module.exports = {
     prettierTransform,
-    prettierOptions
+    defaultTsPrettierOptions,
+    defaultCssPrettierOptions,
+    defaultScssPrettierOptions
 };