@teambit/merging 1.0.225 → 1.0.227

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 (12) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +189 -548
  3. package/dist/merging.main.runtime.js +2 -2
  4. package/dist/merging.main.runtime.js.map +1 -1
  5. package/package.json +16 -16
  6. package/tsconfig.json +43 -1
  7. package/dist/index.d.ts +0 -6
  8. package/dist/merge-cmd.d.ts +0 -50
  9. package/dist/merge-status-provider.d.ts +0 -31
  10. package/dist/merging.aspect.d.ts +0 -2
  11. package/dist/merging.main.runtime.d.ts +0 -152
  12. /package/dist/{preview-1712546198033.js → preview-1712719054377.js} +0 -0
package/artifacts/schema.json CHANGED
@@ -79,11 +79,7 @@
79
79
  "line": 152,
80
80
  "character": 49
81
81
  },
82
- "name": "ConfigMergeResult",
83
- "componentId": {
84
- "scope": "teambit.workspace",
85
- "name": "config-merger"
86
- }
82
+ "name": "ConfigMergeResult"
87
83
  }
88
84
  },
89
85
  "isOptional": true
@@ -205,11 +201,7 @@
205
201
  "line": 152,
206
202
  "character": 49
207
203
  },
208
- "name": "ConfigMergeResult",
209
- "componentId": {
210
- "scope": "teambit.workspace",
211
- "name": "config-merger"
212
- }
204
+ "name": "ConfigMergeResult"
213
205
  }
214
206
  },
215
207
  "isOptional": true
@@ -579,12 +571,7 @@
579
571
  "line": 372,
580
572
  "character": 54
581
573
  },
582
- "name": "ComponentID",
583
- "componentId": {
584
- "scope": "teambit.component",
585
- "name": "component-id",
586
- "version": "1.2.0"
587
- }
574
+ "name": "ComponentID"
588
575
  }
589
576
  },
590
577
  "isOptional": true,
@@ -636,12 +623,7 @@
636
623
  "line": 379,
637
624
  "character": 50
638
625
  },
639
- "name": "ComponentID",
640
- "componentId": {
641
- "scope": "teambit.component",
642
- "name": "component-id",
643
- "version": "1.2.0"
644
- }
626
+ "name": "ComponentID"
645
627
  }
646
628
  },
647
629
  "isOptional": true,
@@ -686,11 +668,7 @@
686
668
  "line": 264,
687
669
  "character": 78
688
670
  },
689
- "name": "WorkspaceConfigUpdateResult",
690
- "componentId": {
691
- "scope": "teambit.workspace",
692
- "name": "config-merger"
693
- }
671
+ "name": "WorkspaceConfigUpdateResult"
694
672
  },
695
673
  "isOptional": true,
696
674
  "isSpread": false
@@ -765,11 +743,7 @@
765
743
  "line": 114,
766
744
  "character": 24
767
745
  },
768
- "name": "Workspace",
769
- "componentId": {
770
- "scope": "teambit.workspace",
771
- "name": "workspace"
772
- }
746
+ "name": "Workspace"
773
747
  },
774
748
  "isOptional": false,
775
749
  "isSpread": false
@@ -789,11 +763,7 @@
789
763
  "line": 115,
790
764
  "character": 20
791
765
  },
792
- "name": "ScopeMain",
793
- "componentId": {
794
- "scope": "teambit.scope",
795
- "name": "scope"
796
- }
766
+ "name": "ScopeMain"
797
767
  },
798
768
  "isOptional": false,
799
769
  "isSpread": false
@@ -813,11 +783,7 @@
813
783
  "line": 116,
814
784
  "character": 22
815
785
  },
816
- "name": "InstallMain",
817
- "componentId": {
818
- "scope": "teambit.workspace",
819
- "name": "install"
820
- }
786
+ "name": "InstallMain"
821
787
  },
822
788
  "isOptional": false,
823
789
  "isSpread": false
@@ -837,11 +803,7 @@
837
803
  "line": 117,
838
804
  "character": 23
839
805
  },
840
- "name": "SnappingMain",
841
- "componentId": {
842
- "scope": "teambit.component",
843
- "name": "snapping"
844
- }
806
+ "name": "SnappingMain"
845
807
  },
846
808
  "isOptional": false,
847
809
  "isSpread": false
@@ -861,11 +823,7 @@
861
823
  "line": 118,
862
824
  "character": 23
863
825
  },
864
- "name": "CheckoutMain",
865
- "componentId": {
866
- "scope": "teambit.component",
867
- "name": "checkout"
868
- }
826
+ "name": "CheckoutMain"
869
827
  },
870
828
  "isOptional": false,
871
829
  "isSpread": false
@@ -885,11 +843,7 @@
885
843
  "line": 119,
886
844
  "character": 21
887
845
  },
888
- "name": "Logger",
889
- "componentId": {
890
- "scope": "teambit.harmony",
891
- "name": "logger"
892
- }
846
+ "name": "Logger"
893
847
  },
894
848
  "isOptional": false,
895
849
  "isSpread": false
@@ -909,11 +863,7 @@
909
863
  "line": 120,
910
864
  "character": 30
911
865
  },
912
- "name": "ComponentWriterMain",
913
- "componentId": {
914
- "scope": "teambit.component",
915
- "name": "component-writer"
916
- }
866
+ "name": "ComponentWriterMain"
917
867
  },
918
868
  "isOptional": false,
919
869
  "isSpread": false
@@ -933,11 +883,7 @@
933
883
  "line": 121,
934
884
  "character": 23
935
885
  },
936
- "name": "ImporterMain",
937
- "componentId": {
938
- "scope": "teambit.scope",
939
- "name": "importer"
940
- }
886
+ "name": "ImporterMain"
941
887
  },
942
888
  "isOptional": false,
943
889
  "isSpread": false
@@ -957,11 +903,7 @@
957
903
  "line": 122,
958
904
  "character": 21
959
905
  },
960
- "name": "ConfigMain",
961
- "componentId": {
962
- "scope": "teambit.harmony",
963
- "name": "config"
964
- }
906
+ "name": "ConfigMain"
965
907
  },
966
908
  "isOptional": false,
967
909
  "isSpread": false
@@ -981,11 +923,7 @@
981
923
  "line": 123,
982
924
  "character": 21
983
925
  },
984
- "name": "RemoveMain",
985
- "componentId": {
986
- "scope": "teambit.component",
987
- "name": "remove"
988
- }
926
+ "name": "RemoveMain"
989
927
  },
990
928
  "isOptional": false,
991
929
  "isSpread": false
@@ -1005,11 +943,7 @@
1005
943
  "line": 124,
1006
944
  "character": 27
1007
945
  },
1008
- "name": "ConfigMergerMain",
1009
- "componentId": {
1010
- "scope": "teambit.workspace",
1011
- "name": "config-merger"
1012
- }
946
+ "name": "ConfigMergerMain"
1013
947
  },
1014
948
  "isOptional": false,
1015
949
  "isSpread": false
@@ -1079,8 +1013,7 @@
1079
1013
  "line": 129,
1080
1014
  "character": 20
1081
1015
  },
1082
- "name": "MergeStrategy",
1083
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
1016
+ "name": "MergeStrategy"
1084
1017
  },
1085
1018
  "isOptional": false,
1086
1019
  "isSpread": false
@@ -1265,8 +1198,7 @@
1265
1198
  "line": 165,
1266
1199
  "character": 15
1267
1200
  },
1268
- "name": "Consumer",
1269
- "packageName": "@teambit/legacy/dist/consumer"
1201
+ "name": "Consumer"
1270
1202
  },
1271
1203
  "isOptional": false,
1272
1204
  "isSpread": false
@@ -1293,12 +1225,7 @@
1293
1225
  "line": 166,
1294
1226
  "character": 13
1295
1227
  },
1296
- "name": "ComponentID",
1297
- "componentId": {
1298
- "scope": "teambit.component",
1299
- "name": "component-id",
1300
- "version": "1.2.0"
1301
- }
1228
+ "name": "ComponentID"
1302
1229
  }
1303
1230
  },
1304
1231
  "isOptional": false,
@@ -1319,8 +1246,7 @@
1319
1246
  "line": 167,
1320
1247
  "character": 20
1321
1248
  },
1322
- "name": "MergeStrategy",
1323
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
1249
+ "name": "MergeStrategy"
1324
1250
  },
