@teambit/dependencies 1.0.105 → 1.0.107
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.
- package/dependencies-loader/dependencies-loader.ts +5 -3
- package/dependencies-loader/dependencies-versions-resolver.ts +5 -2
- package/dist/dependencies-loader/dependencies-loader.js +4 -3
- package/dist/dependencies-loader/dependencies-loader.js.map +1 -1
- package/dist/dependencies-loader/dependencies-versions-resolver.d.ts +1 -1
- package/dist/dependencies-loader/dependencies-versions-resolver.js +4 -2
- package/dist/dependencies-loader/dependencies-versions-resolver.js.map +1 -1
- package/package.json +9 -9
- /package/dist/{preview-1703474083789.js → preview-1703590665075.js} +0 -0
|
@@ -46,7 +46,8 @@ export class DependenciesLoader {
|
|
|
46
46
|
this.component,
|
|
47
47
|
results.overridesDependencies,
|
|
48
48
|
results.autoDetectOverrides,
|
|
49
|
-
applyOverrides.debugDependenciesData.components
|
|
49
|
+
applyOverrides.debugDependenciesData.components,
|
|
50
|
+
opts.resolveExtensionsVersions
|
|
50
51
|
);
|
|
51
52
|
|
|
52
53
|
return {
|
|
@@ -86,7 +87,7 @@ export class DependenciesLoader {
|
|
|
86
87
|
this.aspectLoader
|
|
87
88
|
);
|
|
88
89
|
const results = await autoDetectDeps.getDependenciesData(opts.cacheResolvedDependencies, opts.cacheProjectAst);
|
|
89
|
-
if (this.shouldSaveInCache(results.dependenciesData)) {
|
|
90
|
+
if (this.shouldSaveInCache(results.dependenciesData, opts.storeInFsCache)) {
|
|
90
91
|
await workspace.consumer.componentFsCache.saveDependenciesDataInCache(
|
|
91
92
|
this.idStr,
|
|
92
93
|
results.dependenciesData.serialize()
|
|
@@ -126,7 +127,8 @@ export class DependenciesLoader {
|
|
|
126
127
|
return DependenciesData.deserialize(cacheData.data);
|
|
127
128
|
}
|
|
128
129
|
|
|
129
|
-
private shouldSaveInCache(dependenciesData: DependenciesData) {
|
|
130
|
+
private shouldSaveInCache(dependenciesData: DependenciesData, storeInFsCache = true) {
|
|
131
|
+
if (!storeInFsCache) return false;
|
|
130
132
|
if (!dependenciesData.issues) return true;
|
|
131
133
|
return !dependenciesData.issues.shouldBlockSavingInCache();
|
|
132
134
|
}
|
|
@@ -20,14 +20,17 @@ export function updateDependenciesVersions(
|
|
|
20
20
|
component: Component,
|
|
21
21
|
overridesDependencies: OverridesDependencies,
|
|
22
22
|
autoDetectOverrides?: Record<string, any>,
|
|
23
|
-
debugDependencies?: DebugComponentsDependency[]
|
|
23
|
+
debugDependencies?: DebugComponentsDependency[],
|
|
24
|
+
updateExtensionsVersions = true
|
|
24
25
|
) {
|
|
25
26
|
const consumer: Consumer = workspace.consumer;
|
|
26
27
|
const autoDetectConfigMerge = workspace.getAutoDetectConfigMerge(component.id) || {};
|
|
27
28
|
|
|
28
29
|
updateDependencies(component.dependencies, 'dependencies');
|
|
29
30
|
updateDependencies(component.devDependencies, 'devDependencies');
|
|
30
|
-
|
|
31
|
+
if (updateExtensionsVersions) {
|
|
32
|
+
updateExtensions(component.extensions);
|
|
33
|
+
}
|
|
31
34
|
|
|
32
35
|
/**
|
|
33
36
|
* the `pkg` can be missing only in two scenarios:
|
|
@@ -123,7 +123,7 @@ class DependenciesLoader {
|
|
|
123
123
|
applyOverrides.issues = dependenciesData.issues;
|
|
124
124
|
const results = await applyOverrides.getDependenciesData();
|
|
125
125
|
this.setDependenciesDataOnComponent(results.dependenciesData, results.overridesDependencies);
|
|
126
|
-
(0, _dependenciesVersionsResolver().updateDependenciesVersions)(this.depsResolver, workspace, this.component, results.overridesDependencies, results.autoDetectOverrides, applyOverrides.debugDependenciesData.components);
|
|
126
|
+
(0, _dependenciesVersionsResolver().updateDependenciesVersions)(this.depsResolver, workspace, this.component, results.overridesDependencies, results.autoDetectOverrides, applyOverrides.debugDependenciesData.components, opts.resolveExtensionsVersions);
|
|
127
127
|
return {
|
|
128
128
|
dependenciesData: results.dependenciesData,
|
|
129
129
|
overridesDependencies: results.overridesDependencies,
|
|
@@ -152,7 +152,7 @@ class DependenciesLoader {
|
|
|
152
152
|
}
|
|
153
153
|
const autoDetectDeps = new (_autoDetectDeps().AutoDetectDeps)(this.component, workspace, this.devFiles, this.depsResolver, this.aspectLoader);
|
|
154
154
|
const results = await autoDetectDeps.getDependenciesData(opts.cacheResolvedDependencies, opts.cacheProjectAst);
|
|
155
|
-
if (this.shouldSaveInCache(results.dependenciesData)) {
|
|
155
|
+
if (this.shouldSaveInCache(results.dependenciesData, opts.storeInFsCache)) {
|
|
156
156
|
await workspace.consumer.componentFsCache.saveDependenciesDataInCache(this.idStr, results.dependenciesData.serialize());
|
|
157
157
|
}
|
|
158
158
|
return results;
|
|
@@ -184,7 +184,8 @@ class DependenciesLoader {
|
|
|
184
184
|
_logger().default.debug(`dependencies-loader, getting the dependencies data for ${this.idStr} from the cache`);
|
|
185
185
|
return _dependenciesData().DependenciesData.deserialize(cacheData.data);
|
|
186
186
|
}
|
|
187
|
-
shouldSaveInCache(dependenciesData) {
|
|
187
|
+
shouldSaveInCache(dependenciesData, storeInFsCache = true) {
|
|
188
|
+
if (!storeInFsCache) return false;
|
|
188
189
|
if (!dependenciesData.issues) return true;
|
|
189
190
|
return !dependenciesData.issues.shouldBlockSavingInCache();
|
|
190
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_ramda","data","_interopRequireDefault","require","_path","_lodash","_componentIssues","_logger","_lastModified","_config","_constants","_dependencyResolver","_dependenciesData","_dependenciesVersionsResolver","_autoDetectDeps","_applyOverrides","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","DependenciesLoader","constructor","component","depsResolver","devFiles","aspectLoader","idStr","id","toString","load","workspace","opts","dependenciesData","debugDependenciesData","getDependenciesData","applyOverrides","ApplyOverrides","allDependencies","allPackagesDependencies","issues","results","setDependenciesDataOnComponent","overridesDependencies","updateDependenciesVersions","autoDetectOverrides","components","loadFromScope","depsDataFromCache","getDependenciesDataFromCacheIfPossible","autoDetectDeps","AutoDetectDeps","cacheResolvedDependencies","cacheProjectAst","shouldSaveInCache","consumer","componentFsCache","saveDependenciesDataInCache","serialize","_this$component$compo","useDependenciesCache","cacheData","getDependenciesDataFromCache","rootDir","componentMap","getComponentDir","filesPaths","files","map","f","path","componentConfigPath","join","COMPONENT_CONFIG_FILE_NAME","push","lastModifiedComponent","getLastModifiedComponentTimestampMs","wasModifiedAfterCache","timestamp","logger","debug","DependenciesData","deserialize","shouldBlockSavingInCache","setDependencies","dependencies","setDevDependencies","devDependencies","packageDependencies","devPackageDependencies","peerPackageDependencies","missingFromOverrides","missingPackageDependencies","R","isEmpty","getOrCreate","IssuesClasses","MissingManuallyConfiguredPackages","uniq","manuallyRemovedDependencies","manuallyAddedDependencies","coreAspects","length","pushToDependencyResolverExtension","dataField","operation","depResolverAspectName","DependencyResolverAspect","extExistOnComponent","ext","extensions","findCoreExtension","ExtensionDataEntry","undefined","existing","find","c","packageName","componentId","exports"],"sources":["dependencies-loader.ts"],"sourcesContent":["import R from 'ramda';\nimport path from 'path';\nimport { uniq } from 'lodash';\nimport { IssuesClasses } from '@teambit/component-issues';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { getLastModifiedComponentTimestampMs } from '@teambit/legacy/dist/utils/fs/last-modified';\nimport { ExtensionDataEntry } from '@teambit/legacy/dist/consumer/config';\nimport Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { DependencyLoaderOpts } from '@teambit/legacy/dist/consumer/component/component-loader';\nimport { COMPONENT_CONFIG_FILE_NAME } from '@teambit/legacy/dist/constants';\nimport { Workspace } from '@teambit/workspace';\nimport DependencyResolverAspect, { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { DevFilesMain } from '@teambit/dev-files';\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 ) {\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, 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 updateDependenciesVersions(\n this.depsResolver,\n workspace,\n this.component,\n results.overridesDependencies,\n results.autoDetectOverrides,\n applyOverrides.debugDependenciesData.components\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);\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)) {\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 if (wasModifiedAfterCache) {\n return null; // cache is invalid.\n }\n 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) {\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.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 (!R.isEmpty(missingFromOverrides)) {\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":";;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,MAAA;EAAA,MAAAH,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAC,KAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,iBAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,gBAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,QAAA;EAAA,MAAAN,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAI,OAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,cAAA;EAAA,MAAAP,IAAA,GAAAE,OAAA;EAAAK,aAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,QAAA;EAAA,MAAAR,IAAA,GAAAE,OAAA;EAAAM,OAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAS,WAAA;EAAA,MAAAT,IAAA,GAAAE,OAAA;EAAAO,UAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAU,oBAAA;EAAA,MAAAV,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAQ,mBAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAW,kBAAA;EAAA,MAAAX,IAAA,GAAAE,OAAA;EAAAS,iBAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAY,8BAAA;EAAA,MAAAZ,IAAA,GAAAE,OAAA;EAAAU,6BAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,gBAAA;EAAA,MAAAb,IAAA,GAAAE,OAAA;EAAAW,eAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAc,gBAAA;EAAA,MAAAd,IAAA,GAAAE,OAAA;EAAAY,eAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAmD,SAAAC,uBAAAc,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,gBAAAH,GAAA,EAAAI,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAJ,GAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAR,GAAA,EAAAI,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAX,GAAA,CAAAI,GAAA,IAAAC,KAAA,WAAAL,GAAA;AAAA,SAAAM,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAE5C,MAAMW,kBAAkB,CAAC;EAE9BC,WAAWA,CACDC,SAAoB,EACpBC,YAAoC,EACpCC,QAAsB,EACtBC,YAA8B,EACtC;IAAA,KAJQH,SAAoB,GAApBA,SAAoB;IAAA,KACpBC,YAAoC,GAApCA,YAAoC;IAAA,KACpCC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,YAA8B,GAA9BA,YAA8B;IAAAzB,eAAA;IAEtC,IAAI,CAAC0B,KAAK,GAAG,IAAI,CAACJ,SAAS,CAACK,EAAE,CAACC,QAAQ,CAAC,CAAC;EAC3C;EACA,MAAMC,IAAIA,CAACC,SAAoB,EAAEC,IAA0B,EAAE;IAC3D,MAAM;MAAEC,gBAAgB;MAAEC;IAAsB,CAAC,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACJ,SAAS,EAAEC,IAAI,CAAC;IACnG,MAAMI,cAAc,GAAG,KAAIC,gCAAc,EAAC,IAAI,CAACd,SAAS,EAAE,IAAI,CAACC,YAAY,EAAEO,SAAS,CAAC;IACvFK,cAAc,CAACE,eAAe,GAAGL,gBAAgB,CAACK,eAAe;IACjEF,cAAc,CAACG,uBAAuB,GAAGN,gBAAgB,CAACM,uBAAuB;IACjF,IAAIL,qBAAqB,EAAE;MACzB;MACAE,cAAc,CAACF,qBAAqB,GAAGA,qBAAqB;IAC9D;IACAE,cAAc,CAACI,MAAM,GAAGP,gBAAgB,CAACO,MAAM;IAC/C,MAAMC,OAAO,GAAG,MAAML,cAAc,CAACD,mBAAmB,CAAC,CAAC;IAC1D,IAAI,CAACO,8BAA8B,CAACD,OAAO,CAACR,gBAAgB,EAAEQ,OAAO,CAACE,qBAAqB,CAAC;IAC5F,IAAAC,0DAA0B,EACxB,IAAI,CAACpB,YAAY,EACjBO,SAAS,EACT,IAAI,CAACR,SAAS,EACdkB,OAAO,CAACE,qBAAqB,EAC7BF,OAAO,CAACI,mBAAmB,EAC3BT,cAAc,CAACF,qBAAqB,CAACY,UACvC,CAAC;IAED,OAAO;MACLb,gBAAgB,EAAEQ,OAAO,CAACR,gBAAgB;MAC1CU,qBAAqB,EAAEF,OAAO,CAACE,qBAAqB;MACpDT,qBAAqB,EAAEE,cAAc,CAACF;IACxC,CAAC;EACH;EAEA,MAAMa,aAAaA,CAACd,gBAA2C,EAAE;IAC/D,MAAMG,cAAc,GAAG,KAAIC,gCAAc,EAAC,IAAI,CAACd,SAAS,EAAE,IAAI,CAACC,YAAY,CAAC;IAC5E,MAAM;MAAEc,eAAe;MAAEC,uBAAuB;MAAEC;IAAO,CAAC,GAAGP,gBAAgB;IAC7E,IAAIK,eAAe,EAAEF,cAAc,CAACE,eAAe,GAAGA,eAAe;IACrE,IAAIC,uBAAuB,EAAEH,cAAc,CAACG,uBAAuB,GAAGA,uBAAuB;IAC7F,IAAIC,MAAM,EAAEJ,cAAc,CAACI,MAAM,GAAGA,MAAM;IAC1C,MAAMC,OAAO,GAAG,MAAML,cAAc,CAACD,mBAAmB,CAAC,CAAC;IAC1D,IAAI,CAACO,8BAA8B,CAACD,OAAO,CAACR,gBAAgB,EAAEQ,OAAO,CAACE,qBAAqB,CAAC;EAC9F;EAEA,MAAcR,mBAAmBA,CAC/BJ,SAAoB,EACpBC,IAA0B,EAIzB;IACD,MAAMgB,iBAAiB,GAAG,MAAM,IAAI,CAACC,sCAAsC,CAAClB,SAAS,EAAEC,IAAI,CAAC;IAC5F,IAAIgB,iBAAiB,EAAE;MACrB,OAAO;QAAEf,gBAAgB,EAAEe;MAAkB,CAAC;IAChD;IAEA,MAAME,cAAc,GAAG,KAAIC,gCAAc,EACvC,IAAI,CAAC5B,SAAS,EACdQ,SAAS,EACT,IAAI,CAACN,QAAQ,EACb,IAAI,CAACD,YAAY,EACjB,IAAI,CAACE,YACP,CAAC;IACD,MAAMe,OAAO,GAAG,MAAMS,cAAc,CAACf,mBAAmB,CAACH,IAAI,CAACoB,yBAAyB,EAAEpB,IAAI,CAACqB,eAAe,CAAC;IAC9G,IAAI,IAAI,CAACC,iBAAiB,CAACb,OAAO,CAACR,gBAAgB,CAAC,EAAE;MACpD,MAAMF,SAAS,CAACwB,QAAQ,CAACC,gBAAgB,CAACC,2BAA2B,CACnE,IAAI,CAAC9B,KAAK,EACVc,OAAO,CAACR,gBAAgB,CAACyB,SAAS,CAAC,CACrC,CAAC;IACH;IAEA,OAAOjB,OAAO;EAChB;EAEA,MAAcQ,sCAAsCA,CAClDlB,SAAoB,EACpBC,IAA0B,EACQ;IAAA,IAAA2B,qBAAA;IAClC,IAAI,CAAC3B,IAAI,CAAC4B,oBAAoB,EAAE;MAC9B,OAAO,IAAI;IACb;IACA,MAAMC,SAAS,GAAG,MAAM9B,SAAS,CAACwB,QAAQ,CAACC,gBAAgB,CAACM,4BAA4B,CAAC,IAAI,CAACnC,KAAK,CAAC;IACpG,IAAI,CAACkC,SAAS,EAAE;MACd,OAAO,IAAI,CAAC,CAAC;IACf;IACA,MAAME,OAAO,IAAAJ,qBAAA,GAAG,IAAI,CAACpC,SAAS,CAACyC,YAAY,cAAAL,qBAAA,uBAA3BA,qBAAA,CAA6BM,eAAe,CAAC,CAAC;IAC9D,IAAI,CAACF,OAAO,EAAE;MACZ;MACA;MACA;MACA,OAAO,IAAI;IACb;IACA,MAAMG,UAAU,GAAG,IAAI,CAAC3C,SAAS,CAAC4C,KAAK,CAACC,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,IAAI,CAAC;IAC1D,MAAMC,mBAAmB,GAAGD,eAAI,CAACE,IAAI,CAACzC,SAAS,CAACuC,IAAI,EAAEP,OAAO,EAAEU,uCAA0B,CAAC;IAC1FP,UAAU,CAACQ,IAAI,CAACH,mBAAmB,CAAC;IACpC,MAAMI,qBAAqB,GAAG,MAAM,IAAAC,mDAAmC,EAACb,OAAO,EAAEG,UAAU,CAAC;IAC5F,MAAMW,qBAAqB,GAAGF,qBAAqB,GAAGd,SAAS,CAACiB,SAAS;IACzE,IAAID,qBAAqB,EAAE;MACzB,OAAO,IAAI,CAAC,CAAC;IACf;IACAE,iBAAM,CAACC,KAAK,CAAE,0DAAyD,IAAI,CAACrD,KAAM,iBAAgB,CAAC;IACnG,OAAOsD,oCAAgB,CAACC,WAAW,CAACrB,SAAS,CAAC9E,IAAI,CAAC;EACrD;EAEQuE,iBAAiBA,CAACrB,gBAAkC,EAAE;IAC5D,IAAI,CAACA,gBAAgB,CAACO,MAAM,EAAE,OAAO,IAAI;IACzC,OAAO,CAACP,gBAAgB,CAACO,MAAM,CAAC2C,wBAAwB,CAAC,CAAC;EAC5D;EAEQzC,8BAA8BA,CACpCT,gBAAkC,EAClCU,qBAA4C,EAC5C;IACA,IAAI,CAACpB,SAAS,CAAC6D,eAAe,CAACnD,gBAAgB,CAACK,eAAe,CAAC+C,YAAY,CAAC;IAC7E,IAAI,CAAC9D,SAAS,CAAC+D,kBAAkB,CAACrD,gBAAgB,CAACK,eAAe,CAACiD,eAAe,CAAC;IACnF,IAAI,CAAChE,SAAS,CAACiE,mBAAmB,GAAGvD,gBAAgB,CAACM,uBAAuB,CAACiD,mBAAmB,IAAI,CAAC,CAAC;IACvG,IAAI,CAACjE,SAAS,CAACkE,sBAAsB,GAAGxD,gBAAgB,CAACM,uBAAuB,CAACkD,sBAAsB,IAAI,CAAC,CAAC;IAC7G,IAAI,CAAClE,SAAS,CAACmE,uBAAuB,GAAGzD,gBAAgB,CAACM,uBAAuB,CAACmD,uBAAuB,IAAI,CAAC,CAAC;IAC/G,MAAMC,oBAAoB,GAAGhD,qBAAqB,CAACiD,0BAA0B;IAC7E,IAAI,CAACC,gBAAC,CAACC,OAAO,CAACH,oBAAoB,CAAC,EAAE;MACpC1D,gBAAgB,CAACO,MAAM,CAACuD,WAAW,CAACC,gCAAa,CAACC,iCAAiC,CAAC,CAAClH,IAAI,GACvF,IAAAmH,cAAI,EAACP,oBAAoB,CAAC;IAC9B;IACA,IAAI,CAAC1D,gBAAgB,CAACO,MAAM,CAACsD,OAAO,CAAC,CAAC,EAAE,IAAI,CAACvE,SAAS,CAACiB,MAAM,GAAGP,gBAAgB,CAACO,MAAM;IACvF,IAAI,CAACjB,SAAS,CAAC4E,2BAA2B,GAAGxD,qBAAqB,CAACwD,2BAA2B;IAC9F,IAAI,CAAC5E,SAAS,CAAC6E,yBAAyB,GAAGzD,qBAAqB,CAACyD,yBAAyB;IAC1F,IAAInE,gBAAgB,CAACoE,WAAW,CAACC,MAAM,EAAE;MACvC,IAAI,CAACC,iCAAiC,CAAC,aAAa,EAAEtE,gBAAgB,CAACoE,WAAW,EAAE,KAAK,CAAC;IAC5F;EACF;EAEQE,iCAAiCA,CAACC,SAAiB,EAAEzH,IAAS,EAAE0H,SAAwB,GAAG,KAAK,EAAE;IACxG,MAAMC,qBAAqB,GAAGC,6BAAwB,CAAC/E,EAAE;IACzD,IAAIgF,mBAAmB,GAAG,IAAI;IAC9B,IAAIC,GAAG,GAAG,IAAI,CAACtF,SAAS,CAACuF,UAAU,CAACC,iBAAiB,CAACL,qBAAqB,CAAC;IAC5E,IAAI,CAACG,GAAG,EAAE;MACRD,mBAAmB,GAAG,KAAK;MAC3B;MACAC,GAAG,GAAG,KAAIG,4BAAkB,EAACC,SAAS,EAAEA,SAAS,EAAEP,qBAAqB,EAAEO,SAAS,EAAE,CAAC,CAAC,CAAC;IAC1F;IAEA,IAAI,CAACJ,GAAG,CAAC9H,IAAI,CAACyH,SAAS,CAAC,EAAEK,GAAG,CAAC9H,IAAI,CAACyH,SAAS,CAAC,GAAG,EAAE;IAClD,IAAIC,SAAS,KAAK,KAAK,EAAE;MACvB,MAAMS,QAAQ,GAAGL,GAAG,CAAC9H,IAAI,CAACyH,SAAS,CAAC,CAACW,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,WAAW,KAAKtI,IAAI,CAACsI,WAAW,CAAC;MACpF,IAAIH,QAAQ,EAAE;QACZA,QAAQ,CAACI,WAAW,GAAGvI,IAAI,CAACuI,WAAW;MACzC,CAAC,MAAM;QACLT,GAAG,CAAC9H,IAAI,CAACyH,SAAS,CAAC,CAAC9B,IAAI,CAAC3F,IAAI,CAAC;MAChC;IACF;IACA,IAAI0H,SAAS,KAAK,KAAK,EAAE;MACvBI,GAAG,CAAC9H,IAAI,CAACyH,SAAS,CAAC,GAAGzH,IAAI;IAC5B;IACA,IAAI,CAAC6H,mBAAmB,EAAE;MACxB,IAAI,CAACrF,SAAS,CAACuF,UAAU,CAACpC,IAAI,CAACmC,GAAG,CAAC;IACrC;EACF;AACF;AAACU,OAAA,CAAAlG,kBAAA,GAAAA,kBAAA"}
|
|
1
|
+
{"version":3,"names":["_ramda","data","_interopRequireDefault","require","_path","_lodash","_componentIssues","_logger","_lastModified","_config","_constants","_dependencyResolver","_dependenciesData","_dependenciesVersionsResolver","_autoDetectDeps","_applyOverrides","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","DependenciesLoader","constructor","component","depsResolver","devFiles","aspectLoader","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","_this$component$compo","useDependenciesCache","cacheData","getDependenciesDataFromCache","rootDir","componentMap","getComponentDir","filesPaths","files","map","f","path","componentConfigPath","join","COMPONENT_CONFIG_FILE_NAME","push","lastModifiedComponent","getLastModifiedComponentTimestampMs","wasModifiedAfterCache","timestamp","logger","debug","DependenciesData","deserialize","shouldBlockSavingInCache","setDependencies","dependencies","setDevDependencies","devDependencies","packageDependencies","devPackageDependencies","peerPackageDependencies","missingFromOverrides","missingPackageDependencies","R","isEmpty","getOrCreate","IssuesClasses","MissingManuallyConfiguredPackages","uniq","manuallyRemovedDependencies","manuallyAddedDependencies","coreAspects","length","pushToDependencyResolverExtension","dataField","operation","depResolverAspectName","DependencyResolverAspect","extExistOnComponent","ext","extensions","findCoreExtension","ExtensionDataEntry","undefined","existing","find","c","packageName","componentId","exports"],"sources":["dependencies-loader.ts"],"sourcesContent":["import R from 'ramda';\nimport path from 'path';\nimport { uniq } from 'lodash';\nimport { IssuesClasses } from '@teambit/component-issues';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { getLastModifiedComponentTimestampMs } from '@teambit/legacy/dist/utils/fs/last-modified';\nimport { ExtensionDataEntry } from '@teambit/legacy/dist/consumer/config';\nimport Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { DependencyLoaderOpts } from '@teambit/legacy/dist/consumer/component/component-loader';\nimport { COMPONENT_CONFIG_FILE_NAME } from '@teambit/legacy/dist/constants';\nimport { Workspace } from '@teambit/workspace';\nimport DependencyResolverAspect, { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { DevFilesMain } from '@teambit/dev-files';\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 ) {\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, 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 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);\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 if (wasModifiedAfterCache) {\n return null; // cache is invalid.\n }\n 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.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 (!R.isEmpty(missingFromOverrides)) {\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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"}
|
|
@@ -3,4 +3,4 @@ import Component from '@teambit/legacy/dist/consumer/component/consumer-componen
|
|
|
3
3
|
import { DependencyResolverMain } from '@teambit/dependency-resolver';
|
|
4
4
|
import OverridesDependencies from './overrides-dependencies';
|
|
5
5
|
import { DebugComponentsDependency } from './auto-detect-deps';
|
|
6
|
-
export declare function updateDependenciesVersions(depsResolver: DependencyResolverMain, workspace: Workspace, component: Component, overridesDependencies: OverridesDependencies, autoDetectOverrides?: Record<string, any>, debugDependencies?: DebugComponentsDependency[]): void;
|
|
6
|
+
export declare function updateDependenciesVersions(depsResolver: DependencyResolverMain, workspace: Workspace, component: Component, overridesDependencies: OverridesDependencies, autoDetectOverrides?: Record<string, any>, debugDependencies?: DebugComponentsDependency[], updateExtensionsVersions?: boolean): void;
|
|
@@ -33,12 +33,14 @@ function _autoDetectDeps() {
|
|
|
33
33
|
return data;
|
|
34
34
|
}
|
|
35
35
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
36
|
-
function updateDependenciesVersions(depsResolver, workspace, component, overridesDependencies, autoDetectOverrides, debugDependencies) {
|
|
36
|
+
function updateDependenciesVersions(depsResolver, workspace, component, overridesDependencies, autoDetectOverrides, debugDependencies, updateExtensionsVersions = true) {
|
|
37
37
|
const consumer = workspace.consumer;
|
|
38
38
|
const autoDetectConfigMerge = workspace.getAutoDetectConfigMerge(component.id) || {};
|
|
39
39
|
updateDependencies(component.dependencies, 'dependencies');
|
|
40
40
|
updateDependencies(component.devDependencies, 'devDependencies');
|
|
41
|
-
|
|
41
|
+
if (updateExtensionsVersions) {
|
|
42
|
+
updateExtensions(component.extensions);
|
|
43
|
+
}
|
|
42
44
|
|
|
43
45
|
/**
|
|
44
46
|
* the `pkg` can be missing only in two scenarios:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_ramda","data","_interopRequireDefault","require","_logger","_constants","_autoDetectDeps","obj","__esModule","default","updateDependenciesVersions","depsResolver","workspace","component","overridesDependencies","autoDetectOverrides","debugDependencies","consumer","autoDetectConfigMerge","getAutoDetectConfigMerge","id","updateDependencies","dependencies","devDependencies","updateExtensions","extensions","resolveVersion","depType","pkg","idFromBitMap","getIdFromBitMap","idFromComponentConfig","getIdFromComponentConfig","getFromComponentConfig","getFromBitMap","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","overrides","getComponentDependenciesWithVersion","R","isEmpty","Object","keys","idStr","toStringWithoutVersion","pkgName","_dependencies$depType","getDependenciesToAddManually","found","validVersion","getValidVersion","DEPENDENCIES_FIELDS","some","depField","_depsResolver$getWork","getWorkspacePolicyManifest","foundVersion","field","_autoDetectConfigMerg","_autoDetectConfigMerg2"],"sources":["dependencies-versions-resolver.ts"],"sourcesContent":["import R from 'ramda';\nimport { ComponentID } from '@teambit/component-id';\nimport Consumer from '@teambit/legacy/dist/consumer/consumer';\nimport { Workspace } from '@teambit/workspace';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport Dependencies from '@teambit/legacy/dist/consumer/component/dependencies/dependencies';\nimport { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport Dependency from '@teambit/legacy/dist/consumer/component/dependencies/dependency';\nimport OverridesDependencies from './overrides-dependencies';\nimport { DebugComponentsDependency, getValidVersion } from './auto-detect-deps';\n\ntype DepType = 'dependencies' | 'devDependencies';\n\nexport function updateDependenciesVersions(\n depsResolver: DependencyResolverMain,\n workspace: Workspace,\n component: Component,\n overridesDependencies: OverridesDependencies,\n autoDetectOverrides?: Record<string, any>,\n debugDependencies?: DebugComponentsDependency[]\n) {\n const consumer: Consumer = workspace.consumer;\n const autoDetectConfigMerge = workspace.getAutoDetectConfigMerge(component.id) || {};\n\n updateDependencies(component.dependencies, 'dependencies');\n updateDependencies(component.devDependencies, 'devDependencies');\n updateExtensions(component.extensions);\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 // 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 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 getIdFromComponentConfig(componentId: ComponentID): ComponentID | undefined {\n const dependencies = component.overrides.getComponentDependenciesWithVersion();\n if (R.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) {\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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"}
|
|
1
|
+
{"version":3,"names":["_ramda","data","_interopRequireDefault","require","_logger","_constants","_autoDetectDeps","obj","__esModule","default","updateDependenciesVersions","depsResolver","workspace","component","overridesDependencies","autoDetectOverrides","debugDependencies","updateExtensionsVersions","consumer","autoDetectConfigMerge","getAutoDetectConfigMerge","id","updateDependencies","dependencies","devDependencies","updateExtensions","extensions","resolveVersion","depType","pkg","idFromBitMap","getIdFromBitMap","idFromComponentConfig","getIdFromComponentConfig","getFromComponentConfig","getFromBitMap","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","overrides","getComponentDependenciesWithVersion","R","isEmpty","Object","keys","idStr","toStringWithoutVersion","pkgName","_dependencies$depType","getDependenciesToAddManually","found","validVersion","getValidVersion","DEPENDENCIES_FIELDS","some","depField","_depsResolver$getWork","getWorkspacePolicyManifest","foundVersion","field","_autoDetectConfigMerg","_autoDetectConfigMerg2"],"sources":["dependencies-versions-resolver.ts"],"sourcesContent":["import R from 'ramda';\nimport { ComponentID } from '@teambit/component-id';\nimport Consumer from '@teambit/legacy/dist/consumer/consumer';\nimport { Workspace } from '@teambit/workspace';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport Dependencies from '@teambit/legacy/dist/consumer/component/dependencies/dependencies';\nimport { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport Dependency from '@teambit/legacy/dist/consumer/component/dependencies/dependency';\nimport OverridesDependencies from './overrides-dependencies';\nimport { DebugComponentsDependency, getValidVersion } from './auto-detect-deps';\n\ntype DepType = 'dependencies' | 'devDependencies';\n\nexport 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\n updateDependencies(component.dependencies, 'dependencies');\n updateDependencies(component.devDependencies, 'devDependencies');\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 // 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 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 getIdFromComponentConfig(componentId: ComponentID): ComponentID | undefined {\n const dependencies = component.overrides.getComponentDependenciesWithVersion();\n if (R.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) {\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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"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/dependencies",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.107",
|
|
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.
|
|
9
|
+
"version": "1.0.107"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"archy": "1.0.0",
|
|
@@ -23,12 +23,12 @@
|
|
|
23
23
|
"@teambit/harmony": "0.4.6",
|
|
24
24
|
"@teambit/component-id": "1.2.0",
|
|
25
25
|
"@teambit/component-version": "1.0.3",
|
|
26
|
-
"@teambit/cli": "0.0.
|
|
27
|
-
"@teambit/aspect-loader": "1.0.
|
|
28
|
-
"@teambit/dependency-resolver": "1.0.
|
|
29
|
-
"@teambit/dev-files": "1.0.
|
|
30
|
-
"@teambit/workspace": "1.0.
|
|
31
|
-
"@teambit/component-issues": "0.0.
|
|
26
|
+
"@teambit/cli": "0.0.839",
|
|
27
|
+
"@teambit/aspect-loader": "1.0.107",
|
|
28
|
+
"@teambit/dependency-resolver": "1.0.107",
|
|
29
|
+
"@teambit/dev-files": "1.0.107",
|
|
30
|
+
"@teambit/workspace": "1.0.107",
|
|
31
|
+
"@teambit/component-issues": "0.0.137"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/cli-table": "^0.3.0",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"@types/testing-library__jest-dom": "5.9.5"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
48
|
-
"@teambit/legacy": "1.0.
|
|
48
|
+
"@teambit/legacy": "1.0.624",
|
|
49
49
|
"react": "^16.8.0 || ^17.0.0",
|
|
50
50
|
"react-dom": "^16.8.0 || ^17.0.0"
|
|
51
51
|
},
|
|
File without changes
|