run prettier with master config before merging

immerjs · Oct 22, 2019 · ae80361 · ae80361
1 parent 85656cb
commit ae80361
Show file tree

Hide file tree

Showing 19 changed files with 4,381 additions and 4,430 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,3 +59,4 @@ typings/
 
 .idea
 dist/
+website/build
diff --git a/.prettierrc b/.prettierrc
@@ -5,15 +5,15 @@
   "requirePragma": false,
   "semi": false,
   "singleQuote": false,
-  "tabWidth": 4,
   "trailingComma": "none",
-  "useTabs": false,
+  "useTabs": true,
   "overrides": [
     {
       "files": [".prettierrc", "*.json"],
       "options": {
         "printWidth": 200,
-        "tabWidth": 2
+        "tabWidth": 2,
+        "useTabs": false
       }
     }
   ]