@teambit/dependencies 1.0.579 → 1.0.581

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dependencies-loader/dependencies-loader.ts +1 -1
  2. package/dependencies-loader/dependencies-versions-resolver.ts +1 -1
  3. package/dist/dependencies-loader/dependencies-loader.js +1 -1
  4. package/dist/dependencies-loader/dependencies-loader.js.map +1 -1
  5. package/dist/dependencies-loader/dependencies-versions-resolver.js +1 -1
  6. package/dist/dependencies-loader/dependencies-versions-resolver.js.map +1 -1
  7. package/package.json +25 -25
  8. /package/dist/{preview-1743045659475.js → preview-1743563977810.js} +0 -0
package/dependencies-loader/dependencies-loader.ts CHANGED
@@ -135,7 +135,7 @@ export class DependenciesLoader {
135
135
  }
136
136
  return null; // cache is invalid.
137
137
  }
138
- this.logger.debug(`dependencies-loader, getting the dependencies data for ${this.idStr} from the cache`);
138
+ this.logger.trace(`dependencies-loader, getting the dependencies data for ${this.idStr} from the cache`);
139
139
  return DependenciesData.deserialize(cacheData.data);
140
140
  }
141
141
 
package/dependencies-loader/dependencies-versions-resolver.ts CHANGED
@@ -78,7 +78,7 @@ export async function updateDependenciesVersions(
78
78
  for (const strategy of strategies) {
79
79
  const strategyId = strategy();
80
80
  if (strategyId) {
81
- logger.debug(
81
+ logger.trace(
82
82
  `found dependency version ${strategyId.version} for ${id.toString()} in strategy ${strategy.name}`
83
83
  );
84
84
  if (debugDep) {
package/dist/dependencies-loader/dependencies-loader.js CHANGED
@@ -179,7 +179,7 @@ class DependenciesLoader {
179
179
  }
180
180
  return null; // cache is invalid.
181
181
  }
182
- this.logger.debug(`dependencies-loader, getting the dependencies data for ${this.idStr} from the cache`);
182
+ this.logger.trace(`dependencies-loader, getting the dependencies data for ${this.idStr} from the cache`);
183
183
  return _dependenciesData().DependenciesData.deserialize(cacheData.data);
184
184
  }
185
185
  shouldSaveInCache(dependenciesData, storeInFsCache = true) {
package/dist/dependencies-loader/dependencies-loader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_path","data","_interopRequireDefault","require","_lodash","_componentIssues","_toolboxFs","_legacy","_legacy2","_dependencyResolver","_dependenciesData","_dependenciesVersionsResolver","_autoDetectDeps","_applyOverrides","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","DependenciesLoader","constructor","component","depsResolver","devFiles","aspectLoader","logger","idStr","id","toString","load","workspace","opts","dependenciesData","debugDependenciesData","getDependenciesData","applyOverrides","ApplyOverrides","allDependencies","allPackagesDependencies","issues","results","setDependenciesDataOnComponent","overridesDependencies","updateDependenciesVersions","autoDetectOverrides","components","resolveExtensionsVersions","loadFromScope","depsDataFromCache","getDependenciesDataFromCacheIfPossible","autoDetectDeps","AutoDetectDeps","cacheResolvedDependencies","cacheProjectAst","shouldSaveInCache","storeInFsCache","consumer","componentFsCache","saveDependenciesDataInCache","serialize","useDependenciesCache","cacheData","getDependenciesDataFromCache","rootDir","componentMap","getComponentDir","filesPaths","files","map","f","path","componentConfigPath","join","COMPONENT_CONFIG_FILE_NAME","push","lastModifiedComponent","getLastModifiedComponentTimestampMs","wasModifiedAfterCache","timestamp","envJsonFile","find","file","relative","lastModifiedEnvJsonc","getLastModifiedPathsTimestampMs","wasEnvJsonModifiedAfterCache","debug","deleteAllDependenciesDataCache","DependenciesData","deserialize","shouldBlockSavingInCache","setDependencies","dependencies","setDevDependencies","devDependencies","setPeerDependencies","peerDependencies","packageDependencies","devPackageDependencies","peerPackageDependencies","missingFromOverrides","missingPackageDependencies","length","getOrCreate","IssuesClasses","MissingManuallyConfiguredPackages","uniq","isEmpty","manuallyRemovedDependencies","manuallyAddedDependencies","coreAspects","pushToDependencyResolverExtension","dataField","operation","depResolverAspectName","DependencyResolverAspect","extExistOnComponent","ext","extensions","findCoreExtension","ExtensionDataEntry","undefined","existing","c","packageName","componentId","exports"],"sources":["dependencies-loader.ts"],"sourcesContent":["import path from 'path';\nimport { uniq } from 'lodash';\nimport { IssuesClasses } from '@teambit/component-issues';\nimport { getLastModifiedComponentTimestampMs, getLastModifiedPathsTimestampMs } from '@teambit/toolbox.fs.last-modified';\nimport { ExtensionDataEntry } from '@teambit/legacy.extension-data';\nimport { DependencyLoaderOpts, ConsumerComponent as Component } from '@teambit/legacy.consumer-component';\nimport { COMPONENT_CONFIG_FILE_NAME } from '@teambit/legacy.constants';\nimport { Workspace } from '@teambit/workspace';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { DevFilesMain } from '@teambit/dev-files';\nimport { Logger } from '@teambit/logger';\nimport { AspectLoaderMain } from '@teambit/aspect-loader';\nimport { DependenciesData } from './dependencies-data';\nimport { updateDependenciesVersions } from './dependencies-versions-resolver';\nimport { AutoDetectDeps, DebugDependencies } from './auto-detect-deps';\nimport OverridesDependencies from './overrides-dependencies';\nimport { ApplyOverrides } from './apply-overrides';\n\nexport class DependenciesLoader {\n private idStr: string;\n constructor(\n private component: Component,\n private depsResolver: DependencyResolverMain,\n private devFiles: DevFilesMain,\n private aspectLoader: AspectLoaderMain,\n private logger: Logger\n ) {\n this.idStr = this.component.id.toString();\n }\n async load(workspace: Workspace, opts: DependencyLoaderOpts) {\n const { dependenciesData, debugDependenciesData } = await this.getDependenciesData(workspace, opts);\n const applyOverrides = new ApplyOverrides(this.component, this.depsResolver, this.logger, workspace);\n applyOverrides.allDependencies = dependenciesData.allDependencies;\n applyOverrides.allPackagesDependencies = dependenciesData.allPackagesDependencies;\n if (debugDependenciesData) {\n // if it's coming from the cache, it's empty\n applyOverrides.debugDependenciesData = debugDependenciesData;\n }\n applyOverrides.issues = dependenciesData.issues;\n const results = await applyOverrides.getDependenciesData();\n this.setDependenciesDataOnComponent(results.dependenciesData, results.overridesDependencies);\n await updateDependenciesVersions(\n this.depsResolver,\n workspace,\n this.component,\n results.overridesDependencies,\n results.autoDetectOverrides,\n applyOverrides.debugDependenciesData.components,\n opts.resolveExtensionsVersions\n );\n\n return {\n dependenciesData: results.dependenciesData,\n overridesDependencies: results.overridesDependencies,\n debugDependenciesData: applyOverrides.debugDependenciesData,\n };\n }\n\n async loadFromScope(dependenciesData: Partial<DependenciesData>) {\n const applyOverrides = new ApplyOverrides(this.component, this.depsResolver, this.logger);\n const { allDependencies, allPackagesDependencies, issues } = dependenciesData;\n if (allDependencies) applyOverrides.allDependencies = allDependencies;\n if (allPackagesDependencies) applyOverrides.allPackagesDependencies = allPackagesDependencies;\n if (issues) applyOverrides.issues = issues;\n const results = await applyOverrides.getDependenciesData();\n this.setDependenciesDataOnComponent(results.dependenciesData, results.overridesDependencies);\n }\n\n private async getDependenciesData(\n workspace: Workspace,\n opts: DependencyLoaderOpts\n ): Promise<{\n dependenciesData: DependenciesData;\n debugDependenciesData?: DebugDependencies;\n }> {\n const depsDataFromCache = await this.getDependenciesDataFromCacheIfPossible(workspace, opts);\n if (depsDataFromCache) {\n return { dependenciesData: depsDataFromCache };\n }\n\n const autoDetectDeps = new AutoDetectDeps(\n this.component,\n workspace,\n this.devFiles,\n this.depsResolver,\n this.aspectLoader\n );\n const results = await autoDetectDeps.getDependenciesData(opts.cacheResolvedDependencies, opts.cacheProjectAst);\n if (this.shouldSaveInCache(results.dependenciesData, opts.storeInFsCache)) {\n await workspace.consumer.componentFsCache.saveDependenciesDataInCache(\n this.idStr,\n results.dependenciesData.serialize()\n );\n }\n\n return results;\n }\n\n private async getDependenciesDataFromCacheIfPossible(\n workspace: Workspace,\n opts: DependencyLoaderOpts\n ): Promise<DependenciesData | null> {\n if (!opts.useDependenciesCache) {\n return null;\n }\n const cacheData = await workspace.consumer.componentFsCache.getDependenciesDataFromCache(this.idStr);\n if (!cacheData) {\n return null; // probably the first time, so it wasn't entered to the cache yet.\n }\n const rootDir = this.component.componentMap?.getComponentDir();\n if (!rootDir) {\n // could happen on legacy only and when there is no trackDir, in which case, we can't\n // determine whether or not a component file has been deleted, as a result, we are unable\n // to invalidate the cache in such a case.\n return null;\n }\n const filesPaths = this.component.files.map((f) => f.path);\n const componentConfigPath = path.join(workspace.path, rootDir, COMPONENT_CONFIG_FILE_NAME);\n filesPaths.push(componentConfigPath);\n const lastModifiedComponent = await getLastModifiedComponentTimestampMs(rootDir, filesPaths);\n const wasModifiedAfterCache = lastModifiedComponent > cacheData.timestamp;\n\n if (wasModifiedAfterCache) {\n // in case the env.jsonc was modified, all components using this env should be invalidated as well.\n // we don't have a fast way to check which are those components so we clear them all.\n // in terms of performance, it's not that bad because this file is not modified often.\n const envJsonFile = this.component.files.find((file) => file.relative === 'env.jsonc');\n if (envJsonFile) {\n const lastModifiedEnvJsonc = await getLastModifiedPathsTimestampMs([envJsonFile.path]);\n const wasEnvJsonModifiedAfterCache = lastModifiedEnvJsonc > cacheData.timestamp;\n if (wasEnvJsonModifiedAfterCache) {\n this.logger.debug(`dependencies-loader, the env ${this.idStr} was modified after the cache was created, clearing all deps caches`);\n await workspace.consumer.componentFsCache.deleteAllDependenciesDataCache();\n }\n }\n return null; // cache is invalid.\n }\n this.logger.debug(`dependencies-loader, getting the dependencies data for ${this.idStr} from the cache`);\n return DependenciesData.deserialize(cacheData.data);\n }\n\n private shouldSaveInCache(dependenciesData: DependenciesData, storeInFsCache = true) {\n if (!storeInFsCache) return false;\n if (!dependenciesData.issues) return true;\n return !dependenciesData.issues.shouldBlockSavingInCache();\n }\n\n private setDependenciesDataOnComponent(\n dependenciesData: DependenciesData,\n overridesDependencies: OverridesDependencies\n ) {\n this.component.setDependencies(dependenciesData.allDependencies.dependencies);\n this.component.setDevDependencies(dependenciesData.allDependencies.devDependencies);\n this.component.setPeerDependencies(dependenciesData.allDependencies.peerDependencies);\n this.component.packageDependencies = dependenciesData.allPackagesDependencies.packageDependencies ?? {};\n this.component.devPackageDependencies = dependenciesData.allPackagesDependencies.devPackageDependencies ?? {};\n this.component.peerPackageDependencies = dependenciesData.allPackagesDependencies.peerPackageDependencies ?? {};\n const missingFromOverrides = overridesDependencies.missingPackageDependencies;\n if (missingFromOverrides.length) {\n dependenciesData.issues.getOrCreate(IssuesClasses.MissingManuallyConfiguredPackages).data =\n uniq(missingFromOverrides);\n }\n if (!dependenciesData.issues.isEmpty()) this.component.issues = dependenciesData.issues;\n this.component.manuallyRemovedDependencies = overridesDependencies.manuallyRemovedDependencies;\n this.component.manuallyAddedDependencies = overridesDependencies.manuallyAddedDependencies;\n if (dependenciesData.coreAspects.length) {\n this.pushToDependencyResolverExtension('coreAspects', dependenciesData.coreAspects, 'set');\n }\n }\n\n private pushToDependencyResolverExtension(dataField: string, data: any, operation: 'add' | 'set' = 'add') {\n const depResolverAspectName = DependencyResolverAspect.id;\n let extExistOnComponent = true;\n let ext = this.component.extensions.findCoreExtension(depResolverAspectName);\n if (!ext) {\n extExistOnComponent = false;\n // Create new deps resolver extension entry to add to the component with data only\n ext = new ExtensionDataEntry(undefined, undefined, depResolverAspectName, undefined, {});\n }\n\n if (!ext.data[dataField]) ext.data[dataField] = [];\n if (operation === 'add') {\n const existing = ext.data[dataField].find((c) => c.packageName === data.packageName);\n if (existing) {\n existing.componentId = data.componentId;\n } else {\n ext.data[dataField].push(data);\n }\n }\n if (operation === 'set') {\n ext.data[dataField] = data;\n }\n if (!extExistOnComponent) {\n this.component.extensions.push(ext);\n }\n }\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_path","data","_interopRequireDefault","require","_lodash","_componentIssues","_toolboxFs","_legacy","_legacy2","_dependencyResolver","_dependenciesData","_dependenciesVersionsResolver","_autoDetectDeps","_applyOverrides","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","DependenciesLoader","constructor","component","depsResolver","devFiles","aspectLoader","logger","idStr","id","toString","load","workspace","opts","dependenciesData","debugDependenciesData","getDependenciesData","applyOverrides","ApplyOverrides","allDependencies","allPackagesDependencies","issues","results","setDependenciesDataOnComponent","overridesDependencies","updateDependenciesVersions","autoDetectOverrides","components","resolveExtensionsVersions","loadFromScope","depsDataFromCache","getDependenciesDataFromCacheIfPossible","autoDetectDeps","AutoDetectDeps","cacheResolvedDependencies","cacheProjectAst","shouldSaveInCache","storeInFsCache","consumer","componentFsCache","saveDependenciesDataInCache","serialize","useDependenciesCache","cacheData","getDependenciesDataFromCache","rootDir","componentMap","getComponentDir","filesPaths","files","map","f","path","componentConfigPath","join","COMPONENT_CONFIG_FILE_NAME","push","lastModifiedComponent","getLastModifiedComponentTimestampMs","wasModifiedAfterCache","timestamp","envJsonFile","find","file","relative","lastModifiedEnvJsonc","getLastModifiedPathsTimestampMs","wasEnvJsonModifiedAfterCache","debug","deleteAllDependenciesDataCache","trace","DependenciesData","deserialize","shouldBlockSavingInCache","setDependencies","dependencies","setDevDependencies","devDependencies","setPeerDependencies","peerDependencies","packageDependencies","devPackageDependencies","peerPackageDependencies","missingFromOverrides","missingPackageDependencies","length","getOrCreate","IssuesClasses","MissingManuallyConfiguredPackages","uniq","isEmpty","manuallyRemovedDependencies","manuallyAddedDependencies","coreAspects","pushToDependencyResolverExtension","dataField","operation","depResolverAspectName","DependencyResolverAspect","extExistOnComponent","ext","extensions","findCoreExtension","ExtensionDataEntry","undefined","existing","c","packageName","componentId","exports"],"sources":["dependencies-loader.ts"],"sourcesContent":["import path from 'path';\nimport { uniq } from 'lodash';\nimport { IssuesClasses } from '@teambit/component-issues';\nimport { getLastModifiedComponentTimestampMs, getLastModifiedPathsTimestampMs } from '@teambit/toolbox.fs.last-modified';\nimport { ExtensionDataEntry } from '@teambit/legacy.extension-data';\nimport { DependencyLoaderOpts, ConsumerComponent as Component } from '@teambit/legacy.consumer-component';\nimport { COMPONENT_CONFIG_FILE_NAME } from '@teambit/legacy.constants';\nimport { Workspace } from '@teambit/workspace';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { DevFilesMain } from '@teambit/dev-files';\nimport { Logger } from '@teambit/logger';\nimport { AspectLoaderMain } from '@teambit/aspect-loader';\nimport { DependenciesData } from './dependencies-data';\nimport { updateDependenciesVersions } from './dependencies-versions-resolver';\nimport { AutoDetectDeps, DebugDependencies } from './auto-detect-deps';\nimport OverridesDependencies from './overrides-dependencies';\nimport { ApplyOverrides } from './apply-overrides';\n\nexport class DependenciesLoader {\n private idStr: string;\n constructor(\n private component: Component,\n private depsResolver: DependencyResolverMain,\n private devFiles: DevFilesMain,\n private aspectLoader: AspectLoaderMain,\n private logger: Logger\n ) {\n this.idStr = this.component.id.toString();\n }\n async load(workspace: Workspace, opts: DependencyLoaderOpts) {\n const { dependenciesData, debugDependenciesData } = await this.getDependenciesData(workspace, opts);\n const applyOverrides = new ApplyOverrides(this.component, this.depsResolver, this.logger, workspace);\n applyOverrides.allDependencies = dependenciesData.allDependencies;\n applyOverrides.allPackagesDependencies = dependenciesData.allPackagesDependencies;\n if (debugDependenciesData) {\n // if it's coming from the cache, it's empty\n applyOverrides.debugDependenciesData = debugDependenciesData;\n }\n applyOverrides.issues = dependenciesData.issues;\n const results = await applyOverrides.getDependenciesData();\n this.setDependenciesDataOnComponent(results.dependenciesData, results.overridesDependencies);\n await updateDependenciesVersions(\n this.depsResolver,\n workspace,\n this.component,\n results.overridesDependencies,\n results.autoDetectOverrides,\n applyOverrides.debugDependenciesData.components,\n opts.resolveExtensionsVersions\n );\n\n return {\n dependenciesData: results.dependenciesData,\n overridesDependencies: results.overridesDependencies,\n debugDependenciesData: applyOverrides.debugDependenciesData,\n };\n }\n\n async loadFromScope(dependenciesData: Partial<DependenciesData>) {\n const applyOverrides = new ApplyOverrides(this.component, this.depsResolver, this.logger);\n const { allDependencies, allPackagesDependencies, issues } = dependenciesData;\n if (allDependencies) applyOverrides.allDependencies = allDependencies;\n if (allPackagesDependencies) applyOverrides.allPackagesDependencies = allPackagesDependencies;\n if (issues) applyOverrides.issues = issues;\n const results = await applyOverrides.getDependenciesData();\n this.setDependenciesDataOnComponent(results.dependenciesData, results.overridesDependencies);\n }\n\n private async getDependenciesData(\n workspace: Workspace,\n opts: DependencyLoaderOpts\n ): Promise<{\n dependenciesData: DependenciesData;\n debugDependenciesData?: DebugDependencies;\n }> {\n const depsDataFromCache = await this.getDependenciesDataFromCacheIfPossible(workspace, opts);\n if (depsDataFromCache) {\n return { dependenciesData: depsDataFromCache };\n }\n\n const autoDetectDeps = new AutoDetectDeps(\n this.component,\n workspace,\n this.devFiles,\n this.depsResolver,\n this.aspectLoader\n );\n const results = await autoDetectDeps.getDependenciesData(opts.cacheResolvedDependencies, opts.cacheProjectAst);\n if (this.shouldSaveInCache(results.dependenciesData, opts.storeInFsCache)) {\n await workspace.consumer.componentFsCache.saveDependenciesDataInCache(\n this.idStr,\n results.dependenciesData.serialize()\n );\n }\n\n return results;\n }\n\n private async getDependenciesDataFromCacheIfPossible(\n workspace: Workspace,\n opts: DependencyLoaderOpts\n ): Promise<DependenciesData | null> {\n if (!opts.useDependenciesCache) {\n return null;\n }\n const cacheData = await workspace.consumer.componentFsCache.getDependenciesDataFromCache(this.idStr);\n if (!cacheData) {\n return null; // probably the first time, so it wasn't entered to the cache yet.\n }\n const rootDir = this.component.componentMap?.getComponentDir();\n if (!rootDir) {\n // could happen on legacy only and when there is no trackDir, in which case, we can't\n // determine whether or not a component file has been deleted, as a result, we are unable\n // to invalidate the cache in such a case.\n return null;\n }\n const filesPaths = this.component.files.map((f) => f.path);\n const componentConfigPath = path.join(workspace.path, rootDir, COMPONENT_CONFIG_FILE_NAME);\n filesPaths.push(componentConfigPath);\n const lastModifiedComponent = await getLastModifiedComponentTimestampMs(rootDir, filesPaths);\n const wasModifiedAfterCache = lastModifiedComponent > cacheData.timestamp;\n\n if (wasModifiedAfterCache) {\n // in case the env.jsonc was modified, all components using this env should be invalidated as well.\n // we don't have a fast way to check which are those components so we clear them all.\n // in terms of performance, it's not that bad because this file is not modified often.\n const envJsonFile = this.component.files.find((file) => file.relative === 'env.jsonc');\n if (envJsonFile) {\n const lastModifiedEnvJsonc = await getLastModifiedPathsTimestampMs([envJsonFile.path]);\n const wasEnvJsonModifiedAfterCache = lastModifiedEnvJsonc > cacheData.timestamp;\n if (wasEnvJsonModifiedAfterCache) {\n this.logger.debug(`dependencies-loader, the env ${this.idStr} was modified after the cache was created, clearing all deps caches`);\n await workspace.consumer.componentFsCache.deleteAllDependenciesDataCache();\n }\n }\n return null; // cache is invalid.\n }\n this.logger.trace(`dependencies-loader, getting the dependencies data for ${this.idStr} from the cache`);\n return DependenciesData.deserialize(cacheData.data);\n }\n\n private shouldSaveInCache(dependenciesData: DependenciesData, storeInFsCache = true) {\n if (!storeInFsCache) return false;\n if (!dependenciesData.issues) return true;\n return !dependenciesData.issues.shouldBlockSavingInCache();\n }\n\n private setDependenciesDataOnComponent(\n dependenciesData: DependenciesData,\n overridesDependencies: OverridesDependencies\n ) {\n this.component.setDependencies(dependenciesData.allDependencies.dependencies);\n this.component.setDevDependencies(dependenciesData.allDependencies.devDependencies);\n this.component.setPeerDependencies(dependenciesData.allDependencies.peerDependencies);\n this.component.packageDependencies = dependenciesData.allPackagesDependencies.packageDependencies ?? {};\n this.component.devPackageDependencies = dependenciesData.allPackagesDependencies.devPackageDependencies ?? {};\n this.component.peerPackageDependencies = dependenciesData.allPackagesDependencies.peerPackageDependencies ?? {};\n const missingFromOverrides = overridesDependencies.missingPackageDependencies;\n if (missingFromOverrides.length) {\n dependenciesData.issues.getOrCreate(IssuesClasses.MissingManuallyConfiguredPackages).data =\n uniq(missingFromOverrides);\n }\n if (!dependenciesData.issues.isEmpty()) this.component.issues = dependenciesData.issues;\n this.component.manuallyRemovedDependencies = overridesDependencies.manuallyRemovedDependencies;\n this.component.manuallyAddedDependencies = overridesDependencies.manuallyAddedDependencies;\n if (dependenciesData.coreAspects.length) {\n this.pushToDependencyResolverExtension('coreAspects', dependenciesData.coreAspects, 'set');\n }\n }\n\n private pushToDependencyResolverExtension(dataField: string, data: any, operation: 'add' | 'set' = 'add') {\n const depResolverAspectName = DependencyResolverAspect.id;\n let extExistOnComponent = true;\n let ext = this.component.extensions.findCoreExtension(depResolverAspectName);\n if (!ext) {\n extExistOnComponent = false;\n // Create new deps resolver extension entry to add to the component with data only\n ext = new ExtensionDataEntry(undefined, undefined, depResolverAspectName, undefined, {});\n }\n\n if (!ext.data[dataField]) ext.data[dataField] = [];\n if (operation === 'add') {\n const existing = ext.data[dataField].find((c) => c.packageName === data.packageName);\n if (existing) {\n existing.componentId = data.componentId;\n } else {\n ext.data[dataField].push(data);\n }\n }\n if (operation === 'set') {\n ext.data[dataField] = data;\n }\n if (!extExistOnComponent) {\n this.component.extensions.push(ext);\n }\n }\n}\n"],"mappings":"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","ignoreList":[]}
package/dist/dependencies-loader/dependencies-versions-resolver.js CHANGED
@@ -76,7 +76,7 @@ async function updateDependenciesVersions(depsResolver, workspace, component, ov
76
76
  for (const strategy of strategies) {
77
77
  const strategyId = strategy();
78
78
  if (strategyId) {
79
- _legacy().logger.debug(`found dependency version ${strategyId.version} for ${id.toString()} in strategy ${strategy.name}`);
79
+ _legacy().logger.trace(`found dependency version ${strategyId.version} for ${id.toString()} in strategy ${strategy.name}`);
80
80
  if (debugDep) {
81
81
  debugDep.versionResolvedFrom = strategy.name.replace('getFrom', '');
82
82
  debugDep.version = strategyId.version;
package/dist/dependencies-loader/dependencies-versions-resolver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_legacy","data","require","_lodash","_legacy2","_autoDetectDeps","updateDependenciesVersions","depsResolver","workspace","component","overridesDependencies","autoDetectOverrides","debugDependencies","updateExtensionsVersions","consumer","autoDetectConfigMerge","getAutoDetectConfigMerge","id","currentLane","getCurrentLaneObject","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","isPkgInWorkspacePolicies","getFromMergeConfig","resolveFromMergeConfig","getFromDepPackageJsonDueToAutoDetectOverrides","isPkgInAutoDetectOverrides","getFromModel","getIdFromModelDeps","componentFromModel","strategies","strategy","strategyId","logger","debug","version","toString","name","versionResolvedFrom","replace","undefined","updateDependency","dependency","packageName","resolvedVersion","changeVersion","get","forEach","updateExtension","extension","extensionId","componentId","getAllDependenciesIds","searchWithoutVersion","existingIds","bitmapIdsFromCurrentLane","filterWithoutVersion","length","updateDependents","overrides","getComponentDependenciesWithVersion","isEmpty","Object","keys","idStr","toStringWithoutVersion","pkgName","getDependenciesToAddManually","found","validVersion","getValidVersion","DEPENDENCIES_FIELDS","some","depField","getWorkspacePolicyManifest","foundVersion","field"],"sources":["dependencies-versions-resolver.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\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, getValidVersion } 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\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): string | undefined {\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 pkg && id.hasVersion() && isPkgInWorkspacePolicies(pkg) ? id : null;\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) {\n logger.debug(\n `found dependency version ${strategyId.version} for ${id.toString()} in strategy ${strategy.name}`\n );\n if (debugDep) {\n debugDep.versionResolvedFrom = strategy.name.replace('getFrom', '');\n debugDep.version = strategyId.version;\n }\n\n return strategyId.version;\n }\n }\n return undefined;\n }\n\n function updateDependency(dependency: Dependency, depType: DepType) {\n const { id, packageName } = dependency;\n const resolvedVersion = resolveVersion(id, depType, packageName);\n if (resolvedVersion) {\n dependency.id = dependency.id.changeVersion(resolvedVersion);\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 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 function resolveFromOverrides(id: ComponentID, depType: DepType, pkgName?: string): ComponentID | undefined {\n if (!pkgName) return undefined;\n const dependencies = overridesDependencies.getDependenciesToAddManually();\n const found = dependencies?.[depType]?.[pkgName];\n if (!found) return undefined;\n const validVersion = getValidVersion(found);\n return validVersion ? id.changeVersion(validVersion) : undefined;\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 isPkgInWorkspacePolicies(pkgName: string) {\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 foundVersion = foundVersion ? getValidVersion(foundVersion) : null;\n }\n });\n return foundVersion ? id.changeVersion(foundVersion) : undefined;\n }\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_legacy","data","require","_lodash","_legacy2","_autoDetectDeps","updateDependenciesVersions","depsResolver","workspace","component","overridesDependencies","autoDetectOverrides","debugDependencies","updateExtensionsVersions","consumer","autoDetectConfigMerge","getAutoDetectConfigMerge","id","currentLane","getCurrentLaneObject","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","isPkgInWorkspacePolicies","getFromMergeConfig","resolveFromMergeConfig","getFromDepPackageJsonDueToAutoDetectOverrides","isPkgInAutoDetectOverrides","getFromModel","getIdFromModelDeps","componentFromModel","strategies","strategy","strategyId","logger","trace","version","toString","name","versionResolvedFrom","replace","undefined","updateDependency","dependency","packageName","resolvedVersion","changeVersion","get","forEach","updateExtension","extension","extensionId","componentId","getAllDependenciesIds","searchWithoutVersion","existingIds","bitmapIdsFromCurrentLane","filterWithoutVersion","length","updateDependents","overrides","getComponentDependenciesWithVersion","isEmpty","Object","keys","idStr","toStringWithoutVersion","pkgName","getDependenciesToAddManually","found","validVersion","getValidVersion","DEPENDENCIES_FIELDS","some","depField","getWorkspacePolicyManifest","foundVersion","field"],"sources":["dependencies-versions-resolver.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\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, getValidVersion } 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\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): string | undefined {\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 pkg && id.hasVersion() && isPkgInWorkspacePolicies(pkg) ? id : null;\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) {\n logger.trace(\n `found dependency version ${strategyId.version} for ${id.toString()} in strategy ${strategy.name}`\n );\n if (debugDep) {\n debugDep.versionResolvedFrom = strategy.name.replace('getFrom', '');\n debugDep.version = strategyId.version;\n }\n\n return strategyId.version;\n }\n }\n return undefined;\n }\n\n function updateDependency(dependency: Dependency, depType: DepType) {\n const { id, packageName } = dependency;\n const resolvedVersion = resolveVersion(id, depType, packageName);\n if (resolvedVersion) {\n dependency.id = dependency.id.changeVersion(resolvedVersion);\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 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 function resolveFromOverrides(id: ComponentID, depType: DepType, pkgName?: string): ComponentID | undefined {\n if (!pkgName) return undefined;\n const dependencies = overridesDependencies.getDependenciesToAddManually();\n const found = dependencies?.[depType]?.[pkgName];\n if (!found) return undefined;\n const validVersion = getValidVersion(found);\n return validVersion ? id.changeVersion(validVersion) : undefined;\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 isPkgInWorkspacePolicies(pkgName: string) {\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 foundVersion = foundVersion ? getValidVersion(foundVersion) : null;\n }\n });\n return foundVersion ? id.changeVersion(foundVersion) : undefined;\n }\n}\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/dependencies",
3
- "version": "1.0.579",
3
+ "version": "1.0.581",
4
4
  "homepage": "https://bit.cloud/teambit/dependencies/dependencies",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.dependencies",
8
8
  "name": "dependencies",
9
- "version": "1.0.579"
9
+ "version": "1.0.581"
10
10
  },
11
11
  "dependencies": {
12
12
  "archy": "1.0.0",
@@ -20,46 +20,46 @@
20
20
  "fs-extra": "10.0.0",
21
21
  "semver": "7.7.1",
22
22
  "debug": "4.3.4",
23
+ "resolve-dependency-path": "2.0.0",
24
+ "stylus-lookup": "3.0.2",
23
25
  "detective-amd": "3.0.1",
24
26
  "detective-stylus": "1.0.0",
25
27
  "module-definition": "3.3.1",
26
28
  "node-source-walk": "4.2.0",
27
- "resolve-dependency-path": "2.0.0",
28
- "stylus-lookup": "3.0.2",
29
29
  "@teambit/harmony": "0.4.7",
30
30
  "@teambit/component-id": "1.2.3",
31
31
  "@teambit/bit-error": "0.0.404",
32
32
  "@teambit/component-version": "1.0.4",
33
+ "@teambit/styling.deps-lookups.lookup-styling": "0.0.4",
34
+ "@teambit/typescript.deps-lookups.lookup-typescript": "0.0.2",
33
35
  "@teambit/node.deps-detectors.detective-es6": "0.0.6",
34
36
  "@teambit/styling.deps-detectors.detective-css": "0.0.6",
35
37
  "@teambit/styling.deps-detectors.detective-less": "0.0.6",
36
38
  "@teambit/styling.deps-detectors.detective-sass": "0.0.9",
37
39
  "@teambit/styling.deps-detectors.detective-scss": "0.0.9",
38
40
  "@teambit/typescript.deps-detectors.detective-typescript": "0.0.9",
39
- "@teambit/styling.deps-lookups.lookup-styling": "0.0.4",
40
- "@teambit/typescript.deps-lookups.lookup-typescript": "0.0.2",
41
- "@teambit/cli": "0.0.1156",
42
- "@teambit/graph": "1.0.579",
41
+ "@teambit/cli": "0.0.1158",
42
+ "@teambit/graph": "1.0.581",
43
43
  "@teambit/legacy.constants": "0.0.11",
44
- "@teambit/aspect-loader": "1.0.579",
44
+ "@teambit/aspect-loader": "1.0.581",
45
45
  "@teambit/component-package-version": "0.0.438",
46
- "@teambit/dependency-resolver": "1.0.579",
47
- "@teambit/dev-files": "1.0.579",
48
- "@teambit/legacy.consumer-component": "0.0.45",
49
- "@teambit/logger": "0.0.1249",
50
- "@teambit/scope": "1.0.579",
51
- "@teambit/workspace": "1.0.579",
52
- "@teambit/legacy.dependency-graph": "0.0.47",
53
- "@teambit/component.sources": "0.0.96",
46
+ "@teambit/dependency-resolver": "1.0.581",
47
+ "@teambit/dev-files": "1.0.581",
48
+ "@teambit/legacy.consumer-component": "0.0.46",
49
+ "@teambit/logger": "0.0.1251",
50
+ "@teambit/scope": "1.0.581",
51
+ "@teambit/workspace": "1.0.581",
52
+ "@teambit/legacy.dependency-graph": "0.0.48",
53
+ "@teambit/component.sources": "0.0.97",
54
54
  "@teambit/legacy.utils": "0.0.19",
55
55
  "@teambit/toolbox.path.path": "0.0.8",
56
56
  "@teambit/component-issues": "0.0.157",
57
- "@teambit/legacy.bit-map": "0.0.101",
58
- "@teambit/legacy.consumer-config": "0.0.44",
59
- "@teambit/legacy.consumer": "0.0.44",
60
- "@teambit/legacy.logger": "0.0.16",
57
+ "@teambit/legacy.bit-map": "0.0.102",
58
+ "@teambit/legacy.consumer-config": "0.0.45",
59
+ "@teambit/legacy.consumer": "0.0.45",
60
+ "@teambit/legacy.logger": "0.0.17",
61
61
  "@teambit/toolbox.fs.extension-getter": "0.0.5",
62
- "@teambit/legacy.extension-data": "0.0.46",
62
+ "@teambit/legacy.extension-data": "0.0.47",
63
63
  "@teambit/toolbox.fs.last-modified": "0.0.5"
64
64
  },
65
65
  "devDependencies": {
@@ -72,9 +72,9 @@
72
72
  "@types/mocha": "9.1.0",
73
73
  "@teambit/defender.fs.global-bit-temp-dir": "0.0.1",
74
74
  "@teambit/harmony.envs.core-aspect-env": "0.0.69",
75
- "@teambit/component.testing.mock-components": "0.0.304",
76
- "@teambit/harmony.testing.load-aspect": "0.0.299",
77
- "@teambit/workspace.testing.mock-workspace": "0.0.75"
75
+ "@teambit/component.testing.mock-components": "0.0.306",
76
+ "@teambit/harmony.testing.load-aspect": "0.0.301",
77
+ "@teambit/workspace.testing.mock-workspace": "0.0.77"
78
78
  },
79
79
  "peerDependencies": {
80
80
  "chai": "4.3.0",