Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: duplicate worklets code the smart way #6827

Merged
merged 42 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
2f8b9c4
feat: stub of node module react-native-worklets
tjzel Dec 11, 2024
fcfda4f
feat: preliminary use of react-native-worklets in reanimated
tjzel Dec 11, 2024
a9b6af2
chore: fix CMakeLists
tjzel Dec 12, 2024
96b76d7
Merge branch 'main' into @tjzel/worklets/node-module-with-rea-support
tjzel Dec 12, 2024
3ee4d4f
chore: add explanatory comments
tjzel Dec 17, 2024
1f40ace
feat: add linting to react-native-worklets
tjzel Dec 17, 2024
7fccc99
chore: add missing dependency
tjzel Dec 17, 2024
661706a
chore: add external-worklets-example
tjzel Dec 12, 2024
b127bea
chore: fix FabricExample occurences
tjzel Dec 17, 2024
a507fdc
chore: update github actions
tjzel Dec 17, 2024
afd030d
chore: fix CI
tjzel Dec 17, 2024
2634199
chore: remove excessive changes
tjzel Dec 12, 2024
64aea46
chore: remove external worklets
tjzel Jan 20, 2025
3701183
chore: cleanup
tjzel Jan 20, 2025
ceee2f7
chore: draft duplication
tjzel Dec 17, 2024
62c9488
chore: cleanup
tjzel Jan 21, 2025
50d3f00
chore: improve react-native-worklets detection script
tjzel Jan 21, 2025
7e75fb3
refactor: move ReanimatedVersion to Reanimated
tjzel Jan 21, 2025
88e38c0
Merge branch 'main' into @tjzel/worklets/restructure-worklets-source-…
tjzel Jan 23, 2025
08ad6ab
chore: cleanup
tjzel Jan 23, 2025
6a35149
chore: cleanup
tjzel Jan 23, 2025
45a4c27
Merge branch 'main' into @tjzel/worklets/restructure-worklets-source-…
tjzel Jan 23, 2025
1bcb1a9
Merge remote-tracking branch 'origin/@tjzel/worklets/restructure-work…
tjzel Jan 24, 2025
077304b
chore: fix CI issues
tjzel Jan 24, 2025
2017a8e
refactor: actually copy from worklets
tjzel Jan 24, 2025
6a85786
chore: fix dir
tjzel Jan 24, 2025
48669d5
chore: remove worklets
tjzel Jan 24, 2025
cb09fa5
refactor: major
tjzel Jan 27, 2025
8604d29
chore: apple
tjzel Jan 27, 2025
627827d
refactor: adjust to downstream changes
tjzel Jan 27, 2025
8d30b32
Merge branch 'main' into @tjzel/worklets/restructure-worklets-source-…
tjzel Jan 27, 2025
5585839
chore: update CI
tjzel Jan 27, 2025
8b9319c
chore: dont fire CIs twice
tjzel Jan 27, 2025
55301e8
chore: fix java package
tjzel Jan 27, 2025
3b9eac8
Merge branch '@tjzel/worklets/restructure-worklets-source-sets' into …
tjzel Jan 27, 2025
2cd50bc
chore: update CI
tjzel Jan 27, 2025
15c4fba
Merge branch '@tjzel/worklets/restructure-worklets-source-sets' into …
tjzel Jan 28, 2025
70ededc
chore: cleanup
tjzel Jan 28, 2025
85b3e07
chore: apply formatting
tjzel Jan 28, 2025
daad12a
Merge branch 'main' into @tjzel/worklets/duplicate-reanimated-code
tjzel Jan 28, 2025
8aa02a7
chore: add targets to build gradle`
tjzel Jan 28, 2025
510cbff
chore: restore order
tjzel Jan 29, 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
Prev Previous commit
Next Next commit
chore: remove worklets
  • Loading branch information
tjzel committed Jan 24, 2025
commit 48669d56fc736e489b2b212755866aa4b9da7348
98 changes: 13 additions & 85 deletions apps/fabric-example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1755,7 +1755,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated (= 4.0.0-beta.1)
- RNWorklets
- RNReanimated/worklets (= 4.0.0-beta.1)
- Yoga
- RNReanimated/reanimated (4.0.0-beta.1):
- DoubleConversion
Expand All @@ -1778,7 +1778,6 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated/apple (= 4.0.0-beta.1)
- RNWorklets
- Yoga
- RNReanimated/reanimated/apple (4.0.0-beta.1):
- DoubleConversion
Expand All @@ -1800,76 +1799,8 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNWorklets
- Yoga
- RNScreens (4.5.0):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.11.18.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-RCTImage
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNScreens/common (= 4.5.0)
- Yoga
- RNScreens/common (4.5.0):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.11.18.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-RCTImage
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNSVG (15.11.1):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.11.18.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNSVG/common (= 15.11.1)
- Yoga
- RNSVG/common (15.11.1):
- RNReanimated/worklets (4.0.0-beta.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1889,8 +1820,9 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/worklets/apple (= 4.0.0-beta.1)
- Yoga
- RNWorklets (0.0.1):
- RNReanimated/worklets/apple (4.0.0-beta.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1910,10 +1842,8 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNWorklets/duplicated (= 0.0.1)
- RNWorklets/worklets (= 0.0.1)
- Yoga
- RNWorklets/duplicated (0.0.1):
- RNScreens (4.5.0):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1928,14 +1858,15 @@ PODS:
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-RCTImage
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNWorklets/duplicated/apple (= 0.0.1)
- RNScreens/common (= 4.5.0)
- Yoga
- RNWorklets/duplicated/apple (0.0.1):
- RNScreens/common (4.5.0):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1950,13 +1881,14 @@ PODS:
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-RCTImage
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNWorklets/worklets (0.0.1):
- RNSVG (15.11.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1976,9 +1908,9 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNWorklets/worklets/apple (= 0.0.1)
- RNSVG/common (= 15.11.1)
- Yoga
- RNWorklets/worklets/apple (0.0.1):
- RNSVG/common (15.11.1):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -2081,7 +2013,6 @@ DEPENDENCIES:
- RNReanimated (from `../../../node_modules/react-native-reanimated`)
- RNScreens (from `../../../node_modules/react-native-screens`)
- RNSVG (from `../../../node_modules/react-native-svg`)
- RNWorklets (from `../../../node_modules/react-native-worklets`)
- Yoga (from `../../../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
Expand Down Expand Up @@ -2242,8 +2173,6 @@ EXTERNAL SOURCES:
:path: "../../../node_modules/react-native-screens"
RNSVG:
:path: "../../../node_modules/react-native-svg"
RNWorklets:
:path: "../../../node_modules/react-native-worklets"
Yoga:
:path: "../../../node_modules/react-native/ReactCommon/yoga"

