fix: move visionOS codegen specs, sync with upstream

callstack · Jul 15, 2024 · 5a9cd7a · 5a9cd7a
1 parent 0567625
commit 5a9cd7a
Show file tree

Hide file tree

Showing 12 changed files with 417 additions and 384 deletions.
diff --git a/packages/out-of-tree-platforms/package.json b/packages/out-of-tree-platforms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@callstack/out-of-tree-platforms",
-  "version": "0.75.0-main",
+  "version": "0.76.0-main",
   "description": "Utils for React Native out of tree platforms.",
   "keywords": ["out-of-tree", "react-native"],
   "homepage": "https://github.com/callstack/react-native-visionos/tree/HEAD/packages/out-of-tree-platforms#readme",

diff --git a/packages/react-native/Libraries/WindowManager/NativeWindowManager.js b/packages/react-native/Libraries/WindowManager/NativeWindowManager.js
@@ -3,6 +3,6 @@
  * @format
  */
 
-export * from '../../src/private/specs/visionos_modules/NativeWindowManager';
-import NativeWindowManager from '../../src/private/specs/visionos_modules/NativeWindowManager';
+export * from '../../visionos_modules/NativeWindowManager';
+import NativeWindowManager from '../../visionos_modules/NativeWindowManager';
 export default NativeWindowManager;
diff --git a/packages/react-native/Libraries/XR/NativeXRModule.js b/packages/react-native/Libraries/XR/NativeXRModule.js
@@ -3,6 +3,6 @@
  * @format
  */
 
-export * from '../../src/private/specs/visionos_modules/NativeXRModule';
-import NativeXRModule from '../../src/private/specs/visionos_modules/NativeXRModule';
+export * from '../../visionos_modules/NativeXRModule';
+import NativeXRModule from '../../visionos_modules/NativeXRModule';
 export default NativeXRModule;
diff --git a/packages/react-native/React/CoreModules/RCTDeviceInfo.mm b/packages/react-native/React/CoreModules/RCTDeviceInfo.mm
@@ -52,7 +52,6 @@ - (void)initialize
                                                name:RCTAccessibilityManagerDidUpdateMultiplierNotification
                                              object:[_moduleRegistry moduleForName:"AccessibilityManager"]];
 
-#if !TARGET_OS_VISION
 
   _currentInterfaceDimensions = [self _exportedDimensions];
 

diff --git a/...act-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm b/...act-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
@@ -75,6 +75,9 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations
   }
 
   return _supportedInterfaceOrientations;
+#else
+  return UIInterfaceOrientationUnknown;
+#endif
 }
 #endif // RCT_DEV
 

diff --git a/packages/react-native/React/Views/RCTModalHostViewController.m b/packages/react-native/React/Views/RCTModalHostViewController.m
@@ -68,6 +68,9 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations
   }
 
   return _supportedInterfaceOrientations;
+#else
+  return UIInterfaceOrientationUnknown;
+#endif
 }
 #endif // RCT_DEV
 

diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -162,7 +162,7 @@
         "type": "modules",
         "ios": {},
         "android": {},
