From 1ddba1be4b590cf0c4d52417dbe353fc2ba016a8 Mon Sep 17 00:00:00 2001 From: Wojciech Stanisz Date: Mon, 11 Sep 2023 21:41:50 +0200 Subject: [PATCH 1/9] Bump reanimated to 3.5.0 --- 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 2bea672171fe..1c041db94691 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -783,7 +783,7 @@ PODS: - React-Core - RNReactNativeHapticFeedback (1.14.0): - React-Core - - RNReanimated (3.4.0): + - RNReanimated (3.5.0): - DoubleConversion - FBLazyVector - glog @@ -1298,7 +1298,7 @@ SPEC CHECKSUMS: rnmapbox-maps: 6f638ec002aa6e906a6f766d69cd45f968d98e64 RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c - RNReanimated: 020859659f64be2d30849a1fe88c821a7c3e0cbf + RNReanimated: fd0dc9a5889bfac6c45a922b26c902dc6185b4dc RNScreens: d037903436160a4b039d32606668350d2a808806 RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d diff --git a/package-lock.json b/package-lock.json index cd763dffefbe..aa5702b52e34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -94,7 +94,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "3.4.0", + "react-native-reanimated": "^3.5.0", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", @@ -41013,9 +41013,9 @@ } }, "node_modules/react-native-reanimated": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.4.0.tgz", - "integrity": "sha512-B5cZJseoIkYlZTRBRN0xuU1NBxUza/6GSHhiEBQfbOufWVlUMMcWUecIRVglW49l8d2wXbfCdQlNyVoFqmHkaQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.0.tgz", + "integrity": "sha512-om2AfxCD0YyBvGADJ5Ql38CKIJ8MXZTTpve1jt94TcRjLHXui24wYomoumSnnBQEfeRDzjwpmFdqcLtJ5mU5Pg==", "dependencies": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", @@ -76740,9 +76740,9 @@ "requires": {} }, "react-native-reanimated": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.4.0.tgz", - "integrity": "sha512-B5cZJseoIkYlZTRBRN0xuU1NBxUza/6GSHhiEBQfbOufWVlUMMcWUecIRVglW49l8d2wXbfCdQlNyVoFqmHkaQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.0.tgz", + "integrity": "sha512-om2AfxCD0YyBvGADJ5Ql38CKIJ8MXZTTpve1jt94TcRjLHXui24wYomoumSnnBQEfeRDzjwpmFdqcLtJ5mU5Pg==", "requires": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", diff --git a/package.json b/package.json index 6666fd19cf7a..59ef49d40199 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "3.4.0", + "react-native-reanimated": "3.5.0", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", From 0a4b9501e3519dc877d8706d61c7ab5c9bfaa786 Mon Sep 17 00:00:00 2001 From: Wojciech Stanisz Date: Tue, 12 Sep 2023 14:27:04 +0200 Subject: [PATCH 2/9] Bump to 3.5.1 --- 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 1c041db94691..99f77ea908d1 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -783,7 +783,7 @@ PODS: - React-Core - RNReactNativeHapticFeedback (1.14.0): - React-Core - - RNReanimated (3.5.0): + - RNReanimated (3.5.1): - DoubleConversion - FBLazyVector - glog @@ -1298,7 +1298,7 @@ SPEC CHECKSUMS: rnmapbox-maps: 6f638ec002aa6e906a6f766d69cd45f968d98e64 RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c - RNReanimated: fd0dc9a5889bfac6c45a922b26c902dc6185b4dc + RNReanimated: 99aa8c96151abbc2d7e737a56ec62aca709f0c92 RNScreens: d037903436160a4b039d32606668350d2a808806 RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d diff --git a/package-lock.json b/package-lock.json index aa5702b52e34..3784b4a01e9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -94,7 +94,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "^3.5.0", + "react-native-reanimated": "^3.5.1", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", @@ -41013,9 +41013,9 @@ } }, "node_modules/react-native-reanimated": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.0.tgz", - "integrity": "sha512-om2AfxCD0YyBvGADJ5Ql38CKIJ8MXZTTpve1jt94TcRjLHXui24wYomoumSnnBQEfeRDzjwpmFdqcLtJ5mU5Pg==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.1.tgz", + "integrity": "sha512-ZBTOKibTn1IR5IaoQkpPCibuao5SjXR6Pzx+KHM50wrvBnL1PecsnQjmL2VEj8hbwshrzgRGgGt1XM82DKrykw==", "dependencies": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", @@ -76740,9 +76740,9 @@ "requires": {} }, "react-native-reanimated": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.0.tgz", - "integrity": "sha512-om2AfxCD0YyBvGADJ5Ql38CKIJ8MXZTTpve1jt94TcRjLHXui24wYomoumSnnBQEfeRDzjwpmFdqcLtJ5mU5Pg==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.1.tgz", + "integrity": "sha512-ZBTOKibTn1IR5IaoQkpPCibuao5SjXR6Pzx+KHM50wrvBnL1PecsnQjmL2VEj8hbwshrzgRGgGt1XM82DKrykw==", "requires": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", diff --git a/package.json b/package.json index 59ef49d40199..fbdc85a4ba63 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "3.5.0", + "react-native-reanimated": "^3.5.1", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", From 2e71d6530c664746954087c09366346ef9c31a30 Mon Sep 17 00:00:00 2001 From: Wojciech Stanisz Date: Tue, 12 Sep 2023 14:29:18 +0200 Subject: [PATCH 3/9] Add patch to fix typecheck --- patches/react-native-reanimated+3.5.1.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 patches/react-native-reanimated+3.5.1.patch diff --git a/patches/react-native-reanimated+3.5.1.patch b/patches/react-native-reanimated+3.5.1.patch new file mode 100644 index 000000000000..69c8f7028a58 --- /dev/null +++ b/patches/react-native-reanimated+3.5.1.patch @@ -0,0 +1,11 @@ +diff --git a/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts b/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts +index 4df2481..cca7f1a 100644 +--- a/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts ++++ b/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts +@@ -40,5 +40,5 @@ export function isReducedMotion() { + ? isWindowAvailable() + ? !window.matchMedia('(prefers-reduced-motion: no-preference)').matches + : false +- : global._REANIMATED_IS_REDUCED_MOTION ?? false; ++ : (global as any)._REANIMATED_IS_REDUCED_MOTION ?? false; + } From d385296c394ec73967850e0e42f5ddd5ff537564 Mon Sep 17 00:00:00 2001 From: Wojciech Stanisz Date: Fri, 15 Sep 2023 18:11:58 +0200 Subject: [PATCH 4/9] Bump to 3.5.2 to fix release crash --- ios/Podfile.lock | 4 ++-- package-lock.json | 14 +++++++------- package.json | 6 +++--- ...1.patch => react-native-reanimated+3.5.2.patch} | 0 4 files changed, 12 insertions(+), 12 deletions(-) rename patches/{react-native-reanimated+3.5.1.patch => react-native-reanimated+3.5.2.patch} (100%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1b39c43809f6..1d20b93a3a39 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -783,7 +783,7 @@ PODS: - React-Core - RNReactNativeHapticFeedback (1.14.0): - React-Core - - RNReanimated (3.5.1): + - RNReanimated (3.5.2): - DoubleConversion - FBLazyVector - glog @@ -1298,7 +1298,7 @@ SPEC CHECKSUMS: rnmapbox-maps: 6f638ec002aa6e906a6f766d69cd45f968d98e64 RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c - RNReanimated: 99aa8c96151abbc2d7e737a56ec62aca709f0c92 + RNReanimated: 2491645f0883526f4470d8b5c761308709ba31f8 RNScreens: d037903436160a4b039d32606668350d2a808806 RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d diff --git a/package-lock.json b/package-lock.json index 9ca93346d61f..bfb5ad3518e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "^3.5.1", + "react-native-reanimated": "^3.5.2", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", @@ -40696,9 +40696,9 @@ } }, "node_modules/react-native-reanimated": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.1.tgz", - "integrity": "sha512-ZBTOKibTn1IR5IaoQkpPCibuao5SjXR6Pzx+KHM50wrvBnL1PecsnQjmL2VEj8hbwshrzgRGgGt1XM82DKrykw==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.2.tgz", + "integrity": "sha512-Uv9imJ6ZC7F/tTSpjjfo/0AZlw19Lag63+MUqF6p483LOoRkYtYP3JmtVV402mQWfhL1LPMeyAu/1spRjPKCCQ==", "dependencies": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", @@ -76177,9 +76177,9 @@ "requires": {} }, "react-native-reanimated": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.1.tgz", - "integrity": "sha512-ZBTOKibTn1IR5IaoQkpPCibuao5SjXR6Pzx+KHM50wrvBnL1PecsnQjmL2VEj8hbwshrzgRGgGt1XM82DKrykw==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.2.tgz", + "integrity": "sha512-Uv9imJ6ZC7F/tTSpjjfo/0AZlw19Lag63+MUqF6p483LOoRkYtYP3JmtVV402mQWfhL1LPMeyAu/1spRjPKCCQ==", "requires": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", diff --git a/package.json b/package.json index 3fcbe801e47a..48e9c878dd44 100644 --- a/package.json +++ b/package.json @@ -61,9 +61,9 @@ "@formatjs/intl-pluralrules": "^5.2.2", "@gorhom/portal": "^1.0.14", "@invertase/react-native-apple-authentication": "^2.2.2", - "@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#5cdae3d4455b03a04c57f50be3863e2fe6c92c52", "@kie/act-js": "^2.0.1", "@kie/mock-github": "^1.0.0", + "@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#5cdae3d4455b03a04c57f50be3863e2fe6c92c52", "@onfido/react-native-sdk": "7.4.0", "@react-native-async-storage/async-storage": "^1.17.10", "@react-native-camera-roll/camera-roll": "5.4.0", @@ -81,9 +81,9 @@ "@react-navigation/stack": "6.3.16", "@react-ng/bounds-observer": "^0.2.1", "@rnmapbox/maps": "^10.0.11", + "@types/node": "^18.14.0", "@ua/react-native-airship": "^15.2.6", "awesome-phonenumber": "^5.4.0", - "@types/node": "^18.14.0", "babel-plugin-transform-remove-console": "^6.9.4", "babel-polyfill": "^6.26.0", "canvas-size": "^1.2.6", @@ -141,7 +141,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "^3.5.1", + "react-native-reanimated": "^3.5.2", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", diff --git a/patches/react-native-reanimated+3.5.1.patch b/patches/react-native-reanimated+3.5.2.patch similarity index 100% rename from patches/react-native-reanimated+3.5.1.patch rename to patches/react-native-reanimated+3.5.2.patch From 1e2afb2362be1f8f4d821163fd10eac79e1457f3 Mon Sep 17 00:00:00 2001 From: Wojciech Stanisz Date: Fri, 15 Sep 2023 18:49:55 +0200 Subject: [PATCH 5/9] Remove autogenerated imports in patch --- patches/react-native-reanimated+3.5.2.patch | 41 +++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/patches/react-native-reanimated+3.5.2.patch b/patches/react-native-reanimated+3.5.2.patch index 69c8f7028a58..c509e4c4cd2e 100644 --- a/patches/react-native-reanimated+3.5.2.patch +++ b/patches/react-native-reanimated+3.5.2.patch @@ -1,3 +1,44 @@ +diff --git a/node_modules/react-native-reanimated/lib/module/reanimated2/index.js b/node_modules/react-native-reanimated/lib/module/reanimated2/index.js +index 0027008..2aea2ff 100644 +--- a/node_modules/react-native-reanimated/lib/module/reanimated2/index.js ++++ b/node_modules/react-native-reanimated/lib/module/reanimated2/index.js +@@ -1,15 +1,15 @@ + import './publicGlobals'; +-export { runOnJS, runOnUI, createWorkletRuntime, WorkletRuntime, makeMutable, makeShareableCloneRecursive, isReanimated3, isConfigured, enableLayoutAnimations, getViewProp } from './core'; +-export { useAnimatedProps, useEvent, useHandler, useWorkletCallback, useSharedValue, useReducedMotion, useAnimatedStyle, useAnimatedGestureHandler, GestureHandlers, useAnimatedReaction, AnimatedRef, useAnimatedRef, useAnimatedScrollHandler, ScrollHandler, ScrollHandlers, useDerivedValue, DerivedValue, useAnimatedSensor, useFrameCallback, FrameCallback, useAnimatedKeyboard, useScrollViewOffset } from './hook'; +-export { DelayAnimation, RepeatAnimation, SequenceAnimation, StyleLayoutAnimation, cancelAnimation, defineAnimation, withTiming, WithTimingConfig, TimingAnimation, withSpring, WithSpringConfig, SpringAnimation, withDecay, WithDecayConfig, DecayAnimation, withDelay, withRepeat, withSequence } from './animation'; +-export { Extrapolation, ExtrapolationConfig, ExtrapolationType, interpolate, clamp } from './interpolation'; +-export { Extrapolate, InterpolationOptions, interpolateColor, ColorSpace, InterpolateConfig, useInterpolateConfig, InterpolateRGB, InterpolateHSV } from './interpolateColor'; +-export { EasingFunction, EasingFn, EasingFunctionFactory, EasingFactoryFn, Easing } from './Easing'; ++export { runOnJS, runOnUI, createWorkletRuntime, makeMutable, makeShareableCloneRecursive, isReanimated3, isConfigured, enableLayoutAnimations, getViewProp } from './core'; ++export { useAnimatedProps, useEvent, useHandler, useWorkletCallback, useSharedValue, useReducedMotion, useAnimatedStyle, useAnimatedGestureHandler, useAnimatedReaction, useAnimatedRef, useAnimatedScrollHandler, useDerivedValue, useAnimatedSensor, useFrameCallback, useAnimatedKeyboard, useScrollViewOffset } from './hook'; ++export { cancelAnimation, defineAnimation, withTiming, withSpring, withDecay, withDelay, withRepeat, withSequence } from './animation'; ++export { interpolate, clamp } from './interpolation'; ++export { Extrapolate, interpolateColor, useInterpolateConfig } from './interpolateColor'; ++export { Easing } from './Easing'; + export { measure, dispatchCommand, scrollTo, setGestureState } from './NativeMethods'; + export { setNativeProps } from './SetNativeProps'; +-export { isColor, processColor, ParsedColorArray, convertToRGBA } from './Colors'; ++export { isColor, processColor, convertToRGBA } from './Colors'; + export { createAnimatedPropAdapter } from './PropAdapters'; +-export { BaseAnimationBuilder, ComplexAnimationBuilder, Keyframe, LayoutAnimation, EntryAnimationsValues, ExitAnimationsValues, EntryExitAnimationFunction, LayoutAnimationsValues, LayoutAnimationFunction, ILayoutAnimationBuilder, IEntryExitAnimationBuilder, ++export { BaseAnimationBuilder, ComplexAnimationBuilder, Keyframe, + // Flip + FlipInXUp, FlipInYLeft, FlipInXDown, FlipInYRight, FlipInEasyX, FlipInEasyY, FlipOutXUp, FlipOutYLeft, FlipOutXDown, FlipOutYRight, FlipOutEasyX, FlipOutEasyY, + // Stretch +@@ -34,9 +34,7 @@ RollInLeft, RollInRight, RollOutLeft, RollOutRight, + Layout, LinearTransition, FadingTransition, SequencedTransition, JumpingTransition, CurvedTransition, EntryExitTransition, combineTransition, + // SET + SharedTransition, SharedTransitionType } from './layoutReanimation'; +-export { getRelativeCoords, ComponentCoords, isSharedValue } from './utils'; +-export { StyleProps, SharedValue, AnimatableValueObject, AnimatableValue, AnimationObject, Animation, SensorType, IOSReferenceFrame, SensorConfig, AnimatedSensor, AnimationCallback, Value3D, ValueRotation, InterfaceOrientation, KeyboardState, AnimatedKeyboardInfo, MeasuredDimensions, AnimatedKeyboardOptions, ReduceMotion } from './commonTypes'; +-export { FrameInfo } from './frameCallback'; ++export { getRelativeCoords, isSharedValue } from './utils'; ++export { SensorType, IOSReferenceFrame, InterfaceOrientation, KeyboardState, ReduceMotion } from './commonTypes'; + export { getUseOfValueInStyleWarning } from './pluginUtils'; +-export { withReanimatedTimer, advanceAnimationByTime, advanceAnimationByFrame, setUpTests, getAnimatedStyle } from './jestUtils'; + //# sourceMappingURL=index.js.map +\ No newline at end of file diff --git a/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts b/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts index 4df2481..cca7f1a 100644 --- a/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts From 3deab5e032cbc4c090f906ca38b18b2b91d688b1 Mon Sep 17 00:00:00 2001 From: Wojciech Stanisz Date: Wed, 20 Sep 2023 16:57:31 +0200 Subject: [PATCH 6/9] Bump reanimated to 3.5.3 --- ios/Podfile.lock | 4 +- package-lock.json | 34 ++++++++------ package.json | 2 +- patches/react-native-reanimated+3.5.2.patch | 52 --------------------- 4 files changed, 23 insertions(+), 69 deletions(-) delete mode 100644 patches/react-native-reanimated+3.5.2.patch diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1d20b93a3a39..9c14d69aca55 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -783,7 +783,7 @@ PODS: - React-Core - RNReactNativeHapticFeedback (1.14.0): - React-Core - - RNReanimated (3.5.2): + - RNReanimated (3.5.3): - DoubleConversion - FBLazyVector - glog @@ -1298,7 +1298,7 @@ SPEC CHECKSUMS: rnmapbox-maps: 6f638ec002aa6e906a6f766d69cd45f968d98e64 RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c - RNReanimated: 2491645f0883526f4470d8b5c761308709ba31f8 + RNReanimated: e037aac4d8b0055a399f5af065e8210f6c8cc900 RNScreens: d037903436160a4b039d32606668350d2a808806 RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d diff --git a/package-lock.json b/package-lock.json index bfb5ad3518e8..68ca30f17289 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "^3.5.2", + "react-native-reanimated": "^3.5.3", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", @@ -1777,10 +1777,11 @@ } }, "node_modules/@babel/plugin-transform-object-assign": { - "version": "7.18.6", - "license": "MIT", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.22.5.tgz", + "integrity": "sha512-iDhx9ARkXq4vhZ2CYOSnQXkmxkDgosLi3J8Z17mKz7LyzthtkdVchLD7WZ3aXeCuvJDOW3+1I5TpJmwIbF9MKQ==", "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -40696,9 +40697,9 @@ } }, "node_modules/react-native-reanimated": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.2.tgz", - "integrity": "sha512-Uv9imJ6ZC7F/tTSpjjfo/0AZlw19Lag63+MUqF6p483LOoRkYtYP3JmtVV402mQWfhL1LPMeyAu/1spRjPKCCQ==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.3.tgz", + "integrity": "sha512-zjGJL2rgYLiEqIwaIOd+/dgRZzot4wKUvKk0ZXeWY7SJg4Bp+9yQTOT98Jx6b1/Cga2YY71i0tIu3hanLajGAQ==", "dependencies": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", @@ -40718,7 +40719,8 @@ }, "node_modules/react-native-reanimated/node_modules/convert-source-map": { "version": "2.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" }, "node_modules/react-native-render-html": { "version": "6.3.1", @@ -49140,9 +49142,11 @@ } }, "@babel/plugin-transform-object-assign": { - "version": "7.18.6", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.22.5.tgz", + "integrity": "sha512-iDhx9ARkXq4vhZ2CYOSnQXkmxkDgosLi3J8Z17mKz7LyzthtkdVchLD7WZ3aXeCuvJDOW3+1I5TpJmwIbF9MKQ==", "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-object-rest-spread": { @@ -76177,9 +76181,9 @@ "requires": {} }, "react-native-reanimated": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.2.tgz", - "integrity": "sha512-Uv9imJ6ZC7F/tTSpjjfo/0AZlw19Lag63+MUqF6p483LOoRkYtYP3JmtVV402mQWfhL1LPMeyAu/1spRjPKCCQ==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.3.tgz", + "integrity": "sha512-zjGJL2rgYLiEqIwaIOd+/dgRZzot4wKUvKk0ZXeWY7SJg4Bp+9yQTOT98Jx6b1/Cga2YY71i0tIu3hanLajGAQ==", "requires": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", @@ -76188,7 +76192,9 @@ }, "dependencies": { "convert-source-map": { - "version": "2.0.0" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" } } }, diff --git a/package.json b/package.json index 48e9c878dd44..dabb5d0afde9 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "^3.5.2", + "react-native-reanimated": "^3.5.3", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", diff --git a/patches/react-native-reanimated+3.5.2.patch b/patches/react-native-reanimated+3.5.2.patch deleted file mode 100644 index c509e4c4cd2e..000000000000 --- a/patches/react-native-reanimated+3.5.2.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/node_modules/react-native-reanimated/lib/module/reanimated2/index.js b/node_modules/react-native-reanimated/lib/module/reanimated2/index.js -index 0027008..2aea2ff 100644 ---- a/node_modules/react-native-reanimated/lib/module/reanimated2/index.js -+++ b/node_modules/react-native-reanimated/lib/module/reanimated2/index.js -@@ -1,15 +1,15 @@ - import './publicGlobals'; --export { runOnJS, runOnUI, createWorkletRuntime, WorkletRuntime, makeMutable, makeShareableCloneRecursive, isReanimated3, isConfigured, enableLayoutAnimations, getViewProp } from './core'; --export { useAnimatedProps, useEvent, useHandler, useWorkletCallback, useSharedValue, useReducedMotion, useAnimatedStyle, useAnimatedGestureHandler, GestureHandlers, useAnimatedReaction, AnimatedRef, useAnimatedRef, useAnimatedScrollHandler, ScrollHandler, ScrollHandlers, useDerivedValue, DerivedValue, useAnimatedSensor, useFrameCallback, FrameCallback, useAnimatedKeyboard, useScrollViewOffset } from './hook'; --export { DelayAnimation, RepeatAnimation, SequenceAnimation, StyleLayoutAnimation, cancelAnimation, defineAnimation, withTiming, WithTimingConfig, TimingAnimation, withSpring, WithSpringConfig, SpringAnimation, withDecay, WithDecayConfig, DecayAnimation, withDelay, withRepeat, withSequence } from './animation'; --export { Extrapolation, ExtrapolationConfig, ExtrapolationType, interpolate, clamp } from './interpolation'; --export { Extrapolate, InterpolationOptions, interpolateColor, ColorSpace, InterpolateConfig, useInterpolateConfig, InterpolateRGB, InterpolateHSV } from './interpolateColor'; --export { EasingFunction, EasingFn, EasingFunctionFactory, EasingFactoryFn, Easing } from './Easing'; -+export { runOnJS, runOnUI, createWorkletRuntime, makeMutable, makeShareableCloneRecursive, isReanimated3, isConfigured, enableLayoutAnimations, getViewProp } from './core'; -+export { useAnimatedProps, useEvent, useHandler, useWorkletCallback, useSharedValue, useReducedMotion, useAnimatedStyle, useAnimatedGestureHandler, useAnimatedReaction, useAnimatedRef, useAnimatedScrollHandler, useDerivedValue, useAnimatedSensor, useFrameCallback, useAnimatedKeyboard, useScrollViewOffset } from './hook'; -+export { cancelAnimation, defineAnimation, withTiming, withSpring, withDecay, withDelay, withRepeat, withSequence } from './animation'; -+export { interpolate, clamp } from './interpolation'; -+export { Extrapolate, interpolateColor, useInterpolateConfig } from './interpolateColor'; -+export { Easing } from './Easing'; - export { measure, dispatchCommand, scrollTo, setGestureState } from './NativeMethods'; - export { setNativeProps } from './SetNativeProps'; --export { isColor, processColor, ParsedColorArray, convertToRGBA } from './Colors'; -+export { isColor, processColor, convertToRGBA } from './Colors'; - export { createAnimatedPropAdapter } from './PropAdapters'; --export { BaseAnimationBuilder, ComplexAnimationBuilder, Keyframe, LayoutAnimation, EntryAnimationsValues, ExitAnimationsValues, EntryExitAnimationFunction, LayoutAnimationsValues, LayoutAnimationFunction, ILayoutAnimationBuilder, IEntryExitAnimationBuilder, -+export { BaseAnimationBuilder, ComplexAnimationBuilder, Keyframe, - // Flip - FlipInXUp, FlipInYLeft, FlipInXDown, FlipInYRight, FlipInEasyX, FlipInEasyY, FlipOutXUp, FlipOutYLeft, FlipOutXDown, FlipOutYRight, FlipOutEasyX, FlipOutEasyY, - // Stretch -@@ -34,9 +34,7 @@ RollInLeft, RollInRight, RollOutLeft, RollOutRight, - Layout, LinearTransition, FadingTransition, SequencedTransition, JumpingTransition, CurvedTransition, EntryExitTransition, combineTransition, - // SET - SharedTransition, SharedTransitionType } from './layoutReanimation'; --export { getRelativeCoords, ComponentCoords, isSharedValue } from './utils'; --export { StyleProps, SharedValue, AnimatableValueObject, AnimatableValue, AnimationObject, Animation, SensorType, IOSReferenceFrame, SensorConfig, AnimatedSensor, AnimationCallback, Value3D, ValueRotation, InterfaceOrientation, KeyboardState, AnimatedKeyboardInfo, MeasuredDimensions, AnimatedKeyboardOptions, ReduceMotion } from './commonTypes'; --export { FrameInfo } from './frameCallback'; -+export { getRelativeCoords, isSharedValue } from './utils'; -+export { SensorType, IOSReferenceFrame, InterfaceOrientation, KeyboardState, ReduceMotion } from './commonTypes'; - export { getUseOfValueInStyleWarning } from './pluginUtils'; --export { withReanimatedTimer, advanceAnimationByTime, advanceAnimationByFrame, setUpTests, getAnimatedStyle } from './jestUtils'; - //# sourceMappingURL=index.js.map -\ No newline at end of file -diff --git a/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts b/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts -index 4df2481..cca7f1a 100644 ---- a/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts -+++ b/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts -@@ -40,5 +40,5 @@ export function isReducedMotion() { - ? isWindowAvailable() - ? !window.matchMedia('(prefers-reduced-motion: no-preference)').matches - : false -- : global._REANIMATED_IS_REDUCED_MOTION ?? false; -+ : (global as any)._REANIMATED_IS_REDUCED_MOTION ?? false; - } From 9ae84b4f6c26abb6376915057c1c65e50c88a44c Mon Sep 17 00:00:00 2001 From: Wojciech Stanisz Date: Wed, 20 Sep 2023 17:47:06 +0200 Subject: [PATCH 7/9] Fix types by adding globals.d.ts --- patches/react-native-reanimated+3.5.3.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 patches/react-native-reanimated+3.5.3.patch diff --git a/patches/react-native-reanimated+3.5.3.patch b/patches/react-native-reanimated+3.5.3.patch new file mode 100644 index 000000000000..cf6ee2e271c2 --- /dev/null +++ b/patches/react-native-reanimated+3.5.3.patch @@ -0,0 +1,10 @@ +diff --git a/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts b/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts +index 4df2481..2be308f 100644 +--- a/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts ++++ b/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts +@@ -1,4 +1,5 @@ + import { Platform } from 'react-native'; ++import './globals.d.ts' + + export function isJest(): boolean { + return !!process.env.JEST_WORKER_ID; From 0e2f4c65cda9228491c1f569d4e0e1c48ffdb124 Mon Sep 17 00:00:00 2001 From: Wojciech Stanisz Date: Thu, 21 Sep 2023 13:57:11 +0200 Subject: [PATCH 8/9] Bump to 3.5.4 --- ios/Podfile.lock | 4 ++-- package-lock.json | 14 +++++++------- package.json | 2 +- patches/react-native-reanimated+3.5.3.patch | 10 ---------- 4 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 patches/react-native-reanimated+3.5.3.patch diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9c14d69aca55..7f84639798da 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -783,7 +783,7 @@ PODS: - React-Core - RNReactNativeHapticFeedback (1.14.0): - React-Core - - RNReanimated (3.5.3): + - RNReanimated (3.5.4): - DoubleConversion - FBLazyVector - glog @@ -1298,7 +1298,7 @@ SPEC CHECKSUMS: rnmapbox-maps: 6f638ec002aa6e906a6f766d69cd45f968d98e64 RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c - RNReanimated: e037aac4d8b0055a399f5af065e8210f6c8cc900 + RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87 RNScreens: d037903436160a4b039d32606668350d2a808806 RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d diff --git a/package-lock.json b/package-lock.json index 68ca30f17289..65f027329834 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "^3.5.3", + "react-native-reanimated": "^3.5.4", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", @@ -40697,9 +40697,9 @@ } }, "node_modules/react-native-reanimated": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.3.tgz", - "integrity": "sha512-zjGJL2rgYLiEqIwaIOd+/dgRZzot4wKUvKk0ZXeWY7SJg4Bp+9yQTOT98Jx6b1/Cga2YY71i0tIu3hanLajGAQ==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.4.tgz", + "integrity": "sha512-8we9LLDO1o4Oj9/DICeEJ2K1tjfqkJagqQUglxeUAkol/HcEJ6PGxIrpBcNryLqCDYEcu6FZWld/FzizBIw6bg==", "dependencies": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", @@ -76181,9 +76181,9 @@ "requires": {} }, "react-native-reanimated": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.3.tgz", - "integrity": "sha512-zjGJL2rgYLiEqIwaIOd+/dgRZzot4wKUvKk0ZXeWY7SJg4Bp+9yQTOT98Jx6b1/Cga2YY71i0tIu3hanLajGAQ==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.4.tgz", + "integrity": "sha512-8we9LLDO1o4Oj9/DICeEJ2K1tjfqkJagqQUglxeUAkol/HcEJ6PGxIrpBcNryLqCDYEcu6FZWld/FzizBIw6bg==", "requires": { "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", diff --git a/package.json b/package.json index dabb5d0afde9..5f5ecc234b56 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "^3.5.3", + "react-native-reanimated": "^3.5.4", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", diff --git a/patches/react-native-reanimated+3.5.3.patch b/patches/react-native-reanimated+3.5.3.patch deleted file mode 100644 index cf6ee2e271c2..000000000000 --- a/patches/react-native-reanimated+3.5.3.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts b/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts -index 4df2481..2be308f 100644 ---- a/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts -+++ b/node_modules/react-native-reanimated/src/reanimated2/PlatformChecker.ts -@@ -1,4 +1,5 @@ - import { Platform } from 'react-native'; -+import './globals.d.ts' - - export function isJest(): boolean { - return !!process.env.JEST_WORKER_ID; From ff64f371cbcb625e7fd85ca6a6d5e5310c3a37da Mon Sep 17 00:00:00 2001 From: Wojciech Stanisz Date: Mon, 25 Sep 2023 10:38:01 +0200 Subject: [PATCH 9/9] Remove ^ from reanimated version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3d4b5521cc21..48f7628a73e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "^3.5.4", + "react-native-reanimated": "3.5.4", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0", diff --git a/package.json b/package.json index a74cd86af7cf..8bc06745f115 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "react-native-plaid-link-sdk": "^10.0.0", "react-native-qrcode-svg": "^6.2.0", "react-native-quick-sqlite": "^8.0.0-beta.2", - "react-native-reanimated": "^3.5.4", + "react-native-reanimated": "3.5.4", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.21.0",