1325
1251
  "isOptional": false,
1326
1252
  "isSpread": false
@@ -1482,8 +1408,7 @@
1482
1408
  "line": 218,
1483
1409
  "character": 20
1484
1410
  },
1485
- "name": "MergeStrategy",
1486
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
1411
+ "name": "MergeStrategy"
1487
1412
  },
1488
1413
  "isOptional": false
1489
1414
  },
@@ -1564,8 +1489,7 @@
1564
1489
  "line": 221,
1565
1490
  "character": 18
1566
1491
  },
1567
- "name": "Lane",
1568
- "packageName": "@teambit/legacy/dist/scope/models"
1492
+ "name": "Lane"
1569
1493
  },
1570
1494
  {
1571
1495
  "__schema": "LiteralTypeSchema",
@@ -1700,8 +1624,7 @@
1700
1624
  "line": 218,
1701
1625
  "character": 20
1702
1626
  },
1703
- "name": "MergeStrategy",
1704
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
1627
+ "name": "MergeStrategy"
1705
1628
  },
1706
1629
  "isOptional": false
1707
1630
  },
@@ -1782,8 +1705,7 @@
1782
1705
  "line": 221,
1783
1706
  "character": 18
1784
1707
  },
1785
- "name": "Lane",
1786
- "packageName": "@teambit/legacy/dist/scope/models"
1708
+ "name": "Lane"
1787
1709
  },
1788
1710
  {
1789
1711
  "__schema": "LiteralTypeSchema",
@@ -1930,14 +1852,14 @@
1930
1852
  "__schema": "FunctionLikeSchema",
1931
1853
  "location": {
1932
1854
  "filePath": "merging.main.runtime.ts",
1933
- "line": 348,
1855
+ "line": 350,
1934
1856
  "character": 3
1935
1857
  },
1936
1858
  "doc": {
1937
1859
  "__schema": "DocSchema",
1938
1860
  "location": {
1939
1861
  "filePath": "merging.main.runtime.ts",
1940
- "line": 342,
1862
+ "line": 344,
1941
1863
  "character": 3
1942
1864
  },
1943
1865
  "raw": "/**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */",
@@ -1950,7 +1872,7 @@
1950
1872
  "__schema": "ParameterSchema",
1951
1873
  "location": {
1952
1874
  "filePath": "merging.main.runtime.ts",
1953
- "line": 349,
1875
+ "line": 351,
1954
1876
  "character": 5
1955
1877
  },
1956
1878
  "name": "bitIds",
@@ -1958,22 +1880,17 @@
1958
1880
  "__schema": "TypeArraySchema",
1959
1881
  "location": {
1960
1882
  "filePath": "merging.main.runtime.ts",
1961
- "line": 349,
1883
+ "line": 351,
1962
1884
  "character": 13
1963
1885
  },
1964
1886
  "type": {
1965
1887
  "__schema": "TypeRefSchema",
1966
1888
  "location": {
1967
1889
  "filePath": "merging.main.runtime.ts",
1968
- "line": 349,
1890
+ "line": 351,
1969
1891
  "character": 13
1970
1892
  },
1971
- "name": "ComponentID",
1972
- "componentId": {
1973
- "scope": "teambit.component",
1974
- "name": "component-id",
1975
- "version": "1.2.0"
1976
- }
1893
+ "name": "ComponentID"
1977
1894
  }
1978
1895
  },
1979
1896
  "isOptional": false,
@@ -1983,7 +1900,7 @@
1983
1900
  "__schema": "ParameterSchema",
1984
1901
  "location": {
1985
1902
  "filePath": "merging.main.runtime.ts",
1986
- "line": 350,
1903
+ "line": 352,
1987
1904
  "character": 5
1988
1905
  },
1989
1906
  "name": "options",
@@ -1991,11 +1908,10 @@
1991
1908
  "__schema": "TypeRefSchema",
1992
1909
  "location": {
1993
1910
  "filePath": "merging.main.runtime.ts",
1994
- "line": 350,
1911
+ "line": 352,
1995
1912
  "character": 14
1996
1913
  },
1997
- "name": "MergeStatusProviderOptions",
1998
- "internalFilePath": "merge-status-provider.ts"
1914
+ "name": "MergeStatusProviderOptions"
1999
1915
  },
2000
1916
  "isOptional": false,
2001
1917
  "isSpread": false
@@ -2004,7 +1920,7 @@
2004
1920
  "__schema": "ParameterSchema",
2005
1921
  "location": {
2006
1922
  "filePath": "merging.main.runtime.ts",
2007
- "line": 351,
1923
+ "line": 353,
2008
1924
  "character": 5
2009
1925
  },
2010
1926
  "name": "currentLane",
@@ -2012,7 +1928,7 @@
2012
1928
  "__schema": "TypeUnionSchema",
2013
1929
  "location": {
2014
1930
  "filePath": "merging.main.runtime.ts",
2015
- "line": 351,
1931
+ "line": 353,
2016
1932
  "character": 18
2017
1933
  },
2018
1934
  "types": [
@@ -2020,17 +1936,16 @@
2020
1936
  "__schema": "TypeRefSchema",
2021
1937
  "location": {
2022
1938
  "filePath": "merging.main.runtime.ts",
2023
- "line": 351,
1939
+ "line": 353,
2024
1940
  "character": 18
2025
1941
  },
2026
- "name": "Lane",
2027
- "packageName": "@teambit/legacy/dist/scope/models"
1942
+ "name": "Lane"
2028
1943
  },
