@teambit/dependency-resolver 1.0.494 → 1.0.495

package/dist/dependency-resolver.main.runtime.d.ts

@@ -9,7 +9,7 @@ import { Logger } from '@teambit/logger';
 import { ExtensionDataList } from '@teambit/legacy.extension-data';
 import { ProxyConfig, NetworkConfig } from '@teambit/scope.network';
 import { onTagIdTransformer } from '@teambit/snapping';
-import { ConsumerComponent as LegacyComponent } from '@teambit/legacy.consumer-component';
+import { ConsumerComponent as LegacyComponent, Dependency as LegacyDependency } from '@teambit/legacy.consumer-component';
 import { ComponentID } from '@teambit/component-id';
 import { SourceFile } from '@teambit/component.sources';
 import { ProjectManifest } from '@pnpm/types';
@@ -302,13 +302,13 @@ export declare class DependencyResolverMain {
      */
     registerRootPolicy(policy: WorkspacePolicy): void;
     getComponentEnvPolicyFromExtension(configuredExtensions: ExtensionDataList): Promise<EnvPolicy>;
-    getEnvPolicyFromEnvId(id: ComponentID, legacyFiles?: SourceFile[]): Promise<EnvPolicy | undefined>;
+    getEnvPolicyFromEnvId(id: ComponentID, legacyFiles?: SourceFile[], envExtendsDeps?: LegacyDependency[]): Promise<EnvPolicy | undefined>;
     /**
      * @deprecated use getEnvPolicyFromEnvId instead (it's the same)
      */
     getEnvPolicyFromEnvLegacyId(id: ComponentID, legacyFiles?: SourceFile[]): Promise<EnvPolicy | undefined>;
     getComponentEnvPolicy(component: Component): Promise<EnvPolicy>;
-    getEnvManifest(envComponent?: Component, legacyFiles?: SourceFile[]): EnvPolicy | undefined;
+    getEnvManifest(envComponent?: Component, legacyFiles?: SourceFile[], envExtendsDeps?: LegacyDependency[]): Promise<EnvPolicy | undefined>;
     /**
      * Merge policy from parent and child env.jsonc files
      * The rule is that for each type of dependency (dev, runtime, peer) we check each item.
@@ -339,12 +339,12 @@ export declare class DependencyResolverMain {
      * 3. props defined by the user (they are the strongest one)
      * @param configuredExtensions
      */
-    mergeVariantPolicies(configuredExtensions: ExtensionDataList, id: ComponentID, legacyFiles?: SourceFile[]): Promise<VariantPolicy>;
+    mergeVariantPolicies(configuredExtensions: ExtensionDataList, id: ComponentID, legacyFiles?: SourceFile[], envExtendsDeps?: LegacyDependency[]): Promise<VariantPolicy>;
     /**
      * These are the policies that the env itself defines for itself.
      * So policies installed only locally for the env, not to any components that use the env.
      */
-    getPoliciesFromEnvForItself(id: ComponentID, legacyFiles?: SourceFile[]): Promise<VariantPolicy | undefined>;
+    getPoliciesFromEnvForItself(id: ComponentID, legacyFiles?: SourceFile[], envExtendsDeps?: LegacyDependency[]): Promise<VariantPolicy | undefined>;
     updateDepsOnLegacyTag(component: LegacyComponent, idTransformer: onTagIdTransformer): LegacyComponent;
     /**
      * Register a new dependency detector. Detectors allow to extend Bit's dependency detection

package/dist/dependency-resolver.main.runtime.js

@@ -1030,8 +1030,8 @@ class DependencyResolverMain {
       envId
     });
   }
-  async getEnvPolicyFromEnvId(id, legacyFiles) {
-    const fromFile = await this.getEnvPolicyFromFile(id.toString(), legacyFiles);
+  async getEnvPolicyFromEnvId(id, legacyFiles, envExtendsDeps) {
+    const fromFile = await this.getEnvPolicyFromFile(id.toString(), legacyFiles, envExtendsDeps);
     if (fromFile) return fromFile;
     const envDef = this.envs.getEnvDefinitionById(id);
     if (!envDef) return undefined;
@@ -1065,9 +1065,15 @@ class DependencyResolverMain {
       envId: envIdWithoutVersion
     });
   }
-  getEnvManifest(envComponent, legacyFiles) {
-    const object = this.envs.getEnvManifest(envComponent, legacyFiles);
-    const policy = object?.policy;
+  async getEnvManifest(envComponent, legacyFiles, envExtendsDeps) {
+    let envManifest;
+    if (envComponent) {
+      envManifest = await this.envs.getOrCalculateEnvManifest(envComponent, legacyFiles, envExtendsDeps);
+    }
+    if (!envManifest && legacyFiles) {
+      envManifest = await this.envs.calculateEnvManifest(undefined, legacyFiles, envExtendsDeps);
+    }
+    const policy = envManifest?.policy;
     if (!policy) return undefined;
     const allPoliciesFromEnv = _envPolicy().EnvPolicy.fromConfigObject(policy, {
       includeLegacyPeersInSelfPolicy: envComponent && this.envs.isCoreEnv(envComponent.id.toStringWithoutVersion())
@@ -1102,11 +1108,15 @@ class DependencyResolverMain {
       policy
     };
   }
-  async getEnvPolicyFromFile(envId, legacyFiles) {
+  async getEnvPolicyFromFile(envId, legacyFiles, envExtendsDeps) {
     const isCoreEnv = this.envs.isCoreEnv(envId);
     if (isCoreEnv) return undefined;
     if (legacyFiles) {
-      return this.getEnvManifest(undefined, legacyFiles);
+      const envJsonc = legacyFiles.find(file => file.basename === 'env.jsonc');
+      if (envJsonc) {
+        return this.getEnvManifest(undefined, legacyFiles, envExtendsDeps);
+      }
+      return undefined;
     }
     const envComponent = await this.envs.getEnvComponentByEnvId(envId, envId);
     return this.getEnvManifest(envComponent);
@@ -1156,7 +1166,7 @@ class DependencyResolverMain {
    * 3. props defined by the user (they are the strongest one)
    * @param configuredExtensions
    */
-  async mergeVariantPolicies(configuredExtensions, id, legacyFiles) {
+  async mergeVariantPolicies(configuredExtensions, id, legacyFiles, envExtendsDeps) {
     let policiesFromSlots = _policy().VariantPolicy.getEmpty();
     let policiesFromConfig = _policy().VariantPolicy.getEmpty();
     const policiesFromEnv = await this.getComponentEnvPolicyFromExtension(configuredExtensions);
@@ -1185,7 +1195,7 @@ class DependencyResolverMain {
         source: 'config'
       });
     }
-    const policiesFromEnvForItself = (await this.getPoliciesFromEnvForItself(id, legacyFiles)) ?? _policy().VariantPolicy.getEmpty();
+    const policiesFromEnvForItself = (await this.getPoliciesFromEnvForItself(id, legacyFiles, envExtendsDeps)) ?? _policy().VariantPolicy.getEmpty();
     const result = _policy().VariantPolicy.mergePolices([policiesFromEnv, policiesFromEnvForItself, policiesFromSlots, policiesFromConfig]);
     return result;
   }
