From 08865685df0f5976dcc1d58a9d249ddc45868a1e Mon Sep 17 00:00:00 2001
From: Beef <beefers@riseup.net>
Date: Thu, 20 Oct 2022 07:58:17 +0100
Subject: [PATCH] [Cleanup] Tidy up last night's rushed commit

---
 package.json                            |  3 +--
 pnpm-lock.yaml                          | 35 +------------------------
 src/index.ts                            |  4 +--
 src/lib/debug.ts                        |  2 +-
 src/ui/settings/components/Settings.tsx |  4 +--
 5 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index 6d7fc25..cf5590c 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,7 @@
         "zustand": "^4.1.2"
     },
     "dependencies": {
-        "spitroast": "^1.4.2",
-        "valtio": "^1.7.4"
+        "spitroast": "^1.4.2"
     },
     "pnpm": {
         "peerDependencyRules": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b31bc01..d8bb702 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,12 +9,10 @@ specifiers:
   redux: ^4.2.0
   spitroast: ^1.4.2
   typescript: ^4.8.4
-  valtio: ^1.7.4
   zustand: ^4.1.2
 
 dependencies:
   spitroast: 1.4.2
-  valtio: 1.7.4
 
 devDependencies:
   '@react-native-async-storage/async-storage': 1.17.10
@@ -316,10 +314,6 @@ packages:
       is-plain-obj: 2.1.0
     dev: true
 
-  /proxy-compare/2.3.0:
-    resolution: {integrity: sha512-c3L2CcAi7f7pvlD0D7xsF+2CQIW8C3HaYx2Pfgq8eA4HAl3GAH6/dVYsyBbYF/0XJs2ziGLrzmz5fmzPm6A0pQ==}
-    dev: false
-
   /redux/4.2.0:
     resolution: {integrity: sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==}
     dependencies:
@@ -347,34 +341,7 @@ packages:
     peerDependenciesMeta:
       react:
         optional: true
-
-  /valtio/1.7.4:
-    resolution: {integrity: sha512-x8N7I7hfIlRHQyRe8cx3QJsEYdzMHb12HYUGIDjPruEwLrMpegvS8iZDk4PZ/i8HgeiOPF7Qr78Ke3HA1CGu9A==}
-    engines: {node: '>=12.7.0'}
-    peerDependencies:
-      '@babel/helper-module-imports': '>=7.12'
-      '@babel/types': '>=7.13'
-      aslemammad-vite-plugin-macro: '>=1.0.0-alpha.1'
-      babel-plugin-macros: '>=3.0'
-      react: '>=16.8'
-      vite: '>=2.8.6'
-    peerDependenciesMeta:
-      '@babel/helper-module-imports':
-        optional: true
-      '@babel/types':
-        optional: true
-      aslemammad-vite-plugin-macro:
-        optional: true
-      babel-plugin-macros:
-        optional: true
-      react:
-        optional: true
-      vite:
-        optional: true
-    dependencies:
-      proxy-compare: 2.3.0
-      use-sync-external-store: 1.2.0
-    dev: false
+    dev: true
 
   /zustand/4.1.2:
     resolution: {integrity: sha512-gcRaKchcxFPbImrBb/BKgujOhHhik9YhVpIeP87ETT7uokEe2Szu7KkuZ9ghjtD+/KKkcrRNktR2AiLXPIbKIQ==}
diff --git a/src/index.ts b/src/index.ts
index aded6a2..4237e39 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,8 +2,8 @@ import patcher from "@lib/patcher";
 import logger from "@lib/logger";
 import * as metro from "@metro/filters";
 import * as common from "@metro/common";
-import initSettings from "./ui/settings";
-import { patchLogHook } from "./lib/debug";
+import initSettings from "@ui/settings";
+import { patchLogHook } from "@lib/debug";
 
 console.log("Hello from Vendetta!");
 let erroredOnLoad = false;
diff --git a/src/lib/debug.ts b/src/lib/debug.ts
index 06147f7..660aeb6 100644
--- a/src/lib/debug.ts
+++ b/src/lib/debug.ts
@@ -1,5 +1,5 @@
 import { after } from "spitroast";
-import logger from "./logger";
+import logger from "@lib/logger";
 export let socket: WebSocket;
 
 let iLoveBundlers = eval;
diff --git a/src/ui/settings/components/Settings.tsx b/src/ui/settings/components/Settings.tsx
index 5eb0203..b3c0776 100644
--- a/src/ui/settings/components/Settings.tsx
+++ b/src/ui/settings/components/Settings.tsx
@@ -1,5 +1,5 @@
-import { connectToDebugWS } from "@/lib/debug";
-import { AsyncStorage, React, ReactNative as RN } from "@metro/common";
+import { connectToDebugWS } from "@lib/debug";
+import { React, ReactNative as RN } from "@metro/common";
 import { Forms } from "@ui/components";
 import Version from "./Version";