fix: force a single version of harmony linked from bvm

scopes/component/isolator/isolator.main.runtime.ts

@@ -832,7 +832,7 @@ export class IsolatorMain {
       packageManagerConfigRootDir: isolateInstallOptions.packageManagerConfigRootDir,
       resolveVersionsFromDependenciesOnly: true,
       linkedDependencies: opts.linkedDependencies,
-      forceTeambitHarmonyLink: !this.dependencyResolver.hasHarmonyInRootPolicy(),
+      forcedHarmonyVersion: this.dependencyResolver.harmonyVersionInRootPolicy(),
       excludeExtensionsDependencies: true,
       dedupeInjectedDeps: true,
       dependenciesGraph: opts.dependenciesGraph,

scopes/dependencies/dependency-resolver/dependency-installer.ts

@@ -42,7 +42,7 @@ export type InstallOptions = {
   packageManagerConfigRootDir?: string;
   resolveVersionsFromDependenciesOnly?: boolean;
   linkedDependencies?: Record<string, Record<string, string>>;
-  forceTeambitHarmonyLink?: boolean;
+  forcedHarmonyVersion?: string;
   excludeExtensionsDependencies?: boolean;
   dedupeInjectedDeps?: boolean;
   dependenciesGraph?: DependenciesGraph;
@@ -164,6 +164,10 @@ export class DependencyInstaller {
         JSON.stringify(options.linkedDependencies)
       ) as typeof options.linkedDependencies;
       if (linkedDependencies[finalRootDir]) {
+        if (options.forcedHarmonyVersion == null && manifests[finalRootDir].dependencies?.['@teambit/harmony']) {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          delete manifests[finalRootDir].dependencies!['@teambit/harmony'];
+        }
         const directDeps = new Set<string>();
         Object.values(manifests).forEach((manifest) => {
           for (const depName of Object.keys({ ...manifest.dependencies, ...manifest.devDependencies })) {
@@ -175,10 +179,6 @@ export class DependencyInstaller {
             delete linkedDependencies[finalRootDir][manifest.name];
           }
         }
-        if (options.forceTeambitHarmonyLink && manifests[finalRootDir].dependencies?.['@teambit/harmony']) {
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          delete manifests[finalRootDir].dependencies!['@teambit/harmony'];
-        }
       }
       Object.entries(linkedDependencies).forEach(([dir, linkedDeps]) => {
         if (!manifests[dir]) {
@@ -210,6 +210,7 @@ export class DependencyInstaller {
       preferOffline: this.preferOffline,
       dedupeInjectedDeps: options.dedupeInjectedDeps,
       dependenciesGraph: options.dependenciesGraph,
+      forcedHarmonyVersion: options.forcedHarmonyVersion,
       ...packageManagerOptions,
     };
     if (options.installTeambitBit) {

scopes/dependencies/dependency-resolver/dependency-resolver.main.runtime.ts

@@ -241,9 +241,9 @@ export class DependencyResolverMain {
     return res;
   }
 
-  hasHarmonyInRootPolicy(): boolean {
+  harmonyVersionInRootPolicy(): string | undefined {
     const rootPolicy = this.getWorkspacePolicyFromConfig();
-    return rootPolicy.entries.some(({ dependencyId }) => dependencyId === '@teambit/harmony');
+    return rootPolicy.entries.find(({ dependencyId }) => dependencyId === '@teambit/harmony')?.value?.version;
   }
 
   nodeLinker(packageManagerName?: string): NodeLinker {

scopes/dependencies/dependency-resolver/package-manager.ts

@@ -134,6 +134,8 @@ export type PackageManagerInstallOptions = {
   returnListOfDepsRequiringBuild?: boolean;
 
   dependenciesGraph?: DependenciesGraph;
+
+  forcedHarmonyVersion?: string;
 };
 
 export type PackageManagerGetPeerDependencyIssuesOptions = PackageManagerInstallOptions;

scopes/dependencies/pnpm/lynx.ts

@@ -191,6 +191,7 @@ export async function install(
     hoistInjectedDependencies?: boolean;
     dryRun?: boolean;
     dedupeInjectedDeps?: boolean;
+    forcedHarmonyVersion?: string;
   } & Pick<
     InstallOptions,
     | 'autoInstallPeers'
@@ -221,6 +222,18 @@ export async function install(
     readPackage.push(readPackageHook as ReadPackageHook);
   }
   readPackage.push(removeLegacyFromDeps as ReadPackageHook);
+  const overrides = {
+    ...options.overrides,
+  };
+  if (options.forcedHarmonyVersion) {
+    // Harmony needs to be a singleton, so if a specific version was requested for the workspace,
+    // we force that version accross the whole dependency graph.
+    overrides['@teambit/harmony'] = options.forcedHarmonyVersion;
+  } else {
+    // If the workspace did not specify a harmony version in a root policy,
+    // then we remove harmony from any dependencies, so that the one linked from bvm is used.
+    readPackage.push(removeHarmonyFromDeps as ReadPackageHook);
+  }
   if (!manifestsByPaths[rootDir].dependenciesMeta) {
     manifestsByPaths = {
       ...manifestsByPaths,
@@ -291,6 +304,7 @@ export async function install(
     disableRelinkLocalDirDeps: true,
     hoistPattern,
     virtualStoreDirMaxLength: VIRTUAL_STORE_DIR_MAX_LENGTH,
+    overrides,
   };
 
   let dependenciesChanged = false;
@@ -403,11 +417,29 @@ function readPackageHookForCapsules(pkg: PackageManifest, workspaceDir?: string)
  * It is linked from bvm.
  */
 function removeLegacyFromDeps(pkg: PackageManifest): PackageManifest {
-  if (pkg.dependencies?.['@teambit/legacy'] && !pkg.dependencies['@teambit/legacy'].startsWith('link:')) {
-    delete pkg.dependencies['@teambit/legacy'];
+  if (pkg.dependencies != null) {
+    if (pkg.dependencies['@teambit/legacy'] && !pkg.dependencies['@teambit/legacy'].startsWith('link:')) {
+      delete pkg.dependencies['@teambit/legacy'];
+    }
   }
-  if (pkg.peerDependencies?.['@teambit/legacy']) {
-    delete pkg.peerDependencies['@teambit/legacy'];
+  if (pkg.peerDependencies != null) {
+    if (pkg.peerDependencies['@teambit/legacy']) {
+      delete pkg.peerDependencies['@teambit/legacy'];
+    }
+  }
+  return pkg;
+}
+
+function removeHarmonyFromDeps(pkg: PackageManifest): PackageManifest {
+  if (pkg.dependencies != null) {
+    if (pkg.dependencies['@teambit/harmony'] && !pkg.dependencies['@teambit/harmony'].startsWith('link:')) {
+      delete pkg.dependencies['@teambit/harmony'];
+    }
+  }
+  if (pkg.peerDependencies != null) {
+    if (pkg.peerDependencies['@teambit/harmony']) {
+      delete pkg.peerDependencies['@teambit/harmony'];
+    }
   }
   return pkg;
 }

scopes/dependencies/pnpm/pnpm.package-manager.ts

@@ -209,6 +209,7 @@ export class PnpmPackageManager implements PackageManager {
           peerDependencyRules: installOptions.peerDependencyRules,
         },
         returnListOfDepsRequiringBuild: installOptions.returnListOfDepsRequiringBuild,
+        forcedHarmonyVersion: installOptions.forcedHarmonyVersion,
       },
       this.logger
     );

scopes/workspace/install/install.main.runtime.ts

@@ -350,7 +350,7 @@ export class InstallMain {
     const compDirMap = await this.getComponentsDirectory([]);
     let installCycle = 0;
     let hasMissingLocalComponents = true;
-    const forceTeambitHarmonyLink = !this.dependencyResolver.hasHarmonyInRootPolicy();
+    const forcedHarmonyVersion = this.dependencyResolver.harmonyVersionInRootPolicy();
     /* eslint-disable no-await-in-loop */
     do {
       // In case there are missing local components,
@@ -366,7 +366,7 @@ export class InstallMain {
         {
           linkedDependencies,
           installTeambitBit: false,
-          forceTeambitHarmonyLink,
+          forcedHarmonyVersion,
         },
         pmInstallOptions
       );