@@ -1194,8 +1204,8 @@ class DependencyResolverMain {
    * These are the policies that the env itself defines for itself.
    * So policies installed only locally for the env, not to any components that use the env.
    */
-  async getPoliciesFromEnvForItself(id, legacyFiles) {
-    const envPolicy = await this.getEnvPolicyFromEnvId(id, legacyFiles);
+  async getPoliciesFromEnvForItself(id, legacyFiles, envExtendsDeps) {
+    const envPolicy = await this.getEnvPolicyFromEnvId(id, legacyFiles, envExtendsDeps);
     return envPolicy?.selfPolicy;
   }
   updateDepsOnLegacyTag(component, idTransformer) {
@@ -1426,12 +1436,14 @@ class DependencyResolverMain {
     // const packageManager = new PackageManagerLegacy(config.packageManager, logger);
     const logger = loggerExt.createLogger(_dependencyResolver().DependencyResolverAspect.id);
     const dependencyResolver = new DependencyResolverMain(config, rootPolicyRegistry, policiesRegistry, envs, logger, configMain, aspectLoader, globalConfig, componentAspect, packageManagerSlot, dependencyFactorySlot, preInstallSlot, postInstallSlot);
+    const envJsoncDetector = envs.getEnvJsoncDetector();
+    dependencyResolver.registerDetector(envJsoncDetector);
     componentAspect.registerShowFragments([new (_showFragments().DependenciesFragment)(dependencyResolver), new (_showFragments().DevDependenciesFragment)(dependencyResolver), new (_showFragments().PeerDependenciesFragment)(dependencyResolver)]);
     // TODO: solve this generics issue and remove the ts-ignore
     // @ts-ignore
     dependencyResolver.registerDependencyFactories([new (_dependencies2().ComponentDependencyFactory)(componentAspect)]);
-    _legacy3().ConsumerComponent.registerOnComponentOverridesLoading(_dependencyResolver().DependencyResolverAspect.id, async (configuredExtensions, id, legacyFiles) => {
-      const policy = await dependencyResolver.mergeVariantPolicies(configuredExtensions, id, legacyFiles);
+    _legacy3().ConsumerComponent.registerOnComponentOverridesLoading(_dependencyResolver().DependencyResolverAspect.id, async (configuredExtensions, id, legacyFiles, envExtendsDeps) => {
+      const policy = await dependencyResolver.mergeVariantPolicies(configuredExtensions, id, legacyFiles, envExtendsDeps);
       return policy.toLegacyDepsOverrides();
     });
     if (aspectLoader) aspectLoader.registerOnLoadRequireableExtensionSlot(dependencyResolver.onLoadRequireableExtensionSubscriber.bind(dependencyResolver));