From a20b2cd5dd71425e04485ceaf554eab72ed99580 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Thu, 17 Nov 2022 12:37:38 +0530 Subject: [PATCH 1/3] Update Reanimated Package + Remove manuall patch file --- ios/Podfile.lock | 10 +-- package-lock.json | 14 ++-- package.json | 4 +- .../react-native-reanimated+3.0.0-rc.3.patch | 64 ------------------- 4 files changed, 14 insertions(+), 78 deletions(-) delete mode 100644 patches/react-native-reanimated+3.0.0-rc.3.patch diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e8c0a53362e1..e088c84752d4 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -472,7 +472,7 @@ PODS: - React-Core - react-native-image-manipulator (1.0.5): - React - - react-native-image-picker (4.8.5): + - react-native-image-picker (4.10.1): - React-Core - react-native-netinfo (8.3.1): - React-Core @@ -594,7 +594,7 @@ PODS: - React-Core - RNReactNativeHapticFeedback (1.14.0): - React-Core - - RNReanimated (3.0.0-rc.3): + - RNReanimated (3.0.0-rc.4): - DoubleConversion - FBLazyVector - FBReactNativeSpec @@ -980,7 +980,7 @@ SPEC CHECKSUMS: react-native-document-picker: f68191637788994baed5f57d12994aa32cf8bf88 react-native-flipper: dc5290261fbeeb2faec1bdc57ae6dd8d562e1de4 react-native-image-manipulator: c48f64221cfcd46e9eec53619c4c0374f3328a56 - react-native-image-picker: cd420f97f6ed6ff74fc4686d27dbcfdbd051db91 + react-native-image-picker: f2ab1215d17bcfe27b0eb6417cc236fd1f4775e7 react-native-netinfo: 1a6035d3b9780221d407c277ebfb5722ace00658 react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa react-native-plaid-link-sdk: 77052f329310ff5a36ddda276793f40d27c02bc4 @@ -1013,7 +1013,7 @@ SPEC CHECKSUMS: RNGestureHandler: 920eb17f5b1e15dae6e5ed1904045f8f90e0b11e RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c - RNReanimated: 6c980139eb3b043569a08b8cb3d92cdf46bd54fa + RNReanimated: 9d50cc094df0b3846db3a7954208b466d342ca7d RNScreens: 0df01424e9e0ed7827200d6ed1087ddd06c493f9 RNSVG: 38ca962c970dbce1ca38991a5aebf26d163f9efb SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d @@ -1025,4 +1025,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 48093a300788c218e76f70cf6d102915cd993f34 -COCOAPODS: 1.11.3 +COCOAPODS: 1.11.2 diff --git a/package-lock.json b/package-lock.json index 1bcaf91a2f39..131d60fa4653 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "react-native-permissions": "^3.0.1", "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#7f09b2c15ffae320d769788f75bdf8948714bb10", "react-native-plaid-link-sdk": "^7.2.0", - "react-native-reanimated": "3.0.0-rc.3", + "react-native-reanimated": "3.0.0-rc.4", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.17.0", @@ -35539,9 +35539,9 @@ } }, "node_modules/react-native-reanimated": { - "version": "3.0.0-rc.3", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.0.0-rc.3.tgz", - "integrity": "sha512-kFkbazXfhq/zb3sQyLIFegLqxzPMJAd36pbz7jtOphZ1mEXDadX0ODp6eD7/PJHnLqYGHtsqSI8WMMLLN6rdjw==", + "version": "3.0.0-rc.4", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.0.0-rc.4.tgz", + "integrity": "sha512-kBVx6JJceNe++QfBVV/poDEYn1XLqI6AcJzsu9OprNsKwAeqP6KysrY92crfC1txBr1lRPK0ClKjRhifPwFhlg==", "dependencies": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", @@ -69853,9 +69853,9 @@ "requires": {} }, "react-native-reanimated": { - "version": "3.0.0-rc.3", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.0.0-rc.3.tgz", - "integrity": "sha512-kFkbazXfhq/zb3sQyLIFegLqxzPMJAd36pbz7jtOphZ1mEXDadX0ODp6eD7/PJHnLqYGHtsqSI8WMMLLN6rdjw==", + "version": "3.0.0-rc.4", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.0.0-rc.4.tgz", + "integrity": "sha512-kBVx6JJceNe++QfBVV/poDEYn1XLqI6AcJzsu9OprNsKwAeqP6KysrY92crfC1txBr1lRPK0ClKjRhifPwFhlg==", "requires": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", diff --git a/package.json b/package.json index d5f340da47b8..5c5797f3c76f 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "license": "MIT", "private": true, "scripts": { - "postinstall": "npx patch-package && cd desktop && npm install", + "postinstall": "cd desktop && npm install", "clean": "npx react-native clean-project-auto", "android": "scripts/set-pusher-suffix.sh && npx react-native run-android --port=8083", "ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --port=8082", @@ -103,7 +103,7 @@ "react-native-permissions": "^3.0.1", "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#7f09b2c15ffae320d769788f75bdf8948714bb10", "react-native-plaid-link-sdk": "^7.2.0", - "react-native-reanimated": "3.0.0-rc.3", + "react-native-reanimated": "3.0.0-rc.4", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.17.0", diff --git a/patches/react-native-reanimated+3.0.0-rc.3.patch b/patches/react-native-reanimated+3.0.0-rc.3.patch deleted file mode 100644 index 321bcc07419f..000000000000 --- a/patches/react-native-reanimated+3.0.0-rc.3.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/node_modules/react-native-reanimated/RNReanimated.podspec b/node_modules/react-native-reanimated/RNReanimated.podspec -index 3205c93..c7f2821 100644 ---- a/node_modules/react-native-reanimated/RNReanimated.podspec -+++ b/node_modules/react-native-reanimated/RNReanimated.podspec -@@ -49,7 +49,12 @@ rescue - end - end - --reactCommonDir = File.join(nodeModulesDir, "react-native", "ReactCommon") -+ -+# From: https://github.com/software-mansion/react-native-reanimated/pull/3701/files -+pods_root = Pod::Config.instance.project_pods_root -+react_native_common_dir_absolute = File.join(nodeModulesDir, 'react-native', 'ReactCommon') -+react_native_common_dir_relative = Pathname.new(react_native_common_dir_absolute).relative_path_from(pods_root).to_s -+reactCommonDir = react_native_common_dir_relative - - if isUserApp - libInstances = %x[find ../../ -name "package.json" | grep "/react-native-reanimated/package.json" | grep -v "/.yarn/"] -@@ -111,9 +116,10 @@ Pod::Spec.new do |s| - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - } - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + ' -DHERMES_ENABLE_DEBUGGER' -- s.xcconfig = { -- "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"#{reactCommonDir}\"", -- "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + fabric_flags } -+ s.xcconfig = { -+ "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/Headers/Public/React-hermes\" \"$(PODS_ROOT)/Headers/Public/hermes-engine\" \"$(PODS_ROOT)/#{reactCommonDir}\"", -+ "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + fabric_flags -+ } - - s.requires_arc = true - -diff --git a/node_modules/react-native-reanimated/ios/REAModule.mm b/node_modules/react-native-reanimated/ios/REAModule.mm -index e1cd2f4..8ba248d 100644 ---- a/node_modules/react-native-reanimated/ios/REAModule.mm -+++ b/node_modules/react-native-reanimated/ios/REAModule.mm -@@ -52,6 +52,7 @@ @implementation REAModule { - #ifdef DEBUG - SingleInstanceChecker singleInstanceChecker_; - #endif -+ bool hasListeners; - } - - RCT_EXPORT_MODULE(ReanimatedModule); -@@ -291,4 +292,19 @@ - (void)eventDispatcherWillDispatchEvent:(id)event - [_nodesManager dispatchEvent:event]; - } - -+- (void)startObserving { -+ hasListeners = YES; -+} -+ -+- (void)stopObserving { -+ hasListeners = NO; -+} -+ -+- (void)sendEventWithName:(NSString *)eventName body:(id)body -+{ -+ if (hasListeners) { -+ [super sendEventWithName:eventName body:body]; -+ } -+} -+ - @end From ee3591bfb510bf7a064fb077c774c686784f993c Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Thu, 17 Nov 2022 18:08:23 +0530 Subject: [PATCH 2/3] Rc-6 updated --- ios/Podfile.lock | 4 ++-- package-lock.json | 14 +++++++------- package.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e088c84752d4..93e6058327a0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -594,7 +594,7 @@ PODS: - React-Core - RNReactNativeHapticFeedback (1.14.0): - React-Core - - RNReanimated (3.0.0-rc.4): + - RNReanimated (3.0.0-rc.6): - DoubleConversion - FBLazyVector - FBReactNativeSpec @@ -1013,7 +1013,7 @@ SPEC CHECKSUMS: RNGestureHandler: 920eb17f5b1e15dae6e5ed1904045f8f90e0b11e RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c - RNReanimated: 9d50cc094df0b3846db3a7954208b466d342ca7d + RNReanimated: 069f3aff5df4cbefaf81589c0622370073a89f1d RNScreens: 0df01424e9e0ed7827200d6ed1087ddd06c493f9 RNSVG: 38ca962c970dbce1ca38991a5aebf26d163f9efb SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d diff --git a/package-lock.json b/package-lock.json index 131d60fa4653..72801c1eeb51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "react-native-permissions": "^3.0.1", "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#7f09b2c15ffae320d769788f75bdf8948714bb10", "react-native-plaid-link-sdk": "^7.2.0", - "react-native-reanimated": "3.0.0-rc.4", + "react-native-reanimated": "3.0.0-rc.6", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.17.0", @@ -35539,9 +35539,9 @@ } }, "node_modules/react-native-reanimated": { - "version": "3.0.0-rc.4", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.0.0-rc.4.tgz", - "integrity": "sha512-kBVx6JJceNe++QfBVV/poDEYn1XLqI6AcJzsu9OprNsKwAeqP6KysrY92crfC1txBr1lRPK0ClKjRhifPwFhlg==", + "version": "3.0.0-rc.6", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.0.0-rc.6.tgz", + "integrity": "sha512-XdJP4yESxU5kyxZtExwa4uEBF3fUJ7jQTzptMg/KBANZazKnNUW+UwgpW6MQ0xyLSqcHY/essYcGadCU6wHu3A==", "dependencies": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", @@ -69853,9 +69853,9 @@ "requires": {} }, "react-native-reanimated": { - "version": "3.0.0-rc.4", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.0.0-rc.4.tgz", - "integrity": "sha512-kBVx6JJceNe++QfBVV/poDEYn1XLqI6AcJzsu9OprNsKwAeqP6KysrY92crfC1txBr1lRPK0ClKjRhifPwFhlg==", + "version": "3.0.0-rc.6", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.0.0-rc.6.tgz", + "integrity": "sha512-XdJP4yESxU5kyxZtExwa4uEBF3fUJ7jQTzptMg/KBANZazKnNUW+UwgpW6MQ0xyLSqcHY/essYcGadCU6wHu3A==", "requires": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", diff --git a/package.json b/package.json index 5c5797f3c76f..e0af97e86533 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "react-native-permissions": "^3.0.1", "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#7f09b2c15ffae320d769788f75bdf8948714bb10", "react-native-plaid-link-sdk": "^7.2.0", - "react-native-reanimated": "3.0.0-rc.4", + "react-native-reanimated": "3.0.0-rc.6", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.17.0", From 5267542140f1d4f0b26139fcc2188cd27a4347b1 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Wed, 23 Nov 2022 07:40:27 +0530 Subject: [PATCH 3/3] patch command added back --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0af97e86533..b87396601c79 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "license": "MIT", "private": true, "scripts": { - "postinstall": "cd desktop && npm install", + "postinstall": "npx patch-package && cd desktop && npm install", "clean": "npx react-native clean-project-auto", "android": "scripts/set-pusher-suffix.sh && npx react-native run-android --port=8083", "ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --port=8082",