diff options
author | Eric Bailey <git@esb.lol> | 2023-12-23 17:44:38 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-23 15:44:38 -0800 |
commit | 93f5bb3b1f10cb6011f1770132067fc58df39f3b (patch) | |
tree | ecf0d6987030f3695568eef30d7a4ab4f676cd00 /patches | |
parent | 7d6b7d2fa6ec074db3f38785e46834f826c82772 (diff) | |
download | voidsky-93f5bb3b1f10cb6011f1770132067fc58df39f3b.tar.zst |
Bump react-native to 0.73.1, expo to 50 (#2214)
* Bump to react-native@0.73, bump expo@next Includes bumps for all expo deps and dev dependencies. Updates react-native patch and others, and removes the babel-preset-expo patch. * Remove duplicate Splash ref * Bump more deps * Properly install expo-notifications * Bump webview dep * Bump packages according to expo fix; remove pager-view patch as it is no longer needed * Don't access expo-camera from Web * Fix crypto dep on web * Fix some type issues * Build esnext modules to support dynamic imports --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/babel-preset-expo+9.5.2.patch | 14 | ||||
-rw-r--r-- | patches/metro+0.80.1.patch (renamed from patches/metro+0.76.8.patch) | 0 | ||||
-rw-r--r-- | patches/metro-runtime+0.80.1.patch (renamed from patches/metro-runtime+0.76.8.patch) | 0 | ||||
-rw-r--r-- | patches/metro-transform-worker+0.80.1.patch (renamed from patches/metro-transform-worker+0.76.8.patch) | 6 | ||||
-rw-r--r-- | patches/react-native+0.73.0.patch (renamed from patches/react-native+0.72.5.patch) | 6 | ||||
-rw-r--r-- | patches/react-native-pager-view+6.1.4.patch | 54 |
6 files changed, 6 insertions, 74 deletions
diff --git a/patches/babel-preset-expo+9.5.2.patch b/patches/babel-preset-expo+9.5.2.patch deleted file mode 100644 index 5e328c224..000000000 --- a/patches/babel-preset-expo+9.5.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/node_modules/babel-preset-expo/index.js b/node_modules/babel-preset-expo/index.js -index 2099ee3..2b9e092 100644 ---- a/node_modules/babel-preset-expo/index.js -+++ b/node_modules/babel-preset-expo/index.js -@@ -105,7 +105,8 @@ module.exports = function (api, options = {}) { - ], - ], - plugins: [ -- getObjectRestSpreadPlugin(), -+ // - dan: This will be disabled anyway when we upgrade Expo, but let's do it now. -+ // getObjectRestSpreadPlugin(), - ...extraPlugins, - getAliasPlugin(), - [require.resolve('@babel/plugin-proposal-decorators'), { legacy: true }], diff --git a/patches/metro+0.76.8.patch b/patches/metro+0.80.1.patch index f8ef67c84..f8ef67c84 100644 --- a/patches/metro+0.76.8.patch +++ b/patches/metro+0.80.1.patch diff --git a/patches/metro-runtime+0.76.8.patch b/patches/metro-runtime+0.80.1.patch index 65303775d..65303775d 100644 --- a/patches/metro-runtime+0.76.8.patch +++ b/patches/metro-runtime+0.80.1.patch diff --git a/patches/metro-transform-worker+0.76.8.patch b/patches/metro-transform-worker+0.80.1.patch index d835eee06..65f44e578 100644 --- a/patches/metro-transform-worker+0.76.8.patch +++ b/patches/metro-transform-worker+0.80.1.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/metro-transform-worker/src/index.js b/node_modules/metro-transform-worker/src/index.js -index 27d4cb3..fd71f47 100644 +index cae11e7..42f251b 100644 --- a/node_modules/metro-transform-worker/src/index.js +++ b/node_modules/metro-transform-worker/src/index.js -@@ -190,6 +190,10 @@ async function transformJS(file, { config, options, projectRoot }) { +@@ -189,6 +189,10 @@ async function transformJS(file, { config, options, projectRoot }) { let dependencyMapName = ""; let dependencies; let wrappedAst; @@ -13,7 +13,7 @@ index 27d4cb3..fd71f47 100644 // If the module to transform is a script (meaning that is not part of the // dependency graph and it code will just be prepended to the bundle modules), -@@ -229,19 +233,20 @@ async function transformJS(file, { config, options, projectRoot }) { +@@ -228,19 +232,20 @@ async function transformJS(file, { config, options, projectRoot }) { if (config.unstable_disableModuleWrapping === true) { wrappedAst = ast; } else { diff --git a/patches/react-native+0.72.5.patch b/patches/react-native+0.73.0.patch index d640f6c9e..66f7f7647 100644 --- a/patches/react-native+0.72.5.patch +++ b/patches/react-native+0.73.0.patch @@ -1,7 +1,7 @@ -diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m +diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm index 9dca6a5..090bda5 100644 ---- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m -+++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m +--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm ++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm @@ -266,11 +266,10 @@ static void *TextFieldSelectionObservingContext = &TextFieldSelectionObservingCo - (void)textViewDidChangeSelection:(__unused UITextView *)textView diff --git a/patches/react-native-pager-view+6.1.4.patch b/patches/react-native-pager-view+6.1.4.patch deleted file mode 100644 index d6b4178ab..000000000 --- a/patches/react-native-pager-view+6.1.4.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/node_modules/react-native-pager-view/ios/ReactNativePageView.m b/node_modules/react-native-pager-view/ios/ReactNativePageView.m -index ab0fc7f..1ace752 100644 ---- a/node_modules/react-native-pager-view/ios/ReactNativePageView.m -+++ b/node_modules/react-native-pager-view/ios/ReactNativePageView.m -@@ -1,6 +1,6 @@ - - #import "ReactNativePageView.h" --#import "React/RCTLog.h" -+#import <React/RCTLog.h> - #import <React/RCTViewManager.h> - - #import "UIViewController+CreateExtension.h" -@@ -9,7 +9,7 @@ - #import "RCTOnPageSelected.h" - #import <math.h> - --@interface ReactNativePageView () <UIPageViewControllerDataSource, UIPageViewControllerDelegate, UIScrollViewDelegate> -+@interface ReactNativePageView () <UIPageViewControllerDataSource, UIPageViewControllerDelegate, UIScrollViewDelegate, UIGestureRecognizerDelegate> - - @property(nonatomic, strong) UIPageViewController *reactPageViewController; - @property(nonatomic, strong) RCTEventDispatcher *eventDispatcher; -@@ -80,6 +80,10 @@ - (void)didMoveToWindow { - [self setupInitialController]; - } - -+ UIPanGestureRecognizer* panGestureRecognizer = [UIPanGestureRecognizer new]; -+ panGestureRecognizer.delegate = self; -+ [self addGestureRecognizer: panGestureRecognizer]; -+ - if (self.reactViewController.navigationController != nil && self.reactViewController.navigationController.interactivePopGestureRecognizer != nil) { - [self.scrollView.panGestureRecognizer requireGestureRecognizerToFail:self.reactViewController.navigationController.interactivePopGestureRecognizer]; - } -@@ -463,4 +467,21 @@ - (NSString *)determineScrollDirection:(UIScrollView *)scrollView { - - (BOOL)isLtrLayout { - return [_layoutDirection isEqualToString:@"ltr"]; - } -+ -+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { -+ if (!_overdrag && otherGestureRecognizer == self.scrollView.panGestureRecognizer) { -+ UIPanGestureRecognizer* p = (UIPanGestureRecognizer*) gestureRecognizer; -+ CGPoint velocity = [p velocityInView:self]; -+ if (self.currentIndex == 0 && velocity.x > 0) { -+ self.scrollView.panGestureRecognizer.enabled = false; -+ return NO; -+ } else { -+ self.scrollView.panGestureRecognizer.enabled = self.scrollEnabled; -+ } -+ } else { -+ self.scrollView.panGestureRecognizer.enabled = self.scrollEnabled; -+ } -+ -+ return YES; -+} - @end |