2029
1944
  {
2030
1945
  "__schema": "LiteralTypeSchema",
2031
1946
  "location": {
2032
1947
  "filePath": "merging.main.runtime.ts",
2033
- "line": 351,
1948
+ "line": 353,
2034
1949
  "character": 25
2035
1950
  },
2036
1951
  "name": "null"
@@ -2044,7 +1959,7 @@
2044
1959
  "__schema": "ParameterSchema",
2045
1960
  "location": {
2046
1961
  "filePath": "merging.main.runtime.ts",
2047
- "line": 352,
1962
+ "line": 354,
2048
1963
  "character": 5
2049
1964
  },
2050
1965
  "name": "otherLane",
@@ -2052,7 +1967,7 @@
2052
1967
  "__schema": "TypeUnionSchema",
2053
1968
  "location": {
2054
1969
  "filePath": "merging.main.runtime.ts",
2055
- "line": 352,
1970
+ "line": 354,
2056
1971
  "character": 17
2057
1972
  },
2058
1973
  "types": [
@@ -2060,17 +1975,16 @@
2060
1975
  "__schema": "TypeRefSchema",
2061
1976
  "location": {
2062
1977
  "filePath": "merging.main.runtime.ts",
2063
- "line": 352,
1978
+ "line": 354,
2064
1979
  "character": 17
2065
1980
  },
2066
- "name": "Lane",
2067
- "packageName": "@teambit/legacy/dist/scope/models"
1981
+ "name": "Lane"
2068
1982
  },
2069
1983
  {
2070
1984
  "__schema": "LiteralTypeSchema",
2071
1985
  "location": {
2072
1986
  "filePath": "merging.main.runtime.ts",
2073
- "line": 352,
1987
+ "line": 354,
2074
1988
  "character": 24
2075
1989
  },
2076
1990
  "name": "null"
@@ -2085,7 +1999,7 @@
2085
1999
  "__schema": "TypeRefSchema",
2086
2000
  "location": {
2087
2001
  "filePath": "merging.main.runtime.ts",
2088
- "line": 353,
2002
+ "line": 355,
2089
2003
  "character": 6
2090
2004
  },
2091
2005
  "name": "Promise",
@@ -2094,14 +2008,14 @@
2094
2008
  "__schema": "TypeArraySchema",
2095
2009
  "location": {
2096
2010
  "filePath": "merging.main.runtime.ts",
2097
- "line": 353,
2011
+ "line": 355,
2098
2012
  "character": 14
2099
2013
  },
2100
2014
  "type": {
2101
2015
  "__schema": "TypeRefSchema",
2102
2016
  "location": {
2103
2017
  "filePath": "merging.main.runtime.ts",
2104
- "line": 353,
2018
+ "line": 355,
2105
2019
  "character": 14
2106
2020
  },
2107
2021
  "name": "ComponentMergeStatus"
@@ -2117,7 +2031,7 @@
2117
2031
  "__schema": "VariableLikeSchema",
2118
2032
  "location": {
2119
2033
  "filePath": "merging.main.runtime.ts",
2120
- "line": 650,
2034
+ "line": 651,
2121
2035
  "character": 3
2122
2036
  },
2123
2037
  "signature": "(property) MergingMain.slots: never[]",
@@ -2126,7 +2040,7 @@
2126
2040
  "__schema": "InferenceTypeSchema",
2127
2041
  "location": {
2128
2042
  "filePath": "merging.main.runtime.ts",
2129
- "line": 650,
2043
+ "line": 651,
2130
2044
  "character": 3
2131
2045
  },
2132
2046
  "type": "never[]"
@@ -2138,7 +2052,7 @@
2138
2052
  "__schema": "VariableLikeSchema",
2139
2053
  "location": {
2140
2054
  "filePath": "merging.main.runtime.ts",
2141
- "line": 651,
2055
+ "line": 652,
2142
2056
  "character": 3
2143
2057
  },
2144
2058
  "signature": "(property) MergingMain.dependencies: Aspect[]",
@@ -2147,7 +2061,7 @@
2147
2061
  "__schema": "InferenceTypeSchema",
2148
2062
  "location": {
2149
2063
  "filePath": "merging.main.runtime.ts",
2150
- "line": 651,
2064
+ "line": 652,
2151
2065
  "character": 3
2152
2066
  },
2153
2067
  "type": "Aspect[]"
@@ -2159,7 +2073,7 @@
2159
2073
  "__schema": "VariableLikeSchema",
2160
2074
  "location": {
2161
2075
  "filePath": "merging.main.runtime.ts",
2162
- "line": 666,
2076
+ "line": 667,
2163
2077
  "character": 3
2164
2078
  },
2165
2079
  "signature": "(property) MergingMain.runtime: RuntimeDefinition",
@@ -2168,7 +2082,7 @@
2168
2082
  "__schema": "InferenceTypeSchema",
2169
2083
  "location": {
2170
2084
  "filePath": "merging.main.runtime.ts",
2171
- "line": 666,
2085
+ "line": 667,
2172
2086
  "character": 3
2173
2087
  },
2174
2088
  "type": "RuntimeDefinition"
@@ -2180,7 +2094,7 @@
2180
2094
  "__schema": "FunctionLikeSchema",
2181
2095
  "location": {
2182
2096
  "filePath": "merging.main.runtime.ts",
2183
- "line": 667,
2097
+ "line": 668,
2184
2098
  "character": 3
2185
2099
  },
2186
2100
  "signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain\n]): Promise<MergingMain>",
@@ -2190,7 +2104,7 @@
2190
2104
  "__schema": "ParameterSchema",
2191
2105
  "location": {
2192
2106
  "filePath": "merging.main.runtime.ts",
2193
- "line": 667,
2107
+ "line": 668,
2194
2108
  "character": 25
2195
2109
  },
2196
2110
  "name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger ]",
@@ -2198,23 +2112,10 @@
2198
2112
  "__schema": "TupleTypeSchema",
2199
2113
  "location": {
2200
2114
  "filePath": "merging.main.runtime.ts",
2201
- "line": 681,
2115
+ "line": 682,
2202
2116
  "character": 6
2203
2117
  },
2204
2118
  "elements": [
2205
- {
2206
- "__schema": "TypeRefSchema",
2207
- "location": {
2208
- "filePath": "merging.main.runtime.ts",
2209
- "line": 682,
2210
- "character": 5
2211
- },
2212
- "name": "CLIMain",
2213
- "componentId": {
2214
- "scope": "teambit.harmony",
2215
- "name": "cli"
2216
- }
2217
- },
2218
2119
  {
2219
2120
  "__schema": "TypeRefSchema",
2220
2121
  "location": {
@@ -2222,11 +2123,7 @@
2222
2123
  "line": 683,
2223
2124
  "character": 5
2224
2125
  },
2225
- "name": "Workspace",
2226
- "componentId": {
2227
- "scope": "teambit.workspace",
2228
- "name": "workspace"
2229
- }
2126
+ "name": "CLIMain"
2230
2127
  },
2231
2128
  {
2232
2129
  "__schema": "TypeRefSchema",
@@ -2235,11 +2132,7 @@
2235
2132
  "line": 684,
2236
2133
  "character": 5
2237
2134
  },
2238
- "name": "ScopeMain",
2239
- "componentId": {
2240
- "scope": "teambit.scope",
2241
- "name": "scope"
2242
- }
2135
+ "name": "Workspace"
2243
2136
  },
2244
2137
  {
2245
2138
  "__schema": "TypeRefSchema",
@@ -2248,11 +2141,7 @@
2248
2141
  "line": 685,
2249
2142
  "character": 5
2250
2143
  },
2251
- "name": "SnappingMain",
2252
- "componentId": {
2253
- "scope": "teambit.component",
2254
- "name": "snapping"
2255
- }
2144
+ "name": "ScopeMain"
2256
2145
  },
2257
2146
  {
2258
2147
  "__schema": "TypeRefSchema",
@@ -2261,11 +2150,7 @@
2261
2150
  "line": 686,
2262
2151
  "character": 5
2263
2152
  },
2264
- "name": "CheckoutMain",
2265
- "componentId": {
2266
- "scope": "teambit.component",
2267
- "name": "checkout"
2268
- }
2153
+ "name": "SnappingMain"
2269
2154
  },
2270
2155
  {
2271
2156
  "__schema": "TypeRefSchema",
@@ -2274,11 +2159,7 @@
2274
2159
  "line": 687,
2275
2160
  "character": 5
2276
2161
  },
2277
- "name": "InstallMain",
2278
- "componentId": {
2279
- "scope": "teambit.workspace",
2280
- "name": "install"
2281
- }
2162
+ "name": "CheckoutMain"
2282
2163
  },
2283
2164
  {
2284
2165
  "__schema": "TypeRefSchema",
@@ -2287,11 +2168,7 @@
2287
2168
  "line": 688,
2288
2169
  "character": 5
2289
2170
  },
2290
- "name": "LoggerMain",
2291
- "componentId": {
2292
- "scope": "teambit.harmony",
2293
- "name": "logger"
2294
- }
2171
+ "name": "InstallMain"
2295
2172
  },
2296
2173
  {
2297
2174
  "__schema": "TypeRefSchema",
@@ -2300,11 +2177,7 @@
2300
2177
  "line": 689,
2301
2178
  "character": 5
2302
2179
  },
2303
- "name": "ComponentWriterMain",
2304
- "componentId": {
2305
- "scope": "teambit.component",
2306
- "name": "component-writer"
2307
- }
2180
+ "name": "LoggerMain"
2308
2181
  },
2309
2182
  {
2310
2183
  "__schema": "TypeRefSchema",
@@ -2313,11 +2186,7 @@
2313
2186
  "line": 690,
2314
2187
  "character": 5
2315
2188
  },
2316
- "name": "ImporterMain",
2317
- "componentId": {
2318
- "scope": "teambit.scope",
2319
- "name": "importer"
2320
- }
2189
+ "name": "ComponentWriterMain"
2321
2190
  },
2322
2191
  {
2323
2192
  "__schema": "TypeRefSchema",
@@ -2326,11 +2195,7 @@
2326
2195
  "line": 691,
2327
2196
  "character": 5
2328
2197
  },
2329
- "name": "ConfigMain",
2330
- "componentId": {
2331
- "scope": "teambit.harmony",
2332
- "name": "config"
2333
- }
2198
+ "name": "ImporterMain"
2334
2199
  },
2335
2200
  {
2336
2201
  "__schema": "TypeRefSchema",
@@ -2339,11 +2204,7 @@
2339
2204
  "line": 692,
2340
2205
  "character": 5
2341
2206
  },
2342
- "name": "RemoveMain",
2343
- "componentId": {
2344
- "scope": "teambit.component",
2345
- "name": "remove"
2346
- }
2207
+ "name": "ConfigMain"
2347
2208
  },
2348
2209
  {
2349
2210
  "__schema": "TypeRefSchema",
@@ -2352,11 +2213,7 @@
2352
2213
  "line": 693,
2353
2214
  "character": 5
2354
2215
  },
