@teambit/merging 1.0.494 → 1.0.496

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.
Files changed (6) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +56 -56
  3. package/dist/esm.mjs +5 -0
  4. package/esm.mjs +5 -0
  5. package/package.json +25 -25
  6. /package/dist/{preview-1734260112091.js → preview-1734405572492.js} +0 -0
package/artifacts/__bit_junit.xml CHANGED
@@ -1,4 +1,4 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <testsuites tests="0" failures="0" errors="0" skipped="0">
3
- <testsuite name="teambit.component/merging@1.0.494" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.496" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -887,7 +887,7 @@
887
887
  "componentId": {
888
888
  "scope": "teambit.legacy",
889
889
  "name": "scope",
890
- "version": "0.0.6"
890
+ "version": "0.0.8"
891
891
  }
892
892
  },
893
893
  "isOptional": false
@@ -912,7 +912,7 @@
912
912
  "componentId": {
913
913
  "scope": "teambit.scope",
914
914
  "name": "objects",
915
- "version": "0.0.6"
915
+ "version": "0.0.8"
916
916
  }
917
917
  },
918
918
  "isOptional": false
@@ -997,7 +997,7 @@
997
997
  "componentId": {
998
998
  "scope": "teambit.scope",
999
999
  "name": "objects",
1000
- "version": "0.0.6"
1000
+ "version": "0.0.8"
1001
1001
  }
1002
1002
  },
1003
1003
  "isOptional": false
@@ -1026,7 +1026,7 @@
1026
1026
  "componentId": {
1027
1027
  "scope": "teambit.legacy",
1028
1028
  "name": "scope",
1029
- "version": "0.0.6"
1029
+ "version": "0.0.8"
1030
1030
  }
1031
1031
  },
1032
1032
  "isOptional": false
@@ -1051,7 +1051,7 @@
1051
1051
  "componentId": {
1052
1052
  "scope": "teambit.scope",
1053
1053
  "name": "objects",
1054
- "version": "0.0.6"
1054
+ "version": "0.0.8"
1055
1055
  }
1056
1056
  },
1057
1057
  "isOptional": false
@@ -1136,7 +1136,7 @@
1136
1136
  "componentId": {
1137
1137
  "scope": "teambit.scope",
1138
1138
  "name": "objects",
1139
- "version": "0.0.6"
1139
+ "version": "0.0.8"
1140
1140
  }
1141
1141
  },
1142
1142
  "isOptional": false
@@ -1422,7 +1422,7 @@
1422
1422
  "componentId": {
1423
1423
  "scope": "teambit.component",
1424
1424
  "name": "sources",
1425
- "version": "0.0.58"
1425
+ "version": "0.0.60"
1426
1426
  }
1427
1427
  },
1428
1428
  "isOptional": false
@@ -1618,7 +1618,7 @@
1618
1618
  "componentId": {
1619
1619
  "scope": "teambit.component",
1620
1620
  "name": "sources",
1621
- "version": "0.0.58"
1621
+ "version": "0.0.60"
1622
1622
  }
1623
1623
  },
1624
1624
  "isOptional": true
@@ -1700,7 +1700,7 @@
1700
1700
  "componentId": {
1701
1701
  "scope": "teambit.component",
1702
1702
  "name": "sources",
1703
- "version": "0.0.58"
1703
+ "version": "0.0.60"
1704
1704
  }
1705
1705
  },
1706
1706
  "isOptional": false
@@ -1725,7 +1725,7 @@
1725
1725
  "componentId": {
1726
1726
  "scope": "teambit.scope",
1727
1727
  "name": "objects",
1728
- "version": "0.0.6"
1728
+ "version": "0.0.8"
1729
1729
  }
1730
1730
  },
1731
1731
  "isOptional": true
@@ -1750,7 +1750,7 @@
1750
1750
  "componentId": {
1751
1751
  "scope": "teambit.scope",
1752
1752
  "name": "objects",
1753
- "version": "0.0.6"
1753
+ "version": "0.0.8"
1754
1754
  }
1755
1755
  },
