Merge branch 'main' into main-1

Author: SubsequentlySneeds

.github/workflows/release.yml

@@ -12,9 +12,9 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
-          ref: "master"
+          ref: "main"
           persist-credentials: false
 
       - name: "Setup Node v16"

.github/workflows/test.yml

@@ -11,9 +11,9 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js 18
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 18
           cache: yarn
@@ -29,9 +29,9 @@ jobs:
       matrix:
         node-version: [18]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
@@ -48,7 +48,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-2019]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
@@ -70,7 +70,7 @@ jobs:
         uses: microsoft/[email protected]
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn

__e2e__/__snapshots__/config.test.ts.snap

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

docs/platforms.md

@@ -84,6 +84,7 @@ type AndroidProjectConfig = {
   sourceDir: string;
   appName: string;
   packageName: string;
+  mainActivity: string;
   dependencyConfiguration?: string;
   watchModeCommandParams: string;
 };

lerna.json

@@ -1,6 +1,6 @@
 {
-  "version": "12.0.0-alpha.7",
+  "version": "12.0.0-alpha.10",
   "npmClient": "yarn",
-  "useWorkspaces": true,
-  "exact": true
+  "exact": true,
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

package.json

@@ -49,9 +49,9 @@
     "jest": "^26.6.2",
     "jest-circus": "^26.6.2",
     "jest-snapshot-serializer-raw": "^1.1.0",
-    "lerna": "^4.0.0",
+    "lerna": "^7.1.3",
     "lint-staged": "^13.1.0",
-    "metro-memory-fs": "0.77.0",
+    "metro-memory-fs": "0.78.0",
     "micromatch": "^4.0.4",
     "rimraf": "^3.0.2",
     "slash": "^3.0.0",

packages/cli-clean/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@react-native-community/cli-clean",
-  "version": "12.0.0-alpha.7",
+  "version": "12.0.0-alpha.10",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "types": "build/index.d.ts",
   "dependencies": {
-    "@react-native-community/cli-tools": "12.0.0-alpha.7",
+    "@react-native-community/cli-tools": "12.0.0-alpha.10",
     "chalk": "^4.1.2",
     "execa": "^5.0.0",
-    "prompts": "^2.4.0"
+    "prompts": "^2.4.2"
   },
   "files": [
     "build",
     "!*.d.ts",
     "!*.map"
   ],
   "devDependencies": {
-    "@react-native-community/cli-types": "12.0.0-alpha.7",
-    "@types/prompts": "^2.0.9"
+    "@react-native-community/cli-types": "12.0.0-alpha.10",
+    "@types/prompts": "^2.4.4"
   },
   "homepage": "https://github.com/react-native-community/cli/tree/main/packages/cli-clean",
   "repository": {

packages/cli-config/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@react-native-community/cli-config",
-  "version": "12.0.0-alpha.7",
+  "version": "12.0.0-alpha.10",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "types": "build/index.d.ts",
   "dependencies": {
-    "@react-native-community/cli-tools": "12.0.0-alpha.7",
+    "@react-native-community/cli-tools": "12.0.0-alpha.10",
     "chalk": "^4.1.2",
     "cosmiconfig": "^5.1.0",
     "deepmerge": "^4.3.0",
@@ -21,7 +21,7 @@
     "!*.map"
   ],
   "devDependencies": {
-    "@react-native-community/cli-types": "12.0.0-alpha.7",
+    "@react-native-community/cli-types": "12.0.0-alpha.10",
     "@types/cosmiconfig": "^5.0.3",
     "@types/glob": "^7.1.1"
   },

packages/cli-config/src/__tests__/index-test.ts

@@ -406,12 +406,28 @@ test('should convert project sourceDir relative path to absolute', () => {
       <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         package="com.coinbase.android">
+        <application android:name=".MainApplication">
+          <activity android:name=".MainActivity">
+            <intent-filter>
+              <action android:name="android.intent.action.MAIN" />
+              <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+          </activity>
+        </application>
       </manifest>
     `,
     'android2/AndroidManifest.xml': `
       <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         package="com.coinbase.android">
+        <application android:name=".MainApplication">
+          <activity android:name=".MainActivity">
+            <intent-filter>
+              <action android:name="android.intent.action.MAIN" />
+              <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+          </activity>
+        </application>
       </manifest>
     `,
   });

packages/cli-debugger-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-community/cli-debugger-ui",
-  "version": "12.0.0-alpha.7",
+  "version": "12.0.0-alpha.10",
   "license": "MIT",
   "main": "./build/middleware",
   "scripts": {