@teambit/merge-lanes 1.0.141 → 1.0.143
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.
@@ -49,9 +49,9 @@ export declare class MergeLanesMain {
|
|
49
49
|
configMergeResults: ConfigMergeResult[];
|
50
50
|
}>;
|
51
51
|
abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{
|
52
|
-
checkoutResults: ApplyVersionResults;
|
52
|
+
checkoutResults: ApplyVersionResults | undefined;
|
53
53
|
restoredItems: string[];
|
54
|
-
checkoutError: Error;
|
54
|
+
checkoutError: Error | undefined;
|
55
55
|
}>;
|
56
56
|
private getMainIdsToMerge;
|
57
57
|
mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {
|
@@ -62,7 +62,7 @@ export declare class MergeLanesMain {
|
|
62
62
|
exportedIds: string[];
|
63
63
|
}>;
|
64
64
|
private throwIfNotUpToDate;
|
65
|
-
static slots:
|
65
|
+
static slots: never[];
|
66
66
|
static dependencies: import("@teambit/harmony").Aspect[];
|
67
67
|
static runtime: import("@teambit/harmony").RuntimeDefinition;
|
68
68
|
static provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [
|
package/package.json
CHANGED
@@ -1,12 +1,12 @@
|
|
1
1
|
{
|
2
2
|
"name": "@teambit/merge-lanes",
|
3
|
-
"version": "1.0.
|
3
|
+
"version": "1.0.143",
|
4
4
|
"homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
|
5
5
|
"main": "dist/index.js",
|
6
6
|
"componentId": {
|
7
7
|
"scope": "teambit.lanes",
|
8
8
|
"name": "merge-lanes",
|
9
|
-
"version": "1.0.
|
9
|
+
"version": "1.0.143"
|
10
10
|
},
|
11
11
|
"dependencies": {
|
12
12
|
"chalk": "2.4.2",
|
@@ -19,26 +19,25 @@
|
|
19
19
|
"@teambit/lane-id": "0.0.311",
|
20
20
|
"@teambit/harmony": "0.4.6",
|
21
21
|
"@teambit/component-id": "1.2.0",
|
22
|
-
"@teambit/logger": "0.0.
|
23
|
-
"@teambit/scope": "1.0.
|
24
|
-
"@teambit/checkout": "1.0.
|
25
|
-
"@teambit/cli": "0.0.
|
26
|
-
"@teambit/global-config": "0.0.
|
27
|
-
"@teambit/merging": "1.0.
|
28
|
-
"@teambit/remove": "1.0.
|
29
|
-
"@teambit/config-merger": "0.0.
|
30
|
-
"@teambit/export": "1.0.
|
31
|
-
"@teambit/importer": "1.0.
|
32
|
-
"@teambit/lanes": "1.0.
|
33
|
-
"@teambit/workspace": "1.0.
|
22
|
+
"@teambit/logger": "0.0.942",
|
23
|
+
"@teambit/scope": "1.0.143",
|
24
|
+
"@teambit/checkout": "1.0.143",
|
25
|
+
"@teambit/cli": "0.0.849",
|
26
|
+
"@teambit/global-config": "0.0.852",
|
27
|
+
"@teambit/merging": "1.0.143",
|
28
|
+
"@teambit/remove": "1.0.143",
|
29
|
+
"@teambit/config-merger": "0.0.10",
|
30
|
+
"@teambit/export": "1.0.143",
|
31
|
+
"@teambit/importer": "1.0.143",
|
32
|
+
"@teambit/lanes": "1.0.143",
|
33
|
+
"@teambit/workspace": "1.0.143"
|
34
34
|
},
|
35
35
|
"devDependencies": {
|
36
36
|
"@types/fs-extra": "9.0.7",
|
37
37
|
"@types/lodash": "4.14.165",
|
38
38
|
"@types/mocha": "9.1.0",
|
39
|
-
"
|
40
|
-
"@
|
41
|
-
"@teambit/harmony.envs.core-aspect-env": "0.0.19"
|
39
|
+
"chai": "4.3.0",
|
40
|
+
"@teambit/harmony.envs.core-aspect-env": "0.0.24"
|
42
41
|
},
|
43
42
|
"peerDependencies": {
|
44
43
|
"@teambit/legacy": "1.0.624"
|
@@ -55,7 +54,8 @@
|
|
55
54
|
"default": "./dist/index.js"
|
56
55
|
},
|
57
56
|
"./dist/*": "./dist/*",
|
58
|
-
"./artifacts/*": "./artifacts/*"
|
57
|
+
"./artifacts/*": "./artifacts/*",
|
58
|
+
"./*": "./*.ts"
|
59
59
|
},
|
60
60
|
"private": false,
|
61
61
|
"engines": {
|
package/tsconfig.json
CHANGED
@@ -17,7 +17,10 @@
|
|
17
17
|
"resolveJsonModule": true,
|
18
18
|
"allowJs": true,
|
19
19
|
"outDir": "dist",
|
20
|
-
"emitDeclarationOnly": true
|
20
|
+
"emitDeclarationOnly": true,
|
21
|
+
"strict": true,
|
22
|
+
"strictPropertyInitialization": false,
|
23
|
+
"noImplicitAny": false
|
21
24
|
},
|
22
25
|
"exclude": [
|
23
26
|
"artifacts",
|
File without changes
|