@teambit/merging 1.0.700 → 1.0.705
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/package.json
CHANGED
|
@@ -1,53 +1,53 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merging",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.705",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/component/merging",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.component",
|
|
8
8
|
"name": "merging",
|
|
9
|
-
"version": "1.0.
|
|
9
|
+
"version": "1.0.705"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "4.1.2",
|
|
13
13
|
"lodash": "4.17.21",
|
|
14
14
|
"p-map-series": "2.1.0",
|
|
15
|
+
"@teambit/component.modules.merge-helper": "0.0.8",
|
|
15
16
|
"@teambit/bit-error": "0.0.404",
|
|
16
17
|
"@teambit/legacy.constants": "0.0.14",
|
|
17
18
|
"@teambit/component-id": "1.2.4",
|
|
19
|
+
"@teambit/component.snap-distance": "0.0.69",
|
|
18
20
|
"@teambit/lane-id": "0.0.312",
|
|
21
|
+
"@teambit/legacy.consumer-component": "0.0.69",
|
|
22
|
+
"@teambit/legacy.extension-data": "0.0.70",
|
|
23
|
+
"@teambit/legacy.scope": "0.0.68",
|
|
19
24
|
"@teambit/harmony": "0.4.7",
|
|
25
|
+
"@teambit/legacy.component-list": "0.0.122",
|
|
26
|
+
"@teambit/legacy.consumer": "0.0.68",
|
|
27
|
+
"@teambit/pkg.modules.component-package-name": "0.0.75",
|
|
20
28
|
"@teambit/toolbox.path.path": "0.0.8",
|
|
21
|
-
"@teambit/
|
|
22
|
-
"@teambit/
|
|
23
|
-
"@teambit/config-
|
|
24
|
-
"@teambit/
|
|
25
|
-
"@teambit/
|
|
26
|
-
"@teambit/
|
|
27
|
-
"@teambit/
|
|
28
|
-
"@teambit/
|
|
29
|
-
"@teambit/
|
|
30
|
-
"@teambit/
|
|
31
|
-
"@teambit/
|
|
32
|
-
"@teambit/
|
|
33
|
-
"@teambit/
|
|
34
|
-
"@teambit/
|
|
35
|
-
"@teambit/
|
|
36
|
-
"@teambit/
|
|
37
|
-
"@teambit/
|
|
38
|
-
"@teambit/component-writer": "1.0.700",
|
|
39
|
-
"@teambit/config": "0.0.1433",
|
|
40
|
-
"@teambit/install": "1.0.700",
|
|
41
|
-
"@teambit/legacy.component-list": "0.0.120",
|
|
42
|
-
"@teambit/legacy.consumer": "0.0.66",
|
|
43
|
-
"@teambit/pkg.modules.component-package-name": "0.0.73",
|
|
44
|
-
"@teambit/remove": "1.0.700",
|
|
45
|
-
"@teambit/snapping": "1.0.700"
|
|
29
|
+
"@teambit/cli": "0.0.1264",
|
|
30
|
+
"@teambit/config-merger": "0.0.572",
|
|
31
|
+
"@teambit/config-store": "0.0.144",
|
|
32
|
+
"@teambit/builder": "1.0.705",
|
|
33
|
+
"@teambit/dependency-resolver": "1.0.705",
|
|
34
|
+
"@teambit/importer": "1.0.705",
|
|
35
|
+
"@teambit/logger": "0.0.1357",
|
|
36
|
+
"@teambit/objects": "0.0.212",
|
|
37
|
+
"@teambit/scope": "1.0.705",
|
|
38
|
+
"@teambit/workspace": "1.0.705",
|
|
39
|
+
"@teambit/application": "1.0.705",
|
|
40
|
+
"@teambit/checkout": "1.0.705",
|
|
41
|
+
"@teambit/component-writer": "1.0.705",
|
|
42
|
+
"@teambit/config": "0.0.1438",
|
|
43
|
+
"@teambit/install": "1.0.705",
|
|
44
|
+
"@teambit/remove": "1.0.705",
|
|
45
|
+
"@teambit/snapping": "1.0.705"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
48
|
"@types/lodash": "4.14.165",
|
|
49
49
|
"@types/mocha": "9.1.0",
|
|
50
|
-
"@teambit/harmony.envs.core-aspect-env": "0.0.
|
|
50
|
+
"@teambit/harmony.envs.core-aspect-env": "0.0.76"
|
|
51
51
|
},
|
|
52
52
|
"peerDependencies": {},
|
|
53
53
|
"license": "Apache-2.0",
|
package/dist/esm.d.mts
DELETED
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
export const mergeReport: any;
|
|
2
|
-
export const applyVersionReport: any;
|
|
3
|
-
export const conflictSummaryReport: any;
|
|
4
|
-
export const installationErrorOutput: any;
|
|
5
|
-
export const compilationErrorOutput: any;
|
|
6
|
-
export const getRemovedOutput: any;
|
|
7
|
-
export const getAddedOutput: any;
|
|
8
|
-
export const ConfigMergeResult: any;
|
|
9
|
-
export const MergingAspect: any;
|
|
10
|
-
export const getWorkspaceConfigUpdateOutput: any;
|
|
11
|
-
export const compIsAlreadyMergedMsg: any;
|
|
12
|
-
export const FileStatus: any;
|
|
13
|
-
export const MergeOptions: any;
|
|
14
|
-
export const getMergeStrategyInteractive: any;
|
|
15
|
-
export const threeWayMerge: any;
|
|
16
|
-
export const mergeFiles: any;
|
|
17
|
-
export default cjsModule;
|
|
18
|
-
import cjsModule from './index.js';
|
|
File without changes
|