From cca051041fc99d4d72a37d23fb7fdd1ce70a7c47 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 3 Jul 2024 04:21:41 -0700
Subject: [PATCH] Also migrate semi rule, alphabetize

---
 .eslintrc.json         | 12 +++++++-----
 .eslintrc.json.typings | 30 ++++++++++++++++--------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 2218c6fe..d4d7eddc 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -56,16 +56,20 @@
     "jsdoc"
   ],
   "rules": {
-    "no-extra-semi": "error",
     "@stylistic/ts/indent": [
       "warn",
       2
     ],
+    "@stylistic/ts/semi": [
+      "warn",
+      "always"
+    ],
     "@stylistic/ts/quotes": [
       "warn",
       "single",
       { "allowTemplateLiterals": true }
     ],
+
     "@typescript-eslint/array-type": [
       "warn",
       {
@@ -149,10 +153,7 @@
     "@typescript-eslint/no-useless-constructor": "warn",
     "@typescript-eslint/prefer-namespace-keyword": "warn",
     "@typescript-eslint/type-annotation-spacing": "warn",
-    "@typescript-eslint/semi": [
-      "warn",
-      "always"
-    ],
+
     "comma-dangle": [
       "warn",
       {
@@ -193,6 +194,7 @@
       }
     ],
     "no-eval": "warn",
+    "no-extra-semi": "error",
     "no-irregular-whitespace": "warn",
     "no-restricted-imports": [
       "warn",
diff --git a/.eslintrc.json.typings b/.eslintrc.json.typings
index 0d234ee7..ba4c9ff7 100644
--- a/.eslintrc.json.typings
+++ b/.eslintrc.json.typings
@@ -10,7 +10,20 @@
     "jsdoc"
   ],
   "rules": {
-    "no-extra-semi": "error",
+    "@stylistic/ts/indent": [
+      "warn",
+      2
+    ],
+    "@stylistic/ts/semi": [
+      "warn",
+      "always"
+    ],
+    "@stylistic/ts/quotes": [
+      "warn",
+      "single",
+      { "allowTemplateLiterals": true }
+    ],
+
     "@typescript-eslint/array-type": [
       "warn",
       {
@@ -24,10 +37,6 @@
         "allowExpressions": true
       }
     ],
-    "@typescript-eslint/indent": [
-      "warn",
-      2
-    ],
     "@typescript-eslint/member-delimiter-style": [
       "warn",
       {
@@ -48,15 +57,7 @@
     ],
     "@typescript-eslint/prefer-namespace-keyword": "warn",
     "@typescript-eslint/type-annotation-spacing": "warn",
-    "@typescript-eslint/quotes": [
-      "warn",
-      "single",
-      { "allowTemplateLiterals": true }
-    ],
-    "@typescript-eslint/semi": [
-      "warn",
-      "always"
-    ],
+
     "comma-dangle": [
       "warn",
       {
@@ -86,6 +87,7 @@
         "ignorePattern": "^ *(?<ps_description>\\* Ps=)"
       }
     ],
+    "no-extra-semi": "error",
     "no-irregular-whitespace": "warn",
     "no-trailing-spaces": "warn",
     "object-curly-spacing": [