@teambit/dependencies 1.0.637 → 1.0.639

package/dependencies-loader/dependencies-versions-resolver.ts

@@ -1,5 +1,6 @@
 import { ComponentID } from '@teambit/component-id';
 import semver from 'semver';
+import { isSnap } from '@teambit/component-version';
 import { Consumer } from '@teambit/legacy.consumer';
 import { Workspace } from '@teambit/workspace';
 import { logger } from '@teambit/legacy.logger';
@@ -25,7 +26,7 @@ export async function updateDependenciesVersions(
   const consumer: Consumer = workspace.consumer;
   const autoDetectConfigMerge = workspace.getAutoDetectConfigMerge(component.id) || {};
   const currentLane = await workspace.getCurrentLaneObject();
-  const componentRangePrefix  = depsResolver.calcComponentRangePrefixByConsumerComponent(component);
+  const componentRangePrefix = depsResolver.calcComponentRangePrefixByConsumerComponent(component);
   const supportComponentRange = componentRangePrefix && componentRangePrefix !== '-';
   updateDependencies(component.dependencies, 'dependencies');
   updateDependencies(component.devDependencies, 'devDependencies');
@@ -40,7 +41,7 @@ export async function updateDependenciesVersions(
    * running bit link --rewire).
    * 2: this gets called for extension-id.
    */
-  function resolveVersion(id: ComponentID, depType: DepType, pkg?: string): { version?: string, range?: string} {
+  function resolveVersion(id: ComponentID, depType: DepType, pkg?: string): { version?: string; range?: string } {
     const idFromBitMap = getIdFromBitMap(id);
     const idFromComponentConfig = getIdFromComponentConfig(id);
     const getFromComponentConfig = () => idFromComponentConfig;
@@ -60,8 +61,8 @@ export async function updateDependenciesVersions(
       return {
         compId: id,
         range: supportComponentRange && semver.validRange(fromPolicy) ? fromPolicy : undefined,
-      }
-    }
+      };
+    };
     // merge config here is only auto-detected ones. their priority is less then the ws policy
     // otherwise, imagine you merge a lane, you don't like the dependency you got from the other lane, you run
     // bit-install to change it, but it won't do anything.
@@ -89,9 +90,7 @@ export async function updateDependenciesVersions(
       if (!strategyId) continue;
       const version = strategyId instanceof ComponentID ? strategyId.version : strategyId.compId?.version;
       if (!version) continue;
-      logger.trace(
-        `found dependency version ${version} for ${id.toString()} in strategy ${strategy.name}`
-      );
+      logger.trace(`found dependency version ${version} for ${id.toString()} in strategy ${strategy.name}`);
       if (debugDep) {
         debugDep.versionResolvedFrom = strategy.name.replace('getFrom', '');
         debugDep.version = version;
@@ -105,16 +104,21 @@ export async function updateDependenciesVersions(
   function updateDependency(dependency: Dependency, depType: DepType) {
     const { id, packageName } = dependency;
     const { version: resolvedVersion, range } = resolveVersion(id, depType, packageName);
-    if (resolvedVersion) {
-      dependency.id = dependency.id.changeVersion(resolvedVersion);
-      if (supportComponentRange) {
-        if (range) dependency.versionRange = range;
-        else if (resolvedVersion !== 'latest' && (componentRangePrefix === '^' || componentRangePrefix === '~')) {
-          dependency.versionRange = `${componentRangePrefix}${resolvedVersion}`;
-        }
-      } else if (dependency.versionRange && depType !== 'peerDependencies' && dependency.versionRange !== '+') {
-        dependency.versionRange = undefined;
+    if (!resolvedVersion) {
+      return;
+    }
+    dependency.id = dependency.id.changeVersion(resolvedVersion);
+    if (supportComponentRange) {
+      if (range) dependency.versionRange = range;
+      else if (
+        resolvedVersion !== 'latest' &&
+        (componentRangePrefix === '^' || componentRangePrefix === '~') &&
+        !isSnap(resolvedVersion)
+      ) {
+        dependency.versionRange = `${componentRangePrefix}${resolvedVersion}`;
       }
+    } else if (dependency.versionRange && depType !== 'peerDependencies' && dependency.versionRange !== '+') {
+      dependency.versionRange = undefined;
     }
   }
   function updateDependencies(dependencies: Dependencies, depType: DepType) {
@@ -162,8 +166,11 @@ export async function updateDependenciesVersions(
   /**
    * config in .bitmap or component.json are resolved here.
    */
-  function resolveFromOverrides(id: ComponentID, depType: DepType, pkgName?: string):
-  { compId?: ComponentID; range?: string } | undefined {
+  function resolveFromOverrides(
+    id: ComponentID,
+    depType: DepType,
+    pkgName?: string
+  ): { compId?: ComponentID; range?: string } | undefined {
     if (!pkgName) return undefined;
     const dependencies = overridesDependencies.getDependenciesToAddManually();
     const found = dependencies?.[depType]?.[pkgName];

package/dist/dependencies-loader/dependencies-versions-resolver.js

@@ -18,6 +18,13 @@ function _semver() {
   };
   return data;
 }
+function _componentVersion() {
+  const data = require("@teambit/component-version");
+  _componentVersion = function () {
+    return data;
+  };
+  return data;
+}
 function _legacy() {
   const data = require("@teambit/legacy.logger");
   _legacy = function () {
@@ -124,15 +131,16 @@ async function updateDependenciesVersions(depsResolver, workspace, component, ov
       version: resolvedVersion,
       range
     } = resolveVersion(id, depType, packageName);
-    if (resolvedVersion) {
-      dependency.id = dependency.id.changeVersion(resolvedVersion);
-      if (supportComponentRange) {
-        if (range) dependency.versionRange = range;else if (resolvedVersion !== 'latest' && (componentRangePrefix === '^' || componentRangePrefix === '~')) {
-          dependency.versionRange = `${componentRangePrefix}${resolvedVersion}`;
-        }
-      } else if (dependency.versionRange && depType !== 'peerDependencies' && dependency.versionRange !== '+') {
-        dependency.versionRange = undefined;
+    if (!resolvedVersion) {
+      return;
+    }
+    dependency.id = dependency.id.changeVersion(resolvedVersion);
+    if (supportComponentRange) {
+      if (range) dependency.versionRange = range;else if (resolvedVersion !== 'latest' && (componentRangePrefix === '^' || componentRangePrefix === '~') && !(0, _componentVersion().isSnap)(resolvedVersion)) {
+        dependency.versionRange = `${componentRangePrefix}${resolvedVersion}`;
       }
+    } else if (dependency.versionRange && depType !== 'peerDependencies' && dependency.versionRange !== '+') {
+      dependency.versionRange = undefined;
     }
   }
   function updateDependencies(dependencies, depType) {

package/dist/dependencies-loader/dependencies-versions-resolver.js.map

@@ -1 +1 @@
-{"version":3,"names":["_componentId","data","require","_semver","_interopRequireDefault","_legacy","_lodash","_legacy2","_autoDetectDeps","e","__esModule","default","updateDependenciesVersions","depsResolver","workspace","component","overridesDependencies","autoDetectOverrides","debugDependencies","updateExtensionsVersions","consumer","autoDetectConfigMerge","getAutoDetectConfigMerge","id","currentLane","getCurrentLaneObject","componentRangePrefix","calcComponentRangePrefixByConsumerComponent","supportComponentRange","updateDependencies","dependencies","devDependencies","peerDependencies","updateExtensions","extensions","resolveVersion","depType","pkg","idFromBitMap","getIdFromBitMap","idFromComponentConfig","getIdFromComponentConfig","getFromComponentConfig","getFromBitMap","getFromUpdateDependentsOnLane","getIdFromUpdateDependentsOnLane","getFromOverrides","resolveFromOverrides","debugDep","find","dep","isEqualWithoutVersion","getFromDepPackageJson","hasVersion","getFromDepPackageJsonDueToWorkspacePolicy","fromPolicy","pkgVersionFromWorkspacePolicies","compId","range","semver","validRange","undefined","getFromMergeConfig","resolveFromMergeConfig","getFromDepPackageJsonDueToAutoDetectOverrides","isPkgInAutoDetectOverrides","getFromModel","getIdFromModelDeps","componentFromModel","strategies","strategy","strategyId","version","ComponentID","logger","trace","toString","name","versionResolvedFrom","replace","updateDependency","dependency","packageName","resolvedVersion","changeVersion","versionRange","get","forEach","updateExtension","extension","extensionId","componentId","getAllDependenciesIds","searchWithoutVersion","existingIds","bitmapIdsFromCurrentLane","filterWithoutVersion","length","updateDependents","overrides","getComponentDependenciesWithVersion","isEmpty","Object","keys","idStr","toStringWithoutVersion","pkgName","getDependenciesToAddManually","found","validVersion","getValidComponentVersion","DEPENDENCIES_FIELDS","some","depField","getWorkspacePolicyManifest","foundVersion","field","foundValidVersion"],"sources":["dependencies-versions-resolver.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { Consumer } from '@teambit/legacy.consumer';\nimport { Workspace } from '@teambit/workspace';\nimport { logger } from '@teambit/legacy.logger';\nimport { isEmpty } from 'lodash';\nimport { Dependency, Dependencies, ConsumerComponent as Component } from '@teambit/legacy.consumer-component';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy.extension-data';\nimport { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy.constants';\nimport OverridesDependencies from './overrides-dependencies';\nimport { DebugComponentsDependency, getValidComponentVersion } from './auto-detect-deps';\n\ntype DepType = 'dependencies' | 'devDependencies' | 'peerDependencies';\n\nexport async function updateDependenciesVersions(\n  depsResolver: DependencyResolverMain,\n  workspace: Workspace,\n  component: Component,\n  overridesDependencies: OverridesDependencies,\n  autoDetectOverrides?: Record<string, any>,\n  debugDependencies?: DebugComponentsDependency[],\n  updateExtensionsVersions = true\n) {\n  const consumer: Consumer = workspace.consumer;\n  const autoDetectConfigMerge = workspace.getAutoDetectConfigMerge(component.id) || {};\n  const currentLane = await workspace.getCurrentLaneObject();\n  const componentRangePrefix  = depsResolver.calcComponentRangePrefixByConsumerComponent(component);\n  const supportComponentRange = componentRangePrefix && componentRangePrefix !== '-';\n  updateDependencies(component.dependencies, 'dependencies');\n  updateDependencies(component.devDependencies, 'devDependencies');\n  updateDependencies(component.peerDependencies, 'peerDependencies');\n  if (updateExtensionsVersions) {\n    updateExtensions(component.extensions);\n  }\n\n  /**\n   * the `pkg` can be missing only in two scenarios:\n   * 1: the dependency is using relative-paths, not the module path. (which bit-status shows an error and suggests\n   * running bit link --rewire).\n   * 2: this gets called for extension-id.\n   */\n  function resolveVersion(id: ComponentID, depType: DepType, pkg?: string): { version?: string, range?: string} {\n    const idFromBitMap = getIdFromBitMap(id);\n    const idFromComponentConfig = getIdFromComponentConfig(id);\n    const getFromComponentConfig = () => idFromComponentConfig;\n    const getFromBitMap = () => idFromBitMap || null;\n    const getFromUpdateDependentsOnLane = () => getIdFromUpdateDependentsOnLane(id);\n    // later, change this to return the version from the overrides.\n    const getFromOverrides = () => resolveFromOverrides(id, depType, pkg);\n    const debugDep = debugDependencies?.find((dep) => dep.id.isEqualWithoutVersion(id));\n    // the id we get from the auto-detect is coming from the package.json of the dependency.\n    const getFromDepPackageJson = () => (id.hasVersion() ? id : null);\n    // In case it's resolved from the node_modules, and it's also in the ws policy or variants,\n    // use the resolved version from the node_modules / package folder\n    const getFromDepPackageJsonDueToWorkspacePolicy = () => {\n      if (!pkg || !id.hasVersion()) return null;\n      const fromPolicy = pkgVersionFromWorkspacePolicies(pkg);\n      if (!fromPolicy) return null;\n      return {\n        compId: id,\n        range: supportComponentRange && semver.validRange(fromPolicy) ? fromPolicy : undefined,\n      }\n    }\n    // merge config here is only auto-detected ones. their priority is less then the ws policy\n    // otherwise, imagine you merge a lane, you don't like the dependency you got from the other lane, you run\n    // bit-install to change it, but it won't do anything.\n    const getFromMergeConfig = () => (pkg ? resolveFromMergeConfig(id, pkg) : null);\n    const getFromDepPackageJsonDueToAutoDetectOverrides = () => (pkg && isPkgInAutoDetectOverrides(pkg) ? id : null);\n    // If there is a version in the node_modules/package folder, but it's not in the ws policy,\n    // prefer the version from the model over the version from the node_modules\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    const getFromModel = () => getIdFromModelDeps(component.componentFromModel!, id);\n\n    const strategies = [\n      getFromComponentConfig,\n      getFromOverrides,\n      getFromBitMap,\n      getFromUpdateDependentsOnLane,\n      getFromDepPackageJsonDueToWorkspacePolicy,\n      getFromMergeConfig,\n      getFromDepPackageJsonDueToAutoDetectOverrides,\n      getFromModel,\n      getFromDepPackageJson,\n    ];\n\n    for (const strategy of strategies) {\n      const strategyId = strategy();\n      if (!strategyId) continue;\n      const version = strategyId instanceof ComponentID ? strategyId.version : strategyId.compId?.version;\n      if (!version) continue;\n      logger.trace(\n        `found dependency version ${version} for ${id.toString()} in strategy ${strategy.name}`\n      );\n      if (debugDep) {\n        debugDep.versionResolvedFrom = strategy.name.replace('getFrom', '');\n        debugDep.version = version;\n      }\n\n      return { version, range: strategyId instanceof ComponentID ? undefined : strategyId.range };\n    }\n    return {};\n  }\n\n  function updateDependency(dependency: Dependency, depType: DepType) {\n    const { id, packageName } = dependency;\n    const { version: resolvedVersion, range } = resolveVersion(id, depType, packageName);\n    if (resolvedVersion) {\n      dependency.id = dependency.id.changeVersion(resolvedVersion);\n      if (supportComponentRange) {\n        if (range) dependency.versionRange = range;\n        else if (resolvedVersion !== 'latest' && (componentRangePrefix === '^' || componentRangePrefix === '~')) {\n          dependency.versionRange = `${componentRangePrefix}${resolvedVersion}`;\n        }\n      } else if (dependency.versionRange && depType !== 'peerDependencies' && dependency.versionRange !== '+') {\n        dependency.versionRange = undefined;\n      }\n    }\n  }\n  function updateDependencies(dependencies: Dependencies, depType: DepType) {\n    dependencies.get().forEach((dep) => updateDependency(dep, depType));\n  }\n\n  function updateExtension(extension: ExtensionDataEntry) {\n    if (extension.extensionId) {\n      const { version: resolvedVersion } = resolveVersion(extension.extensionId, 'devDependencies');\n      if (resolvedVersion) {\n        extension.extensionId = extension.extensionId.changeVersion(resolvedVersion);\n      }\n    }\n  }\n  function updateExtensions(extensions: ExtensionDataList) {\n    extensions.forEach(updateExtension);\n  }\n\n  function getIdFromModelDeps(componentFromModel: Component, componentId: ComponentID): ComponentID | null {\n    if (!componentFromModel) return null;\n    const dependency = componentFromModel.getAllDependenciesIds().searchWithoutVersion(componentId);\n    if (!dependency) return null;\n    return dependency;\n  }\n\n  function getIdFromBitMap(componentId: ComponentID): ComponentID | null | undefined {\n    const existingIds = consumer.bitmapIdsFromCurrentLane.filterWithoutVersion(componentId);\n    return existingIds.length === 1 ? existingIds[0] : undefined;\n  }\n\n  function getIdFromUpdateDependentsOnLane(id: ComponentID) {\n    const updateDependents = currentLane?.updateDependents;\n    if (!updateDependents) return undefined;\n    return updateDependents.find((dep) => dep.isEqualWithoutVersion(id));\n  }\n\n  function getIdFromComponentConfig(componentId: ComponentID): ComponentID | undefined {\n    const dependencies = component.overrides.getComponentDependenciesWithVersion();\n    if (isEmpty(dependencies)) return undefined;\n    const dependency = Object.keys(dependencies).find((idStr) => componentId.toStringWithoutVersion() === idStr);\n    if (!dependency) return undefined;\n    return componentId.changeVersion(dependencies[dependency]);\n  }\n\n  /**\n   * config in .bitmap or component.json are resolved here.\n   */\n  function resolveFromOverrides(id: ComponentID, depType: DepType, pkgName?: string):\n  { compId?: ComponentID; range?: string } | undefined {\n    if (!pkgName) return undefined;\n    const dependencies = overridesDependencies.getDependenciesToAddManually();\n    const found = dependencies?.[depType]?.[pkgName];\n    if (!found) return undefined;\n    const { version: validVersion, range } = getValidComponentVersion(found);\n    const compId = validVersion ? id.changeVersion(validVersion) : undefined;\n    return { compId, range };\n  }\n\n  function isPkgInAutoDetectOverrides(pkgName: string): boolean {\n    return DEPENDENCIES_FIELDS.some(\n      (depField) => autoDetectOverrides?.[depField] && autoDetectOverrides[depField][pkgName]\n    );\n  }\n\n  function pkgVersionFromWorkspacePolicies(pkgName: string): string | undefined {\n    return depsResolver.getWorkspacePolicyManifest().dependencies?.[pkgName];\n  }\n\n  function resolveFromMergeConfig(id: ComponentID, pkgName: string): ComponentID | undefined {\n    let foundVersion: string | undefined | null;\n    DEPENDENCIES_FIELDS.forEach((field) => {\n      if (autoDetectConfigMerge[field]?.[pkgName]) {\n        foundVersion = autoDetectConfigMerge[field]?.[pkgName];\n      }\n    });\n    const foundValidVersion = foundVersion ? getValidComponentVersion(foundVersion) : undefined;\n    return foundValidVersion?.version ? id.changeVersion(foundValidVersion.version) : undefined;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_componentId","data","require","_semver","_interopRequireDefault","_componentVersion","_legacy","_lodash","_legacy2","_autoDetectDeps","e","__esModule","default","updateDependenciesVersions","depsResolver","workspace","component","overridesDependencies","autoDetectOverrides","debugDependencies","updateExtensionsVersions","consumer","autoDetectConfigMerge","getAutoDetectConfigMerge","id","currentLane","getCurrentLaneObject","componentRangePrefix","calcComponentRangePrefixByConsumerComponent","supportComponentRange","updateDependencies","dependencies","devDependencies","peerDependencies","updateExtensions","extensions","resolveVersion","depType","pkg","idFromBitMap","getIdFromBitMap","idFromComponentConfig","getIdFromComponentConfig","getFromComponentConfig","getFromBitMap","getFromUpdateDependentsOnLane","getIdFromUpdateDependentsOnLane","getFromOverrides","resolveFromOverrides","debugDep","find","dep","isEqualWithoutVersion","getFromDepPackageJson","hasVersion","getFromDepPackageJsonDueToWorkspacePolicy","fromPolicy","pkgVersionFromWorkspacePolicies","compId","range","semver","validRange","undefined","getFromMergeConfig","resolveFromMergeConfig","getFromDepPackageJsonDueToAutoDetectOverrides","isPkgInAutoDetectOverrides","getFromModel","getIdFromModelDeps","componentFromModel","strategies","strategy","strategyId","version","ComponentID","logger","trace","toString","name","versionResolvedFrom","replace","updateDependency","dependency","packageName","resolvedVersion","changeVersion","versionRange","isSnap","get","forEach","updateExtension","extension","extensionId","componentId","getAllDependenciesIds","searchWithoutVersion","existingIds","bitmapIdsFromCurrentLane","filterWithoutVersion","length","updateDependents","overrides","getComponentDependenciesWithVersion","isEmpty","Object","keys","idStr","toStringWithoutVersion","pkgName","getDependenciesToAddManually","found","validVersion","getValidComponentVersion","DEPENDENCIES_FIELDS","some","depField","getWorkspacePolicyManifest","foundVersion","field","foundValidVersion"],"sources":["dependencies-versions-resolver.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { isSnap } from '@teambit/component-version';\nimport { Consumer } from '@teambit/legacy.consumer';\nimport { Workspace } from '@teambit/workspace';\nimport { logger } from '@teambit/legacy.logger';\nimport { isEmpty } from 'lodash';\nimport { Dependency, Dependencies, ConsumerComponent as Component } from '@teambit/legacy.consumer-component';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy.extension-data';\nimport { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy.constants';\nimport OverridesDependencies from './overrides-dependencies';\nimport { DebugComponentsDependency, getValidComponentVersion } from './auto-detect-deps';\n\ntype DepType = 'dependencies' | 'devDependencies' | 'peerDependencies';\n\nexport async function updateDependenciesVersions(\n  depsResolver: DependencyResolverMain,\n  workspace: Workspace,\n  component: Component,\n  overridesDependencies: OverridesDependencies,\n  autoDetectOverrides?: Record<string, any>,\n  debugDependencies?: DebugComponentsDependency[],\n  updateExtensionsVersions = true\n) {\n  const consumer: Consumer = workspace.consumer;\n  const autoDetectConfigMerge = workspace.getAutoDetectConfigMerge(component.id) || {};\n  const currentLane = await workspace.getCurrentLaneObject();\n  const componentRangePrefix = depsResolver.calcComponentRangePrefixByConsumerComponent(component);\n  const supportComponentRange = componentRangePrefix && componentRangePrefix !== '-';\n  updateDependencies(component.dependencies, 'dependencies');\n  updateDependencies(component.devDependencies, 'devDependencies');\n  updateDependencies(component.peerDependencies, 'peerDependencies');\n  if (updateExtensionsVersions) {\n    updateExtensions(component.extensions);\n  }\n\n  /**\n   * the `pkg` can be missing only in two scenarios:\n   * 1: the dependency is using relative-paths, not the module path. (which bit-status shows an error and suggests\n   * running bit link --rewire).\n   * 2: this gets called for extension-id.\n   */\n  function resolveVersion(id: ComponentID, depType: DepType, pkg?: string): { version?: string; range?: string } {\n    const idFromBitMap = getIdFromBitMap(id);\n    const idFromComponentConfig = getIdFromComponentConfig(id);\n    const getFromComponentConfig = () => idFromComponentConfig;\n    const getFromBitMap = () => idFromBitMap || null;\n    const getFromUpdateDependentsOnLane = () => getIdFromUpdateDependentsOnLane(id);\n    // later, change this to return the version from the overrides.\n    const getFromOverrides = () => resolveFromOverrides(id, depType, pkg);\n    const debugDep = debugDependencies?.find((dep) => dep.id.isEqualWithoutVersion(id));\n    // the id we get from the auto-detect is coming from the package.json of the dependency.\n    const getFromDepPackageJson = () => (id.hasVersion() ? id : null);\n    // In case it's resolved from the node_modules, and it's also in the ws policy or variants,\n    // use the resolved version from the node_modules / package folder\n    const getFromDepPackageJsonDueToWorkspacePolicy = () => {\n      if (!pkg || !id.hasVersion()) return null;\n      const fromPolicy = pkgVersionFromWorkspacePolicies(pkg);\n      if (!fromPolicy) return null;\n      return {\n        compId: id,\n        range: supportComponentRange && semver.validRange(fromPolicy) ? fromPolicy : undefined,\n      };\n    };\n    // merge config here is only auto-detected ones. their priority is less then the ws policy\n    // otherwise, imagine you merge a lane, you don't like the dependency you got from the other lane, you run\n    // bit-install to change it, but it won't do anything.\n    const getFromMergeConfig = () => (pkg ? resolveFromMergeConfig(id, pkg) : null);\n    const getFromDepPackageJsonDueToAutoDetectOverrides = () => (pkg && isPkgInAutoDetectOverrides(pkg) ? id : null);\n    // If there is a version in the node_modules/package folder, but it's not in the ws policy,\n    // prefer the version from the model over the version from the node_modules\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    const getFromModel = () => getIdFromModelDeps(component.componentFromModel!, id);\n\n    const strategies = [\n      getFromComponentConfig,\n      getFromOverrides,\n      getFromBitMap,\n      getFromUpdateDependentsOnLane,\n      getFromDepPackageJsonDueToWorkspacePolicy,\n      getFromMergeConfig,\n      getFromDepPackageJsonDueToAutoDetectOverrides,\n      getFromModel,\n      getFromDepPackageJson,\n    ];\n\n    for (const strategy of strategies) {\n      const strategyId = strategy();\n      if (!strategyId) continue;\n      const version = strategyId instanceof ComponentID ? strategyId.version : strategyId.compId?.version;\n      if (!version) continue;\n      logger.trace(`found dependency version ${version} for ${id.toString()} in strategy ${strategy.name}`);\n      if (debugDep) {\n        debugDep.versionResolvedFrom = strategy.name.replace('getFrom', '');\n        debugDep.version = version;\n      }\n\n      return { version, range: strategyId instanceof ComponentID ? undefined : strategyId.range };\n    }\n    return {};\n  }\n\n  function updateDependency(dependency: Dependency, depType: DepType) {\n    const { id, packageName } = dependency;\n    const { version: resolvedVersion, range } = resolveVersion(id, depType, packageName);\n    if (!resolvedVersion) {\n      return;\n    }\n    dependency.id = dependency.id.changeVersion(resolvedVersion);\n    if (supportComponentRange) {\n      if (range) dependency.versionRange = range;\n      else if (\n        resolvedVersion !== 'latest' &&\n        (componentRangePrefix === '^' || componentRangePrefix === '~') &&\n        !isSnap(resolvedVersion)\n      ) {\n        dependency.versionRange = `${componentRangePrefix}${resolvedVersion}`;\n      }\n    } else if (dependency.versionRange && depType !== 'peerDependencies' && dependency.versionRange !== '+') {\n      dependency.versionRange = undefined;\n    }\n  }\n  function updateDependencies(dependencies: Dependencies, depType: DepType) {\n    dependencies.get().forEach((dep) => updateDependency(dep, depType));\n  }\n\n  function updateExtension(extension: ExtensionDataEntry) {\n    if (extension.extensionId) {\n      const { version: resolvedVersion } = resolveVersion(extension.extensionId, 'devDependencies');\n      if (resolvedVersion) {\n        extension.extensionId = extension.extensionId.changeVersion(resolvedVersion);\n      }\n    }\n  }\n  function updateExtensions(extensions: ExtensionDataList) {\n    extensions.forEach(updateExtension);\n  }\n\n  function getIdFromModelDeps(componentFromModel: Component, componentId: ComponentID): ComponentID | null {\n    if (!componentFromModel) return null;\n    const dependency = componentFromModel.getAllDependenciesIds().searchWithoutVersion(componentId);\n    if (!dependency) return null;\n    return dependency;\n  }\n\n  function getIdFromBitMap(componentId: ComponentID): ComponentID | null | undefined {\n    const existingIds = consumer.bitmapIdsFromCurrentLane.filterWithoutVersion(componentId);\n    return existingIds.length === 1 ? existingIds[0] : undefined;\n  }\n\n  function getIdFromUpdateDependentsOnLane(id: ComponentID) {\n    const updateDependents = currentLane?.updateDependents;\n    if (!updateDependents) return undefined;\n    return updateDependents.find((dep) => dep.isEqualWithoutVersion(id));\n  }\n\n  function getIdFromComponentConfig(componentId: ComponentID): ComponentID | undefined {\n    const dependencies = component.overrides.getComponentDependenciesWithVersion();\n    if (isEmpty(dependencies)) return undefined;\n    const dependency = Object.keys(dependencies).find((idStr) => componentId.toStringWithoutVersion() === idStr);\n    if (!dependency) return undefined;\n    return componentId.changeVersion(dependencies[dependency]);\n  }\n\n  /**\n   * config in .bitmap or component.json are resolved here.\n   */\n  function resolveFromOverrides(\n    id: ComponentID,\n    depType: DepType,\n    pkgName?: string\n  ): { compId?: ComponentID; range?: string } | undefined {\n    if (!pkgName) return undefined;\n    const dependencies = overridesDependencies.getDependenciesToAddManually();\n    const found = dependencies?.[depType]?.[pkgName];\n    if (!found) return undefined;\n    const { version: validVersion, range } = getValidComponentVersion(found);\n    const compId = validVersion ? id.changeVersion(validVersion) : undefined;\n    return { compId, range };\n  }\n\n  function isPkgInAutoDetectOverrides(pkgName: string): boolean {\n    return DEPENDENCIES_FIELDS.some(\n      (depField) => autoDetectOverrides?.[depField] && autoDetectOverrides[depField][pkgName]\n    );\n  }\n\n  function pkgVersionFromWorkspacePolicies(pkgName: string): string | undefined {\n    return depsResolver.getWorkspacePolicyManifest().dependencies?.[pkgName];\n  }\n\n  function resolveFromMergeConfig(id: ComponentID, pkgName: string): ComponentID | undefined {\n    let foundVersion: string | undefined | null;\n    DEPENDENCIES_FIELDS.forEach((field) => {\n      if (autoDetectConfigMerge[field]?.[pkgName]) {\n        foundVersion = autoDetectConfigMerge[field]?.[pkgName];\n      }\n    });\n    const foundValidVersion = foundVersion ? getValidComponentVersion(foundVersion) : undefined;\n    return foundValidVersion?.version ? id.changeVersion(foundValidVersion.version) : undefined;\n  }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,aAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,YAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,QAAA;EAAA,MAAAF,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,kBAAA;EAAA,MAAAJ,IAAA,GAAAC,OAAA;EAAAG,iBAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAK,QAAA;EAAA,MAAAL,IAAA,GAAAC,OAAA;EAAAI,OAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,QAAA;EAAA,MAAAN,IAAA,GAAAC,OAAA;EAAAK,OAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA,SAAAO,SAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,QAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAQ,gBAAA;EAAA,MAAAR,IAAA,GAAAC,OAAA;EAAAO,eAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAyF,SAAAG,uBAAAM,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAIlF,eAAeG,0BAA0BA,CAC9CC,YAAoC,EACpCC,SAAoB,EACpBC,SAAoB,EACpBC,qBAA4C,EAC5CC,mBAAyC,EACzCC,iBAA+C,EAC/CC,wBAAwB,GAAG,IAAI,EAC/B;EACA,MAAMC,QAAkB,GAAGN,SAAS,CAACM,QAAQ;EAC7C,MAAMC,qBAAqB,GAAGP,SAAS,CAACQ,wBAAwB,CAACP,SAAS,CAACQ,EAAE,CAAC,IAAI,CAAC,CAAC;EACpF,MAAMC,WAAW,GAAG,MAAMV,SAAS,CAACW,oBAAoB,CAAC,CAAC;EAC1D,MAAMC,oBAAoB,GAAGb,YAAY,CAACc,2CAA2C,CAACZ,SAAS,CAAC;EAChG,MAAMa,qBAAqB,GAAGF,oBAAoB,IAAIA,oBAAoB,KAAK,GAAG;EAClFG,kBAAkB,CAACd,SAAS,CAACe,YAAY,EAAE,cAAc,CAAC;EAC1DD,kBAAkB,CAACd,SAAS,CAACgB,eAAe,EAAE,iBAAiB,CAAC;EAChEF,kBAAkB,CAACd,SAAS,CAACiB,gBAAgB,EAAE,kBAAkB,CAAC;EAClE,IAAIb,wBAAwB,EAAE;IAC5Bc,gBAAgB,CAAClB,SAAS,CAACmB,UAAU,CAAC;EACxC;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,SAASC,cAAcA,CAACZ,EAAe,EAAEa,OAAgB,EAAEC,GAAY,EAAwC;IAC7G,MAAMC,YAAY,GAAGC,eAAe,CAAChB,EAAE,CAAC;IACxC,MAAMiB,qBAAqB,GAAGC,wBAAwB,CAAClB,EAAE,CAAC;IAC1D,MAAMmB,sBAAsB,GAAGA,CAAA,KAAMF,qBAAqB;IAC1D,MAAMG,aAAa,GAAGA,CAAA,KAAML,YAAY,IAAI,IAAI;IAChD,MAAMM,6BAA6B,GAAGA,CAAA,KAAMC,+BAA+B,CAACtB,EAAE,CAAC;IAC/E;IACA,MAAMuB,gBAAgB,GAAGA,CAAA,KAAMC,oBAAoB,CAACxB,EAAE,EAAEa,OAAO,EAAEC,GAAG,CAAC;IACrE,MAAMW,QAAQ,GAAG9B,iBAAiB,EAAE+B,IAAI,CAAEC,GAAG,IAAKA,GAAG,CAAC3B,EAAE,CAAC4B,qBAAqB,CAAC5B,EAAE,CAAC,CAAC;IACnF;IACA,MAAM6B,qBAAqB,GAAGA,CAAA,KAAO7B,EAAE,CAAC8B,UAAU,CAAC,CAAC,GAAG9B,EAAE,GAAG,IAAK;IACjE;IACA;IACA,MAAM+B,yCAAyC,GAAGA,CAAA,KAAM;MACtD,IAAI,CAACjB,GAAG,IAAI,CAACd,EAAE,CAAC8B,UAAU,CAAC,CAAC,EAAE,OAAO,IAAI;MACzC,MAAME,UAAU,GAAGC,+BAA+B,CAACnB,GAAG,CAAC;MACvD,IAAI,CAACkB,UAAU,EAAE,OAAO,IAAI;MAC5B,OAAO;QACLE,MAAM,EAAElC,EAAE;QACVmC,KAAK,EAAE9B,qBAAqB,IAAI+B,iBAAM,CAACC,UAAU,CAACL,UAAU,CAAC,GAAGA,UAAU,GAAGM;MAC/E,CAAC;IACH,CAAC;IACD;IACA;IACA;IACA,MAAMC,kBAAkB,GAAGA,CAAA,KAAOzB,GAAG,GAAG0B,sBAAsB,CAACxC,EAAE,EAAEc,GAAG,CAAC,GAAG,IAAK;IAC/E,MAAM2B,6CAA6C,GAAGA,CAAA,KAAO3B,GAAG,IAAI4B,0BAA0B,CAAC5B,GAAG,CAAC,GAAGd,EAAE,GAAG,IAAK;IAChH;IACA;IACA;IACA,MAAM2C,YAAY,GAAGA,CAAA,KAAMC,kBAAkB,CAACpD,SAAS,CAACqD,kBAAkB,EAAG7C,EAAE,CAAC;IAEhF,MAAM8C,UAAU,GAAG,CACjB3B,sBAAsB,EACtBI,gBAAgB,EAChBH,aAAa,EACbC,6BAA6B,EAC7BU,yCAAyC,EACzCQ,kBAAkB,EAClBE,6CAA6C,EAC7CE,YAAY,EACZd,qBAAqB,CACtB;IAED,KAAK,MAAMkB,QAAQ,IAAID,UAAU,EAAE;MACjC,MAAME,UAAU,GAAGD,QAAQ,CAAC,CAAC;MAC7B,IAAI,CAACC,UAAU,EAAE;MACjB,MAAMC,OAAO,GAAGD,UAAU,YAAYE,0BAAW,GAAGF,UAAU,CAACC,OAAO,GAAGD,UAAU,CAACd,MAAM,EAAEe,OAAO;MACnG,IAAI,CAACA,OAAO,EAAE;MACdE,gBAAM,CAACC,KAAK,CAAC,4BAA4BH,OAAO,QAAQjD,EAAE,CAACqD,QAAQ,CAAC,CAAC,gBAAgBN,QAAQ,CAACO,IAAI,EAAE,CAAC;MACrG,IAAI7B,QAAQ,EAAE;QACZA,QAAQ,CAAC8B,mBAAmB,GAAGR,QAAQ,CAACO,IAAI,CAACE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;QACnE/B,QAAQ,CAACwB,OAAO,GAAGA,OAAO;MAC5B;MAEA,OAAO;QAAEA,OAAO;QAAEd,KAAK,EAAEa,UAAU,YAAYE,0BAAW,GAAGZ,SAAS,GAAGU,UAAU,CAACb;MAAM,CAAC;IAC7F;IACA,OAAO,CAAC,CAAC;EACX;EAEA,SAASsB,gBAAgBA,CAACC,UAAsB,EAAE7C,OAAgB,EAAE;IAClE,MAAM;MAAEb,EAAE;MAAE2D;IAAY,CAAC,GAAGD,UAAU;IACtC,MAAM;MAAET,OAAO,EAAEW,eAAe;MAAEzB;IAAM,CAAC,GAAGvB,cAAc,CAACZ,EAAE,EAAEa,OAAO,EAAE8C,WAAW,CAAC;IACpF,IAAI,CAACC,eAAe,EAAE;MACpB;IACF;IACAF,UAAU,CAAC1D,EAAE,GAAG0D,UAAU,CAAC1D,EAAE,CAAC6D,aAAa,CAACD,eAAe,CAAC;IAC5D,IAAIvD,qBAAqB,EAAE;MACzB,IAAI8B,KAAK,EAAEuB,UAAU,CAACI,YAAY,GAAG3B,KAAK,CAAC,KACtC,IACHyB,eAAe,KAAK,QAAQ,KAC3BzD,oBAAoB,KAAK,GAAG,IAAIA,oBAAoB,KAAK,GAAG,CAAC,IAC9D,CAAC,IAAA4D,0BAAM,EAACH,eAAe,CAAC,EACxB;QACAF,UAAU,CAACI,YAAY,GAAG,GAAG3D,oBAAoB,GAAGyD,eAAe,EAAE;MACvE;IACF,CAAC,MAAM,IAAIF,UAAU,CAACI,YAAY,IAAIjD,OAAO,KAAK,kBAAkB,IAAI6C,UAAU,CAACI,YAAY,KAAK,GAAG,EAAE;MACvGJ,UAAU,CAACI,YAAY,GAAGxB,SAAS;IACrC;EACF;EACA,SAAShC,kBAAkBA,CAACC,YAA0B,EAAEM,OAAgB,EAAE;IACxEN,YAAY,CAACyD,GAAG,CAAC,CAAC,CAACC,OAAO,CAAEtC,GAAG,IAAK8B,gBAAgB,CAAC9B,GAAG,EAAEd,OAAO,CAAC,CAAC;EACrE;EAEA,SAASqD,eAAeA,CAACC,SAA6B,EAAE;IACtD,IAAIA,SAAS,CAACC,WAAW,EAAE;MACzB,MAAM;QAAEnB,OAAO,EAAEW;MAAgB,CAAC,GAAGhD,cAAc,CAACuD,SAAS,CAACC,WAAW,EAAE,iBAAiB,CAAC;MAC7F,IAAIR,eAAe,EAAE;QACnBO,SAAS,CAACC,WAAW,GAAGD,SAAS,CAACC,WAAW,CAACP,aAAa,CAACD,eAAe,CAAC;MAC9E;IACF;EACF;EACA,SAASlD,gBAAgBA,CAACC,UAA6B,EAAE;IACvDA,UAAU,CAACsD,OAAO,CAACC,eAAe,CAAC;EACrC;EAEA,SAAStB,kBAAkBA,CAACC,kBAA6B,EAAEwB,WAAwB,EAAsB;IACvG,IAAI,CAACxB,kBAAkB,EAAE,OAAO,IAAI;IACpC,MAAMa,UAAU,GAAGb,kBAAkB,CAACyB,qBAAqB,CAAC,CAAC,CAACC,oBAAoB,CAACF,WAAW,CAAC;IAC/F,IAAI,CAACX,UAAU,EAAE,OAAO,IAAI;IAC5B,OAAOA,UAAU;EACnB;EAEA,SAAS1C,eAAeA,CAACqD,WAAwB,EAAkC;IACjF,MAAMG,WAAW,GAAG3E,QAAQ,CAAC4E,wBAAwB,CAACC,oBAAoB,CAACL,WAAW,CAAC;IACvF,OAAOG,WAAW,CAACG,MAAM,KAAK,CAAC,GAAGH,WAAW,CAAC,CAAC,CAAC,GAAGlC,SAAS;EAC9D;EAEA,SAAShB,+BAA+BA,CAACtB,EAAe,EAAE;IACxD,MAAM4E,gBAAgB,GAAG3E,WAAW,EAAE2E,gBAAgB;IACtD,IAAI,CAACA,gBAAgB,EAAE,OAAOtC,SAAS;IACvC,OAAOsC,gBAAgB,CAAClD,IAAI,CAAEC,GAAG,IAAKA,GAAG,CAACC,qBAAqB,CAAC5B,EAAE,CAAC,CAAC;EACtE;EAEA,SAASkB,wBAAwBA,CAACmD,WAAwB,EAA2B;IACnF,MAAM9D,YAAY,GAAGf,SAAS,CAACqF,SAAS,CAACC,mCAAmC,CAAC,CAAC;IAC9E,IAAI,IAAAC,iBAAO,EAACxE,YAAY,CAAC,EAAE,OAAO+B,SAAS;IAC3C,MAAMoB,UAAU,GAAGsB,MAAM,CAACC,IAAI,CAAC1E,YAAY,CAAC,CAACmB,IAAI,CAAEwD,KAAK,IAAKb,WAAW,CAACc,sBAAsB,CAAC,CAAC,KAAKD,KAAK,CAAC;IAC5G,IAAI,CAACxB,UAAU,EAAE,OAAOpB,SAAS;IACjC,OAAO+B,WAAW,CAACR,aAAa,CAACtD,YAAY,CAACmD,UAAU,CAAC,CAAC;EAC5D;;EAEA;AACF;AACA;EACE,SAASlC,oBAAoBA,CAC3BxB,EAAe,EACfa,OAAgB,EAChBuE,OAAgB,EACsC;IACtD,IAAI,CAACA,OAAO,EAAE,OAAO9C,SAAS;IAC9B,MAAM/B,YAAY,GAAGd,qBAAqB,CAAC4F,4BAA4B,CAAC,CAAC;IACzE,MAAMC,KAAK,GAAG/E,YAAY,GAAGM,OAAO,CAAC,GAAGuE,OAAO,CAAC;IAChD,IAAI,CAACE,KAAK,EAAE,OAAOhD,SAAS;IAC5B,MAAM;MAAEW,OAAO,EAAEsC,YAAY;MAAEpD;IAAM,CAAC,GAAG,IAAAqD,0CAAwB,EAACF,KAAK,CAAC;IACxE,MAAMpD,MAAM,GAAGqD,YAAY,GAAGvF,EAAE,CAAC6D,aAAa,CAAC0B,YAAY,CAAC,GAAGjD,SAAS;IACxE,OAAO;MAAEJ,MAAM;MAAEC;IAAM,CAAC;EAC1B;EAEA,SAASO,0BAA0BA,CAAC0C,OAAe,EAAW;IAC5D,OAAOK,8BAAmB,CAACC,IAAI,CAC5BC,QAAQ,IAAKjG,mBAAmB,GAAGiG,QAAQ,CAAC,IAAIjG,mBAAmB,CAACiG,QAAQ,CAAC,CAACP,OAAO,CACxF,CAAC;EACH;EAEA,SAASnD,+BAA+BA,CAACmD,OAAe,EAAsB;IAC5E,OAAO9F,YAAY,CAACsG,0BAA0B,CAAC,CAAC,CAACrF,YAAY,GAAG6E,OAAO,CAAC;EAC1E;EAEA,SAAS5C,sBAAsBA,CAACxC,EAAe,EAAEoF,OAAe,EAA2B;IACzF,IAAIS,YAAuC;IAC3CJ,8BAAmB,CAACxB,OAAO,CAAE6B,KAAK,IAAK;MACrC,IAAIhG,qBAAqB,CAACgG,KAAK,CAAC,GAAGV,OAAO,CAAC,EAAE;QAC3CS,YAAY,GAAG/F,qBAAqB,CAACgG,KAAK,CAAC,GAAGV,OAAO,CAAC;MACxD;IACF,CAAC,CAAC;IACF,MAAMW,iBAAiB,GAAGF,YAAY,GAAG,IAAAL,0CAAwB,EAACK,YAAY,CAAC,GAAGvD,SAAS;IAC3F,OAAOyD,iBAAiB,EAAE9C,OAAO,GAAGjD,EAAE,CAAC6D,aAAa,CAACkC,iBAAiB,CAAC9C,OAAO,CAAC,GAAGX,SAAS;EAC7F;AACF","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/dependencies",
-  "version": "1.0.637",
+  "version": "1.0.639",
   "homepage": "https://bit.cloud/teambit/dependencies/dependencies",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.dependencies",
     "name": "dependencies",
-    "version": "1.0.637"
+    "version": "1.0.639"
   },
   "dependencies": {
     "archy": "1.0.0",
@@ -38,28 +38,28 @@
     "@teambit/styling.deps-detectors.detective-sass": "0.0.9",
     "@teambit/styling.deps-detectors.detective-scss": "0.0.9",
     "@teambit/typescript.deps-detectors.detective-typescript": "0.0.9",
-    "@teambit/cli": "0.0.1214",
-    "@teambit/graph": "1.0.637",
+    "@teambit/cli": "0.0.1216",
+    "@teambit/graph": "1.0.639",
     "@teambit/legacy.constants": "0.0.11",
-    "@teambit/workspace": "1.0.637",
-    "@teambit/aspect-loader": "1.0.637",
+    "@teambit/workspace": "1.0.639",
+    "@teambit/aspect-loader": "1.0.639",
     "@teambit/component-package-version": "0.0.438",
-    "@teambit/dependency-resolver": "1.0.637",
-    "@teambit/dev-files": "1.0.637",
-    "@teambit/legacy.consumer-component": "0.0.53",
-    "@teambit/logger": "0.0.1307",
-    "@teambit/scope": "1.0.637",
-    "@teambit/legacy.dependency-graph": "0.0.55",
-    "@teambit/component.sources": "0.0.104",
+    "@teambit/dependency-resolver": "1.0.639",
+    "@teambit/dev-files": "1.0.639",
+    "@teambit/legacy.consumer-component": "0.0.54",
+    "@teambit/logger": "0.0.1309",
+    "@teambit/scope": "1.0.639",
+    "@teambit/legacy.dependency-graph": "0.0.56",
+    "@teambit/component.sources": "0.0.105",
     "@teambit/legacy.utils": "0.0.21",
     "@teambit/toolbox.path.path": "0.0.8",
     "@teambit/component-issues": "0.0.159",
-    "@teambit/legacy.bit-map": "0.0.109",
-    "@teambit/legacy.consumer-config": "0.0.52",
-    "@teambit/legacy.consumer": "0.0.52",
+    "@teambit/legacy.bit-map": "0.0.110",
+    "@teambit/legacy.consumer-config": "0.0.53",
+    "@teambit/legacy.consumer": "0.0.53",
     "@teambit/legacy.logger": "0.0.19",
     "@teambit/toolbox.fs.extension-getter": "0.0.5",
-    "@teambit/legacy.extension-data": "0.0.54",
+    "@teambit/legacy.extension-data": "0.0.55",
     "@teambit/toolbox.fs.last-modified": "0.0.5"
   },
   "devDependencies": {
@@ -72,9 +72,9 @@
     "@types/mocha": "9.1.0",
     "@teambit/defender.fs.global-bit-temp-dir": "0.0.1",
     "@teambit/harmony.envs.core-aspect-env": "0.0.69",
-    "@teambit/component.testing.mock-components": "0.0.315",
-    "@teambit/harmony.testing.load-aspect": "0.0.310",
-    "@teambit/workspace.testing.mock-workspace": "0.0.91"
+    "@teambit/component.testing.mock-components": "0.0.316",
+    "@teambit/harmony.testing.load-aspect": "0.0.311",
+    "@teambit/workspace.testing.mock-workspace": "0.0.92"
   },
   "peerDependencies": {
     "chai": "4.3.0",