2355
- "name": "GlobalConfigMain",
2356
- "componentId": {
2357
- "scope": "teambit.harmony",
2358
- "name": "global-config"
2359
- }
2216
+ "name": "RemoveMain"
2360
2217
  },
2361
2218
  {
2362
2219
  "__schema": "TypeRefSchema",
@@ -2365,11 +2222,16 @@
2365
2222
  "line": 694,
2366
2223
  "character": 5
2367
2224
  },
2368
- "name": "ConfigMergerMain",
2369
- "componentId": {
2370
- "scope": "teambit.workspace",
2371
- "name": "config-merger"
2372
- }
2225
+ "name": "GlobalConfigMain"
2226
+ },
2227
+ {
2228
+ "__schema": "TypeRefSchema",
2229
+ "location": {
2230
+ "filePath": "merging.main.runtime.ts",
2231
+ "line": 695,
2232
+ "character": 5
2233
+ },
2234
+ "name": "ConfigMergerMain"
2373
2235
  }
2374
2236
  ]
2375
2237
  },
@@ -2381,7 +2243,7 @@
2381
2243
  "__schema": "InferenceTypeSchema",
2382
2244
  "location": {
2383
2245
  "filePath": "merging.main.runtime.ts",
2384
- "line": 667,
2246
+ "line": 668,
2385
2247
  "character": 3
2386
2248
  },
2387
2249
  "type": "Promise<MergingMain>"
@@ -2419,11 +2281,7 @@
2419
2281
  "line": 62,
2420
2282
  "character": 36
2421
2283
  },
2422
- "name": "ComponentStatusBase",
2423
- "componentId": {
2424
- "scope": "teambit.component",
2425
- "name": "checkout"
2426
- }
2284
+ "name": "ComponentStatusBase"
2427
2285
  },
2428
2286
  {
2429
2287
  "__schema": "TypeLiteralSchema",
@@ -2457,8 +2315,7 @@
2457
2315
  "line": 63,
2458
2316
  "character": 18
2459
2317
  },
2460
- "name": "MergeResultsThreeWay",
2461
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge"
2318
+ "name": "MergeResultsThreeWay"
2462
2319
  },
2463
2320
  {
2464
2321
  "__schema": "LiteralTypeSchema",
@@ -2489,8 +2346,7 @@
2489
2346
  "line": 64,
2490
2347
  "character": 17
2491
2348
  },
2492
- "name": "SnapsDistance",
2493
- "packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
2349
+ "name": "SnapsDistance"
2494
2350
  },
2495
2351
  "isOptional": true
2496
2352
  },
@@ -2510,8 +2366,7 @@
2510
2366
  "line": 65,
2511
2367
  "character": 23
2512
2368
  },
2513
- "name": "ResolveUnrelatedData",
2514
- "internalFilePath": "merging.main.runtime.ts"
2369
+ "name": "ResolveUnrelatedData"
2515
2370
  },
2516
2371
  "isOptional": true
2517
2372
  },
@@ -2531,11 +2386,7 @@
2531
2386
  "line": 66,
2532
2387
  "character": 23
2533
2388
  },
2534
- "name": "ConfigMergeResult",
2535
- "componentId": {
2536
- "scope": "teambit.workspace",
2537
- "name": "config-merger"
2538
- }
2389
+ "name": "ConfigMergeResult"
2539
2390
  },
2540
2391
  "isOptional": true
2541
2392
  }
@@ -2660,12 +2511,7 @@
2660
2511
  "line": 97,
2661
2512
  "character": 23
2662
2513
  },
2663
- "name": "ComponentID",
2664
- "componentId": {
2665
- "scope": "teambit.component",
2666
- "name": "component-id",
2667
- "version": "1.2.0"
2668
- }
2514
+ "name": "ComponentID"
2669
2515
  }
2670
2516
  },
2671
2517
  "isOptional": true
@@ -2693,12 +2539,7 @@
2693
2539
  "line": 98,
2694
2540
  "character": 21
2695
2541
  },
2696
- "name": "ComponentID",
2697
- "componentId": {
2698
- "scope": "teambit.component",
2699
- "name": "component-id",
2700
- "version": "1.2.0"
2701
- }
2542
+ "name": "ComponentID"
2702
2543
  }
2703
2544
  },
2704
2545
  "isOptional": true
@@ -2726,8 +2567,7 @@
2726
2567
  "line": 99,
2727
2568
  "character": 24
2728
2569
  },
2729
- "name": "ConsumerComponent",
2730
- "packageName": "@teambit/legacy/dist/consumer/component/consumer-component"
2570
+ "name": "ConsumerComponent"
2731
2571
  }
2732
2572
  },
2733
2573
  "isOptional": true
@@ -2776,8 +2616,7 @@
2776
2616
  "line": 101,
2777
2617
  "character": 22
2778
2618
  },
2779
- "name": "MergeSnapResults",
2780
- "internalFilePath": "merging.main.runtime.ts"
2619
+ "name": "MergeSnapResults"
2781
2620
  },
2782
2621
  "isOptional": true
2783
2622
  },
@@ -2945,11 +2784,7 @@
2945
2784
  "line": 109,
2946
2785
  "character": 33
2947
2786
  },
2948
- "name": "WorkspaceConfigUpdateResult",
2949
- "componentId": {
2950
- "scope": "teambit.workspace",
2951
- "name": "config-merger"
2952
- }
2787
+ "name": "WorkspaceConfigUpdateResult"
2953
2788
  },
2954
2789
  "isOptional": true
2955
2790
  }
@@ -3457,11 +3292,7 @@
3457
3292
  "line": 56,
3458
3293
  "character": 67
3459
3294
  },
3460
- "name": "GlobalConfigMain",
3461
- "componentId": {
3462
- "scope": "teambit.harmony",
3463
- "name": "global-config"
3464
- }
3295
+ "name": "GlobalConfigMain"
3465
3296
  },
3466
3297
  "isOptional": false,
3467
3298
  "isSpread": false
@@ -3618,8 +3449,7 @@
3618
3449
  "line": 76,
3619
3450
  "character": 26
3620
3451
  },
3621
- "name": "MergeStrategy",
3622
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
3452
+ "name": "MergeStrategy"
3623
3453
  },
3624
3454
  "isOptional": true
3625
3455
  },
@@ -3843,8 +3673,7 @@
3843
3673
  "line": 76,
3844
3674
  "character": 26
3845
3675
  },
3846
- "name": "MergeStrategy",
3847
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
3676
+ "name": "MergeStrategy"
3848
3677
  },
3849
3678
  "isOptional": true
3850
3679
  },
@@ -4029,7 +3858,7 @@
4029
3858
  "_legacy": {
4030
3859
  "scope": "teambit.component",
4031
3860
  "name": "merging",
4032
- "version": "1.0.225"
3861
+ "version": "1.0.227"
4033
3862
  },
4034
3863
  "_scope": "teambit.component"
4035
3864
  }
@@ -4103,11 +3932,7 @@
4103
3932
  "line": 152,
4104
3933
  "character": 49
4105
3934
  },
4106
- "name": "ConfigMergeResult",
4107
- "componentId": {
4108
- "scope": "teambit.workspace",
4109
- "name": "config-merger"
4110
- }
3935
+ "name": "ConfigMergeResult"
4111
3936
  }
4112
3937
  },
4113
3938
  "isOptional": true
@@ -4229,11 +4054,7 @@
4229
4054
  "line": 152,
4230
4055
  "character": 49
4231
4056
  },
4232
- "name": "ConfigMergeResult",
4233
- "componentId": {
4234
- "scope": "teambit.workspace",
4235
- "name": "config-merger"
4236
- }
4057
+ "name": "ConfigMergeResult"
4237
4058
  }
4238
4059
  },
4239
4060
  "isOptional": true
@@ -4291,11 +4112,7 @@
4291
4112
  "line": 264,
4292
4113
  "character": 78
4293
4114
  },
4294
- "name": "WorkspaceConfigUpdateResult",
4295
- "componentId": {
4296
- "scope": "teambit.workspace",
4297
- "name": "config-merger"
4298
- }
4115
+ "name": "WorkspaceConfigUpdateResult"
4299
4116
  },
4300
4117
  "isOptional": true,
4301
4118
  "isSpread": false
@@ -4651,12 +4468,7 @@
4651
4468
  "line": 372,
4652
4469
  "character": 54
4653
4470
  },
