From b2704bba1c15c3c1574c941d844e3f15ddc065af Mon Sep 17 00:00:00 2001
From: Brendan Mulholland <github@bmulholland.ca>
Date: Mon, 7 Dec 2020 11:23:51 +0100
Subject: [PATCH 1/3] chore: fix Vue component ordering

---
 demo/pages/login.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/demo/pages/login.vue b/demo/pages/login.vue
index 99db6ca5c..4b3067df7 100644
--- a/demo/pages/login.vue
+++ b/demo/pages/login.vue
@@ -110,18 +110,12 @@
   </div>
 </template>
 
-<style scoped>
-.login-button {
-  border: 0;
-}
-</style>
-
 <script>
 import busyOverlay from '~/components/busy-overlay'
 
 export default {
-  middleware: ['auth'],
   components: { busyOverlay },
+  middleware: ['auth'],
   data () {
     return {
       username: '',
@@ -251,3 +245,9 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.login-button {
+  border: 0;
+}
+</style>

From ab7406089d4f5bc138e8af4f58c3466cd0b79496 Mon Sep 17 00:00:00 2001
From: Brendan Mulholland <github@bmulholland.ca>
Date: Mon, 7 Dec 2020 11:36:37 +0100
Subject: [PATCH 2/3] chore(lint): Fix method ordering

---
 src/index.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 6c190aa95..82a515421 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -9,14 +9,6 @@ export { AxiosRequestConfig as HTTPRequest }
 export { AxiosResponse as HTTPResponse }
 
 export type Auth = _Auth
-export type Scheme = _Scheme<SchemeOptions | any> & {
-  token?: Token,
-  refreshToken?: RefreshToken
-  requestHandler?: RequestHandler
-  refreshTokens?: Function
-  check?: (checkStatus: boolean) => SchemeCheck
-  reset?: Function
-}
 
 export type SchemeOptions = {
   name: string,
@@ -30,6 +22,15 @@ export type SchemeCheck = {
   isRefreshable?: boolean
 }
 
+export type Scheme = _Scheme<SchemeOptions | any> & {
+  token?: Token,
+  refreshToken?: RefreshToken
+  requestHandler?: RequestHandler
+  refreshTokens?: Function
+  check?: (checkStatus: boolean) => SchemeCheck
+  reset?: Function
+}
+
 export type AuthOptions = {
   resetOnError: boolean | Function
   defaultStrategy: string

From 5d73cbd3220e7bd3572824e92dab3674f31c172e Mon Sep 17 00:00:00 2001
From: Brendan Mulholland <github@bmulholland.ca>
Date: Mon, 7 Dec 2020 11:45:00 +0100
Subject: [PATCH 3/3] Adopt correct unused vars for typescript

---
 .eslintrc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index 9ef1e9c45..07a06141c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,10 @@
   ],
   "rules": {
     "require-await": 0,
-    "no-useless-constructor": 0
+    "no-useless-constructor": 0,
+    // Correct support for unused var detection in Typescript:
+    // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-unused-vars.md
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": ["error"]
   }
 }