fix: cr comments

Author: OlimpiaZurek

.gitignore

@@ -45,6 +45,3 @@ Thumbs.db
 
 vite.config.*.timestamp*
 vitest.config.*.timestamp*
-
-# Nx
-.nx

packages/platform-android/src/lib/commands/runAndroid/__tests__/runAndroid.test.ts

@@ -32,6 +32,8 @@ const androidProject: AndroidProjectConfig = {
 const OLD_ENV = process.env;
 let adbDevicesCallsCount = 0;
 
+const mockPlatforms = { ios: {}, android: {} };
+
 beforeEach(() => {
   adbDevicesCallsCount = 0;
   vi.clearAllMocks();
@@ -313,8 +315,9 @@ test.each([['release'], ['debug'], ['staging']])(
       undefined,
       { extraSources: [], ignorePaths: [], env: [] },
       vi.fn(), // startDevServer mock
-      '0.79.0', // reactNativeVersion
       '/path/to/react-native', // reactNativePath
+      '0.79.0', // reactNativeVersion
+      mockPlatforms,
     );
 
     expect(tools.outro).toBeCalledWith('Success 🎉.');
@@ -365,8 +368,9 @@ test('runAndroid runs gradle build with custom --appId, --appIdSuffix and --main
     undefined,
     { extraSources: [], ignorePaths: [], env: [] },
     vi.fn(), // startDevServer mock
-    '0.79.0', // reactNativeVersion
     '/path/to/react-native', // reactNativePath
+    '0.79.0', // reactNativeVersion
+    mockPlatforms,
   );
 
   expect(tools.outro).toBeCalledWith('Success 🎉.');
@@ -395,8 +399,9 @@ test('runAndroid fails to launch an app on not-connected device when specified w
     undefined,
     { extraSources: [], ignorePaths: [], env: [] },
     vi.fn(), // startDevServer mock
-    '0.79.0', // reactNativeVersion
     '/path/to/react-native', // reactNativePath
+    '0.79.0', // reactNativeVersion
+    mockPlatforms,
   );
   expect(logWarnSpy).toBeCalledWith(
     'No devices or emulators found matching "emulator-5554". Using available one instead.',
@@ -467,8 +472,9 @@ test.each([['release'], ['debug']])(
       undefined,
       { extraSources: [], ignorePaths: [], env: [] },
       vi.fn(), // startDevServer mock
-      '0.79.0', // reactNativeVersion
       '/path/to/react-native', // reactNativePath
+      '0.79.0', // reactNativeVersion
+      mockPlatforms,
     );
 
     // we don't want to run installDebug when a device is selected, because gradle will install the app on all connected devices
@@ -529,7 +535,7 @@ test('runAndroid launches an app on all connected devices', async () => {
     extraSources: [],
     ignorePaths: [],
     env: [],
-  }, vi.fn(), '0.79.0', '/path/to/react-native');
+  }, vi.fn(), '/path/to/react-native', '0.79.0', mockPlatforms);
 
   // Runs assemble debug task with active architectures arm64-v8a, armeabi-v7a
   expect(spawn).toBeCalledWith(
@@ -597,8 +603,9 @@ test('runAndroid skips building when --binary-path is passed', async () => {
     undefined,
     { extraSources: [], ignorePaths: [], env: [] },
     vi.fn(), // startDevServer mock
-    '0.79.0', // reactNativeVersion
     '/path/to/react-native', // reactNativePath
+    '0.79.0', // reactNativeVersion
+    mockPlatforms,
   );
 
   // Skips gradle

packages/platform-android/src/lib/commands/runAndroid/command.ts

@@ -23,7 +23,8 @@ export function registerRunCommand(
         api.getFingerprintOptions(),
         api.getBundlerStart(),
         api.getReactNativeVersion(),
-        api.getReactNativePath()
+        api.getReactNativePath(),
+        api.getPlatforms()
       );
     },
     options: runOptions,

packages/platform-android/src/lib/commands/runAndroid/runAndroid.ts

@@ -38,6 +38,7 @@ export interface Flags extends BuildFlags {
   binaryPath?: string;
   user?: string;
   local?: boolean;
+  clientLogs?: boolean;
 }
 
 export type AndroidProject = NonNullable<Config['project']['android']>;
@@ -53,7 +54,8 @@ export async function runAndroid(
   fingerprintOptions: FingerprintSources,
   startDevServer: (options: StartDevServerArgs) => void,
   reactNativeVersion: string,
-  reactNativePath: string
+  reactNativePath: string,
+  platforms: { [platform: string]: object }
 ) {
   intro('Running Android app');
 
@@ -86,10 +88,10 @@ export async function runAndroid(
     root: projectRoot,
     reactNativePath,
     reactNativeVersion,
-    platforms: { ios: {}, android: {} },
+    platforms,
     args: {
       interactive: isInteractive(),
-      clientLogs: true,
+      clientLogs: args.clientLogs ?? true,
     },
   });
 
@@ -295,4 +297,8 @@ export const runOptions = [
     name: '--user <number>',
     description: 'Id of the User Profile you want to install the app on.',
   },
+  {
+    name: '--client-logs',
+    description: 'Enable client logs in dev server.',
+  },
 ];

packages/platform-apple-helpers/src/lib/commands/run/createRun.ts

@@ -36,6 +36,7 @@ export const createRun = async ({
   fingerprintOptions,
   reactNativePath,
   reactNativeVersion,
+  platforms,
   startDevServer,
 }: {
   platformName: ApplePlatform;
@@ -46,24 +47,11 @@ export const createRun = async ({
   fingerprintOptions: FingerprintSources;
   reactNativePath: string;
   reactNativeVersion: string;
+  platforms: { [platform: string]: object };
   startDevServer?: (options: StartDevServerArgs) => void;
 }) => {
   validateArgs(args, projectRoot);
 
-  if (startDevServer) {
-    logger.info('Starting dev server...');
-    startDevServer({
-      root: projectRoot,
-      reactNativePath,
-      reactNativeVersion,
-      platforms: { ios: {}, android: {} },
-      args: {
-        interactive: isInteractive(),
-        clientLogs: true,
-      },
-    });
-  }
-
   const deviceOrSimulator = args.destination
     ? // there can be multiple destinations, so we'll pick the first one
       args.destination[0].match(/simulator/i)
@@ -111,6 +99,21 @@ export const createRun = async ({
       deviceOrSimulator,
       fingerprintOptions,
     });
+    
+    if (startDevServer) {
+      logger.info('Starting dev server...');
+      startDevServer({
+        root: projectRoot,
+        reactNativePath,
+        reactNativeVersion,
+        platforms,
+        args: {
+          interactive: isInteractive(),
+          clientLogs: args.clientLogs ?? true,
+        },
+      });
+    }
+    
     await runOnMac(appPath);
     return;
   } else if (args.catalyst) {
@@ -127,6 +130,22 @@ export const createRun = async ({
       deviceOrSimulator,
       fingerprintOptions,
     });
+    
+    // Start dev server after build completes to avoid log clashing
+    if (startDevServer) {
+      logger.info('Starting dev server...');
+      startDevServer({
+        root: projectRoot,
+        reactNativePath,
+        reactNativeVersion,
+        platforms,
+        args: {
+          interactive: isInteractive(),
+          clientLogs: args.clientLogs ?? true,
+        },
+      });
+    }
+    
     if (scheme) {
       await runOnMacCatalyst(appPath, scheme);
       return;
@@ -147,7 +166,7 @@ export const createRun = async ({
   if (device) {
     if (device.type !== deviceOrSimulator) {
       throw new RockError(
-        `Selected device "${device.name}" is not a ${deviceOrSimulator}. 
+        `Selected device "${device.name}" is not a ${deviceOrSimulator}.
 Please either use "--destination ${
           deviceOrSimulator === 'simulator' ? 'device' : 'simulator'
         }" flag or select available ${deviceOrSimulator}:
@@ -174,6 +193,22 @@ ${devices
           fingerprintOptions,
         }),
       ]);
+      
+      // Start dev server after build completes to avoid log clashing
+      if (startDevServer) {
+        logger.info('Starting dev server...');
+        startDevServer({
+          root: projectRoot,
+          reactNativePath,
+          reactNativeVersion,
+          platforms,
+          args: {
+            interactive: isInteractive(),
+            clientLogs: args.clientLogs ?? true,
+          },
+        });
+      }
+      
       await runOnSimulator(device, appPath, infoPlistPath);
     } else if (device.type === 'device') {
       const { appPath, bundleIdentifier } = await buildApp({
@@ -188,6 +223,22 @@ ${devices
         deviceOrSimulator,
         fingerprintOptions,
       });
+      
+      // Start dev server after build completes to avoid log clashing
+      if (startDevServer) {
+        logger.info('Starting dev server...');
+        startDevServer({
+          root: projectRoot,
+          reactNativePath,
+          reactNativeVersion,
+          platforms,
+          args: {
+            interactive: isInteractive(),
+            clientLogs: args.clientLogs ?? true,
+          },
+        });
+      }
+      
       await runOnDevice(
         device,
         appPath,
@@ -242,6 +293,22 @@ ${devices
             fingerprintOptions,
           }),
         ]);
+      
+      // Start dev server after build completes to avoid log clashing
+      if (startDevServer) {
+        logger.info('Starting dev server...');
+        startDevServer({
+          root: projectRoot,
+          reactNativePath,
+          reactNativeVersion,
+          platforms,
+          args: {
+            interactive: isInteractive(),
+            clientLogs: args.clientLogs ?? true,
+          },
+        });
+      }
+      
       if (bootedDevice.type === 'simulator') {
         await runOnSimulator(bootedDevice, appPath, infoPlistPath);
       } else {

packages/platform-apple-helpers/src/lib/commands/run/runOptions.ts

@@ -8,6 +8,7 @@ export interface RunFlags extends BuildFlags {
   device?: string;
   catalyst?: boolean;
   local?: boolean;
+  clientLogs?: boolean;
 }
 
 export const getRunOptions = ({ platformName }: BuilderCommand) => {
@@ -30,6 +31,10 @@ export const getRunOptions = ({ platformName }: BuilderCommand) => {
       name: '--catalyst',
       description: 'Run on Mac Catalyst.',
     },
+    {
+      name: '--client-logs',
+      description: 'Enable client logs in dev server.',
+    },
     ...getBuildOptions({ platformName }),
   ];
 };

packages/platform-ios/src/lib/platformIOS.ts

@@ -62,6 +62,7 @@ export const platformIOS =
           fingerprintOptions: api.getFingerprintOptions(),
           reactNativePath: api.getReactNativePath(),
           reactNativeVersion: api.getReactNativeVersion(),
+          platforms: api.getPlatforms(),
           startDevServer: api.getBundlerStart(),
         });
         outro('Success 🎉.');