Merge 975fc18 into 94a1a6b

webpack · Feb 28, 2018 · 8e4cdac · 8e4cdac
2 parents 94a1a6b + 975fc18
commit 8e4cdac
Show file tree

Hide file tree

Showing 11 changed files with 274 additions and 282 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,10 +1,13 @@
 {
-	"env": {
-		"node": true
-	},
-	"rules": {
-		"strict": 0,
-		"curly": 0,
-		"no-underscore-dangle": 0
-	}
+  "env": {
+    "node": true
+  },
+  "plugins": [
+    "prettier"
+  ],
+  "rules": {
+    "strict": 0,
+    "curly": 0,
+    "no-underscore-dangle": 0
+  }
 }
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "tabWidth": 2,
+  "useTabs": true
+}