@teambit/dependency-resolver 1.0.957 → 1.0.959

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

@@ -22,7 +22,7 @@ import { DependencyVersionResolver } from './dependency-version-resolver';
 import type { DepLinkerContext, LinkingOptions } from './dependency-linker';
 import { DependencyLinker } from './dependency-linker';
 import type { ComponentRangePrefix, DependencyResolverWorkspaceConfig, NodeLinker } from './dependency-resolver-workspace-config';
-import type { CurrentPkg, OutdatedPkg } from './get-all-policy-pkgs';
+import type { CurrentPkg, OutdatedPkg, CurrentPkgSource } from './get-all-policy-pkgs';
 import type { CreateFromComponentsOptions, WorkspaceManifest, ManifestDependenciesObject } from './manifest';
 import type { WorkspacePolicyConfigObject, VariantPolicyConfigObject, WorkspacePolicyAddEntryOptions, WorkspacePolicyEntry, SerializedVariantPolicy } from './policy';
 import { WorkspacePolicy, VariantPolicy } from './policy';
@@ -423,14 +423,16 @@ export declare class DependencyResolverMain {
         patterns?: string[];
         forceVersionBump?: 'major' | 'minor' | 'patch' | 'compatible';
     }): Promise<MergedOutdatedPkg[] | null>;
-    getAllDependencies({ variantPoliciesByPatterns, componentPolicies, components, }: {
+    getAllDependencies({ variantPoliciesByPatterns, componentPolicies, components, includeEnvJsoncDeps, }: {
         variantPoliciesByPatterns: Record<string, VariantPolicyConfigObject>;
         componentPolicies: Array<{
             componentId: ComponentID;
             policy: any;
         }>;
         components: Component[];
+        includeEnvJsoncDeps?: boolean;
     }): CurrentPkg[];
+    getEnvJsoncPolicyPkgs(components: Component[]): CurrentPkg[];
     getAllDedupedDirectDependencies(opts: {
         variantPoliciesByPatterns: Record<string, VariantPolicyConfigObject>;
         componentPolicies: Array<{
@@ -455,7 +457,7 @@ export declare class DependencyResolverMain {
     }, pkgs: Array<{
         name: string;
         currentRange: string;
-        source: 'variants' | 'component' | 'rootPolicy' | 'component-model';
+        source: CurrentPkgSource;
     } & T>): Promise<Array<{
         name: string;
         currentRange: string;
@@ -476,7 +478,7 @@ export declare class DependencyResolverMain {
     static runtime: import("@teambit/harmony").RuntimeDefinition;
     static dependencies: Aspect[];
     static slots: (((registerFn: () => string) => SlotRegistry<WorkspacePolicy>) | ((registerFn: () => string) => SlotRegistry<Partial<Record<keyof import("./policy").PolicyConfigKeys, {
-        [dependencyId: string]: import("./policy/variant-policy/variant-policy").VariantPolicyConfigEntryValue;
+        [dependencyId: string]: import("./policy").VariantPolicyConfigEntryValue;
     }>>>) | ((registerFn: () => string) => SlotRegistry<PackageManager>) | ((registerFn: () => string) => SlotRegistry<RegExp>) | ((registerFn: () => string) => SlotRegistry<DependencyFactory>) | ((registerFn: () => string) => SlotRegistry<PreInstallSubscriberList>) | ((registerFn: () => string) => SlotRegistry<DependencyDetector>) | ((registerFn: () => string) => SlotRegistry<AddPackagesToLinkSlot>))[];
     static defaultConfig: DependencyResolverWorkspaceConfig & Required<Pick<DependencyResolverWorkspaceConfig, 'linkCoreAspects'>>;
     static provider([envs, loggerExt, configMain, aspectLoader, componentAspect, graphql, configStore]: [

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

@@ -351,7 +351,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /* eslint-disable max-lines */
 const BIT_CLOUD_REGISTRY = exports.BIT_CLOUD_REGISTRY = `https://node-registry.${(0, _legacy().getCloudDomain)()}/`;
 const NPM_REGISTRY = exports.NPM_REGISTRY = 'https://registry.npmjs.org/';
 const defaultLinkingOptions = {
@@ -1458,7 +1458,8 @@ as an alternative, you can use "+" to keep the same version installed in the wor
     let allPkgs = this.getAllDependencies({
       variantPoliciesByPatterns,
       componentPolicies,
-      components
+      components,
+      includeEnvJsoncDeps: true
     });
     if (patterns?.length) {
       const selectedPkgNames = new Set((0, _multimatch().default)(allPkgs.map(({
@@ -1480,7 +1481,8 @@ as an alternative, you can use "+" to keep the same version installed in the wor
   getAllDependencies({
     variantPoliciesByPatterns,
     componentPolicies,
-    components
+    components,
+    includeEnvJsoncDeps = false
   }) {
     const localComponentPkgNames = new Set(components.map(component => this.getPackageName(component)));
     const componentModelVersions = components.map(component => {
@@ -1498,12 +1500,56 @@ as an alternative, you can use "+" to keep the same version installed in the wor
         lifecycleType: dep.lifecycle
       }));
     }).flat();
-    return (0, _getAllPolicyPkgs().getAllPolicyPkgs)({
+    return [...(0, _getAllPolicyPkgs().getAllPolicyPkgs)({
       rootPolicy: this.getWorkspacePolicyFromConfig(),
       variantPoliciesByPatterns,
       componentPolicies,
       componentModelVersions
-    });
+    }), ...(includeEnvJsoncDeps ? this.getEnvJsoncPolicyPkgs(components) : [])];
+  }
+  getEnvJsoncPolicyPkgs(components) {
+    const policies = [{
+      field: 'peers',
+      targetField: 'peerDependencies'
+    }, {
+      field: 'dev',
+      targetField: 'devDependencies'
+    }, {
+      field: 'runtime',
+      targetField: 'dependencies'
+    }];
+    const pkgs = [];
+    for (const component of components) {
+      const isEnv = this.envs.isEnv(component);
+      if (!isEnv) continue;
+      const envJsoncFile = component.filesystem.files.find(file => file.relative === 'env.jsonc');
+      if (!envJsoncFile) continue;
+      let envJsonc;
+      try {
+        envJsonc = (0, _commentJson().parse)(envJsoncFile.contents.toString());
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        this.logger.warn(`Failed to parse env.jsonc for component ${component.id.toString()}: ${errorMessage}`);
+        continue;
+      }
+      if (!envJsonc.policy) continue;
+      for (const {
+        field,
+        targetField
+      } of policies) {
+        const deps = envJsonc.policy?.[field] || [];
+        for (const dep of deps) {
+          pkgs.push({
+            name: dep.name,
+            currentRange: dep.version,
+            source: 'env-jsonc',
+            componentId: component.id,
+            targetField
+          });
+        }
+      }
+    }
+    return pkgs;
   }
   getAllDedupedDirectDependencies(opts) {
     const allDeps = this.getAllDependencies(opts);