From 97309ec7bc349cf102aa91be6a8b9ff346349e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C5=91rik=20Levente?= <levminer@levminer.com>
Date: Sat, 4 Feb 2023 12:51:37 +0100
Subject: [PATCH] Fix type errors

---
 interface/components/navigation.svelte      |  2 +-
 interface/components/routeTransition.svelte |  2 +-
 interface/layout/app.svelte                 |  2 +-
 interface/utils/navigate.ts                 |  2 +-
 package-lock.json                           | 64 ++++++++++-----------
 package.json                                |  4 +-
 6 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/interface/components/navigation.svelte b/interface/components/navigation.svelte
index 3934471a..33ebb5ae 100644
--- a/interface/components/navigation.svelte
+++ b/interface/components/navigation.svelte
@@ -33,5 +33,5 @@
 </div>
 
 <script lang="ts">
-	import { active } from "tinro"
+	import { active } from "@baileyherbert/tinro"
 </script>
diff --git a/interface/components/routeTransition.svelte b/interface/components/routeTransition.svelte
index 5b7beb84..d0e6b924 100644
--- a/interface/components/routeTransition.svelte
+++ b/interface/components/routeTransition.svelte
@@ -5,6 +5,6 @@
 {/key}
 
 <script>
-	import { router } from "tinro"
+	import { router } from "@baileyherbert/tinro"
 	import { fade } from "svelte/transition"
 </script>
diff --git a/interface/layout/app.svelte b/interface/layout/app.svelte
index 0d0e26e8..edc116c8 100644
--- a/interface/layout/app.svelte
+++ b/interface/layout/app.svelte
@@ -30,7 +30,7 @@
 </div>
 
 <script lang="ts">
-	import { Route, router } from "tinro"
+	import { Route, router } from "@baileyherbert/tinro"
 	import { onMount } from "svelte"
 	import { state } from "../stores/state"
 	import { number, version } from "../../build.json"
diff --git a/interface/utils/navigate.ts b/interface/utils/navigate.ts
index 4a6c29de..b6497d49 100644
--- a/interface/utils/navigate.ts
+++ b/interface/utils/navigate.ts
@@ -1,5 +1,5 @@
 import { shell } from "@tauri-apps/api"
