continue work

docs/platforms.md

@@ -98,7 +98,7 @@ module.exports = {
 };
 ```
 
-On Android and iOS, this function returns:
+On Android and iOS, this function returns a dependency configuration for:
 
 ```ts
 type IOSDependencyConfig = {

packages/cli-hermes/src/profileHermes/downloadProfile.ts

@@ -6,10 +6,7 @@ import path from 'path';
 import os from 'os';
 import transformer from 'hermes-profile-transformer';
 import {findSourcemap, generateSourcemap} from './sourcemapUtils';
-import {
-  getAndroidProject,
-  getPackageName,
-} from '@react-native-community/cli-platform-android';
+import {getAndroidProject} from '@react-native-community/cli-platform-android';
 /**
  * Get the last modified hermes profile
  * @param packageNameWithSuffix
@@ -54,7 +51,7 @@ export async function downloadProfile(
   try {
     const androidProject = getAndroidProject(ctx);
     const packageNameWithSuffix = [
-      appId || getPackageName(androidProject),
+      appId || androidProject.packageName,
       appIdSuffix,
     ]
       .filter(Boolean)

packages/cli-types/src/android.ts

@@ -1,5 +1,6 @@
 export interface AndroidProjectConfig {
   sourceDir: string;
+  appName: string;
   packageName: string;
   dependencyConfiguration?: string;
 }

packages/cli-types/src/index.ts

@@ -89,17 +89,20 @@ type IOSPlatformConfig = PlatformConfig<
 >;
 
 export type ProjectConfig = {
-  android?: ReturnType<AndroidPlatformConfig['projectConfig']>;
-  ios?: ReturnType<IOSPlatformConfig['projectConfig']>;
+  android?: Exclude<ReturnType<AndroidPlatformConfig['projectConfig']>, void>;
+  ios?: Exclude<ReturnType<IOSPlatformConfig['projectConfig']>, void>;
   [key: string]: any;
 };
 
 export interface DependencyConfig {
   name: string;
   root: string;
   platforms: {
-    android?: ReturnType<AndroidPlatformConfig['dependencyConfig']>;
-    ios?: ReturnType<IOSPlatformConfig['dependencyConfig']>;
+    android?: Exclude<
+      ReturnType<AndroidPlatformConfig['dependencyConfig']>,
+      void
+    >;
+    ios?: Exclude<ReturnType<IOSPlatformConfig['dependencyConfig']>, void>;
     [key: string]: any;
   };
 }

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

@@ -21,11 +21,9 @@ import {
   getDefaultUserTerminal,
   CLIError,
 } from '@react-native-community/cli-tools';
-import warnAboutManuallyLinkedLibs from '../../link/warnAboutManuallyLinkedLibs';
-import {getAndroidProject, getPackageName} from '../../utils/getAndroidProject';
+import {getAndroidProject} from '../../config/getAndroidProject';
 
-function displayWarnings(config: Config, args: Flags) {
-  warnAboutManuallyLinkedLibs(config);
+function displayWarnings(args: Flags) {
   if (args.appFolder) {
     logger.warn(
       'Using deprecated "--appFolder" flag. Use "project.android.appName" in react-native.config.js instead.',
@@ -60,7 +58,7 @@ type AndroidProject = NonNullable<Config['project']['android']>;
  * Starts the app on a connected Android emulator or device.
  */
 async function runAndroid(_argv: Array<string>, config: Config, args: Flags) {
-  displayWarnings(config, args);
+  displayWarnings(args);
   const androidProject = getAndroidProject(config);
 
   if (args.jetifier) {
@@ -112,21 +110,17 @@ function buildAndRun(args: Flags, androidProject: AndroidProject) {
   process.chdir(androidProject.sourceDir);
   const cmd = process.platform.startsWith('win') ? 'gradlew.bat' : './gradlew';
 
-  const {appFolder} = args;
-  const packageName = getPackageName(androidProject, appFolder);
-
   const adbPath = getAdbPath();
   if (args.deviceId) {
-    return runOnSpecificDevice(args, cmd, packageName, adbPath, androidProject);
+    return runOnSpecificDevice(args, cmd, adbPath, androidProject);
   } else {
-    return runOnAllDevices(args, cmd, packageName, adbPath, androidProject);
+    return runOnAllDevices(args, cmd, adbPath, androidProject);
   }
 }
 
 function runOnSpecificDevice(
   args: Flags,
   gradlew: 'gradlew.bat' | './gradlew',
-  packageName: string,
   adbPath: string,
   androidProject: AndroidProject,
 ) {
@@ -135,13 +129,7 @@ function runOnSpecificDevice(
   if (devices.length > 0 && deviceId) {
     if (devices.indexOf(deviceId) !== -1) {
       buildApk(gradlew, androidProject.sourceDir);
-      installAndLaunchOnDevice(
-        args,
-        deviceId,
-        packageName,
-        adbPath,
-        androidProject,
-      );
+      installAndLaunchOnDevice(args, deviceId, adbPath, androidProject);
     } else {
       logger.error(
         `Could not find device with the id: "${deviceId}". Please choose one of the following:`,
@@ -226,13 +214,17 @@ function getInstallApkName(
 function installAndLaunchOnDevice(
   args: Flags,
   selectedDevice: string,
-  packageName: string,
   adbPath: string,
   androidProject: AndroidProject,
 ) {
   tryRunAdbReverse(args.port, selectedDevice);
   tryInstallAppOnDevice(args, adbPath, selectedDevice, androidProject);
-  tryLaunchAppOnDevice(selectedDevice, packageName, adbPath, args);
+  tryLaunchAppOnDevice(
+    selectedDevice,
+    androidProject.packageName,
+    adbPath,
+    args,
+  );
 }
 
 function startServerInNewWindow(

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

@@ -31,7 +31,6 @@ type AndroidProject = NonNullable<Config['project']['android']>;
 async function runOnAllDevices(
   args: Flags,
   cmd: string,
-  packageName: string,
   adbPath: string,
   androidProject: AndroidProject,
 ) {
@@ -98,7 +97,7 @@ async function runOnAllDevices(
   (devices.length > 0 ? devices : [undefined]).forEach(
     (device: string | void) => {
       tryRunAdbReverse(args.port, device);
-      tryLaunchAppOnDevice(device, packageName, adbPath, args);
+      tryLaunchAppOnDevice(device, androidProject.packageName, adbPath, args);
     },
   );
 }

packages/platform-android/src/config/__tests__/getAndroidProject.test.ts

@@ -0,0 +1 @@
+// @todo

packages/platform-android/src/utils/getAndroidProject.ts → packages/platform-android/src/config/getAndroidProject.ts

@@ -1,4 +1,4 @@
-import {Config, AndroidProjectConfig} from '@react-native-community/cli-types';
+import {Config} from '@react-native-community/cli-types';
 import {logger, CLIError} from '@react-native-community/cli-tools';
 import fs from 'fs';
 import chalk from 'chalk';
@@ -20,18 +20,14 @@ export function getAndroidProject(config: Config) {
  * Get the package name of the running React Native app
  * @param config
  */
-export function getPackageName(
-  androidProject: AndroidProjectConfig,
-  appFolder?: string,
-) {
-  const {appName, manifestPath} = androidProject;
+export function getPackageName(manifestPath: string) {
   const androidManifest = fs.readFileSync(manifestPath, 'utf8');
 
   let packageNameMatchArray = androidManifest.match(/package="(.+?)"/);
   if (!packageNameMatchArray || packageNameMatchArray.length === 0) {
     throw new CLIError(
       `Failed to build the app: No package name found. Found errors in ${chalk.underline.dim(
-        `${appFolder || appName}/src/main/AndroidManifest.xml`,
+        `${manifestPath}`,
       )}`,
     );
   }

packages/platform-android/src/config/index.ts

@@ -11,15 +11,12 @@ import fs from 'fs';
 import findAndroidDir from './findAndroidDir';
 import findManifest from './findManifest';
 import findPackageClassName from './findPackageClassName';
-import readManifest from './readManifest';
 import {
   AndroidProjectParams,
   AndroidDependencyParams,
   AndroidProjectConfig,
 } from '@react-native-community/cli-types';
-import {XmlDocument} from 'xmldoc';
-
-const getPackageName = (manifest: XmlDocument) => manifest.attr.package;
+import {getPackageName} from './getAndroidProject';
 
 /**
  * Gets android project config by analyzing given folder and taking some
@@ -46,16 +43,15 @@ export function projectConfig(
     return null;
   }
 
-  const manifest = readManifest(manifestPath);
-
-  const packageName = userConfig.packageName || getPackageName(manifest);
+  const packageName = userConfig.packageName || getPackageName(manifestPath);
 
   if (!packageName) {
     throw new Error(`Package name not found in ${manifestPath}`);
   }
 
   return {
     sourceDir,
+    appName,
     packageName,
     dependencyConfiguration: userConfig.dependencyConfiguration,
   };
@@ -97,8 +93,7 @@ export function dependencyConfig(
     return null;
   }
 
-  const manifest = readManifest(manifestPath);
-  const packageName = userConfig.packageName || getPackageName(manifest);
+  const packageName = userConfig.packageName || getPackageName(manifestPath);
   const packageClassName = findPackageClassName(sourceDir);
 
   /**

packages/platform-android/src/index.ts

@@ -4,4 +4,4 @@
 
 export {default as commands} from './commands';
 export {projectConfig, dependencyConfig} from './config';
-export {getAndroidProject, getPackageName} from './utils/getAndroidProject';
+export {getAndroidProject, getPackageName} from './config/getAndroidProject';

packages/platform-ios/src/commands/runIOS/index.ts

@@ -19,8 +19,6 @@ import findXcodeProject, {ProjectInfo} from './findXcodeProject';
 import parseIOSDevicesList from './parseIOSDevicesList';
 import parseXctraceIOSDevicesList from './parseXctraceIOSDevicesList';
 import findMatchingSimulator from './findMatchingSimulator';
-import warnAboutManuallyLinkedLibs from '../../link/warnAboutManuallyLinkedLibs';
-import warnAboutPodInstall from '../../link/warnAboutPodInstall';
 import {
   logger,
   CLIError,
@@ -43,16 +41,13 @@ type FlagsT = {
   terminal: string | undefined;
 };
 
-function runIOS(_: Array<string>, ctx: Config, args: FlagsT) {
+function runIOS(_: Array<string>, _ctx: Config, args: FlagsT) {
   if (!fs.existsSync(args.projectPath)) {
     throw new CLIError(
       'iOS project folder not found. Are you sure this is a React Native project?',
     );
   }
 
-  warnAboutManuallyLinkedLibs(ctx);
-  warnAboutPodInstall(ctx);
-
   process.chdir(args.projectPath);
 
   const xcodeProject = findXcodeProject(fs.readdirSync('.'));