diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-03-23 11:42:34 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-03-23 11:42:34 -0500 |
| commit | 3c54794445ea8e3bd7c3356450b86fc4c6ba12cd (patch) | |
| tree | c1dfbf99e8c815539f8411d1613040d3d0e12002 | |
| parent | 7e759f559cf0b7206fefef5e9b5586f742c5f4eb (diff) | |
| download | gitlab-ce-3c54794445ea8e3bd7c3356450b86fc4c6ba12cd.tar.gz | |
update prettier config to differentiate node scripts from babel compiled modules
| -rw-r--r-- | .prettierignore | 3 | ||||
| -rw-r--r-- | .prettierrc | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.prettierignore b/.prettierignore index 62fe6a45b95..a4a5e8ada89 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,6 +1,3 @@ -/config/ /node_modules/ /public/ /vendor/ -karma.config.js -webpack.config.js diff --git a/.prettierrc b/.prettierrc index 5e2863a11f6..748cfcae65f 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,13 @@ { "printWidth": 100, "singleQuote": true, - "trailingComma": "all" + "trailingComma": "es5", + "overrides": [ + { + "files": ["app/assets/javascripts/*", "spec/javascripts/*"], + "options": { + "trailingComma": "all" + } + } + ] } |