-import { router } from "tinro"
+import { router } from "@baileyherbert/tinro"
 
 /**
  * Go to the specified link
diff --git a/package-lock.json b/package-lock.json
index c5e3f28d..d57139c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,11 +11,12 @@
 			"dependencies": {
 				"otpauth": "^8.0.3",
 				"protocol-buffers": "^5.0.0",
-				"qrcode-decoder": "^0.3.3",
+				"qrcode-decoder": "^0.2.2",
 				"qrcode-generator": "^1.4.4",
 				"ua-parser-js": "^1.0.33"
 			},
 			"devDependencies": {
+				"@baileyherbert/tinro": "^1.0.0",
 				"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 				"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
 				"@rgossiaux/svelte-headlessui": "^1.0.2",
@@ -42,10 +43,15 @@
 				"svelte-check": "^3.0.3",
 				"svelte-preprocess": "^5.0.1",
 				"tailwindcss": "^3.2.4",
-				"tinro": "^0.6.12",
 				"typescript": "^4.9.4"
 			}
 		},
+		"node_modules/@baileyherbert/tinro": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@baileyherbert/tinro/-/tinro-1.0.0.tgz",
+			"integrity": "sha512-o2ivTZOou205Kq/ivr18oPnB05/K20S8V6REi+ge+Xg9zzHrrTOhjwt56SGPOCSnCl1TeXa4ZVCZT3WN5PSDug==",
+			"dev": true
+		},
 		"node_modules/@esbuild-plugins/node-globals-polyfill": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/@esbuild-plugins/node-globals-polyfill/-/node-globals-polyfill-0.1.1.tgz",
@@ -2958,9 +2964,9 @@
 			"dev": true
 		},
 		"node_modules/json5": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-			"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -3012,9 +3018,9 @@
 			}
 		},
 		"node_modules/loader-utils": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz",
-			"integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+			"integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 12.13.0"
@@ -3730,9 +3736,9 @@
 			}
 		},
 		"node_modules/qrcode-decoder": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/qrcode-decoder/-/qrcode-decoder-0.3.3.tgz",
-			"integrity": "sha512-0pwJIK2cHJDPZ2Rpbd0aLcQg3N4pFOnfHjBUNJnutBOCkcGhsYMiyBgDPEaiZQV+pxrM97bkPPKlSkl724u14Q==",
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/qrcode-decoder/-/qrcode-decoder-0.2.2.tgz",
+			"integrity": "sha512-gyysRyA/SHaMn7yDKhFJ8AGNkbTJfSVq/7vtNWtBdW5PdT3m8SLX+YbWY04HRkoS/H7RaI3UfAsOw+cVqsfWHg==",
 			"dependencies": {
 				"jsqr": "^1.4.0"
 			}
@@ -4424,12 +4430,6 @@
 			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
 			"dev": true
 		},
-		"node_modules/tinro": {
-			"version": "0.6.12",
-			"resolved": "https://registry.npmjs.org/tinro/-/tinro-0.6.12.tgz",
-			"integrity": "sha512-YYLh0a21GXXpS66ilZbywfXcPTKQQ+bv3tihoqKqSFQP6/F11N7ZmtRbFWcyZXXPFRSzNxmPJBB8ZhP0GkoS0Q==",
-			"dev": true
-		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -4678,6 +4678,12 @@
 		}
 	},
 	"dependencies": {
+		"@baileyherbert/tinro": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@baileyherbert/tinro/-/tinro-1.0.0.tgz",
+			"integrity": "sha512-o2ivTZOou205Kq/ivr18oPnB05/K20S8V6REi+ge+Xg9zzHrrTOhjwt56SGPOCSnCl1TeXa4ZVCZT3WN5PSDug==",
+			"dev": true
+		},
 		"@esbuild-plugins/node-globals-polyfill": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/@esbuild-plugins/node-globals-polyfill/-/node-globals-polyfill-0.1.1.tgz",
@@ -6627,9 +6633,9 @@
 			"dev": true
 		},
 		"json5": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-			"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
 			"dev": true,
 			"peer": true,
 			"requires": {
@@ -6669,9 +6675,9 @@
 			"dev": true
 		},
 		"loader-utils": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz",
-			"integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+			"integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
 			"dev": true
 		},
 		"locate-path": {
@@ -7159,9 +7165,9 @@
 			"dev": true
 		},
 		"qrcode-decoder": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/qrcode-decoder/-/qrcode-decoder-0.3.3.tgz",
-			"integrity": "sha512-0pwJIK2cHJDPZ2Rpbd0aLcQg3N4pFOnfHjBUNJnutBOCkcGhsYMiyBgDPEaiZQV+pxrM97bkPPKlSkl724u14Q==",
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/qrcode-decoder/-/qrcode-decoder-0.2.2.tgz",
+			"integrity": "sha512-gyysRyA/SHaMn7yDKhFJ8AGNkbTJfSVq/7vtNWtBdW5PdT3m8SLX+YbWY04HRkoS/H7RaI3UfAsOw+cVqsfWHg==",
 			"requires": {
 				"jsqr": "^1.4.0"
 			}
@@ -7633,12 +7639,6 @@
 			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
 			"dev": true
 		},
-		"tinro": {
-			"version": "0.6.12",
-			"resolved": "https://registry.npmjs.org/tinro/-/tinro-0.6.12.tgz",
-			"integrity": "sha512-YYLh0a21GXXpS66ilZbywfXcPTKQQ+bv3tihoqKqSFQP6/F11N7ZmtRbFWcyZXXPFRSzNxmPJBB8ZhP0GkoS0Q==",
-			"dev": true
-		},
 		"to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
diff --git a/package.json b/package.json
index a3a3d25a..a3f094cb 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
 		"check": "svelte-check && tsc --noEmit && eslint ."
 	},
 	"devDependencies": {
+		"@baileyherbert/tinro": "^1.0.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
 		"@rgossiaux/svelte-headlessui": "^1.0.2",
@@ -44,13 +45,12 @@
 		"svelte-check": "^3.0.3",
 		"svelte-preprocess": "^5.0.1",
 		"tailwindcss": "^3.2.4",
-		"tinro": "^0.6.12",
 		"typescript": "^4.9.4"
 	},
 	"dependencies": {
 		"otpauth": "^8.0.3",
 		"protocol-buffers": "^5.0.0",
-		"qrcode-decoder": "^0.3.3",
+		"qrcode-decoder": "^0.2.2",
 		"qrcode-generator": "^1.4.4",
 		"ua-parser-js": "^1.0.33"
 	}