URL bar improvements

packages/vscode-extension/src/dependency/DependencyManager.ts

@@ -334,6 +334,7 @@ export class DependencyManager implements Disposable {
         installed,
         info: "Whether supported version of Expo Router is installed.",
         error: undefined,
+        isOptional: !isExpoRouterProject(),
       },
     });
     Logger.debug(`Minimum Expo version installed:`, installed);
@@ -353,6 +354,7 @@ export class DependencyManager implements Disposable {
         installed,
         info: "Whether Storybook is installed.",
         error: undefined,
+        isOptional: true,
       },
     });
     Logger.debug("Storybook installed:", installed);
@@ -460,3 +462,18 @@ export function checkMinDependencyVersionInstalled(dependency: string, minVersio
 export async function checkAndroidEmulatorExists() {
   return fs.existsSync(EMULATOR_BINARY);
 }
+
+export function isExpoRouterProject() {
+  try {
+    const appRoot = getAppRootFolder();
+    const packageJson = require(path.join(appRoot, "package.json"));
+    const hasExpoRouterDependency = Object.values<string>(packageJson.dependencies).some(
+      (dependencies: string) => {
+        return dependencies.includes("expo-router");
+      }
+    );
+    return hasExpoRouterDependency;
+  } catch (e) {
+    return false;
+  }
+}

packages/vscode-extension/src/webview/providers/DependenciesProvider.tsx

@@ -19,6 +19,7 @@ export interface DependencyState {
   installed: InstallationStatus;
   info: string;
   error?: string;
+  isOptional?: boolean;
 }
 
 interface DependencyMessageData {
@@ -27,6 +28,7 @@ interface DependencyMessageData {
     installed: boolean;
     info: string;
     error?: string;
+    isOptional?: boolean;
   };
 }
 
@@ -88,9 +90,17 @@ function hasError(dependencies: Dependencies, domain: "ios" | "android" | "commo
 
 function adaptDependencyData(data: DependencyMessageData["data"]): DependencyState {
   if (data.installed) {
-    return { ...data, installed: InstallationStatus.Installed };
+    return {
+      ...data,
+      installed: InstallationStatus.Installed,
+      isOptional: data.isOptional ?? false,
+    };
   }
-  return { ...data, installed: InstallationStatus.NotInstalled };
+  return {
+    ...data,
+    installed: InstallationStatus.NotInstalled,
+    isOptional: data.isOptional ?? false,
+  };
 }
 
 function entries<K extends string, T>(object: Partial<Record<K, T>>) {
@@ -156,8 +166,8 @@ export default function DependenciesProvider({ children }: PropsWithChildren) {
   }, []);
 
   const updateDependency = useCallback(
-    (name: keyof Dependencies, newState: Partial<DependencyState>, { isOptional = false } = {}) => {
-      if (isOptional && newState.installed === InstallationStatus.NotInstalled) {
+    (name: keyof Dependencies, newState: Partial<DependencyState>) => {
+      if (newState.isOptional && newState.installed === InstallationStatus.NotInstalled) {
         newState.installed = InstallationStatus.Optional;
       }
 
@@ -208,10 +218,10 @@ export default function DependenciesProvider({ children }: PropsWithChildren) {
           updateDependency("Pods", { error: undefined, installed: InstallationStatus.InProgress });
           break;
         case "isExpoRouterInstalled":
-          updateDependency("ExpoRouter", data, { isOptional: true });
+          updateDependency("ExpoRouter", data);
           break;
         case "isStorybookInstalled":
-          updateDependency("Storybook", data, { isOptional: true });
+          updateDependency("Storybook", data);
           break;
       }
     };