-        "jsSrcsDir": "src/private/specs/visionos_modules"
+        "jsSrcsDir": "visionos_modules"
       },
       {
         "name": "rncore",

diff --git a/...s/visionos_modules/NativeWindowManager.js → ...e/visionos_modules/NativeWindowManager.js b/...s/visionos_modules/NativeWindowManager.js → ...e/visionos_modules/NativeWindowManager.js
@@ -3,9 +3,9 @@
  * @format
  */
 
-import type {TurboModule} from '../../../../Libraries/TurboModule/RCTExport';
+import type {TurboModule} from '../Libraries/TurboModule/RCTExport';
 
-import * as TurboModuleRegistry from '../../../../Libraries/TurboModule/TurboModuleRegistry';
+import * as TurboModuleRegistry from '../Libraries/TurboModule/TurboModuleRegistry';
 
 export type WindowManagerConstants = {|
   +supportsMultipleScenes?: boolean,

diff --git a/.../specs/visionos_modules/NativeXRModule.js → ...native/visionos_modules/NativeXRModule.js b/.../specs/visionos_modules/NativeXRModule.js → ...native/visionos_modules/NativeXRModule.js
@@ -3,9 +3,9 @@
  * @format
  */
 
-import type {TurboModule} from '../../../../Libraries/TurboModule/RCTExport';
+import type {TurboModule} from '../Libraries/TurboModule/RCTExport';
 
-import * as TurboModuleRegistry from '../../../../Libraries/TurboModule/TurboModuleRegistry';
+import * as TurboModuleRegistry from '../Libraries/TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
   // $FlowIgnore[unclear-type]

diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
@@ -15,7 +15,7 @@ PODS:
   - hermes-engine/inspector (1000.0.0)
   - hermes-engine/inspector_chrome (1000.0.0)
   - hermes-engine/Public (1000.0.0)
-  - MyNativeView (0.75.0-main):
+  - MyNativeView (0.76.0-main):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -36,7 +36,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - NativeCxxModuleExample (0.75.0-main):
+  - NativeCxxModuleExample (0.76.0-main):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -58,7 +58,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - Yoga
   - OCMock (3.9.2)
-  - OSSLibraryExample (0.0.1):
+  - OSSLibraryExample (0.76.0-main):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -449,6 +449,7 @@ PODS:
     - React-featureflags
     - React-featureflagsnativemodule
     - React-graphics
+    - React-idlecallbacksnativemodule
     - React-ImageManager
     - React-microtasksnativemodule
     - React-NativeModulesApple
@@ -1273,6 +1274,28 @@ PODS:
     - React-jsinspector
     - React-perflogger (= 1000.0.0)
     - React-runtimeexecutor
+  - React-idlecallbacksnativemodule (1000.0.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
   - React-ImageManager (1000.0.0):
     - glog
     - RCT-Folly/Fabric
@@ -1310,6 +1333,7 @@ PODS:
     - RCT-Folly (= 2024.01.01.00)
     - React-featureflags
     - React-jsi
+    - React-perflogger (= 1000.0.0)
     - React-runtimeexecutor (= 1000.0.0)
   - React-jsitracing (1000.0.0):
     - React-jsi
@@ -1351,7 +1375,9 @@ PODS:
     - React-runtimeexecutor
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - React-perflogger (1000.0.0)
+  - React-perflogger (1000.0.0):
+    - DoubleConversion
+    - RCT-Folly (= 2024.01.01.00)
   - React-performancetimeline (1000.0.0):
     - RCT-Folly (= 2024.01.01.00)
     - React-cxxreact
@@ -1642,7 +1668,7 @@ PODS:
     - React-logger (= 1000.0.0)
     - React-perflogger (= 1000.0.0)
     - React-utils (= 1000.0.0)
-  - ScreenshotManager (0.75.0-main):
+  - ScreenshotManager (0.76.0-main):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1698,6 +1724,7 @@ DEPENDENCIES:
   - React-featureflagsnativemodule (from `../react-native/ReactCommon/react/nativemodule/featureflags`)
   - React-graphics (from `../react-native/ReactCommon/react/renderer/graphics`)
   - React-hermes (from `../react-native/ReactCommon/hermes`)
+  - React-idlecallbacksnativemodule (from `../react-native/ReactCommon/react/nativemodule/idlecallbacks`)
   - React-ImageManager (from `../react-native/ReactCommon/react/renderer/imagemanager/platform/ios`)
   - React-jserrorhandler (from `../react-native/ReactCommon/jserrorhandler`)
   - React-jsi (from `../react-native/ReactCommon/jsi`)
@@ -1804,6 +1831,8 @@ EXTERNAL SOURCES:
     :path: "../react-native/ReactCommon/react/renderer/graphics"
   React-hermes:
     :path: "../react-native/ReactCommon/hermes"
+  React-idlecallbacksnativemodule:
+    :path: "../react-native/ReactCommon/react/nativemodule/idlecallbacks"
   React-ImageManager:
     :path: "../react-native/ReactCommon/react/renderer/imagemanager/platform/ios"
   React-jserrorhandler:
@@ -1901,78 +1930,79 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   boost: b6392ab8d665ef3aa7069eea9e57f5224ec9970a
   DoubleConversion: 26c660c8d88372cca1a67f8101d2d962a7064361
-  FBLazyVector: bb97cf41a1ec98da6ac5f168603429aa26256826
+  FBLazyVector: 8f7392987e61cd9e62bca3a8d6712b2742638364
   fmt: 5d9ffa7ccba126c08b730252123601d514652320
-  glog: 63360cdb8e07e9542830fefdd73687e5af0db2ac
-  hermes-engine: c87fb20a7588a9a2e5112ca459a0faa58f90c0c6
-  MyNativeView: 285c6f70650ff53a276f7086047921e617a4d0e3
-  NativeCxxModuleExample: 1cd42853b5ec241c6b5e70f2dd4bbc26feb97b39
+  glog: 66d66eda971f41dc8c173bd5b6e1913ba1ff33cc
+  hermes-engine: 40dec4ba443db55a38d5663e79e2a2ab1b5ee46e
+  MyNativeView: f3c048d9853ab68408dadb8dd387ce4a47ac7069
+  NativeCxxModuleExample: ef7c002b6f44701c64cefe67010a60b85639a0af
   OCMock: 267d92c078398b7ce11d99e811e3a402744c06bc
-  OSSLibraryExample: d718b079a7ff6bb417fdbb6d98d58b9081b07b88
-  RCT-Folly: e75371281be586c821f9614489de0d370146e4a2
+  OSSLibraryExample: c82a7587af8e450167f7658d60656d416b320a69
+  RCT-Folly: e9c870566037ca41e7c252578073da038ea3f63a
   RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf
-  RCTRequired: e2d2421dd9b71ec2f75d8819f1d9150f9c4ea3d2
-  RCTTypeSafety: a46d8dca67435dcad5faf1bce7fc264f1d344556
-  React: d2dd0aa5d3c1c5f1621ffcb635b3a3062c0cec7d
-  React-callinvoker: 392e9e1decfc6434b5ea2b4e33121efed6adc371
-  React-Core: acdfcba326e9b8ea4b3163bf02d96684690cb7b9
-  React-CoreModules: 5ce6d9f965d466772940678032c3ea110dc7127e
-  React-cxxreact: 7cecf854cf8c4943cf8b212c1b3e1df5f07d58ef
-  React-debug: 17d58ecd6724696ae4b0168db1e3b131ea41f13d
-  React-defaultsnativemodule: 3b0377f7d08cfd2303e9ee044bc5fd622e45e916
-  React-domnativemodule: fc3745aae8d9188e7aaf89a854bf118e4d681ff4
-  React-Fabric: 6ab10fe82bc1b72c1531bee915e1a1a3196fb15c
-  React-FabricComponents: 3f511394002de01adee675643828f036606f2458
-  React-FabricImage: 0ad7e9d33663b9ca9fc6adf7241f05cb49cf1675
-  React-featureflags: 1125a077b97ad05724459c50a8d63a631ccbb290
-  React-featureflagsnativemodule: 4ba580e1a12a48d220fee7f970825b114b4d3f46
-  React-graphics: 5dee8dd4ab45eecca676158623182a7e2f799e67
-  React-hermes: 947107bf8afa084b413500b138f511757d2e47ce
-  React-ImageManager: 3a794152d8c399f803025970b572f46443a083a0
-  React-jserrorhandler: 12e28f468161d1582d8fe7c15a65684069aa3da8
-  React-jsi: 7b6ffae817b20a441556db20bdd86e97e0bfaf5f
-  React-jsiexecutor: bda1a35f4735342507d728d36da595c75e399dde
-  React-jsinspector: 0e9793a6c9cf5b13125cecba61e9d34abdf92815
-  React-jsitracing: af49f8ebb2a6598b2a51e16115e12da87b10b688
-  React-logger: 3bcc34dd4448460b6e59b121c79011a6e77bbb76
-  React-Mapbuffer: 30dcc9c98ad76c5a201e8cbca543722276bc8671
-  React-microtasksnativemodule: 091e2c420e803b2aa9f65e76fc5543509b05205a
-  React-nativeconfig: 2cf1ab755b737e046d1f2ecd29ec9e5e42adeb7f
-  React-NativeModulesApple: 64cff64125c365e816c5e521161f7c94809e1f4c
-  React-perflogger: 8157085d2988add400788acdfcceaf7f014d6ae3
-  React-performancetimeline: 43b84cd541cc401d0a9637743b25f21a594f1b12
-  React-RCTActionSheet: a89ed21bc6824449c407219f7fde19efebd59ad4
-  React-RCTAnimation: b937d3b4090d98aca81db3ce19cc7a7ae1f3703a
-  React-RCTAppDelegate: 4191aadf91d494096723cd1409860cc0aaeb9cb7
-  React-RCTBlob: 1b98526cf6e0f88b909ed8b26394f27c0d88e15f
-  React-RCTFabric: 62b9c82312da5d6002e167009a2fa4e6042ab43c
-  React-RCTImage: 6b8baa4f6f1e8dd5c9eb9e1352587636c2270e6e
-  React-RCTLinking: ff709cf5f506247b217fedb9a66a7af7af9736c0
-  React-RCTNetwork: 4825b99a2a144eb9fa8d13c0c2a01d3d24cff8eb
-  React-RCTPushNotification: 2d6afa6c09d038613f472e4e7db60dc84eb8a206
-  React-RCTSettings: d38b3b1e9feffb833783a17e57f339a3cd0d2a36
-  React-RCTSwiftExtensions: e4ef71c2508fbc872e1aa5d699c4a5ec31349795
-  React-RCTTest: b53fc31507708d8a1b1aee14303eca7bce0a1b4d
-  React-RCTText: 064098b910f211ae82646cdb4e27c03668f7273b
-  React-RCTVibration: 8b000ff2d65261cd3dcc191ad173e6144bf28de1
-  React-RCTWindowManager: 9203a9030b886c23163a5a20eb01c53df43bbdfb
-  React-RCTXR: 8e7399b1611fa1b85c81f8e07f4bf1f2a3bb60d7
-  React-rendererconsistency: 86c24bac056d99b82167e1b935e3caec02919828
-  React-rendererdebug: 3a0cecb7a10edf272b6d729b3b07e19afcd083c7
-  React-rncore: cd92442b4210adcc6e6fc01980dcfaf5773cc20b
-  React-RuntimeApple: a4e630e05326f3b27de108bd916e46a85548630d
-  React-RuntimeCore: 9839c85fc8eb3226fd0b16f94cdb1bcaf512abf5
-  React-runtimeexecutor: 3365a76846220cadfcda11cfbb056fa8860cee3c
-  React-RuntimeHermes: 8d9529c0f043b0dad106b244420cc0500c213be4
-  React-runtimescheduler: 2b08c807de104a242c38db0f07edc35dc253a5a6
-  React-utils: d2463dc5f0f83ba29a17380f440f6f2060cb954e
+  RCTRequired: c4f106faf59c40abcac5c484c5f282cf4f5ea397
+  RCTTypeSafety: 99c977da12754a30afa43b45295ac072886d2509
+  React: 655eaed674270c34a6fa14eec1e14b3359de5e2f
+  React-callinvoker: e2c5b0fe516a4d43820a11a923ce6e9dbefc9708
+  React-Core: b850a83aa649dcd2b98868fead3e74f3d91a83fe
+  React-CoreModules: 472c43fe4823894a171f27afde6453522bf799ba
+  React-cxxreact: 7cecb62200d6c514d3339d61232e864a051c5588
+  React-debug: 78d0d16ada25fafbc175612a6d625f831cffedff
+  React-defaultsnativemodule: c89e6da5b87243531d23615181b7fa918b3f3fbd
+  React-domnativemodule: f9061618faaee1143a53dd7bc723200c7f102d6e
+  React-Fabric: 00edf69ff59dc1735c7a8b710231b0bd4929f270
+  React-FabricComponents: e2860f4cc20834166abc705731c14f5e43bd978c
+  React-FabricImage: cb3af73b84eb087481e087f03ccd924a6dd88509
+  React-featureflags: 86ebe06bbd0ae2bbfd9cb98052ef3de61cea4055
+  React-featureflagsnativemodule: 4d0b86b663f9b2f3adaa3f98ca2114335dc2e8fb
+  React-graphics: 8236a051f0bfa3785377f9a5da9dc6f4817d65f4
+  React-hermes: 62dc667222b775df70e8a061e5e9fab8f61540e5
+  React-idlecallbacksnativemodule: 11a82da05026aa2c4b7a25c13f9be81642f4e8e0
+  React-ImageManager: 4c0ce0f626c526d16ea94dec8605a4a302501804
+  React-jserrorhandler: 3c474cd0cbac06b10e0c92a1464fa4d2bfb8ebc3
+  React-jsi: 2952ebd269528888f5693c0fde4276198ed9b93a
+  React-jsiexecutor: 1ddec7aa516bf6310027711dc79f376fa1254b38
+  React-jsinspector: da17531a5bd04553812edd08f5a18c13ee9cbdd2
+  React-jsitracing: 23692ef86ebf0d297e4b2b8dd7adf05ddbe4bb27
+  React-logger: 7897bbfcaa0c14bdd2da36654a9334169dfce825
+  React-Mapbuffer: 942b20677916435e81d65496c65ad0b1dcafc704
+  React-microtasksnativemodule: 4c24d2ed37b0665e3dc4a2e3c1e09f88315891d0
+  React-nativeconfig: 5fad10ef0d932fcb77116c2393c6481f29f09b7a
+  React-NativeModulesApple: 29256aa1c5597d572794644373c6c7df9483b850
+  React-perflogger: b9a926015bdd82870176ada36d79a1a56e823310
+  React-performancetimeline: 6f68588004221fdb62e0463a6b03cac4d4c7c1da
+  React-RCTActionSheet: 2541412e14fa5b93e4c6e591f46bdeedefaade09
+  React-RCTAnimation: 7b3a10c719f06411993ba11ad3aa4ceb9696141a
+  React-RCTAppDelegate: 15e3e86eb499a4423eeacd3ce3617f95ab052c7d
+  React-RCTBlob: 6f4da5d7e079776a3ddd84e8ee90b14fbab15624
+  React-RCTFabric: 55578ccb1b5b3230101b2efabd23cdb00b6adc3b
+  React-RCTImage: 17e07040a00c6ad59a92ca68ef7d25cb9380fed6
+  React-RCTLinking: 284420644b1dcc8239783834f1fdfac64dcbe434
+  React-RCTNetwork: 16846f0554140e45fb0f7a588c11be8c97e57fc8
+  React-RCTPushNotification: 613a6da959b70a517b81acb442d482ee5fba91fa
+  React-RCTSettings: 9db0e386765a4d6af5c03eb8206011ea899ca3eb
+  React-RCTSwiftExtensions: 5cd2205980a3b35456db857da557f9d363e9565d
+  React-RCTTest: 31db64f4adf0a792cbd5da69f30c16bc02c21393
+  React-RCTText: 70e0f8d3a8d61404d44e5bd02bb0a61050855b45
+  React-RCTVibration: 89d70d8e76b3061a0f60add1111a05dc763f012d
+  React-RCTWindowManager: e764fa5bbe5f36393904917a40097f8265f76133
+  React-RCTXR: 1eb11e2ba8cc5ceb9fecc27f21e002ad6cd652b8
+  React-rendererconsistency: be742730b3a9aaf9ca9bff831d1bcaf4ce8ed400
+  React-rendererdebug: 7147d483b855f06dc15d82da231fef71236d2750
+  React-rncore: db8534c953321266ceb6e48ba801e179c2add140
+  React-RuntimeApple: f03dbc1f72dea56c1434637260d3d51a95f46dc1
+  React-RuntimeCore: 2e860c574834ae2f9083dc93364425dfd7ad8e27
+  React-runtimeexecutor: 2099a4023b65ce30e31678f808fc461b08db7f26
+  React-RuntimeHermes: 124ab1cf8c35816fff1900e441bf11e909bc47d3
+  React-runtimescheduler: 1b8c991257f4f084787337832b5b55e3347c11a9
+  React-utils: 791acd082185b54f3d79d66c2ef7ae6865022afb
   ReactCodegen: 2fa2bfb8df604e5bbf2462cf3cced313c3131b96
-  ReactCommon: 6340d066518d1d237004322a2e0f98276a629b60
-  ReactCommon-Samples: ade3760c867b52e43c058c1e9ce83f91aeb00aff
-  ScreenshotManager: 662151998cf5859591e72c76ceb9ebc6d04b425b
+  ReactCommon: fdc5490effa657363a1fb8c5ddbaff5d1fb15e20
+  ReactCommon-Samples: e1ab691c058aa7f91412fa5e2722c30e8628db65
+  ScreenshotManager: cf3604e3fd56d856bc00244ccfa96f4a400a5a6c
   SocketRocket: 0ba3e799f983d2dfa878777017659ef6c866e5c6
-  Yoga: 6d52df2404d3e20ba00f3b1834a10b3c4fa4979c
+  Yoga: 90b7d40e0db918a9e7aecfa9e3c218ce235eb9d4
 
 PODFILE CHECKSUM: ecf8d73b0aefca76e0e218d8845b105ea9282718
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
@@ -907,7 +907,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A975CA6C2C05EADF0043F72A /* RCTNetworkTaskTests.m in Sources */,
 				E7DB20DF22B2BAA6005AC45F /* RCTImageLoaderTests.m in Sources */,
 				E7DB20D222B2BAA6005AC45F /* RCTModuleInitNotificationRaceTests.m in Sources */,
 				E7DB20D522B2BAA6005AC45F /* RCTPerformanceLoggerTests.m in Sources */,