editorconfig, update npm deps

benzkji · Jul 30, 2018 · 5e3cb55 · 5e3cb55
1 parent e619eea
commit 5e3cb55
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,25 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py,sass,scss}]
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+# Matches the exact files either package.json or .travis.yml
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@ share/
 /env
 /envs
 .tox
+/package-lock.json
 testenv1
 node_modules/
 .python-version