4654
- "name": "ComponentID",
4655
- "componentId": {
4656
- "scope": "teambit.component",
4657
- "name": "component-id",
4658
- "version": "1.2.0"
4659
- }
4471
+ "name": "ComponentID"
4660
4472
  }
4661
4473
  },
4662
4474
  "isOptional": true,
@@ -4708,12 +4520,7 @@
4708
4520
  "line": 379,
4709
4521
  "character": 50
4710
4522
  },
4711
- "name": "ComponentID",
4712
- "componentId": {
4713
- "scope": "teambit.component",
4714
- "name": "component-id",
4715
- "version": "1.2.0"
4716
- }
4523
+ "name": "ComponentID"
4717
4524
  }
4718
4525
  },
4719
4526
  "isOptional": true,
@@ -4760,11 +4567,7 @@
4760
4567
  "line": 280,
4761
4568
  "character": 56
4762
4569
  },
4763
- "name": "WorkspaceDepsUpdates",
4764
- "componentId": {
4765
- "scope": "teambit.workspace",
4766
- "name": "config-merger"
4767
- }
4570
+ "name": "WorkspaceDepsUpdates"
4768
4571
  },
4769
4572
  "isOptional": true,
4770
4573
  "isSpread": false
@@ -4815,11 +4618,7 @@
4815
4618
  "line": 62,
4816
4619
  "character": 36
4817
4620
  },
4818
- "name": "ComponentStatusBase",
4819
- "componentId": {
4820
- "scope": "teambit.component",
4821
- "name": "checkout"
4822
- }
4621
+ "name": "ComponentStatusBase"
4823
4622
  },
4824
4623
  {
4825
4624
  "__schema": "TypeLiteralSchema",
@@ -4853,8 +4652,7 @@
4853
4652
  "line": 63,
4854
4653
  "character": 18
4855
4654
  },
4856
- "name": "MergeResultsThreeWay",
4857
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge"
4655
+ "name": "MergeResultsThreeWay"
4858
4656
  },
4859
4657
  {
4860
4658
  "__schema": "LiteralTypeSchema",
@@ -4885,8 +4683,7 @@
4885
4683
  "line": 64,
4886
4684
  "character": 17
4887
4685
  },
4888
- "name": "SnapsDistance",
4889
- "packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
4686
+ "name": "SnapsDistance"
4890
4687
  },
4891
4688
  "isOptional": true
4892
4689
  },
@@ -4906,8 +4703,7 @@
4906
4703
  "line": 65,
4907
4704
  "character": 23
4908
4705
  },
4909
- "name": "ResolveUnrelatedData",
4910
- "internalFilePath": "merging.main.runtime.ts"
4706
+ "name": "ResolveUnrelatedData"
4911
4707
  },
4912
4708
  "isOptional": true
4913
4709
  },
@@ -4927,11 +4723,7 @@
4927
4723
  "line": 66,
4928
4724
  "character": 23
4929
4725
  },
4930
- "name": "ConfigMergeResult",
4931
- "componentId": {
4932
- "scope": "teambit.workspace",
4933
- "name": "config-merger"
4934
- }
4726
+ "name": "ConfigMergeResult"
4935
4727
  },
4936
4728
  "isOptional": true
4937
4729
  }
@@ -4964,11 +4756,7 @@
4964
4756
  "line": 69,
4965
4757
  "character": 54
4966
4758
  },
4967
- "name": "ComponentStatusBase",
4968
- "componentId": {
4969
- "scope": "teambit.component",
4970
- "name": "checkout"
4971
- }
4759
+ "name": "ComponentStatusBase"
4972
4760
  },
4973
4761
  {
4974
4762
  "__schema": "TypeLiteralSchema",
@@ -4994,8 +4782,7 @@
4994
4782
  "line": 70,
4995
4783
  "character": 17
4996
4784
  },
4997
- "name": "SnapsDistance",
4998
- "packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
4785
+ "name": "SnapsDistance"
4999
4786
  },
5000
4787
  "isOptional": true
5001
4788
  },
@@ -5015,8 +4802,7 @@
5015
4802
  "line": 71,
5016
4803
  "character": 23
5017
4804
  },
5018
- "name": "ResolveUnrelatedData",
5019
- "internalFilePath": "merging.main.runtime.ts"
4805
+ "name": "ResolveUnrelatedData"
5020
4806
  },
5021
4807
  "isOptional": true
5022
4808
  },
@@ -5322,8 +5108,7 @@
5322
5108
  "line": 85,
5323
5109
  "character": 22
5324
5110
  },
5325
- "name": "ConsumerComponent",
5326
- "packageName": "@teambit/legacy/dist/consumer/component/consumer-component"
5111
+ "name": "ConsumerComponent"
5327
5112
  }
5328
5113
  },
5329
5114
  "isOptional": false
@@ -5351,8 +5136,7 @@
5351
5136
  "line": 86,
5352
5137
  "character": 23
5353
5138
  },
5354
- "name": "AutoTagResult",
5355
- "packageName": "@teambit/legacy/dist/scope/component-ops/auto-tag"
5139
+ "name": "AutoTagResult"
5356
5140
  }
5357
5141
  },
5358
5142
  "isOptional": false
@@ -5373,12 +5157,7 @@
5373
5157
  "line": 87,
5374
5158
  "character": 23
5375
5159
  },
5376
- "name": "ComponentIdList",
5377
- "componentId": {
5378
- "scope": "teambit.component",
5379
- "name": "component-id",
5380
- "version": "1.2.0"
5381
- }
5160
+ "name": "ComponentIdList"
5382
5161
  },
5383
5162
  "isOptional": true
5384
5163
  },
@@ -5405,12 +5184,7 @@
5405
5184
  "line": 88,
5406
5185
  "character": 17
5407
5186
  },
5408
- "name": "ComponentID",
5409
- "componentId": {
5410
- "scope": "teambit.component",
5411
- "name": "component-id",
5412
- "version": "1.2.0"
5413
- }
5187
+ "name": "ComponentID"
5414
5188
  }
5415
5189
  },
5416
5190
  "isOptional": true
@@ -5610,12 +5384,7 @@
5610
5384
  "line": 97,
5611
5385
  "character": 23
5612
5386
  },
5613
- "name": "ComponentID",
5614
- "componentId": {
5615
- "scope": "teambit.component",
5616
- "name": "component-id",
5617
- "version": "1.2.0"
5618
- }
5387
+ "name": "ComponentID"
5619
5388
  }
5620
5389
  },
5621
5390
  "isOptional": true
@@ -5643,12 +5412,7 @@
5643
5412
  "line": 98,
5644
5413
  "character": 21
5645
5414
  },
5646
- "name": "ComponentID",
5647
- "componentId": {
5648
- "scope": "teambit.component",
5649
- "name": "component-id",
5650
- "version": "1.2.0"
5651
- }
5415
+ "name": "ComponentID"
5652
5416
  }
5653
5417
  },
5654
5418
  "isOptional": true
@@ -5676,8 +5440,7 @@
5676
5440
  "line": 99,
5677
5441
  "character": 24
5678
5442
  },
5679
- "name": "ConsumerComponent",
5680
- "packageName": "@teambit/legacy/dist/consumer/component/consumer-component"
5443
+ "name": "ConsumerComponent"
5681
5444
  }
5682
5445
  },
5683
5446
  "isOptional": true
@@ -5726,8 +5489,7 @@
5726
5489
  "line": 101,
5727
5490
  "character": 22
5728
5491
  },
5729
- "name": "MergeSnapResults",
5730
- "internalFilePath": "merging.main.runtime.ts"
5492
+ "name": "MergeSnapResults"
5731
5493
  },
5732
5494
  "isOptional": true
5733
5495
  },
@@ -5895,11 +5657,7 @@
5895
5657
  "line": 109,
5896
5658
  "character": 33
5897
5659
  },
5898
- "name": "WorkspaceConfigUpdateResult",
5899
- "componentId": {
5900
- "scope": "teambit.workspace",
5901
- "name": "config-merger"
5902
- }
5660
+ "name": "WorkspaceConfigUpdateResult"
5903
5661
  },
5904
5662
  "isOptional": true
5905
5663
  }
@@ -5941,11 +5699,7 @@
5941
5699
  "line": 114,
5942
5700
  "character": 24
5943
5701
  },