1756
1756
  "isOptional": false
@@ -1948,7 +1948,7 @@
1948
1948
  "componentId": {
1949
1949
  "scope": "teambit.component",
1950
1950
  "name": "sources",
1951
- "version": "0.0.58"
1951
+ "version": "0.0.60"
1952
1952
  }
1953
1953
  },
1954
1954
  "isOptional": false
@@ -2030,7 +2030,7 @@
2030
2030
  "componentId": {
2031
2031
  "scope": "teambit.component",
2032
2032
  "name": "sources",
2033
- "version": "0.0.58"
2033
+ "version": "0.0.60"
2034
2034
  }
2035
2035
  },
2036
2036
  "isOptional": false
@@ -2112,7 +2112,7 @@
2112
2112
  "componentId": {
2113
2113
  "scope": "teambit.scope",
2114
2114
  "name": "objects",
2115
- "version": "0.0.6"
2115
+ "version": "0.0.8"
2116
2116
  }
2117
2117
  },
2118
2118
  "isOptional": false
@@ -3258,7 +3258,7 @@
3258
3258
  "componentId": {
3259
3259
  "scope": "teambit.legacy",
3260
3260
  "name": "consumer",
3261
- "version": "0.0.6"
3261
+ "version": "0.0.8"
3262
3262
  }
3263
3263
  },
3264
3264
  "isOptional": false,
@@ -3552,7 +3552,7 @@
3552
3552
  "componentId": {
3553
3553
  "scope": "teambit.scope",
3554
3554
  "name": "objects",
3555
- "version": "0.0.6"
3555
+ "version": "0.0.8"
3556
3556
  }
3557
3557
  },
3558
3558
  "isOptional": true
@@ -3774,7 +3774,7 @@
3774
3774
  "componentId": {
3775
3775
  "scope": "teambit.scope",
3776
3776
  "name": "objects",
3777
- "version": "0.0.6"
3777
+ "version": "0.0.8"
3778
3778
  }
3779
3779
  },
3780
3780
  "isOptional": true
@@ -3988,7 +3988,7 @@
3988
3988
  "componentId": {
3989
3989
  "scope": "teambit.scope",
3990
3990
  "name": "objects",
3991
- "version": "0.0.6"
3991
+ "version": "0.0.8"
3992
3992
  }
3993
3993
  },
3994
3994
  "isOptional": true,
@@ -4127,7 +4127,7 @@
4127
4127
  "componentId": {
4128
4128
  "scope": "teambit.scope",
4129
4129
  "name": "objects",
4130
- "version": "0.0.6"
4130
+ "version": "0.0.8"
4131
4131
  }
4132
4132
  },
4133
4133
  "isOptional": true,
@@ -4152,7 +4152,7 @@
4152
4152
  "componentId": {
4153
4153
  "scope": "teambit.scope",
4154
4154
  "name": "objects",
4155
- "version": "0.0.6"
4155
+ "version": "0.0.8"
4156
4156
  }
4157
4157
  },
4158
4158
  "isOptional": true,
@@ -4220,7 +4220,7 @@
4220
4220
  "componentId": {
4221
4221
  "scope": "teambit.legacy",
4222
4222
  "name": "component-list",
4223
- "version": "0.0.60"
4223
+ "version": "0.0.62"
4224
4224
  }
4225
4225
  },
4226
4226
  "isOptional": true,
@@ -4662,7 +4662,7 @@
4662
4662
  "componentId": {
4663
4663
  "scope": "teambit.component",
4664
4664
  "name": "snap-distance",
4665
- "version": "0.0.6"
4665
+ "version": "0.0.8"
4666
4666
  }
4667
4667
  },
4668
4668
  "isOptional": true
@@ -4946,7 +4946,7 @@
4946
4946
  "componentId": {
4947
4947
  "scope": "teambit.legacy",
4948
4948
  "name": "consumer-component",
4949
- "version": "0.0.7"
4949
+ "version": "0.0.9"
4950
4950
  }
4951
4951
  }
4952
4952
  },
