fix sim version detection(apple)

Author: ElenaDiachenko

package.json

@@ -127,7 +127,7 @@
     },
     "private": true,
     "resolutions": {
-        "@react-native-community/cli-platform-ios": "12.3.6"
+        "@react-native-community/cli-platform-ios": "15.0.1"
     },
     "title": "ReNative",
     "husky": {

packages/app-harness/package.json

@@ -42,6 +42,7 @@
     "dependencies": {
         "@lightningjs/cli": "2.13.0",
         "@lightningjs/sdk": "5.5.1",
+        "@react-native-community/cli": "15.0.1",
         "@react-native-community/push-notification-ios": "1.11.0",
         "@react-native-firebase/app": "20.0.0",
         "@rnv/renative": "1.8.0-rc.0",

packages/config-templates/pluginTemplates/@react-native-community/cli-platform-apple/overrides.json

@@ -0,0 +1,8 @@
+{
+    "overrides": {
+        "build/tools/listDevices.js": {
+            "const parsedSimctlOutput = Object.keys(simctlOutput.devices).map(key => simctlOutput.devices[key]).reduce((acc, val) => acc.concat(val), []);": "const parsedSimctlOutput = Object.keys(simctlOutput.devices)\n  .map(key => {\n    const runtimeVersionMatch = key.match(/-(\\d+-\\d+)/);\n    const runtimeVersion = runtimeVersionMatch ? runtimeVersionMatch[1].replace('-', '.') : null;\n    return simctlOutput.devices[key].map(sim => ({ ...sim, version: runtimeVersion, }));\n  }).reduce((acc, val) => acc.concat(val), []);  // <= PATCHED BY RENATIVE"
+        }
+    }
+}
+ 

packages/config-templates/pluginTemplates/@react-native-community/cli-platform-ios/overrides.json

@@ -455,16 +455,21 @@
         },
         "@react-native-community/cli": {
             "disableNpm": false,
-            "version": "^15.0.1",
+            "version": "15.0.1",
+            "supportedPlatforms": ["tvos", "ios"]
+        },
+        "@react-native-community/cli-platform-apple": {
+            "disableNpm": true,
+            "version": "15.0.1",
             "supportedPlatforms": ["tvos", "ios"]
         },
         "@react-native-community/cli-platform-android": {
             "version": "^15.0.1"
         },
         "@react-native-community/cli-platform-ios": {
-            "version": "12.3.6",
+            "version": "15.0.1",
             "disablePluginTemplateOverrides": false,
-            "disableNpm": false,
+            "disableNpm": true,
             "supportedPlatforms": ["tvos", "ios"],
             "nodeModuleOverrides": {
                 "^12.3.6": {

packages/config-templates/renative.templates.json

@@ -38,8 +38,9 @@
         "xcode": "3.0.1"
     },
     "peerDependencies": {
-        "@react-native-community/cli": "^15.0.1",
-        "@react-native-community/cli-platform-ios": "^12.3.6",
+        "@react-native-community/cli": "15.0.1",
+        "@react-native-community/cli-platform-apple": "15.0.1",
+        "@react-native-community/cli-platform-ios": "15.0.1",
         "@rnv/core": "^1.8.0-rc.0"
     },
     "publishConfig": {

packages/sdk-apple/package.json

@@ -1,11 +1,10 @@
 import { createRnvContext, getContext } from '@rnv/core';
 import { getAppleDevices } from '../deviceManager';
-import listIOSDevices from '@react-native-community/cli-platform-ios/build/tools/listIOSDevices';
+import listIOSDevices from '@react-native-community/cli-platform-apple/build/tools/listDevices';
 import { DeviceType } from '../types';
 
 const devices: DeviceType[] = [
     {
-        modelName: 'MacBook Pro',
         isAvailable: true,
         name: 'My Mac',
         udid: 'D9B9188D-C38B-59D9-A1BD-5E4081F6EDA1',
@@ -14,7 +13,6 @@ const devices: DeviceType[] = [
         type: 'device',
     },
     {
-        modelName: 'iPhone 15',
         isAvailable: true,
         name: 'iPhone 15',
         udid: 'ABF470AF-2538-4047-94A8-D72E22EB15BF',
@@ -23,7 +21,6 @@ const devices: DeviceType[] = [
         type: 'device',
     },
     {
-        modelName: 'iPhone 15 Pro',
         isAvailable: true,
         name: 'iPhone 15 Pro',
         udid: '04264D6F-0223-4AC6-9D05-8449DFDC6C3B',
@@ -32,7 +29,6 @@ const devices: DeviceType[] = [
         type: 'simulator',
     },
     {
-        modelName: 'iPad Pro (11-inch) (4th generation)',
         isAvailable: true,
         name: 'iPad Pro (11-inch) (4th generation)',
         udid: '59853D87-6F6C-4A6E-9F9C-A9C335F86647',
@@ -42,7 +38,7 @@ const devices: DeviceType[] = [
     },
 ];
 
-jest.mock('@react-native-community/cli-platform-ios/build/tools/listIOSDevices');
+jest.mock('@react-native-community/cli-platform-apple/build/tools/listDevices');
 jest.mock('@rnv/core');
 
 beforeEach(() => {

packages/sdk-apple/src/__tests__/deviceManager.test.ts

@@ -18,7 +18,7 @@ const ERROR_MSG = {
 };
 
 export const getAppleDevices = async (ignoreDevices?: boolean, ignoreSimulators?: boolean) => {
-    const listIOSDevices = require('@react-native-community/cli-platform-ios/build/tools/listIOSDevices.js').default;
+    const listIOSDevices = require('@react-native-community/cli-platform-apple/build/tools/listDevices.js').default;
 
     const c = getContext();
     const { platform } = c;
@@ -56,28 +56,28 @@ export const getAppleDevices = async (ignoreDevices?: boolean, ignoreSimulators?
 
 const _parseNewIOSDevicesList = (rawDevices: Array<DeviceType>) => {
     const decideIcon = (device: DeviceType) => {
-        const { modelName } = device;
-        if (modelName?.includes('iPhone') || modelName?.includes('iPod')) {
+        const { name } = device;
+        if (name?.includes('iPhone') || name?.includes('iPod')) {
             return 'Phone 📱';
         }
-        if (modelName?.includes('iPad')) {
+        if (name?.includes('iPad')) {
             return 'Tablet 💊';
         }
-        if (modelName?.includes('Apple TV')) {
+        if (name?.includes('Apple TV')) {
             return 'TV 📺';
         }
         return 'Apple Device';
     };
 
     return rawDevices.map((device): AppleDevice => {
-        const { name, version, udid, type, modelName } = device;
+        const { name, version, udid, type } = device;
         const icon = decideIcon(device);
         return {
             udid,
             name,
             icon,
             version,
-            modelName,
+            // modelName,
             isDevice: type === 'device',
         };
     });

packages/sdk-apple/src/deviceManager.ts

@@ -1,5 +1,5 @@
 import { ConfigPluginPlatformSchema } from '@rnv/core';
-import { Device } from '@react-native-community/cli-platform-ios/build/types';
+import { Device } from '@react-native-community/cli-platform-apple/build/types';
 
 export type AppleDevice = {
     udid?: string;
@@ -11,7 +11,7 @@ export type AppleDevice = {
     modelName?: string;
 };
 
-export type DeviceType = Device & { modelName: string };
+export type DeviceType = Device;
 
 export type Payload = {
     pluginConfigiOS: {

packages/sdk-apple/src/types.ts

@@ -119,6 +119,7 @@
         "react-dom": "source:rnv",
         "react-native-gesture-handler": "source:rnv",
         "@react-native-community/cli-platform-ios": "source:rnv",
+        "@react-native-community/cli-platform-apple": "source:rnv",
         "@react-native-community/cli": "source:rnv",
         "react-native": "source:rnv",
         "next": "source:rnv",