From f78d6c589b303e01bcc08d2d2df42ded0321330e Mon Sep 17 00:00:00 2001 From: Krzysztof Magiera Date: Fri, 11 Oct 2024 09:20:51 +0200 Subject: [PATCH] Fix logic for determinig whether platofm folders are needed --- packages/vscode-extension/src/builders/buildAndroid.ts | 2 +- .../vscode-extension/src/dependency/DependencyManager.ts | 2 +- .../src/webview/providers/DependenciesProvider.tsx | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/vscode-extension/src/builders/buildAndroid.ts b/packages/vscode-extension/src/builders/buildAndroid.ts index 0bb56711a..b9bec1798 100644 --- a/packages/vscode-extension/src/builders/buildAndroid.ts +++ b/packages/vscode-extension/src/builders/buildAndroid.ts @@ -121,7 +121,7 @@ export async function buildAndroid( if (!(await dependencyManager.isInstalled("android"))) { throw new Error( - "Android directory does not exist, configure build source in launch configuration or use expo prebuild to generate the directory" + '"android" directory does not exist, configure build source in launch configuration or use expo prebuild to generate the directory' ); } diff --git a/packages/vscode-extension/src/dependency/DependencyManager.ts b/packages/vscode-extension/src/dependency/DependencyManager.ts index 361987edb..869dc602a 100644 --- a/packages/vscode-extension/src/dependency/DependencyManager.ts +++ b/packages/vscode-extension/src/dependency/DependencyManager.ts @@ -352,5 +352,5 @@ async function areNativeDirectoriesOptional(): Promise { const isExpoGo = await isExpoGoProject(); const launchConfiguration = getLaunchConfiguration(); - return isExpoGo && !!launchConfiguration.eas && !!launchConfiguration.customBuild; + return isExpoGo || !!launchConfiguration.eas || !!launchConfiguration.customBuild; } diff --git a/packages/vscode-extension/src/webview/providers/DependenciesProvider.tsx b/packages/vscode-extension/src/webview/providers/DependenciesProvider.tsx index 278891d21..ff1b0c96c 100644 --- a/packages/vscode-extension/src/webview/providers/DependenciesProvider.tsx +++ b/packages/vscode-extension/src/webview/providers/DependenciesProvider.tsx @@ -225,13 +225,13 @@ export function dependencyDescription(dependency: Dependency) { }; case "ios": return { - info: "Whether ios directory exists in the project", - error: "Ios directory does not exist in root directory", + info: 'Whether "ios" directory exists in the project', + error: '"ios" directory does not exist in the main application directory', }; case "android": return { - info: "Whether android directory exists in the project", - error: "Android directory does not exist in root directory", + info: 'Whether "android" directory exists in the project', + error: '"android" directory does not exist in the main application directory', }; case "expo": return {