@@ -6300,7 +6300,7 @@
6300
6300
  "_legacy": {
6301
6301
  "scope": "teambit.component",
6302
6302
  "name": "merging",
6303
- "version": "1.0.494"
6303
+ "version": "1.0.496"
6304
6304
  },
6305
6305
  "_scope": "teambit.component"
6306
6306
  }
@@ -7151,7 +7151,7 @@
7151
7151
  "componentId": {
7152
7152
  "scope": "teambit.component",
7153
7153
  "name": "sources",
7154
- "version": "0.0.58"
7154
+ "version": "0.0.60"
7155
7155
  }
7156
7156
  },
7157
7157
  "isOptional": false
@@ -7347,7 +7347,7 @@
7347
7347
  "componentId": {
7348
7348
  "scope": "teambit.component",
7349
7349
  "name": "sources",
7350
- "version": "0.0.58"
7350
+ "version": "0.0.60"
7351
7351
  }
7352
7352
  },
7353
7353
  "isOptional": true
@@ -7429,7 +7429,7 @@
7429
7429
  "componentId": {
7430
7430
  "scope": "teambit.component",
7431
7431
  "name": "sources",
7432
- "version": "0.0.58"
7432
+ "version": "0.0.60"
7433
7433
  }
7434
7434
  },
7435
7435
  "isOptional": false
@@ -7454,7 +7454,7 @@
7454
7454
  "componentId": {
7455
7455
  "scope": "teambit.scope",
7456
7456
  "name": "objects",
7457
- "version": "0.0.6"
7457
+ "version": "0.0.8"
7458
7458
  }
7459
7459
  },
7460
7460
  "isOptional": true
@@ -7479,7 +7479,7 @@
7479
7479
  "componentId": {
7480
7480
  "scope": "teambit.scope",
7481
7481
  "name": "objects",
7482
- "version": "0.0.6"
7482
+ "version": "0.0.8"
7483
7483
  }
7484
7484
  },
7485
7485
  "isOptional": false
@@ -7677,7 +7677,7 @@
7677
7677
  "componentId": {
7678
7678
  "scope": "teambit.component",
7679
7679
  "name": "sources",
7680
- "version": "0.0.58"
7680
+ "version": "0.0.60"
7681
7681
  }
7682
7682
  },
7683
7683
  "isOptional": false
@@ -7759,7 +7759,7 @@
7759
7759
  "componentId": {
7760
7760
  "scope": "teambit.component",
7761
7761
  "name": "sources",
7762
- "version": "0.0.58"
7762
+ "version": "0.0.60"
7763
7763
  }
7764
7764
  },
7765
7765
  "isOptional": false
@@ -7841,7 +7841,7 @@
7841
7841
  "componentId": {
7842
7842
  "scope": "teambit.scope",
7843
7843
  "name": "objects",
7844
- "version": "0.0.6"
7844
+ "version": "0.0.8"
7845
7845
  }
7846
7846
  },
7847
7847
  "isOptional": false
@@ -7952,7 +7952,7 @@
7952
7952
  "componentId": {
7953
7953
  "scope": "teambit.legacy",
7954
7954
  "name": "scope",
7955
- "version": "0.0.6"
7955
+ "version": "0.0.8"
7956
7956
  }
7957
7957
  },
7958
7958
  "isOptional": false
@@ -7977,7 +7977,7 @@
7977
7977
  "componentId": {
7978
7978
  "scope": "teambit.scope",
7979
7979
  "name": "objects",
7980
- "version": "0.0.6"
7980
+ "version": "0.0.8"
7981
7981
  }
7982
7982
  },
7983
7983
  "isOptional": false
@@ -8062,7 +8062,7 @@
8062
8062
  "componentId": {
8063
8063
  "scope": "teambit.scope",
8064
8064
  "name": "objects",
8065
- "version": "0.0.6"
8065
+ "version": "0.0.8"
8066
8066
  }
8067
8067
  },
8068
8068
  "isOptional": false