Expand Down Expand Up @@ -2321,10 +2250,9 @@ SPEC CHECKSUMS:
RNCMaskedView: 18c76ebdf9752bb75652829f99f6c3d1318cc864
RNFlashList: ee2388e0d3ffde77431ba5d09b8f59a0c65a8e05
RNGestureHandler: 4e7defe5095e936424173fc75f0bf2af5bba8e23
RNReanimated: 8584b5c59e14081af1cf8c6afdc270673946992b
RNReanimated: 4ed0a35da49cbc246b2b7b6b739ae71a12e6200e
RNScreens: d0854539b51a53e38b61bcc9fb402439a9c73b26
RNSVG: 7e38044415125a1d108294377de261d2fe2c54c9
RNWorklets: 102ca186cb218ef0e3931b9d29278ece4a6fce7a
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Yoga: 0c8754b0ea9edb13b6ce6b60f0f69eb5f164f16a

Expand Down
3 changes: 1 addition & 2 deletions apps/fabric-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
"react-native-reanimated": "workspace:*",
"react-native-safe-area-context": "5.1.0",
"react-native-screens": "4.5.0",
"react-native-svg": "15.11.1",
"react-native-worklets": "workspace:*"
"react-native-svg": "15.11.1"
},
"devDependencies": {
"@babel/core": "^7.25.2",
Expand Down
1 change: 0 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12168,7 +12168,6 @@ __metadata:
react-native-safe-area-context: "npm:5.1.0"
react-native-screens: "npm:4.5.0"
react-native-svg: "npm:15.11.1"
react-native-worklets: "workspace:*"
react-test-renderer: "npm:18.3.1"
typescript: "npm:~5.3.0"
typescript-eslint: "npm:^8.12.2"
Expand Down
Loading