feat: extract android applicationId (#1951)

* feat: extract android applicationId

* (fix) tests

* fix: e2e snapshot

* fix: update snapshot

* fix: update snap

* update variable name

---------

Co-authored-by: Tomasz Misiukiewicz <[email protected]>

Author: adamTrz

__e2e__/__snapshots__/config.test.ts.snap

@@ -66,6 +66,7 @@ exports[`shows up current config without unnecessary output 1`] = `
       "sourceDir": "<<REPLACED_ROOT>>/TestProject/android",
       "appName": "app",
       "packageName": "com.testproject",
+      "applicationId": "com.testproject",
       "mainActivity": ".MainActivity"
     }
   }

packages/cli-platform-android/src/commands/runAndroid/tryLaunchAppOnDevice.ts

@@ -17,9 +17,10 @@ function tryLaunchAppOnDevice(
   args: Flags,
 ) {
   const {appId, appIdSuffix} = args;
-  const {packageName, mainActivity} = androidProject;
 
-  const packageNameWithSuffix = [appId || packageName, appIdSuffix]
+  const {packageName, mainActivity, applicationId} = androidProject;
+
+  const applicationIdWithSuffix = [appId || applicationId, appIdSuffix]
     .filter(Boolean)
     .join('.');
 
@@ -34,7 +35,7 @@ function tryLaunchAppOnDevice(
       'am',
       'start',
       '-n',
-      `${packageNameWithSuffix}/${activityToLaunch}`,
+      `${applicationIdWithSuffix}/${activityToLaunch}`,
       '-a',
       'android.intent.action.MAIN',
       '-c',

packages/cli-platform-android/src/config/__fixtures__/files/build.gradle

@@ -2,7 +2,10 @@ apply package: "com.android.application"
 apply package: "com.facebook.react"
 
 android {
-    namespace 'com.some.example'
+    namespace "com.some.example"
+    defaultConfig {
+        applicationId "com.example"
+    }
 }
 
 react {

packages/cli-platform-android/src/config/__tests__/__snapshots__/getProjectConfig.test.ts.snap

@@ -3,6 +3,7 @@
 exports[`android::getProjectConfig returns an object with android project configuration for flat structure 1`] = `
 Object {
   "appName": "",
+  "applicationId": "com.some.example",
   "dependencyConfiguration": undefined,
   "mainActivity": ".MainActivity",
   "packageName": "com.some.example",
@@ -15,6 +16,7 @@ Object {
 exports[`android::getProjectConfig returns an object with android project configuration for multiple 1`] = `
 Object {
   "appName": "",
+  "applicationId": "com.some.example",
   "dependencyConfiguration": undefined,
   "mainActivity": ".MainActivity",
   "packageName": "com.some.example",
@@ -27,6 +29,7 @@ Object {
 exports[`android::getProjectConfig returns an object with android project configuration for nested structure 1`] = `
 Object {
   "appName": "app",
+  "applicationId": "com.example",
   "dependencyConfiguration": undefined,
   "mainActivity": ".MainActivity",
   "packageName": "com.some.example",

packages/cli-platform-android/src/config/getAndroidProject.ts

@@ -106,3 +106,22 @@ export function parseNamespaceFromBuildGradleFile(buildGradle: string) {
 export function validatePackageName(packageName: string) {
   return /^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$/i.test(packageName);
 }
+
+// Search for applicationId at defaultConfig object
+export function parseApplicationIdFromBuildGradleFile(buildGradlePath: string) {
+  if (!buildGradlePath) {
+    return null;
+  }
+  const buildGradle = fs.readFileSync(buildGradlePath, 'utf8');
+
+  const matchArray = buildGradle.match(/defaultConfig\s*{([\s\S]*?)}/);
+
+  if (matchArray && matchArray.length > 0) {
+    const appIdMatchArray = matchArray[1].match(
+      /applicationId\s*[=]*\s*["'](.+?)["']/,
+    );
+    return appIdMatchArray?.[1] ?? '';
+  } else {
+    return null;
+  }
+}

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

@@ -17,7 +17,10 @@ import {
   AndroidDependencyParams,
   AndroidDependencyConfig,
 } from '@react-native-community/cli-types';
-import {getPackageName} from './getAndroidProject';
+import {
+  getPackageName,
+  parseApplicationIdFromBuildGradleFile,
+} from './getAndroidProject';
 import {findLibraryName} from './findLibraryName';
 import {findComponentDescriptors} from './findComponentDescriptors';
 import {findBuildGradle} from './findBuildGradle';
@@ -60,6 +63,9 @@ export function projectConfig(
     );
   }
 
+  const applicationId = buildGradlePath
+    ? getApplicationId(buildGradlePath, packageName)
+    : packageName;
   const mainActivity = getMainActivity(manifestPath || '');
 
   if (!mainActivity) {
@@ -70,6 +76,7 @@ export function projectConfig(
     sourceDir,
     appName,
     packageName,
+    applicationId,
     mainActivity,
     dependencyConfiguration: userConfig.dependencyConfiguration,
     watchModeCommandParams: userConfig.watchModeCommandParams,
@@ -78,6 +85,16 @@ export function projectConfig(
   };
 }
 
+function getApplicationId(buildGradlePath: string, packageName: string) {
+  let appId = packageName;
+
+  const applicationId = parseApplicationIdFromBuildGradleFile(buildGradlePath);
+  if (applicationId) {
+    appId = applicationId;
+  }
+  return appId;
+}
+
 function getAppName(sourceDir: string, userConfigAppName: string | undefined) {
   let appName = '';
   if (

packages/cli-types/src/android.ts

@@ -2,6 +2,7 @@ export interface AndroidProjectConfig {
   sourceDir: string;
   appName: string;
   packageName: string;
+  applicationId: string;
   mainActivity: string;
   dependencyConfiguration?: string;
   watchModeCommandParams?: string[];