Skip to content

Commit

Permalink
chore: sync with upstrteam
Browse files Browse the repository at this point in the history
  • Loading branch information
okwasniewski committed Sep 11, 2024
1 parent e47a20e commit b370a5a
Show file tree
Hide file tree
Showing 8 changed files with 305 additions and 525 deletions.
2 changes: 1 addition & 1 deletion packages/helloworld/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"dependencies": {
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "1000.0.0"
"@callstack/react-native-visionos": "1000.0.0"
},
"devDependencies": {
"@babel/core": "^7.25.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-test-library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"devDependencies": {
"@babel/core": "^7.25.2",
"@react-native/babel-preset": "0.76.0-main",
"react-native": "1000.0.0"
"@callstack/react-native-visionos": "1000.0.0"
},
"peerDependencies": {
"react": "*",
Expand Down
2 changes: 0 additions & 2 deletions packages/react-native/scripts/react_native_pods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ def use_react_native! (
pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec"
pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec", :modular_headers => true
pod 'SocketRocket', :podspec => "#{prefix}/third-party-podspecs/SocketRocket.podspec", :modular_headers => true


folly_config = get_folly_config()
run_codegen!(
Expand Down
17 changes: 12 additions & 5 deletions packages/react-native/sdks/hermes-engine/hermes-engine.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,19 @@
require "json"
require_relative "./hermes-utils.rb"

react_native_path = File.dirname(Pod::Executable.execute_command('node', ['-p',
'require.resolve(
"react-native",
begin
react_native_path = File.dirname(Pod::Executable.execute_command('node', ['-p',
'require.resolve(
"react-native",
{paths: [process.argv[1]]},
)', __dir__]).strip
)
)', __dir__]).strip
)
rescue => e
# Fallback to the parent directory if the above command fails (e.g when building locally in OOT Platform)
react_native_path = File.join(__dir__, "..", "..")
end

puts "React Native path: #{react_native_path}"

# package.json
package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
Expand Down
21 changes: 0 additions & 21 deletions packages/react-native/third-party-podspecs/SocketRocket.podspec

This file was deleted.

246 changes: 106 additions & 140 deletions packages/rn-tester/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- OCMock (3.9.4)
- OCMock (3.9.2)
- OSSLibraryExample (0.76.0-main):
- DoubleConversion
- glog
Expand Down Expand Up @@ -372,6 +372,40 @@ PODS:
- React-utils
- SocketRocket (= 0.7.1)
- Yoga
- React-Core/RCTWindowManagerHeaders (1000.0.0):
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTDeprecation
- React-Core/Default
- React-cxxreact
- React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
- Yoga
- React-Core/RCTXRHeaders (1000.0.0):
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTDeprecation
- React-Core/Default
- React-cxxreact
- React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
- Yoga
- React-CoreModules (1000.0.0):
- DoubleConversion
- fmt (= 9.1.0)
Expand Down Expand Up @@ -1744,9 +1778,12 @@ DEPENDENCIES:
- ReactCommon-Samples (from `../react-native/ReactCommon/react/nativemodule/samples`)
- ReactCommon/turbomodule/core (from `../react-native/ReactCommon`)
- ScreenshotManager (from `NativeModuleExample`)
- SocketRocket (from `../react-native/third-party-podspecs/SocketRocket.podspec`)
- Yoga (from `../react-native/ReactCommon/yoga`)

SPEC REPOS:
trunk:
- SocketRocket

EXTERNAL SOURCES:
boost:
:podspec: "../react-native/third-party-podspecs/boost.podspec"
Expand Down Expand Up @@ -1896,161 +1933,90 @@ EXTERNAL SOURCES:
:path: "../react-native/ReactCommon/react/nativemodule/samples"
ScreenshotManager:
:path: NativeModuleExample
SocketRocket:
:podspec: "../react-native/third-party-podspecs/SocketRocket.podspec"
Yoga:
:path: "../react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
boost: 1dca942403ed9342f98334bf4c3621f011aa7946
DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
FBLazyVector: c8715bd426ed93c57bb679b549e92f79a823212a
fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
hermes-engine: 18648a751649d9b6ac408579511554a4fbaaccc2
MyNativeView: 32eb899a4fc31dbe7e93f356935a7fe56d42d74e
NativeCxxModuleExample: 9621f63e90acef88ac37beac4fb841132ad18d86
OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
OSSLibraryExample: 44a44517ba2b7e99be1ac345942e5c98e3f8d8da
RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648
RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf
RCTRequired: 7a8e6a2c361700f9c645216e9991604757b1025c
RCTTypeSafety: 27891ddab793e9f45bd427e0063985fa9d1a745c
React: 0a852eb3a4778fa382bd4bec1d1102dc95c492ce
React-callinvoker: 4857665c23ce7406d949bb95ce3a579620cd35f5
React-Core: dab3d3b3713c207cf555cc54f613d72e5dda65dc
React-CoreModules: 5d48f1d3a5f01341d5e34b401cf7b099a6834941
React-cxxreact: cfad872bd295947124e9d3635b5dc2395037875f
React-debug: 8cf17cbbe4db4489da08583fa1219292ab3add3b
React-defaultsnativemodule: 8f585662fc9ea76ad1a6f2df50f245e126ea2c1f
React-domnativemodule: 6d3248be46d2b94fa9b09e09a5981adb35ec135e
React-Fabric: ea21b602bbfe90f63aadf01c069b7f1759d5e2c7
React-FabricComponents: c69ec63ffe8b1bf773f85695939d8c21e77b3423
React-FabricImage: fcbed58676da40e43f50970d4a3abf7014d4c97c
React-featureflags: b8a4c60827c52e3e6b3d331c47964b91226da452
React-featureflagsnativemodule: 12af419af8e7cc6e2212fa10d450ec6cc78e3c93
React-graphics: c385ac155868a23b0dd4dace94228a0812dd3587
React-hermes: bf8bec9c40d4756e74be3bb642dcc636ee0a3376
React-idlecallbacksnativemodule: 01b2c90be61e39ea57c5ec8fb40223402f0408a3
React-ImageManager: d09977cf41a8af909d776b92150d00066610253e
React-jserrorhandler: bf2e4e3e6ea6c903c0dac85d6ef069bdf010073c
React-jsi: ca82ba79ab3b28553f3c7cae5d3e6bd61bd0615c
React-jsiexecutor: 0bce63803bd83219aa6f5d64ffdd504a407f8f76
React-jsinspector: 51698143244af04db8fff1968b6eae92dbc29ef6
React-jsitracing: 00126dc737136e1359deabbd064ad3e8d17e30a7
React-logger: 7c9f94c18cab8076ed5ab70f4aeeeb1668c44c7d
React-Mapbuffer: 5dcd028f06ec61a76e3d2e823033a9d33c948f9d
React-microtasksnativemodule: d34bab40ed40aa735326940cfb4d5b1206761431
React-nativeconfig: ede29a5b5c88ce9f6e6dfd41b5e6cab57059ebb5
React-NativeModulesApple: 36bd93a8e4aded2cc32355a8f3df92b7e97d8edd
React-perflogger: 932cd803362f3d58552daafd62bc9ff51ba58021
React-performancetimeline: 0b4298173f00277c86e4cb5ee5a7c05d7bc8d4aa
React-RCTActionSheet: 036a8aefa14fc19675e9e9f5006dc714bcb46684
React-RCTAnimation: 0053c157cbbea286bc2db8835ef4f44b30508cc4
React-RCTAppDelegate: 71c4f386c437618dcd5208ce6e8c754293594ad4
React-RCTBlob: 037dd4857df7cee67f8f888a7bc50d2b4a92bca5
React-RCTFabric: 02213d7cec2c67a050743a23892810e9c0c3f2fd
React-RCTImage: 66449efc872f237ccb44a6a3bfd356989a587fe4
React-RCTLinking: 16741487b0dc6801cfaa708e64c038a74e9a847d
React-RCTNetwork: ff9babb55e055cff13673f16f3d4d538c64df90d
React-RCTPushNotification: 03d115747b28a77ae375e0f63e188bf9a1d1d4be
React-RCTSettings: 48fc69ff93298efee6611f6983180aafa438b47a
React-RCTTest: 5f5e3cd632066b2b798917bd076ba539a30fe415
React-RCTText: 11944100c500f4d315616c05ac547535c4dad9aa
React-RCTVibration: 9fd4ce9cc2b7dd827dcec09eb502d07a1b076b76
React-rendererconsistency: 546e5e6e2cd2452dceae8a1f649a8729459e1ef7
React-rendererdebug: ba5a20926f8e0d8de547bad92c88e63910bce590
React-rncore: 3a67b832671a341bb3418a8b89a8dc4425b62310
React-RuntimeApple: 71457481a74e06a296448a8ac4a9700167a2d241
React-RuntimeCore: bf9c9c863e710e4d2938d9bc542501b3cd07fc03
React-runtimeexecutor: 5a4b1736b547811ebbf2f5db9e58c9184d6514cd
React-RuntimeHermes: 3d83f329b54d2d6accaf7c9d28d6f519857b83b9
React-runtimescheduler: 8786b1927836380c443d0fb39af3f10cf80ffd18
React-timing: ff1ffa083a1901bf161f7d50950f08c7e07dca90
React-utils: 31bd4a7e3141994194048105b704669d2190818c
ReactCodegen: 65ce3f3e2bb238505f943941b1cf30b4f5ea9698
ReactCommon: 2f7f1a6ac3607b43f524dd6997813075ac06dcfa
ReactCommon-Samples: cb52d135304897c4aab596d514d6a44ab1e25b21
ScreenshotManager: a3d9db14cd056df5e4a57c3fedee795393246790
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Yoga: dcc37de9ded9760f3d5dc18865cc15a62bb4884b
CHECKOUT OPTIONS:
OCMock:
:git: https://github.com/erikdoe/ocmock.git
:tag: v3.9.2

SPEC CHECKSUMS:
boost: 860c623744dab87c609a055f83f83f42b5ebcc72
DoubleConversion: 55b1a13a4ac0adb3284bef5f3f0c96754f6f0ae8
FBLazyVector: 8d8f60607ab65f0e152211cbbf9642186bb3b0b3
FBLazyVector: 75917a8d89cfe57b7f98cd4ab36cb526f1174cd7
fmt: 030bf7157445bf1aea48da271f274f4414e75349
glog: a40a7f15eed93736148eb4c5bb7ed8a4a460f748
hermes-engine: 010da565d0073d612a760a5c869315ddefe72a98
hermes-engine: 6122c86dee17ba201cb2319a3f482ce0b1e1a7ae
MyNativeView: 4aaf4bcf87cc036f198a87515b761bedc3485559
NativeCxxModuleExample: 6205ec76b01387bae46348010610ee14e4263038
OCMock: 267d92c078398b7ce11d99e811e3a402744c06bc
OSSLibraryExample: 2142d01ef5f40e317ad354d2801552774682c7f1
RCT-Folly: d23913eeafd2fd092ae5067925f4b778c33dadf9
RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf
RCTRequired: 88f54cd55420a6981df43816abdfcad9f0981729
RCTTypeSafety: 47c725aea1edff1f09c20c7986887ea7b02e8e05
React: 25116488c35785f9e128bec04a2ac430fc4904f1
React-callinvoker: 598f3bb781e60599869e742a0148df237d5c5ad8
React-Core: a8f06753f2d7afab501f6b37ac592ffa164e20b7
React-CoreModules: e81d07822695d8da470a2e9c9ebd7e18a9dc9200
React-cxxreact: 49d132dc10c8308899f4664eb695d178a9ab51fa
React-debug: 01e57005dc4558aec0cc76e7ced22fe544d4d60d
React-defaultsnativemodule: 6078e8669b3c9d613cfed67e894805ffa461e9df
React-domnativemodule: ac22cbef33c10a54a6e636467d72f50c1cd83c87
React-Fabric: d73d31089d0487c5aa16b29f89803d304cbaa908
React-FabricComponents: 1427c11815a56d0e64497891a297ef683ffecca8
React-FabricImage: 291f6afb29b8f63924dbee6619bc76af2cd42e93
React-featureflags: 4ae7647ca45c372e20b5ee67e1d86b9bf99edc89
React-featureflagsnativemodule: 2e59918918f0c001c174c5da340d9f829ff23657
React-graphics: f2fc9e7cbbd46ac41db64a2fd1497605482ee1bb
React-hermes: 29ffa7e04d8adab9c29abc3ec4906f02d22e51eb
React-idlecallbacksnativemodule: 1cbd157b20d32396f3c059f015a5a05c2a97df9d
React-ImageManager: 65f8dd056ca7f9aeaaf9dcce2b575b3f5d0bba2a
React-jserrorhandler: e51f8c5ca098a523b9a0e6a119bf6c1f74ec9b01
React-jsi: 0660d41f3a7f3d13875f3d5d25bb4e0867987e5b
React-jsiexecutor: e1e997d71a8329651b449a8e106467a204565dcf
React-jsinspector: 9f9d1d3378464dc81730c48d027f5e13ae2f04e9
React-jsitracing: e7a70bbcd3279b9bbf9fb6e6646e50e275a35616
React-logger: b9ae56d9f31a924d0639d2713eaee925e8576af0
React-Mapbuffer: 021b2a188bd3ce19be35da7b8162e62cc4d8abac
React-microtasksnativemodule: dcefa3a05089c709e02b3899718a93fb97dae072
React-nativeconfig: 48e4ebab810a7a8f11304afd118000badae20b44
React-NativeModulesApple: 7f25f411dea7929cedad570ec5a05d7e5d525112
React-perflogger: cb47660e0f0841ae617c330488ca90db1113052e
React-performancetimeline: 7ba58dd84fcc57f4ea1c342a142ca6355ac74df5
React-RCTActionSheet: 2bf826a7d56226ccb4e647ccf9b174a5b5ac5052
React-RCTAnimation: 6f7f27e9bab012473ddb76025e124ecba4be5f6f
React-RCTAppDelegate: 430e38ee0c36282e25746d49af0a93736f2db4e7
React-RCTBlob: c74dce52cd68072c23e29597dce5d01de21ff0e3
React-RCTFabric: 838583e210ab32b098432310447f6557e9fcd3b8
React-RCTImage: 2a7316f5541266d96c9f63261a2eaa0e14b3d790
React-RCTLinking: 02a745188779bf2ecb527288d1689e69cb127654
React-RCTNetwork: 37353fbc2cd737b511ddd348d2a110ecaed6fe55
React-RCTPushNotification: 4352f4a9a5601b2f047450c8f337af769f3966be
React-RCTSettings: 746640ba457ab4bc1144a56171d19e3f18a793aa
React-RCTSwiftExtensions: 9c7a9a8836cba12eaa3d874bf29f163ed98385e2
React-RCTTest: 2a5793d223960ef029aafbf2b9daeaf2961f7140
React-RCTText: 24271e9c52a52dcff1a2fe5f5c0181a26e4ce405
React-RCTVibration: 88eb0bfcd16ff39bfef10b238729a196a02fea9f
React-RCTWindowManager: 88e85013ffb39fad71247c24b39d0c0a943f80ef
React-RCTXR: 4b3b602959e95ddb6e4e46b19a60fc8e325258d2
React-rendererconsistency: 5141835e41aae2e524c38745b2989de63661c5a5
React-rendererdebug: 00aa7ed144756150fa26243dc6c055bc29b8464b
React-rncore: aa31e828707ff474f0823a4b2851c6a0aa5d41d4
React-RuntimeApple: 1b838edce9d97fa492319a2cd8c7e1f3c6327b85
React-RuntimeCore: bfd1a068f322c69339b99254fc0191449706ff12
React-runtimeexecutor: 4d6a582bed9f7e8fd0ee558ba4b1f3ef6f460aa7
React-RuntimeHermes: 4ad7df52ac79b1c7412a6f992db81f702162ce3c
React-runtimescheduler: 079fac686eb3e241973f6b169b28d0496769f955
React-timing: 61264ee53cb8458767c60765744520bc112233d6
React-utils: 069d110803398fff652d787ab9efac513b06189d
RCTRequired: 8919b4dc424a86aba972804530a06910b74d15a5
RCTTypeSafety: 3f1a45e4577f09e87afa7a96aa626f39303eda82
React: e4ed2cd942dd3e28e922468afaf73868de21ea27
React-callinvoker: d6a336a05b014e411ea16c6cddaa6d59e1a5b0bc
React-Core: 492bd6177faf25b49f26318a315aa0ac1ba38d96
React-CoreModules: c85b9b284f3382f0c800ee9e0bb39ca2de770e8d
React-cxxreact: 8de3c541a2252614df9ef5f6f10da47de049f894
React-debug: 6f947fa4a7419c21c162c9803c6f3f24d6b7e68c
React-defaultsnativemodule: 10b757a10362c6eacbe5ad38a5e98504fc5e4798
React-domnativemodule: a9d107632f08c9c0792c1d8c9e8608729b3e600d
React-Fabric: f9dab36edff6834e99750add3a59058353687c79
React-FabricComponents: 6692268833fdb0ec9e435611bf8ea1e7faacc0e1
React-FabricImage: 6417f376e21ad0f58894e628867163b5a3327f69
React-featureflags: 7ec38e7f4b81a870e7c4912c4eb02a726384db6d
React-featureflagsnativemodule: f6a3befd63d4e27bee813e9321643dbed6800543
React-graphics: eba6d6369336f25baba841534d919f8d52ea8be6
React-hermes: 336332b5fc7625c90d27820371d5d20f2ab8dd5b
React-idlecallbacksnativemodule: 16b079c2f21c7f8ba0b4c242a46bf00d06a9d7c6
React-ImageManager: 05a3c1a062d90df2181458c0d0665a8ffa084244
React-jserrorhandler: 88322945d8c68834e22511963c4ddc644ca7535d
React-jsi: b0b8226b325d9a5d4ee792b097da4061f3a5e3f7
React-jsiexecutor: 166248bb49a62884118be80414f0a8958ae577a3
React-jsinspector: 4aad8ab68d7da02ee74902575b9f0a68bfc42189
React-jsitracing: b632400ca03d0554d482ffc254b4a4e1ab6024a7
React-logger: 35584107dc831ae3bc23064c63161c0a079f959b
React-Mapbuffer: 8faa20ad9065b2d09c321c2387257780d3041863
React-microtasksnativemodule: 9ba80052db25065c66234b326de431912df19545
React-nativeconfig: be3975ef2d52d63ac255ecbf1861f9ef7b60b439
React-NativeModulesApple: e6a958f9925095363c22f4343337bf8f0227ca49
React-perflogger: 3e6acd6b92b0ea8ccd5a0872edfe70ebdecfe6bd
React-performancetimeline: 369a6ed47a5f951586d7b4dd741382ec8307080f
React-RCTActionSheet: 6df066b08fa19696b19e8a0b500c24f09a8238d5
React-RCTAnimation: 2a52d8345af047b8fe2ce8fe9c7ef1b12876081a
React-RCTAppDelegate: 0181d89af0fb8aca50b41749a2952d102d31dc8d
React-RCTBlob: b70a36038f80af467052b7b0966d9d3403d538a4
React-RCTFabric: c07a979acbda5fee3da9a67689cc549830a2cf07
React-RCTImage: 9b63b595bf2aa575383fb978ce3ade3cedb95ba7
React-RCTLinking: 442be15b86fd627fc9eff11b82996608072e93f5
React-RCTNetwork: ced688e676899e4e1cde14d070db16721855867c
React-RCTPushNotification: 547e8526b4878bb0dc1cc73a3631ee9222d301a4
React-RCTSettings: ef1b0340fbcbcbd83cb787c6c64f8ec87f93fd02
React-RCTSwiftExtensions: 5b6189006b9e5526390b1f88168b5e9ac5b5f8ec
React-RCTTest: fe0371b6bb5703e5dbdc145d704f3db0dd99a6c6
React-RCTText: f8ef84e0c01ff4a463d8984e13f02d8cb3489e67
React-RCTVibration: ce3dfe8bcb777d8e694a8b643a72b78fb4e9a035
React-RCTWindowManager: a53b985b4a923e13c1ab7546e87db04bb1956300
React-RCTXR: f79f86a916325b346aa879e417ebcf27b95d93c5
React-rendererconsistency: 0ca5004cb82d0a5550955dd3593cd2ebeda25457
React-rendererdebug: b91a3027ff07c58c3306e029c1da7b3b3c0abd97
React-rncore: 70e0b76634f90404805cd159595ce74900bdc80d
React-RuntimeApple: aabc75825a6e486d3d9523ee93fe9d83e14b13c6
React-RuntimeCore: 4d6127a02c8200bfb49923733c2ec2240106d46d
React-runtimeexecutor: 90cca54336482cf43d7c2b3c80af3f4cef1d1e0e
React-RuntimeHermes: 3c5d14d1acdc9d17d62a048f11d9af115e0ac263
React-runtimescheduler: c42bd8cc26171a3534a98d6fb19aec4761b2854f
React-timing: 211dd30779c09ed8a2ba9fd7a1343ad37a9c9e82
React-utils: 76d8c01d580264f17d9f039da69afac43b774e36
ReactCodegen: e0b48721f27c77ea8bf1b26038bee317efc219fc
ReactCommon: 22a784a034080685a6565ddf61259f419e8475dd
ReactCommon-Samples: 68a0c105d6417574f7ac8a5b5546b1e71a238a36
ReactCommon: 245600a1b02f0987c92d108b9d727f128faa08fb
ReactCommon-Samples: b4ddc137d57d049c827f7a356b8df1bf39dd227b
ScreenshotManager: 4bd1cc50a26fe3225c48add3fd254f8e9cba38ca
SocketRocket: 056929a116eb442123fa563c6b75a1f88f98252a
Yoga: b056bdf86aa89c3f07a2f80d9cc6c8f7144a5a4a
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Yoga: 961e7e2a9fad70b36e221e75b3e45637a33cbdca

PODFILE CHECKSUM: ecf8d73b0aefca76e0e218d8845b105ea9282718

Expand Down
Loading

0 comments on commit b370a5a

Please sign in to comment.