@@ -8091,7 +8091,7 @@
8091
8091
  "componentId": {
8092
8092
  "scope": "teambit.legacy",
8093
8093
  "name": "scope",
8094
- "version": "0.0.6"
8094
+ "version": "0.0.8"
8095
8095
  }
8096
8096
  },
8097
8097
  "isOptional": false
@@ -8116,7 +8116,7 @@
8116
8116
  "componentId": {
8117
8117
  "scope": "teambit.scope",
8118
8118
  "name": "objects",
8119
- "version": "0.0.6"
8119
+ "version": "0.0.8"
8120
8120
  }
8121
8121
  },
8122
8122
  "isOptional": false
@@ -8201,7 +8201,7 @@
8201
8201
  "componentId": {
8202
8202
  "scope": "teambit.scope",
8203
8203
  "name": "objects",
8204
- "version": "0.0.6"
8204
+ "version": "0.0.8"
8205
8205
  }
8206
8206
  },
8207
8207
  "isOptional": false
@@ -8266,7 +8266,7 @@
8266
8266
  "componentId": {
8267
8267
  "scope": "teambit.legacy",
8268
8268
  "name": "scope",
8269
- "version": "0.0.6"
8269
+ "version": "0.0.8"
8270
8270
  }
8271
8271
  },
8272
8272
  "isOptional": false,
@@ -8922,7 +8922,7 @@
8922
8922
  "componentId": {
8923
8923
  "scope": "teambit.component",
8924
8924
  "name": "snap-distance",
8925
- "version": "0.0.6"
8925
+ "version": "0.0.8"
8926
8926
  }
8927
8927
  },
8928
8928
  "isOptional": false
@@ -9027,7 +9027,7 @@
9027
9027
  "componentId": {
9028
9028
  "scope": "teambit.component",
9029
9029
  "name": "snap-distance",
9030
- "version": "0.0.6"
9030
+ "version": "0.0.8"
9031
9031
  }
9032
9032
  },
9033
9033
  "isOptional": true
@@ -9140,7 +9140,7 @@
9140
9140
  "componentId": {
9141
9141
  "scope": "teambit.component",
9142
9142
  "name": "snap-distance",
9143
- "version": "0.0.6"
9143
+ "version": "0.0.8"
9144
9144
  }
9145
9145
  },
9146
9146
  "isOptional": true
@@ -9203,7 +9203,7 @@
9203
9203
  "componentId": {
9204
9204
  "scope": "teambit.scope",
9205
9205
  "name": "objects",
9206
- "version": "0.0.6"
9206
+ "version": "0.0.8"
9207
9207
  }
9208
9208
  },
9209
9209
  "isOptional": false
@@ -9253,7 +9253,7 @@
9253
9253
  "componentId": {
9254
9254
  "scope": "teambit.scope",
9255
9255
  "name": "objects",
9256
- "version": "0.0.6"
9256
+ "version": "0.0.8"
9257
9257
  }
9258
9258
  },
9259
9259
  "isOptional": false
@@ -9479,7 +9479,7 @@
9479
9479
  "componentId": {
9480
9480
  "scope": "teambit.legacy",
9481
9481
  "name": "consumer-component",
9482
- "version": "0.0.7"
9482
+ "version": "0.0.9"
9483
9483
  }
9484
9484
  }
9485
9485
  },
@@ -9873,7 +9873,7 @@
9873
9873
  "componentId": {
9874
9874
  "scope": "teambit.legacy",
9875
9875
  "name": "consumer-component",
9876
- "version": "0.0.7"
9876
+ "version": "0.0.9"
9877
9877
  }
9878
9878
  }
9879
9879
  },
@@ -10658,7 +10658,7 @@
10658
10658
  "componentId": {
10659
10659
  "scope": "teambit.legacy",
10660
10660
  "name": "consumer",
10661
- "version": "0.0.6"
10661
+ "version": "0.0.8"
10662
10662
  }
10663
10663
  },
10664
10664
  "isOptional": false,
@@ -10952,7 +10952,7 @@
10952
10952
  "componentId": {
10953
10953
  "scope": "teambit.scope",
10954
10954
  "name": "objects",
10955
- "version": "0.0.6"
10955
+ "version": "0.0.8"
10956
10956
  }
