about summary refs log tree commit diff
path: root/patches
diff options
context:
space:
mode:
authorEric Bailey <git@esb.lol>2023-09-05 14:23:22 -0500
committerGitHub <noreply@github.com>2023-09-05 12:23:22 -0700
commite3e91816d1604c222b5be486c290b075d3faa443 (patch)
tree34a2ad2feeec29337ee03274360b3687952e324c /patches
parent9a3fa512ebcbf9e0b539dd337db967017b626826 (diff)
downloadvoidsky-e3e91816d1604c222b5be486c290b075d3faa443.tar.zst
Upgrade to Expo 49 (#1331)
* update to expo 49

* update expo-camera to fix console erorrs

* run doctor again

* fix ts errors

* patch @sentry/react-native

Getting `cannot read property 'ignoreLogs' of undefined` in this file.
Ironically, this may be a cyclical imports problem. LogBox isn't enabled
in production, so this patch should only affect dev/test.

* fix type error

* reinstall newer reanimated

* pin expo-dev-client to fix reanimated dev-build issue

* fix type errors, fix bad conflict res

* Fix to notifications badge z-index on desktop

---------

Co-authored-by: Paul Frazee <pfrazee@gmail.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/@sentry+react-native+5.5.0.patch14
-rw-r--r--patches/react-native+0.72.4.patch (renamed from patches/react-native+0.71.8.patch)13
2 files changed, 16 insertions, 11 deletions
diff --git a/patches/@sentry+react-native+5.5.0.patch b/patches/@sentry+react-native+5.5.0.patch
new file mode 100644
index 000000000..5ff4ddaba
--- /dev/null
+++ b/patches/@sentry+react-native+5.5.0.patch
@@ -0,0 +1,14 @@
+diff --git a/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js b/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js
+index 7e0b4cd..3fd7406 100644
+--- a/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js
++++ b/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js
+@@ -3,6 +3,8 @@ import { LogBox } from 'react-native';
+  * This is a workaround for using fetch on RN, this is a known issue in react-native and only generates a warning.
+  */
+ export function ignoreRequireCycleLogs() {
+-    LogBox.ignoreLogs(['Require cycle:']);
++    try {
++        LogBox.ignoreLogs(['Require cycle:']);
++    } catch (e) {}
+ }
+ //# sourceMappingURL=ignorerequirecyclelogs.js.map
diff --git a/patches/react-native+0.71.8.patch b/patches/react-native+0.72.4.patch
index ac8fa2be1..d640f6c9e 100644
--- a/patches/react-native+0.71.8.patch
+++ b/patches/react-native+0.72.4.patch
@@ -1,16 +1,7 @@
 diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
-index 1c8f8e0..090bda5 100644
+index 9dca6a5..090bda5 100644
 --- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
 +++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
-@@ -256,7 +256,7 @@ static void *TextFieldSelectionObservingContext = &TextFieldSelectionObservingCo
- 
- - (void)textViewDidChange:(__unused UITextView *)textView
- {
--  if (_ignoreNextTextInputCall) {
-+  if (_ignoreNextTextInputCall && [_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
-     _ignoreNextTextInputCall = NO;
-     return;
-   }
 @@ -266,11 +266,10 @@ static void *TextFieldSelectionObservingContext = &TextFieldSelectionObservingCo
  
  - (void)textViewDidChangeSelection:(__unused UITextView *)textView
@@ -23,4 +14,4 @@ index 1c8f8e0..090bda5 100644
 -  _lastStringStateWasUpdatedWith = _backedTextInputView.attributedText;
    [self textViewProbablyDidChangeSelection];
  }
- 
\ No newline at end of file
+