Merge branch 'master' into cdp-node-version-compatibility

Author: EmmaYuan1015

src/common/nodeHelper.ts

@@ -10,3 +10,5 @@ export async function getNodeVersion(projectPath: string, env: object) {
         return "";
     }
 }
+
+// Note: Additional helpers are not required for CDP messaging improvement.

src/common/projectVersionHelper.ts

@@ -50,6 +50,32 @@ export function RNPackageVersionsToPackageVersion(
 
 export class ProjectVersionHelper {
     private static SEMVER_INVALID = "SemverInvalid";
+    /**
+     * Reads required Node.js semver range from react-native's package.json engines.node.
+     * Falls back to null if not found.
+     */
+    public static async getReactNativeRequiredNodeRange(
+        projectRoot: string,
+        nodeModulesRoot?: string,
+    ): Promise<string | null> {
+        try {
+            if (!nodeModulesRoot) {
+                nodeModulesRoot = AppLauncher.getNodeModulesRootByProjectPath(projectRoot);
+            }
+            const rnPackage = new Package(nodeModulesRoot);
+            const rnPkgJson = await rnPackage
+                .dependencyPackage(REACT_NATIVE_PACKAGES.REACT_NATIVE.packageName)
+                .parsePackageInformation();
+            const engines = rnPkgJson && rnPkgJson.engines;
+            const nodeRange = engines && engines.node;
+            if (typeof nodeRange === "string" && nodeRange.trim().length > 0) {
+                return nodeRange.trim();
+            }
+            return null;
+        } catch {
+            return null;
+        }
+    }
 
     public static getRNVersionsWithBrokenMetroBundler(): string[] {
         // https://github.com/microsoft/vscode-react-native/issues/660 for details

src/debugger/rnDebugSession.ts

@@ -8,10 +8,12 @@ import { logger } from "@vscode/debugadapter";
 import { DebugProtocol } from "vscode-debugprotocol";
 import * as nls from "vscode-nls";
 import { ProjectVersionHelper } from "../common/projectVersionHelper";
+import { InternalErrorCode } from "../common/error/internalErrorCode";
+import * as semver from "semver";
 import { TelemetryHelper } from "../common/telemetryHelper";
 import { RnCDPMessageHandler } from "../cdp-proxy/CDPMessageHandlers/rnCDPMessageHandler";
 import { ErrorHelper } from "../common/error/errorHelper";
-import { InternalErrorCode } from "../common/error/internalErrorCode";
+
 import { ReactNativeProjectHelper } from "../common/reactNativeProjectHelper";
 import { MultipleLifetimesAppWorker } from "./appWorker";
 import {
@@ -60,6 +62,21 @@ export class RNDebugSession extends DebugSessionBase {
                 if (launchArgs.platform != "exponent") {
                     await ReactNativeProjectHelper.verifyMetroConfigFile(launchArgs.cwd);
                 }
+                const requiredNodeRange =
+                    await ProjectVersionHelper.getReactNativeRequiredNodeRange(launchArgs.cwd);
+                if (requiredNodeRange) {
+                    const currentNode = process.version;
+                    const coerced = semver.coerce(currentNode);
+                    if (
+                        !coerced ||
+                        !semver.satisfies(coerced, requiredNodeRange, { includePrerelease: true })
+                    ) {
+                        throw ErrorHelper.getInternalError(
+                            InternalErrorCode.CouldNotAttachToDebugger,
+                            `Incompatible Node.js for React Native: detected ${currentNode}; required ${requiredNodeRange}. Install a supported Node.js or change React Native version.`,
+                        );
+                    }
+                }
                 await this.initializeSettings(launchArgs);
                 logger.log("Launching the application");
                 logger.verbose(`Launching the application: ${JSON.stringify(launchArgs, null, 2)}`);
@@ -102,6 +119,24 @@ export class RNDebugSession extends DebugSessionBase {
 
         return new Promise<void>(async (resolve, reject) => {
             try {
+                const requiredNodeRange =
+                    await ProjectVersionHelper.getReactNativeRequiredNodeRange(attachArgs.cwd);
+                if (requiredNodeRange) {
+                    const currentNode = process.version;
+                    const coerced = semver.coerce(currentNode);
+                    if (
+                        !coerced ||
+                        !semver.satisfies(coerced, requiredNodeRange, { includePrerelease: true })
+                    ) {
+                        reject(
+                            ErrorHelper.getInternalError(
+                                InternalErrorCode.CouldNotAttachToDebugger,
+                                `Incompatible Node.js for React Native: detected ${currentNode}; required ${requiredNodeRange}. Install a supported Node.js or change React Native version.`,
+                            ),
+                        );
+                        return;
+                    }
+                }
                 await this.initializeSettings(attachArgs);
                 logger.log("Attaching to the application");
                 logger.verbose(

src/extension/services/validationService/checks/nodeJS.ts

@@ -1,13 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for details.
 
+import * as path from "path";
 import * as nls from "vscode-nls";
 import {
     basicCheck,
     createNotFoundMessage,
     createVersionErrorMessage,
     parseVersion,
 } from "../util";
+import { ProjectVersionHelper } from "../../../../common/projectVersionHelper";
 import { ValidationCategoryE, IValidation, ValidationResultT } from "./types";
 
 nls.config({
@@ -20,9 +22,19 @@ const toLocale = nls.loadMessageBundle();
 const label = "Node.JS";
 
 async function test(): Promise<ValidationResultT> {
+    // Determine RN-required Node range if available
+    const projectRoot = process.cwd();
+    const nodeModulesRoot = path.join(projectRoot, "node_modules");
+    const rnNodeRange = await ProjectVersionHelper.getReactNativeRequiredNodeRange(
+        projectRoot,
+        nodeModulesRoot,
+    );
+
+    const requiredRange = rnNodeRange || "12.0.0";
+
     const result = await basicCheck({
         command: "node",
-        versionRange: "12.0.0",
+        versionRange: requiredRange,
         getVersion: parseVersion.bind(null, "node --version"),
     });
 
@@ -43,9 +55,9 @@ async function test(): Promise<ValidationResultT> {
     if (result.versionCompare === -1) {
         return {
             status: "failure",
-            comment:
-                "Detected version is older than 12.0.0 " +
-                `Minimal required version is 12.0.0. Please update your ${label} installation`,
+            comment: rnNodeRange
+                ? `Detected Node.js version is incompatible with React Native. Required range: ${requiredRange}. Please install a supported Node.js version for your project's React Native.`
+                : "Detected version is older than 12.0.0 Minimal required version is 12.0.0. Please update your Node.JS installation",
         };
     }
 
@@ -56,7 +68,7 @@ const main: IValidation = {
     label,
     description: toLocale(
         "NodejsCheckDescription",
-        "Required for code execution. Minimal version is 12",
+        "Required for code execution. Uses React Native's required Node range when available; otherwise minimal version is 12",
     ),
     category: ValidationCategoryE.Common,
     exec: test,

test/extension/tipsNotificationService/tipsNotificationService.test.ts

@@ -34,6 +34,7 @@ suite("tipNotificationService", function () {
     let tipNotificationService: TipNotificationService;
 
     setup(async function () {
+        this.timeout(5000);
         tipNotificationService = TipNotificationService.getInstance();
         config.delete(tipsConfigName);
         await SettingsHelper.setShowTips(true);
@@ -47,7 +48,8 @@ suite("tipNotificationService", function () {
     });
 
     suite("initializeTipsConfig", function () {
-        test("should create correct tips config", async () => {
+        test("should create correct tips config", async function () {
+            this.timeout(5000);
             await (<any>tipNotificationService).initializeTipsConfig();
             const tipsConfig: TipsConfig = (<any>tipNotificationService).tipsConfig;
 

test/smoke/suites/activation.test.ts

@@ -42,15 +42,15 @@ export function startExtensionActivationTests(): void {
             try {
                 await ElementHelper.WaitElementSelectorVisible(
                     `[id="${Constant.previewExtensionId}"]`,
-                    2000,
+                    10000,
                 );
                 SmokeTestLogger.info("React-native preview extension is activated");
                 isActivited = true;
             } catch {
                 try {
                     await ElementHelper.WaitElementSelectorVisible(
                         `[id="${Constant.prodExtensionId}"]`,
-                        2000,
+                        10000,
                     );
                     SmokeTestLogger.info("React-native prod extension is activated");
                     isActivited = true;

test/smoke/suites/helper/application.ts

@@ -54,7 +54,7 @@ export class Application {
             timeout: 10000,
         });
 
-        await utilities.sleep(5000);
+        await utilities.sleep(10000);
         return this.mainPage;
     }
 
@@ -74,7 +74,13 @@ export class Application {
 
     async installExtensionFromVSIX(vscodeExecutablePath: string): Promise<void> {
         const [cliPath, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
-        args.push(`--extensions-dir=${this.extensionDirectory}`);
+        // Remove existing --extensions-dir if present to avoid duplication
+        const extensionsDirIndex = args.findIndex(arg => arg.startsWith("--extensions-dir="));
+        if (extensionsDirIndex >= 0) {
+            args[extensionsDirIndex] = `--extensions-dir=${this.extensionDirectory}`;
+        } else {
+            args.push(`--extensions-dir=${this.extensionDirectory}`);
+        }
         let extensionFile = utilities.findFile(this.vsixDirectory, /.*\.(vsix)/);
         if (!extensionFile) {
             throw new Error(`React Native extension .vsix is not found in ${this.vsixDirectory}`);