@teambit/lanes.modules.diff 0.0.390 → 0.0.392
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/dist/lane-diff-generator.d.ts +1 -1
- package/dist/lane-diff-generator.js +20 -6
- package/dist/lane-diff-generator.js.map +1 -1
- package/dist/lane-diff.cmd.js +1 -1
- package/dist/lane-diff.cmd.js.map +1 -1
- package/lane-diff-generator.ts +23 -7
- package/lane-diff.cmd.ts +1 -1
- package/package-tar/teambit-lanes.modules.diff-0.0.392.tgz +0 -0
- package/package.json +4 -4
- package/package-tar/teambit-lanes.modules.diff-0.0.390.tgz +0 -0
- /package/dist/{preview-1691983057527.js → preview-1692155876143.js} +0 -0
|
@@ -28,7 +28,7 @@ export declare class LaneDiffGenerator {
|
|
|
28
28
|
constructor(workspace: Workspace | undefined, scope: ScopeMain);
|
|
29
29
|
/**
|
|
30
30
|
* the values array may include zero to two values and will be processed as following:
|
|
31
|
-
* [] => diff between the
|
|
31
|
+
* [] => diff between the default lane (from) and the current lane (to). (only inside workspace).
|
|
32
32
|
* [to] => diff between the current lane (or default-lane when in scope) and "to" lane.
|
|
33
33
|
* [from, to] => diff between "from" lane and "to" lane.
|
|
34
34
|
*/
|
|
@@ -26,7 +26,7 @@ class LaneDiffGenerator {
|
|
|
26
26
|
}
|
|
27
27
|
/**
|
|
28
28
|
* the values array may include zero to two values and will be processed as following:
|
|
29
|
-
* [] => diff between the
|
|
29
|
+
* [] => diff between the default lane (from) and the current lane (to). (only inside workspace).
|
|
30
30
|
* [to] => diff between the current lane (or default-lane when in scope) and "to" lane.
|
|
31
31
|
* [from, to] => diff between "from" lane and "to" lane.
|
|
32
32
|
*/
|
|
@@ -39,10 +39,12 @@ class LaneDiffGenerator {
|
|
|
39
39
|
const legacyScope = this.scope.legacyScope;
|
|
40
40
|
const fromLaneId = yield legacyScope.lanes.parseLaneIdFromString(fromLaneName);
|
|
41
41
|
const toLaneId = yield legacyScope.lanes.parseLaneIdFromString(toLaneName);
|
|
42
|
+
let toLane;
|
|
43
|
+
let fromLane;
|
|
42
44
|
if (fromLaneId.isDefault()) {
|
|
43
45
|
if (toLaneId.isDefault())
|
|
44
46
|
throw new Error(`unable to diff between main and main, they're the same lane`);
|
|
45
|
-
|
|
47
|
+
toLane = yield legacyScope.lanes.loadLane(toLaneId);
|
|
46
48
|
if (!toLane)
|
|
47
49
|
throw new Error(`unable to find a lane "${toLaneName}" in the scope`);
|
|
48
50
|
this.toLaneData = yield this.mapToLaneData(toLane);
|
|
@@ -50,7 +52,7 @@ class LaneDiffGenerator {
|
|
|
50
52
|
this.fromLaneData = yield this.getDefaultLaneData(bitIds);
|
|
51
53
|
}
|
|
52
54
|
else if (toLaneId.isDefault()) {
|
|
53
|
-
|
|
55
|
+
fromLane = yield legacyScope.lanes.loadLane(fromLaneId);
|
|
54
56
|
if (!fromLane)
|
|
55
57
|
throw new Error(`unable to find a lane "${fromLaneName}" in the scope`);
|
|
56
58
|
this.fromLaneData = yield this.mapToLaneData(fromLane);
|
|
@@ -59,10 +61,10 @@ class LaneDiffGenerator {
|
|
|
59
61
|
}
|
|
60
62
|
else {
|
|
61
63
|
// both, "from" and "to" are not default-lane.
|
|
62
|
-
|
|
64
|
+
toLane = yield legacyScope.lanes.loadLane(toLaneId);
|
|
63
65
|
if (!toLane)
|
|
64
66
|
throw new Error(`unable to find a lane "${toLaneName}" in the scope`);
|
|
65
|
-
|
|
67
|
+
fromLane = yield legacyScope.lanes.loadLane(fromLaneId);
|
|
66
68
|
if (!fromLane)
|
|
67
69
|
throw new Error(`unable to find a lane "${fromLaneName}" in the scope`);
|
|
68
70
|
this.toLaneData = yield this.mapToLaneData(toLane);
|
|
@@ -77,6 +79,18 @@ class LaneDiffGenerator {
|
|
|
77
79
|
if (!this.toLaneData.components.length) {
|
|
78
80
|
throw new bit_error_1.BitError(`lane "${toLaneName}" is empty, nothing to show`);
|
|
79
81
|
}
|
|
82
|
+
const idsOfTo = bit_id_1.BitIds.fromArray(this.toLaneData.components.map((c) => { var _a; return c.id.changeVersion((_a = c.head) === null || _a === void 0 ? void 0 : _a.toString()); }));
|
|
83
|
+
const idsOfFrom = bit_id_1.BitIds.fromArray(this.fromLaneData.components.map((c) => { var _a; return c.id.changeVersion((_a = c.head) === null || _a === void 0 ? void 0 : _a.toString()); }));
|
|
84
|
+
yield this.scope.legacyScope.scopeImporter.importWithoutDeps(idsOfTo, {
|
|
85
|
+
cache: true,
|
|
86
|
+
lane: toLane || undefined,
|
|
87
|
+
ignoreMissingHead: true,
|
|
88
|
+
});
|
|
89
|
+
yield this.scope.legacyScope.scopeImporter.importWithoutDeps(idsOfFrom, {
|
|
90
|
+
cache: true,
|
|
91
|
+
lane: fromLane || undefined,
|
|
92
|
+
ignoreMissingHead: true,
|
|
93
|
+
});
|
|
80
94
|
yield Promise.all(this.toLaneData.components.map(({ id, head }) => __awaiter(this, void 0, void 0, function* () {
|
|
81
95
|
if (idsToCheckDiff && !idsToCheckDiff.hasWithoutVersion(id)) {
|
|
82
96
|
return;
|
|
@@ -113,7 +127,7 @@ class LaneDiffGenerator {
|
|
|
113
127
|
}
|
|
114
128
|
let fromVersion;
|
|
115
129
|
try {
|
|
116
|
-
fromVersion =
|
|
130
|
+
fromVersion = yield modelComponent.loadVersion(fromLaneHead.toString(), this.scope.legacyScope.objects, true);
|
|
117
131
|
}
|
|
118
132
|
catch (err) {
|
|
119
133
|
this.failures.push({ id, msg: err.message });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lane-diff-generator.js","sourceRoot":"","sources":["../lane-diff-generator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,iGAIqE;AACrE,8CAAgD;AAChD,wDAAqD;AACrD,kDAA8C;AAuB9C,MAAa,iBAAiB;IAQ5B,YAAoB,SAAgC,EAAU,KAAgB;QAA1D,cAAS,GAAT,SAAS,CAAuB;QAAU,UAAK,GAAL,KAAK,CAAW;QAPtE,iBAAY,GAAY,EAAE,CAAC;QAC3B,eAAU,GAAY,EAAE,CAAC;QACzB,kBAAa,GAAkB,EAAE,CAAC;QAClC,uBAAkB,GAAY,EAAE,CAAC;QAGjC,aAAQ,GAAc,EAAE,CAAC;IACgD,CAAC;IAElF;;;;;OAKG;IACG,QAAQ,CAAC,MAAgB,EAAE,cAA2B,EAAE,EAAE,OAAgB;;YAC9E,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"lane-diff-generator.js","sourceRoot":"","sources":["../lane-diff-generator.ts"],"names":[],"mappings":"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"}
|
package/dist/lane-diff.cmd.js
CHANGED
|
@@ -48,7 +48,7 @@ bit lane diff from to => diff between "from" lane and "to" lane.`;
|
|
|
48
48
|
};
|
|
49
49
|
const diffResultsStr = (0, components_diff_1.outputDiffResults)(compsWithDiff);
|
|
50
50
|
const failuresTitle = `\n\nDiff failed on the following component(s)`;
|
|
51
|
-
const failuresIds = failures.map((f) => `${f.id.toString()} - ${chalk_1.default.red(f.msg)}`);
|
|
51
|
+
const failuresIds = failures.map((f) => `${f.id.toString()} - ${chalk_1.default.red(f.msg)}`).join('\n');
|
|
52
52
|
const failuresStr = failures.length ? `${chalk_1.default.inverse(failuresTitle)}\n${failuresIds}` : '';
|
|
53
53
|
const newCompsToStr = newCompsOutput(toLaneName, newCompsTo);
|
|
54
54
|
const newCompsFromStr = newCompsOutput(fromLaneName, newCompsFrom);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lane-diff.cmd.js","sourceRoot":"","sources":["../lane-diff.cmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,kDAA0B;AAC1B,iGAAgG;AAChG,+DAA0D;AAE1D,MAAa,WAAW;IAgBtB,YAAoB,SAAoB,EAAU,KAAgB;QAA9C,cAAS,GAAT,SAAS,CAAW;QAAU,UAAK,GAAL,KAAK,CAAW;QAflE,SAAI,GAAG,kBAAkB,CAAC;QAC1B,gBAAW,GAAG,yBAAyB,CAAC;QACxC,wBAAmB,GAAG;;iEAEyC,CAAC;QAChE,UAAK,GAAG,EAAE,CAAC;QACX,YAAO,GAAG;YACR,CAAC,EAAE,EAAE,6BAA6B,EAAE,yDAAyD,CAAC;SAC7E,CAAC;QACpB,WAAM,GAAG,IAAI,CAAC;QACd,YAAO,GAAG,IAAI,CAAC;QACf,cAAS,GAAG,IAAI,CAAC;QACjB,aAAQ,GAAG,IAAI,CAAC;QAChB,kBAAa,GAAG,IAAI,CAAC;IAEgD,CAAC;IAEhE,MAAM,CAAC,CAAC,MAAM,GAAG,EAAE,CAAa,EAAE,EAAE,OAAO,EAAwB;;YACvE,MAAM,iBAAiB,GAAG,IAAI,uCAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,GACnF,MAAM,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YAE/D,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,GAAa,EAAE,EAAE;gBACzD,IAAI,CAAC,GAAG,CAAC,MAAM;oBAAE,OAAO,EAAE,CAAC;gBAC3B,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,eAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClE,MAAM,aAAa,GAAG,iDAAiD,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACnG,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,eAAK,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzF,CAAC,CAAC;YAEF,MAAM,cAAc,GAAG,IAAA,mCAAiB,EAAC,aAAa,CAAC,CAAC;YAExD,MAAM,aAAa,GAAG,+CAA+C,CAAC;YACtE,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,eAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"lane-diff.cmd.js","sourceRoot":"","sources":["../lane-diff.cmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,kDAA0B;AAC1B,iGAAgG;AAChG,+DAA0D;AAE1D,MAAa,WAAW;IAgBtB,YAAoB,SAAoB,EAAU,KAAgB;QAA9C,cAAS,GAAT,SAAS,CAAW;QAAU,UAAK,GAAL,KAAK,CAAW;QAflE,SAAI,GAAG,kBAAkB,CAAC;QAC1B,gBAAW,GAAG,yBAAyB,CAAC;QACxC,wBAAmB,GAAG;;iEAEyC,CAAC;QAChE,UAAK,GAAG,EAAE,CAAC;QACX,YAAO,GAAG;YACR,CAAC,EAAE,EAAE,6BAA6B,EAAE,yDAAyD,CAAC;SAC7E,CAAC;QACpB,WAAM,GAAG,IAAI,CAAC;QACd,YAAO,GAAG,IAAI,CAAC;QACf,cAAS,GAAG,IAAI,CAAC;QACjB,aAAQ,GAAG,IAAI,CAAC;QAChB,kBAAa,GAAG,IAAI,CAAC;IAEgD,CAAC;IAEhE,MAAM,CAAC,CAAC,MAAM,GAAG,EAAE,CAAa,EAAE,EAAE,OAAO,EAAwB;;YACvE,MAAM,iBAAiB,GAAG,IAAI,uCAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,GACnF,MAAM,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YAE/D,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,GAAa,EAAE,EAAE;gBACzD,IAAI,CAAC,GAAG,CAAC,MAAM;oBAAE,OAAO,EAAE,CAAC;gBAC3B,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,eAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClE,MAAM,aAAa,GAAG,iDAAiD,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACnG,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,eAAK,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzF,CAAC,CAAC;YAEF,MAAM,cAAc,GAAG,IAAA,mCAAiB,EAAC,aAAa,CAAC,CAAC;YAExD,MAAM,aAAa,GAAG,+CAA+C,CAAC;YACtE,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,eAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/F,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,eAAK,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,MAAM,aAAa,GAAG,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAC7D,MAAM,eAAe,GAAG,cAAc,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YACnE,OAAO,GAAG,cAAc,GAAG,aAAa,GAAG,eAAe,GAAG,WAAW,EAAE,CAAC;QAC7E,CAAC;KAAA;CACF;AAvCD,kCAuCC"}
|
package/lane-diff-generator.ts
CHANGED
|
@@ -45,37 +45,40 @@ export class LaneDiffGenerator {
|
|
|
45
45
|
|
|
46
46
|
/**
|
|
47
47
|
* the values array may include zero to two values and will be processed as following:
|
|
48
|
-
* [] => diff between the
|
|
48
|
+
* [] => diff between the default lane (from) and the current lane (to). (only inside workspace).
|
|
49
49
|
* [to] => diff between the current lane (or default-lane when in scope) and "to" lane.
|
|
50
50
|
* [from, to] => diff between "from" lane and "to" lane.
|
|
51
51
|
*/
|
|
52
52
|
async generate(values: string[], diffOptions: DiffOptions = {}, pattern?: string): Promise<LaneDiffResults> {
|
|
53
53
|
const { fromLaneName, toLaneName } = this.getLaneNames(values);
|
|
54
|
+
|
|
54
55
|
if (fromLaneName === toLaneName) {
|
|
55
56
|
throw new Error(`unable to run diff between "${fromLaneName}" and "${toLaneName}", they're the same lane`);
|
|
56
57
|
}
|
|
57
58
|
const legacyScope = this.scope.legacyScope;
|
|
58
59
|
const fromLaneId = await legacyScope.lanes.parseLaneIdFromString(fromLaneName);
|
|
59
60
|
const toLaneId = await legacyScope.lanes.parseLaneIdFromString(toLaneName);
|
|
61
|
+
let toLane: Lane | null | undefined;
|
|
62
|
+
let fromLane: Lane | null | undefined;
|
|
60
63
|
|
|
61
64
|
if (fromLaneId.isDefault()) {
|
|
62
65
|
if (toLaneId.isDefault()) throw new Error(`unable to diff between main and main, they're the same lane`);
|
|
63
|
-
|
|
66
|
+
toLane = await legacyScope.lanes.loadLane(toLaneId);
|
|
64
67
|
if (!toLane) throw new Error(`unable to find a lane "${toLaneName}" in the scope`);
|
|
65
68
|
this.toLaneData = await this.mapToLaneData(toLane);
|
|
66
69
|
const bitIds = toLane.components.map((c) => c.id);
|
|
67
70
|
this.fromLaneData = await this.getDefaultLaneData(bitIds);
|
|
68
71
|
} else if (toLaneId.isDefault()) {
|
|
69
|
-
|
|
72
|
+
fromLane = await legacyScope.lanes.loadLane(fromLaneId);
|
|
70
73
|
if (!fromLane) throw new Error(`unable to find a lane "${fromLaneName}" in the scope`);
|
|
71
74
|
this.fromLaneData = await this.mapToLaneData(fromLane);
|
|
72
75
|
const bitIds = fromLane?.components.map((c) => c.id) || [];
|
|
73
76
|
this.toLaneData = await this.getDefaultLaneData(bitIds);
|
|
74
77
|
} else {
|
|
75
78
|
// both, "from" and "to" are not default-lane.
|
|
76
|
-
|
|
79
|
+
toLane = await legacyScope.lanes.loadLane(toLaneId);
|
|
77
80
|
if (!toLane) throw new Error(`unable to find a lane "${toLaneName}" in the scope`);
|
|
78
|
-
|
|
81
|
+
fromLane = await legacyScope.lanes.loadLane(fromLaneId);
|
|
79
82
|
if (!fromLane) throw new Error(`unable to find a lane "${fromLaneName}" in the scope`);
|
|
80
83
|
this.toLaneData = await this.mapToLaneData(toLane);
|
|
81
84
|
this.fromLaneData = await this.mapToLaneData(fromLane);
|
|
@@ -94,6 +97,19 @@ export class LaneDiffGenerator {
|
|
|
94
97
|
throw new BitError(`lane "${toLaneName}" is empty, nothing to show`);
|
|
95
98
|
}
|
|
96
99
|
|
|
100
|
+
const idsOfTo = BitIds.fromArray(this.toLaneData.components.map((c) => c.id.changeVersion(c.head?.toString())));
|
|
101
|
+
const idsOfFrom = BitIds.fromArray(this.fromLaneData.components.map((c) => c.id.changeVersion(c.head?.toString())));
|
|
102
|
+
await this.scope.legacyScope.scopeImporter.importWithoutDeps(idsOfTo, {
|
|
103
|
+
cache: true,
|
|
104
|
+
lane: toLane || undefined,
|
|
105
|
+
ignoreMissingHead: true,
|
|
106
|
+
});
|
|
107
|
+
await this.scope.legacyScope.scopeImporter.importWithoutDeps(idsOfFrom, {
|
|
108
|
+
cache: true,
|
|
109
|
+
lane: fromLane || undefined,
|
|
110
|
+
ignoreMissingHead: true,
|
|
111
|
+
});
|
|
112
|
+
|
|
97
113
|
await Promise.all(
|
|
98
114
|
this.toLaneData.components.map(async ({ id, head }) => {
|
|
99
115
|
if (idsToCheckDiff && !idsToCheckDiff.hasWithoutVersion(id)) {
|
|
@@ -132,7 +148,7 @@ export class LaneDiffGenerator {
|
|
|
132
148
|
}
|
|
133
149
|
let fromVersion: Version;
|
|
134
150
|
try {
|
|
135
|
-
fromVersion =
|
|
151
|
+
fromVersion = await modelComponent.loadVersion(fromLaneHead.toString(), this.scope.legacyScope.objects, true);
|
|
136
152
|
} catch (err: any) {
|
|
137
153
|
this.failures.push({ id, msg: err.message });
|
|
138
154
|
return;
|
|
@@ -191,7 +207,7 @@ export class LaneDiffGenerator {
|
|
|
191
207
|
const modelComponent = await this.scope.legacyScope.getModelComponent(id);
|
|
192
208
|
const laneComponent = {
|
|
193
209
|
id,
|
|
194
|
-
head: modelComponent.head as Ref,
|
|
210
|
+
head: modelComponent.head as Ref, // @todo: this is not true. it can be undefined
|
|
195
211
|
version: modelComponent.latestVersion(), // should this be latestVersion() or bitId.version.toString()
|
|
196
212
|
};
|
|
197
213
|
laneData.components.push(laneComponent);
|
package/lane-diff.cmd.ts
CHANGED
|
@@ -38,7 +38,7 @@ bit lane diff from to => diff between "from" lane and "to" lane.`;
|
|
|
38
38
|
const diffResultsStr = outputDiffResults(compsWithDiff);
|
|
39
39
|
|
|
40
40
|
const failuresTitle = `\n\nDiff failed on the following component(s)`;
|
|
41
|
-
const failuresIds = failures.map((f) => `${f.id.toString()} - ${chalk.red(f.msg)}`);
|
|
41
|
+
const failuresIds = failures.map((f) => `${f.id.toString()} - ${chalk.red(f.msg)}`).join('\n');
|
|
42
42
|
const failuresStr = failures.length ? `${chalk.inverse(failuresTitle)}\n${failuresIds}` : '';
|
|
43
43
|
const newCompsToStr = newCompsOutput(toLaneName, newCompsTo);
|
|
44
44
|
const newCompsFromStr = newCompsOutput(fromLaneName, newCompsFrom);
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/lanes.modules.diff",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.392",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/lanes/modules/diff",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.lanes",
|
|
8
8
|
"name": "modules/diff",
|
|
9
|
-
"version": "0.0.
|
|
9
|
+
"version": "0.0.392"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
13
|
-
"@teambit/legacy-bit-id": "0.0
|
|
13
|
+
"@teambit/legacy-bit-id": "1.0.0",
|
|
14
14
|
"@teambit/bit-error": "0.0.402",
|
|
15
|
-
"@teambit/lane-id": "0.0.
|
|
15
|
+
"@teambit/lane-id": "0.0.274"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@types/mocha": "9.1.0",
|
|
Binary file
|
|
File without changes
|