Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
2c5e447
Testing reanimated v4
blazejkustra Aug 28, 2025
8878252
Bump reanimated to v4
blazejkustra Aug 29, 2025
f35e02b
Add live-markdown temporary patch
blazejkustra Aug 29, 2025
a2fb8ef
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Sep 1, 2025
bd77f1a
Update patches and reanimated version
blazejkustra Sep 1, 2025
95b3311
Update live-markdown patch
blazejkustra Sep 1, 2025
6a8ba26
Fix versions
blazejkustra Sep 3, 2025
dc455ce
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Sep 3, 2025
e4e74af
Remove patch for reduce motion animation
blazejkustra Sep 3, 2025
9031c0a
Fix ts check with live markdown patch
blazejkustra Sep 3, 2025
d44c181
Fix patch for live markdown
blazejkustra Sep 3, 2025
582f5f9
Remove patch name
blazejkustra Sep 3, 2025
7e93dd5
Prepare live markdown temporary patch so the app builds on both andro…
blazejkustra Sep 4, 2025
1c37a3e
Move patch to a catalog
blazejkustra Sep 4, 2025
5999f80
Fix comment
blazejkustra Sep 4, 2025
b9498b8
Merge branch 'main' into chore/reanimated-v4
blazejkustra Sep 4, 2025
ed9b358
Remove unrelated podfile changes
blazejkustra Sep 4, 2025
87aeb55
Reset podfile
blazejkustra Sep 4, 2025
7ce7490
Commit verified podfile.lock
blazejkustra Sep 4, 2025
813d182
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Sep 11, 2025
c6709ae
Bump worklets, fix failing tests
blazejkustra Sep 11, 2025
eb11b15
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Sep 12, 2025
466c725
Pin worklets version
blazejkustra Sep 12, 2025
0aef903
Add rn-worklets to babel transforming
blazejkustra Sep 12, 2025
93ff430
Temporary testing to fix web
blazejkustra Sep 12, 2025
aa80b3d
Remove temporary patch and update reanimated to fix bundle on web
blazejkustra Sep 17, 2025
77c15ca
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Sep 17, 2025
2ff77f4
bump live-markdown to version supporting worklets & remove patch
war-in Oct 3, 2025
d42aa60
Merge branch 'main' into chore/reanimated-v4
war-in Oct 3, 2025
a3112ab
update Podfile.lock
war-in Oct 3, 2025
108cb48
Merge branch 'chore/reanimated-v4' of github.com:software-mansion-lab…
blazejkustra Oct 6, 2025
6c9a50b
Bump reanimated to 4.1.2
blazejkustra Oct 6, 2025
805688d
Fix patch name
blazejkustra Oct 6, 2025
adfd8ad
Merge branch 'refs/heads/main' into chore/reanimated-v4
war-in Oct 7, 2025
1861026
bump live-markdown
war-in Oct 7, 2025
298aade
Merge branch 'main' into chore/reanimated-v4
war-in Oct 13, 2025
518e746
chore: bump `react-native-live-markdown`
war-in Oct 13, 2025
43c4e4c
Merge branch 'main' into chore/reanimated-v4
war-in Oct 14, 2025
7c9da25
chore: bump `react-native-live-markdown`
war-in Oct 14, 2025
4feca21
Merge branch 'main' into chore/reanimated-v4
war-in Oct 20, 2025
91e51ad
chore: update Podfile.lock
war-in Oct 20, 2025
636eab5
fix: test failures due to "missing" `makeShareableCloneRecursive` in …
war-in Oct 21, 2025
1455d49
Merge branch 'main' into chore/reanimated-v4
war-in Oct 21, 2025
475f68a
Merge branch 'main' into chore/reanimated-v4
war-in Oct 22, 2025
4e94b0e
chore: fix Podfile.lock after merging main
war-in Oct 22, 2025
8f8ac45
fix: update `react-native-reanimated` mock
war-in Oct 22, 2025
91a792a
Merge branch 'refs/heads/main' into chore/reanimated-v4
war-in Oct 23, 2025
2e3e9b9
Merge branch 'refs/heads/main' into chore/reanimated-v4
war-in Oct 23, 2025
cad6c9e
fix: iOS standalone build issue
war-in Oct 23, 2025
ff55485
Remove temporary live-markdown patch & bump LM
blazejkustra Oct 24, 2025
b55f781
Update Podfile.lock to include bump of RNLiveMarkdown to 0.1.310
blazejkustra Oct 24, 2025
421e60f
Fix podfile.lock, sync with main
blazejkustra Oct 24, 2025
072345d
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Oct 27, 2025
ce34157
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Oct 28, 2025
3f60770
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Oct 30, 2025
9c4207d
Remove patch for fixing broken slideInUp animation in react-native-re…
blazejkustra Oct 30, 2025
4a670e7
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Oct 30, 2025
9711e76
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Oct 31, 2025
32f9a19
Merge branch 'main' of github.com:Expensify/App into chore/reanimated-v4
blazejkustra Nov 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,10 @@ GEM
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
ffi (1.17.0)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux)
ffi (1.17.2)
ffi (1.17.2-arm64-darwin)
ffi (1.17.2-x86_64-darwin)
ffi (1.17.2-x86_64-linux-gnu)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
Expand Down
8 changes: 4 additions & 4 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ const defaultPluginsForWebpack = [
// We use `@babel/plugin-transform-class-properties` for transforming ReactNative libraries and do not use it for our own
// source code transformation as we do not use class property assignment.
'@babel/plugin-transform-class-properties',

'@babel/plugin-proposal-export-namespace-from',
// Keep it last
'react-native-reanimated/plugin',
'react-native-worklets/plugin',
'@babel/plugin-transform-export-namespace-from',
];

