From a53875f208d6b29f5481098c4b1084ac84a09628 Mon Sep 17 00:00:00 2001
From: Oswaldo Acauan <oswaldoacauan@users.noreply.github.com>
Date: Wed, 18 Oct 2017 16:17:55 -0200
Subject: [PATCH] Add trailingComma rule for config-default.js (#2372)

---
 app/config/config-default.js |  8 ++++----
 package.json                 | 21 ++++++++++++++++++++-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/config/config-default.js b/app/config/config-default.js
index 1c33036c..57ea9b59 100644
--- a/app/config/config-default.js
+++ b/app/config/config-default.js
@@ -70,7 +70,7 @@ module.exports = {
       lightBlue: '#0066ff',
       lightMagenta: '#cc00ff',
       lightCyan: '#00ffff',
-      lightWhite: '#ffffff'
+      lightWhite: '#ffffff',
     },
 
     // the shell to run when spawning a new session (i.e. /usr/local/bin/fish)
@@ -98,11 +98,11 @@ module.exports = {
     bell: 'SOUND',
 
     // if true, selected text will automatically be copied to the clipboard
-    copyOnSelect: false
+    copyOnSelect: false,
 
     // if true, on right click selected text will be copied or pasted if no
     // selection is present (true by default on Windows)
-    // quickEdit: true
+    // quickEdit: true,
 
     // URL to custom bell
     // bellSoundURL: 'http://example.com/bell.mp3',
@@ -126,5 +126,5 @@ module.exports = {
   keymaps: {
     // Example
     // 'window:devtools': 'cmd+alt+o',
-  }
+  },
 };
diff --git a/package.json b/package.json
index 0b825b5c..7d613fdf 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,26 @@
           "jsxBracketSameLine": false
         }
       ]
-    }
+    },
+    "overrides": [{
+      "files": "app/config/config-default.js",
+      "rules": {
+        "prettier/prettier": [
+          "error",
+          {
+            "printWidth": 120,
+            "tabWidth": 2,
+            "singleQuote": true,
+            "trailingComma": "es5",
+            "bracketSpacing": false,
+            "semi": true,
+            "useTabs": false,
+            "parser": "babylon",
+            "jsxBracketSameLine": false
+          }
+        ]
+      }
+    }]
   },
   "babel": {
     "presets": ["react"],