@teambit/dependency-resolver 1.0.173 → 1.0.174
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/artifacts/__bit_junit.xml +39 -39
- package/artifacts/preview/teambit_dependencies_dependency_resolver-preview.js +1 -1
- package/artifacts/schema.json +844 -494
- package/dependencies/base-dependency.ts +7 -1
- package/dependencies/component-dependency/component-dependency-factory.ts +7 -2
- package/dependencies/component-dependency/component-dependency.ts +3 -2
- package/dependencies/dependency.ts +2 -0
- package/dist/dependencies/base-dependency.d.ts +3 -1
- package/dist/dependencies/base-dependency.js +6 -1
- package/dist/dependencies/base-dependency.js.map +1 -1
- package/dist/dependencies/component-dependency/component-dependency-factory.js +4 -2
- package/dist/dependencies/component-dependency/component-dependency-factory.js.map +1 -1
- package/dist/dependencies/component-dependency/component-dependency.d.ts +1 -1
- package/dist/dependencies/component-dependency/component-dependency.js +2 -2
- package/dist/dependencies/component-dependency/component-dependency.js.map +1 -1
- package/dist/dependencies/dependency.d.ts +2 -0
- package/dist/dependencies/dependency.js.map +1 -1
- package/dist/dependency-resolver.main.runtime.d.ts +1 -1
- package/dist/dependency-resolver.main.runtime.js +2 -2
- package/dist/dependency-resolver.main.runtime.js.map +1 -1
- package/dist/preview-1708958940676.js +7 -0
- package/package.json +10 -10
- package/dist/preview-1708466611462.js +0 -7
|
@@ -10,7 +10,8 @@ export abstract class BaseDependency implements Dependency {
|
|
|
10
10
|
private _lifecycle: DependencyLifecycleType,
|
|
11
11
|
private _source?: DependencySource,
|
|
12
12
|
private _hidden?: boolean,
|
|
13
|
-
private _optional?: boolean
|
|
13
|
+
private _optional?: boolean,
|
|
14
|
+
private _versionRange?: string
|
|
14
15
|
) {}
|
|
15
16
|
|
|
16
17
|
get id(): string {
|
|
@@ -25,6 +26,10 @@ export abstract class BaseDependency implements Dependency {
|
|
|
25
26
|
return this._version;
|
|
26
27
|
}
|
|
27
28
|
|
|
29
|
+
get versionRange() {
|
|
30
|
+
return this._versionRange;
|
|
31
|
+
}
|
|
32
|
+
|
|
28
33
|
get type() {
|
|
29
34
|
return this._type;
|
|
30
35
|
}
|
|
@@ -65,6 +70,7 @@ export abstract class BaseDependency implements Dependency {
|
|
|
65
70
|
return {
|
|
66
71
|
id: this.id,
|
|
67
72
|
version: this.version,
|
|
73
|
+
versionRange: this.versionRange,
|
|
68
74
|
__type: this.type,
|
|
69
75
|
lifecycle: this.lifecycle.toString(),
|
|
70
76
|
source: this.source,
|
|
@@ -40,7 +40,8 @@ export class ComponentDependencyFactory implements DependencyFactory {
|
|
|
40
40
|
serialized.lifecycle as DependencyLifecycleType,
|
|
41
41
|
serialized.source,
|
|
42
42
|
serialized.hidden,
|
|
43
|
-
serialized.optional
|
|
43
|
+
serialized.optional,
|
|
44
|
+
serialized.versionRange
|
|
44
45
|
) as unknown as ComponentDependency;
|
|
45
46
|
}
|
|
46
47
|
|
|
@@ -51,11 +52,14 @@ export class ComponentDependencyFactory implements DependencyFactory {
|
|
|
51
52
|
const devDeps = await mapSeries(legacyComponent.devDependencies.get(), (dep) =>
|
|
52
53
|
this.transformLegacyComponentDepToSerializedDependency(dep, 'dev')
|
|
53
54
|
);
|
|
55
|
+
const peerDeps = await mapSeries(legacyComponent.peerDependencies.get(), (dep) =>
|
|
56
|
+
this.transformLegacyComponentDepToSerializedDependency(dep, 'peer')
|
|
57
|
+
);
|
|
54
58
|
const extensionDeps = await mapSeries(legacyComponent.extensions, (extension) =>
|
|
55
59
|
this.transformLegacyComponentExtensionToSerializedDependency(extension, 'dev')
|
|
56
60
|
);
|
|
57
61
|
const filteredExtensionDeps: SerializedComponentDependency[] = compact(extensionDeps);
|
|
58
|
-
const serializedComponentDeps = [...runtimeDeps, ...devDeps, ...filteredExtensionDeps];
|
|
62
|
+
const serializedComponentDeps = [...runtimeDeps, ...devDeps, ...peerDeps, ...filteredExtensionDeps];
|
|
59
63
|
const componentDeps: ComponentDependency[] = await mapSeries(serializedComponentDeps, (dep) => this.parse(dep));
|
|
60
64
|
const dependencyList = new DependencyList(componentDeps);
|
|
61
65
|
return dependencyList;
|
|
@@ -81,6 +85,7 @@ export class ComponentDependencyFactory implements DependencyFactory {
|
|
|
81
85
|
packageName,
|
|
82
86
|
componentId: legacyDep.id.serialize(),
|
|
83
87
|
version: legacyDep.id._legacy.getVersion().toString(),
|
|
88
|
+
versionRange: legacyDep.versionRange,
|
|
84
89
|
__type: TYPE,
|
|
85
90
|
lifecycle,
|
|
86
91
|
};
|
|
@@ -24,9 +24,10 @@ export class ComponentDependency extends BaseDependency {
|
|
|
24
24
|
lifecycle: DependencyLifecycleType,
|
|
25
25
|
source?: DependencySource,
|
|
26
26
|
hidden?: boolean,
|
|
27
|
-
optional?: boolean
|
|
27
|
+
optional?: boolean,
|
|
28
|
+
versionRange?: string
|
|
28
29
|
) {
|
|
29
|
-
super(id, version, lifecycle, source, hidden, optional);
|
|
30
|
+
super(id, version, lifecycle, source, hidden, optional, versionRange);
|
|
30
31
|
this._type = TYPE;
|
|
31
32
|
}
|
|
32
33
|
|
|
@@ -7,6 +7,7 @@ export type DependencyLifecycleType = WorkspaceDependencyLifecycleType | 'dev';
|
|
|
7
7
|
export interface SerializedDependency {
|
|
8
8
|
id: string;
|
|
9
9
|
version: string;
|
|
10
|
+
versionRange?: string;
|
|
10
11
|
__type: string;
|
|
11
12
|
lifecycle: string;
|
|
12
13
|
source?: DependencySource;
|
|
@@ -29,6 +30,7 @@ export type DependencyManifest = {
|
|
|
29
30
|
export interface Dependency {
|
|
30
31
|
id: string;
|
|
31
32
|
version: string;
|
|
33
|
+
versionRange?: string;
|
|
32
34
|
type: string;
|
|
33
35
|
idWithoutVersion: string;
|
|
34
36
|
lifecycle: DependencyLifecycleType;
|
|
@@ -7,11 +7,13 @@ export declare abstract class BaseDependency implements Dependency {
|
|
|
7
7
|
private _source?;
|
|
8
8
|
private _hidden?;
|
|
9
9
|
private _optional?;
|
|
10
|
+
private _versionRange?;
|
|
10
11
|
_type: string;
|
|
11
|
-
constructor(_id: string, _version: string, _lifecycle: DependencyLifecycleType, _source?: DependencySource | undefined, _hidden?: boolean | undefined, _optional?: boolean | undefined);
|
|
12
|
+
constructor(_id: string, _version: string, _lifecycle: DependencyLifecycleType, _source?: DependencySource | undefined, _hidden?: boolean | undefined, _optional?: boolean | undefined, _versionRange?: string | undefined);
|
|
12
13
|
get id(): string;
|
|
13
14
|
set id(newId: string);
|
|
14
15
|
get version(): string;
|
|
16
|
+
get versionRange(): string | undefined;
|
|
15
17
|
get type(): string;
|
|
16
18
|
get lifecycle(): DependencyLifecycleType;
|
|
17
19
|
get source(): DependencySource | undefined;
|
|
@@ -8,13 +8,14 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
|
|
|
8
8
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
|
|
9
9
|
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
10
10
|
class BaseDependency {
|
|
11
|
-
constructor(_id, _version, _lifecycle, _source, _hidden, _optional) {
|
|
11
|
+
constructor(_id, _version, _lifecycle, _source, _hidden, _optional, _versionRange) {
|
|
12
12
|
this._id = _id;
|
|
13
13
|
this._version = _version;
|
|
14
14
|
this._lifecycle = _lifecycle;
|
|
15
15
|
this._source = _source;
|
|
16
16
|
this._hidden = _hidden;
|
|
17
17
|
this._optional = _optional;
|
|
18
|
+
this._versionRange = _versionRange;
|
|
18
19
|
_defineProperty(this, "_type", void 0);
|
|
19
20
|
}
|
|
20
21
|
get id() {
|
|
@@ -26,6 +27,9 @@ class BaseDependency {
|
|
|
26
27
|
get version() {
|
|
27
28
|
return this._version;
|
|
28
29
|
}
|
|
30
|
+
get versionRange() {
|
|
31
|
+
return this._versionRange;
|
|
32
|
+
}
|
|
29
33
|
get type() {
|
|
30
34
|
return this._type;
|
|
31
35
|
}
|
|
@@ -57,6 +61,7 @@ class BaseDependency {
|
|
|
57
61
|
return {
|
|
58
62
|
id: this.id,
|
|
59
63
|
version: this.version,
|
|
64
|
+
versionRange: this.versionRange,
|
|
60
65
|
__type: this.type,
|
|
61
66
|
lifecycle: this.lifecycle.toString(),
|
|
62
67
|
source: this.source,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["BaseDependency","constructor","_id","_version","_lifecycle","_source","_hidden","_optional","_defineProperty","id","newId","version","type","_type","lifecycle","source","hidden","optional","idWithoutVersion","serialize","__type","toString","setVersion","newVersion","getPackageName","toManifest","packageName","exports"],"sources":["base-dependency.ts"],"sourcesContent":["import { DependencySource } from '../policy/variant-policy/variant-policy';\nimport { Dependency, DependencyLifecycleType, DependencyManifest } from './dependency';\n\nexport abstract class BaseDependency implements Dependency {\n _type: string;\n\n constructor(\n private _id: string,\n private _version: string,\n private _lifecycle: DependencyLifecycleType,\n private _source?: DependencySource,\n private _hidden?: boolean,\n private _optional?: boolean\n ) {}\n\n get id(): string {\n return this._id;\n }\n\n set id(newId: string) {\n this._id = newId;\n }\n\n get version() {\n return this._version;\n }\n\n get type() {\n return this._type;\n }\n\n get lifecycle() {\n return this._lifecycle;\n }\n\n get source() {\n return this._source;\n }\n\n set source(source) {\n this._source = source;\n }\n\n set hidden(hidden) {\n this._hidden = hidden;\n }\n\n get hidden() {\n return this._hidden;\n }\n\n set optional(optional) {\n this._optional = optional;\n }\n\n get optional() {\n return this._optional;\n }\n\n get idWithoutVersion() {\n return this._id;\n }\n\n serialize<SerializedDependency>(): SerializedDependency {\n return {\n id: this.id,\n version: this.version,\n __type: this.type,\n lifecycle: this.lifecycle.toString(),\n source: this.source,\n hidden: this.hidden,\n optional: this.optional,\n } as unknown as SerializedDependency;\n }\n\n setVersion(newVersion: string) {\n this._version = newVersion;\n }\n\n getPackageName() {\n return this.id;\n }\n\n toManifest(): DependencyManifest {\n const packageName = this.getPackageName?.();\n const version = this.version;\n return {\n packageName,\n version,\n };\n }\n}\n"],"mappings":";;;;;;;;;AAGO,MAAeA,cAAc,CAAuB;EAGzDC,WAAWA,CACDC,GAAW,EACXC,QAAgB,EAChBC,UAAmC,EACnCC,OAA0B,EAC1BC,OAAiB,EACjBC,SAAmB,
|
|
1
|
+
{"version":3,"names":["BaseDependency","constructor","_id","_version","_lifecycle","_source","_hidden","_optional","_versionRange","_defineProperty","id","newId","version","versionRange","type","_type","lifecycle","source","hidden","optional","idWithoutVersion","serialize","__type","toString","setVersion","newVersion","getPackageName","toManifest","packageName","exports"],"sources":["base-dependency.ts"],"sourcesContent":["import { DependencySource } from '../policy/variant-policy/variant-policy';\nimport { Dependency, DependencyLifecycleType, DependencyManifest } from './dependency';\n\nexport abstract class BaseDependency implements Dependency {\n _type: string;\n\n constructor(\n private _id: string,\n private _version: string,\n private _lifecycle: DependencyLifecycleType,\n private _source?: DependencySource,\n private _hidden?: boolean,\n private _optional?: boolean,\n private _versionRange?: string\n ) {}\n\n get id(): string {\n return this._id;\n }\n\n set id(newId: string) {\n this._id = newId;\n }\n\n get version() {\n return this._version;\n }\n\n get versionRange() {\n return this._versionRange;\n }\n\n get type() {\n return this._type;\n }\n\n get lifecycle() {\n return this._lifecycle;\n }\n\n get source() {\n return this._source;\n }\n\n set source(source) {\n this._source = source;\n }\n\n set hidden(hidden) {\n this._hidden = hidden;\n }\n\n get hidden() {\n return this._hidden;\n }\n\n set optional(optional) {\n this._optional = optional;\n }\n\n get optional() {\n return this._optional;\n }\n\n get idWithoutVersion() {\n return this._id;\n }\n\n serialize<SerializedDependency>(): SerializedDependency {\n return {\n id: this.id,\n version: this.version,\n versionRange: this.versionRange,\n __type: this.type,\n lifecycle: this.lifecycle.toString(),\n source: this.source,\n hidden: this.hidden,\n optional: this.optional,\n } as unknown as SerializedDependency;\n }\n\n setVersion(newVersion: string) {\n this._version = newVersion;\n }\n\n getPackageName() {\n return this.id;\n }\n\n toManifest(): DependencyManifest {\n const packageName = this.getPackageName?.();\n const version = this.version;\n return {\n packageName,\n version,\n };\n }\n}\n"],"mappings":";;;;;;;;;AAGO,MAAeA,cAAc,CAAuB;EAGzDC,WAAWA,CACDC,GAAW,EACXC,QAAgB,EAChBC,UAAmC,EACnCC,OAA0B,EAC1BC,OAAiB,EACjBC,SAAmB,EACnBC,aAAsB,EAC9B;IAAA,KAPQN,GAAW,GAAXA,GAAW;IAAA,KACXC,QAAgB,GAAhBA,QAAgB;IAAA,KAChBC,UAAmC,GAAnCA,UAAmC;IAAA,KACnCC,OAA0B,GAA1BA,OAA0B;IAAA,KAC1BC,OAAiB,GAAjBA,OAAiB;IAAA,KACjBC,SAAmB,GAAnBA,SAAmB;IAAA,KACnBC,aAAsB,GAAtBA,aAAsB;IAAAC,eAAA;EAC7B;EAEH,IAAIC,EAAEA,CAAA,EAAW;IACf,OAAO,IAAI,CAACR,GAAG;EACjB;EAEA,IAAIQ,EAAEA,CAACC,KAAa,EAAE;IACpB,IAAI,CAACT,GAAG,GAAGS,KAAK;EAClB;EAEA,IAAIC,OAAOA,CAAA,EAAG;IACZ,OAAO,IAAI,CAACT,QAAQ;EACtB;EAEA,IAAIU,YAAYA,CAAA,EAAG;IACjB,OAAO,IAAI,CAACL,aAAa;EAC3B;EAEA,IAAIM,IAAIA,CAAA,EAAG;IACT,OAAO,IAAI,CAACC,KAAK;EACnB;EAEA,IAAIC,SAASA,CAAA,EAAG;IACd,OAAO,IAAI,CAACZ,UAAU;EACxB;EAEA,IAAIa,MAAMA,CAAA,EAAG;IACX,OAAO,IAAI,CAACZ,OAAO;EACrB;EAEA,IAAIY,MAAMA,CAACA,MAAM,EAAE;IACjB,IAAI,CAACZ,OAAO,GAAGY,MAAM;EACvB;EAEA,IAAIC,MAAMA,CAACA,MAAM,EAAE;IACjB,IAAI,CAACZ,OAAO,GAAGY,MAAM;EACvB;EAEA,IAAIA,MAAMA,CAAA,EAAG;IACX,OAAO,IAAI,CAACZ,OAAO;EACrB;EAEA,IAAIa,QAAQA,CAACA,QAAQ,EAAE;IACrB,IAAI,CAACZ,SAAS,GAAGY,QAAQ;EAC3B;EAEA,IAAIA,QAAQA,CAAA,EAAG;IACb,OAAO,IAAI,CAACZ,SAAS;EACvB;EAEA,IAAIa,gBAAgBA,CAAA,EAAG;IACrB,OAAO,IAAI,CAAClB,GAAG;EACjB;EAEAmB,SAASA,CAAA,EAA+C;IACtD,OAAO;MACLX,EAAE,EAAE,IAAI,CAACA,EAAE;MACXE,OAAO,EAAE,IAAI,CAACA,OAAO;MACrBC,YAAY,EAAE,IAAI,CAACA,YAAY;MAC/BS,MAAM,EAAE,IAAI,CAACR,IAAI;MACjBE,SAAS,EAAE,IAAI,CAACA,SAAS,CAACO,QAAQ,CAAC,CAAC;MACpCN,MAAM,EAAE,IAAI,CAACA,MAAM;MACnBC,MAAM,EAAE,IAAI,CAACA,MAAM;MACnBC,QAAQ,EAAE,IAAI,CAACA;IACjB,CAAC;EACH;EAEAK,UAAUA,CAACC,UAAkB,EAAE;IAC7B,IAAI,CAACtB,QAAQ,GAAGsB,UAAU;EAC5B;EAEAC,cAAcA,CAAA,EAAG;IACf,OAAO,IAAI,CAAChB,EAAE;EAChB;EAEAiB,UAAUA,CAAA,EAAuB;IAC/B,MAAMC,WAAW,GAAG,IAAI,CAACF,cAAc,GAAG,CAAC;IAC3C,MAAMd,OAAO,GAAG,IAAI,CAACA,OAAO;IAC5B,OAAO;MACLgB,WAAW;MACXhB;IACF,CAAC;EACH;AACF;AAACiB,OAAA,CAAA7B,cAAA,GAAAA,cAAA"}
|
|
@@ -68,14 +68,15 @@ class ComponentDependencyFactory {
|
|
|
68
68
|
} else {
|
|
69
69
|
throw new Error(`ComponentDependencyFactory, unable to parse ${serialized.componentId}`);
|
|
70
70
|
}
|
|
71
|
-
return new (_componentDependency().ComponentDependency)(id, serialized.isExtension, serialized.packageName, serialized.id, serialized.version, serialized.lifecycle, serialized.source, serialized.hidden, serialized.optional);
|
|
71
|
+
return new (_componentDependency().ComponentDependency)(id, serialized.isExtension, serialized.packageName, serialized.id, serialized.version, serialized.lifecycle, serialized.source, serialized.hidden, serialized.optional, serialized.versionRange);
|
|
72
72
|
}
|
|
73
73
|
async fromLegacyComponent(legacyComponent) {
|
|
74
74
|
const runtimeDeps = await (0, _pMapSeries().default)(legacyComponent.dependencies.get(), dep => this.transformLegacyComponentDepToSerializedDependency(dep, 'runtime'));
|
|
75
75
|
const devDeps = await (0, _pMapSeries().default)(legacyComponent.devDependencies.get(), dep => this.transformLegacyComponentDepToSerializedDependency(dep, 'dev'));
|
|
76
|
+
const peerDeps = await (0, _pMapSeries().default)(legacyComponent.peerDependencies.get(), dep => this.transformLegacyComponentDepToSerializedDependency(dep, 'peer'));
|
|
76
77
|
const extensionDeps = await (0, _pMapSeries().default)(legacyComponent.extensions, extension => this.transformLegacyComponentExtensionToSerializedDependency(extension, 'dev'));
|
|
77
78
|
const filteredExtensionDeps = (0, _lodash().compact)(extensionDeps);
|
|
78
|
-
const serializedComponentDeps = [...runtimeDeps, ...devDeps, ...filteredExtensionDeps];
|
|
79
|
+
const serializedComponentDeps = [...runtimeDeps, ...devDeps, ...peerDeps, ...filteredExtensionDeps];
|
|
79
80
|
const componentDeps = await (0, _pMapSeries().default)(serializedComponentDeps, dep => this.parse(dep));
|
|
80
81
|
const dependencyList = new (_dependencyList().DependencyList)(componentDeps);
|
|
81
82
|
return dependencyList;
|
|
@@ -96,6 +97,7 @@ class ComponentDependencyFactory {
|
|
|
96
97
|
packageName,
|
|
97
98
|
componentId: legacyDep.id.serialize(),
|
|
98
99
|
version: legacyDep.id._legacy.getVersion().toString(),
|
|
100
|
+
versionRange: legacyDep.versionRange,
|
|
99
101
|
__type: _componentDependency().TYPE,
|
|
100
102
|
lifecycle
|
|
101
103
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_lodash","_componentId","_componentIdToPackageName","_componentDependency","_dependencyList","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","ComponentDependencyFactory","constructor","componentAspect","type","TYPE","parse","serialized","id","componentId","ComponentID","scope","fromObject","Error","ComponentDependency","isExtension","packageName","version","lifecycle","source","hidden","optional","fromLegacyComponent","legacyComponent","runtimeDeps","mapSeries","dependencies","get","dep","transformLegacyComponentDepToSerializedDependency","devDeps","devDependencies","extensionDeps","extensions","extension","transformLegacyComponentExtensionToSerializedDependency","filteredExtensionDeps","compact","serializedComponentDeps","componentDeps","dependencyList","DependencyList","legacyDep","host","getHost","depComponent","getLegacyMinimal","componentIdToPackageName","toString","serialize","_legacy","getVersion","__type","extensionId","undefined","extComponent","state","_consumer","exports"],"sources":["component-dependency-factory.ts"],"sourcesContent":["import mapSeries from 'p-map-series';\nimport { ComponentMain } from '@teambit/component';\nimport { compact } from 'lodash';\nimport { ComponentID } from '@teambit/component-id';\nimport { Dependency as LegacyDependency } from '@teambit/legacy/dist/consumer/component/dependencies';\nimport LegacyComponent from '@teambit/legacy/dist/consumer/component';\nimport { ExtensionDataEntry } from '@teambit/legacy/dist/consumer/config';\nimport componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';\nimport { ComponentDependency, SerializedComponentDependency, TYPE } from './component-dependency';\nimport { DependencyLifecycleType } from '../dependency';\nimport { DependencyFactory } from '../dependency-factory';\nimport { DependencyList } from '../dependency-list';\n\nexport class ComponentDependencyFactory implements DependencyFactory {\n type: string;\n\n constructor(private componentAspect: ComponentMain) {\n this.type = TYPE;\n }\n\n // TODO: solve this generics issue and remove the ts-ignore\n // @ts-ignore\n parse<ComponentDependency, S extends SerializedComponentDependency>(serialized: S): ComponentDependency {\n let id;\n\n if (serialized.componentId instanceof ComponentID) {\n id = serialized.componentId;\n } else if (typeof serialized.componentId === 'object' && serialized.componentId.scope) {\n id = ComponentID.fromObject(serialized.componentId as any);\n } else {\n throw new Error(`ComponentDependencyFactory, unable to parse ${serialized.componentId}`);\n }\n\n return new ComponentDependency(\n id,\n serialized.isExtension,\n serialized.packageName,\n serialized.id,\n serialized.version,\n serialized.lifecycle as DependencyLifecycleType,\n serialized.source,\n serialized.hidden,\n serialized.optional\n ) as unknown as ComponentDependency;\n }\n\n async fromLegacyComponent(legacyComponent: LegacyComponent): Promise<DependencyList> {\n const runtimeDeps = await mapSeries(legacyComponent.dependencies.get(), (dep) =>\n this.transformLegacyComponentDepToSerializedDependency(dep, 'runtime')\n );\n const devDeps = await mapSeries(legacyComponent.devDependencies.get(), (dep) =>\n this.transformLegacyComponentDepToSerializedDependency(dep, 'dev')\n );\n const extensionDeps = await mapSeries(legacyComponent.extensions, (extension) =>\n this.transformLegacyComponentExtensionToSerializedDependency(extension, 'dev')\n );\n const filteredExtensionDeps: SerializedComponentDependency[] = compact(extensionDeps);\n const serializedComponentDeps = [...runtimeDeps, ...devDeps, ...filteredExtensionDeps];\n const componentDeps: ComponentDependency[] = await mapSeries(serializedComponentDeps, (dep) => this.parse(dep));\n const dependencyList = new DependencyList(componentDeps);\n return dependencyList;\n }\n\n private async transformLegacyComponentDepToSerializedDependency(\n legacyDep: LegacyDependency,\n lifecycle: DependencyLifecycleType\n ): Promise<SerializedComponentDependency> {\n let packageName = legacyDep.packageName || '';\n if (!packageName) {\n const host = this.componentAspect.getHost();\n const id = legacyDep.id;\n const depComponent = await host.getLegacyMinimal(id);\n if (depComponent) {\n packageName = componentIdToPackageName(depComponent);\n }\n }\n\n return {\n id: legacyDep.id.toString(),\n isExtension: false,\n packageName,\n componentId: legacyDep.id.serialize(),\n version: legacyDep.id._legacy.getVersion().toString(),\n __type: TYPE,\n lifecycle,\n };\n }\n\n private async transformLegacyComponentExtensionToSerializedDependency(\n extension: ExtensionDataEntry,\n lifecycle: DependencyLifecycleType\n ): Promise<SerializedComponentDependency | undefined> {\n if (!extension.extensionId) {\n return undefined;\n }\n const host = this.componentAspect.getHost();\n const id = extension.extensionId;\n const extComponent = await host.get(id);\n let packageName = '';\n if (extComponent) {\n packageName = componentIdToPackageName(extComponent.state._consumer);\n }\n return {\n id: extension.extensionId.toString(),\n isExtension: true,\n packageName,\n componentId: extension.extensionId.serialize(),\n version: extension.extensionId._legacy.getVersion().toString(),\n __type: TYPE,\n lifecycle,\n };\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_lodash","_componentId","_componentIdToPackageName","_componentDependency","_dependencyList","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","ComponentDependencyFactory","constructor","componentAspect","type","TYPE","parse","serialized","id","componentId","ComponentID","scope","fromObject","Error","ComponentDependency","isExtension","packageName","version","lifecycle","source","hidden","optional","versionRange","fromLegacyComponent","legacyComponent","runtimeDeps","mapSeries","dependencies","get","dep","transformLegacyComponentDepToSerializedDependency","devDeps","devDependencies","peerDeps","peerDependencies","extensionDeps","extensions","extension","transformLegacyComponentExtensionToSerializedDependency","filteredExtensionDeps","compact","serializedComponentDeps","componentDeps","dependencyList","DependencyList","legacyDep","host","getHost","depComponent","getLegacyMinimal","componentIdToPackageName","toString","serialize","_legacy","getVersion","__type","extensionId","undefined","extComponent","state","_consumer","exports"],"sources":["component-dependency-factory.ts"],"sourcesContent":["import mapSeries from 'p-map-series';\nimport { ComponentMain } from '@teambit/component';\nimport { compact } from 'lodash';\nimport { ComponentID } from '@teambit/component-id';\nimport { Dependency as LegacyDependency } from '@teambit/legacy/dist/consumer/component/dependencies';\nimport LegacyComponent from '@teambit/legacy/dist/consumer/component';\nimport { ExtensionDataEntry } from '@teambit/legacy/dist/consumer/config';\nimport componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';\nimport { ComponentDependency, SerializedComponentDependency, TYPE } from './component-dependency';\nimport { DependencyLifecycleType } from '../dependency';\nimport { DependencyFactory } from '../dependency-factory';\nimport { DependencyList } from '../dependency-list';\n\nexport class ComponentDependencyFactory implements DependencyFactory {\n type: string;\n\n constructor(private componentAspect: ComponentMain) {\n this.type = TYPE;\n }\n\n // TODO: solve this generics issue and remove the ts-ignore\n // @ts-ignore\n parse<ComponentDependency, S extends SerializedComponentDependency>(serialized: S): ComponentDependency {\n let id;\n\n if (serialized.componentId instanceof ComponentID) {\n id = serialized.componentId;\n } else if (typeof serialized.componentId === 'object' && serialized.componentId.scope) {\n id = ComponentID.fromObject(serialized.componentId as any);\n } else {\n throw new Error(`ComponentDependencyFactory, unable to parse ${serialized.componentId}`);\n }\n\n return new ComponentDependency(\n id,\n serialized.isExtension,\n serialized.packageName,\n serialized.id,\n serialized.version,\n serialized.lifecycle as DependencyLifecycleType,\n serialized.source,\n serialized.hidden,\n serialized.optional,\n serialized.versionRange\n ) as unknown as ComponentDependency;\n }\n\n async fromLegacyComponent(legacyComponent: LegacyComponent): Promise<DependencyList> {\n const runtimeDeps = await mapSeries(legacyComponent.dependencies.get(), (dep) =>\n this.transformLegacyComponentDepToSerializedDependency(dep, 'runtime')\n );\n const devDeps = await mapSeries(legacyComponent.devDependencies.get(), (dep) =>\n this.transformLegacyComponentDepToSerializedDependency(dep, 'dev')\n );\n const peerDeps = await mapSeries(legacyComponent.peerDependencies.get(), (dep) =>\n this.transformLegacyComponentDepToSerializedDependency(dep, 'peer')\n );\n const extensionDeps = await mapSeries(legacyComponent.extensions, (extension) =>\n this.transformLegacyComponentExtensionToSerializedDependency(extension, 'dev')\n );\n const filteredExtensionDeps: SerializedComponentDependency[] = compact(extensionDeps);\n const serializedComponentDeps = [...runtimeDeps, ...devDeps, ...peerDeps, ...filteredExtensionDeps];\n const componentDeps: ComponentDependency[] = await mapSeries(serializedComponentDeps, (dep) => this.parse(dep));\n const dependencyList = new DependencyList(componentDeps);\n return dependencyList;\n }\n\n private async transformLegacyComponentDepToSerializedDependency(\n legacyDep: LegacyDependency,\n lifecycle: DependencyLifecycleType\n ): Promise<SerializedComponentDependency> {\n let packageName = legacyDep.packageName || '';\n if (!packageName) {\n const host = this.componentAspect.getHost();\n const id = legacyDep.id;\n const depComponent = await host.getLegacyMinimal(id);\n if (depComponent) {\n packageName = componentIdToPackageName(depComponent);\n }\n }\n\n return {\n id: legacyDep.id.toString(),\n isExtension: false,\n packageName,\n componentId: legacyDep.id.serialize(),\n version: legacyDep.id._legacy.getVersion().toString(),\n versionRange: legacyDep.versionRange,\n __type: TYPE,\n lifecycle,\n };\n }\n\n private async transformLegacyComponentExtensionToSerializedDependency(\n extension: ExtensionDataEntry,\n lifecycle: DependencyLifecycleType\n ): Promise<SerializedComponentDependency | undefined> {\n if (!extension.extensionId) {\n return undefined;\n }\n const host = this.componentAspect.getHost();\n const id = extension.extensionId;\n const extComponent = await host.get(id);\n let packageName = '';\n if (extComponent) {\n packageName = componentIdToPackageName(extComponent.state._consumer);\n }\n return {\n id: extension.extensionId.toString(),\n isExtension: true,\n packageName,\n componentId: extension.extensionId.serialize(),\n version: extension.extensionId._legacy.getVersion().toString(),\n __type: TYPE,\n lifecycle,\n };\n }\n}\n"],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export declare class ComponentDependency extends BaseDependency {
|
|
|
13
13
|
private _componentId;
|
|
14
14
|
private _isExtension;
|
|
15
15
|
private _packageName;
|
|
16
|
-
constructor(_componentId: ComponentID, _isExtension: boolean, _packageName: string, id: string, version: string, lifecycle: DependencyLifecycleType, source?: DependencySource, hidden?: boolean, optional?: boolean);
|
|
16
|
+
constructor(_componentId: ComponentID, _isExtension: boolean, _packageName: string, id: string, version: string, lifecycle: DependencyLifecycleType, source?: DependencySource, hidden?: boolean, optional?: boolean, versionRange?: string);
|
|
17
17
|
get componentId(): ComponentID;
|
|
18
18
|
get isExtension(): boolean;
|
|
19
19
|
get packageName(): string;
|
|
@@ -14,8 +14,8 @@ function _baseDependency() {
|
|
|
14
14
|
const TYPE = exports.TYPE = 'component';
|
|
15
15
|
// TODO: think about where is the right place to put this
|
|
16
16
|
class ComponentDependency extends _baseDependency().BaseDependency {
|
|
17
|
-
constructor(_componentId, _isExtension, _packageName, id, version, lifecycle, source, hidden, optional) {
|
|
18
|
-
super(id, version, lifecycle, source, hidden, optional);
|
|
17
|
+
constructor(_componentId, _isExtension, _packageName, id, version, lifecycle, source, hidden, optional, versionRange) {
|
|
18
|
+
super(id, version, lifecycle, source, hidden, optional, versionRange);
|
|
19
19
|
this._componentId = _componentId;
|
|
20
20
|
this._isExtension = _isExtension;
|
|
21
21
|
this._packageName = _packageName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_baseDependency","data","require","TYPE","exports","ComponentDependency","BaseDependency","constructor","_componentId","_isExtension","_packageName","id","version","lifecycle","source","hidden","optional","_type","componentId","isExtension","packageName","getPackageName","idWithoutVersion","toStringWithoutVersion","setVersion","newVersion","newComponentId","changeVersion","splittedId","split","length","newId","serialize","serialized","Object","assign","toManifest"],"sources":["component-dependency.ts"],"sourcesContent":["import type { ComponentID } from '@teambit/component-id';\nimport type { BitIdProps } from '@teambit/legacy-bit-id';\n\nimport { SerializedDependency, DependencyLifecycleType, DependencyManifest } from '../dependency';\nimport { BaseDependency } from '../base-dependency';\nimport { DependencySource } from '../../policy/variant-policy/variant-policy';\n\nexport const TYPE = 'component';\n\nexport interface SerializedComponentDependency extends SerializedDependency {\n componentId: BitIdProps;\n isExtension: boolean;\n packageName: string;\n}\n\n// TODO: think about where is the right place to put this\nexport class ComponentDependency extends BaseDependency {\n constructor(\n private _componentId: ComponentID,\n private _isExtension: boolean,\n private _packageName: string,\n id: string,\n version: string,\n lifecycle: DependencyLifecycleType,\n source?: DependencySource,\n hidden?: boolean,\n optional?: boolean\n ) {\n super(id, version, lifecycle, source, hidden, optional);\n this._type = TYPE;\n }\n\n get componentId() {\n return this._componentId;\n }\n\n get isExtension() {\n return this._isExtension;\n }\n\n get packageName() {\n return this._packageName;\n }\n\n getPackageName() {\n return this.packageName;\n }\n\n get idWithoutVersion() {\n return this.componentId.toStringWithoutVersion();\n }\n\n setVersion(newVersion: string) {\n super.setVersion(newVersion);\n const newComponentId = this.componentId.changeVersion(newVersion);\n this._componentId = newComponentId;\n const splittedId = this.id.split('@');\n if (splittedId.length === 2) {\n const newId = `${splittedId[0]}@${newVersion}`;\n this.id = newId;\n }\n }\n\n // eslint-disable-next-line @typescript-eslint/no-shadow\n serialize<SerializedComponentDependency>(): SerializedComponentDependency {\n const serialized = Object.assign({}, super.serialize(), {\n componentId: this.componentId.serialize(),\n isExtension: this.isExtension,\n packageName: this.packageName,\n }) as unknown as SerializedComponentDependency;\n return serialized;\n }\n\n toManifest(): DependencyManifest {\n const packageName = this.getPackageName?.();\n const version = this.version;\n return {\n packageName,\n version,\n };\n }\n}\n"],"mappings":";;;;;;AAIA,SAAAA,gBAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,eAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGO,MAAME,IAAI,GAAAC,OAAA,CAAAD,IAAA,GAAG,WAAW;AAQ/B;AACO,MAAME,mBAAmB,SAASC,gCAAc,CAAC;EACtDC,WAAWA,CACDC,YAAyB,EACzBC,YAAqB,EACrBC,YAAoB,EAC5BC,EAAU,EACVC,OAAe,EACfC,SAAkC,EAClCC,MAAyB,EACzBC,MAAgB,EAChBC,QAAkB,
|
|
1
|
+
{"version":3,"names":["_baseDependency","data","require","TYPE","exports","ComponentDependency","BaseDependency","constructor","_componentId","_isExtension","_packageName","id","version","lifecycle","source","hidden","optional","versionRange","_type","componentId","isExtension","packageName","getPackageName","idWithoutVersion","toStringWithoutVersion","setVersion","newVersion","newComponentId","changeVersion","splittedId","split","length","newId","serialize","serialized","Object","assign","toManifest"],"sources":["component-dependency.ts"],"sourcesContent":["import type { ComponentID } from '@teambit/component-id';\nimport type { BitIdProps } from '@teambit/legacy-bit-id';\n\nimport { SerializedDependency, DependencyLifecycleType, DependencyManifest } from '../dependency';\nimport { BaseDependency } from '../base-dependency';\nimport { DependencySource } from '../../policy/variant-policy/variant-policy';\n\nexport const TYPE = 'component';\n\nexport interface SerializedComponentDependency extends SerializedDependency {\n componentId: BitIdProps;\n isExtension: boolean;\n packageName: string;\n}\n\n// TODO: think about where is the right place to put this\nexport class ComponentDependency extends BaseDependency {\n constructor(\n private _componentId: ComponentID,\n private _isExtension: boolean,\n private _packageName: string,\n id: string,\n version: string,\n lifecycle: DependencyLifecycleType,\n source?: DependencySource,\n hidden?: boolean,\n optional?: boolean,\n versionRange?: string\n ) {\n super(id, version, lifecycle, source, hidden, optional, versionRange);\n this._type = TYPE;\n }\n\n get componentId() {\n return this._componentId;\n }\n\n get isExtension() {\n return this._isExtension;\n }\n\n get packageName() {\n return this._packageName;\n }\n\n getPackageName() {\n return this.packageName;\n }\n\n get idWithoutVersion() {\n return this.componentId.toStringWithoutVersion();\n }\n\n setVersion(newVersion: string) {\n super.setVersion(newVersion);\n const newComponentId = this.componentId.changeVersion(newVersion);\n this._componentId = newComponentId;\n const splittedId = this.id.split('@');\n if (splittedId.length === 2) {\n const newId = `${splittedId[0]}@${newVersion}`;\n this.id = newId;\n }\n }\n\n // eslint-disable-next-line @typescript-eslint/no-shadow\n serialize<SerializedComponentDependency>(): SerializedComponentDependency {\n const serialized = Object.assign({}, super.serialize(), {\n componentId: this.componentId.serialize(),\n isExtension: this.isExtension,\n packageName: this.packageName,\n }) as unknown as SerializedComponentDependency;\n return serialized;\n }\n\n toManifest(): DependencyManifest {\n const packageName = this.getPackageName?.();\n const version = this.version;\n return {\n packageName,\n version,\n };\n }\n}\n"],"mappings":";;;;;;AAIA,SAAAA,gBAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,eAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGO,MAAME,IAAI,GAAAC,OAAA,CAAAD,IAAA,GAAG,WAAW;AAQ/B;AACO,MAAME,mBAAmB,SAASC,gCAAc,CAAC;EACtDC,WAAWA,CACDC,YAAyB,EACzBC,YAAqB,EACrBC,YAAoB,EAC5BC,EAAU,EACVC,OAAe,EACfC,SAAkC,EAClCC,MAAyB,EACzBC,MAAgB,EAChBC,QAAkB,EAClBC,YAAqB,EACrB;IACA,KAAK,CAACN,EAAE,EAAEC,OAAO,EAAEC,SAAS,EAAEC,MAAM,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,YAAY,CAAC;IAAC,KAX9DT,YAAyB,GAAzBA,YAAyB;IAAA,KACzBC,YAAqB,GAArBA,YAAqB;IAAA,KACrBC,YAAoB,GAApBA,YAAoB;IAU5B,IAAI,CAACQ,KAAK,GAAGf,IAAI;EACnB;EAEA,IAAIgB,WAAWA,CAAA,EAAG;IAChB,OAAO,IAAI,CAACX,YAAY;EAC1B;EAEA,IAAIY,WAAWA,CAAA,EAAG;IAChB,OAAO,IAAI,CAACX,YAAY;EAC1B;EAEA,IAAIY,WAAWA,CAAA,EAAG;IAChB,OAAO,IAAI,CAACX,YAAY;EAC1B;EAEAY,cAAcA,CAAA,EAAG;IACf,OAAO,IAAI,CAACD,WAAW;EACzB;EAEA,IAAIE,gBAAgBA,CAAA,EAAG;IACrB,OAAO,IAAI,CAACJ,WAAW,CAACK,sBAAsB,CAAC,CAAC;EAClD;EAEAC,UAAUA,CAACC,UAAkB,EAAE;IAC7B,KAAK,CAACD,UAAU,CAACC,UAAU,CAAC;IAC5B,MAAMC,cAAc,GAAG,IAAI,CAACR,WAAW,CAACS,aAAa,CAACF,UAAU,CAAC;IACjE,IAAI,CAAClB,YAAY,GAAGmB,cAAc;IAClC,MAAME,UAAU,GAAG,IAAI,CAAClB,EAAE,CAACmB,KAAK,CAAC,GAAG,CAAC;IACrC,IAAID,UAAU,CAACE,MAAM,KAAK,CAAC,EAAE;MAC3B,MAAMC,KAAK,GAAI,GAAEH,UAAU,CAAC,CAAC,CAAE,IAAGH,UAAW,EAAC;MAC9C,IAAI,CAACf,EAAE,GAAGqB,KAAK;IACjB;EACF;;EAEA;EACAC,SAASA,CAAA,EAAiE;IACxE,MAAMC,UAAU,GAAGC,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAACH,SAAS,CAAC,CAAC,EAAE;MACtDd,WAAW,EAAE,IAAI,CAACA,WAAW,CAACc,SAAS,CAAC,CAAC;MACzCb,WAAW,EAAE,IAAI,CAACA,WAAW;MAC7BC,WAAW,EAAE,IAAI,CAACA;IACpB,CAAC,CAA6C;IAC9C,OAAOa,UAAU;EACnB;EAEAG,UAAUA,CAAA,EAAuB;IAC/B,MAAMhB,WAAW,GAAG,IAAI,CAACC,cAAc,GAAG,CAAC;IAC3C,MAAMV,OAAO,GAAG,IAAI,CAACA,OAAO;IAC5B,OAAO;MACLS,WAAW;MACXT;IACF,CAAC;EACH;AACF;AAACR,OAAA,CAAAC,mBAAA,GAAAA,mBAAA"}
|
|
@@ -4,6 +4,7 @@ export type DependencyLifecycleType = WorkspaceDependencyLifecycleType | 'dev';
|
|
|
4
4
|
export interface SerializedDependency {
|
|
5
5
|
id: string;
|
|
6
6
|
version: string;
|
|
7
|
+
versionRange?: string;
|
|
7
8
|
__type: string;
|
|
8
9
|
lifecycle: string;
|
|
9
10
|
source?: DependencySource;
|
|
@@ -23,6 +24,7 @@ export type DependencyManifest = {
|
|
|
23
24
|
export interface Dependency {
|
|
24
25
|
id: string;
|
|
25
26
|
version: string;
|
|
27
|
+
versionRange?: string;
|
|
26
28
|
type: string;
|
|
27
29
|
idWithoutVersion: string;
|
|
28
30
|
lifecycle: DependencyLifecycleType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":[],"sources":["dependency.ts"],"sourcesContent":["import type { DependencySource } from '../policy/variant-policy/variant-policy';\n\nexport type WorkspaceDependencyLifecycleType = 'runtime' | 'peer';\n\nexport type DependencyLifecycleType = WorkspaceDependencyLifecycleType | 'dev';\n\nexport interface SerializedDependency {\n id: string;\n version: string;\n __type: string;\n lifecycle: string;\n source?: DependencySource;\n hidden?: boolean;\n optional?: boolean;\n packageName?: string;\n}\n\n/**\n * Allowed values are valid semver values and the \"-\" sign.\n */\nexport type SemverVersion = string;\nexport type PackageName = string;\n\nexport type DependencyManifest = {\n packageName: PackageName;\n version: SemverVersion;\n};\n\nexport interface Dependency {\n id: string;\n version: string;\n type: string;\n idWithoutVersion: string;\n lifecycle: DependencyLifecycleType;\n source?: DependencySource;\n hidden?: boolean;\n optional?: boolean;\n\n serialize: <T extends SerializedDependency>() => T;\n setVersion: (newVersion: string) => void;\n toManifest: () => DependencyManifest;\n getPackageName?: () => string;\n}\n"],"mappings":""}
|
|
1
|
+
{"version":3,"names":[],"sources":["dependency.ts"],"sourcesContent":["import type { DependencySource } from '../policy/variant-policy/variant-policy';\n\nexport type WorkspaceDependencyLifecycleType = 'runtime' | 'peer';\n\nexport type DependencyLifecycleType = WorkspaceDependencyLifecycleType | 'dev';\n\nexport interface SerializedDependency {\n id: string;\n version: string;\n versionRange?: string;\n __type: string;\n lifecycle: string;\n source?: DependencySource;\n hidden?: boolean;\n optional?: boolean;\n packageName?: string;\n}\n\n/**\n * Allowed values are valid semver values and the \"-\" sign.\n */\nexport type SemverVersion = string;\nexport type PackageName = string;\n\nexport type DependencyManifest = {\n packageName: PackageName;\n version: SemverVersion;\n};\n\nexport interface Dependency {\n id: string;\n version: string;\n versionRange?: string;\n type: string;\n idWithoutVersion: string;\n lifecycle: DependencyLifecycleType;\n source?: DependencySource;\n hidden?: boolean;\n optional?: boolean;\n\n serialize: <T extends SerializedDependency>() => T;\n setVersion: (newVersion: string) => void;\n toManifest: () => DependencyManifest;\n getPackageName?: () => string;\n}\n"],"mappings":""}
|
|
@@ -176,7 +176,7 @@ export declare class DependencyResolverMain {
|
|
|
176
176
|
/**
|
|
177
177
|
* returns only the dependencies that are bit-components.
|
|
178
178
|
*/
|
|
179
|
-
getComponentDependencies(component: IComponent):
|
|
179
|
+
getComponentDependencies(component: IComponent): ComponentDependency[];
|
|
180
180
|
private getDependenciesFromSerializedDependencies;
|
|
181
181
|
/**
|
|
182
182
|
* Getting the merged workspace policy (from dep resolver config and others like root package.json)
|
|
@@ -524,8 +524,8 @@ class DependencyResolverMain {
|
|
|
524
524
|
/**
|
|
525
525
|
* returns only the dependencies that are bit-components.
|
|
526
526
|
*/
|
|
527
|
-
|
|
528
|
-
const dependencyList =
|
|
527
|
+
getComponentDependencies(component) {
|
|
528
|
+
const dependencyList = this.getDependencies(component);
|
|
529
529
|
return dependencyList.getComponentDependencies();
|
|
530
530
|
}
|
|
531
531
|
getDependenciesFromSerializedDependencies(dependencies) {
|