Expand Down Expand Up @@ -81,8 +81,6 @@ const metro = {
['@babel/plugin-proposal-class-properties', {loose: true}],
['@babel/plugin-proposal-private-methods', {loose: true}],
['@babel/plugin-proposal-private-property-in-object', {loose: true}],
// The reanimated babel plugin needs to be last, as stated here: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation
'react-native-reanimated/plugin',
Comment thread
blazejkustra marked this conversation as resolved.

/* Fullstory */
'@fullstory/react-native',
Expand Down Expand Up @@ -134,6 +132,8 @@ const metro = {
},
],
'@babel/plugin-transform-export-namespace-from',
// The worklets babel plugin needs to be last, as stated here: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/getting-started/
'react-native-worklets/plugin',
],
env: {
production: {
Expand Down
1 change: 1 addition & 0 deletions config/webpack/webpack.common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const PreloadWebpackPlugin = require('@vue/preload-webpack-plugin') as PreloadWe

const includeModules = [
'react-native-reanimated',
'react-native-worklets',
'react-native-picker-select',
'react-native-web',
'react-native-webview',
Expand Down
98 changes: 67 additions & 31 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3559,7 +3559,7 @@ PODS:
- RNGoogleSignin (10.0.1):
- GoogleSignIn (~> 7.0)
- React-Core
- RNLiveMarkdown (0.1.308):
- RNLiveMarkdown (0.1.310):
- boost
- DoubleConversion
- fast_float
Expand Down Expand Up @@ -3587,7 +3587,7 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/worklets
- RNWorklets
- SocketRocket
- Yoga
- RNLocalize (3.5.4):
Expand Down Expand Up @@ -3735,7 +3735,7 @@ PODS:
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- RNReanimated (3.19.1):
- RNReanimated (4.1.2):
- boost
- DoubleConversion
- fast_float
Expand All @@ -3762,11 +3762,11 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated (= 3.19.1)
- RNReanimated/worklets (= 3.19.1)
- RNReanimated/reanimated (= 4.1.2)
- RNWorklets
- SocketRocket
- Yoga
- RNReanimated/reanimated (3.19.1):
- RNReanimated/reanimated (4.1.2):
- boost
- DoubleConversion
- fast_float
Expand All @@ -3793,10 +3793,11 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated/apple (= 3.19.1)
- RNReanimated/reanimated/apple (= 4.1.2)
- RNWorklets
- SocketRocket
- Yoga
- RNReanimated/reanimated/apple (3.19.1):
- RNReanimated/reanimated/apple (4.1.2):
- boost
- DoubleConversion
- fast_float
Expand All @@ -3823,9 +3824,10 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNWorklets
- SocketRocket
- Yoga
- RNReanimated/worklets (3.19.1):
- RNScreens (4.15.4):
- boost
- DoubleConversion
- fast_float
Expand All @@ -3841,21 +3843,21 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-RCTImage
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/worklets/apple (= 3.19.1)
- RNScreens/common (= 4.15.4)
- SocketRocket
- Yoga
- RNReanimated/worklets/apple (3.19.1):
- RNScreens/common (4.15.4):
- boost
- DoubleConversion
- fast_float
Expand All @@ -3871,11 +3873,11 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-RCTImage
- React-renderercss
- React-rendererdebug
- React-utils
Expand All @@ -3884,7 +3886,7 @@ PODS:
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- RNScreens (4.15.4):
- RNSentry (7.4.0):
- boost
- DoubleConversion
- fast_float
Expand All @@ -3900,21 +3902,21 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-RCTImage
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNScreens/common (= 4.15.4)
- Sentry/HybridSDK (= 8.57.0)
- SocketRocket
- Yoga
- RNScreens/common (4.15.4):
- RNShare (11.0.2):
- boost
- DoubleConversion
- fast_float
Expand All @@ -3934,7 +3936,6 @@ PODS:
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-RCTImage
- React-renderercss
- React-rendererdebug
- React-utils
Expand All @@ -3943,7 +3944,12 @@ PODS:
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- RNSentry (7.4.0):
- RNSound (0.11.2):
- React-Core
- RNSound/Core (= 0.11.2)
- RNSound/Core (0.11.2):
- React-Core
- RNSVG (15.12.1):
- boost
- DoubleConversion
- fast_float
Expand All @@ -3959,7 +3965,6 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
Expand All @@ -3970,10 +3975,10 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Sentry/HybridSDK (= 8.57.0)
- RNSVG/common (= 15.12.1)
- SocketRocket
- Yoga
- RNShare (11.0.2):
- RNSVG/common (15.12.1):
- boost
- DoubleConversion
- fast_float
Expand Down Expand Up @@ -4001,12 +4006,37 @@ PODS:
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- RNSound (0.11.2):
- React-Core
- RNSound/Core (= 0.11.2)
- RNSound/Core (0.11.2):
- RNWorklets (0.6.0):
- boost
- DoubleConversion
- fast_float
- fmt
- glog
- hermes-engine
- RCT-Folly
- RCT-Folly/Fabric
- RCTRequired
- RCTTypeSafety
- React-Core
- RNSVG (15.12.1):
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNWorklets/worklets (= 0.6.0)
- SocketRocket
- Yoga
- RNWorklets/worklets (0.6.0):
- boost
- DoubleConversion
- fast_float
Expand All @@ -4022,6 +4052,7 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
Expand All @@ -4032,10 +4063,10 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNSVG/common (= 15.12.1)
- RNWorklets/worklets/apple (= 0.6.0)
- SocketRocket
- Yoga
- RNSVG/common (15.12.1):
- RNWorklets/worklets/apple (0.6.0):
- boost
- DoubleConversion
- fast_float
Expand All @@ -4051,6 +4082,7 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
Expand Down Expand Up @@ -4227,6 +4259,7 @@ DEPENDENCIES:
- RNShare (from `../node_modules/react-native-share`)
- RNSound (from `../node_modules/react-native-sound`)
- RNSVG (from `../node_modules/react-native-svg`)
- RNWorklets (from `../node_modules/react-native-worklets`)
- SocketRocket (~> 0.7.1)
- VisionCamera (from `../node_modules/react-native-vision-camera`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
Expand Down Expand Up @@ -4559,6 +4592,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-sound"
RNSVG:
:path: "../node_modules/react-native-svg"
RNWorklets:
:path: "../node_modules/react-native-worklets"
VisionCamera:
:path: "../node_modules/react-native-vision-camera"
Yoga:
Expand Down Expand Up @@ -4735,18 +4770,19 @@ SPEC CHECKSUMS:
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: 9339994ea5d1ff6ad2679b7d0cc3d49053111369
RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
RNLiveMarkdown: 835074fb8fd0afb493c7c2b73076a0f2738a8f63
RNLiveMarkdown: 51e46a8300e2eb6f2d3e898b7734b3833532dba6
RNLocalize: 0aa716b7d0f1316ca5f8f16ed42b79b9e3093279
rnmapbox-maps: 870cd752e1d132e05465f3074b582ce6c7e742e9
RNNitroSQLite: d5cf8c550c51015e1ecc93ff6e7509187c6c1c9e
RNPermissions: d507f1fe0ee109c8f6f882808fcf8a173645e40b
RNReactNativeHapticFeedback: 43c09eb41d8321be2e1375cb87ae734e58f677b0
RNReanimated: 8d0f830cd94d0d9cc86eed5850e567a89807586e
RNReanimated: 91d075aaf0c89d51a0708cd64cd6c77f7fa42cdc
RNScreens: 0c5341cc352632758171de6453502a6a757d0369
RNSentry: 34bead6afbfce1bb89837b84da1dec001f890329
RNShare: 385bf6a127cb075d4fdbe7bb85587cad88fe9afe
RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
RNSVG: 9be2bc57df95a874e8c4b0f7dd71866139f321d2
RNWorklets: e752b7443b51916158d3b6ca6700294827e8a1ea
SDWebImage: 9f177d83116802728e122410fb25ad88f5c7608a
SDWebImageAVIFCoder: afe194a084e851f70228e4be35ef651df0fc5c57
SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
Expand Down
1 change: 1 addition & 0 deletions jest/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ jest.mock('react-native-reanimated', () => ({
useScrollViewOffset: jest.fn(() => 0),
useAnimatedRef: jest.fn(() => jest.fn()),
LayoutAnimationConfig: jest.fn,
makeShareableCloneRecursive: jest.fn,
}));

jest.mock('react-native-keyboard-controller', () => require<typeof RNKeyboardController>('react-native-keyboard-controller/jest'));
Expand Down
Loading
Loading