5944
- "name": "Workspace",
5945
- "componentId": {
5946
- "scope": "teambit.workspace",
5947
- "name": "workspace"
5948
- }
5702
+ "name": "Workspace"
5949
5703
  },
5950
5704
  "isOptional": false,
5951
5705
  "isSpread": false
@@ -5965,11 +5719,7 @@
5965
5719
  "line": 115,
5966
5720
  "character": 20
5967
5721
  },
5968
- "name": "ScopeMain",
5969
- "componentId": {
5970
- "scope": "teambit.scope",
5971
- "name": "scope"
5972
- }
5722
+ "name": "ScopeMain"
5973
5723
  },
5974
5724
  "isOptional": false,
5975
5725
  "isSpread": false
@@ -5989,11 +5739,7 @@
5989
5739
  "line": 116,
5990
5740
  "character": 22
5991
5741
  },
5992
- "name": "InstallMain",
5993
- "componentId": {
5994
- "scope": "teambit.workspace",
5995
- "name": "install"
5996
- }
5742
+ "name": "InstallMain"
5997
5743
  },
5998
5744
  "isOptional": false,
5999
5745
  "isSpread": false
@@ -6013,11 +5759,7 @@
6013
5759
  "line": 117,
6014
5760
  "character": 23
6015
5761
  },
6016
- "name": "SnappingMain",
6017
- "componentId": {
6018
- "scope": "teambit.component",
6019
- "name": "snapping"
6020
- }
5762
+ "name": "SnappingMain"
6021
5763
  },
6022
5764
  "isOptional": false,
6023
5765
  "isSpread": false
@@ -6037,11 +5779,7 @@
6037
5779
  "line": 118,
6038
5780
  "character": 23
6039
5781
  },
6040
- "name": "CheckoutMain",
6041
- "componentId": {
6042
- "scope": "teambit.component",
6043
- "name": "checkout"
6044
- }
5782
+ "name": "CheckoutMain"
6045
5783
  },
6046
5784
  "isOptional": false,
6047
5785
  "isSpread": false
@@ -6061,11 +5799,7 @@
6061
5799
  "line": 119,
6062
5800
  "character": 21
6063
5801
  },
6064
- "name": "Logger",
6065
- "componentId": {
6066
- "scope": "teambit.harmony",
6067
- "name": "logger"
6068
- }
5802
+ "name": "Logger"
6069
5803
  },
6070
5804
  "isOptional": false,
6071
5805
  "isSpread": false
@@ -6085,11 +5819,7 @@
6085
5819
  "line": 120,
6086
5820
  "character": 30
6087
5821
  },
6088
- "name": "ComponentWriterMain",
6089
- "componentId": {
6090
- "scope": "teambit.component",
6091
- "name": "component-writer"
6092
- }
5822
+ "name": "ComponentWriterMain"
6093
5823
  },
6094
5824
  "isOptional": false,
6095
5825
  "isSpread": false
@@ -6109,11 +5839,7 @@
6109
5839
  "line": 121,
6110
5840
  "character": 23
6111
5841
  },
6112
- "name": "ImporterMain",
6113
- "componentId": {
6114
- "scope": "teambit.scope",
6115
- "name": "importer"
6116
- }
5842
+ "name": "ImporterMain"
6117
5843
  },
6118
5844
  "isOptional": false,
6119
5845
  "isSpread": false
@@ -6133,11 +5859,7 @@
6133
5859
  "line": 122,
6134
5860
  "character": 21
6135
5861
  },
6136
- "name": "ConfigMain",
6137
- "componentId": {
6138
- "scope": "teambit.harmony",
6139
- "name": "config"
6140
- }
5862
+ "name": "ConfigMain"
6141
5863
  },
6142
5864
  "isOptional": false,
6143
5865
  "isSpread": false
@@ -6157,11 +5879,7 @@
6157
5879
  "line": 123,
6158
5880
  "character": 21
6159
5881
  },
6160
- "name": "RemoveMain",
6161
- "componentId": {
6162
- "scope": "teambit.component",
6163
- "name": "remove"
6164
- }
5882
+ "name": "RemoveMain"
6165
5883
  },
6166
5884
  "isOptional": false,
6167
5885
  "isSpread": false
@@ -6181,11 +5899,7 @@
6181
5899
  "line": 124,
6182
5900
  "character": 27
6183
5901
  },
6184
- "name": "ConfigMergerMain",
6185
- "componentId": {
6186
- "scope": "teambit.workspace",
6187
- "name": "config-merger"
6188
- }
5902
+ "name": "ConfigMergerMain"
6189
5903
  },
6190
5904
  "isOptional": false,
6191
5905
  "isSpread": false
@@ -6255,8 +5969,7 @@
6255
5969
  "line": 129,
6256
5970
  "character": 20
6257
5971
  },
6258
- "name": "MergeStrategy",
6259
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
5972
+ "name": "MergeStrategy"
6260
5973
  },
6261
5974
  "isOptional": false,
6262
5975
  "isSpread": false
@@ -6441,8 +6154,7 @@
6441
6154
  "line": 165,
6442
6155
  "character": 15
6443
6156
  },
6444
- "name": "Consumer",
6445
- "packageName": "@teambit/legacy/dist/consumer"
6157
+ "name": "Consumer"
6446
6158
  },
6447
6159
  "isOptional": false,
6448
6160
  "isSpread": false
@@ -6469,12 +6181,7 @@
6469
6181
  "line": 166,
6470
6182
  "character": 13
6471
6183
  },
6472
- "name": "ComponentID",
6473
- "componentId": {
6474
- "scope": "teambit.component",
6475
- "name": "component-id",
6476
- "version": "1.2.0"
6477
- }
6184
+ "name": "ComponentID"
6478
6185
  }
6479
6186
  },
6480
6187
  "isOptional": false,
@@ -6495,8 +6202,7 @@
6495
6202
  "line": 167,
6496
6203
  "character": 20
6497
6204
  },
6498
- "name": "MergeStrategy",
6499
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
6205
+ "name": "MergeStrategy"
6500
6206
  },
6501
6207
  "isOptional": false,
6502
6208
  "isSpread": false
@@ -6658,8 +6364,7 @@
6658
6364
  "line": 218,
6659
6365
  "character": 20
6660
6366
  },
6661
- "name": "MergeStrategy",
6662
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
6367
+ "name": "MergeStrategy"
6663
6368
  },
6664
6369
  "isOptional": false
6665
6370
  },
@@ -6740,8 +6445,7 @@
6740
6445
  "line": 221,
6741
6446
  "character": 18
6742
6447
  },
6743
- "name": "Lane",
6744
- "packageName": "@teambit/legacy/dist/scope/models"
6448
+ "name": "Lane"
6745
6449
  },
6746
6450
  {
6747
6451
  "__schema": "LiteralTypeSchema",
@@ -6876,8 +6580,7 @@
6876
6580
  "line": 218,
6877
6581
  "character": 20
6878
6582
  },
6879
- "name": "MergeStrategy",
6880
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
6583
+ "name": "MergeStrategy"
6881
6584
  },
6882
6585
  "isOptional": false
6883
6586
  },
@@ -6958,8 +6661,7 @@
6958
6661
  "line": 221,
6959
6662
  "character": 18
6960
6663
  },
6961
- "name": "Lane",
6962
- "packageName": "@teambit/legacy/dist/scope/models"
6664
+ "name": "Lane"
6963
6665
  },
