Merge branch 'main' into main

Author: Rexogamer

__e2e__/__snapshots__/config.test.ts.snap

@@ -4,7 +4,7 @@ exports[`shows up current config without unnecessary output 1`] = `
 {
   "root": "<<REPLACED_ROOT>>/TestProject",
   "reactNativePath": "<<REPLACED_ROOT>>/TestProject/node_modules/react-native",
-  "reactNativeVersion": "0.78",
+  "reactNativeVersion": "<<REPLACED>>",
   "dependencies": {},
   "commands": [
     {

__e2e__/config.test.ts

@@ -70,6 +70,9 @@ test('shows up current config without unnecessary output', () => {
     options: command.options && ['<<REPLACED>>'],
   }));
 
+  expect(parsedStdout.reactNativeVersion).toMatch(/^\d+\.\d+(\.\d+)?$/);
+  parsedStdout.reactNativeVersion = '<<REPLACED>>';
+
   const expectedXcodeProject =
     process.platform === 'darwin'
       ? {

docs/dependencies.md

@@ -56,7 +56,6 @@ type AndroidDependencyParams = {
   packageInstance?: string;
   buildTypes?: string[];
   libraryName?: string | null;
-  componentDescriptors?: string[] | null;
   cmakeListsPath?: string | null;
   cxxModuleCMakeListsModuleName?: string | null;
   cxxModuleCMakeListsPath?: string | null;
@@ -134,9 +133,9 @@ A string indicating your custom library name. By default it's taken from the `li
 
 #### platforms.android.componentDescriptors
 
-> Note: Only applicable when new architecture is turned on.
+> Note: This field is deprecated and providing a value to it will have no effect.
 
-An array of custom component descriptor strings. By default they're generated based on `codegenNativeComponent` calls.
+Historically used to provide an array of custom component descriptor to register with the Interop Layer. [Since 0.74](https://github.com/reactwg/react-native-new-architecture/discussions/175) this field is ignored as the interop layer are automatic.
 
 #### platforms.android.cmakeListsPath
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "19.0.0-alpha.0",
+  "version": "19.0.0",
   "npmClient": "yarn",
   "exact": true,
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"

package.json

@@ -62,5 +62,6 @@
     "./packages/**/*.ts": [
       "yarn lint"
     ]
-  }
+  },
+  "packageManager": "yarn@1.22.22"
 }

packages/cli-clean/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@react-native-community/cli-clean",
-  "version": "19.0.0-alpha.0",
+  "version": "19.0.0",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "types": "build/index.d.ts",
   "dependencies": {
-    "@react-native-community/cli-tools": "19.0.0-alpha.0",
+    "@react-native-community/cli-tools": "19.0.0",
+    "chalk": "^4.1.2",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
     "picocolors": "^1.1.1"
@@ -19,7 +20,7 @@
     "!*.map"
   ],
   "devDependencies": {
-    "@react-native-community/cli-types": "19.0.0-alpha.0",
+    "@react-native-community/cli-types": "19.0.0",
     "@types/prompts": "^2.4.4"
   },
   "homepage": "https://github.com/react-native-community/cli/tree/main/packages/cli-clean",

packages/cli-config-android/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@react-native-community/cli-config-android",
-  "version": "19.0.0-alpha.0",
+  "version": "19.0.0",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@react-native-community/cli-tools": "19.0.0-alpha.0",
+    "@react-native-community/cli-tools": "19.0.0",
     "fast-glob": "^3.3.2",
     "fast-xml-parser": "^4.4.1",
     "picocolors": "^1.1.1"
@@ -19,7 +19,7 @@
     "native_modules.gradle"
   ],
   "devDependencies": {
-    "@react-native-community/cli-types": "19.0.0-alpha.0"
+    "@react-native-community/cli-types": "19.0.0"
   },
   "homepage": "https://github.com/react-native-community/cli/tree/main/packages/cli-config-android",
   "repository": {

packages/cli-config-android/src/config/__fixtures__/android.ts

@@ -71,6 +71,19 @@ function generateValidFileStructureForApp() {
   };
 }
 
+function generateValidFileStructureForAppWithCustomAppName(
+  customAppName: string,
+) {
+  return {
+    'build.gradle': buildGradle,
+    [customAppName]: {
+      'build.gradle': appBuildGradle,
+    },
+    src: {
+      'AndroidManifest.xml': manifest,
+    },
+  };
+}
 export const valid = generateValidFileStructureForLib('ReactPackage.java');
 
 export const validKotlin = generateValidFileStructureForLib('ReactPackage.kt');
@@ -83,6 +96,9 @@ export const validKotlinWithDifferentFileName =
 
 export const validApp = generateValidFileStructureForApp();
 
+export const validAppWithCustomAppName =
+  generateValidFileStructureForAppWithCustomAppName('custom');
+
 export const userConfigManifest = {
   src: {
     main: {

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

@@ -3,7 +3,7 @@
 exports[`android::getProjectConfig returns an object with android project configuration for flat structure 1`] = `
 Object {
   "appName": "",
-  "applicationId": "com.some.example",
+  "applicationId": "com.example",
   "assets": Array [],
   "dependencyConfiguration": undefined,
   "mainActivity": ".MainActivity",

packages/cli-config-android/src/config/__tests__/findBuildGradle.test.ts

@@ -21,17 +21,26 @@ describe('findBuildGradle for apps', () => {
       flat: {
         android: mocks.validApp,
       },
+      customPath: {
+        android: mocks.validAppWithCustomAppName,
+      },
     });
   });
 
   it('returns the app gradle path if file exists in the folder', () => {
-    expect(findBuildGradle('/flat/android', false)).toBe(
+    expect(findBuildGradle('/flat/android', 'app')).toBe(
       '/flat/android/app/build.gradle',
     );
   });
 
   it('returns `null` if there is no gradle in the app folder', () => {
-    expect(findBuildGradle('/empty', false)).toBeNull();
+    expect(findBuildGradle('/empty', 'app')).toBeNull();
+  });
+
+  it('returns the app build.gradle with custom app name', () => {
+    expect(findBuildGradle('/customPath/android', 'custom')).toBe(
+      '/customPath/android/custom/build.gradle',
+    );
   });
 });
 
@@ -46,12 +55,12 @@ describe('findBuildGradle for libraries', () => {
   });
 
   it('returns the app gradle path if file exists in the folder', () => {
-    expect(findBuildGradle('/flat/android', true)).toBe(
+    expect(findBuildGradle('/flat/android', '')).toBe(
       '/flat/android/build.gradle',
     );
   });
 
   it('returns `null` if there is no gradle in the app folder', () => {
-    expect(findBuildGradle('/empty', true)).toBeNull();
+    expect(findBuildGradle('/empty', '')).toBeNull();
   });
 });