10957
10957
  },
10958
10958
  "isOptional": true
@@ -11174,7 +11174,7 @@
11174
11174
  "componentId": {
11175
11175
  "scope": "teambit.scope",
11176
11176
  "name": "objects",
11177
- "version": "0.0.6"
11177
+ "version": "0.0.8"
11178
11178
  }
11179
11179
  },
11180
11180
  "isOptional": true
@@ -11388,7 +11388,7 @@
11388
11388
  "componentId": {
11389
11389
  "scope": "teambit.scope",
11390
11390
  "name": "objects",
11391
- "version": "0.0.6"
11391
+ "version": "0.0.8"
11392
11392
  }
11393
11393
  },
11394
11394
  "isOptional": true,
@@ -11527,7 +11527,7 @@
11527
11527
  "componentId": {
11528
11528
  "scope": "teambit.scope",
11529
11529
  "name": "objects",
11530
- "version": "0.0.6"
11530
+ "version": "0.0.8"
11531
11531
  }
11532
11532
  },
11533
11533
  "isOptional": true,
@@ -11552,7 +11552,7 @@
11552
11552
  "componentId": {
11553
11553
  "scope": "teambit.scope",
11554
11554
  "name": "objects",
11555
- "version": "0.0.6"
11555
+ "version": "0.0.8"
11556
11556
  }
11557
11557
  },
11558
11558
  "isOptional": true,
@@ -11620,7 +11620,7 @@
11620
11620
  "componentId": {
11621
11621
  "scope": "teambit.legacy",
11622
11622
  "name": "component-list",
11623
- "version": "0.0.60"
11623
+ "version": "0.0.62"
11624
11624
  }
11625
11625
  },
11626
11626
  "isOptional": true,
@@ -12014,7 +12014,7 @@
12014
12014
  "componentId": {
12015
12015
  "scope": "teambit.scope",
12016
12016
  "name": "objects",
12017
- "version": "0.0.6"
12017
+ "version": "0.0.8"
12018
12018
  }
12019
12019
  },
12020
12020
  "isOptional": false
@@ -12039,7 +12039,7 @@
12039
12039
  "componentId": {
12040
12040
  "scope": "teambit.scope",
12041
12041
  "name": "objects",
12042
- "version": "0.0.6"
12042
+ "version": "0.0.8"
12043
12043
  }
12044
12044
  },
12045
12045
  "isOptional": false
@@ -12125,7 +12125,7 @@
12125
12125
  "componentId": {
12126
12126
  "scope": "teambit.component",
12127
12127
  "name": "merging",
12128
- "version": "1.0.494"
12128
+ "version": "1.0.496"
12129
12129
  },
12130
12130
  "taggedModuleExports": []
12131
12131
  }
package/dist/esm.mjs CHANGED
@@ -12,5 +12,10 @@ export const ConfigMergeResult = cjsModule.ConfigMergeResult;
12
12
  export const MergingAspect = cjsModule.MergingAspect;
13
13
  export const getWorkspaceConfigUpdateOutput = cjsModule.getWorkspaceConfigUpdateOutput;
14
14
  export const compIsAlreadyMergedMsg = cjsModule.compIsAlreadyMergedMsg;
15
+ export const FileStatus = cjsModule.FileStatus;
16
+ export const MergeOptions = cjsModule.MergeOptions;
17
+ export const getMergeStrategyInteractive = cjsModule.getMergeStrategyInteractive;
18
+ export const threeWayMerge = cjsModule.threeWayMerge;
19
+ export const mergeFiles = cjsModule.mergeFiles;
15
20
 
16
21
  export default cjsModule;
package/esm.mjs CHANGED
@@ -12,5 +12,10 @@ export const ConfigMergeResult = cjsModule.ConfigMergeResult;
12
12
  export const MergingAspect = cjsModule.MergingAspect;
13
13
  export const getWorkspaceConfigUpdateOutput = cjsModule.getWorkspaceConfigUpdateOutput;