6964
6666
  {
6965
6667
  "__schema": "LiteralTypeSchema",
@@ -7106,14 +6808,14 @@
7106
6808
  "__schema": "FunctionLikeSchema",
7107
6809
  "location": {
7108
6810
  "filePath": "merging.main.runtime.ts",
7109
- "line": 348,
6811
+ "line": 350,
7110
6812
  "character": 3
7111
6813
  },
7112
6814
  "doc": {
7113
6815
  "__schema": "DocSchema",
7114
6816
  "location": {
7115
6817
  "filePath": "merging.main.runtime.ts",
7116
- "line": 342,
6818
+ "line": 344,
7117
6819
  "character": 3
7118
6820
  },
7119
6821
  "raw": "/**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */",
@@ -7126,7 +6828,7 @@
7126
6828
  "__schema": "ParameterSchema",
7127
6829
  "location": {
7128
6830
  "filePath": "merging.main.runtime.ts",
7129
- "line": 349,
6831
+ "line": 351,
7130
6832
  "character": 5
7131
6833
  },
7132
6834
  "name": "bitIds",
@@ -7134,22 +6836,17 @@
7134
6836
  "__schema": "TypeArraySchema",
7135
6837
  "location": {
7136
6838
  "filePath": "merging.main.runtime.ts",
7137
- "line": 349,
6839
+ "line": 351,
7138
6840
  "character": 13
7139
6841
  },
7140
6842
  "type": {
7141
6843
  "__schema": "TypeRefSchema",
7142
6844
  "location": {
7143
6845
  "filePath": "merging.main.runtime.ts",
7144
- "line": 349,
6846
+ "line": 351,
7145
6847
  "character": 13
7146
6848
  },
7147
- "name": "ComponentID",
7148
- "componentId": {
7149
- "scope": "teambit.component",
7150
- "name": "component-id",
7151
- "version": "1.2.0"
7152
- }
6849
+ "name": "ComponentID"
7153
6850
  }
7154
6851
  },
7155
6852
  "isOptional": false,
@@ -7159,7 +6856,7 @@
7159
6856
  "__schema": "ParameterSchema",
7160
6857
  "location": {
7161
6858
  "filePath": "merging.main.runtime.ts",
7162
- "line": 350,
6859
+ "line": 352,
7163
6860
  "character": 5
7164
6861
  },
7165
6862
  "name": "options",
@@ -7167,11 +6864,10 @@
7167
6864
  "__schema": "TypeRefSchema",
7168
6865
  "location": {
7169
6866
  "filePath": "merging.main.runtime.ts",
7170
- "line": 350,
6867
+ "line": 352,
7171
6868
  "character": 14
7172
6869
  },
7173
- "name": "MergeStatusProviderOptions",
7174
- "internalFilePath": "merge-status-provider.ts"
6870
+ "name": "MergeStatusProviderOptions"
7175
6871
  },
7176
6872
  "isOptional": false,
7177
6873
  "isSpread": false
@@ -7180,7 +6876,7 @@
7180
6876
  "__schema": "ParameterSchema",
7181
6877
  "location": {
7182
6878
  "filePath": "merging.main.runtime.ts",
7183
- "line": 351,
6879
+ "line": 353,
7184
6880
  "character": 5
7185
6881
  },
7186
6882
  "name": "currentLane",
@@ -7188,7 +6884,7 @@
7188
6884
  "__schema": "TypeUnionSchema",
7189
6885
  "location": {
7190
6886
  "filePath": "merging.main.runtime.ts",
7191
- "line": 351,
6887
+ "line": 353,
7192
6888
  "character": 18
7193
6889
  },
7194
6890
  "types": [
@@ -7196,17 +6892,16 @@
7196
6892
  "__schema": "TypeRefSchema",
7197
6893
  "location": {
7198
6894
  "filePath": "merging.main.runtime.ts",
7199
- "line": 351,
6895
+ "line": 353,
7200
6896
  "character": 18
7201
6897
  },
7202
- "name": "Lane",
7203
- "packageName": "@teambit/legacy/dist/scope/models"
6898
+ "name": "Lane"
7204
6899
  },
7205
6900
  {
7206
6901
  "__schema": "LiteralTypeSchema",
7207
6902
  "location": {
7208
6903
  "filePath": "merging.main.runtime.ts",
7209
- "line": 351,
6904
+ "line": 353,
7210
6905
  "character": 25
7211
6906
  },
7212
6907
  "name": "null"
@@ -7220,7 +6915,7 @@
7220
6915
  "__schema": "ParameterSchema",
7221
6916
  "location": {
7222
6917
  "filePath": "merging.main.runtime.ts",
7223
- "line": 352,
6918
+ "line": 354,
7224
6919
  "character": 5
7225
6920
  },
7226
6921
  "name": "otherLane",
@@ -7228,7 +6923,7 @@
7228
6923
  "__schema": "TypeUnionSchema",
7229
6924
  "location": {
7230
6925
  "filePath": "merging.main.runtime.ts",
7231
- "line": 352,
6926
+ "line": 354,
7232
6927
  "character": 17
7233
6928
  },
7234
6929
  "types": [
@@ -7236,17 +6931,16 @@
7236
6931
  "__schema": "TypeRefSchema",
7237
6932
  "location": {
7238
6933
  "filePath": "merging.main.runtime.ts",
7239
- "line": 352,
6934
+ "line": 354,
7240
6935
  "character": 17
7241
6936
  },
7242
- "name": "Lane",
7243
- "packageName": "@teambit/legacy/dist/scope/models"
6937
+ "name": "Lane"
7244
6938
  },
7245
6939
  {
7246
6940
  "__schema": "LiteralTypeSchema",
7247
6941
  "location": {
7248
6942
  "filePath": "merging.main.runtime.ts",
7249
- "line": 352,
6943
+ "line": 354,
7250
6944
  "character": 24
7251
6945
  },
7252
6946
  "name": "null"
@@ -7261,7 +6955,7 @@
7261
6955
  "__schema": "TypeRefSchema",
7262
6956
  "location": {
7263
6957
  "filePath": "merging.main.runtime.ts",
7264
- "line": 353,
6958
+ "line": 355,
7265
6959
  "character": 6
7266
6960
  },
7267
6961
  "name": "Promise",
@@ -7270,14 +6964,14 @@
7270
6964
  "__schema": "TypeArraySchema",
7271
6965
  "location": {
7272
6966
  "filePath": "merging.main.runtime.ts",
7273
- "line": 353,
6967
+ "line": 355,
7274
6968
  "character": 14
7275
6969
  },
7276
6970
  "type": {
7277
6971
  "__schema": "TypeRefSchema",
7278
6972
  "location": {
7279
6973
  "filePath": "merging.main.runtime.ts",
7280
- "line": 353,
6974
+ "line": 355,
7281
6975
  "character": 14
7282
6976
  },
7283
6977
  "name": "ComponentMergeStatus"
@@ -7293,7 +6987,7 @@
7293
6987
  "__schema": "VariableLikeSchema",
7294
6988
  "location": {
7295
6989
  "filePath": "merging.main.runtime.ts",
7296
- "line": 650,
6990
+ "line": 651,
7297
6991
  "character": 3
7298
6992
  },
7299
6993
  "signature": "(property) MergingMain.slots: never[]",
@@ -7302,7 +6996,7 @@
7302
6996
  "__schema": "InferenceTypeSchema",
7303
6997
  "location": {
7304
6998
  "filePath": "merging.main.runtime.ts",
7305
- "line": 650,
6999
+ "line": 651,
7306
7000
  "character": 3
7307
7001
  },
7308
7002
  "type": "never[]"
@@ -7314,7 +7008,7 @@
7314
7008
  "__schema": "VariableLikeSchema",
7315
7009
  "location": {
7316
7010
  "filePath": "merging.main.runtime.ts",
7317
- "line": 651,
7011
+ "line": 652,
7318
7012
  "character": 3
7319
7013
  },
7320
7014
  "signature": "(property) MergingMain.dependencies: Aspect[]",
@@ -7323,7 +7017,7 @@
7323
7017
  "__schema": "InferenceTypeSchema",
7324
7018
  "location": {
7325
7019
  "filePath": "merging.main.runtime.ts",
7326
- "line": 651,
7020
+ "line": 652,
7327
7021
  "character": 3
7328
7022
  },
7329
7023
  "type": "Aspect[]"
@@ -7335,7 +7029,7 @@
7335
7029
  "__schema": "VariableLikeSchema",
7336
7030
  "location": {
7337
7031
  "filePath": "merging.main.runtime.ts",
7338
- "line": 666,
7032
+ "line": 667,
7339
7033
  "character": 3
7340
7034
  },
7341
7035
  "signature": "(property) MergingMain.runtime: RuntimeDefinition",
@@ -7344,7 +7038,7 @@
7344
7038
  "__schema": "InferenceTypeSchema",
7345
7039
  "location": {
7346
7040
  "filePath": "merging.main.runtime.ts",
7347
- "line": 666,
7041
+ "line": 667,
7348
7042
  "character": 3
7349
7043
  },
7350
7044
  "type": "RuntimeDefinition"
@@ -7356,7 +7050,7 @@
7356
7050
  "__schema": "FunctionLikeSchema",
7357
7051
  "location": {
7358
7052
  "filePath": "merging.main.runtime.ts",
7359
- "line": 667,
7053
+ "line": 668,
7360
7054
  "character": 3
7361
7055
  },
7362
7056
  "signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain\n]): Promise<MergingMain>",
@@ -7366,7 +7060,7 @@
7366
7060
  "__schema": "ParameterSchema",
7367
7061
  "location": {
7368
7062
  "filePath": "merging.main.runtime.ts",
7369
- "line": 667,
7063
+ "line": 668,
7370
7064
  "character": 25
7371
7065
  },
7372
7066
  "name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger ]",
@@ -7374,23 +7068,10 @@
7374
7068
  "__schema": "TupleTypeSchema",
7375
7069
  "location": {
7376
7070
  "filePath": "merging.main.runtime.ts",
7377
- "line": 681,
7071
+ "line": 682,
7378
7072
  "character": 6
7379
7073
  },
7380
7074
  "elements": [
7381
- {
7382
- "__schema": "TypeRefSchema",
7383
- "location": {
7384
- "filePath": "merging.main.runtime.ts",
7385
- "line": 682,
7386
- "character": 5
7387
- },
7388
- "name": "CLIMain",
7389
- "componentId": {
7390
- "scope": "teambit.harmony",
7391
- "name": "cli"
7392
- }
7393
- },
7394
7075
  {
7395
7076
  "__schema": "TypeRefSchema",
7396
7077
  "location": {
@@ -7398,11 +7079,7 @@
7398
7079
  "line": 683,
7399
7080
  "character": 5
7400
7081
  },
7401
- "name": "Workspace",
7402
- "componentId": {
7403
- "scope": "teambit.workspace",
7404
- "name": "workspace"
7405
- }
7082
+ "name": "CLIMain"
7406
7083
  },
7407
7084
  {
7408
7085
  "__schema": "TypeRefSchema",
@@ -7411,11 +7088,7 @@
7411
7088
  "line": 684,
7412
7089
  "character": 5
7413
7090
  },
7414
- "name": "ScopeMain",
7415
- "componentId": {
7416
- "scope": "teambit.scope",
7417
- "name": "scope"
7418
- }
7091
+ "name": "Workspace"
7419
7092
  },
7420
7093
  {
7421
7094
  "__schema": "TypeRefSchema",
@@ -7424,11 +7097,7 @@
7424
7097
  "line": 685,
7425
7098
  "character": 5
7426
7099
  },
7427
- "name": "SnappingMain",
7428
- "componentId": {
7429
- "scope": "teambit.component",
7430
- "name": "snapping"
7431
- }
7100
+ "name": "ScopeMain"
7432
7101
  },
7433
7102
  {
7434
7103
  "__schema": "TypeRefSchema",
@@ -7437,11 +7106,7 @@
7437
7106
  "line": 686,
7438
7107
  "character": 5
7439
7108
  },
7440
- "name": "CheckoutMain",
7441
- "componentId": {
7442
- "scope": "teambit.component",
7443
- "name": "checkout"
7444
- }
7109
+ "name": "SnappingMain"
7445
7110
  },
7446
7111
  {
7447
7112
  "__schema": "TypeRefSchema",
@@ -7450,11 +7115,7 @@
7450
7115
  "line": 687,
7451
7116
  "character": 5
7452
7117
  },
7453
- "name": "InstallMain",
7454
- "componentId": {
7455
- "scope": "teambit.workspace",
7456
- "name": "install"
7457
- }
7118
+ "name": "CheckoutMain"
7458
7119
  },
