From e3e91816d1604c222b5be486c290b075d3faa443 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 5 Sep 2023 14:23:22 -0500 Subject: 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 --- patches/@sentry+react-native+5.5.0.patch | 14 ++++++++++++++ patches/react-native+0.71.8.patch | 26 -------------------------- patches/react-native+0.72.4.patch | 17 +++++++++++++++++ 3 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 patches/@sentry+react-native+5.5.0.patch delete mode 100644 patches/react-native+0.71.8.patch create mode 100644 patches/react-native+0.72.4.patch (limited to 'patches') 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.71.8.patch deleted file mode 100644 index ac8fa2be1..000000000 --- a/patches/react-native+0.71.8.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 ---- 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 - { -- if (_lastStringStateWasUpdatedWith && ![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) { -+ if (![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) { - [self textViewDidChange:_backedTextInputView]; - _ignoreNextTextInputCall = YES; - } -- _lastStringStateWasUpdatedWith = _backedTextInputView.attributedText; - [self textViewProbablyDidChangeSelection]; - } - \ No newline at end of file diff --git a/patches/react-native+0.72.4.patch b/patches/react-native+0.72.4.patch new file mode 100644 index 000000000..d640f6c9e --- /dev/null +++ b/patches/react-native+0.72.4.patch @@ -0,0 +1,17 @@ +diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m +index 9dca6a5..090bda5 100644 +--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m ++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m +@@ -266,11 +266,10 @@ static void *TextFieldSelectionObservingContext = &TextFieldSelectionObservingCo + + - (void)textViewDidChangeSelection:(__unused UITextView *)textView + { +- if (_lastStringStateWasUpdatedWith && ![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) { ++ if (![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) { + [self textViewDidChange:_backedTextInputView]; + _ignoreNextTextInputCall = YES; + } +- _lastStringStateWasUpdatedWith = _backedTextInputView.attributedText; + [self textViewProbablyDidChangeSelection]; + } + -- cgit 1.4.1