Merge branch 'master' into benjaminbi/issue1927

microsoft · Mar 9, 2023 · f1cb338 · f1cb338
2 parents a36170a + 81f731b
commit f1cb338
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/.ci/master-pipeline.yml b/.ci/master-pipeline.yml
@@ -18,12 +18,12 @@ jobs:
         clean: true
       - template: common-validation.yml
 
-      - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+      - task: ComponentGovernanceComponentDetection@0
         displayName: "Component Detection"
         inputs:
           ignoreDirectories: ".vscode-test"
 
-      - task: msospo.ospo-extension.8d7f9abb-6896-461d-9e25-4f74ed65ddb2.notice@0
+      - task: notice@0
         displayName: "NOTICE File Generator"
         inputs:
           outputfile: "ThirdPartyNotices_Generated.txt"

diff --git a/package.json b/package.json
@@ -899,10 +899,21 @@
                   "android",
                   "ios",
                   "macos",
-                  "windows"
+                  "windows",
+                  "exponent"
                 ],
                 "description": "%reactNative.launch.direct.platform.description%"
               },
+              "expoHostType": {
+                "type": "string",
+                "enum": [
+                  "tunnel",
+                  "lan",
+                  "local"
+                ],
+                "default": "lan",
+                "description": "%reactNative.launch.expoHostType.description%"
+              },
               "useHermesEngine": {
                 "type": "boolean",
                 "description": "%reactNative.direct.attach.useHermesEngine.description%",

diff --git a/src/extension/debuggingConfiguration/configurationProviders/debugConfigProvider.ts b/src/extension/debuggingConfiguration/configurationProviders/debugConfigProvider.ts
@@ -59,7 +59,10 @@ export class DebugConfigProvider extends BaseConfigProvider {
                 }
             };
         } else if (state.config.platform === PlatformType.Exponent) {
-            return () => this.configureExpoHostType(input, state.config);
+            return async () => {
+                await this.configureApplicationType(input, state.config);
+                await this.configureExpoHostType(input, state.config);
+            };
         }
         return;
     }

diff --git a/src/extension/debuggingConfiguration/debugConfigTypesAndConstants.ts b/src/extension/debuggingConfiguration/debugConfigTypesAndConstants.ts
@@ -73,7 +73,7 @@ export const platformTypeDirectPickConfig: DebugConfigurationQuickPickItem[] = [
 
 export const appTypePickConfig: DebugConfigurationQuickPickItem[] = [
     {
-        label: "Application in direct mode",
+        label: "Application in direct mode(Hermes)",
         type: DEBUG_TYPES.REACT_NATIVE_DIRECT,
     },
     {
@@ -139,6 +139,7 @@ export const DEBUG_CONFIGURATION_NAMES = {
     RUN_ANDROID_HERMES_EXPERIMENTAL: "Run Android Hermes - Experimental",
     RUN_IOS_HERMES_EXPERIMENTAL: "Run iOS Hermes - Experimental",
     RUN_DIRECT_IOS_EXPERIMENTAL: "Run Direct iOS - Experimental",
+    DEBUG_IN_EXPONENT_HERMES_EXPERIMENTAL: "Debug in Hermes Exponent - Experimental",
 };
 
 export const debugConfigurations: Record<string, vscode.DebugConfiguration> = {
@@ -278,4 +279,11 @@ export const debugConfigurations: Record<string, vscode.DebugConfiguration> = {
         useHermesEngine: false,
         target: "device",
     },
+    [DEBUG_CONFIGURATION_NAMES.DEBUG_IN_EXPONENT_HERMES_EXPERIMENTAL]: {
+        name: DEBUG_CONFIGURATION_NAMES.DEBUG_IN_EXPONENT_HERMES_EXPERIMENTAL,
+        cwd: "${workspaceFolder}",
+        type: DEBUG_TYPES.REACT_NATIVE_DIRECT,
+        request: "launch",
+        platform: PlatformType.Exponent,
+    },
 };
diff --git a/test/localization/localization.test.ts b/test/localization/localization.test.ts
@@ -6,7 +6,7 @@ import { ErrorHelper } from "../../src/common/error/errorHelper";
 import { InternalErrorCode } from "../../src/common/error/internalErrorCode";
 
 suite("localizationTest", function () {
-    suite("localizationContext", function () {
+    suite.skip("localizationContext", function () {
         const commandFailedErrorChs = ErrorHelper.getInternalError(
             InternalErrorCode.CommandFailed,
             "IncorrectCommand",