add ios part and fix ts

Author: OlimpiaZurek

packages/config/src/lib/config.ts

@@ -2,7 +2,7 @@ import * as fs from 'node:fs';
 import { createRequire } from 'node:module';
 import * as path from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { FingerprintSources, RemoteBuildCache } from '@rock-js/tools';
+import type { FingerprintSources, RemoteBuildCache } from '@rock-js/tools';
 import { colorLink, getReactNativeVersion, logger } from '@rock-js/tools';
 import type { ValidationError } from 'joi';
 import { ConfigTypeSchema } from './schema.js';
@@ -13,14 +13,26 @@ export type PluginOutput = {
   description: string;
 };
 
-type StartDevServerFunction = (options: {
+export type DevServerArgs = {
+  interactive: boolean;
+  clientLogs: boolean;
+  port?: string;
+  host?: string;
+  https?: boolean;
+  resetCache?: boolean;
+  platforms?: string[];
+  [key: string]: unknown;
+};
+
+export type StartDevServerArgs = {
   root: string;
-  // TODO fix type
-  args: any;
+  args: DevServerArgs;
   reactNativeVersion: string;
   reactNativePath: string;
   platforms: Record<string, object>;
-}) => Promise<void>;
+};
+
+type StartDevServerFunction = (options: StartDevServerArgs) => Promise<void>;
 
 export type BundlerPluginOutput = {
   name: string;
@@ -41,15 +53,8 @@ export type PluginApi = {
   getRemoteCacheProvider: () => Promise<
     null | undefined | (() => RemoteBuildCache)
   >;
-<<<<<<< HEAD
   getFingerprintOptions: () => FingerprintSources;
-=======
-  getFingerprintOptions: () => {
-    extraSources: string[];
-    ignorePaths: string[];
-  };
->>>>>>> 83e802f (make it run)
-  getBundlerStart: () => ({ args }: { args: any }) => void;
+  getBundlerStart: () => ({ args }: { args: DevServerArgs }) => void;
 };
 
 type PluginType = (args: PluginApi) => PluginOutput;
@@ -102,6 +107,7 @@ export type ConfigOutput = {
   root: string;
   commands?: Array<CommandType>;
   platforms?: Record<string, PlatformOutput>;
+  bundler?: BundlerPluginOutput;
 } & PluginApi;
 
 const extensions = ['.js', '.ts', '.mjs'];
@@ -209,10 +215,10 @@ Read more: ${colorLink('https://rockjs.dev/docs/configuration#github-actions-pro
       }
       return validatedConfig.remoteCacheProvider;
     },
-    getFingerprintOptions: () => FingerprintSources,
+    getFingerprintOptions: () => validatedConfig.fingerprint as FingerprintSources,
     getBundlerStart:
       () =>
-      ({ args }: { args: any }) => {
+      ({ args }: { args: DevServerArgs }) => {
         return bundler?.start({
           root: api.getProjectRoot(),
           args,
@@ -240,12 +246,11 @@ Read more: ${colorLink('https://rockjs.dev/docs/configuration#github-actions-pro
   }
 
   if (validatedConfig.bundler) {
-    // @ts-expect-error tbd
     bundler = assignOriginToCommand(
       validatedConfig.bundler,
       api,
       validatedConfig
-    );
+    ) as BundlerPluginOutput;
   }
 
   for (const internalPlugin of internalPlugins) {
@@ -260,7 +265,6 @@ Read more: ${colorLink('https://rockjs.dev/docs/configuration#github-actions-pro
     root: projectRoot,
     commands: validatedConfig.commands ?? [],
     platforms: platforms ?? {},
-    // @ts-expect-error tbd
     bundler,
     ...api,
   };

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

@@ -21,7 +21,9 @@ export function registerRunCommand(
         projectRoot,
         await api.getRemoteCacheProvider(),
         api.getFingerprintOptions(),
-        api.getBundlerStart()
+        api.getBundlerStart(),
+        api.getReactNativeVersion(),
+        api.getReactNativePath()
       );
     },
     options: runOptions,

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

@@ -4,6 +4,7 @@ import type {
   AndroidProjectConfig,
   Config,
 } from '@react-native-community/cli-types';
+import type { StartDevServerArgs } from '@rock-js/config';
 import type { FingerprintSources, RemoteBuildCache } from '@rock-js/tools';
 import {
   color,
@@ -50,14 +51,9 @@ export async function runAndroid(
   projectRoot: string,
   remoteCacheProvider: null | (() => RemoteBuildCache) | undefined,
   fingerprintOptions: FingerprintSources,
-  startDevServer: (options: {
-    root: string;
-    // TODO fix type
-    args: any;
-    reactNativeVersion: string;
-    reactNativePath: string;
-    platforms: Record<string, object>;
-  }) => void
+  startDevServer: (options: StartDevServerArgs) => void,
+  reactNativeVersion: string,
+  reactNativePath: string
 ) {
   intro('Running Android app');
 
@@ -88,8 +84,8 @@ export async function runAndroid(
   logger.info('Starting dev server...');
   startDevServer({
     root: projectRoot,
-    reactNativePath: './node_modules/react-native',
-    reactNativeVersion: '0.79',
+    reactNativePath,
+    reactNativeVersion,
     platforms: { ios: {}, android: {} },
     args: {
       interactive: isInteractive(),

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

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import type { StartDevServerArgs } from '@rock-js/config';
 import type { FingerprintSources, RemoteBuildCache } from '@rock-js/tools';
 import {
   color,
@@ -34,6 +35,8 @@ export const createRun = async ({
   remoteCacheProvider,
   fingerprintOptions,
   reactNativePath,
+  reactNativeVersion,
+  startDevServer,
 }: {
   platformName: ApplePlatform;
   projectConfig: ProjectConfig;
@@ -42,9 +45,25 @@ export const createRun = async ({
   remoteCacheProvider: null | (() => RemoteBuildCache) | undefined;
   fingerprintOptions: FingerprintSources;
   reactNativePath: string;
+  reactNativeVersion: string;
+  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)

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

@@ -61,6 +61,8 @@ export const platformIOS =
           remoteCacheProvider: await api.getRemoteCacheProvider(),
           fingerprintOptions: api.getFingerprintOptions(),
           reactNativePath: api.getReactNativePath(),
+          reactNativeVersion: api.getReactNativeVersion(),
+          startDevServer: api.getBundlerStart(),
         });
         outro('Success 🎉.');
       },

packages/plugin-metro/src/lib/start/command.ts

@@ -7,6 +7,7 @@
 
 import path from 'node:path';
 import type { PluginApi } from '@rock-js/config';
+import type { StartDevServerArgs } from '@rock-js/config';
 import { findDevServerPort, intro } from '@rock-js/tools';
 import type { StartCommandArgs } from './runServer.js';
 import runServer from './runServer.js';
@@ -17,15 +18,9 @@ export async function startDevServer({
   reactNativeVersion,
   reactNativePath,
   platforms,
-}: {
-  root: string;
-  args: StartCommandArgs;
-  reactNativeVersion: string;
-  reactNativePath: string;
-  platforms: Record<string, object>;
-}) {
+}: StartDevServerArgs) {
   const { port, startDevServer } = await findDevServerPort(
-    args.port ?? 8081,
+    args.port ? Number(args.port) : 8081,
     root
   );
 
@@ -35,7 +30,7 @@ export async function startDevServer({
 
   return runServer(
     { root, reactNativeVersion, reactNativePath, platforms },
-    { ...args, port }
+    { ...args, port, platforms: Object.keys(platforms) }
   );
 }