Fix build cache management in workspaces

packages/vscode-extension/src/builders/PlatformBuildCache.ts → packages/vscode-extension/src/builders/BuildCache.ts

@@ -30,44 +30,33 @@ export type BuildCacheInfo = {
   buildResult: AndroidBuildResult | IOSBuildResult;
 };
 
-export class PlatformBuildCache {
-  static instances: Record<DevicePlatform, PlatformBuildCache | undefined> = {
-    [DevicePlatform.Android]: undefined,
-    [DevicePlatform.IOS]: undefined,
-  };
-
-  static forPlatform(platform: DevicePlatform): PlatformBuildCache {
-    if (!this.instances[platform]) {
-      this.instances[platform] = new PlatformBuildCache(platform);
-    }
-
-    return this.instances[platform];
-  }
+export class BuildCache {
+  constructor(private readonly platform: DevicePlatform, private readonly appRoot: string) {}
 
-  private constructor(private readonly platform: DevicePlatform) {}
-
-  get cacheKey() {
-    return this.platform === DevicePlatform.Android ? ANDROID_BUILD_CACHE_KEY : IOS_BUILD_CACHE_KEY;
+  private get cacheKey() {
+    const keyPrefix =
+      this.platform === DevicePlatform.Android ? ANDROID_BUILD_CACHE_KEY : IOS_BUILD_CACHE_KEY;
+    return `${keyPrefix}:{this.appRoot}`;
   }
 
   /**
    * Passed fingerprint should be calculated at the time build is started.
    */
   public async storeBuild(buildFingerprint: string, build: BuildResult) {
     const appPath = await getAppHash(getAppPath(build));
-    await extensionContext.workspaceState.update(this.cacheKey, {
+    await extensionContext.globalState.update(this.cacheKey, {
       fingerprint: buildFingerprint,
       buildHash: appPath,
       buildResult: build,
     });
   }
 
   public async clearCache() {
-    await extensionContext.workspaceState.update(this.cacheKey, undefined);
+    await extensionContext.globalState.update(this.cacheKey, undefined);
   }
 
   public async getBuild(currentFingerprint: string) {
-    const cache = extensionContext.workspaceState.get<BuildCacheInfo>(this.cacheKey);
+    const cache = extensionContext.globalState.get<BuildCacheInfo>(this.cacheKey);
     if (!cache) {
       Logger.debug("No cached build found.");
       return undefined;
@@ -105,8 +94,7 @@ export class PlatformBuildCache {
 
   public async isCacheStale() {
     const currentFingerprint = await this.calculateFingerprint();
-    const { fingerprint } =
-      extensionContext.workspaceState.get<BuildCacheInfo>(this.cacheKey) ?? {};
+    const { fingerprint } = extensionContext.globalState.get<BuildCacheInfo>(this.cacheKey) ?? {};
 
     return currentFingerprint !== fingerprint;
   }
@@ -145,10 +133,10 @@ export class PlatformBuildCache {
     const fingerprint = await runfingerprintCommand(fingerprintCommand, env);
 
     if (!fingerprint) {
-      throw new Error("Failed to generate workspace fingerprint using custom script.");
+      throw new Error("Failed to generate application fingerprint using custom script.");
     }
 
-    Logger.debug("Workspace fingerprint", fingerprint);
+    Logger.debug("Application fingerprint", fingerprint);
     return fingerprint;
   }
 }
@@ -160,3 +148,20 @@ function getAppPath(build: BuildResult) {
 async function getAppHash(appPath: string) {
   return (await calculateMD5(appPath)).digest("hex");
 }
+
+export function migrateOldBuildCachesToNewStorage() {
+  const platformKeys = [ANDROID_BUILD_CACHE_KEY, IOS_BUILD_CACHE_KEY];
+  const appRoot = getAppRootFolder();
+
+  platformKeys.forEach((platformKey) => {
+    const cache = extensionContext.workspaceState.get<BuildCacheInfo>(platformKey);
+    if (!cache) {
+      return;
+    }
+
+    extensionContext.globalState.update(appRoot + platformKey, cache);
+
+    // remove the old cache afterwords
+    extensionContext.workspaceState.update(platformKey, undefined);
+  });
+}

packages/vscode-extension/src/builders/BuildManager.ts

@@ -1,5 +1,5 @@
 import { Disposable, OutputChannel, window } from "vscode";
-import { PlatformBuildCache } from "./PlatformBuildCache";
+import { BuildCache } from "./BuildCache";
 import { AndroidBuildResult, buildAndroid } from "./buildAndroid";
 import { IOSBuildResult, buildIos } from "./buildIOS";
 import { DeviceInfo, DevicePlatform } from "../common/DeviceManager";
@@ -53,7 +53,7 @@ export class BuildManager {
     });
 
     const cancelToken = new CancelToken();
-    const buildCache = PlatformBuildCache.forPlatform(platform);
+    const buildCache = new BuildCache(platform, getAppRootFolder());
 
     const buildApp = async () => {
       const currentFingerprint = await buildCache.calculateFingerprint();

packages/vscode-extension/src/extension.ts

@@ -31,6 +31,7 @@ import { getLaunchConfiguration } from "./utilities/launchConfiguration";
 import { Project } from "./project/project";
 import { findFilesInWorkspace, isWorkspaceRoot } from "./utilities/common";
 import { Platform } from "./utilities/platform";
+import { migrateOldBuildCachesToNewStorage } from "./builders/BuildCache";
 
 const OPEN_PANEL_ON_ACTIVATION = "open_panel_on_activation";
 
@@ -245,6 +246,9 @@ export async function activate(context: ExtensionContext) {
     }
   }
 
+  // this needs to be run after app root is set
+  migrateOldBuildCachesToNewStorage();
+
   extensionActivated();
 }
 

packages/vscode-extension/src/project/project.ts

@@ -22,7 +22,7 @@ import {
 import { Logger } from "../Logger";
 import { DeviceInfo } from "../common/DeviceManager";
 import { DeviceAlreadyUsedError, DeviceManager } from "../devices/DeviceManager";
-import { extensionContext } from "../utilities/extensionContext";
+import { extensionContext, getAppRootFolder } from "../utilities/extensionContext";
 import { IosSimulatorDevice } from "../devices/IosSimulatorDevice";
 import { AndroidEmulatorDevice } from "../devices/AndroidEmulatorDevice";
 import { DependencyManager } from "../dependency/DependencyManager";
@@ -31,7 +31,7 @@ import { DebugSessionDelegate } from "../debugging/DebugSession";
 import { Metro, MetroDelegate } from "./metro";
 import { Devtools } from "./devtools";
 import { AppEvent, DeviceSession, EventDelegate } from "./deviceSession";
-import { PlatformBuildCache } from "../builders/PlatformBuildCache";
+import { BuildCache } from "../builders/BuildCache";
 import { PanelLocation } from "../common/WorkspaceConfig";
 import { activateDevice, getLicenseToken } from "../utilities/license";
 
@@ -671,7 +671,8 @@ export class Project
   private checkIfNativeChanged = throttleAsync(async () => {
     if (!this.isCachedBuildStale && this.projectState.selectedDevice) {
       const platform = this.projectState.selectedDevice.platform;
-      const isCacheStale = await PlatformBuildCache.forPlatform(platform).isCacheStale();
+      const buildCache = new BuildCache(platform, getAppRootFolder());
+      const isCacheStale = await buildCache.isCacheStale();
 
       if (isCacheStale) {
         this.isCachedBuildStale = true;