From 5560a136e6d571f4ef8dacbe668c027ef5bdf147 Mon Sep 17 00:00:00 2001
From: Beef <beefers@riseup.net>
Date: Sat, 14 Jan 2023 16:04:24 +0000
Subject: [PATCH] [Meta] Fix dependency resolution issues

---
 package.json   |  7 +++++--
 pnpm-lock.yaml | 23 +++++++++--------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 4695518..9e746d2 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
     "license": "BSD-3-Clause",
     "devDependencies": {
         "@react-native-async-storage/async-storage": "^1.17.11",
-        "@types/react": "^18.0.26",
-        "@types/react-native": "~0.68.1",
+        "@types/react": "18.0.26",
+        "@types/react-native": "0.68.1",
         "esbuild": "^0.16.17",
         "esbuild-plugin-alias": "^0.2.1",
         "esbuild-plugin-external-global": "^1.0.1",
@@ -26,6 +26,9 @@
     "dependencies": {
         "spitroast": "^1.4.2"
     },
+    "resolutions": {
+        "@types/react": "18.0.26"
+    },
     "pnpm": {
         "peerDependencyRules": {
             "ignoreMissing": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e035b2e..879b65a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,9 +1,12 @@
 lockfileVersion: 5.4
 
+overrides:
+  '@types/react': 18.0.26
+
 specifiers:
   '@react-native-async-storage/async-storage': ^1.17.11
-  '@types/react': ^18.0.26
-  '@types/react-native': ~0.68.1
+  '@types/react': 18.0.26
+  '@types/react-native': 0.68.1
   esbuild: ^0.16.17
   esbuild-plugin-alias: ^0.2.1
   esbuild-plugin-external-global: ^1.0.1
@@ -17,7 +20,7 @@ dependencies:
 devDependencies:
   '@react-native-async-storage/async-storage': 1.17.11
   '@types/react': 18.0.26
-  '@types/react-native': 0.68.10
+  '@types/react-native': 0.68.1
   esbuild: 0.16.17
   esbuild-plugin-alias: 0.2.1
   esbuild-plugin-external-global: 1.0.1
@@ -239,18 +242,10 @@ packages:
     resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
     dev: true
 
-  /@types/react-native/0.68.10:
-    resolution: {integrity: sha512-BFmi9wERGJutVg0rgkS63gV2w8yPoug2PeF3SmeOkW3c5TbfFLI74iPpAMu/wxcJSnlEuwkMp6RXatZZe8fulg==}
+  /@types/react-native/0.68.1:
+    resolution: {integrity: sha512-S+r6VamWqVutlQ3q/vhTn4b0F/DdZj8R6AIDdgwV9xN9Ln1kRdQd7o3mo7FnfdddVdzEkWMUVlK2sbkFOJFAiQ==}
     dependencies:
-      '@types/react': 17.0.52
-    dev: true
-
-  /@types/react/17.0.52:
-    resolution: {integrity: sha512-vwk8QqVODi0VaZZpDXQCmEmiOuyjEFPY7Ttaw5vjM112LOq37yz1CDJGrRJwA1fYEq4Iitd5rnjd1yWAc/bT+A==}
-    dependencies:
-      '@types/prop-types': 15.7.5
-      '@types/scheduler': 0.16.2
-      csstype: 3.1.1
+      '@types/react': 18.0.26
     dev: true
 
   /@types/react/18.0.26: