update browserlist, add prettierrc

Kilian · Mar 15, 2019 · b7be2a8 · b7be2a8
1 parent 2f0f58c
commit b7be2a8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,15 @@
+{
+  "overrides": [
+    {
+      "files": [".prettierrc", ".babelrc", ".eslintrc", ".stylelintrc"],
+      "options": {
+        "parser": "json"
+      }
+    }
+  ],
+  "singleQuote": true,
+  "useTabs": false,
+  "printWidth": 120,
+  "tabWidth": 2,
+  "trailingComma": "es5"
+}
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "start-main-dev": "cross-env HOT=1 NODE_ENV=development electron -r babel-register ./app/main.dev.js",
     "start-renderer-dev": "cross-env NODE_ENV=development node --trace-warnings -r babel-register ./node_modules/webpack-dev-server/bin/webpack-dev-server --config webpack.config.renderer.dev.js"
   },
-  "browserslist": "electron 2.0",
+  "browserslist": "electron 4.0",
   "build": {
     "productName": "FromScratch",
     "appId": "com.kilianvalkhof.FromScratch",