Merge pull request #237 from github/cbraynor/fix206

Resolve violations of sort-imports lint
github · Oct 1, 2020 · 4ff6c0d · 4ff6c0d
2 parents b9e9339 + 10479a2
commit 4ff6c0d
Showing 48 changed files with 96 additions and 78 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -22,11 +22,14 @@
         "import/no-namespace": "off",
         "import/no-unresolved": "error",
         "import/no-webpack-loader-syntax": "error",
+        "import/order": ["error", {
+            "alphabetize": {"order": "asc"},
+            "newlines-between": "always"
+        }],
         "no-async-foreach/no-async-foreach": "error",
         "no-console": "off",
         "no-sequences": "error",
-        "one-var": ["error", "never"],
-        "sort-imports": ["error", { "allowSeparatedGroups": true }]
+        "one-var": ["error", "never"]
     },
     "overrides": [{
         // "temporarily downgraded during transition to eslint
@@ -47,8 +50,7 @@
             "func-style": "off",
             "github/no-then": "off",
             "import/no-extraneous-dependencies": "off",
-            "no-shadow": "off",
-            "sort-imports": "off"
+            "no-shadow": "off"
         }
     }]
 }
diff --git a/lib/actions-util.test.js.map b/lib/actions-util.test.js.map
diff --git a/lib/analyze.test.js b/lib/analyze.test.js
diff --git a/lib/analyze.test.js.map b/lib/analyze.test.js.map
diff --git a/lib/api-client.js b/lib/api-client.js
diff --git a/lib/api-client.js.map b/lib/api-client.js.map
diff --git a/lib/codeql.js b/lib/codeql.js