14
14
  export const compIsAlreadyMergedMsg = cjsModule.compIsAlreadyMergedMsg;
15
+ export const FileStatus = cjsModule.FileStatus;
16
+ export const MergeOptions = cjsModule.MergeOptions;
17
+ export const getMergeStrategyInteractive = cjsModule.getMergeStrategyInteractive;
18
+ export const threeWayMerge = cjsModule.threeWayMerge;
19
+ export const mergeFiles = cjsModule.mergeFiles;
15
20
 
16
21
  export default cjsModule;
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.494",
3
+ "version": "1.0.496",
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.494"
9
+ "version": "1.0.496"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -17,34 +17,34 @@
17
17
  "@teambit/component-id": "1.2.2",
18
18
  "@teambit/lane-id": "0.0.311",
19
19
  "@teambit/harmony": "0.4.6",
20
- "@teambit/cli": "0.0.1071",
21
- "@teambit/config-merger": "0.0.361",
22
- "@teambit/global-config": "0.0.1074",
20
+ "@teambit/cli": "0.0.1073",
21
+ "@teambit/config-merger": "0.0.363",
22
+ "@teambit/global-config": "0.0.1076",
23
23
  "@teambit/legacy.constants": "0.0.3",
24
24
  "@teambit/git.modules.git-executable": "0.0.4",
25
- "@teambit/legacy.logger": "0.0.4",
25
+ "@teambit/legacy.logger": "0.0.5",
26
26
  "@teambit/legacy.utils": "0.0.11",
27
- "@teambit/component.snap-distance": "0.0.6",
28
- "@teambit/importer": "1.0.494",
29
- "@teambit/legacy.consumer-component": "0.0.7",
30
- "@teambit/legacy.scope": "0.0.6",
31
- "@teambit/logger": "0.0.1164",
32
- "@teambit/scope.objects": "0.0.6",
33
- "@teambit/scope": "1.0.494",
34
- "@teambit/workspace": "1.0.494",
35
- "@teambit/checkout": "1.0.494",
36
- "@teambit/component-writer": "1.0.494",
37
- "@teambit/config": "0.0.1245",
38
- "@teambit/dependency-resolver": "1.0.494",
39
- "@teambit/install": "1.0.494",
40
- "@teambit/legacy.component-list": "0.0.60",
41
- "@teambit/legacy.consumer": "0.0.6",
42
- "@teambit/pkg.modules.component-package-name": "0.0.13",
43
- "@teambit/remove": "1.0.494",
44
- "@teambit/snapping": "1.0.494",
27
+ "@teambit/component.snap-distance": "0.0.8",
28
+ "@teambit/importer": "1.0.496",
29
+ "@teambit/legacy.consumer-component": "0.0.9",
30
+ "@teambit/legacy.scope": "0.0.8",
31
+ "@teambit/logger": "0.0.1166",
32
+ "@teambit/scope.objects": "0.0.8",
33
+ "@teambit/scope": "1.0.496",
34
+ "@teambit/workspace": "1.0.496",
35
+ "@teambit/checkout": "1.0.496",
36
+ "@teambit/component-writer": "1.0.496",
37
+ "@teambit/config": "0.0.1247",
38
+ "@teambit/dependency-resolver": "1.0.496",
39
+ "@teambit/install": "1.0.496",
40
+ "@teambit/legacy.component-list": "0.0.62",
41
+ "@teambit/legacy.consumer": "0.0.8",
42
+ "@teambit/pkg.modules.component-package-name": "0.0.15",
43
+ "@teambit/remove": "1.0.496",
44
+ "@teambit/snapping": "1.0.496",
45
45
  "@teambit/toolbox.path.path": "0.0.5",
46
46
  "@teambit/legacy.cli.prompts": "0.0.8",
47
- "@teambit/component.sources": "0.0.58",
47
+ "@teambit/component.sources": "0.0.60",
48
48
  "@teambit/toolbox.crypto.sha1": "0.0.4",
49
49
  "@teambit/toolbox.string.eol": "0.0.2"
50
50
  },