Merge pull request #140 from mrmlnc/massive_infrastructure_update

Massive infrastructure update

.editorconfig

@@ -9,6 +9,6 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[{package-lock.json,package.json,*.yml}]
+[*.yml]
 indent_style = space
 indent_size = 2

.eslintrc.json

@@ -0,0 +1,9 @@
+{
+	"extends": "mrmlnc",
+	"ignorePatterns": [
+		"**/unsafe/**/*.ts"
+	],
+	"rules": {
+		"import/no-unresolved": ["error", { "ignore": ["vscode"] }]
+	}
+}

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.gitignore

@@ -5,13 +5,10 @@ npm-debug.log*
 
 # Dependency directory
 node_modules/
-# Fixture dependencies
 !fixtures/e2e/node_modules
 
-# Build directory
+# Compiled and temporary files
 out/
-
-# VS Code binary
-.vscode-test
-
 *.vsix
+.vscode-test
+.eslintcache

.mergify.yml

@@ -1,11 +1,4 @@
 pull_request_rules:
-  - name: Conflicts
-    conditions:
-      - conflict
-    actions:
-      comment:
-        message: This pull request is now in conflicts. Could you fix it?
-
   - name: Merge with review
     conditions:
       - base=master