7459
7120
  {
7460
7121
  "__schema": "TypeRefSchema",
@@ -7463,11 +7124,7 @@
7463
7124
  "line": 688,
7464
7125
  "character": 5
7465
7126
  },
7466
- "name": "LoggerMain",
7467
- "componentId": {
7468
- "scope": "teambit.harmony",
7469
- "name": "logger"
7470
- }
7127
+ "name": "InstallMain"
7471
7128
  },
7472
7129
  {
7473
7130
  "__schema": "TypeRefSchema",
@@ -7476,11 +7133,7 @@
7476
7133
  "line": 689,
7477
7134
  "character": 5
7478
7135
  },
7479
- "name": "ComponentWriterMain",
7480
- "componentId": {
7481
- "scope": "teambit.component",
7482
- "name": "component-writer"
7483
- }
7136
+ "name": "LoggerMain"
7484
7137
  },
7485
7138
  {
7486
7139
  "__schema": "TypeRefSchema",
@@ -7489,11 +7142,7 @@
7489
7142
  "line": 690,
7490
7143
  "character": 5
7491
7144
  },
7492
- "name": "ImporterMain",
7493
- "componentId": {
7494
- "scope": "teambit.scope",
7495
- "name": "importer"
7496
- }
7145
+ "name": "ComponentWriterMain"
7497
7146
  },
7498
7147
  {
7499
7148
  "__schema": "TypeRefSchema",
@@ -7502,11 +7151,7 @@
7502
7151
  "line": 691,
7503
7152
  "character": 5
7504
7153
  },
7505
- "name": "ConfigMain",
7506
- "componentId": {
7507
- "scope": "teambit.harmony",
7508
- "name": "config"
7509
- }
7154
+ "name": "ImporterMain"
7510
7155
  },
7511
7156
  {
7512
7157
  "__schema": "TypeRefSchema",
@@ -7515,11 +7160,7 @@
7515
7160
  "line": 692,
7516
7161
  "character": 5
7517
7162
  },
7518
- "name": "RemoveMain",
7519
- "componentId": {
7520
- "scope": "teambit.component",
7521
- "name": "remove"
7522
- }
7163
+ "name": "ConfigMain"
7523
7164
  },
7524
7165
  {
7525
7166
  "__schema": "TypeRefSchema",
@@ -7528,11 +7169,7 @@
7528
7169
  "line": 693,
7529
7170
  "character": 5
7530
7171
  },
7531
- "name": "GlobalConfigMain",
7532
- "componentId": {
7533
- "scope": "teambit.harmony",
7534
- "name": "global-config"
7535
- }
7172
+ "name": "RemoveMain"
7536
7173
  },
7537
7174
  {
7538
7175
  "__schema": "TypeRefSchema",
@@ -7541,11 +7178,16 @@
7541
7178
  "line": 694,
7542
7179
  "character": 5
7543
7180
  },
7544
- "name": "ConfigMergerMain",
7545
- "componentId": {
7546
- "scope": "teambit.workspace",
7547
- "name": "config-merger"
7548
- }
7181
+ "name": "GlobalConfigMain"
7182
+ },
7183
+ {
7184
+ "__schema": "TypeRefSchema",
7185
+ "location": {
7186
+ "filePath": "merging.main.runtime.ts",
7187
+ "line": 695,
7188
+ "character": 5
7189
+ },
7190
+ "name": "ConfigMergerMain"
7549
7191
  }
7550
7192
  ]
7551
7193
  },
@@ -7557,7 +7199,7 @@
7557
7199
  "__schema": "InferenceTypeSchema",
7558
7200
  "location": {
7559
7201
  "filePath": "merging.main.runtime.ts",
7560
- "line": 667,
7202
+ "line": 668,
7561
7203
  "character": 3
7562
7204
  },
7563
7205
  "type": "Promise<MergingMain>"
@@ -7606,8 +7248,7 @@
7606
7248
  "line": 56,
7607
7249
  "character": 13
7608
7250
  },
7609
- "name": "MergeStrategy",
7610
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
7251
+ "name": "MergeStrategy"
7611
7252
  },
7612
7253
  "isOptional": false
7613
7254
  },
@@ -7685,7 +7326,7 @@
7685
7326
  "__schema": "UnImplementedSchema",
7686
7327
  "location": {
7687
7328
  "filePath": "merging.main.runtime.ts",
7688
- "line": 715,
7329
+ "line": 716,
7689
7330
  "character": 1
7690
7331
  },
7691
7332
  "name": "MergingAspect.addRuntime(MergingMain);",
@@ -7734,7 +7375,7 @@
7734
7375
  "componentId": {
7735
7376
  "scope": "teambit.component",
7736
7377
  "name": "merging",
7737
- "version": "1.0.225"
7378
+ "version": "1.0.227"
7738
7379
  },
7739
7380
  "taggedModuleExports": []
7740
7381
  }