fix: move visionOS codegen specs, sync with upstream

okwasniewski · okwasniewski · commit 2f1a2b377903 · 2024-07-29T09:33:39.000+02:00
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/packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm b/packages/react-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/packages/react-native/visionos_modules/NativeWindowManager.js b/packages/react-native/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/packages/react-native/visionos_modules/NativeXRModule.js b/packages/react-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
@@ -1995,4 +1995,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 8591f96a513620a2a83a0b9a125ad3fa32ea1369
 
-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 */,
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@callstack/out-of-tree-platforms",`
`3`		`- "version": "0.75.0-main",`
	`3`	`+ "version": "0.76.0-main",`
`4`	`4`	`"description": "Utils for React Native out of tree platforms.",`
`5`	`5`	`"keywords": ["out-of-tree", "react-native"],`
`6`	`6`	`"homepage": "https://github.com/callstack/react-native-visionos/tree/HEAD/packages/out-of-tree-platforms#readme",`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,9 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`return _supportedInterfaceOrientations;`
	`78`	`+#else`
	`79`	`+ return UIInterfaceOrientationUnknown;`
	`80`	`+#endif`
`78`	`81`	`}`
`79`	`82`	`#endif // RCT_DEV`
`80`	`83`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,9 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`return _supportedInterfaceOrientations;`
	`71`	`+#else`
	`72`	`+ return UIInterfaceOrientationUnknown;`
	`73`	`+#endif`
`71`	`74`	`}`
`72`	`75`	`#endif // RCT_DEV`
`73`	`76`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@`
`162`	`162`	`"type": "modules",`
`163`	`163`	`"ios": {},`
`164`	`164`	`"android": {},`
`165`		`- "jsSrcsDir": "src/private/specs/visionos_modules"`
	`165`	`+ "jsSrcsDir": "visionos_modules"`
`166`	`166`	`},`
`167`	`167`	`{`
`168`	`168`	`"name": "rncore",`
Original file line number	Diff line number	Diff line change
`@@ -1995,4 +1995,4 @@ SPEC CHECKSUMS:`
`1995`	`1995`
`1996`	`1996`	`PODFILE CHECKSUM: 8591f96a513620a2a83a0b9a125ad3fa32ea1369`
`1997`	`1997`
`1998`		`-COCOAPODS: 1.14.3`
	`1998`	`+COCOAPODS: 1.15.2`