Sync upstream 2026-11-09

README.md

@@ -706,7 +706,7 @@ The following is a list of all the configuration properties the debugger accepts
 | `expoHostType`                     | The connection type to be used on Expo debugging to communicate with a device or an emulator. Possible values: <ul><li>`tunnel` - allows to deploy and debug an application by means of Expo cloud services</li><li>`lan` - allows to deploy and install an application via your LAN</li><li>`local` - allows to debug an application on an emulator or an Android device without network connection</li></ul>                                                                                                                                                                                                                                                                                                                                                         | `string`   | `lan`                                         |
 | `env`                              | Environment variables passed to the debugger and `react-native run-<platform>` command                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `object`   | `{}`                                          |
 | `envFile`                          | Absolute path to a file containing environment variable definitions                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `string`   | `${workspaceFolder}/.env`                     |
-| `variant`                          | A variant to be passed to `react-native run-android`, e.g. use `devDebug` to specify `--variant=devDebug`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`   | n/a                                           |
+| `variant`                          | Android build variant to run, such as `debug` or `devDebug`. The extension uses `--mode` for CLI 12 and newer, and `--variant` for older versions. Non-empty `runArguments` override this setting.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`   | n/a                                           |
 | `scheme`                           | A scheme name to be passed to `react-native run-ios`, e.g. `devDebug` to specify `--scheme=devDebug`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `string`   | n/a                                           |
 | `productName`                      | iOS bundle display name e.g. `AwesomeProject` value means that the extension will search for `AwesomeProject.app` bundle                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string`   | n/a                                           |
 | `jsDebugTrace`                     | Enable trace collection for depended extension `vscode-js-debug`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `boolean`  | n/a                                           |

package.nls.json

@@ -77,7 +77,7 @@
     "reactNative.launch.runArguments.description": "Run arguments to be passed to 'react-native run-<platform>' command (override all other configuration params)",
     "reactNative.launch.env.description": "Environment variables passed to the debugger and 'react-native run-<platform>' command.",
     "reactNative.launch.envFile.description": "Absolute path to a file containing environment variable definitions.",
-    "reactNative.launch.variant.description": "A variant to be passed to 'react-native run-android', e.g. use 'devDebug' to specify '--variant=devDebug'",
+    "reactNative.launch.variant.description": "Android build variant to run, such as 'debug' or 'devDebug'. The extension selects '--mode' or '--variant' according to the installed CLI version.",
     "reactNative.launch.scheme.description": "A scheme name to be passed to 'react-native run-ios', e.g. 'devDebug' to specify '--scheme=devDebug'",
     "reactNative.launch.productName.description": "iOS bundle display name e.g. 'AwesomeProject' value means that extension will search for 'AwesomeProject.app' bundle",
     "reactNative.launch.skipFiles.description": "An array of file or folder names, or glob patterns, to skip when debugging.",

src/common/customRequire.ts

@@ -6,6 +6,7 @@
 
 interface CustomRequire extends NodeRequireFunction {
     cache: any;
+    resolve: RequireResolve;
 }
 
 // Portion of code was taken from https://github.com/sindresorhus/ow/blob/d62a06c192b892d504887f0b97fdc842e8cbf862/source/utils/node/require.ts

src/common/reactNativeProjectHelper.ts

@@ -46,14 +46,36 @@ export class ReactNativeProjectHelper {
     }
 
     public static isAndroidHermesEnabled(projectRoot: string): boolean {
-        const buildGradlePath = path.join(projectRoot, "android", "app", "build.gradle");
-        if (!projectRoot || !fs.existsSync(buildGradlePath)) {
+        if (!projectRoot) {
             return false;
         }
 
+        const gradlePropertiesPath = path.join(projectRoot, "android", "gradle.properties");
+        if (fs.existsSync(gradlePropertiesPath)) {
+            const properties = fs.readFileSync(gradlePropertiesPath, "utf-8");
+            let hermesEnabled: boolean | undefined;
+            for (const line of properties.split(/\r?\n/)) {
+                const match = line.match(/^[\t ]*hermesEnabled[\t ]*[:=][\t ]*(.*)$/);
+                if (match) {
+                    hermesEnabled = match[1].trim().toLowerCase() === "true";
+                }
+            }
+            if (hermesEnabled !== undefined) {
+                return hermesEnabled;
+            }
+        }
+
+        const buildGradlePath = path.join(projectRoot, "android", "app", "build.gradle");
+        if (!fs.existsSync(buildGradlePath)) {
+            return false;
+        }
         const buildGradleContent = fs.readFileSync(buildGradlePath, "utf-8");
-        const hermesEnabled = /enableHermes\s*:\s*true/.test(buildGradleContent);
-        return hermesEnabled;
+        // Mask strings as well as comments so examples and comment markers in strings are ignored.
+        const configuration = buildGradleContent.replace(
+            /"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\/\/[^\n\r]*|\/\*[\S\s]*?\*\//g,
+            " ",
+        );
+        return /\benableHermes\s*:\s*true\b/.test(configuration);
     }
 
     public static isIOSHermesEnabled(projectRoot: string): boolean {

src/extension/android/androidPlatform.ts

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for details.
 
+import * as fs from "fs";
+import * as path from "path";
 import * as semver from "semver";
 import * as nls from "vscode-nls";
 import { MobilePlatformDeps, TargetType } from "../generalPlatform";
@@ -15,6 +17,7 @@ import { notNullOrUndefined } from "../../common/utils";
 import { PromiseUtil } from "../../common/node/promise";
 import { GeneralMobilePlatform } from "../generalMobilePlatform";
 import { ProjectVersionHelper } from "../../common/projectVersionHelper";
+import customRequire from "../../common/customRequire";
 import { LogCatMonitorManager } from "./logCatMonitorManager";
 import { AndroidTarget, AndroidTargetManager } from "./androidTargetManager";
 import { AdbHelper, AndroidAPILevel } from "./adb";
@@ -306,7 +309,7 @@ export class AndroidPlatform extends GeneralMobilePlatform {
             runArguments = this.runOptions.runArguments;
         } else {
             if (this.runOptions.variant) {
-                runArguments.push("--variant", this.runOptions.variant);
+                runArguments.push(this.getVariantOptionName(), this.runOptions.variant);
             }
             if (this.runOptions.target) {
                 if (
@@ -321,6 +324,69 @@ export class AndroidPlatform extends GeneralMobilePlatform {
         return runArguments;
     }
 
+    private getVariantOptionName(): "--mode" | "--variant" {
+        const searchPaths = [
+            this.runOptions.projectRoot,
+            this.runOptions.nodeModulesRoot,
+            path.join(this.runOptions.nodeModulesRoot, "node_modules", "react-native"),
+            path.join(
+                this.runOptions.nodeModulesRoot,
+                "node_modules",
+                "@react-native-community",
+                "cli",
+            ),
+        ];
+
+        try {
+            for (const packageName of [
+                "@react-native-community/cli-platform-android",
+                "@react-native-community/cli",
+                "react-native",
+            ]) {
+                let packageJsonPath: string;
+                try {
+                    packageJsonPath = customRequire.resolve(`${packageName}/package.json`, {
+                        paths: searchPaths,
+                    });
+                } catch (error) {
+                    if ((error as NodeJS.ErrnoException).code === "MODULE_NOT_FOUND") {
+                        continue;
+                    }
+                    throw error;
+                }
+
+                const packageJson: unknown = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+                const version =
+                    packageJson && typeof packageJson === "object" && "version" in packageJson
+                        ? packageJson.version
+                        : undefined;
+                if (typeof version !== "string" || !semver.valid(version)) {
+                    throw new Error(`Invalid package version in ${packageJsonPath}`);
+                }
+
+                if (packageName === "react-native") {
+                    // Older React Native releases bundled the Android CLI.
+                    if (semver.lt(version, "0.60.0")) {
+                        return "--variant";
+                    }
+                    break;
+                }
+
+                return semver.gte(version, "12.0.0") ? "--mode" : "--variant";
+            }
+
+            throw new Error("Cannot locate the project's Android CLI package");
+        } catch (error) {
+            throw new Error(
+                localize(
+                    "CannotDetermineAndroidVariantOption",
+                    "Cannot determine the Android build variant option: {0}. Check the project's CLI installation or specify the supported option explicitly in 'runArguments'.",
+                    error instanceof Error ? error.message : String(error),
+                ),
+            );
+        }
+    }
+
     public dispose(): void {
         if (this.logCatMonitor) {
             LogCatMonitorManager.delMonitor(this.logCatMonitor.deviceId);

src/extension/commands/enableHermes.ts

@@ -47,7 +47,7 @@ export class EnableHermes extends Command {
             }
 
             const podfileContent = fs.readFileSync(podfilePath, "utf-8");
-            const hermesMatches = podfileContent.match(/#?\s*:hermes_enabled\s*=>\s*\w*/);
+            const hermesMatches = podfileContent.match(/#?\s*:hermes_enabled\s*=>\s*(\w*)/);
             const regex = /(use_react_native!\s*\([^)]*?)(\n\s*\))/;
             const rnMatches = podfileContent.match(regex);
             const nodeModulesRoot: string =
@@ -59,6 +59,7 @@ export class EnableHermes extends Command {
             );
 
             if (hermesMatches && !hermesMatches[0].startsWith("#")) {
+                if (hermesMatches[1] === isHermesEnabled) return;
                 const updatedHermes = podfileContent.replace(
                     /:hermes_enabled\s*=>\s*\w+/,
                     `:hermes_enabled => ${isHermesEnabled}`,

src/extension/commands/installExpoGoApplication.ts

@@ -9,6 +9,7 @@ import * as vscode from "vscode";
 import * as nls from "vscode-nls";
 import { OutputChannelLogger } from "../log/OutputChannelLogger";
 import { ErrorHelper } from "../../common/error/errorHelper";
+import { NestedError } from "../../common/error/internalError";
 import { InternalErrorCode } from "../../common/error/internalErrorCode";
 import { downloadExpoGo } from "../../common/downloadHelper";
 import { installAndroidApplication, installiOSApplication } from "../../common/installHelper";
@@ -71,19 +72,23 @@ export class InstallExpoGoApplication extends Command {
                 if (!fs.existsSync(fileName)) {
                     try {
                         await downloadExpoGo(targetUrl, fileName);
-                    } catch {
-                        throw new Error(
+                    } catch (error) {
+                        throw new NestedError(
+                            InternalErrorCode.FailedToInstallExpoGo,
                             localize("FailedToDownloadExpoGo", "Failed to download Expo Go."),
+                            error,
                         );
                     }
                 }
 
                 if (installItem === "Auto") {
                     try {
                         await installAndroidApplication(this.project, fileName);
-                    } catch {
-                        throw new Error(
+                    } catch (error) {
+                        throw new NestedError(
+                            InternalErrorCode.FailedToInstallExpoGo,
                             localize("FailedToInstallExpoGo", "Failed to install Expo Go."),
+                            error,
                         );
                     }
                 } else {
@@ -123,19 +128,23 @@ export class InstallExpoGoApplication extends Command {
                                 .getPackager()
                                 .getProjectPath()}/expogo_${iOSClientVersion}.tar.gz`,
                         );
-                    } catch {
-                        throw new Error(
+                    } catch (error) {
+                        throw new NestedError(
+                            InternalErrorCode.FailedToInstallExpoGo,
                             localize("FailedToDownloadExpoGo", "Failed to download Expo Go."),
+                            error,
                         );
                     }
                 }
 
                 if (installItem === "Auto" && os.platform() === "darwin") {
                     try {
                         await installiOSApplication(this.project, tarFile);
-                    } catch {
-                        throw new Error(
+                    } catch (error) {
+                        throw new NestedError(
+                            InternalErrorCode.FailedToInstallExpoGo,
                             localize("FailedToInstallExpoGo", "Failed to install Expo Go."),
+                            error,
                         );
                     }
                 } else {