From f7f5ef00efb8d48d884ae063cf05711746e4e17d Mon Sep 17 00:00:00 2001
From: Ivan Savushkin <ivan@savushkin.me>
Date: Tue, 11 Feb 2020 19:08:32 +0300
Subject: [PATCH] feat(core): update rules tslint@6.0.0

---
 package.json |  2 +-
 tslint.json  | 68 +++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 34e2eb6..c6ef97f 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
   },
   "peerDependencies": {
     "codelyzer": "^5.0.0",
-    "tslint": ">=5.20.0"
+    "tslint": ">=6.0.0"
   },
   "husky": {
     "hooks": {
diff --git a/tslint.json b/tslint.json
index 1664afa..bcee926 100644
--- a/tslint.json
+++ b/tslint.json
@@ -12,9 +12,71 @@
     ],
     "member-ordering": [
       true,
-      "public-before-private",
-      "static-before-instance",
-      "variables-before-functions"
+      {
+        "order": [
+          {
+            "name": "public static field",
+            "kinds": [
+              "public-static-field",
+              "protected-static-field"
+            ]
+          },
+          {
+            "name": "private static field",
+            "kinds": [
+              "private-static-field"
+            ]
+          },
+          {
+            "name": "public instance field",
+            "kinds": [
+              "public-instance-field",
+              "protected-instance-field"
+            ]
+          },
+          {
+            "name": "private instance field",
+            "kinds": [
+              "private-instance-field"
+            ]
+          },
+          {
+            "name": "public static method",
+            "kinds": [
+              "public-static-method",
+              "protected-static-method",
+              "public-static-accessor",
+              "protected-static-accessor"
+            ]
+          },
+          {
+            "name": "private static method",
+            "kinds": [
+              "private-static-method",
+              "private-static-accessor"
+            ]
+          },
+          {
+            "name": "public instance method",
+            "kinds": [
+              "public-constructor",
+              "protected-constructor",
+              "public-instance-method",
+              "protected-instance-method",
+              "public-instance-accessor",
+              "protected-instance-accessor"
+            ]
+          },
+          {
+            "name": "private instance method",
+            "kinds": [
+              "private-constructor",
+              "private-instance-method",
+              "private-instance-accessor"
+            ]
+          }
+        ]
+      }
     ],
     "prefer-readonly": true,
     "adjacent-overload-signatures": [