@teambit/merging 1.0.249 → 1.0.250
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/artifacts/__bit_junit.xml +1 -1
- package/artifacts/schema.json +774 -496
- package/dist/merging.main.runtime.d.ts +8 -4
- package/dist/merging.main.runtime.js +32 -5
- package/dist/merging.main.runtime.js.map +1 -1
- package/package.json +13 -12
- /package/dist/{preview-1713842366409.js → preview-1713916866359.js} +0 -0
package/artifacts/schema.json
CHANGED
|
@@ -734,7 +734,7 @@
|
|
|
734
734
|
"__schema": "ClassSchema",
|
|
735
735
|
"location": {
|
|
736
736
|
"filePath": "merging.main.runtime.ts",
|
|
737
|
-
"line":
|
|
737
|
+
"line": 114,
|
|
738
738
|
"character": 1
|
|
739
739
|
},
|
|
740
740
|
"signature": "class MergingMain",
|
|
@@ -744,17 +744,17 @@
|
|
|
744
744
|
"__schema": "ConstructorSchema",
|
|
745
745
|
"location": {
|
|
746
746
|
"filePath": "merging.main.runtime.ts",
|
|
747
|
-
"line":
|
|
747
|
+
"line": 115,
|
|
748
748
|
"character": 3
|
|
749
749
|
},
|
|
750
|
-
"signature": "constructor MergingMain(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain): MergingMain",
|
|
750
|
+
"signature": "constructor MergingMain(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain, depResolver: DependencyResolverMain): MergingMain",
|
|
751
751
|
"name": "constructor",
|
|
752
752
|
"params": [
|
|
753
753
|
{
|
|
754
754
|
"__schema": "ParameterSchema",
|
|
755
755
|
"location": {
|
|
756
756
|
"filePath": "merging.main.runtime.ts",
|
|
757
|
-
"line":
|
|
757
|
+
"line": 116,
|
|
758
758
|
"character": 5
|
|
759
759
|
},
|
|
760
760
|
"name": "workspace",
|
|
@@ -762,7 +762,7 @@
|
|
|
762
762
|
"__schema": "TypeRefSchema",
|
|
763
763
|
"location": {
|
|
764
764
|
"filePath": "merging.main.runtime.ts",
|
|
765
|
-
"line":
|
|
765
|
+
"line": 116,
|
|
766
766
|
"character": 24
|
|
767
767
|
},
|
|
768
768
|
"name": "Workspace",
|
|
@@ -778,7 +778,7 @@
|
|
|
778
778
|
"__schema": "ParameterSchema",
|
|
779
779
|
"location": {
|
|
780
780
|
"filePath": "merging.main.runtime.ts",
|
|
781
|
-
"line":
|
|
781
|
+
"line": 117,
|
|
782
782
|
"character": 5
|
|
783
783
|
},
|
|
784
784
|
"name": "scope",
|
|
@@ -786,7 +786,7 @@
|
|
|
786
786
|
"__schema": "TypeRefSchema",
|
|
787
787
|
"location": {
|
|
788
788
|
"filePath": "merging.main.runtime.ts",
|
|
789
|
-
"line":
|
|
789
|
+
"line": 117,
|
|
790
790
|
"character": 20
|
|
791
791
|
},
|
|
792
792
|
"name": "ScopeMain",
|
|
@@ -802,7 +802,7 @@
|
|
|
802
802
|
"__schema": "ParameterSchema",
|
|
803
803
|
"location": {
|
|
804
804
|
"filePath": "merging.main.runtime.ts",
|
|
805
|
-
"line":
|
|
805
|
+
"line": 118,
|
|
806
806
|
"character": 5
|
|
807
807
|
},
|
|
808
808
|
"name": "install",
|
|
@@ -810,7 +810,7 @@
|
|
|
810
810
|
"__schema": "TypeRefSchema",
|
|
811
811
|
"location": {
|
|
812
812
|
"filePath": "merging.main.runtime.ts",
|
|
813
|
-
"line":
|
|
813
|
+
"line": 118,
|
|
814
814
|
"character": 22
|
|
815
815
|
},
|
|
816
816
|
"name": "InstallMain",
|
|
@@ -826,7 +826,7 @@
|
|
|
826
826
|
"__schema": "ParameterSchema",
|
|
827
827
|
"location": {
|
|
828
828
|
"filePath": "merging.main.runtime.ts",
|
|
829
|
-
"line":
|
|
829
|
+
"line": 119,
|
|
830
830
|
"character": 5
|
|
831
831
|
},
|
|
832
832
|
"name": "snapping",
|
|
@@ -834,7 +834,7 @@
|
|
|
834
834
|
"__schema": "TypeRefSchema",
|
|
835
835
|
"location": {
|
|
836
836
|
"filePath": "merging.main.runtime.ts",
|
|
837
|
-
"line":
|
|
837
|
+
"line": 119,
|
|
838
838
|
"character": 23
|
|
839
839
|
},
|
|
840
840
|
"name": "SnappingMain",
|
|
@@ -850,7 +850,7 @@
|
|
|
850
850
|
"__schema": "ParameterSchema",
|
|
851
851
|
"location": {
|
|
852
852
|
"filePath": "merging.main.runtime.ts",
|
|
853
|
-
"line":
|
|
853
|
+
"line": 120,
|
|
854
854
|
"character": 5
|
|
855
855
|
},
|
|
856
856
|
"name": "checkout",
|
|
@@ -858,7 +858,7 @@
|
|
|
858
858
|
"__schema": "TypeRefSchema",
|
|
859
859
|
"location": {
|
|
860
860
|
"filePath": "merging.main.runtime.ts",
|
|
861
|
-
"line":
|
|
861
|
+
"line": 120,
|
|
862
862
|
"character": 23
|
|
863
863
|
},
|
|
864
864
|
"name": "CheckoutMain",
|
|
@@ -874,7 +874,7 @@
|
|
|
874
874
|
"__schema": "ParameterSchema",
|
|
875
875
|
"location": {
|
|
876
876
|
"filePath": "merging.main.runtime.ts",
|
|
877
|
-
"line":
|
|
877
|
+
"line": 121,
|
|
878
878
|
"character": 5
|
|
879
879
|
},
|
|
880
880
|
"name": "logger",
|
|
@@ -882,7 +882,7 @@
|
|
|
882
882
|
"__schema": "TypeRefSchema",
|
|
883
883
|
"location": {
|
|
884
884
|
"filePath": "merging.main.runtime.ts",
|
|
885
|
-
"line":
|
|
885
|
+
"line": 121,
|
|
886
886
|
"character": 21
|
|
887
887
|
},
|
|
888
888
|
"name": "Logger",
|
|
@@ -898,7 +898,7 @@
|
|
|
898
898
|
"__schema": "ParameterSchema",
|
|
899
899
|
"location": {
|
|
900
900
|
"filePath": "merging.main.runtime.ts",
|
|
901
|
-
"line":
|
|
901
|
+
"line": 122,
|
|
902
902
|
"character": 5
|
|
903
903
|
},
|
|
904
904
|
"name": "componentWriter",
|
|
@@ -906,7 +906,7 @@
|
|
|
906
906
|
"__schema": "TypeRefSchema",
|
|
907
907
|
"location": {
|
|
908
908
|
"filePath": "merging.main.runtime.ts",
|
|
909
|
-
"line":
|
|
909
|
+
"line": 122,
|
|
910
910
|
"character": 30
|
|
911
911
|
},
|
|
912
912
|
"name": "ComponentWriterMain",
|
|
@@ -922,7 +922,7 @@
|
|
|
922
922
|
"__schema": "ParameterSchema",
|
|
923
923
|
"location": {
|
|
924
924
|
"filePath": "merging.main.runtime.ts",
|
|
925
|
-
"line":
|
|
925
|
+
"line": 123,
|
|
926
926
|
"character": 5
|
|
927
927
|
},
|
|
928
928
|
"name": "importer",
|
|
@@ -930,7 +930,7 @@
|
|
|
930
930
|
"__schema": "TypeRefSchema",
|
|
931
931
|
"location": {
|
|
932
932
|
"filePath": "merging.main.runtime.ts",
|
|
933
|
-
"line":
|
|
933
|
+
"line": 123,
|
|
934
934
|
"character": 23
|
|
935
935
|
},
|
|
936
936
|
"name": "ImporterMain",
|
|
@@ -946,7 +946,7 @@
|
|
|
946
946
|
"__schema": "ParameterSchema",
|
|
947
947
|
"location": {
|
|
948
948
|
"filePath": "merging.main.runtime.ts",
|
|
949
|
-
"line":
|
|
949
|
+
"line": 124,
|
|
950
950
|
"character": 5
|
|
951
951
|
},
|
|
952
952
|
"name": "config",
|
|
@@ -954,7 +954,7 @@
|
|
|
954
954
|
"__schema": "TypeRefSchema",
|
|
955
955
|
"location": {
|
|
956
956
|
"filePath": "merging.main.runtime.ts",
|
|
957
|
-
"line":
|
|
957
|
+
"line": 124,
|
|
958
958
|
"character": 21
|
|
959
959
|
},
|
|
960
960
|
"name": "ConfigMain",
|
|
@@ -970,7 +970,7 @@
|
|
|
970
970
|
"__schema": "ParameterSchema",
|
|
971
971
|
"location": {
|
|
972
972
|
"filePath": "merging.main.runtime.ts",
|
|
973
|
-
"line":
|
|
973
|
+
"line": 125,
|
|
974
974
|
"character": 5
|
|
975
975
|
},
|
|
976
976
|
"name": "remove",
|
|
@@ -978,7 +978,7 @@
|
|
|
978
978
|
"__schema": "TypeRefSchema",
|
|
979
979
|
"location": {
|
|
980
980
|
"filePath": "merging.main.runtime.ts",
|
|
981
|
-
"line":
|
|
981
|
+
"line": 125,
|
|
982
982
|
"character": 21
|
|
983
983
|
},
|
|
984
984
|
"name": "RemoveMain",
|
|
@@ -994,7 +994,7 @@
|
|
|
994
994
|
"__schema": "ParameterSchema",
|
|
995
995
|
"location": {
|
|
996
996
|
"filePath": "merging.main.runtime.ts",
|
|
997
|
-
"line":
|
|
997
|
+
"line": 126,
|
|
998
998
|
"character": 5
|
|
999
999
|
},
|
|
1000
1000
|
"name": "configMerger",
|
|
@@ -1002,7 +1002,7 @@
|
|
|
1002
1002
|
"__schema": "TypeRefSchema",
|
|
1003
1003
|
"location": {
|
|
1004
1004
|
"filePath": "merging.main.runtime.ts",
|
|
1005
|
-
"line":
|
|
1005
|
+
"line": 126,
|
|
1006
1006
|
"character": 27
|
|
1007
1007
|
},
|
|
1008
1008
|
"name": "ConfigMergerMain",
|
|
@@ -1013,13 +1013,37 @@
|
|
|
1013
1013
|
},
|
|
1014
1014
|
"isOptional": false,
|
|
1015
1015
|
"isSpread": false
|
|
1016
|
+
},
|
|
1017
|
+
{
|
|
1018
|
+
"__schema": "ParameterSchema",
|
|
1019
|
+
"location": {
|
|
1020
|
+
"filePath": "merging.main.runtime.ts",
|
|
1021
|
+
"line": 127,
|
|
1022
|
+
"character": 5
|
|
1023
|
+
},
|
|
1024
|
+
"name": "depResolver",
|
|
1025
|
+
"type": {
|
|
1026
|
+
"__schema": "TypeRefSchema",
|
|
1027
|
+
"location": {
|
|
1028
|
+
"filePath": "merging.main.runtime.ts",
|
|
1029
|
+
"line": 127,
|
|
1030
|
+
"character": 26
|
|
1031
|
+
},
|
|
1032
|
+
"name": "DependencyResolverMain",
|
|
1033
|
+
"componentId": {
|
|
1034
|
+
"scope": "teambit.dependencies",
|
|
1035
|
+
"name": "dependency-resolver"
|
|
1036
|
+
}
|
|
1037
|
+
},
|
|
1038
|
+
"isOptional": false,
|
|
1039
|
+
"isSpread": false
|
|
1016
1040
|
}
|
|
1017
1041
|
],
|
|
1018
1042
|
"returnType": {
|
|
1019
1043
|
"__schema": "ThisTypeSchema",
|
|
1020
1044
|
"location": {
|
|
1021
1045
|
"filePath": "merging.main.runtime.ts",
|
|
1022
|
-
"line":
|
|
1046
|
+
"line": 114,
|
|
1023
1047
|
"character": 1
|
|
1024
1048
|
},
|
|
1025
1049
|
"name": "MergingMain"
|
|
@@ -1030,7 +1054,7 @@
|
|
|
1030
1054
|
"__schema": "FunctionLikeSchema",
|
|
1031
1055
|
"location": {
|
|
1032
1056
|
"filePath": "merging.main.runtime.ts",
|
|
1033
|
-
"line":
|
|
1057
|
+
"line": 130,
|
|
1034
1058
|
"character": 3
|
|
1035
1059
|
},
|
|
1036
1060
|
"signature": "(method) MergingMain.merge(ids: string[], mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>",
|
|
@@ -1040,7 +1064,7 @@
|
|
|
1040
1064
|
"__schema": "ParameterSchema",
|
|
1041
1065
|
"location": {
|
|
1042
1066
|
"filePath": "merging.main.runtime.ts",
|
|
1043
|
-
"line":
|
|
1067
|
+
"line": 131,
|
|
1044
1068
|
"character": 5
|
|
1045
1069
|
},
|
|
1046
1070
|
"name": "ids",
|
|
@@ -1048,14 +1072,14 @@
|
|
|
1048
1072
|
"__schema": "TypeArraySchema",
|
|
1049
1073
|
"location": {
|
|
1050
1074
|
"filePath": "merging.main.runtime.ts",
|
|
1051
|
-
"line":
|
|
1075
|
+
"line": 131,
|
|
1052
1076
|
"character": 10
|
|
1053
1077
|
},
|
|
1054
1078
|
"type": {
|
|
1055
1079
|
"__schema": "KeywordTypeSchema",
|
|
1056
1080
|
"location": {
|
|
1057
1081
|
"filePath": "merging.main.runtime.ts",
|
|
1058
|
-
"line":
|
|
1082
|
+
"line": 131,
|
|
1059
1083
|
"character": 10
|
|
1060
1084
|
},
|
|
1061
1085
|
"name": "string"
|
|
@@ -1068,7 +1092,7 @@
|
|
|
1068
1092
|
"__schema": "ParameterSchema",
|
|
1069
1093
|
"location": {
|
|
1070
1094
|
"filePath": "merging.main.runtime.ts",
|
|
1071
|
-
"line":
|
|
1095
|
+
"line": 132,
|
|
1072
1096
|
"character": 5
|
|
1073
1097
|
},
|
|
1074
1098
|
"name": "mergeStrategy",
|
|
@@ -1076,7 +1100,7 @@
|
|
|
1076
1100
|
"__schema": "TypeRefSchema",
|
|
1077
1101
|
"location": {
|
|
1078
1102
|
"filePath": "merging.main.runtime.ts",
|
|
1079
|
-
"line":
|
|
1103
|
+
"line": 132,
|
|
1080
1104
|
"character": 20
|
|
1081
1105
|
},
|
|
1082
1106
|
"name": "MergeStrategy",
|
|
@@ -1089,7 +1113,7 @@
|
|
|
1089
1113
|
"__schema": "ParameterSchema",
|
|
1090
1114
|
"location": {
|
|
1091
1115
|
"filePath": "merging.main.runtime.ts",
|
|
1092
|
-
"line":
|
|
1116
|
+
"line": 133,
|
|
1093
1117
|
"character": 5
|
|
1094
1118
|
},
|
|
1095
1119
|
"name": "abort",
|
|
@@ -1097,7 +1121,7 @@
|
|
|
1097
1121
|
"__schema": "KeywordTypeSchema",
|
|
1098
1122
|
"location": {
|
|
1099
1123
|
"filePath": "merging.main.runtime.ts",
|
|
1100
|
-
"line":
|
|
1124
|
+
"line": 133,
|
|
1101
1125
|
"character": 12
|
|
1102
1126
|
},
|
|
1103
1127
|
"name": "boolean"
|
|
@@ -1109,7 +1133,7 @@
|
|
|
1109
1133
|
"__schema": "ParameterSchema",
|
|
1110
1134
|
"location": {
|
|
1111
1135
|
"filePath": "merging.main.runtime.ts",
|
|
1112
|
-
"line":
|
|
1136
|
+
"line": 134,
|
|
1113
1137
|
"character": 5
|
|
1114
1138
|
},
|
|
1115
1139
|
"name": "resolve",
|
|
@@ -1117,7 +1141,7 @@
|
|
|
1117
1141
|
"__schema": "KeywordTypeSchema",
|
|
1118
1142
|
"location": {
|
|
1119
1143
|
"filePath": "merging.main.runtime.ts",
|
|
1120
|
-
"line":
|
|
1144
|
+
"line": 134,
|
|
1121
1145
|
"character": 14
|
|
1122
1146
|
},
|
|
1123
1147
|
"name": "boolean"
|
|
@@ -1129,7 +1153,7 @@
|
|
|
1129
1153
|
"__schema": "ParameterSchema",
|
|
1130
1154
|
"location": {
|
|
1131
1155
|
"filePath": "merging.main.runtime.ts",
|
|
1132
|
-
"line":
|
|
1156
|
+
"line": 135,
|
|
1133
1157
|
"character": 5
|
|
1134
1158
|
},
|
|
1135
1159
|
"name": "noSnap",
|
|
@@ -1137,7 +1161,7 @@
|
|
|
1137
1161
|
"__schema": "KeywordTypeSchema",
|
|
1138
1162
|
"location": {
|
|
1139
1163
|
"filePath": "merging.main.runtime.ts",
|
|
1140
|
-
"line":
|
|
1164
|
+
"line": 135,
|
|
1141
1165
|
"character": 13
|
|
1142
1166
|
},
|
|
1143
1167
|
"name": "boolean"
|
|
@@ -1149,7 +1173,7 @@
|
|
|
1149
1173
|
"__schema": "ParameterSchema",
|
|
1150
1174
|
"location": {
|
|
1151
1175
|
"filePath": "merging.main.runtime.ts",
|
|
1152
|
-
"line":
|
|
1176
|
+
"line": 136,
|
|
1153
1177
|
"character": 5
|
|
1154
1178
|
},
|
|
1155
1179
|
"name": "message",
|
|
@@ -1157,7 +1181,7 @@
|
|
|
1157
1181
|
"__schema": "KeywordTypeSchema",
|
|
1158
1182
|
"location": {
|
|
1159
1183
|
"filePath": "merging.main.runtime.ts",
|
|
1160
|
-
"line":
|
|
1184
|
+
"line": 136,
|
|
1161
1185
|
"character": 14
|
|
1162
1186
|
},
|
|
1163
1187
|
"name": "string"
|
|
@@ -1169,7 +1193,7 @@
|
|
|
1169
1193
|
"__schema": "ParameterSchema",
|
|
1170
1194
|
"location": {
|
|
1171
1195
|
"filePath": "merging.main.runtime.ts",
|
|
1172
|
-
"line":
|
|
1196
|
+
"line": 137,
|
|
1173
1197
|
"character": 5
|
|
1174
1198
|
},
|
|
1175
1199
|
"name": "build",
|
|
@@ -1177,7 +1201,7 @@
|
|
|
1177
1201
|
"__schema": "KeywordTypeSchema",
|
|
1178
1202
|
"location": {
|
|
1179
1203
|
"filePath": "merging.main.runtime.ts",
|
|
1180
|
-
"line":
|
|
1204
|
+
"line": 137,
|
|
1181
1205
|
"character": 12
|
|
1182
1206
|
},
|
|
1183
1207
|
"name": "boolean"
|
|
@@ -1189,7 +1213,7 @@
|
|
|
1189
1213
|
"__schema": "ParameterSchema",
|
|
1190
1214
|
"location": {
|
|
1191
1215
|
"filePath": "merging.main.runtime.ts",
|
|
1192
|
-
"line":
|
|
1216
|
+
"line": 138,
|
|
1193
1217
|
"character": 5
|
|
1194
1218
|
},
|
|
1195
1219
|
"name": "skipDependencyInstallation",
|
|
@@ -1197,7 +1221,7 @@
|
|
|
1197
1221
|
"__schema": "KeywordTypeSchema",
|
|
1198
1222
|
"location": {
|
|
1199
1223
|
"filePath": "merging.main.runtime.ts",
|
|
1200
|
-
"line":
|
|
1224
|
+
"line": 138,
|
|
1201
1225
|
"character": 33
|
|
1202
1226
|
},
|
|
1203
1227
|
"name": "boolean"
|
|
@@ -1210,7 +1234,7 @@
|
|
|
1210
1234
|
"__schema": "TypeRefSchema",
|
|
1211
1235
|
"location": {
|
|
1212
1236
|
"filePath": "merging.main.runtime.ts",
|
|
1213
|
-
"line":
|
|
1237
|
+
"line": 139,
|
|
1214
1238
|
"character": 6
|
|
1215
1239
|
},
|
|
1216
1240
|
"name": "Promise",
|
|
@@ -1219,7 +1243,7 @@
|
|
|
1219
1243
|
"__schema": "TypeRefSchema",
|
|
1220
1244
|
"location": {
|
|
1221
1245
|
"filePath": "merging.main.runtime.ts",
|
|
1222
|
-
"line":
|
|
1246
|
+
"line": 139,
|
|
1223
1247
|
"character": 14
|
|
1224
1248
|
},
|
|
1225
1249
|
"name": "ApplyVersionResults"
|
|
@@ -1234,14 +1258,14 @@
|
|
|
1234
1258
|
"__schema": "FunctionLikeSchema",
|
|
1235
1259
|
"location": {
|
|
1236
1260
|
"filePath": "merging.main.runtime.ts",
|
|
1237
|
-
"line":
|
|
1261
|
+
"line": 167,
|
|
1238
1262
|
"character": 3
|
|
1239
1263
|
},
|
|
1240
1264
|
"doc": {
|
|
1241
1265
|
"__schema": "DocSchema",
|
|
1242
1266
|
"location": {
|
|
1243
1267
|
"filePath": "merging.main.runtime.ts",
|
|
1244
|
-
"line":
|
|
1268
|
+
"line": 163,
|
|
1245
1269
|
"character": 3
|
|
1246
1270
|
},
|
|
1247
1271
|
"raw": "/**\n * when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n */",
|
|
@@ -1254,7 +1278,7 @@
|
|
|
1254
1278
|
"__schema": "ParameterSchema",
|
|
1255
1279
|
"location": {
|
|
1256
1280
|
"filePath": "merging.main.runtime.ts",
|
|
1257
|
-
"line":
|
|
1281
|
+
"line": 168,
|
|
1258
1282
|
"character": 5
|
|
1259
1283
|
},
|
|
1260
1284
|
"name": "consumer",
|
|
@@ -1262,7 +1286,7 @@
|
|
|
1262
1286
|
"__schema": "TypeRefSchema",
|
|
1263
1287
|
"location": {
|
|
1264
1288
|
"filePath": "merging.main.runtime.ts",
|
|
1265
|
-
"line":
|
|
1289
|
+
"line": 168,
|
|
1266
1290
|
"character": 15
|
|
1267
1291
|
},
|
|
1268
1292
|
"name": "Consumer",
|
|
@@ -1275,7 +1299,7 @@
|
|
|
1275
1299
|
"__schema": "ParameterSchema",
|
|
1276
1300
|
"location": {
|
|
1277
1301
|
"filePath": "merging.main.runtime.ts",
|
|
1278
|
-
"line":
|
|
1302
|
+
"line": 169,
|
|
1279
1303
|
"character": 5
|
|
1280
1304
|
},
|
|
1281
1305
|
"name": "bitIds",
|
|
@@ -1283,14 +1307,14 @@
|
|
|
1283
1307
|
"__schema": "TypeArraySchema",
|
|
1284
1308
|
"location": {
|
|
1285
1309
|
"filePath": "merging.main.runtime.ts",
|
|
1286
|
-
"line":
|
|
1310
|
+
"line": 169,
|
|
1287
1311
|
"character": 13
|
|
1288
1312
|
},
|
|
1289
1313
|
"type": {
|
|
1290
1314
|
"__schema": "TypeRefSchema",
|
|
1291
1315
|
"location": {
|
|
1292
1316
|
"filePath": "merging.main.runtime.ts",
|
|
1293
|
-
"line":
|
|
1317
|
+
"line": 169,
|
|
1294
1318
|
"character": 13
|
|
1295
1319
|
},
|
|
1296
1320
|
"name": "ComponentID",
|
|
@@ -1308,7 +1332,7 @@
|
|
|
1308
1332
|
"__schema": "ParameterSchema",
|
|
1309
1333
|
"location": {
|
|
1310
1334
|
"filePath": "merging.main.runtime.ts",
|
|
1311
|
-
"line":
|
|
1335
|
+
"line": 170,
|
|
1312
1336
|
"character": 5
|
|
1313
1337
|
},
|
|
1314
1338
|
"name": "mergeStrategy",
|
|
@@ -1316,7 +1340,7 @@
|
|
|
1316
1340
|
"__schema": "TypeRefSchema",
|
|
1317
1341
|
"location": {
|
|
1318
1342
|
"filePath": "merging.main.runtime.ts",
|
|
1319
|
-
"line":
|
|
1343
|
+
"line": 170,
|
|
1320
1344
|
"character": 20
|
|
1321
1345
|
},
|
|
1322
1346
|
"name": "MergeStrategy",
|
|
@@ -1329,7 +1353,7 @@
|
|
|
1329
1353
|
"__schema": "ParameterSchema",
|
|
1330
1354
|
"location": {
|
|
1331
1355
|
"filePath": "merging.main.runtime.ts",
|
|
1332
|
-
"line":
|
|
1356
|
+
"line": 171,
|
|
1333
1357
|
"character": 5
|
|
1334
1358
|
},
|
|
1335
1359
|
"name": "noSnap",
|
|
@@ -1337,7 +1361,7 @@
|
|
|
1337
1361
|
"__schema": "KeywordTypeSchema",
|
|
1338
1362
|
"location": {
|
|
1339
1363
|
"filePath": "merging.main.runtime.ts",
|
|
1340
|
-
"line":
|
|
1364
|
+
"line": 171,
|
|
1341
1365
|
"character": 13
|
|
1342
1366
|
},
|
|
1343
1367
|
"name": "boolean"
|
|
@@ -1349,7 +1373,7 @@
|
|
|
1349
1373
|
"__schema": "ParameterSchema",
|
|
1350
1374
|
"location": {
|
|
1351
1375
|
"filePath": "merging.main.runtime.ts",
|
|
1352
|
-
"line":
|
|
1376
|
+
"line": 172,
|
|
1353
1377
|
"character": 5
|
|
1354
1378
|
},
|
|
1355
1379
|
"name": "snapMessage",
|
|
@@ -1357,7 +1381,7 @@
|
|
|
1357
1381
|
"__schema": "KeywordTypeSchema",
|
|
1358
1382
|
"location": {
|
|
1359
1383
|
"filePath": "merging.main.runtime.ts",
|
|
1360
|
-
"line":
|
|
1384
|
+
"line": 172,
|
|
1361
1385
|
"character": 18
|
|
1362
1386
|
},
|
|
1363
1387
|
"name": "string"
|
|
@@ -1369,7 +1393,7 @@
|
|
|
1369
1393
|
"__schema": "ParameterSchema",
|
|
1370
1394
|
"location": {
|
|
1371
1395
|
"filePath": "merging.main.runtime.ts",
|
|
1372
|
-
"line":
|
|
1396
|
+
"line": 173,
|
|
1373
1397
|
"character": 5
|
|
1374
1398
|
},
|
|
1375
1399
|
"name": "build",
|
|
@@ -1377,7 +1401,7 @@
|
|
|
1377
1401
|
"__schema": "KeywordTypeSchema",
|
|
1378
1402
|
"location": {
|
|
1379
1403
|
"filePath": "merging.main.runtime.ts",
|
|
1380
|
-
"line":
|
|
1404
|
+
"line": 173,
|
|
1381
1405
|
"character": 12
|
|
1382
1406
|
},
|
|
1383
1407
|
"name": "boolean"
|
|
@@ -1389,7 +1413,7 @@
|
|
|
1389
1413
|
"__schema": "ParameterSchema",
|
|
1390
1414
|
"location": {
|
|
1391
1415
|
"filePath": "merging.main.runtime.ts",
|
|
1392
|
-
"line":
|
|
1416
|
+
"line": 174,
|
|
1393
1417
|
"character": 5
|
|
1394
1418
|
},
|
|
1395
1419
|
"name": "skipDependencyInstallation",
|
|
@@ -1397,7 +1421,7 @@
|
|
|
1397
1421
|
"__schema": "KeywordTypeSchema",
|
|
1398
1422
|
"location": {
|
|
1399
1423
|
"filePath": "merging.main.runtime.ts",
|
|
1400
|
-
"line":
|
|
1424
|
+
"line": 174,
|
|
1401
1425
|
"character": 33
|
|
1402
1426
|
},
|
|
1403
1427
|
"name": "boolean"
|
|
@@ -1410,7 +1434,7 @@
|
|
|
1410
1434
|
"__schema": "TypeRefSchema",
|
|
1411
1435
|
"location": {
|
|
1412
1436
|
"filePath": "merging.main.runtime.ts",
|
|
1413
|
-
"line":
|
|
1437
|
+
"line": 175,
|
|
1414
1438
|
"character": 6
|
|
1415
1439
|
},
|
|
1416
1440
|
"name": "Promise",
|
|
@@ -1419,7 +1443,7 @@
|
|
|
1419
1443
|
"__schema": "TypeRefSchema",
|
|
1420
1444
|
"location": {
|
|
1421
1445
|
"filePath": "merging.main.runtime.ts",
|
|
1422
|
-
"line":
|
|
1446
|
+
"line": 175,
|
|
1423
1447
|
"character": 14
|
|
1424
1448
|
},
|
|
1425
1449
|
"name": "ApplyVersionResults"
|
|
@@ -1434,14 +1458,14 @@
|
|
|
1434
1458
|
"__schema": "FunctionLikeSchema",
|
|
1435
1459
|
"location": {
|
|
1436
1460
|
"filePath": "merging.main.runtime.ts",
|
|
1437
|
-
"line":
|
|
1461
|
+
"line": 210,
|
|
1438
1462
|
"character": 3
|
|
1439
1463
|
},
|
|
1440
1464
|
"doc": {
|
|
1441
1465
|
"__schema": "DocSchema",
|
|
1442
1466
|
"location": {
|
|
1443
1467
|
"filePath": "merging.main.runtime.ts",
|
|
1444
|
-
"line":
|
|
1468
|
+
"line": 207,
|
|
1445
1469
|
"character": 3
|
|
1446
1470
|
},
|
|
1447
1471
|
"raw": "/**\n * merge multiple components according to the \"allComponentsStatus\".\n */",
|
|
@@ -1454,7 +1478,7 @@
|
|
|
1454
1478
|
"__schema": "ParameterSchema",
|
|
1455
1479
|
"location": {
|
|
1456
1480
|
"filePath": "merging.main.runtime.ts",
|
|
1457
|
-
"line":
|
|
1481
|
+
"line": 210,
|
|
1458
1482
|
"character": 20
|
|
1459
1483
|
},
|
|
1460
1484
|
"name": "{ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noSnap, tag, snapMessage, build, skipDependencyInstallation }",
|
|
@@ -1462,7 +1486,7 @@
|
|
|
1462
1486
|
"__schema": "TypeLiteralSchema",
|
|
1463
1487
|
"location": {
|
|
1464
1488
|
"filePath": "merging.main.runtime.ts",
|
|
1465
|
-
"line":
|
|
1489
|
+
"line": 220,
|
|
1466
1490
|
"character": 6
|
|
1467
1491
|
},
|
|
1468
1492
|
"members": [
|
|
@@ -1470,7 +1494,7 @@
|
|
|
1470
1494
|
"__schema": "VariableLikeSchema",
|
|
1471
1495
|
"location": {
|
|
1472
1496
|
"filePath": "merging.main.runtime.ts",
|
|
1473
|
-
"line":
|
|
1497
|
+
"line": 221,
|
|
1474
1498
|
"character": 5
|
|
1475
1499
|
},
|
|
1476
1500
|
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
@@ -1479,7 +1503,7 @@
|
|
|
1479
1503
|
"__schema": "TypeRefSchema",
|
|
1480
1504
|
"location": {
|
|
1481
1505
|
"filePath": "merging.main.runtime.ts",
|
|
1482
|
-
"line":
|
|
1506
|
+
"line": 221,
|
|
1483
1507
|
"character": 20
|
|
1484
1508
|
},
|
|
1485
1509
|
"name": "MergeStrategy",
|
|
@@ -1491,7 +1515,7 @@
|
|
|
1491
1515
|
"__schema": "VariableLikeSchema",
|
|
1492
1516
|
"location": {
|
|
1493
1517
|
"filePath": "merging.main.runtime.ts",
|
|
1494
|
-
"line":
|
|
1518
|
+
"line": 222,
|
|
1495
1519
|
"character": 5
|
|
1496
1520
|
},
|
|
1497
1521
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -1500,14 +1524,14 @@
|
|
|
1500
1524
|
"__schema": "TypeArraySchema",
|
|
1501
1525
|
"location": {
|
|
1502
1526
|
"filePath": "merging.main.runtime.ts",
|
|
1503
|
-
"line":
|
|
1527
|
+
"line": 222,
|
|
1504
1528
|
"character": 26
|
|
1505
1529
|
},
|
|
1506
1530
|
"type": {
|
|
1507
1531
|
"__schema": "TypeRefSchema",
|
|
1508
1532
|
"location": {
|
|
1509
1533
|
"filePath": "merging.main.runtime.ts",
|
|
1510
|
-
"line":
|
|
1534
|
+
"line": 222,
|
|
1511
1535
|
"character": 26
|
|
1512
1536
|
},
|
|
1513
1537
|
"name": "ComponentMergeStatus"
|
|
@@ -1519,7 +1543,7 @@
|
|
|
1519
1543
|
"__schema": "VariableLikeSchema",
|
|
1520
1544
|
"location": {
|
|
1521
1545
|
"filePath": "merging.main.runtime.ts",
|
|
1522
|
-
"line":
|
|
1546
|
+
"line": 223,
|
|
1523
1547
|
"character": 5
|
|
1524
1548
|
},
|
|
1525
1549
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -1528,7 +1552,7 @@
|
|
|
1528
1552
|
"__schema": "TypeRefSchema",
|
|
1529
1553
|
"location": {
|
|
1530
1554
|
"filePath": "merging.main.runtime.ts",
|
|
1531
|
-
"line":
|
|
1555
|
+
"line": 223,
|
|
1532
1556
|
"character": 5
|
|
1533
1557
|
},
|
|
1534
1558
|
"name": "LaneId",
|
|
@@ -1544,7 +1568,7 @@
|
|
|
1544
1568
|
"__schema": "VariableLikeSchema",
|
|
1545
1569
|
"location": {
|
|
1546
1570
|
"filePath": "merging.main.runtime.ts",
|
|
1547
|
-
"line":
|
|
1571
|
+
"line": 224,
|
|
1548
1572
|
"character": 5
|
|
1549
1573
|
},
|
|
1550
1574
|
"signature": "(property) currentLane?: Lane | undefined",
|
|
@@ -1553,7 +1577,7 @@
|
|
|
1553
1577
|
"__schema": "TypeRefSchema",
|
|
1554
1578
|
"location": {
|
|
1555
1579
|
"filePath": "merging.main.runtime.ts",
|
|
1556
|
-
"line":
|
|
1580
|
+
"line": 224,
|
|
1557
1581
|
"character": 19
|
|
1558
1582
|
},
|
|
1559
1583
|
"name": "Lane",
|
|
@@ -1565,7 +1589,7 @@
|
|
|
1565
1589
|
"__schema": "VariableLikeSchema",
|
|
1566
1590
|
"location": {
|
|
1567
1591
|
"filePath": "merging.main.runtime.ts",
|
|
1568
|
-
"line":
|
|
1592
|
+
"line": 225,
|
|
1569
1593
|
"character": 5
|
|
1570
1594
|
},
|
|
1571
1595
|
"signature": "(property) noSnap: boolean",
|
|
@@ -1574,7 +1598,7 @@
|
|
|
1574
1598
|
"__schema": "KeywordTypeSchema",
|
|
1575
1599
|
"location": {
|
|
1576
1600
|
"filePath": "merging.main.runtime.ts",
|
|
1577
|
-
"line":
|
|
1601
|
+
"line": 225,
|
|
1578
1602
|
"character": 13
|
|
1579
1603
|
},
|
|
1580
1604
|
"name": "boolean"
|
|
@@ -1585,7 +1609,7 @@
|
|
|
1585
1609
|
"__schema": "VariableLikeSchema",
|
|
1586
1610
|
"location": {
|
|
1587
1611
|
"filePath": "merging.main.runtime.ts",
|
|
1588
|
-
"line":
|
|
1612
|
+
"line": 226,
|
|
1589
1613
|
"character": 5
|
|
1590
1614
|
},
|
|
1591
1615
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -1594,7 +1618,7 @@
|
|
|
1594
1618
|
"__schema": "KeywordTypeSchema",
|
|
1595
1619
|
"location": {
|
|
1596
1620
|
"filePath": "merging.main.runtime.ts",
|
|
1597
|
-
"line":
|
|
1621
|
+
"line": 226,
|
|
1598
1622
|
"character": 11
|
|
1599
1623
|
},
|
|
1600
1624
|
"name": "boolean"
|
|
@@ -1605,7 +1629,7 @@
|
|
|
1605
1629
|
"__schema": "VariableLikeSchema",
|
|
1606
1630
|
"location": {
|
|
1607
1631
|
"filePath": "merging.main.runtime.ts",
|
|
1608
|
-
"line":
|
|
1632
|
+
"line": 227,
|
|
1609
1633
|
"character": 5
|
|
1610
1634
|
},
|
|
1611
1635
|
"signature": "(property) snapMessage: string",
|
|
@@ -1614,7 +1638,7 @@
|
|
|
1614
1638
|
"__schema": "KeywordTypeSchema",
|
|
1615
1639
|
"location": {
|
|
1616
1640
|
"filePath": "merging.main.runtime.ts",
|
|
1617
|
-
"line":
|
|
1641
|
+
"line": 227,
|
|
1618
1642
|
"character": 18
|
|
1619
1643
|
},
|
|
1620
1644
|
"name": "string"
|
|
@@ -1625,7 +1649,7 @@
|
|
|
1625
1649
|
"__schema": "VariableLikeSchema",
|
|
1626
1650
|
"location": {
|
|
1627
1651
|
"filePath": "merging.main.runtime.ts",
|
|
1628
|
-
"line":
|
|
1652
|
+
"line": 228,
|
|
1629
1653
|
"character": 5
|
|
1630
1654
|
},
|
|
1631
1655
|
"signature": "(property) build: boolean",
|
|
@@ -1634,7 +1658,7 @@
|
|
|
1634
1658
|
"__schema": "KeywordTypeSchema",
|
|
1635
1659
|
"location": {
|
|
1636
1660
|
"filePath": "merging.main.runtime.ts",
|
|
1637
|
-
"line":
|
|
1661
|
+
"line": 228,
|
|
1638
1662
|
"character": 12
|
|
1639
1663
|
},
|
|
1640
1664
|
"name": "boolean"
|
|
@@ -1645,7 +1669,7 @@
|
|
|
1645
1669
|
"__schema": "VariableLikeSchema",
|
|
1646
1670
|
"location": {
|
|
1647
1671
|
"filePath": "merging.main.runtime.ts",
|
|
1648
|
-
"line":
|
|
1672
|
+
"line": 229,
|
|
1649
1673
|
"character": 5
|
|
1650
1674
|
},
|
|
1651
1675
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -1654,7 +1678,7 @@
|
|
|
1654
1678
|
"__schema": "KeywordTypeSchema",
|
|
1655
1679
|
"location": {
|
|
1656
1680
|
"filePath": "merging.main.runtime.ts",
|
|
1657
|
-
"line":
|
|
1681
|
+
"line": 229,
|
|
1658
1682
|
"character": 34
|
|
1659
1683
|
},
|
|
1660
1684
|
"name": "boolean"
|
|
@@ -1669,7 +1693,7 @@
|
|
|
1669
1693
|
"__schema": "VariableLikeSchema",
|
|
1670
1694
|
"location": {
|
|
1671
1695
|
"filePath": "merging.main.runtime.ts",
|
|
1672
|
-
"line":
|
|
1696
|
+
"line": 221,
|
|
1673
1697
|
"character": 5
|
|
1674
1698
|
},
|
|
1675
1699
|
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
@@ -1678,7 +1702,7 @@
|
|
|
1678
1702
|
"__schema": "TypeRefSchema",
|
|
1679
1703
|
"location": {
|
|
1680
1704
|
"filePath": "merging.main.runtime.ts",
|
|
1681
|
-
"line":
|
|
1705
|
+
"line": 221,
|
|
1682
1706
|
"character": 20
|
|
1683
1707
|
},
|
|
1684
1708
|
"name": "MergeStrategy",
|
|
@@ -1690,7 +1714,7 @@
|
|
|
1690
1714
|
"__schema": "VariableLikeSchema",
|
|
1691
1715
|
"location": {
|
|
1692
1716
|
"filePath": "merging.main.runtime.ts",
|
|
1693
|
-
"line":
|
|
1717
|
+
"line": 222,
|
|
1694
1718
|
"character": 5
|
|
1695
1719
|
},
|
|
1696
1720
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -1699,14 +1723,14 @@
|
|
|
1699
1723
|
"__schema": "TypeArraySchema",
|
|
1700
1724
|
"location": {
|
|
1701
1725
|
"filePath": "merging.main.runtime.ts",
|
|
1702
|
-
"line":
|
|
1726
|
+
"line": 222,
|
|
1703
1727
|
"character": 26
|
|
1704
1728
|
},
|
|
1705
1729
|
"type": {
|
|
1706
1730
|
"__schema": "TypeRefSchema",
|
|
1707
1731
|
"location": {
|
|
1708
1732
|
"filePath": "merging.main.runtime.ts",
|
|
1709
|
-
"line":
|
|
1733
|
+
"line": 222,
|
|
1710
1734
|
"character": 26
|
|
1711
1735
|
},
|
|
1712
1736
|
"name": "ComponentMergeStatus"
|
|
@@ -1718,7 +1742,7 @@
|
|
|
1718
1742
|
"__schema": "VariableLikeSchema",
|
|
1719
1743
|
"location": {
|
|
1720
1744
|
"filePath": "merging.main.runtime.ts",
|
|
1721
|
-
"line":
|
|
1745
|
+
"line": 223,
|
|
1722
1746
|
"character": 5
|
|
1723
1747
|
},
|
|
1724
1748
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -1727,7 +1751,7 @@
|
|
|
1727
1751
|
"__schema": "TypeRefSchema",
|
|
1728
1752
|
"location": {
|
|
1729
1753
|
"filePath": "merging.main.runtime.ts",
|
|
1730
|
-
"line":
|
|
1754
|
+
"line": 223,
|
|
1731
1755
|
"character": 5
|
|
1732
1756
|
},
|
|
1733
1757
|
"name": "LaneId",
|
|
@@ -1743,7 +1767,7 @@
|
|
|
1743
1767
|
"__schema": "VariableLikeSchema",
|
|
1744
1768
|
"location": {
|
|
1745
1769
|
"filePath": "merging.main.runtime.ts",
|
|
1746
|
-
"line":
|
|
1770
|
+
"line": 224,
|
|
1747
1771
|
"character": 5
|
|
1748
1772
|
},
|
|
1749
1773
|
"signature": "(property) currentLane?: Lane | undefined",
|
|
@@ -1752,7 +1776,7 @@
|
|
|
1752
1776
|
"__schema": "TypeRefSchema",
|
|
1753
1777
|
"location": {
|
|
1754
1778
|
"filePath": "merging.main.runtime.ts",
|
|
1755
|
-
"line":
|
|
1779
|
+
"line": 224,
|
|
1756
1780
|
"character": 19
|
|
1757
1781
|
},
|
|
1758
1782
|
"name": "Lane",
|
|
@@ -1764,7 +1788,7 @@
|
|
|
1764
1788
|
"__schema": "VariableLikeSchema",
|
|
1765
1789
|
"location": {
|
|
1766
1790
|
"filePath": "merging.main.runtime.ts",
|
|
1767
|
-
"line":
|
|
1791
|
+
"line": 225,
|
|
1768
1792
|
"character": 5
|
|
1769
1793
|
},
|
|
1770
1794
|
"signature": "(property) noSnap: boolean",
|
|
@@ -1773,7 +1797,7 @@
|
|
|
1773
1797
|
"__schema": "KeywordTypeSchema",
|
|
1774
1798
|
"location": {
|
|
1775
1799
|
"filePath": "merging.main.runtime.ts",
|
|
1776
|
-
"line":
|
|
1800
|
+
"line": 225,
|
|
1777
1801
|
"character": 13
|
|
1778
1802
|
},
|
|
1779
1803
|
"name": "boolean"
|
|
@@ -1784,7 +1808,7 @@
|
|
|
1784
1808
|
"__schema": "VariableLikeSchema",
|
|
1785
1809
|
"location": {
|
|
1786
1810
|
"filePath": "merging.main.runtime.ts",
|
|
1787
|
-
"line":
|
|
1811
|
+
"line": 226,
|
|
1788
1812
|
"character": 5
|
|
1789
1813
|
},
|
|
1790
1814
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -1793,7 +1817,7 @@
|
|
|
1793
1817
|
"__schema": "KeywordTypeSchema",
|
|
1794
1818
|
"location": {
|
|
1795
1819
|
"filePath": "merging.main.runtime.ts",
|
|
1796
|
-
"line":
|
|
1820
|
+
"line": 226,
|
|
1797
1821
|
"character": 11
|
|
1798
1822
|
},
|
|
1799
1823
|
"name": "boolean"
|
|
@@ -1804,7 +1828,7 @@
|
|
|
1804
1828
|
"__schema": "VariableLikeSchema",
|
|
1805
1829
|
"location": {
|
|
1806
1830
|
"filePath": "merging.main.runtime.ts",
|
|
1807
|
-
"line":
|
|
1831
|
+
"line": 227,
|
|
1808
1832
|
"character": 5
|
|
1809
1833
|
},
|
|
1810
1834
|
"signature": "(property) snapMessage: string",
|
|
@@ -1813,7 +1837,7 @@
|
|
|
1813
1837
|
"__schema": "KeywordTypeSchema",
|
|
1814
1838
|
"location": {
|
|
1815
1839
|
"filePath": "merging.main.runtime.ts",
|
|
1816
|
-
"line":
|
|
1840
|
+
"line": 227,
|
|
1817
1841
|
"character": 18
|
|
1818
1842
|
},
|
|
1819
1843
|
"name": "string"
|
|
@@ -1824,7 +1848,7 @@
|
|
|
1824
1848
|
"__schema": "VariableLikeSchema",
|
|
1825
1849
|
"location": {
|
|
1826
1850
|
"filePath": "merging.main.runtime.ts",
|
|
1827
|
-
"line":
|
|
1851
|
+
"line": 228,
|
|
1828
1852
|
"character": 5
|
|
1829
1853
|
},
|
|
1830
1854
|
"signature": "(property) build: boolean",
|
|
@@ -1833,7 +1857,7 @@
|
|
|
1833
1857
|
"__schema": "KeywordTypeSchema",
|
|
1834
1858
|
"location": {
|
|
1835
1859
|
"filePath": "merging.main.runtime.ts",
|
|
1836
|
-
"line":
|
|
1860
|
+
"line": 228,
|
|
1837
1861
|
"character": 12
|
|
1838
1862
|
},
|
|
1839
1863
|
"name": "boolean"
|
|
@@ -1844,7 +1868,7 @@
|
|
|
1844
1868
|
"__schema": "VariableLikeSchema",
|
|
1845
1869
|
"location": {
|
|
1846
1870
|
"filePath": "merging.main.runtime.ts",
|
|
1847
|
-
"line":
|
|
1871
|
+
"line": 229,
|
|
1848
1872
|
"character": 5
|
|
1849
1873
|
},
|
|
1850
1874
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -1853,7 +1877,7 @@
|
|
|
1853
1877
|
"__schema": "KeywordTypeSchema",
|
|
1854
1878
|
"location": {
|
|
1855
1879
|
"filePath": "merging.main.runtime.ts",
|
|
1856
|
-
"line":
|
|
1880
|
+
"line": 229,
|
|
1857
1881
|
"character": 34
|
|
1858
1882
|
},
|
|
1859
1883
|
"name": "boolean"
|
|
@@ -1868,7 +1892,7 @@
|
|
|
1868
1892
|
"__schema": "TypeRefSchema",
|
|
1869
1893
|
"location": {
|
|
1870
1894
|
"filePath": "merging.main.runtime.ts",
|
|
1871
|
-
"line":
|
|
1895
|
+
"line": 230,
|
|
1872
1896
|
"character": 7
|
|
1873
1897
|
},
|
|
1874
1898
|
"name": "Promise",
|
|
@@ -1877,7 +1901,7 @@
|
|
|
1877
1901
|
"__schema": "TypeRefSchema",
|
|
1878
1902
|
"location": {
|
|
1879
1903
|
"filePath": "merging.main.runtime.ts",
|
|
1880
|
-
"line":
|
|
1904
|
+
"line": 230,
|
|
1881
1905
|
"character": 15
|
|
1882
1906
|
},
|
|
1883
1907
|
"name": "ApplyVersionResults"
|
|
@@ -1892,14 +1916,116 @@
|
|
|
1892
1916
|
"__schema": "FunctionLikeSchema",
|
|
1893
1917
|
"location": {
|
|
1894
1918
|
"filePath": "merging.main.runtime.ts",
|
|
1895
|
-
"line":
|
|
1919
|
+
"line": 352,
|
|
1920
|
+
"character": 3
|
|
1921
|
+
},
|
|
1922
|
+
"signature": "(method) MergingMain.removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>",
|
|
1923
|
+
"name": "removeFromWsJsonPolicyIfExists",
|
|
1924
|
+
"params": [
|
|
1925
|
+
{
|
|
1926
|
+
"__schema": "ParameterSchema",
|
|
1927
|
+
"location": {
|
|
1928
|
+
"filePath": "merging.main.runtime.ts",
|
|
1929
|
+
"line": 353,
|
|
1930
|
+
"character": 5
|
|
1931
|
+
},
|
|
1932
|
+
"name": "componentsResults",
|
|
1933
|
+
"type": {
|
|
1934
|
+
"__schema": "TypeArraySchema",
|
|
1935
|
+
"location": {
|
|
1936
|
+
"filePath": "merging.main.runtime.ts",
|
|
1937
|
+
"line": 353,
|
|
1938
|
+
"character": 24
|
|
1939
|
+
},
|
|
1940
|
+
"type": {
|
|
1941
|
+
"__schema": "TypeRefSchema",
|
|
1942
|
+
"location": {
|
|
1943
|
+
"filePath": "merging.main.runtime.ts",
|
|
1944
|
+
"line": 353,
|
|
1945
|
+
"character": 24
|
|
1946
|
+
},
|
|
1947
|
+
"name": "ApplyVersionWithComps",
|
|
1948
|
+
"componentId": {
|
|
1949
|
+
"scope": "teambit.component",
|
|
1950
|
+
"name": "checkout"
|
|
1951
|
+
}
|
|
1952
|
+
}
|
|
1953
|
+
},
|
|
1954
|
+
"isOptional": false,
|
|
1955
|
+
"isSpread": false
|
|
1956
|
+
},
|
|
1957
|
+
{
|
|
1958
|
+
"__schema": "ParameterSchema",
|
|
1959
|
+
"location": {
|
|
1960
|
+
"filePath": "merging.main.runtime.ts",
|
|
1961
|
+
"line": 354,
|
|
1962
|
+
"character": 5
|
|
1963
|
+
},
|
|
1964
|
+
"name": "currentLane",
|
|
1965
|
+
"type": {
|
|
1966
|
+
"__schema": "TypeRefSchema",
|
|
1967
|
+
"location": {
|
|
1968
|
+
"filePath": "merging.main.runtime.ts",
|
|
1969
|
+
"line": 354,
|
|
1970
|
+
"character": 19
|
|
1971
|
+
},
|
|
1972
|
+
"name": "Lane",
|
|
1973
|
+
"packageName": "@teambit/legacy/dist/scope/models"
|
|
1974
|
+
},
|
|
1975
|
+
"isOptional": true,
|
|
1976
|
+
"isSpread": false
|
|
1977
|
+
},
|
|
1978
|
+
{
|
|
1979
|
+
"__schema": "ParameterSchema",
|
|
1980
|
+
"location": {
|
|
1981
|
+
"filePath": "merging.main.runtime.ts",
|
|
1982
|
+
"line": 355,
|
|
1983
|
+
"character": 5
|
|
1984
|
+
},
|
|
1985
|
+
"name": "currentLaneIdsBeforeMerge",
|
|
1986
|
+
"type": {
|
|
1987
|
+
"__schema": "TypeRefSchema",
|
|
1988
|
+
"location": {
|
|
1989
|
+
"filePath": "merging.main.runtime.ts",
|
|
1990
|
+
"line": 355,
|
|
1991
|
+
"character": 33
|
|
1992
|
+
},
|
|
1993
|
+
"name": "ComponentIdList",
|
|
1994
|
+
"componentId": {
|
|
1995
|
+
"scope": "teambit.component",
|
|
1996
|
+
"name": "component-id",
|
|
1997
|
+
"version": "1.2.0"
|
|
1998
|
+
}
|
|
1999
|
+
},
|
|
2000
|
+
"isOptional": true,
|
|
2001
|
+
"isSpread": false
|
|
2002
|
+
}
|
|
2003
|
+
],
|
|
2004
|
+
"returnType": {
|
|
2005
|
+
"__schema": "InferenceTypeSchema",
|
|
2006
|
+
"location": {
|
|
2007
|
+
"filePath": "merging.main.runtime.ts",
|
|
2008
|
+
"line": 352,
|
|
2009
|
+
"character": 3
|
|
2010
|
+
},
|
|
2011
|
+
"type": "Promise<void>"
|
|
2012
|
+
},
|
|
2013
|
+
"modifiers": [
|
|
2014
|
+
"async"
|
|
2015
|
+
]
|
|
2016
|
+
},
|
|
2017
|
+
{
|
|
2018
|
+
"__schema": "FunctionLikeSchema",
|
|
2019
|
+
"location": {
|
|
2020
|
+
"filePath": "merging.main.runtime.ts",
|
|
2021
|
+
"line": 377,
|
|
1896
2022
|
"character": 3
|
|
1897
2023
|
},
|
|
1898
2024
|
"doc": {
|
|
1899
2025
|
"__schema": "DocSchema",
|
|
1900
2026
|
"location": {
|
|
1901
2027
|
"filePath": "merging.main.runtime.ts",
|
|
1902
|
-
"line":
|
|
2028
|
+
"line": 371,
|
|
1903
2029
|
"character": 3
|
|
1904
2030
|
},
|
|
1905
2031
|
"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 */",
|
|
@@ -1912,7 +2038,7 @@
|
|
|
1912
2038
|
"__schema": "ParameterSchema",
|
|
1913
2039
|
"location": {
|
|
1914
2040
|
"filePath": "merging.main.runtime.ts",
|
|
1915
|
-
"line":
|
|
2041
|
+
"line": 378,
|
|
1916
2042
|
"character": 5
|
|
1917
2043
|
},
|
|
1918
2044
|
"name": "bitIds",
|
|
@@ -1920,14 +2046,14 @@
|
|
|
1920
2046
|
"__schema": "TypeArraySchema",
|
|
1921
2047
|
"location": {
|
|
1922
2048
|
"filePath": "merging.main.runtime.ts",
|
|
1923
|
-
"line":
|
|
2049
|
+
"line": 378,
|
|
1924
2050
|
"character": 13
|
|
1925
2051
|
},
|
|
1926
2052
|
"type": {
|
|
1927
2053
|
"__schema": "TypeRefSchema",
|
|
1928
2054
|
"location": {
|
|
1929
2055
|
"filePath": "merging.main.runtime.ts",
|
|
1930
|
-
"line":
|
|
2056
|
+
"line": 378,
|
|
1931
2057
|
"character": 13
|
|
1932
2058
|
},
|
|
1933
2059
|
"name": "ComponentID",
|
|
@@ -1945,7 +2071,7 @@
|
|
|
1945
2071
|
"__schema": "ParameterSchema",
|
|
1946
2072
|
"location": {
|
|
1947
2073
|
"filePath": "merging.main.runtime.ts",
|
|
1948
|
-
"line":
|
|
2074
|
+
"line": 379,
|
|
1949
2075
|
"character": 5
|
|
1950
2076
|
},
|
|
1951
2077
|
"name": "options",
|
|
@@ -1953,7 +2079,7 @@
|
|
|
1953
2079
|
"__schema": "TypeRefSchema",
|
|
1954
2080
|
"location": {
|
|
1955
2081
|
"filePath": "merging.main.runtime.ts",
|
|
1956
|
-
"line":
|
|
2082
|
+
"line": 379,
|
|
1957
2083
|
"character": 14
|
|
1958
2084
|
},
|
|
1959
2085
|
"name": "MergeStatusProviderOptions",
|
|
@@ -1966,7 +2092,7 @@
|
|
|
1966
2092
|
"__schema": "ParameterSchema",
|
|
1967
2093
|
"location": {
|
|
1968
2094
|
"filePath": "merging.main.runtime.ts",
|
|
1969
|
-
"line":
|
|
2095
|
+
"line": 380,
|
|
1970
2096
|
"character": 5
|
|
1971
2097
|
},
|
|
1972
2098
|
"name": "currentLane",
|
|
@@ -1974,7 +2100,7 @@
|
|
|
1974
2100
|
"__schema": "TypeRefSchema",
|
|
1975
2101
|
"location": {
|
|
1976
2102
|
"filePath": "merging.main.runtime.ts",
|
|
1977
|
-
"line":
|
|
2103
|
+
"line": 380,
|
|
1978
2104
|
"character": 19
|
|
1979
2105
|
},
|
|
1980
2106
|
"name": "Lane",
|
|
@@ -1987,7 +2113,7 @@
|
|
|
1987
2113
|
"__schema": "ParameterSchema",
|
|
1988
2114
|
"location": {
|
|
1989
2115
|
"filePath": "merging.main.runtime.ts",
|
|
1990
|
-
"line":
|
|
2116
|
+
"line": 381,
|
|
1991
2117
|
"character": 5
|
|
1992
2118
|
},
|
|
1993
2119
|
"name": "otherLane",
|
|
@@ -1995,7 +2121,7 @@
|
|
|
1995
2121
|
"__schema": "TypeRefSchema",
|
|
1996
2122
|
"location": {
|
|
1997
2123
|
"filePath": "merging.main.runtime.ts",
|
|
1998
|
-
"line":
|
|
2124
|
+
"line": 381,
|
|
1999
2125
|
"character": 17
|
|
2000
2126
|
},
|
|
2001
2127
|
"name": "Lane",
|
|
@@ -2009,7 +2135,7 @@
|
|
|
2009
2135
|
"__schema": "TypeRefSchema",
|
|
2010
2136
|
"location": {
|
|
2011
2137
|
"filePath": "merging.main.runtime.ts",
|
|
2012
|
-
"line":
|
|
2138
|
+
"line": 382,
|
|
2013
2139
|
"character": 6
|
|
2014
2140
|
},
|
|
2015
2141
|
"name": "Promise",
|
|
@@ -2018,14 +2144,14 @@
|
|
|
2018
2144
|
"__schema": "TypeArraySchema",
|
|
2019
2145
|
"location": {
|
|
2020
2146
|
"filePath": "merging.main.runtime.ts",
|
|
2021
|
-
"line":
|
|
2147
|
+
"line": 382,
|
|
2022
2148
|
"character": 14
|
|
2023
2149
|
},
|
|
2024
2150
|
"type": {
|
|
2025
2151
|
"__schema": "TypeRefSchema",
|
|
2026
2152
|
"location": {
|
|
2027
2153
|
"filePath": "merging.main.runtime.ts",
|
|
2028
|
-
"line":
|
|
2154
|
+
"line": 382,
|
|
2029
2155
|
"character": 14
|
|
2030
2156
|
},
|
|
2031
2157
|
"name": "ComponentMergeStatus"
|
|
@@ -2041,7 +2167,7 @@
|
|
|
2041
2167
|
"__schema": "VariableLikeSchema",
|
|
2042
2168
|
"location": {
|
|
2043
2169
|
"filePath": "merging.main.runtime.ts",
|
|
2044
|
-
"line":
|
|
2170
|
+
"line": 678,
|
|
2045
2171
|
"character": 3
|
|
2046
2172
|
},
|
|
2047
2173
|
"signature": "(property) MergingMain.slots: never[]",
|
|
@@ -2050,7 +2176,7 @@
|
|
|
2050
2176
|
"__schema": "InferenceTypeSchema",
|
|
2051
2177
|
"location": {
|
|
2052
2178
|
"filePath": "merging.main.runtime.ts",
|
|
2053
|
-
"line":
|
|
2179
|
+
"line": 678,
|
|
2054
2180
|
"character": 3
|
|
2055
2181
|
},
|
|
2056
2182
|
"type": "never[]"
|
|
@@ -2062,7 +2188,7 @@
|
|
|
2062
2188
|
"__schema": "VariableLikeSchema",
|
|
2063
2189
|
"location": {
|
|
2064
2190
|
"filePath": "merging.main.runtime.ts",
|
|
2065
|
-
"line":
|
|
2191
|
+
"line": 679,
|
|
2066
2192
|
"character": 3
|
|
2067
2193
|
},
|
|
2068
2194
|
"signature": "(property) MergingMain.dependencies: Aspect[]",
|
|
@@ -2071,19 +2197,19 @@
|
|
|
2071
2197
|
"__schema": "InferenceTypeSchema",
|
|
2072
2198
|
"location": {
|
|
2073
2199
|
"filePath": "merging.main.runtime.ts",
|
|
2074
|
-
"line":
|
|
2200
|
+
"line": 679,
|
|
2075
2201
|
"character": 3
|
|
2076
2202
|
},
|
|
2077
2203
|
"type": "Aspect[]"
|
|
2078
2204
|
},
|
|
2079
2205
|
"isOptional": true,
|
|
2080
|
-
"defaultValue": "[\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n ]"
|
|
2206
|
+
"defaultValue": "[\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ]"
|
|
2081
2207
|
},
|
|
2082
2208
|
{
|
|
2083
2209
|
"__schema": "VariableLikeSchema",
|
|
2084
2210
|
"location": {
|
|
2085
2211
|
"filePath": "merging.main.runtime.ts",
|
|
2086
|
-
"line":
|
|
2212
|
+
"line": 695,
|
|
2087
2213
|
"character": 3
|
|
2088
2214
|
},
|
|
2089
2215
|
"signature": "(property) MergingMain.runtime: RuntimeDefinition",
|
|
@@ -2092,7 +2218,7 @@
|
|
|
2092
2218
|
"__schema": "InferenceTypeSchema",
|
|
2093
2219
|
"location": {
|
|
2094
2220
|
"filePath": "merging.main.runtime.ts",
|
|
2095
|
-
"line":
|
|
2221
|
+
"line": 695,
|
|
2096
2222
|
"character": 3
|
|
2097
2223
|
},
|
|
2098
2224
|
"type": "RuntimeDefinition"
|
|
@@ -2104,25 +2230,25 @@
|
|
|
2104
2230
|
"__schema": "FunctionLikeSchema",
|
|
2105
2231
|
"location": {
|
|
2106
2232
|
"filePath": "merging.main.runtime.ts",
|
|
2107
|
-
"line":
|
|
2233
|
+
"line": 696,
|
|
2108
2234
|
"character": 3
|
|
2109
2235
|
},
|
|
2110
|
-
"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>",
|
|
2236
|
+
"signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver,]: [\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 DependencyResolverMain\n]): Promise<MergingMain>",
|
|
2111
2237
|
"name": "provider",
|
|
2112
2238
|
"params": [
|
|
2113
2239
|
{
|
|
2114
2240
|
"__schema": "ParameterSchema",
|
|
2115
2241
|
"location": {
|
|
2116
2242
|
"filePath": "merging.main.runtime.ts",
|
|
2117
|
-
"line":
|
|
2243
|
+
"line": 696,
|
|
2118
2244
|
"character": 25
|
|
2119
2245
|
},
|
|
2120
|
-
"name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger ]",
|
|
2246
|
+
"name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver ]",
|
|
2121
2247
|
"type": {
|
|
2122
2248
|
"__schema": "TupleTypeSchema",
|
|
2123
2249
|
"location": {
|
|
2124
2250
|
"filePath": "merging.main.runtime.ts",
|
|
2125
|
-
"line":
|
|
2251
|
+
"line": 711,
|
|
2126
2252
|
"character": 6
|
|
2127
2253
|
},
|
|
2128
2254
|
"elements": [
|
|
@@ -2130,7 +2256,7 @@
|
|
|
2130
2256
|
"__schema": "TypeRefSchema",
|
|
2131
2257
|
"location": {
|
|
2132
2258
|
"filePath": "merging.main.runtime.ts",
|
|
2133
|
-
"line":
|
|
2259
|
+
"line": 712,
|
|
2134
2260
|
"character": 5
|
|
2135
2261
|
},
|
|
2136
2262
|
"name": "CLIMain",
|
|
@@ -2143,7 +2269,7 @@
|
|
|
2143
2269
|
"__schema": "TypeRefSchema",
|
|
2144
2270
|
"location": {
|
|
2145
2271
|
"filePath": "merging.main.runtime.ts",
|
|
2146
|
-
"line":
|
|
2272
|
+
"line": 713,
|
|
2147
2273
|
"character": 5
|
|
2148
2274
|
},
|
|
2149
2275
|
"name": "Workspace",
|
|
@@ -2156,7 +2282,7 @@
|
|
|
2156
2282
|
"__schema": "TypeRefSchema",
|
|
2157
2283
|
"location": {
|
|
2158
2284
|
"filePath": "merging.main.runtime.ts",
|
|
2159
|
-
"line":
|
|
2285
|
+
"line": 714,
|
|
2160
2286
|
"character": 5
|
|
2161
2287
|
},
|
|
2162
2288
|
"name": "ScopeMain",
|
|
@@ -2169,7 +2295,7 @@
|
|
|
2169
2295
|
"__schema": "TypeRefSchema",
|
|
2170
2296
|
"location": {
|
|
2171
2297
|
"filePath": "merging.main.runtime.ts",
|
|
2172
|
-
"line":
|
|
2298
|
+
"line": 715,
|
|
2173
2299
|
"character": 5
|
|
2174
2300
|
},
|
|
2175
2301
|
"name": "SnappingMain",
|
|
@@ -2182,7 +2308,7 @@
|
|
|
2182
2308
|
"__schema": "TypeRefSchema",
|
|
2183
2309
|
"location": {
|
|
2184
2310
|
"filePath": "merging.main.runtime.ts",
|
|
2185
|
-
"line":
|
|
2311
|
+
"line": 716,
|
|
2186
2312
|
"character": 5
|
|
2187
2313
|
},
|
|
2188
2314
|
"name": "CheckoutMain",
|
|
@@ -2195,7 +2321,7 @@
|
|
|
2195
2321
|
"__schema": "TypeRefSchema",
|
|
2196
2322
|
"location": {
|
|
2197
2323
|
"filePath": "merging.main.runtime.ts",
|
|
2198
|
-
"line":
|
|
2324
|
+
"line": 717,
|
|
2199
2325
|
"character": 5
|
|
2200
2326
|
},
|
|
2201
2327
|
"name": "InstallMain",
|
|
@@ -2208,7 +2334,7 @@
|
|
|
2208
2334
|
"__schema": "TypeRefSchema",
|
|
2209
2335
|
"location": {
|
|
2210
2336
|
"filePath": "merging.main.runtime.ts",
|
|
2211
|
-
"line":
|
|
2337
|
+
"line": 718,
|
|
2212
2338
|
"character": 5
|
|
2213
2339
|
},
|
|
2214
2340
|
"name": "LoggerMain",
|
|
@@ -2221,7 +2347,7 @@
|
|
|
2221
2347
|
"__schema": "TypeRefSchema",
|
|
2222
2348
|
"location": {
|
|
2223
2349
|
"filePath": "merging.main.runtime.ts",
|
|
2224
|
-
"line":
|
|
2350
|
+
"line": 719,
|
|
2225
2351
|
"character": 5
|
|
2226
2352
|
},
|
|
2227
2353
|
"name": "ComponentWriterMain",
|
|
@@ -2234,7 +2360,7 @@
|
|
|
2234
2360
|
"__schema": "TypeRefSchema",
|
|
2235
2361
|
"location": {
|
|
2236
2362
|
"filePath": "merging.main.runtime.ts",
|
|
2237
|
-
"line":
|
|
2363
|
+
"line": 720,
|
|
2238
2364
|
"character": 5
|
|
2239
2365
|
},
|
|
2240
2366
|
"name": "ImporterMain",
|
|
@@ -2247,7 +2373,7 @@
|
|
|
2247
2373
|
"__schema": "TypeRefSchema",
|
|
2248
2374
|
"location": {
|
|
2249
2375
|
"filePath": "merging.main.runtime.ts",
|
|
2250
|
-
"line":
|
|
2376
|
+
"line": 721,
|
|
2251
2377
|
"character": 5
|
|
2252
2378
|
},
|
|
2253
2379
|
"name": "ConfigMain",
|
|
@@ -2260,7 +2386,7 @@
|
|
|
2260
2386
|
"__schema": "TypeRefSchema",
|
|
2261
2387
|
"location": {
|
|
2262
2388
|
"filePath": "merging.main.runtime.ts",
|
|
2263
|
-
"line":
|
|
2389
|
+
"line": 722,
|
|
2264
2390
|
"character": 5
|
|
2265
2391
|
},
|
|
2266
2392
|
"name": "RemoveMain",
|
|
@@ -2273,7 +2399,7 @@
|
|
|
2273
2399
|
"__schema": "TypeRefSchema",
|
|
2274
2400
|
"location": {
|
|
2275
2401
|
"filePath": "merging.main.runtime.ts",
|
|
2276
|
-
"line":
|
|
2402
|
+
"line": 723,
|
|
2277
2403
|
"character": 5
|
|
2278
2404
|
},
|
|
2279
2405
|
"name": "GlobalConfigMain",
|
|
@@ -2286,7 +2412,7 @@
|
|
|
2286
2412
|
"__schema": "TypeRefSchema",
|
|
2287
2413
|
"location": {
|
|
2288
2414
|
"filePath": "merging.main.runtime.ts",
|
|
2289
|
-
"line":
|
|
2415
|
+
"line": 724,
|
|
2290
2416
|
"character": 5
|
|
2291
2417
|
},
|
|
2292
2418
|
"name": "ConfigMergerMain",
|
|
@@ -2294,6 +2420,19 @@
|
|
|
2294
2420
|
"scope": "teambit.workspace",
|
|
2295
2421
|
"name": "config-merger"
|
|
2296
2422
|
}
|
|
2423
|
+
},
|
|
2424
|
+
{
|
|
2425
|
+
"__schema": "TypeRefSchema",
|
|
2426
|
+
"location": {
|
|
2427
|
+
"filePath": "merging.main.runtime.ts",
|
|
2428
|
+
"line": 725,
|
|
2429
|
+
"character": 5
|
|
2430
|
+
},
|
|
2431
|
+
"name": "DependencyResolverMain",
|
|
2432
|
+
"componentId": {
|
|
2433
|
+
"scope": "teambit.dependencies",
|
|
2434
|
+
"name": "dependency-resolver"
|
|
2435
|
+
}
|
|
2297
2436
|
}
|
|
2298
2437
|
]
|
|
2299
2438
|
},
|
|
@@ -2305,7 +2444,7 @@
|
|
|
2305
2444
|
"__schema": "InferenceTypeSchema",
|
|
2306
2445
|
"location": {
|
|
2307
2446
|
"filePath": "merging.main.runtime.ts",
|
|
2308
|
-
"line":
|
|
2447
|
+
"line": 696,
|
|
2309
2448
|
"character": 3
|
|
2310
2449
|
},
|
|
2311
2450
|
"type": "Promise<MergingMain>"
|
|
@@ -2323,7 +2462,7 @@
|
|
|
2323
2462
|
"__schema": "TypeSchema",
|
|
2324
2463
|
"location": {
|
|
2325
2464
|
"filePath": "merging.main.runtime.ts",
|
|
2326
|
-
"line":
|
|
2465
|
+
"line": 64,
|
|
2327
2466
|
"character": 1
|
|
2328
2467
|
},
|
|
2329
2468
|
"signature": "type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null | undefined;\n divergeData?: SnapsDistance | undefined;\n resolvedUnrelated?: ResolveUnrelatedData | undefined;\n configMergeResult?: ConfigMergeResult | undefined;\n}",
|
|
@@ -2332,7 +2471,7 @@
|
|
|
2332
2471
|
"__schema": "TypeIntersectionSchema",
|
|
2333
2472
|
"location": {
|
|
2334
2473
|
"filePath": "merging.main.runtime.ts",
|
|
2335
|
-
"line":
|
|
2474
|
+
"line": 64,
|
|
2336
2475
|
"character": 36
|
|
2337
2476
|
},
|
|
2338
2477
|
"types": [
|
|
@@ -2340,7 +2479,7 @@
|
|
|
2340
2479
|
"__schema": "TypeRefSchema",
|
|
2341
2480
|
"location": {
|
|
2342
2481
|
"filePath": "merging.main.runtime.ts",
|
|
2343
|
-
"line":
|
|
2482
|
+
"line": 64,
|
|
2344
2483
|
"character": 36
|
|
2345
2484
|
},
|
|
2346
2485
|
"name": "ComponentStatusBase",
|
|
@@ -2353,7 +2492,7 @@
|
|
|
2353
2492
|
"__schema": "TypeLiteralSchema",
|
|
2354
2493
|
"location": {
|
|
2355
2494
|
"filePath": "merging.main.runtime.ts",
|
|
2356
|
-
"line":
|
|
2495
|
+
"line": 64,
|
|
2357
2496
|
"character": 58
|
|
2358
2497
|
},
|
|
2359
2498
|
"members": [
|
|
@@ -2361,7 +2500,7 @@
|
|
|
2361
2500
|
"__schema": "VariableLikeSchema",
|
|
2362
2501
|
"location": {
|
|
2363
2502
|
"filePath": "merging.main.runtime.ts",
|
|
2364
|
-
"line":
|
|
2503
|
+
"line": 65,
|
|
2365
2504
|
"character": 3
|
|
2366
2505
|
},
|
|
2367
2506
|
"signature": "(property) mergeResults?: MergeResultsThreeWay | null | undefined",
|
|
@@ -2370,7 +2509,7 @@
|
|
|
2370
2509
|
"__schema": "TypeUnionSchema",
|
|
2371
2510
|
"location": {
|
|
2372
2511
|
"filePath": "merging.main.runtime.ts",
|
|
2373
|
-
"line":
|
|
2512
|
+
"line": 65,
|
|
2374
2513
|
"character": 18
|
|
2375
2514
|
},
|
|
2376
2515
|
"types": [
|
|
@@ -2378,7 +2517,7 @@
|
|
|
2378
2517
|
"__schema": "TypeRefSchema",
|
|
2379
2518
|
"location": {
|
|
2380
2519
|
"filePath": "merging.main.runtime.ts",
|
|
2381
|
-
"line":
|
|
2520
|
+
"line": 65,
|
|
2382
2521
|
"character": 18
|
|
2383
2522
|
},
|
|
2384
2523
|
"name": "MergeResultsThreeWay",
|
|
@@ -2388,7 +2527,7 @@
|
|
|
2388
2527
|
"__schema": "LiteralTypeSchema",
|
|
2389
2528
|
"location": {
|
|
2390
2529
|
"filePath": "merging.main.runtime.ts",
|
|
2391
|
-
"line":
|
|
2530
|
+
"line": 65,
|
|
2392
2531
|
"character": 41
|
|
2393
2532
|
},
|
|
2394
2533
|
"name": "null"
|
|
@@ -2401,7 +2540,7 @@
|
|
|
2401
2540
|
"__schema": "VariableLikeSchema",
|
|
2402
2541
|
"location": {
|
|
2403
2542
|
"filePath": "merging.main.runtime.ts",
|
|
2404
|
-
"line":
|
|
2543
|
+
"line": 66,
|
|
2405
2544
|
"character": 3
|
|
2406
2545
|
},
|
|
2407
2546
|
"signature": "(property) divergeData?: SnapsDistance | undefined",
|
|
@@ -2410,7 +2549,7 @@
|
|
|
2410
2549
|
"__schema": "TypeRefSchema",
|
|
2411
2550
|
"location": {
|
|
2412
2551
|
"filePath": "merging.main.runtime.ts",
|
|
2413
|
-
"line":
|
|
2552
|
+
"line": 66,
|
|
2414
2553
|
"character": 17
|
|
2415
2554
|
},
|
|
2416
2555
|
"name": "SnapsDistance",
|
|
@@ -2422,7 +2561,7 @@
|
|
|
2422
2561
|
"__schema": "VariableLikeSchema",
|
|
2423
2562
|
"location": {
|
|
2424
2563
|
"filePath": "merging.main.runtime.ts",
|
|
2425
|
-
"line":
|
|
2564
|
+
"line": 67,
|
|
2426
2565
|
"character": 3
|
|
2427
2566
|
},
|
|
2428
2567
|
"signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
|
|
@@ -2431,7 +2570,7 @@
|
|
|
2431
2570
|
"__schema": "TypeRefSchema",
|
|
2432
2571
|
"location": {
|
|
2433
2572
|
"filePath": "merging.main.runtime.ts",
|
|
2434
|
-
"line":
|
|
2573
|
+
"line": 67,
|
|
2435
2574
|
"character": 23
|
|
2436
2575
|
},
|
|
2437
2576
|
"name": "ResolveUnrelatedData",
|
|
@@ -2443,7 +2582,7 @@
|
|
|
2443
2582
|
"__schema": "VariableLikeSchema",
|
|
2444
2583
|
"location": {
|
|
2445
2584
|
"filePath": "merging.main.runtime.ts",
|
|
2446
|
-
"line":
|
|
2585
|
+
"line": 68,
|
|
2447
2586
|
"character": 3
|
|
2448
2587
|
},
|
|
2449
2588
|
"signature": "(property) configMergeResult?: ConfigMergeResult | undefined",
|
|
@@ -2452,7 +2591,7 @@
|
|
|
2452
2591
|
"__schema": "TypeRefSchema",
|
|
2453
2592
|
"location": {
|
|
2454
2593
|
"filePath": "merging.main.runtime.ts",
|
|
2455
|
-
"line":
|
|
2594
|
+
"line": 68,
|
|
2456
2595
|
"character": 23
|
|
2457
2596
|
},
|
|
2458
2597
|
"name": "ConfigMergeResult",
|
|
@@ -2472,7 +2611,7 @@
|
|
|
2472
2611
|
"__schema": "TypeSchema",
|
|
2473
2612
|
"location": {
|
|
2474
2613
|
"filePath": "merging.main.runtime.ts",
|
|
2475
|
-
"line":
|
|
2614
|
+
"line": 95,
|
|
2476
2615
|
"character": 1
|
|
2477
2616
|
},
|
|
2478
2617
|
"signature": "type ApplyVersionResults = {\n components?: ApplyVersionResult[] | undefined;\n version?: string | undefined;\n failedComponents?: FailedComponents[] | undefined;\n removedComponents?: ComponentID[] | undefined;\n ... 11 more ...;\n workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined;\n}",
|
|
@@ -2481,7 +2620,7 @@
|
|
|
2481
2620
|
"__schema": "TypeLiteralSchema",
|
|
2482
2621
|
"location": {
|
|
2483
2622
|
"filePath": "merging.main.runtime.ts",
|
|
2484
|
-
"line":
|
|
2623
|
+
"line": 95,
|
|
2485
2624
|
"character": 35
|
|
2486
2625
|
},
|
|
2487
2626
|
"members": [
|
|
@@ -2489,7 +2628,7 @@
|
|
|
2489
2628
|
"__schema": "VariableLikeSchema",
|
|
2490
2629
|
"location": {
|
|
2491
2630
|
"filePath": "merging.main.runtime.ts",
|
|
2492
|
-
"line":
|
|
2631
|
+
"line": 96,
|
|
2493
2632
|
"character": 3
|
|
2494
2633
|
},
|
|
2495
2634
|
"signature": "(property) components?: ApplyVersionResult[] | undefined",
|
|
@@ -2498,14 +2637,14 @@
|
|
|
2498
2637
|
"__schema": "TypeArraySchema",
|
|
2499
2638
|
"location": {
|
|
2500
2639
|
"filePath": "merging.main.runtime.ts",
|
|
2501
|
-
"line":
|
|
2640
|
+
"line": 96,
|
|
2502
2641
|
"character": 16
|
|
2503
2642
|
},
|
|
2504
2643
|
"type": {
|
|
2505
2644
|
"__schema": "TypeRefSchema",
|
|
2506
2645
|
"location": {
|
|
2507
2646
|
"filePath": "merging.main.runtime.ts",
|
|
2508
|
-
"line":
|
|
2647
|
+
"line": 96,
|
|
2509
2648
|
"character": 16
|
|
2510
2649
|
},
|
|
2511
2650
|
"name": "ApplyVersionResult"
|
|
@@ -2517,7 +2656,7 @@
|
|
|
2517
2656
|
"__schema": "VariableLikeSchema",
|
|
2518
2657
|
"location": {
|
|
2519
2658
|
"filePath": "merging.main.runtime.ts",
|
|
2520
|
-
"line":
|
|
2659
|
+
"line": 97,
|
|
2521
2660
|
"character": 3
|
|
2522
2661
|
},
|
|
2523
2662
|
"signature": "(property) version?: string | undefined",
|
|
@@ -2526,7 +2665,7 @@
|
|
|
2526
2665
|
"__schema": "KeywordTypeSchema",
|
|
2527
2666
|
"location": {
|
|
2528
2667
|
"filePath": "merging.main.runtime.ts",
|
|
2529
|
-
"line":
|
|
2668
|
+
"line": 97,
|
|
2530
2669
|
"character": 13
|
|
2531
2670
|
},
|
|
2532
2671
|
"name": "string"
|
|
@@ -2537,7 +2676,7 @@
|
|
|
2537
2676
|
"__schema": "VariableLikeSchema",
|
|
2538
2677
|
"location": {
|
|
2539
2678
|
"filePath": "merging.main.runtime.ts",
|
|
2540
|
-
"line":
|
|
2679
|
+
"line": 98,
|
|
2541
2680
|
"character": 3
|
|
2542
2681
|
},
|
|
2543
2682
|
"signature": "(property) failedComponents?: FailedComponents[] | undefined",
|
|
@@ -2546,14 +2685,14 @@
|
|
|
2546
2685
|
"__schema": "TypeArraySchema",
|
|
2547
2686
|
"location": {
|
|
2548
2687
|
"filePath": "merging.main.runtime.ts",
|
|
2549
|
-
"line":
|
|
2688
|
+
"line": 98,
|
|
2550
2689
|
"character": 22
|
|
2551
2690
|
},
|
|
2552
2691
|
"type": {
|
|
2553
2692
|
"__schema": "TypeRefSchema",
|
|
2554
2693
|
"location": {
|
|
2555
2694
|
"filePath": "merging.main.runtime.ts",
|
|
2556
|
-
"line":
|
|
2695
|
+
"line": 98,
|
|
2557
2696
|
"character": 22
|
|
2558
2697
|
},
|
|
2559
2698
|
"name": "FailedComponents"
|
|
@@ -2565,7 +2704,7 @@
|
|
|
2565
2704
|
"__schema": "VariableLikeSchema",
|
|
2566
2705
|
"location": {
|
|
2567
2706
|
"filePath": "merging.main.runtime.ts",
|
|
2568
|
-
"line":
|
|
2707
|
+
"line": 99,
|
|
2569
2708
|
"character": 3
|
|
2570
2709
|
},
|
|
2571
2710
|
"signature": "(property) removedComponents?: ComponentID[] | undefined",
|
|
@@ -2574,14 +2713,14 @@
|
|
|
2574
2713
|
"__schema": "TypeArraySchema",
|
|
2575
2714
|
"location": {
|
|
2576
2715
|
"filePath": "merging.main.runtime.ts",
|
|
2577
|
-
"line":
|
|
2716
|
+
"line": 99,
|
|
2578
2717
|
"character": 23
|
|
2579
2718
|
},
|
|
2580
2719
|
"type": {
|
|
2581
2720
|
"__schema": "TypeRefSchema",
|
|
2582
2721
|
"location": {
|
|
2583
2722
|
"filePath": "merging.main.runtime.ts",
|
|
2584
|
-
"line":
|
|
2723
|
+
"line": 99,
|
|
2585
2724
|
"character": 23
|
|
2586
2725
|
},
|
|
2587
2726
|
"name": "ComponentID",
|
|
@@ -2598,7 +2737,7 @@
|
|
|
2598
2737
|
"__schema": "VariableLikeSchema",
|
|
2599
2738
|
"location": {
|
|
2600
2739
|
"filePath": "merging.main.runtime.ts",
|
|
2601
|
-
"line":
|
|
2740
|
+
"line": 100,
|
|
2602
2741
|
"character": 3
|
|
2603
2742
|
},
|
|
2604
2743
|
"signature": "(property) addedComponents?: ComponentID[] | undefined",
|
|
@@ -2607,14 +2746,14 @@
|
|
|
2607
2746
|
"__schema": "TypeArraySchema",
|
|
2608
2747
|
"location": {
|
|
2609
2748
|
"filePath": "merging.main.runtime.ts",
|
|
2610
|
-
"line":
|
|
2749
|
+
"line": 100,
|
|
2611
2750
|
"character": 21
|
|
2612
2751
|
},
|
|
2613
2752
|
"type": {
|
|
2614
2753
|
"__schema": "TypeRefSchema",
|
|
2615
2754
|
"location": {
|
|
2616
2755
|
"filePath": "merging.main.runtime.ts",
|
|
2617
|
-
"line":
|
|
2756
|
+
"line": 100,
|
|
2618
2757
|
"character": 21
|
|
2619
2758
|
},
|
|
2620
2759
|
"name": "ComponentID",
|
|
@@ -2631,7 +2770,7 @@
|
|
|
2631
2770
|
"__schema": "VariableLikeSchema",
|
|
2632
2771
|
"location": {
|
|
2633
2772
|
"filePath": "merging.main.runtime.ts",
|
|
2634
|
-
"line":
|
|
2773
|
+
"line": 101,
|
|
2635
2774
|
"character": 3
|
|
2636
2775
|
},
|
|
2637
2776
|
"signature": "(property) resolvedComponents?: ConsumerComponent[] | undefined",
|
|
@@ -2640,14 +2779,14 @@
|
|
|
2640
2779
|
"__schema": "TypeArraySchema",
|
|
2641
2780
|
"location": {
|
|
2642
2781
|
"filePath": "merging.main.runtime.ts",
|
|
2643
|
-
"line":
|
|
2782
|
+
"line": 101,
|
|
2644
2783
|
"character": 24
|
|
2645
2784
|
},
|
|
2646
2785
|
"type": {
|
|
2647
2786
|
"__schema": "TypeRefSchema",
|
|
2648
2787
|
"location": {
|
|
2649
2788
|
"filePath": "merging.main.runtime.ts",
|
|
2650
|
-
"line":
|
|
2789
|
+
"line": 101,
|
|
2651
2790
|
"character": 24
|
|
2652
2791
|
},
|
|
2653
2792
|
"name": "ConsumerComponent",
|
|
@@ -2660,7 +2799,7 @@
|
|
|
2660
2799
|
"__schema": "VariableLikeSchema",
|
|
2661
2800
|
"location": {
|
|
2662
2801
|
"filePath": "merging.main.runtime.ts",
|
|
2663
|
-
"line":
|
|
2802
|
+
"line": 102,
|
|
2664
2803
|
"character": 3
|
|
2665
2804
|
},
|
|
2666
2805
|
"signature": "(property) abortedComponents?: ApplyVersionResult[] | undefined",
|
|
@@ -2669,14 +2808,14 @@
|
|
|
2669
2808
|
"__schema": "TypeArraySchema",
|
|
2670
2809
|
"location": {
|
|
2671
2810
|
"filePath": "merging.main.runtime.ts",
|
|
2672
|
-
"line":
|
|
2811
|
+
"line": 102,
|
|
2673
2812
|
"character": 23
|
|
2674
2813
|
},
|
|
2675
2814
|
"type": {
|
|
2676
2815
|
"__schema": "TypeRefSchema",
|
|
2677
2816
|
"location": {
|
|
2678
2817
|
"filePath": "merging.main.runtime.ts",
|
|
2679
|
-
"line":
|
|
2818
|
+
"line": 102,
|
|
2680
2819
|
"character": 23
|
|
2681
2820
|
},
|
|
2682
2821
|
"name": "ApplyVersionResult"
|
|
@@ -2688,7 +2827,7 @@
|
|
|
2688
2827
|
"__schema": "VariableLikeSchema",
|
|
2689
2828
|
"location": {
|
|
2690
2829
|
"filePath": "merging.main.runtime.ts",
|
|
2691
|
-
"line":
|
|
2830
|
+
"line": 103,
|
|
2692
2831
|
"character": 3
|
|
2693
2832
|
},
|
|
2694
2833
|
"signature": "(property) mergeSnapResults?: MergeSnapResults | undefined",
|
|
@@ -2697,7 +2836,7 @@
|
|
|
2697
2836
|
"__schema": "TypeRefSchema",
|
|
2698
2837
|
"location": {
|
|
2699
2838
|
"filePath": "merging.main.runtime.ts",
|
|
2700
|
-
"line":
|
|
2839
|
+
"line": 103,
|
|
2701
2840
|
"character": 22
|
|
2702
2841
|
},
|
|
2703
2842
|
"name": "MergeSnapResults",
|
|
@@ -2709,7 +2848,7 @@
|
|
|
2709
2848
|
"__schema": "VariableLikeSchema",
|
|
2710
2849
|
"location": {
|
|
2711
2850
|
"filePath": "merging.main.runtime.ts",
|
|
2712
|
-
"line":
|
|
2851
|
+
"line": 104,
|
|
2713
2852
|
"character": 3
|
|
2714
2853
|
},
|
|
2715
2854
|
"signature": "(property) mergeSnapError?: Error | undefined",
|
|
@@ -2718,7 +2857,7 @@
|
|
|
2718
2857
|
"__schema": "TypeRefSchema",
|
|
2719
2858
|
"location": {
|
|
2720
2859
|
"filePath": "merging.main.runtime.ts",
|
|
2721
|
-
"line":
|
|
2860
|
+
"line": 104,
|
|
2722
2861
|
"character": 20
|
|
2723
2862
|
},
|
|
2724
2863
|
"name": "Error"
|
|
@@ -2729,7 +2868,7 @@
|
|
|
2729
2868
|
"__schema": "VariableLikeSchema",
|
|
2730
2869
|
"location": {
|
|
2731
2870
|
"filePath": "merging.main.runtime.ts",
|
|
2732
|
-
"line":
|
|
2871
|
+
"line": 105,
|
|
2733
2872
|
"character": 3
|
|
2734
2873
|
},
|
|
2735
2874
|
"signature": "(property) leftUnresolvedConflicts?: boolean | undefined",
|
|
@@ -2738,7 +2877,7 @@
|
|
|
2738
2877
|
"__schema": "KeywordTypeSchema",
|
|
2739
2878
|
"location": {
|
|
2740
2879
|
"filePath": "merging.main.runtime.ts",
|
|
2741
|
-
"line":
|
|
2880
|
+
"line": 105,
|
|
2742
2881
|
"character": 29
|
|
2743
2882
|
},
|
|
2744
2883
|
"name": "boolean"
|
|
@@ -2749,7 +2888,7 @@
|
|
|
2749
2888
|
"__schema": "VariableLikeSchema",
|
|
2750
2889
|
"location": {
|
|
2751
2890
|
"filePath": "merging.main.runtime.ts",
|
|
2752
|
-
"line":
|
|
2891
|
+
"line": 106,
|
|
2753
2892
|
"character": 3
|
|
2754
2893
|
},
|
|
2755
2894
|
"signature": "(property) verbose?: boolean | undefined",
|
|
@@ -2758,7 +2897,7 @@
|
|
|
2758
2897
|
"__schema": "KeywordTypeSchema",
|
|
2759
2898
|
"location": {
|
|
2760
2899
|
"filePath": "merging.main.runtime.ts",
|
|
2761
|
-
"line":
|
|
2900
|
+
"line": 106,
|
|
2762
2901
|
"character": 13
|
|
2763
2902
|
},
|
|
2764
2903
|
"name": "boolean"
|
|
@@ -2769,7 +2908,7 @@
|
|
|
2769
2908
|
"__schema": "VariableLikeSchema",
|
|
2770
2909
|
"location": {
|
|
2771
2910
|
"filePath": "merging.main.runtime.ts",
|
|
2772
|
-
"line":
|
|
2911
|
+
"line": 107,
|
|
2773
2912
|
"character": 3
|
|
2774
2913
|
},
|
|
2775
2914
|
"signature": "(property) newFromLane?: string[] | undefined",
|
|
@@ -2778,14 +2917,14 @@
|
|
|
2778
2917
|
"__schema": "TypeArraySchema",
|
|
2779
2918
|
"location": {
|
|
2780
2919
|
"filePath": "merging.main.runtime.ts",
|
|
2781
|
-
"line":
|
|
2920
|
+
"line": 107,
|
|
2782
2921
|
"character": 17
|
|
2783
2922
|
},
|
|
2784
2923
|
"type": {
|
|
2785
2924
|
"__schema": "KeywordTypeSchema",
|
|
2786
2925
|
"location": {
|
|
2787
2926
|
"filePath": "merging.main.runtime.ts",
|
|
2788
|
-
"line":
|
|
2927
|
+
"line": 107,
|
|
2789
2928
|
"character": 17
|
|
2790
2929
|
},
|
|
2791
2930
|
"name": "string"
|
|
@@ -2797,7 +2936,7 @@
|
|
|
2797
2936
|
"__schema": "VariableLikeSchema",
|
|
2798
2937
|
"location": {
|
|
2799
2938
|
"filePath": "merging.main.runtime.ts",
|
|
2800
|
-
"line":
|
|
2939
|
+
"line": 108,
|
|
2801
2940
|
"character": 3
|
|
2802
2941
|
},
|
|
2803
2942
|
"signature": "(property) newFromLaneAdded?: boolean | undefined",
|
|
@@ -2806,7 +2945,7 @@
|
|
|
2806
2945
|
"__schema": "KeywordTypeSchema",
|
|
2807
2946
|
"location": {
|
|
2808
2947
|
"filePath": "merging.main.runtime.ts",
|
|
2809
|
-
"line":
|
|
2948
|
+
"line": 108,
|
|
2810
2949
|
"character": 22
|
|
2811
2950
|
},
|
|
2812
2951
|
"name": "boolean"
|
|
@@ -2817,7 +2956,7 @@
|
|
|
2817
2956
|
"__schema": "VariableLikeSchema",
|
|
2818
2957
|
"location": {
|
|
2819
2958
|
"filePath": "merging.main.runtime.ts",
|
|
2820
|
-
"line":
|
|
2959
|
+
"line": 109,
|
|
2821
2960
|
"character": 3
|
|
2822
2961
|
},
|
|
2823
2962
|
"signature": "(property) installationError?: Error | undefined",
|
|
@@ -2826,7 +2965,7 @@
|
|
|
2826
2965
|
"__schema": "TypeRefSchema",
|
|
2827
2966
|
"location": {
|
|
2828
2967
|
"filePath": "merging.main.runtime.ts",
|
|
2829
|
-
"line":
|
|
2968
|
+
"line": 109,
|
|
2830
2969
|
"character": 23
|
|
2831
2970
|
},
|
|
2832
2971
|
"name": "Error"
|
|
@@ -2837,7 +2976,7 @@
|
|
|
2837
2976
|
"__schema": "VariableLikeSchema",
|
|
2838
2977
|
"location": {
|
|
2839
2978
|
"filePath": "merging.main.runtime.ts",
|
|
2840
|
-
"line":
|
|
2979
|
+
"line": 110,
|
|
2841
2980
|
"character": 3
|
|
2842
2981
|
},
|
|
2843
2982
|
"signature": "(property) compilationError?: Error | undefined",
|
|
@@ -2846,7 +2985,7 @@
|
|
|
2846
2985
|
"__schema": "TypeRefSchema",
|
|
2847
2986
|
"location": {
|
|
2848
2987
|
"filePath": "merging.main.runtime.ts",
|
|
2849
|
-
"line":
|
|
2988
|
+
"line": 110,
|
|
2850
2989
|
"character": 22
|
|
2851
2990
|
},
|
|
2852
2991
|
"name": "Error"
|
|
@@ -2857,7 +2996,7 @@
|
|
|
2857
2996
|
"__schema": "VariableLikeSchema",
|
|
2858
2997
|
"location": {
|
|
2859
2998
|
"filePath": "merging.main.runtime.ts",
|
|
2860
|
-
"line":
|
|
2999
|
+
"line": 111,
|
|
2861
3000
|
"character": 3
|
|
2862
3001
|
},
|
|
2863
3002
|
"signature": "(property) workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined",
|
|
@@ -2866,7 +3005,7 @@
|
|
|
2866
3005
|
"__schema": "TypeRefSchema",
|
|
2867
3006
|
"location": {
|
|
2868
3007
|
"filePath": "merging.main.runtime.ts",
|
|
2869
|
-
"line":
|
|
3008
|
+
"line": 111,
|
|
2870
3009
|
"character": 33
|
|
2871
3010
|
},
|
|
2872
3011
|
"name": "WorkspaceConfigUpdateResult",
|
|
@@ -2884,7 +3023,7 @@
|
|
|
2884
3023
|
"__schema": "TypeSchema",
|
|
2885
3024
|
"location": {
|
|
2886
3025
|
"filePath": "merging.main.runtime.ts",
|
|
2887
|
-
"line":
|
|
3026
|
+
"line": 93,
|
|
2888
3027
|
"character": 1
|
|
2889
3028
|
},
|
|
2890
3029
|
"signature": "type ApplyVersionResult = {\n id: ComponentID;\n filesStatus: FilesStatus;\n}",
|
|
@@ -2893,7 +3032,7 @@
|
|
|
2893
3032
|
"__schema": "TypeLiteralSchema",
|
|
2894
3033
|
"location": {
|
|
2895
3034
|
"filePath": "merging.main.runtime.ts",
|
|
2896
|
-
"line":
|
|
3035
|
+
"line": 93,
|
|
2897
3036
|
"character": 34
|
|
2898
3037
|
},
|
|
2899
3038
|
"members": [
|
|
@@ -2901,7 +3040,7 @@
|
|
|
2901
3040
|
"__schema": "VariableLikeSchema",
|
|
2902
3041
|
"location": {
|
|
2903
3042
|
"filePath": "merging.main.runtime.ts",
|
|
2904
|
-
"line":
|
|
3043
|
+
"line": 93,
|
|
2905
3044
|
"character": 36
|
|
2906
3045
|
},
|
|
2907
3046
|
"signature": "(property) id: ComponentID",
|
|
@@ -2910,7 +3049,7 @@
|
|
|
2910
3049
|
"__schema": "TypeRefSchema",
|
|
2911
3050
|
"location": {
|
|
2912
3051
|
"filePath": "merging.main.runtime.ts",
|
|
2913
|
-
"line":
|
|
3052
|
+
"line": 93,
|
|
2914
3053
|
"character": 36
|
|
2915
3054
|
},
|
|
2916
3055
|
"name": "ComponentID",
|
|
@@ -2926,7 +3065,7 @@
|
|
|
2926
3065
|
"__schema": "VariableLikeSchema",
|
|
2927
3066
|
"location": {
|
|
2928
3067
|
"filePath": "merging.main.runtime.ts",
|
|
2929
|
-
"line":
|
|
3068
|
+
"line": 93,
|
|
2930
3069
|
"character": 53
|
|
2931
3070
|
},
|
|
2932
3071
|
"signature": "(property) filesStatus: FilesStatus",
|
|
@@ -2935,7 +3074,7 @@
|
|
|
2935
3074
|
"__schema": "TypeRefSchema",
|
|
2936
3075
|
"location": {
|
|
2937
3076
|
"filePath": "merging.main.runtime.ts",
|
|
2938
|
-
"line":
|
|
3077
|
+
"line": 93,
|
|
2939
3078
|
"character": 53
|
|
2940
3079
|
},
|
|
2941
3080
|
"name": "FilesStatus"
|
|
@@ -2949,7 +3088,7 @@
|
|
|
2949
3088
|
"__schema": "TypeSchema",
|
|
2950
3089
|
"location": {
|
|
2951
3090
|
"filePath": "merging.main.runtime.ts",
|
|
2952
|
-
"line":
|
|
3091
|
+
"line": 84,
|
|
2953
3092
|
"character": 1
|
|
2954
3093
|
},
|
|
2955
3094
|
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
@@ -2958,7 +3097,7 @@
|
|
|
2958
3097
|
"__schema": "TypeLiteralSchema",
|
|
2959
3098
|
"location": {
|
|
2960
3099
|
"filePath": "merging.main.runtime.ts",
|
|
2961
|
-
"line":
|
|
3100
|
+
"line": 84,
|
|
2962
3101
|
"character": 27
|
|
2963
3102
|
},
|
|
2964
3103
|
"members": [
|
|
@@ -2966,14 +3105,14 @@
|
|
|
2966
3105
|
"__schema": "IndexSignatureSchema",
|
|
2967
3106
|
"location": {
|
|
2968
3107
|
"filePath": "merging.main.runtime.ts",
|
|
2969
|
-
"line":
|
|
3108
|
+
"line": 84,
|
|
2970
3109
|
"character": 29
|
|
2971
3110
|
},
|
|
2972
3111
|
"keyType": {
|
|
2973
3112
|
"__schema": "ParameterSchema",
|
|
2974
3113
|
"location": {
|
|
2975
3114
|
"filePath": "merging.main.runtime.ts",
|
|
2976
|
-
"line":
|
|
3115
|
+
"line": 84,
|
|
2977
3116
|
"character": 30
|
|
2978
3117
|
},
|
|
2979
3118
|
"name": "fileName",
|
|
@@ -2981,7 +3120,7 @@
|
|
|
2981
3120
|
"__schema": "KeywordTypeSchema",
|
|
2982
3121
|
"location": {
|
|
2983
3122
|
"filePath": "merging.main.runtime.ts",
|
|
2984
|
-
"line":
|
|
3123
|
+
"line": 84,
|
|
2985
3124
|
"character": 40
|
|
2986
3125
|
},
|
|
2987
3126
|
"name": "string"
|
|
@@ -2993,7 +3132,7 @@
|
|
|
2993
3132
|
"__schema": "TypeOperatorSchema",
|
|
2994
3133
|
"location": {
|
|
2995
3134
|
"filePath": "merging.main.runtime.ts",
|
|
2996
|
-
"line":
|
|
3135
|
+
"line": 84,
|
|
2997
3136
|
"character": 49
|
|
2998
3137
|
},
|
|
2999
3138
|
"name": "keyof",
|
|
@@ -3001,7 +3140,7 @@
|
|
|
3001
3140
|
"__schema": "TypeQuerySchema",
|
|
3002
3141
|
"location": {
|
|
3003
3142
|
"filePath": "merging.main.runtime.ts",
|
|
3004
|
-
"line":
|
|
3143
|
+
"line": 84,
|
|
3005
3144
|
"character": 55
|
|
3006
3145
|
},
|
|
3007
3146
|
"signature": "(alias) const FileStatus: {\n merged: string;\n manual: string;\n binaryConflict: string;\n updated: string;\n added: string;\n removed: string;\n overridden: string;\n unchanged: string;\n remainDeleted: string;\n deletedConflict: string;\n}\nimport FileStatus",
|
|
@@ -3009,7 +3148,7 @@
|
|
|
3009
3148
|
"__schema": "TypeRefSchema",
|
|
3010
3149
|
"location": {
|
|
3011
3150
|
"filePath": "merging.main.runtime.ts",
|
|
3012
|
-
"line":
|
|
3151
|
+
"line": 84,
|
|
3013
3152
|
"character": 62
|
|
3014
3153
|
},
|
|
3015
3154
|
"name": "FileStatus",
|
|
@@ -3025,7 +3164,7 @@
|
|
|
3025
3164
|
"__schema": "TypeSchema",
|
|
3026
3165
|
"location": {
|
|
3027
3166
|
"filePath": "merging.main.runtime.ts",
|
|
3028
|
-
"line":
|
|
3167
|
+
"line": 81,
|
|
3029
3168
|
"character": 1
|
|
3030
3169
|
},
|
|
3031
3170
|
"signature": "type FailedComponents = {\n id: ComponentID;\n unchangedMessage: string;\n unchangedLegitimately?: boolean | undefined;\n}",
|
|
@@ -3034,7 +3173,7 @@
|
|
|
3034
3173
|
"__schema": "TypeLiteralSchema",
|
|
3035
3174
|
"location": {
|
|
3036
3175
|
"filePath": "merging.main.runtime.ts",
|
|
3037
|
-
"line":
|
|
3176
|
+
"line": 81,
|
|
3038
3177
|
"character": 32
|
|
3039
3178
|
},
|
|
3040
3179
|
"members": [
|
|
@@ -3042,7 +3181,7 @@
|
|
|
3042
3181
|
"__schema": "VariableLikeSchema",
|
|
3043
3182
|
"location": {
|
|
3044
3183
|
"filePath": "merging.main.runtime.ts",
|
|
3045
|
-
"line":
|
|
3184
|
+
"line": 81,
|
|
3046
3185
|
"character": 34
|
|
3047
3186
|
},
|
|
3048
3187
|
"signature": "(property) id: ComponentID",
|
|
@@ -3051,7 +3190,7 @@
|
|
|
3051
3190
|
"__schema": "TypeRefSchema",
|
|
3052
3191
|
"location": {
|
|
3053
3192
|
"filePath": "merging.main.runtime.ts",
|
|
3054
|
-
"line":
|
|
3193
|
+
"line": 81,
|
|
3055
3194
|
"character": 34
|
|
3056
3195
|
},
|
|
3057
3196
|
"name": "ComponentID",
|
|
@@ -3067,7 +3206,7 @@
|
|
|
3067
3206
|
"__schema": "VariableLikeSchema",
|
|
3068
3207
|
"location": {
|
|
3069
3208
|
"filePath": "merging.main.runtime.ts",
|
|
3070
|
-
"line":
|
|
3209
|
+
"line": 81,
|
|
3071
3210
|
"character": 51
|
|
3072
3211
|
},
|
|
3073
3212
|
"signature": "(property) unchangedMessage: string",
|
|
@@ -3076,7 +3215,7 @@
|
|
|
3076
3215
|
"__schema": "KeywordTypeSchema",
|
|
3077
3216
|
"location": {
|
|
3078
3217
|
"filePath": "merging.main.runtime.ts",
|
|
3079
|
-
"line":
|
|
3218
|
+
"line": 81,
|
|
3080
3219
|
"character": 69
|
|
3081
3220
|
},
|
|
3082
3221
|
"name": "string"
|
|
@@ -3087,7 +3226,7 @@
|
|
|
3087
3226
|
"__schema": "VariableLikeSchema",
|
|
3088
3227
|
"location": {
|
|
3089
3228
|
"filePath": "merging.main.runtime.ts",
|
|
3090
|
-
"line":
|
|
3229
|
+
"line": 81,
|
|
3091
3230
|
"character": 77
|
|
3092
3231
|
},
|
|
3093
3232
|
"signature": "(property) unchangedLegitimately?: boolean | undefined",
|
|
@@ -3096,7 +3235,7 @@
|
|
|
3096
3235
|
"__schema": "KeywordTypeSchema",
|
|
3097
3236
|
"location": {
|
|
3098
3237
|
"filePath": "merging.main.runtime.ts",
|
|
3099
|
-
"line":
|
|
3238
|
+
"line": 81,
|
|
3100
3239
|
"character": 101
|
|
3101
3240
|
},
|
|
3102
3241
|
"name": "boolean"
|
|
@@ -3953,7 +4092,7 @@
|
|
|
3953
4092
|
"_legacy": {
|
|
3954
4093
|
"scope": "teambit.component",
|
|
3955
4094
|
"name": "merging",
|
|
3956
|
-
"version": "1.0.
|
|
4095
|
+
"version": "1.0.250"
|
|
3957
4096
|
},
|
|
3958
4097
|
"_scope": "teambit.component"
|
|
3959
4098
|
}
|
|
@@ -4719,7 +4858,7 @@
|
|
|
4719
4858
|
"__schema": "TypeSchema",
|
|
4720
4859
|
"location": {
|
|
4721
4860
|
"filePath": "merging.main.runtime.ts",
|
|
4722
|
-
"line":
|
|
4861
|
+
"line": 64,
|
|
4723
4862
|
"character": 1
|
|
4724
4863
|
},
|
|
4725
4864
|
"signature": "type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null | undefined;\n divergeData?: SnapsDistance | undefined;\n resolvedUnrelated?: ResolveUnrelatedData | undefined;\n configMergeResult?: ConfigMergeResult | undefined;\n}",
|
|
@@ -4728,7 +4867,7 @@
|
|
|
4728
4867
|
"__schema": "TypeIntersectionSchema",
|
|
4729
4868
|
"location": {
|
|
4730
4869
|
"filePath": "merging.main.runtime.ts",
|
|
4731
|
-
"line":
|
|
4870
|
+
"line": 64,
|
|
4732
4871
|
"character": 36
|
|
4733
4872
|
},
|
|
4734
4873
|
"types": [
|
|
@@ -4736,7 +4875,7 @@
|
|
|
4736
4875
|
"__schema": "TypeRefSchema",
|
|
4737
4876
|
"location": {
|
|
4738
4877
|
"filePath": "merging.main.runtime.ts",
|
|
4739
|
-
"line":
|
|
4878
|
+
"line": 64,
|
|
4740
4879
|
"character": 36
|
|
4741
4880
|
},
|
|
4742
4881
|
"name": "ComponentStatusBase",
|
|
@@ -4749,7 +4888,7 @@
|
|
|
4749
4888
|
"__schema": "TypeLiteralSchema",
|
|
4750
4889
|
"location": {
|
|
4751
4890
|
"filePath": "merging.main.runtime.ts",
|
|
4752
|
-
"line":
|
|
4891
|
+
"line": 64,
|
|
4753
4892
|
"character": 58
|
|
4754
4893
|
},
|
|
4755
4894
|
"members": [
|
|
@@ -4757,7 +4896,7 @@
|
|
|
4757
4896
|
"__schema": "VariableLikeSchema",
|
|
4758
4897
|
"location": {
|
|
4759
4898
|
"filePath": "merging.main.runtime.ts",
|
|
4760
|
-
"line":
|
|
4899
|
+
"line": 65,
|
|
4761
4900
|
"character": 3
|
|
4762
4901
|
},
|
|
4763
4902
|
"signature": "(property) mergeResults?: MergeResultsThreeWay | null | undefined",
|
|
@@ -4766,7 +4905,7 @@
|
|
|
4766
4905
|
"__schema": "TypeUnionSchema",
|
|
4767
4906
|
"location": {
|
|
4768
4907
|
"filePath": "merging.main.runtime.ts",
|
|
4769
|
-
"line":
|
|
4908
|
+
"line": 65,
|
|
4770
4909
|
"character": 18
|
|
4771
4910
|
},
|
|
4772
4911
|
"types": [
|
|
@@ -4774,7 +4913,7 @@
|
|
|
4774
4913
|
"__schema": "TypeRefSchema",
|
|
4775
4914
|
"location": {
|
|
4776
4915
|
"filePath": "merging.main.runtime.ts",
|
|
4777
|
-
"line":
|
|
4916
|
+
"line": 65,
|
|
4778
4917
|
"character": 18
|
|
4779
4918
|
},
|
|
4780
4919
|
"name": "MergeResultsThreeWay",
|
|
@@ -4784,7 +4923,7 @@
|
|
|
4784
4923
|
"__schema": "LiteralTypeSchema",
|
|
4785
4924
|
"location": {
|
|
4786
4925
|
"filePath": "merging.main.runtime.ts",
|
|
4787
|
-
"line":
|
|
4926
|
+
"line": 65,
|
|
4788
4927
|
"character": 41
|
|
4789
4928
|
},
|
|
4790
4929
|
"name": "null"
|
|
@@ -4797,7 +4936,7 @@
|
|
|
4797
4936
|
"__schema": "VariableLikeSchema",
|
|
4798
4937
|
"location": {
|
|
4799
4938
|
"filePath": "merging.main.runtime.ts",
|
|
4800
|
-
"line":
|
|
4939
|
+
"line": 66,
|
|
4801
4940
|
"character": 3
|
|
4802
4941
|
},
|
|
4803
4942
|
"signature": "(property) divergeData?: SnapsDistance | undefined",
|
|
@@ -4806,7 +4945,7 @@
|
|
|
4806
4945
|
"__schema": "TypeRefSchema",
|
|
4807
4946
|
"location": {
|
|
4808
4947
|
"filePath": "merging.main.runtime.ts",
|
|
4809
|
-
"line":
|
|
4948
|
+
"line": 66,
|
|
4810
4949
|
"character": 17
|
|
4811
4950
|
},
|
|
4812
4951
|
"name": "SnapsDistance",
|
|
@@ -4818,7 +4957,7 @@
|
|
|
4818
4957
|
"__schema": "VariableLikeSchema",
|
|
4819
4958
|
"location": {
|
|
4820
4959
|
"filePath": "merging.main.runtime.ts",
|
|
4821
|
-
"line":
|
|
4960
|
+
"line": 67,
|
|
4822
4961
|
"character": 3
|
|
4823
4962
|
},
|
|
4824
4963
|
"signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
|
|
@@ -4827,7 +4966,7 @@
|
|
|
4827
4966
|
"__schema": "TypeRefSchema",
|
|
4828
4967
|
"location": {
|
|
4829
4968
|
"filePath": "merging.main.runtime.ts",
|
|
4830
|
-
"line":
|
|
4969
|
+
"line": 67,
|
|
4831
4970
|
"character": 23
|
|
4832
4971
|
},
|
|
4833
4972
|
"name": "ResolveUnrelatedData",
|
|
@@ -4839,7 +4978,7 @@
|
|
|
4839
4978
|
"__schema": "VariableLikeSchema",
|
|
4840
4979
|
"location": {
|
|
4841
4980
|
"filePath": "merging.main.runtime.ts",
|
|
4842
|
-
"line":
|
|
4981
|
+
"line": 68,
|
|
4843
4982
|
"character": 3
|
|
4844
4983
|
},
|
|
4845
4984
|
"signature": "(property) configMergeResult?: ConfigMergeResult | undefined",
|
|
@@ -4848,7 +4987,7 @@
|
|
|
4848
4987
|
"__schema": "TypeRefSchema",
|
|
4849
4988
|
"location": {
|
|
4850
4989
|
"filePath": "merging.main.runtime.ts",
|
|
4851
|
-
"line":
|
|
4990
|
+
"line": 68,
|
|
4852
4991
|
"character": 23
|
|
4853
4992
|
},
|
|
4854
4993
|
"name": "ConfigMergeResult",
|
|
@@ -4868,7 +5007,7 @@
|
|
|
4868
5007
|
"__schema": "TypeSchema",
|
|
4869
5008
|
"location": {
|
|
4870
5009
|
"filePath": "merging.main.runtime.ts",
|
|
4871
|
-
"line":
|
|
5010
|
+
"line": 71,
|
|
4872
5011
|
"character": 1
|
|
4873
5012
|
},
|
|
4874
5013
|
"signature": "type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance | undefined;\n resolvedUnrelated?: ResolveUnrelatedData | undefined;\n mergeProps?: {\n ...;\n } | undefined;\n}",
|
|
@@ -4877,7 +5016,7 @@
|
|
|
4877
5016
|
"__schema": "TypeIntersectionSchema",
|
|
4878
5017
|
"location": {
|
|
4879
5018
|
"filePath": "merging.main.runtime.ts",
|
|
4880
|
-
"line":
|
|
5019
|
+
"line": 71,
|
|
4881
5020
|
"character": 54
|
|
4882
5021
|
},
|
|
4883
5022
|
"types": [
|
|
@@ -4885,7 +5024,7 @@
|
|
|
4885
5024
|
"__schema": "TypeRefSchema",
|
|
4886
5025
|
"location": {
|
|
4887
5026
|
"filePath": "merging.main.runtime.ts",
|
|
4888
|
-
"line":
|
|
5027
|
+
"line": 71,
|
|
4889
5028
|
"character": 54
|
|
4890
5029
|
},
|
|
4891
5030
|
"name": "ComponentStatusBase",
|
|
@@ -4898,7 +5037,7 @@
|
|
|
4898
5037
|
"__schema": "TypeLiteralSchema",
|
|
4899
5038
|
"location": {
|
|
4900
5039
|
"filePath": "merging.main.runtime.ts",
|
|
4901
|
-
"line":
|
|
5040
|
+
"line": 71,
|
|
4902
5041
|
"character": 76
|
|
4903
5042
|
},
|
|
4904
5043
|
"members": [
|
|
@@ -4906,7 +5045,7 @@
|
|
|
4906
5045
|
"__schema": "VariableLikeSchema",
|
|
4907
5046
|
"location": {
|
|
4908
5047
|
"filePath": "merging.main.runtime.ts",
|
|
4909
|
-
"line":
|
|
5048
|
+
"line": 72,
|
|
4910
5049
|
"character": 3
|
|
4911
5050
|
},
|
|
4912
5051
|
"signature": "(property) divergeData?: SnapsDistance | undefined",
|
|
@@ -4915,7 +5054,7 @@
|
|
|
4915
5054
|
"__schema": "TypeRefSchema",
|
|
4916
5055
|
"location": {
|
|
4917
5056
|
"filePath": "merging.main.runtime.ts",
|
|
4918
|
-
"line":
|
|
5057
|
+
"line": 72,
|
|
4919
5058
|
"character": 17
|
|
4920
5059
|
},
|
|
4921
5060
|
"name": "SnapsDistance",
|
|
@@ -4927,7 +5066,7 @@
|
|
|
4927
5066
|
"__schema": "VariableLikeSchema",
|
|
4928
5067
|
"location": {
|
|
4929
5068
|
"filePath": "merging.main.runtime.ts",
|
|
4930
|
-
"line":
|
|
5069
|
+
"line": 73,
|
|
4931
5070
|
"character": 3
|
|
4932
5071
|
},
|
|
4933
5072
|
"signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
|
|
@@ -4936,7 +5075,7 @@
|
|
|
4936
5075
|
"__schema": "TypeRefSchema",
|
|
4937
5076
|
"location": {
|
|
4938
5077
|
"filePath": "merging.main.runtime.ts",
|
|
4939
|
-
"line":
|
|
5078
|
+
"line": 73,
|
|
4940
5079
|
"character": 23
|
|
4941
5080
|
},
|
|
4942
5081
|
"name": "ResolveUnrelatedData",
|
|
@@ -4948,7 +5087,7 @@
|
|
|
4948
5087
|
"__schema": "VariableLikeSchema",
|
|
4949
5088
|
"location": {
|
|
4950
5089
|
"filePath": "merging.main.runtime.ts",
|
|
4951
|
-
"line":
|
|
5090
|
+
"line": 74,
|
|
4952
5091
|
"character": 3
|
|
4953
5092
|
},
|
|
4954
5093
|
"signature": "(property) mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n} | undefined",
|
|
@@ -4957,7 +5096,7 @@
|
|
|
4957
5096
|
"__schema": "TypeLiteralSchema",
|
|
4958
5097
|
"location": {
|
|
4959
5098
|
"filePath": "merging.main.runtime.ts",
|
|
4960
|
-
"line":
|
|
5099
|
+
"line": 74,
|
|
4961
5100
|
"character": 16
|
|
4962
5101
|
},
|
|
4963
5102
|
"members": [
|
|
@@ -4965,7 +5104,7 @@
|
|
|
4965
5104
|
"__schema": "VariableLikeSchema",
|
|
4966
5105
|
"location": {
|
|
4967
5106
|
"filePath": "merging.main.runtime.ts",
|
|
4968
|
-
"line":
|
|
5107
|
+
"line": 75,
|
|
4969
5108
|
"character": 5
|
|
4970
5109
|
},
|
|
4971
5110
|
"signature": "(property) otherLaneHead: Ref",
|
|
@@ -4974,7 +5113,7 @@
|
|
|
4974
5113
|
"__schema": "TypeRefSchema",
|
|
4975
5114
|
"location": {
|
|
4976
5115
|
"filePath": "merging.main.runtime.ts",
|
|
4977
|
-
"line":
|
|
5116
|
+
"line": 75,
|
|
4978
5117
|
"character": 5
|
|
4979
5118
|
},
|
|
4980
5119
|
"name": "Ref",
|
|
@@ -4986,7 +5125,7 @@
|
|
|
4986
5125
|
"__schema": "VariableLikeSchema",
|
|
4987
5126
|
"location": {
|
|
4988
5127
|
"filePath": "merging.main.runtime.ts",
|
|
4989
|
-
"line":
|
|
5128
|
+
"line": 76,
|
|
4990
5129
|
"character": 5
|
|
4991
5130
|
},
|
|
4992
5131
|
"signature": "(property) currentId: ComponentID",
|
|
@@ -4995,7 +5134,7 @@
|
|
|
4995
5134
|
"__schema": "TypeRefSchema",
|
|
4996
5135
|
"location": {
|
|
4997
5136
|
"filePath": "merging.main.runtime.ts",
|
|
4998
|
-
"line":
|
|
5137
|
+
"line": 76,
|
|
4999
5138
|
"character": 5
|
|
5000
5139
|
},
|
|
5001
5140
|
"name": "ComponentID",
|
|
@@ -5011,7 +5150,7 @@
|
|
|
5011
5150
|
"__schema": "VariableLikeSchema",
|
|
5012
5151
|
"location": {
|
|
5013
5152
|
"filePath": "merging.main.runtime.ts",
|
|
5014
|
-
"line":
|
|
5153
|
+
"line": 77,
|
|
5015
5154
|
"character": 5
|
|
5016
5155
|
},
|
|
5017
5156
|
"signature": "(property) modelComponent: ModelComponent",
|
|
@@ -5020,7 +5159,7 @@
|
|
|
5020
5159
|
"__schema": "TypeRefSchema",
|
|
5021
5160
|
"location": {
|
|
5022
5161
|
"filePath": "merging.main.runtime.ts",
|
|
5023
|
-
"line":
|
|
5162
|
+
"line": 77,
|
|
5024
5163
|
"character": 5
|
|
5025
5164
|
},
|
|
5026
5165
|
"name": "ModelComponent",
|
|
@@ -5041,7 +5180,7 @@
|
|
|
5041
5180
|
"__schema": "TypeSchema",
|
|
5042
5181
|
"location": {
|
|
5043
5182
|
"filePath": "merging.main.runtime.ts",
|
|
5044
|
-
"line":
|
|
5183
|
+
"line": 81,
|
|
5045
5184
|
"character": 1
|
|
5046
5185
|
},
|
|
5047
5186
|
"signature": "type FailedComponents = {\n id: ComponentID;\n unchangedMessage: string;\n unchangedLegitimately?: boolean | undefined;\n}",
|
|
@@ -5050,7 +5189,7 @@
|
|
|
5050
5189
|
"__schema": "TypeLiteralSchema",
|
|
5051
5190
|
"location": {
|
|
5052
5191
|
"filePath": "merging.main.runtime.ts",
|
|
5053
|
-
"line":
|
|
5192
|
+
"line": 81,
|
|
5054
5193
|
"character": 32
|
|
5055
5194
|
},
|
|
5056
5195
|
"members": [
|
|
@@ -5058,7 +5197,7 @@
|
|
|
5058
5197
|
"__schema": "VariableLikeSchema",
|
|
5059
5198
|
"location": {
|
|
5060
5199
|
"filePath": "merging.main.runtime.ts",
|
|
5061
|
-
"line":
|
|
5200
|
+
"line": 81,
|
|
5062
5201
|
"character": 34
|
|
5063
5202
|
},
|
|
5064
5203
|
"signature": "(property) id: ComponentID",
|
|
@@ -5067,7 +5206,7 @@
|
|
|
5067
5206
|
"__schema": "TypeRefSchema",
|
|
5068
5207
|
"location": {
|
|
5069
5208
|
"filePath": "merging.main.runtime.ts",
|
|
5070
|
-
"line":
|
|
5209
|
+
"line": 81,
|
|
5071
5210
|
"character": 34
|
|
5072
5211
|
},
|
|
5073
5212
|
"name": "ComponentID",
|
|
@@ -5083,7 +5222,7 @@
|
|
|
5083
5222
|
"__schema": "VariableLikeSchema",
|
|
5084
5223
|
"location": {
|
|
5085
5224
|
"filePath": "merging.main.runtime.ts",
|
|
5086
|
-
"line":
|
|
5225
|
+
"line": 81,
|
|
5087
5226
|
"character": 51
|
|
5088
5227
|
},
|
|
5089
5228
|
"signature": "(property) unchangedMessage: string",
|
|
@@ -5092,7 +5231,7 @@
|
|
|
5092
5231
|
"__schema": "KeywordTypeSchema",
|
|
5093
5232
|
"location": {
|
|
5094
5233
|
"filePath": "merging.main.runtime.ts",
|
|
5095
|
-
"line":
|
|
5234
|
+
"line": 81,
|
|
5096
5235
|
"character": 69
|
|
5097
5236
|
},
|
|
5098
5237
|
"name": "string"
|
|
@@ -5103,7 +5242,7 @@
|
|
|
5103
5242
|
"__schema": "VariableLikeSchema",
|
|
5104
5243
|
"location": {
|
|
5105
5244
|
"filePath": "merging.main.runtime.ts",
|
|
5106
|
-
"line":
|
|
5245
|
+
"line": 81,
|
|
5107
5246
|
"character": 77
|
|
5108
5247
|
},
|
|
5109
5248
|
"signature": "(property) unchangedLegitimately?: boolean | undefined",
|
|
@@ -5112,7 +5251,7 @@
|
|
|
5112
5251
|
"__schema": "KeywordTypeSchema",
|
|
5113
5252
|
"location": {
|
|
5114
5253
|
"filePath": "merging.main.runtime.ts",
|
|
5115
|
-
"line":
|
|
5254
|
+
"line": 81,
|
|
5116
5255
|
"character": 101
|
|
5117
5256
|
},
|
|
5118
5257
|
"name": "boolean"
|
|
@@ -5126,7 +5265,7 @@
|
|
|
5126
5265
|
"__schema": "TypeSchema",
|
|
5127
5266
|
"location": {
|
|
5128
5267
|
"filePath": "merging.main.runtime.ts",
|
|
5129
|
-
"line":
|
|
5268
|
+
"line": 84,
|
|
5130
5269
|
"character": 1
|
|
5131
5270
|
},
|
|
5132
5271
|
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
@@ -5135,7 +5274,7 @@
|
|
|
5135
5274
|
"__schema": "TypeLiteralSchema",
|
|
5136
5275
|
"location": {
|
|
5137
5276
|
"filePath": "merging.main.runtime.ts",
|
|
5138
|
-
"line":
|
|
5277
|
+
"line": 84,
|
|
5139
5278
|
"character": 27
|
|
5140
5279
|
},
|
|
5141
5280
|
"members": [
|
|
@@ -5143,14 +5282,14 @@
|
|
|
5143
5282
|
"__schema": "IndexSignatureSchema",
|
|
5144
5283
|
"location": {
|
|
5145
5284
|
"filePath": "merging.main.runtime.ts",
|
|
5146
|
-
"line":
|
|
5285
|
+
"line": 84,
|
|
5147
5286
|
"character": 29
|
|
5148
5287
|
},
|
|
5149
5288
|
"keyType": {
|
|
5150
5289
|
"__schema": "ParameterSchema",
|
|
5151
5290
|
"location": {
|
|
5152
5291
|
"filePath": "merging.main.runtime.ts",
|
|
5153
|
-
"line":
|
|
5292
|
+
"line": 84,
|
|
5154
5293
|
"character": 30
|
|
5155
5294
|
},
|
|
5156
5295
|
"name": "fileName",
|
|
@@ -5158,7 +5297,7 @@
|
|
|
5158
5297
|
"__schema": "KeywordTypeSchema",
|
|
5159
5298
|
"location": {
|
|
5160
5299
|
"filePath": "merging.main.runtime.ts",
|
|
5161
|
-
"line":
|
|
5300
|
+
"line": 84,
|
|
5162
5301
|
"character": 40
|
|
5163
5302
|
},
|
|
5164
5303
|
"name": "string"
|
|
@@ -5170,7 +5309,7 @@
|
|
|
5170
5309
|
"__schema": "TypeOperatorSchema",
|
|
5171
5310
|
"location": {
|
|
5172
5311
|
"filePath": "merging.main.runtime.ts",
|
|
5173
|
-
"line":
|
|
5312
|
+
"line": 84,
|
|
5174
5313
|
"character": 49
|
|
5175
5314
|
},
|
|
5176
5315
|
"name": "keyof",
|
|
@@ -5178,7 +5317,7 @@
|
|
|
5178
5317
|
"__schema": "TypeQuerySchema",
|
|
5179
5318
|
"location": {
|
|
5180
5319
|
"filePath": "merging.main.runtime.ts",
|
|
5181
|
-
"line":
|
|
5320
|
+
"line": 84,
|
|
5182
5321
|
"character": 55
|
|
5183
5322
|
},
|
|
5184
5323
|
"signature": "(alias) const FileStatus: {\n merged: string;\n manual: string;\n binaryConflict: string;\n updated: string;\n added: string;\n removed: string;\n overridden: string;\n unchanged: string;\n remainDeleted: string;\n deletedConflict: string;\n}\nimport FileStatus",
|
|
@@ -5186,7 +5325,7 @@
|
|
|
5186
5325
|
"__schema": "TypeRefSchema",
|
|
5187
5326
|
"location": {
|
|
5188
5327
|
"filePath": "merging.main.runtime.ts",
|
|
5189
|
-
"line":
|
|
5328
|
+
"line": 84,
|
|
5190
5329
|
"character": 62
|
|
5191
5330
|
},
|
|
5192
5331
|
"name": "FileStatus",
|
|
@@ -5202,7 +5341,7 @@
|
|
|
5202
5341
|
"__schema": "TypeSchema",
|
|
5203
5342
|
"location": {
|
|
5204
5343
|
"filePath": "merging.main.runtime.ts",
|
|
5205
|
-
"line":
|
|
5344
|
+
"line": 86,
|
|
5206
5345
|
"character": 1
|
|
5207
5346
|
},
|
|
5208
5347
|
"signature": "type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList | undefined;\n exportedIds?: ComponentID[] | undefined;\n} | null",
|
|
@@ -5211,7 +5350,7 @@
|
|
|
5211
5350
|
"__schema": "TypeUnionSchema",
|
|
5212
5351
|
"location": {
|
|
5213
5352
|
"filePath": "merging.main.runtime.ts",
|
|
5214
|
-
"line":
|
|
5353
|
+
"line": 86,
|
|
5215
5354
|
"character": 32
|
|
5216
5355
|
},
|
|
5217
5356
|
"types": [
|
|
@@ -5219,7 +5358,7 @@
|
|
|
5219
5358
|
"__schema": "TypeLiteralSchema",
|
|
5220
5359
|
"location": {
|
|
5221
5360
|
"filePath": "merging.main.runtime.ts",
|
|
5222
|
-
"line":
|
|
5361
|
+
"line": 86,
|
|
5223
5362
|
"character": 32
|
|
5224
5363
|
},
|
|
5225
5364
|
"members": [
|
|
@@ -5227,7 +5366,7 @@
|
|
|
5227
5366
|
"__schema": "VariableLikeSchema",
|
|
5228
5367
|
"location": {
|
|
5229
5368
|
"filePath": "merging.main.runtime.ts",
|
|
5230
|
-
"line":
|
|
5369
|
+
"line": 87,
|
|
5231
5370
|
"character": 3
|
|
5232
5371
|
},
|
|
5233
5372
|
"signature": "(property) snappedComponents: ConsumerComponent[]",
|
|
@@ -5236,14 +5375,14 @@
|
|
|
5236
5375
|
"__schema": "TypeArraySchema",
|
|
5237
5376
|
"location": {
|
|
5238
5377
|
"filePath": "merging.main.runtime.ts",
|
|
5239
|
-
"line":
|
|
5378
|
+
"line": 87,
|
|
5240
5379
|
"character": 22
|
|
5241
5380
|
},
|
|
5242
5381
|
"type": {
|
|
5243
5382
|
"__schema": "TypeRefSchema",
|
|
5244
5383
|
"location": {
|
|
5245
5384
|
"filePath": "merging.main.runtime.ts",
|
|
5246
|
-
"line":
|
|
5385
|
+
"line": 87,
|
|
5247
5386
|
"character": 22
|
|
5248
5387
|
},
|
|
5249
5388
|
"name": "ConsumerComponent",
|
|
@@ -5256,7 +5395,7 @@
|
|
|
5256
5395
|
"__schema": "VariableLikeSchema",
|
|
5257
5396
|
"location": {
|
|
5258
5397
|
"filePath": "merging.main.runtime.ts",
|
|
5259
|
-
"line":
|
|
5398
|
+
"line": 88,
|
|
5260
5399
|
"character": 3
|
|
5261
5400
|
},
|
|
5262
5401
|
"signature": "(property) autoSnappedResults: AutoTagResult[]",
|
|
@@ -5265,14 +5404,14 @@
|
|
|
5265
5404
|
"__schema": "TypeArraySchema",
|
|
5266
5405
|
"location": {
|
|
5267
5406
|
"filePath": "merging.main.runtime.ts",
|
|
5268
|
-
"line":
|
|
5407
|
+
"line": 88,
|
|
5269
5408
|
"character": 23
|
|
5270
5409
|
},
|
|
5271
5410
|
"type": {
|
|
5272
5411
|
"__schema": "TypeRefSchema",
|
|
5273
5412
|
"location": {
|
|
5274
5413
|
"filePath": "merging.main.runtime.ts",
|
|
5275
|
-
"line":
|
|
5414
|
+
"line": 88,
|
|
5276
5415
|
"character": 23
|
|
5277
5416
|
},
|
|
5278
5417
|
"name": "AutoTagResult",
|
|
@@ -5285,7 +5424,7 @@
|
|
|
5285
5424
|
"__schema": "VariableLikeSchema",
|
|
5286
5425
|
"location": {
|
|
5287
5426
|
"filePath": "merging.main.runtime.ts",
|
|
5288
|
-
"line":
|
|
5427
|
+
"line": 89,
|
|
5289
5428
|
"character": 3
|
|
5290
5429
|
},
|
|
5291
5430
|
"signature": "(property) removedComponents?: ComponentIdList | undefined",
|
|
@@ -5294,7 +5433,7 @@
|
|
|
5294
5433
|
"__schema": "TypeRefSchema",
|
|
5295
5434
|
"location": {
|
|
5296
5435
|
"filePath": "merging.main.runtime.ts",
|
|
5297
|
-
"line":
|
|
5436
|
+
"line": 89,
|
|
5298
5437
|
"character": 23
|
|
5299
5438
|
},
|
|
5300
5439
|
"name": "ComponentIdList",
|
|
@@ -5310,7 +5449,7 @@
|
|
|
5310
5449
|
"__schema": "VariableLikeSchema",
|
|
5311
5450
|
"location": {
|
|
5312
5451
|
"filePath": "merging.main.runtime.ts",
|
|
5313
|
-
"line":
|
|
5452
|
+
"line": 90,
|
|
5314
5453
|
"character": 3
|
|
5315
5454
|
},
|
|
5316
5455
|
"signature": "(property) exportedIds?: ComponentID[] | undefined",
|
|
@@ -5319,14 +5458,14 @@
|
|
|
5319
5458
|
"__schema": "TypeArraySchema",
|
|
5320
5459
|
"location": {
|
|
5321
5460
|
"filePath": "merging.main.runtime.ts",
|
|
5322
|
-
"line":
|
|
5461
|
+
"line": 90,
|
|
5323
5462
|
"character": 17
|
|
5324
5463
|
},
|
|
5325
5464
|
"type": {
|
|
5326
5465
|
"__schema": "TypeRefSchema",
|
|
5327
5466
|
"location": {
|
|
5328
5467
|
"filePath": "merging.main.runtime.ts",
|
|
5329
|
-
"line":
|
|
5468
|
+
"line": 90,
|
|
5330
5469
|
"character": 17
|
|
5331
5470
|
},
|
|
5332
5471
|
"name": "ComponentID",
|
|
@@ -5345,7 +5484,7 @@
|
|
|
5345
5484
|
"__schema": "LiteralTypeSchema",
|
|
5346
5485
|
"location": {
|
|
5347
5486
|
"filePath": "merging.main.runtime.ts",
|
|
5348
|
-
"line":
|
|
5487
|
+
"line": 91,
|
|
5349
5488
|
"character": 5
|
|
5350
5489
|
},
|
|
5351
5490
|
"name": "null"
|
|
@@ -5357,7 +5496,7 @@
|
|
|
5357
5496
|
"__schema": "TypeSchema",
|
|
5358
5497
|
"location": {
|
|
5359
5498
|
"filePath": "merging.main.runtime.ts",
|
|
5360
|
-
"line":
|
|
5499
|
+
"line": 93,
|
|
5361
5500
|
"character": 1
|
|
5362
5501
|
},
|
|
5363
5502
|
"signature": "type ApplyVersionResult = {\n id: ComponentID;\n filesStatus: FilesStatus;\n}",
|
|
@@ -5366,7 +5505,7 @@
|
|
|
5366
5505
|
"__schema": "TypeLiteralSchema",
|
|
5367
5506
|
"location": {
|
|
5368
5507
|
"filePath": "merging.main.runtime.ts",
|
|
5369
|
-
"line":
|
|
5508
|
+
"line": 93,
|
|
5370
5509
|
"character": 34
|
|
5371
5510
|
},
|
|
5372
5511
|
"members": [
|
|
@@ -5374,7 +5513,7 @@
|
|
|
5374
5513
|
"__schema": "VariableLikeSchema",
|
|
5375
5514
|
"location": {
|
|
5376
5515
|
"filePath": "merging.main.runtime.ts",
|
|
5377
|
-
"line":
|
|
5516
|
+
"line": 93,
|
|
5378
5517
|
"character": 36
|
|
5379
5518
|
},
|
|
5380
5519
|
"signature": "(property) id: ComponentID",
|
|
@@ -5383,7 +5522,7 @@
|
|
|
5383
5522
|
"__schema": "TypeRefSchema",
|
|
5384
5523
|
"location": {
|
|
5385
5524
|
"filePath": "merging.main.runtime.ts",
|
|
5386
|
-
"line":
|
|
5525
|
+
"line": 93,
|
|
5387
5526
|
"character": 36
|
|
5388
5527
|
},
|
|
5389
5528
|
"name": "ComponentID",
|
|
@@ -5399,7 +5538,7 @@
|
|
|
5399
5538
|
"__schema": "VariableLikeSchema",
|
|
5400
5539
|
"location": {
|
|
5401
5540
|
"filePath": "merging.main.runtime.ts",
|
|
5402
|
-
"line":
|
|
5541
|
+
"line": 93,
|
|
5403
5542
|
"character": 53
|
|
5404
5543
|
},
|
|
5405
5544
|
"signature": "(property) filesStatus: FilesStatus",
|
|
@@ -5408,7 +5547,7 @@
|
|
|
5408
5547
|
"__schema": "TypeRefSchema",
|
|
5409
5548
|
"location": {
|
|
5410
5549
|
"filePath": "merging.main.runtime.ts",
|
|
5411
|
-
"line":
|
|
5550
|
+
"line": 93,
|
|
5412
5551
|
"character": 53
|
|
5413
5552
|
},
|
|
5414
5553
|
"name": "FilesStatus"
|
|
@@ -5422,7 +5561,7 @@
|
|
|
5422
5561
|
"__schema": "TypeSchema",
|
|
5423
5562
|
"location": {
|
|
5424
5563
|
"filePath": "merging.main.runtime.ts",
|
|
5425
|
-
"line":
|
|
5564
|
+
"line": 95,
|
|
5426
5565
|
"character": 1
|
|
5427
5566
|
},
|
|
5428
5567
|
"signature": "type ApplyVersionResults = {\n components?: ApplyVersionResult[] | undefined;\n version?: string | undefined;\n failedComponents?: FailedComponents[] | undefined;\n removedComponents?: ComponentID[] | undefined;\n ... 11 more ...;\n workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined;\n}",
|
|
@@ -5431,7 +5570,7 @@
|
|
|
5431
5570
|
"__schema": "TypeLiteralSchema",
|
|
5432
5571
|
"location": {
|
|
5433
5572
|
"filePath": "merging.main.runtime.ts",
|
|
5434
|
-
"line":
|
|
5573
|
+
"line": 95,
|
|
5435
5574
|
"character": 35
|
|
5436
5575
|
},
|
|
5437
5576
|
"members": [
|
|
@@ -5439,7 +5578,7 @@
|
|
|
5439
5578
|
"__schema": "VariableLikeSchema",
|
|
5440
5579
|
"location": {
|
|
5441
5580
|
"filePath": "merging.main.runtime.ts",
|
|
5442
|
-
"line":
|
|
5581
|
+
"line": 96,
|
|
5443
5582
|
"character": 3
|
|
5444
5583
|
},
|
|
5445
5584
|
"signature": "(property) components?: ApplyVersionResult[] | undefined",
|
|
@@ -5448,14 +5587,14 @@
|
|
|
5448
5587
|
"__schema": "TypeArraySchema",
|
|
5449
5588
|
"location": {
|
|
5450
5589
|
"filePath": "merging.main.runtime.ts",
|
|
5451
|
-
"line":
|
|
5590
|
+
"line": 96,
|
|
5452
5591
|
"character": 16
|
|
5453
5592
|
},
|
|
5454
5593
|
"type": {
|
|
5455
5594
|
"__schema": "TypeRefSchema",
|
|
5456
5595
|
"location": {
|
|
5457
5596
|
"filePath": "merging.main.runtime.ts",
|
|
5458
|
-
"line":
|
|
5597
|
+
"line": 96,
|
|
5459
5598
|
"character": 16
|
|
5460
5599
|
},
|
|
5461
5600
|
"name": "ApplyVersionResult"
|
|
@@ -5467,7 +5606,7 @@
|
|
|
5467
5606
|
"__schema": "VariableLikeSchema",
|
|
5468
5607
|
"location": {
|
|
5469
5608
|
"filePath": "merging.main.runtime.ts",
|
|
5470
|
-
"line":
|
|
5609
|
+
"line": 97,
|
|
5471
5610
|
"character": 3
|
|
5472
5611
|
},
|
|
5473
5612
|
"signature": "(property) version?: string | undefined",
|
|
@@ -5476,7 +5615,7 @@
|
|
|
5476
5615
|
"__schema": "KeywordTypeSchema",
|
|
5477
5616
|
"location": {
|
|
5478
5617
|
"filePath": "merging.main.runtime.ts",
|
|
5479
|
-
"line":
|
|
5618
|
+
"line": 97,
|
|
5480
5619
|
"character": 13
|
|
5481
5620
|
},
|
|
5482
5621
|
"name": "string"
|
|
@@ -5487,7 +5626,7 @@
|
|
|
5487
5626
|
"__schema": "VariableLikeSchema",
|
|
5488
5627
|
"location": {
|
|
5489
5628
|
"filePath": "merging.main.runtime.ts",
|
|
5490
|
-
"line":
|
|
5629
|
+
"line": 98,
|
|
5491
5630
|
"character": 3
|
|
5492
5631
|
},
|
|
5493
5632
|
"signature": "(property) failedComponents?: FailedComponents[] | undefined",
|
|
@@ -5496,14 +5635,14 @@
|
|
|
5496
5635
|
"__schema": "TypeArraySchema",
|
|
5497
5636
|
"location": {
|
|
5498
5637
|
"filePath": "merging.main.runtime.ts",
|
|
5499
|
-
"line":
|
|
5638
|
+
"line": 98,
|
|
5500
5639
|
"character": 22
|
|
5501
5640
|
},
|
|
5502
5641
|
"type": {
|
|
5503
5642
|
"__schema": "TypeRefSchema",
|
|
5504
5643
|
"location": {
|
|
5505
5644
|
"filePath": "merging.main.runtime.ts",
|
|
5506
|
-
"line":
|
|
5645
|
+
"line": 98,
|
|
5507
5646
|
"character": 22
|
|
5508
5647
|
},
|
|
5509
5648
|
"name": "FailedComponents"
|
|
@@ -5515,7 +5654,7 @@
|
|
|
5515
5654
|
"__schema": "VariableLikeSchema",
|
|
5516
5655
|
"location": {
|
|
5517
5656
|
"filePath": "merging.main.runtime.ts",
|
|
5518
|
-
"line":
|
|
5657
|
+
"line": 99,
|
|
5519
5658
|
"character": 3
|
|
5520
5659
|
},
|
|
5521
5660
|
"signature": "(property) removedComponents?: ComponentID[] | undefined",
|
|
@@ -5524,14 +5663,14 @@
|
|
|
5524
5663
|
"__schema": "TypeArraySchema",
|
|
5525
5664
|
"location": {
|
|
5526
5665
|
"filePath": "merging.main.runtime.ts",
|
|
5527
|
-
"line":
|
|
5666
|
+
"line": 99,
|
|
5528
5667
|
"character": 23
|
|
5529
5668
|
},
|
|
5530
5669
|
"type": {
|
|
5531
5670
|
"__schema": "TypeRefSchema",
|
|
5532
5671
|
"location": {
|
|
5533
5672
|
"filePath": "merging.main.runtime.ts",
|
|
5534
|
-
"line":
|
|
5673
|
+
"line": 99,
|
|
5535
5674
|
"character": 23
|
|
5536
5675
|
},
|
|
5537
5676
|
"name": "ComponentID",
|
|
@@ -5548,7 +5687,7 @@
|
|
|
5548
5687
|
"__schema": "VariableLikeSchema",
|
|
5549
5688
|
"location": {
|
|
5550
5689
|
"filePath": "merging.main.runtime.ts",
|
|
5551
|
-
"line":
|
|
5690
|
+
"line": 100,
|
|
5552
5691
|
"character": 3
|
|
5553
5692
|
},
|
|
5554
5693
|
"signature": "(property) addedComponents?: ComponentID[] | undefined",
|
|
@@ -5557,14 +5696,14 @@
|
|
|
5557
5696
|
"__schema": "TypeArraySchema",
|
|
5558
5697
|
"location": {
|
|
5559
5698
|
"filePath": "merging.main.runtime.ts",
|
|
5560
|
-
"line":
|
|
5699
|
+
"line": 100,
|
|
5561
5700
|
"character": 21
|
|
5562
5701
|
},
|
|
5563
5702
|
"type": {
|
|
5564
5703
|
"__schema": "TypeRefSchema",
|
|
5565
5704
|
"location": {
|
|
5566
5705
|
"filePath": "merging.main.runtime.ts",
|
|
5567
|
-
"line":
|
|
5706
|
+
"line": 100,
|
|
5568
5707
|
"character": 21
|
|
5569
5708
|
},
|
|
5570
5709
|
"name": "ComponentID",
|
|
@@ -5581,7 +5720,7 @@
|
|
|
5581
5720
|
"__schema": "VariableLikeSchema",
|
|
5582
5721
|
"location": {
|
|
5583
5722
|
"filePath": "merging.main.runtime.ts",
|
|
5584
|
-
"line":
|
|
5723
|
+
"line": 101,
|
|
5585
5724
|
"character": 3
|
|
5586
5725
|
},
|
|
5587
5726
|
"signature": "(property) resolvedComponents?: ConsumerComponent[] | undefined",
|
|
@@ -5590,14 +5729,14 @@
|
|
|
5590
5729
|
"__schema": "TypeArraySchema",
|
|
5591
5730
|
"location": {
|
|
5592
5731
|
"filePath": "merging.main.runtime.ts",
|
|
5593
|
-
"line":
|
|
5732
|
+
"line": 101,
|
|
5594
5733
|
"character": 24
|
|
5595
5734
|
},
|
|
5596
5735
|
"type": {
|
|
5597
5736
|
"__schema": "TypeRefSchema",
|
|
5598
5737
|
"location": {
|
|
5599
5738
|
"filePath": "merging.main.runtime.ts",
|
|
5600
|
-
"line":
|
|
5739
|
+
"line": 101,
|
|
5601
5740
|
"character": 24
|
|
5602
5741
|
},
|
|
5603
5742
|
"name": "ConsumerComponent",
|
|
@@ -5610,7 +5749,7 @@
|
|
|
5610
5749
|
"__schema": "VariableLikeSchema",
|
|
5611
5750
|
"location": {
|
|
5612
5751
|
"filePath": "merging.main.runtime.ts",
|
|
5613
|
-
"line":
|
|
5752
|
+
"line": 102,
|
|
5614
5753
|
"character": 3
|
|
5615
5754
|
},
|
|
5616
5755
|
"signature": "(property) abortedComponents?: ApplyVersionResult[] | undefined",
|
|
@@ -5619,14 +5758,14 @@
|
|
|
5619
5758
|
"__schema": "TypeArraySchema",
|
|
5620
5759
|
"location": {
|
|
5621
5760
|
"filePath": "merging.main.runtime.ts",
|
|
5622
|
-
"line":
|
|
5761
|
+
"line": 102,
|
|
5623
5762
|
"character": 23
|
|
5624
5763
|
},
|
|
5625
5764
|
"type": {
|
|
5626
5765
|
"__schema": "TypeRefSchema",
|
|
5627
5766
|
"location": {
|
|
5628
5767
|
"filePath": "merging.main.runtime.ts",
|
|
5629
|
-
"line":
|
|
5768
|
+
"line": 102,
|
|
5630
5769
|
"character": 23
|
|
5631
5770
|
},
|
|
5632
5771
|
"name": "ApplyVersionResult"
|
|
@@ -5638,7 +5777,7 @@
|
|
|
5638
5777
|
"__schema": "VariableLikeSchema",
|
|
5639
5778
|
"location": {
|
|
5640
5779
|
"filePath": "merging.main.runtime.ts",
|
|
5641
|
-
"line":
|
|
5780
|
+
"line": 103,
|
|
5642
5781
|
"character": 3
|
|
5643
5782
|
},
|
|
5644
5783
|
"signature": "(property) mergeSnapResults?: MergeSnapResults | undefined",
|
|
@@ -5647,7 +5786,7 @@
|
|
|
5647
5786
|
"__schema": "TypeRefSchema",
|
|
5648
5787
|
"location": {
|
|
5649
5788
|
"filePath": "merging.main.runtime.ts",
|
|
5650
|
-
"line":
|
|
5789
|
+
"line": 103,
|
|
5651
5790
|
"character": 22
|
|
5652
5791
|
},
|
|
5653
5792
|
"name": "MergeSnapResults",
|
|
@@ -5659,7 +5798,7 @@
|
|
|
5659
5798
|
"__schema": "VariableLikeSchema",
|
|
5660
5799
|
"location": {
|
|
5661
5800
|
"filePath": "merging.main.runtime.ts",
|
|
5662
|
-
"line":
|
|
5801
|
+
"line": 104,
|
|
5663
5802
|
"character": 3
|
|
5664
5803
|
},
|
|
5665
5804
|
"signature": "(property) mergeSnapError?: Error | undefined",
|
|
@@ -5668,7 +5807,7 @@
|
|
|
5668
5807
|
"__schema": "TypeRefSchema",
|
|
5669
5808
|
"location": {
|
|
5670
5809
|
"filePath": "merging.main.runtime.ts",
|
|
5671
|
-
"line":
|
|
5810
|
+
"line": 104,
|
|
5672
5811
|
"character": 20
|
|
5673
5812
|
},
|
|
5674
5813
|
"name": "Error"
|
|
@@ -5679,7 +5818,7 @@
|
|
|
5679
5818
|
"__schema": "VariableLikeSchema",
|
|
5680
5819
|
"location": {
|
|
5681
5820
|
"filePath": "merging.main.runtime.ts",
|
|
5682
|
-
"line":
|
|
5821
|
+
"line": 105,
|
|
5683
5822
|
"character": 3
|
|
5684
5823
|
},
|
|
5685
5824
|
"signature": "(property) leftUnresolvedConflicts?: boolean | undefined",
|
|
@@ -5688,7 +5827,7 @@
|
|
|
5688
5827
|
"__schema": "KeywordTypeSchema",
|
|
5689
5828
|
"location": {
|
|
5690
5829
|
"filePath": "merging.main.runtime.ts",
|
|
5691
|
-
"line":
|
|
5830
|
+
"line": 105,
|
|
5692
5831
|
"character": 29
|
|
5693
5832
|
},
|
|
5694
5833
|
"name": "boolean"
|
|
@@ -5699,7 +5838,7 @@
|
|
|
5699
5838
|
"__schema": "VariableLikeSchema",
|
|
5700
5839
|
"location": {
|
|
5701
5840
|
"filePath": "merging.main.runtime.ts",
|
|
5702
|
-
"line":
|
|
5841
|
+
"line": 106,
|
|
5703
5842
|
"character": 3
|
|
5704
5843
|
},
|
|
5705
5844
|
"signature": "(property) verbose?: boolean | undefined",
|
|
@@ -5708,7 +5847,7 @@
|
|
|
5708
5847
|
"__schema": "KeywordTypeSchema",
|
|
5709
5848
|
"location": {
|
|
5710
5849
|
"filePath": "merging.main.runtime.ts",
|
|
5711
|
-
"line":
|
|
5850
|
+
"line": 106,
|
|
5712
5851
|
"character": 13
|
|
5713
5852
|
},
|
|
5714
5853
|
"name": "boolean"
|
|
@@ -5719,7 +5858,7 @@
|
|
|
5719
5858
|
"__schema": "VariableLikeSchema",
|
|
5720
5859
|
"location": {
|
|
5721
5860
|
"filePath": "merging.main.runtime.ts",
|
|
5722
|
-
"line":
|
|
5861
|
+
"line": 107,
|
|
5723
5862
|
"character": 3
|
|
5724
5863
|
},
|
|
5725
5864
|
"signature": "(property) newFromLane?: string[] | undefined",
|
|
@@ -5728,14 +5867,14 @@
|
|
|
5728
5867
|
"__schema": "TypeArraySchema",
|
|
5729
5868
|
"location": {
|
|
5730
5869
|
"filePath": "merging.main.runtime.ts",
|
|
5731
|
-
"line":
|
|
5870
|
+
"line": 107,
|
|
5732
5871
|
"character": 17
|
|
5733
5872
|
},
|
|
5734
5873
|
"type": {
|
|
5735
5874
|
"__schema": "KeywordTypeSchema",
|
|
5736
5875
|
"location": {
|
|
5737
5876
|
"filePath": "merging.main.runtime.ts",
|
|
5738
|
-
"line":
|
|
5877
|
+
"line": 107,
|
|
5739
5878
|
"character": 17
|
|
5740
5879
|
},
|
|
5741
5880
|
"name": "string"
|
|
@@ -5747,7 +5886,7 @@
|
|
|
5747
5886
|
"__schema": "VariableLikeSchema",
|
|
5748
5887
|
"location": {
|
|
5749
5888
|
"filePath": "merging.main.runtime.ts",
|
|
5750
|
-
"line":
|
|
5889
|
+
"line": 108,
|
|
5751
5890
|
"character": 3
|
|
5752
5891
|
},
|
|
5753
5892
|
"signature": "(property) newFromLaneAdded?: boolean | undefined",
|
|
@@ -5756,7 +5895,7 @@
|
|
|
5756
5895
|
"__schema": "KeywordTypeSchema",
|
|
5757
5896
|
"location": {
|
|
5758
5897
|
"filePath": "merging.main.runtime.ts",
|
|
5759
|
-
"line":
|
|
5898
|
+
"line": 108,
|
|
5760
5899
|
"character": 22
|
|
5761
5900
|
},
|
|
5762
5901
|
"name": "boolean"
|
|
@@ -5767,7 +5906,7 @@
|
|
|
5767
5906
|
"__schema": "VariableLikeSchema",
|
|
5768
5907
|
"location": {
|
|
5769
5908
|
"filePath": "merging.main.runtime.ts",
|
|
5770
|
-
"line":
|
|
5909
|
+
"line": 109,
|
|
5771
5910
|
"character": 3
|
|
5772
5911
|
},
|
|
5773
5912
|
"signature": "(property) installationError?: Error | undefined",
|
|
@@ -5776,7 +5915,7 @@
|
|
|
5776
5915
|
"__schema": "TypeRefSchema",
|
|
5777
5916
|
"location": {
|
|
5778
5917
|
"filePath": "merging.main.runtime.ts",
|
|
5779
|
-
"line":
|
|
5918
|
+
"line": 109,
|
|
5780
5919
|
"character": 23
|
|
5781
5920
|
},
|
|
5782
5921
|
"name": "Error"
|
|
@@ -5787,7 +5926,7 @@
|
|
|
5787
5926
|
"__schema": "VariableLikeSchema",
|
|
5788
5927
|
"location": {
|
|
5789
5928
|
"filePath": "merging.main.runtime.ts",
|
|
5790
|
-
"line":
|
|
5929
|
+
"line": 110,
|
|
5791
5930
|
"character": 3
|
|
5792
5931
|
},
|
|
5793
5932
|
"signature": "(property) compilationError?: Error | undefined",
|
|
@@ -5796,7 +5935,7 @@
|
|
|
5796
5935
|
"__schema": "TypeRefSchema",
|
|
5797
5936
|
"location": {
|
|
5798
5937
|
"filePath": "merging.main.runtime.ts",
|
|
5799
|
-
"line":
|
|
5938
|
+
"line": 110,
|
|
5800
5939
|
"character": 22
|
|
5801
5940
|
},
|
|
5802
5941
|
"name": "Error"
|
|
@@ -5807,7 +5946,7 @@
|
|
|
5807
5946
|
"__schema": "VariableLikeSchema",
|
|
5808
5947
|
"location": {
|
|
5809
5948
|
"filePath": "merging.main.runtime.ts",
|
|
5810
|
-
"line":
|
|
5949
|
+
"line": 111,
|
|
5811
5950
|
"character": 3
|
|
5812
5951
|
},
|
|
5813
5952
|
"signature": "(property) workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined",
|
|
@@ -5816,7 +5955,7 @@
|
|
|
5816
5955
|
"__schema": "TypeRefSchema",
|
|
5817
5956
|
"location": {
|
|
5818
5957
|
"filePath": "merging.main.runtime.ts",
|
|
5819
|
-
"line":
|
|
5958
|
+
"line": 111,
|
|
5820
5959
|
"character": 33
|
|
5821
5960
|
},
|
|
5822
5961
|
"name": "WorkspaceConfigUpdateResult",
|
|
@@ -5834,7 +5973,7 @@
|
|
|
5834
5973
|
"__schema": "ClassSchema",
|
|
5835
5974
|
"location": {
|
|
5836
5975
|
"filePath": "merging.main.runtime.ts",
|
|
5837
|
-
"line":
|
|
5976
|
+
"line": 114,
|
|
5838
5977
|
"character": 1
|
|
5839
5978
|
},
|
|
5840
5979
|
"signature": "class MergingMain",
|
|
@@ -5844,17 +5983,17 @@
|
|
|
5844
5983
|
"__schema": "ConstructorSchema",
|
|
5845
5984
|
"location": {
|
|
5846
5985
|
"filePath": "merging.main.runtime.ts",
|
|
5847
|
-
"line":
|
|
5986
|
+
"line": 115,
|
|
5848
5987
|
"character": 3
|
|
5849
5988
|
},
|
|
5850
|
-
"signature": "constructor MergingMain(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain): MergingMain",
|
|
5989
|
+
"signature": "constructor MergingMain(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain, depResolver: DependencyResolverMain): MergingMain",
|
|
5851
5990
|
"name": "constructor",
|
|
5852
5991
|
"params": [
|
|
5853
5992
|
{
|
|
5854
5993
|
"__schema": "ParameterSchema",
|
|
5855
5994
|
"location": {
|
|
5856
5995
|
"filePath": "merging.main.runtime.ts",
|
|
5857
|
-
"line":
|
|
5996
|
+
"line": 116,
|
|
5858
5997
|
"character": 5
|
|
5859
5998
|
},
|
|
5860
5999
|
"name": "workspace",
|
|
@@ -5862,7 +6001,7 @@
|
|
|
5862
6001
|
"__schema": "TypeRefSchema",
|
|
5863
6002
|
"location": {
|
|
5864
6003
|
"filePath": "merging.main.runtime.ts",
|
|
5865
|
-
"line":
|
|
6004
|
+
"line": 116,
|
|
5866
6005
|
"character": 24
|
|
5867
6006
|
},
|
|
5868
6007
|
"name": "Workspace",
|
|
@@ -5878,7 +6017,7 @@
|
|
|
5878
6017
|
"__schema": "ParameterSchema",
|
|
5879
6018
|
"location": {
|
|
5880
6019
|
"filePath": "merging.main.runtime.ts",
|
|
5881
|
-
"line":
|
|
6020
|
+
"line": 117,
|
|
5882
6021
|
"character": 5
|
|
5883
6022
|
},
|
|
5884
6023
|
"name": "scope",
|
|
@@ -5886,7 +6025,7 @@
|
|
|
5886
6025
|
"__schema": "TypeRefSchema",
|
|
5887
6026
|
"location": {
|
|
5888
6027
|
"filePath": "merging.main.runtime.ts",
|
|
5889
|
-
"line":
|
|
6028
|
+
"line": 117,
|
|
5890
6029
|
"character": 20
|
|
5891
6030
|
},
|
|
5892
6031
|
"name": "ScopeMain",
|
|
@@ -5902,7 +6041,7 @@
|
|
|
5902
6041
|
"__schema": "ParameterSchema",
|
|
5903
6042
|
"location": {
|
|
5904
6043
|
"filePath": "merging.main.runtime.ts",
|
|
5905
|
-
"line":
|
|
6044
|
+
"line": 118,
|
|
5906
6045
|
"character": 5
|
|
5907
6046
|
},
|
|
5908
6047
|
"name": "install",
|
|
@@ -5910,7 +6049,7 @@
|
|
|
5910
6049
|
"__schema": "TypeRefSchema",
|
|
5911
6050
|
"location": {
|
|
5912
6051
|
"filePath": "merging.main.runtime.ts",
|
|
5913
|
-
"line":
|
|
6052
|
+
"line": 118,
|
|
5914
6053
|
"character": 22
|
|
5915
6054
|
},
|
|
5916
6055
|
"name": "InstallMain",
|
|
@@ -5926,7 +6065,7 @@
|
|
|
5926
6065
|
"__schema": "ParameterSchema",
|
|
5927
6066
|
"location": {
|
|
5928
6067
|
"filePath": "merging.main.runtime.ts",
|
|
5929
|
-
"line":
|
|
6068
|
+
"line": 119,
|
|
5930
6069
|
"character": 5
|
|
5931
6070
|
},
|
|
5932
6071
|
"name": "snapping",
|
|
@@ -5934,7 +6073,7 @@
|
|
|
5934
6073
|
"__schema": "TypeRefSchema",
|
|
5935
6074
|
"location": {
|
|
5936
6075
|
"filePath": "merging.main.runtime.ts",
|
|
5937
|
-
"line":
|
|
6076
|
+
"line": 119,
|
|
5938
6077
|
"character": 23
|
|
5939
6078
|
},
|
|
5940
6079
|
"name": "SnappingMain",
|
|
@@ -5950,7 +6089,7 @@
|
|
|
5950
6089
|
"__schema": "ParameterSchema",
|
|
5951
6090
|
"location": {
|
|
5952
6091
|
"filePath": "merging.main.runtime.ts",
|
|
5953
|
-
"line":
|
|
6092
|
+
"line": 120,
|
|
5954
6093
|
"character": 5
|
|
5955
6094
|
},
|
|
5956
6095
|
"name": "checkout",
|
|
@@ -5958,7 +6097,7 @@
|
|
|
5958
6097
|
"__schema": "TypeRefSchema",
|
|
5959
6098
|
"location": {
|
|
5960
6099
|
"filePath": "merging.main.runtime.ts",
|
|
5961
|
-
"line":
|
|
6100
|
+
"line": 120,
|
|
5962
6101
|
"character": 23
|
|
5963
6102
|
},
|
|
5964
6103
|
"name": "CheckoutMain",
|
|
@@ -5974,7 +6113,7 @@
|
|
|
5974
6113
|
"__schema": "ParameterSchema",
|
|
5975
6114
|
"location": {
|
|
5976
6115
|
"filePath": "merging.main.runtime.ts",
|
|
5977
|
-
"line":
|
|
6116
|
+
"line": 121,
|
|
5978
6117
|
"character": 5
|
|
5979
6118
|
},
|
|
5980
6119
|
"name": "logger",
|
|
@@ -5982,7 +6121,7 @@
|
|
|
5982
6121
|
"__schema": "TypeRefSchema",
|
|
5983
6122
|
"location": {
|
|
5984
6123
|
"filePath": "merging.main.runtime.ts",
|
|
5985
|
-
"line":
|
|
6124
|
+
"line": 121,
|
|
5986
6125
|
"character": 21
|
|
5987
6126
|
},
|
|
5988
6127
|
"name": "Logger",
|
|
@@ -5998,7 +6137,7 @@
|
|
|
5998
6137
|
"__schema": "ParameterSchema",
|
|
5999
6138
|
"location": {
|
|
6000
6139
|
"filePath": "merging.main.runtime.ts",
|
|
6001
|
-
"line":
|
|
6140
|
+
"line": 122,
|
|
6002
6141
|
"character": 5
|
|
6003
6142
|
},
|
|
6004
6143
|
"name": "componentWriter",
|
|
@@ -6006,7 +6145,7 @@
|
|
|
6006
6145
|
"__schema": "TypeRefSchema",
|
|
6007
6146
|
"location": {
|
|
6008
6147
|
"filePath": "merging.main.runtime.ts",
|
|
6009
|
-
"line":
|
|
6148
|
+
"line": 122,
|
|
6010
6149
|
"character": 30
|
|
6011
6150
|
},
|
|
6012
6151
|
"name": "ComponentWriterMain",
|
|
@@ -6022,7 +6161,7 @@
|
|
|
6022
6161
|
"__schema": "ParameterSchema",
|
|
6023
6162
|
"location": {
|
|
6024
6163
|
"filePath": "merging.main.runtime.ts",
|
|
6025
|
-
"line":
|
|
6164
|
+
"line": 123,
|
|
6026
6165
|
"character": 5
|
|
6027
6166
|
},
|
|
6028
6167
|
"name": "importer",
|
|
@@ -6030,7 +6169,7 @@
|
|
|
6030
6169
|
"__schema": "TypeRefSchema",
|
|
6031
6170
|
"location": {
|
|
6032
6171
|
"filePath": "merging.main.runtime.ts",
|
|
6033
|
-
"line":
|
|
6172
|
+
"line": 123,
|
|
6034
6173
|
"character": 23
|
|
6035
6174
|
},
|
|
6036
6175
|
"name": "ImporterMain",
|
|
@@ -6046,7 +6185,7 @@
|
|
|
6046
6185
|
"__schema": "ParameterSchema",
|
|
6047
6186
|
"location": {
|
|
6048
6187
|
"filePath": "merging.main.runtime.ts",
|
|
6049
|
-
"line":
|
|
6188
|
+
"line": 124,
|
|
6050
6189
|
"character": 5
|
|
6051
6190
|
},
|
|
6052
6191
|
"name": "config",
|
|
@@ -6054,7 +6193,7 @@
|
|
|
6054
6193
|
"__schema": "TypeRefSchema",
|
|
6055
6194
|
"location": {
|
|
6056
6195
|
"filePath": "merging.main.runtime.ts",
|
|
6057
|
-
"line":
|
|
6196
|
+
"line": 124,
|
|
6058
6197
|
"character": 21
|
|
6059
6198
|
},
|
|
6060
6199
|
"name": "ConfigMain",
|
|
@@ -6070,7 +6209,7 @@
|
|
|
6070
6209
|
"__schema": "ParameterSchema",
|
|
6071
6210
|
"location": {
|
|
6072
6211
|
"filePath": "merging.main.runtime.ts",
|
|
6073
|
-
"line":
|
|
6212
|
+
"line": 125,
|
|
6074
6213
|
"character": 5
|
|
6075
6214
|
},
|
|
6076
6215
|
"name": "remove",
|
|
@@ -6078,7 +6217,7 @@
|
|
|
6078
6217
|
"__schema": "TypeRefSchema",
|
|
6079
6218
|
"location": {
|
|
6080
6219
|
"filePath": "merging.main.runtime.ts",
|
|
6081
|
-
"line":
|
|
6220
|
+
"line": 125,
|
|
6082
6221
|
"character": 21
|
|
6083
6222
|
},
|
|
6084
6223
|
"name": "RemoveMain",
|
|
@@ -6094,7 +6233,7 @@
|
|
|
6094
6233
|
"__schema": "ParameterSchema",
|
|
6095
6234
|
"location": {
|
|
6096
6235
|
"filePath": "merging.main.runtime.ts",
|
|
6097
|
-
"line":
|
|
6236
|
+
"line": 126,
|
|
6098
6237
|
"character": 5
|
|
6099
6238
|
},
|
|
6100
6239
|
"name": "configMerger",
|
|
@@ -6102,7 +6241,7 @@
|
|
|
6102
6241
|
"__schema": "TypeRefSchema",
|
|
6103
6242
|
"location": {
|
|
6104
6243
|
"filePath": "merging.main.runtime.ts",
|
|
6105
|
-
"line":
|
|
6244
|
+
"line": 126,
|
|
6106
6245
|
"character": 27
|
|
6107
6246
|
},
|
|
6108
6247
|
"name": "ConfigMergerMain",
|
|
@@ -6113,13 +6252,37 @@
|
|
|
6113
6252
|
},
|
|
6114
6253
|
"isOptional": false,
|
|
6115
6254
|
"isSpread": false
|
|
6255
|
+
},
|
|
6256
|
+
{
|
|
6257
|
+
"__schema": "ParameterSchema",
|
|
6258
|
+
"location": {
|
|
6259
|
+
"filePath": "merging.main.runtime.ts",
|
|
6260
|
+
"line": 127,
|
|
6261
|
+
"character": 5
|
|
6262
|
+
},
|
|
6263
|
+
"name": "depResolver",
|
|
6264
|
+
"type": {
|
|
6265
|
+
"__schema": "TypeRefSchema",
|
|
6266
|
+
"location": {
|
|
6267
|
+
"filePath": "merging.main.runtime.ts",
|
|
6268
|
+
"line": 127,
|
|
6269
|
+
"character": 26
|
|
6270
|
+
},
|
|
6271
|
+
"name": "DependencyResolverMain",
|
|
6272
|
+
"componentId": {
|
|
6273
|
+
"scope": "teambit.dependencies",
|
|
6274
|
+
"name": "dependency-resolver"
|
|
6275
|
+
}
|
|
6276
|
+
},
|
|
6277
|
+
"isOptional": false,
|
|
6278
|
+
"isSpread": false
|
|
6116
6279
|
}
|
|
6117
6280
|
],
|
|
6118
6281
|
"returnType": {
|
|
6119
6282
|
"__schema": "ThisTypeSchema",
|
|
6120
6283
|
"location": {
|
|
6121
6284
|
"filePath": "merging.main.runtime.ts",
|
|
6122
|
-
"line":
|
|
6285
|
+
"line": 114,
|
|
6123
6286
|
"character": 1
|
|
6124
6287
|
},
|
|
6125
6288
|
"name": "MergingMain"
|
|
@@ -6130,7 +6293,7 @@
|
|
|
6130
6293
|
"__schema": "FunctionLikeSchema",
|
|
6131
6294
|
"location": {
|
|
6132
6295
|
"filePath": "merging.main.runtime.ts",
|
|
6133
|
-
"line":
|
|
6296
|
+
"line": 130,
|
|
6134
6297
|
"character": 3
|
|
6135
6298
|
},
|
|
6136
6299
|
"signature": "(method) MergingMain.merge(ids: string[], mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>",
|
|
@@ -6140,7 +6303,7 @@
|
|
|
6140
6303
|
"__schema": "ParameterSchema",
|
|
6141
6304
|
"location": {
|
|
6142
6305
|
"filePath": "merging.main.runtime.ts",
|
|
6143
|
-
"line":
|
|
6306
|
+
"line": 131,
|
|
6144
6307
|
"character": 5
|
|
6145
6308
|
},
|
|
6146
6309
|
"name": "ids",
|
|
@@ -6148,14 +6311,14 @@
|
|
|
6148
6311
|
"__schema": "TypeArraySchema",
|
|
6149
6312
|
"location": {
|
|
6150
6313
|
"filePath": "merging.main.runtime.ts",
|
|
6151
|
-
"line":
|
|
6314
|
+
"line": 131,
|
|
6152
6315
|
"character": 10
|
|
6153
6316
|
},
|
|
6154
6317
|
"type": {
|
|
6155
6318
|
"__schema": "KeywordTypeSchema",
|
|
6156
6319
|
"location": {
|
|
6157
6320
|
"filePath": "merging.main.runtime.ts",
|
|
6158
|
-
"line":
|
|
6321
|
+
"line": 131,
|
|
6159
6322
|
"character": 10
|
|
6160
6323
|
},
|
|
6161
6324
|
"name": "string"
|
|
@@ -6168,7 +6331,7 @@
|
|
|
6168
6331
|
"__schema": "ParameterSchema",
|
|
6169
6332
|
"location": {
|
|
6170
6333
|
"filePath": "merging.main.runtime.ts",
|
|
6171
|
-
"line":
|
|
6334
|
+
"line": 132,
|
|
6172
6335
|
"character": 5
|
|
6173
6336
|
},
|
|
6174
6337
|
"name": "mergeStrategy",
|
|
@@ -6176,7 +6339,7 @@
|
|
|
6176
6339
|
"__schema": "TypeRefSchema",
|
|
6177
6340
|
"location": {
|
|
6178
6341
|
"filePath": "merging.main.runtime.ts",
|
|
6179
|
-
"line":
|
|
6342
|
+
"line": 132,
|
|
6180
6343
|
"character": 20
|
|
6181
6344
|
},
|
|
6182
6345
|
"name": "MergeStrategy",
|
|
@@ -6189,7 +6352,7 @@
|
|
|
6189
6352
|
"__schema": "ParameterSchema",
|
|
6190
6353
|
"location": {
|
|
6191
6354
|
"filePath": "merging.main.runtime.ts",
|
|
6192
|
-
"line":
|
|
6355
|
+
"line": 133,
|
|
6193
6356
|
"character": 5
|
|
6194
6357
|
},
|
|
6195
6358
|
"name": "abort",
|
|
@@ -6197,7 +6360,7 @@
|
|
|
6197
6360
|
"__schema": "KeywordTypeSchema",
|
|
6198
6361
|
"location": {
|
|
6199
6362
|
"filePath": "merging.main.runtime.ts",
|
|
6200
|
-
"line":
|
|
6363
|
+
"line": 133,
|
|
6201
6364
|
"character": 12
|
|
6202
6365
|
},
|
|
6203
6366
|
"name": "boolean"
|
|
@@ -6209,7 +6372,7 @@
|
|
|
6209
6372
|
"__schema": "ParameterSchema",
|
|
6210
6373
|
"location": {
|
|
6211
6374
|
"filePath": "merging.main.runtime.ts",
|
|
6212
|
-
"line":
|
|
6375
|
+
"line": 134,
|
|
6213
6376
|
"character": 5
|
|
6214
6377
|
},
|
|
6215
6378
|
"name": "resolve",
|
|
@@ -6217,7 +6380,7 @@
|
|
|
6217
6380
|
"__schema": "KeywordTypeSchema",
|
|
6218
6381
|
"location": {
|
|
6219
6382
|
"filePath": "merging.main.runtime.ts",
|
|
6220
|
-
"line":
|
|
6383
|
+
"line": 134,
|
|
6221
6384
|
"character": 14
|
|
6222
6385
|
},
|
|
6223
6386
|
"name": "boolean"
|
|
@@ -6229,7 +6392,7 @@
|
|
|
6229
6392
|
"__schema": "ParameterSchema",
|
|
6230
6393
|
"location": {
|
|
6231
6394
|
"filePath": "merging.main.runtime.ts",
|
|
6232
|
-
"line":
|
|
6395
|
+
"line": 135,
|
|
6233
6396
|
"character": 5
|
|
6234
6397
|
},
|
|
6235
6398
|
"name": "noSnap",
|
|
@@ -6237,7 +6400,7 @@
|
|
|
6237
6400
|
"__schema": "KeywordTypeSchema",
|
|
6238
6401
|
"location": {
|
|
6239
6402
|
"filePath": "merging.main.runtime.ts",
|
|
6240
|
-
"line":
|
|
6403
|
+
"line": 135,
|
|
6241
6404
|
"character": 13
|
|
6242
6405
|
},
|
|
6243
6406
|
"name": "boolean"
|
|
@@ -6249,7 +6412,7 @@
|
|
|
6249
6412
|
"__schema": "ParameterSchema",
|
|
6250
6413
|
"location": {
|
|
6251
6414
|
"filePath": "merging.main.runtime.ts",
|
|
6252
|
-
"line":
|
|
6415
|
+
"line": 136,
|
|
6253
6416
|
"character": 5
|
|
6254
6417
|
},
|
|
6255
6418
|
"name": "message",
|
|
@@ -6257,7 +6420,7 @@
|
|
|
6257
6420
|
"__schema": "KeywordTypeSchema",
|
|
6258
6421
|
"location": {
|
|
6259
6422
|
"filePath": "merging.main.runtime.ts",
|
|
6260
|
-
"line":
|
|
6423
|
+
"line": 136,
|
|
6261
6424
|
"character": 14
|
|
6262
6425
|
},
|
|
6263
6426
|
"name": "string"
|
|
@@ -6269,7 +6432,7 @@
|
|
|
6269
6432
|
"__schema": "ParameterSchema",
|
|
6270
6433
|
"location": {
|
|
6271
6434
|
"filePath": "merging.main.runtime.ts",
|
|
6272
|
-
"line":
|
|
6435
|
+
"line": 137,
|
|
6273
6436
|
"character": 5
|
|
6274
6437
|
},
|
|
6275
6438
|
"name": "build",
|
|
@@ -6277,7 +6440,7 @@
|
|
|
6277
6440
|
"__schema": "KeywordTypeSchema",
|
|
6278
6441
|
"location": {
|
|
6279
6442
|
"filePath": "merging.main.runtime.ts",
|
|
6280
|
-
"line":
|
|
6443
|
+
"line": 137,
|
|
6281
6444
|
"character": 12
|
|
6282
6445
|
},
|
|
6283
6446
|
"name": "boolean"
|
|
@@ -6289,7 +6452,7 @@
|
|
|
6289
6452
|
"__schema": "ParameterSchema",
|
|
6290
6453
|
"location": {
|
|
6291
6454
|
"filePath": "merging.main.runtime.ts",
|
|
6292
|
-
"line":
|
|
6455
|
+
"line": 138,
|
|
6293
6456
|
"character": 5
|
|
6294
6457
|
},
|
|
6295
6458
|
"name": "skipDependencyInstallation",
|
|
@@ -6297,7 +6460,7 @@
|
|
|
6297
6460
|
"__schema": "KeywordTypeSchema",
|
|
6298
6461
|
"location": {
|
|
6299
6462
|
"filePath": "merging.main.runtime.ts",
|
|
6300
|
-
"line":
|
|
6463
|
+
"line": 138,
|
|
6301
6464
|
"character": 33
|
|
6302
6465
|
},
|
|
6303
6466
|
"name": "boolean"
|
|
@@ -6310,7 +6473,7 @@
|
|
|
6310
6473
|
"__schema": "TypeRefSchema",
|
|
6311
6474
|
"location": {
|
|
6312
6475
|
"filePath": "merging.main.runtime.ts",
|
|
6313
|
-
"line":
|
|
6476
|
+
"line": 139,
|
|
6314
6477
|
"character": 6
|
|
6315
6478
|
},
|
|
6316
6479
|
"name": "Promise",
|
|
@@ -6319,7 +6482,7 @@
|
|
|
6319
6482
|
"__schema": "TypeRefSchema",
|
|
6320
6483
|
"location": {
|
|
6321
6484
|
"filePath": "merging.main.runtime.ts",
|
|
6322
|
-
"line":
|
|
6485
|
+
"line": 139,
|
|
6323
6486
|
"character": 14
|
|
6324
6487
|
},
|
|
6325
6488
|
"name": "ApplyVersionResults"
|
|
@@ -6334,14 +6497,14 @@
|
|
|
6334
6497
|
"__schema": "FunctionLikeSchema",
|
|
6335
6498
|
"location": {
|
|
6336
6499
|
"filePath": "merging.main.runtime.ts",
|
|
6337
|
-
"line":
|
|
6500
|
+
"line": 167,
|
|
6338
6501
|
"character": 3
|
|
6339
6502
|
},
|
|
6340
6503
|
"doc": {
|
|
6341
6504
|
"__schema": "DocSchema",
|
|
6342
6505
|
"location": {
|
|
6343
6506
|
"filePath": "merging.main.runtime.ts",
|
|
6344
|
-
"line":
|
|
6507
|
+
"line": 163,
|
|
6345
6508
|
"character": 3
|
|
6346
6509
|
},
|
|
6347
6510
|
"raw": "/**\n * when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n */",
|
|
@@ -6354,7 +6517,7 @@
|
|
|
6354
6517
|
"__schema": "ParameterSchema",
|
|
6355
6518
|
"location": {
|
|
6356
6519
|
"filePath": "merging.main.runtime.ts",
|
|
6357
|
-
"line":
|
|
6520
|
+
"line": 168,
|
|
6358
6521
|
"character": 5
|
|
6359
6522
|
},
|
|
6360
6523
|
"name": "consumer",
|
|
@@ -6362,7 +6525,7 @@
|
|
|
6362
6525
|
"__schema": "TypeRefSchema",
|
|
6363
6526
|
"location": {
|
|
6364
6527
|
"filePath": "merging.main.runtime.ts",
|
|
6365
|
-
"line":
|
|
6528
|
+
"line": 168,
|
|
6366
6529
|
"character": 15
|
|
6367
6530
|
},
|
|
6368
6531
|
"name": "Consumer",
|
|
@@ -6375,7 +6538,7 @@
|
|
|
6375
6538
|
"__schema": "ParameterSchema",
|
|
6376
6539
|
"location": {
|
|
6377
6540
|
"filePath": "merging.main.runtime.ts",
|
|
6378
|
-
"line":
|
|
6541
|
+
"line": 169,
|
|
6379
6542
|
"character": 5
|
|
6380
6543
|
},
|
|
6381
6544
|
"name": "bitIds",
|
|
@@ -6383,14 +6546,14 @@
|
|
|
6383
6546
|
"__schema": "TypeArraySchema",
|
|
6384
6547
|
"location": {
|
|
6385
6548
|
"filePath": "merging.main.runtime.ts",
|
|
6386
|
-
"line":
|
|
6549
|
+
"line": 169,
|
|
6387
6550
|
"character": 13
|
|
6388
6551
|
},
|
|
6389
6552
|
"type": {
|
|
6390
6553
|
"__schema": "TypeRefSchema",
|
|
6391
6554
|
"location": {
|
|
6392
6555
|
"filePath": "merging.main.runtime.ts",
|
|
6393
|
-
"line":
|
|
6556
|
+
"line": 169,
|
|
6394
6557
|
"character": 13
|
|
6395
6558
|
},
|
|
6396
6559
|
"name": "ComponentID",
|
|
@@ -6408,7 +6571,7 @@
|
|
|
6408
6571
|
"__schema": "ParameterSchema",
|
|
6409
6572
|
"location": {
|
|
6410
6573
|
"filePath": "merging.main.runtime.ts",
|
|
6411
|
-
"line":
|
|
6574
|
+
"line": 170,
|
|
6412
6575
|
"character": 5
|
|
6413
6576
|
},
|
|
6414
6577
|
"name": "mergeStrategy",
|
|
@@ -6416,7 +6579,7 @@
|
|
|
6416
6579
|
"__schema": "TypeRefSchema",
|
|
6417
6580
|
"location": {
|
|
6418
6581
|
"filePath": "merging.main.runtime.ts",
|
|
6419
|
-
"line":
|
|
6582
|
+
"line": 170,
|
|
6420
6583
|
"character": 20
|
|
6421
6584
|
},
|
|
6422
6585
|
"name": "MergeStrategy",
|
|
@@ -6429,7 +6592,7 @@
|
|
|
6429
6592
|
"__schema": "ParameterSchema",
|
|
6430
6593
|
"location": {
|
|
6431
6594
|
"filePath": "merging.main.runtime.ts",
|
|
6432
|
-
"line":
|
|
6595
|
+
"line": 171,
|
|
6433
6596
|
"character": 5
|
|
6434
6597
|
},
|
|
6435
6598
|
"name": "noSnap",
|
|
@@ -6437,7 +6600,7 @@
|
|
|
6437
6600
|
"__schema": "KeywordTypeSchema",
|
|
6438
6601
|
"location": {
|
|
6439
6602
|
"filePath": "merging.main.runtime.ts",
|
|
6440
|
-
"line":
|
|
6603
|
+
"line": 171,
|
|
6441
6604
|
"character": 13
|
|
6442
6605
|
},
|
|
6443
6606
|
"name": "boolean"
|
|
@@ -6449,7 +6612,7 @@
|
|
|
6449
6612
|
"__schema": "ParameterSchema",
|
|
6450
6613
|
"location": {
|
|
6451
6614
|
"filePath": "merging.main.runtime.ts",
|
|
6452
|
-
"line":
|
|
6615
|
+
"line": 172,
|
|
6453
6616
|
"character": 5
|
|
6454
6617
|
},
|
|
6455
6618
|
"name": "snapMessage",
|
|
@@ -6457,7 +6620,7 @@
|
|
|
6457
6620
|
"__schema": "KeywordTypeSchema",
|
|
6458
6621
|
"location": {
|
|
6459
6622
|
"filePath": "merging.main.runtime.ts",
|
|
6460
|
-
"line":
|
|
6623
|
+
"line": 172,
|
|
6461
6624
|
"character": 18
|
|
6462
6625
|
},
|
|
6463
6626
|
"name": "string"
|
|
@@ -6469,7 +6632,7 @@
|
|
|
6469
6632
|
"__schema": "ParameterSchema",
|
|
6470
6633
|
"location": {
|
|
6471
6634
|
"filePath": "merging.main.runtime.ts",
|
|
6472
|
-
"line":
|
|
6635
|
+
"line": 173,
|
|
6473
6636
|
"character": 5
|
|
6474
6637
|
},
|
|
6475
6638
|
"name": "build",
|
|
@@ -6477,7 +6640,7 @@
|
|
|
6477
6640
|
"__schema": "KeywordTypeSchema",
|
|
6478
6641
|
"location": {
|
|
6479
6642
|
"filePath": "merging.main.runtime.ts",
|
|
6480
|
-
"line":
|
|
6643
|
+
"line": 173,
|
|
6481
6644
|
"character": 12
|
|
6482
6645
|
},
|
|
6483
6646
|
"name": "boolean"
|
|
@@ -6489,7 +6652,7 @@
|
|
|
6489
6652
|
"__schema": "ParameterSchema",
|
|
6490
6653
|
"location": {
|
|
6491
6654
|
"filePath": "merging.main.runtime.ts",
|
|
6492
|
-
"line":
|
|
6655
|
+
"line": 174,
|
|
6493
6656
|
"character": 5
|
|
6494
6657
|
},
|
|
6495
6658
|
"name": "skipDependencyInstallation",
|
|
@@ -6497,7 +6660,7 @@
|
|
|
6497
6660
|
"__schema": "KeywordTypeSchema",
|
|
6498
6661
|
"location": {
|
|
6499
6662
|
"filePath": "merging.main.runtime.ts",
|
|
6500
|
-
"line":
|
|
6663
|
+
"line": 174,
|
|
6501
6664
|
"character": 33
|
|
6502
6665
|
},
|
|
6503
6666
|
"name": "boolean"
|
|
@@ -6510,7 +6673,7 @@
|
|
|
6510
6673
|
"__schema": "TypeRefSchema",
|
|
6511
6674
|
"location": {
|
|
6512
6675
|
"filePath": "merging.main.runtime.ts",
|
|
6513
|
-
"line":
|
|
6676
|
+
"line": 175,
|
|
6514
6677
|
"character": 6
|
|
6515
6678
|
},
|
|
6516
6679
|
"name": "Promise",
|
|
@@ -6519,7 +6682,7 @@
|
|
|
6519
6682
|
"__schema": "TypeRefSchema",
|
|
6520
6683
|
"location": {
|
|
6521
6684
|
"filePath": "merging.main.runtime.ts",
|
|
6522
|
-
"line":
|
|
6685
|
+
"line": 175,
|
|
6523
6686
|
"character": 14
|
|
6524
6687
|
},
|
|
6525
6688
|
"name": "ApplyVersionResults"
|
|
@@ -6534,14 +6697,14 @@
|
|
|
6534
6697
|
"__schema": "FunctionLikeSchema",
|
|
6535
6698
|
"location": {
|
|
6536
6699
|
"filePath": "merging.main.runtime.ts",
|
|
6537
|
-
"line":
|
|
6700
|
+
"line": 210,
|
|
6538
6701
|
"character": 3
|
|
6539
6702
|
},
|
|
6540
6703
|
"doc": {
|
|
6541
6704
|
"__schema": "DocSchema",
|
|
6542
6705
|
"location": {
|
|
6543
6706
|
"filePath": "merging.main.runtime.ts",
|
|
6544
|
-
"line":
|
|
6707
|
+
"line": 207,
|
|
6545
6708
|
"character": 3
|
|
6546
6709
|
},
|
|
6547
6710
|
"raw": "/**\n * merge multiple components according to the \"allComponentsStatus\".\n */",
|
|
@@ -6554,7 +6717,7 @@
|
|
|
6554
6717
|
"__schema": "ParameterSchema",
|
|
6555
6718
|
"location": {
|
|
6556
6719
|
"filePath": "merging.main.runtime.ts",
|
|
6557
|
-
"line":
|
|
6720
|
+
"line": 210,
|
|
6558
6721
|
"character": 20
|
|
6559
6722
|
},
|
|
6560
6723
|
"name": "{ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noSnap, tag, snapMessage, build, skipDependencyInstallation }",
|
|
@@ -6562,7 +6725,7 @@
|
|
|
6562
6725
|
"__schema": "TypeLiteralSchema",
|
|
6563
6726
|
"location": {
|
|
6564
6727
|
"filePath": "merging.main.runtime.ts",
|
|
6565
|
-
"line":
|
|
6728
|
+
"line": 220,
|
|
6566
6729
|
"character": 6
|
|
6567
6730
|
},
|
|
6568
6731
|
"members": [
|
|
@@ -6570,7 +6733,7 @@
|
|
|
6570
6733
|
"__schema": "VariableLikeSchema",
|
|
6571
6734
|
"location": {
|
|
6572
6735
|
"filePath": "merging.main.runtime.ts",
|
|
6573
|
-
"line":
|
|
6736
|
+
"line": 221,
|
|
6574
6737
|
"character": 5
|
|
6575
6738
|
},
|
|
6576
6739
|
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
@@ -6579,7 +6742,7 @@
|
|
|
6579
6742
|
"__schema": "TypeRefSchema",
|
|
6580
6743
|
"location": {
|
|
6581
6744
|
"filePath": "merging.main.runtime.ts",
|
|
6582
|
-
"line":
|
|
6745
|
+
"line": 221,
|
|
6583
6746
|
"character": 20
|
|
6584
6747
|
},
|
|
6585
6748
|
"name": "MergeStrategy",
|
|
@@ -6591,7 +6754,7 @@
|
|
|
6591
6754
|
"__schema": "VariableLikeSchema",
|
|
6592
6755
|
"location": {
|
|
6593
6756
|
"filePath": "merging.main.runtime.ts",
|
|
6594
|
-
"line":
|
|
6757
|
+
"line": 222,
|
|
6595
6758
|
"character": 5
|
|
6596
6759
|
},
|
|
6597
6760
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -6600,14 +6763,14 @@
|
|
|
6600
6763
|
"__schema": "TypeArraySchema",
|
|
6601
6764
|
"location": {
|
|
6602
6765
|
"filePath": "merging.main.runtime.ts",
|
|
6603
|
-
"line":
|
|
6766
|
+
"line": 222,
|
|
6604
6767
|
"character": 26
|
|
6605
6768
|
},
|
|
6606
6769
|
"type": {
|
|
6607
6770
|
"__schema": "TypeRefSchema",
|
|
6608
6771
|
"location": {
|
|
6609
6772
|
"filePath": "merging.main.runtime.ts",
|
|
6610
|
-
"line":
|
|
6773
|
+
"line": 222,
|
|
6611
6774
|
"character": 26
|
|
6612
6775
|
},
|
|
6613
6776
|
"name": "ComponentMergeStatus"
|
|
@@ -6619,7 +6782,7 @@
|
|
|
6619
6782
|
"__schema": "VariableLikeSchema",
|
|
6620
6783
|
"location": {
|
|
6621
6784
|
"filePath": "merging.main.runtime.ts",
|
|
6622
|
-
"line":
|
|
6785
|
+
"line": 223,
|
|
6623
6786
|
"character": 5
|
|
6624
6787
|
},
|
|
6625
6788
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -6628,7 +6791,7 @@
|
|
|
6628
6791
|
"__schema": "TypeRefSchema",
|
|
6629
6792
|
"location": {
|
|
6630
6793
|
"filePath": "merging.main.runtime.ts",
|
|
6631
|
-
"line":
|
|
6794
|
+
"line": 223,
|
|
6632
6795
|
"character": 5
|
|
6633
6796
|
},
|
|
6634
6797
|
"name": "LaneId",
|
|
@@ -6644,7 +6807,7 @@
|
|
|
6644
6807
|
"__schema": "VariableLikeSchema",
|
|
6645
6808
|
"location": {
|
|
6646
6809
|
"filePath": "merging.main.runtime.ts",
|
|
6647
|
-
"line":
|
|
6810
|
+
"line": 224,
|
|
6648
6811
|
"character": 5
|
|
6649
6812
|
},
|
|
6650
6813
|
"signature": "(property) currentLane?: Lane | undefined",
|
|
@@ -6653,7 +6816,7 @@
|
|
|
6653
6816
|
"__schema": "TypeRefSchema",
|
|
6654
6817
|
"location": {
|
|
6655
6818
|
"filePath": "merging.main.runtime.ts",
|
|
6656
|
-
"line":
|
|
6819
|
+
"line": 224,
|
|
6657
6820
|
"character": 19
|
|
6658
6821
|
},
|
|
6659
6822
|
"name": "Lane",
|
|
@@ -6665,7 +6828,7 @@
|
|
|
6665
6828
|
"__schema": "VariableLikeSchema",
|
|
6666
6829
|
"location": {
|
|
6667
6830
|
"filePath": "merging.main.runtime.ts",
|
|
6668
|
-
"line":
|
|
6831
|
+
"line": 225,
|
|
6669
6832
|
"character": 5
|
|
6670
6833
|
},
|
|
6671
6834
|
"signature": "(property) noSnap: boolean",
|
|
@@ -6674,7 +6837,7 @@
|
|
|
6674
6837
|
"__schema": "KeywordTypeSchema",
|
|
6675
6838
|
"location": {
|
|
6676
6839
|
"filePath": "merging.main.runtime.ts",
|
|
6677
|
-
"line":
|
|
6840
|
+
"line": 225,
|
|
6678
6841
|
"character": 13
|
|
6679
6842
|
},
|
|
6680
6843
|
"name": "boolean"
|
|
@@ -6685,7 +6848,7 @@
|
|
|
6685
6848
|
"__schema": "VariableLikeSchema",
|
|
6686
6849
|
"location": {
|
|
6687
6850
|
"filePath": "merging.main.runtime.ts",
|
|
6688
|
-
"line":
|
|
6851
|
+
"line": 226,
|
|
6689
6852
|
"character": 5
|
|
6690
6853
|
},
|
|
6691
6854
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -6694,7 +6857,7 @@
|
|
|
6694
6857
|
"__schema": "KeywordTypeSchema",
|
|
6695
6858
|
"location": {
|
|
6696
6859
|
"filePath": "merging.main.runtime.ts",
|
|
6697
|
-
"line":
|
|
6860
|
+
"line": 226,
|
|
6698
6861
|
"character": 11
|
|
6699
6862
|
},
|
|
6700
6863
|
"name": "boolean"
|
|
@@ -6705,7 +6868,7 @@
|
|
|
6705
6868
|
"__schema": "VariableLikeSchema",
|
|
6706
6869
|
"location": {
|
|
6707
6870
|
"filePath": "merging.main.runtime.ts",
|
|
6708
|
-
"line":
|
|
6871
|
+
"line": 227,
|
|
6709
6872
|
"character": 5
|
|
6710
6873
|
},
|
|
6711
6874
|
"signature": "(property) snapMessage: string",
|
|
@@ -6714,7 +6877,7 @@
|
|
|
6714
6877
|
"__schema": "KeywordTypeSchema",
|
|
6715
6878
|
"location": {
|
|
6716
6879
|
"filePath": "merging.main.runtime.ts",
|
|
6717
|
-
"line":
|
|
6880
|
+
"line": 227,
|
|
6718
6881
|
"character": 18
|
|
6719
6882
|
},
|
|
6720
6883
|
"name": "string"
|
|
@@ -6725,7 +6888,7 @@
|
|
|
6725
6888
|
"__schema": "VariableLikeSchema",
|
|
6726
6889
|
"location": {
|
|
6727
6890
|
"filePath": "merging.main.runtime.ts",
|
|
6728
|
-
"line":
|
|
6891
|
+
"line": 228,
|
|
6729
6892
|
"character": 5
|
|
6730
6893
|
},
|
|
6731
6894
|
"signature": "(property) build: boolean",
|
|
@@ -6734,7 +6897,7 @@
|
|
|
6734
6897
|
"__schema": "KeywordTypeSchema",
|
|
6735
6898
|
"location": {
|
|
6736
6899
|
"filePath": "merging.main.runtime.ts",
|
|
6737
|
-
"line":
|
|
6900
|
+
"line": 228,
|
|
6738
6901
|
"character": 12
|
|
6739
6902
|
},
|
|
6740
6903
|
"name": "boolean"
|
|
@@ -6745,7 +6908,7 @@
|
|
|
6745
6908
|
"__schema": "VariableLikeSchema",
|
|
6746
6909
|
"location": {
|
|
6747
6910
|
"filePath": "merging.main.runtime.ts",
|
|
6748
|
-
"line":
|
|
6911
|
+
"line": 229,
|
|
6749
6912
|
"character": 5
|
|
6750
6913
|
},
|
|
6751
6914
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -6754,7 +6917,7 @@
|
|
|
6754
6917
|
"__schema": "KeywordTypeSchema",
|
|
6755
6918
|
"location": {
|
|
6756
6919
|
"filePath": "merging.main.runtime.ts",
|
|
6757
|
-
"line":
|
|
6920
|
+
"line": 229,
|
|
6758
6921
|
"character": 34
|
|
6759
6922
|
},
|
|
6760
6923
|
"name": "boolean"
|
|
@@ -6769,7 +6932,7 @@
|
|
|
6769
6932
|
"__schema": "VariableLikeSchema",
|
|
6770
6933
|
"location": {
|
|
6771
6934
|
"filePath": "merging.main.runtime.ts",
|
|
6772
|
-
"line":
|
|
6935
|
+
"line": 221,
|
|
6773
6936
|
"character": 5
|
|
6774
6937
|
},
|
|
6775
6938
|
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
@@ -6778,7 +6941,7 @@
|
|
|
6778
6941
|
"__schema": "TypeRefSchema",
|
|
6779
6942
|
"location": {
|
|
6780
6943
|
"filePath": "merging.main.runtime.ts",
|
|
6781
|
-
"line":
|
|
6944
|
+
"line": 221,
|
|
6782
6945
|
"character": 20
|
|
6783
6946
|
},
|
|
6784
6947
|
"name": "MergeStrategy",
|
|
@@ -6790,7 +6953,7 @@
|
|
|
6790
6953
|
"__schema": "VariableLikeSchema",
|
|
6791
6954
|
"location": {
|
|
6792
6955
|
"filePath": "merging.main.runtime.ts",
|
|
6793
|
-
"line":
|
|
6956
|
+
"line": 222,
|
|
6794
6957
|
"character": 5
|
|
6795
6958
|
},
|
|
6796
6959
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -6799,14 +6962,14 @@
|
|
|
6799
6962
|
"__schema": "TypeArraySchema",
|
|
6800
6963
|
"location": {
|
|
6801
6964
|
"filePath": "merging.main.runtime.ts",
|
|
6802
|
-
"line":
|
|
6965
|
+
"line": 222,
|
|
6803
6966
|
"character": 26
|
|
6804
6967
|
},
|
|
6805
6968
|
"type": {
|
|
6806
6969
|
"__schema": "TypeRefSchema",
|
|
6807
6970
|
"location": {
|
|
6808
6971
|
"filePath": "merging.main.runtime.ts",
|
|
6809
|
-
"line":
|
|
6972
|
+
"line": 222,
|
|
6810
6973
|
"character": 26
|
|
6811
6974
|
},
|
|
6812
6975
|
"name": "ComponentMergeStatus"
|
|
@@ -6818,7 +6981,7 @@
|
|
|
6818
6981
|
"__schema": "VariableLikeSchema",
|
|
6819
6982
|
"location": {
|
|
6820
6983
|
"filePath": "merging.main.runtime.ts",
|
|
6821
|
-
"line":
|
|
6984
|
+
"line": 223,
|
|
6822
6985
|
"character": 5
|
|
6823
6986
|
},
|
|
6824
6987
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -6827,7 +6990,7 @@
|
|
|
6827
6990
|
"__schema": "TypeRefSchema",
|
|
6828
6991
|
"location": {
|
|
6829
6992
|
"filePath": "merging.main.runtime.ts",
|
|
6830
|
-
"line":
|
|
6993
|
+
"line": 223,
|
|
6831
6994
|
"character": 5
|
|
6832
6995
|
},
|
|
6833
6996
|
"name": "LaneId",
|
|
@@ -6843,7 +7006,7 @@
|
|
|
6843
7006
|
"__schema": "VariableLikeSchema",
|
|
6844
7007
|
"location": {
|
|
6845
7008
|
"filePath": "merging.main.runtime.ts",
|
|
6846
|
-
"line":
|
|
7009
|
+
"line": 224,
|
|
6847
7010
|
"character": 5
|
|
6848
7011
|
},
|
|
6849
7012
|
"signature": "(property) currentLane?: Lane | undefined",
|
|
@@ -6852,7 +7015,7 @@
|
|
|
6852
7015
|
"__schema": "TypeRefSchema",
|
|
6853
7016
|
"location": {
|
|
6854
7017
|
"filePath": "merging.main.runtime.ts",
|
|
6855
|
-
"line":
|
|
7018
|
+
"line": 224,
|
|
6856
7019
|
"character": 19
|
|
6857
7020
|
},
|
|
6858
7021
|
"name": "Lane",
|
|
@@ -6864,7 +7027,7 @@
|
|
|
6864
7027
|
"__schema": "VariableLikeSchema",
|
|
6865
7028
|
"location": {
|
|
6866
7029
|
"filePath": "merging.main.runtime.ts",
|
|
6867
|
-
"line":
|
|
7030
|
+
"line": 225,
|
|
6868
7031
|
"character": 5
|
|
6869
7032
|
},
|
|
6870
7033
|
"signature": "(property) noSnap: boolean",
|
|
@@ -6873,7 +7036,7 @@
|
|
|
6873
7036
|
"__schema": "KeywordTypeSchema",
|
|
6874
7037
|
"location": {
|
|
6875
7038
|
"filePath": "merging.main.runtime.ts",
|
|
6876
|
-
"line":
|
|
7039
|
+
"line": 225,
|
|
6877
7040
|
"character": 13
|
|
6878
7041
|
},
|
|
6879
7042
|
"name": "boolean"
|
|
@@ -6884,7 +7047,7 @@
|
|
|
6884
7047
|
"__schema": "VariableLikeSchema",
|
|
6885
7048
|
"location": {
|
|
6886
7049
|
"filePath": "merging.main.runtime.ts",
|
|
6887
|
-
"line":
|
|
7050
|
+
"line": 226,
|
|
6888
7051
|
"character": 5
|
|
6889
7052
|
},
|
|
6890
7053
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -6893,7 +7056,7 @@
|
|
|
6893
7056
|
"__schema": "KeywordTypeSchema",
|
|
6894
7057
|
"location": {
|
|
6895
7058
|
"filePath": "merging.main.runtime.ts",
|
|
6896
|
-
"line":
|
|
7059
|
+
"line": 226,
|
|
6897
7060
|
"character": 11
|
|
6898
7061
|
},
|
|
6899
7062
|
"name": "boolean"
|
|
@@ -6904,7 +7067,7 @@
|
|
|
6904
7067
|
"__schema": "VariableLikeSchema",
|
|
6905
7068
|
"location": {
|
|
6906
7069
|
"filePath": "merging.main.runtime.ts",
|
|
6907
|
-
"line":
|
|
7070
|
+
"line": 227,
|
|
6908
7071
|
"character": 5
|
|
6909
7072
|
},
|
|
6910
7073
|
"signature": "(property) snapMessage: string",
|
|
@@ -6913,7 +7076,7 @@
|
|
|
6913
7076
|
"__schema": "KeywordTypeSchema",
|
|
6914
7077
|
"location": {
|
|
6915
7078
|
"filePath": "merging.main.runtime.ts",
|
|
6916
|
-
"line":
|
|
7079
|
+
"line": 227,
|
|
6917
7080
|
"character": 18
|
|
6918
7081
|
},
|
|
6919
7082
|
"name": "string"
|
|
@@ -6924,7 +7087,7 @@
|
|
|
6924
7087
|
"__schema": "VariableLikeSchema",
|
|
6925
7088
|
"location": {
|
|
6926
7089
|
"filePath": "merging.main.runtime.ts",
|
|
6927
|
-
"line":
|
|
7090
|
+
"line": 228,
|
|
6928
7091
|
"character": 5
|
|
6929
7092
|
},
|
|
6930
7093
|
"signature": "(property) build: boolean",
|
|
@@ -6933,7 +7096,7 @@
|
|
|
6933
7096
|
"__schema": "KeywordTypeSchema",
|
|
6934
7097
|
"location": {
|
|
6935
7098
|
"filePath": "merging.main.runtime.ts",
|
|
6936
|
-
"line":
|
|
7099
|
+
"line": 228,
|
|
6937
7100
|
"character": 12
|
|
6938
7101
|
},
|
|
6939
7102
|
"name": "boolean"
|
|
@@ -6944,7 +7107,7 @@
|
|
|
6944
7107
|
"__schema": "VariableLikeSchema",
|
|
6945
7108
|
"location": {
|
|
6946
7109
|
"filePath": "merging.main.runtime.ts",
|
|
6947
|
-
"line":
|
|
7110
|
+
"line": 229,
|
|
6948
7111
|
"character": 5
|
|
6949
7112
|
},
|
|
6950
7113
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -6953,7 +7116,7 @@
|
|
|
6953
7116
|
"__schema": "KeywordTypeSchema",
|
|
6954
7117
|
"location": {
|
|
6955
7118
|
"filePath": "merging.main.runtime.ts",
|
|
6956
|
-
"line":
|
|
7119
|
+
"line": 229,
|
|
6957
7120
|
"character": 34
|
|
6958
7121
|
},
|
|
6959
7122
|
"name": "boolean"
|
|
@@ -6968,7 +7131,7 @@
|
|
|
6968
7131
|
"__schema": "TypeRefSchema",
|
|
6969
7132
|
"location": {
|
|
6970
7133
|
"filePath": "merging.main.runtime.ts",
|
|
6971
|
-
"line":
|
|
7134
|
+
"line": 230,
|
|
6972
7135
|
"character": 7
|
|
6973
7136
|
},
|
|
6974
7137
|
"name": "Promise",
|
|
@@ -6977,7 +7140,7 @@
|
|
|
6977
7140
|
"__schema": "TypeRefSchema",
|
|
6978
7141
|
"location": {
|
|
6979
7142
|
"filePath": "merging.main.runtime.ts",
|
|
6980
|
-
"line":
|
|
7143
|
+
"line": 230,
|
|
6981
7144
|
"character": 15
|
|
6982
7145
|
},
|
|
6983
7146
|
"name": "ApplyVersionResults"
|
|
@@ -6992,14 +7155,116 @@
|
|
|
6992
7155
|
"__schema": "FunctionLikeSchema",
|
|
6993
7156
|
"location": {
|
|
6994
7157
|
"filePath": "merging.main.runtime.ts",
|
|
6995
|
-
"line":
|
|
7158
|
+
"line": 352,
|
|
7159
|
+
"character": 3
|
|
7160
|
+
},
|
|
7161
|
+
"signature": "(method) MergingMain.removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>",
|
|
7162
|
+
"name": "removeFromWsJsonPolicyIfExists",
|
|
7163
|
+
"params": [
|
|
7164
|
+
{
|
|
7165
|
+
"__schema": "ParameterSchema",
|
|
7166
|
+
"location": {
|
|
7167
|
+
"filePath": "merging.main.runtime.ts",
|
|
7168
|
+
"line": 353,
|
|
7169
|
+
"character": 5
|
|
7170
|
+
},
|
|
7171
|
+
"name": "componentsResults",
|
|
7172
|
+
"type": {
|
|
7173
|
+
"__schema": "TypeArraySchema",
|
|
7174
|
+
"location": {
|
|
7175
|
+
"filePath": "merging.main.runtime.ts",
|
|
7176
|
+
"line": 353,
|
|
7177
|
+
"character": 24
|
|
7178
|
+
},
|
|
7179
|
+
"type": {
|
|
7180
|
+
"__schema": "TypeRefSchema",
|
|
7181
|
+
"location": {
|
|
7182
|
+
"filePath": "merging.main.runtime.ts",
|
|
7183
|
+
"line": 353,
|
|
7184
|
+
"character": 24
|
|
7185
|
+
},
|
|
7186
|
+
"name": "ApplyVersionWithComps",
|
|
7187
|
+
"componentId": {
|
|
7188
|
+
"scope": "teambit.component",
|
|
7189
|
+
"name": "checkout"
|
|
7190
|
+
}
|
|
7191
|
+
}
|
|
7192
|
+
},
|
|
7193
|
+
"isOptional": false,
|
|
7194
|
+
"isSpread": false
|
|
7195
|
+
},
|
|
7196
|
+
{
|
|
7197
|
+
"__schema": "ParameterSchema",
|
|
7198
|
+
"location": {
|
|
7199
|
+
"filePath": "merging.main.runtime.ts",
|
|
7200
|
+
"line": 354,
|
|
7201
|
+
"character": 5
|
|
7202
|
+
},
|
|
7203
|
+
"name": "currentLane",
|
|
7204
|
+
"type": {
|
|
7205
|
+
"__schema": "TypeRefSchema",
|
|
7206
|
+
"location": {
|
|
7207
|
+
"filePath": "merging.main.runtime.ts",
|
|
7208
|
+
"line": 354,
|
|
7209
|
+
"character": 19
|
|
7210
|
+
},
|
|
7211
|
+
"name": "Lane",
|
|
7212
|
+
"packageName": "@teambit/legacy/dist/scope/models"
|
|
7213
|
+
},
|
|
7214
|
+
"isOptional": true,
|
|
7215
|
+
"isSpread": false
|
|
7216
|
+
},
|
|
7217
|
+
{
|
|
7218
|
+
"__schema": "ParameterSchema",
|
|
7219
|
+
"location": {
|
|
7220
|
+
"filePath": "merging.main.runtime.ts",
|
|
7221
|
+
"line": 355,
|
|
7222
|
+
"character": 5
|
|
7223
|
+
},
|
|
7224
|
+
"name": "currentLaneIdsBeforeMerge",
|
|
7225
|
+
"type": {
|
|
7226
|
+
"__schema": "TypeRefSchema",
|
|
7227
|
+
"location": {
|
|
7228
|
+
"filePath": "merging.main.runtime.ts",
|
|
7229
|
+
"line": 355,
|
|
7230
|
+
"character": 33
|
|
7231
|
+
},
|
|
7232
|
+
"name": "ComponentIdList",
|
|
7233
|
+
"componentId": {
|
|
7234
|
+
"scope": "teambit.component",
|
|
7235
|
+
"name": "component-id",
|
|
7236
|
+
"version": "1.2.0"
|
|
7237
|
+
}
|
|
7238
|
+
},
|
|
7239
|
+
"isOptional": true,
|
|
7240
|
+
"isSpread": false
|
|
7241
|
+
}
|
|
7242
|
+
],
|
|
7243
|
+
"returnType": {
|
|
7244
|
+
"__schema": "InferenceTypeSchema",
|
|
7245
|
+
"location": {
|
|
7246
|
+
"filePath": "merging.main.runtime.ts",
|
|
7247
|
+
"line": 352,
|
|
7248
|
+
"character": 3
|
|
7249
|
+
},
|
|
7250
|
+
"type": "Promise<void>"
|
|
7251
|
+
},
|
|
7252
|
+
"modifiers": [
|
|
7253
|
+
"async"
|
|
7254
|
+
]
|
|
7255
|
+
},
|
|
7256
|
+
{
|
|
7257
|
+
"__schema": "FunctionLikeSchema",
|
|
7258
|
+
"location": {
|
|
7259
|
+
"filePath": "merging.main.runtime.ts",
|
|
7260
|
+
"line": 377,
|
|
6996
7261
|
"character": 3
|
|
6997
7262
|
},
|
|
6998
7263
|
"doc": {
|
|
6999
7264
|
"__schema": "DocSchema",
|
|
7000
7265
|
"location": {
|
|
7001
7266
|
"filePath": "merging.main.runtime.ts",
|
|
7002
|
-
"line":
|
|
7267
|
+
"line": 371,
|
|
7003
7268
|
"character": 3
|
|
7004
7269
|
},
|
|
7005
7270
|
"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 */",
|
|
@@ -7012,7 +7277,7 @@
|
|
|
7012
7277
|
"__schema": "ParameterSchema",
|
|
7013
7278
|
"location": {
|
|
7014
7279
|
"filePath": "merging.main.runtime.ts",
|
|
7015
|
-
"line":
|
|
7280
|
+
"line": 378,
|
|
7016
7281
|
"character": 5
|
|
7017
7282
|
},
|
|
7018
7283
|
"name": "bitIds",
|
|
@@ -7020,14 +7285,14 @@
|
|
|
7020
7285
|
"__schema": "TypeArraySchema",
|
|
7021
7286
|
"location": {
|
|
7022
7287
|
"filePath": "merging.main.runtime.ts",
|
|
7023
|
-
"line":
|
|
7288
|
+
"line": 378,
|
|
7024
7289
|
"character": 13
|
|
7025
7290
|
},
|
|
7026
7291
|
"type": {
|
|
7027
7292
|
"__schema": "TypeRefSchema",
|
|
7028
7293
|
"location": {
|
|
7029
7294
|
"filePath": "merging.main.runtime.ts",
|
|
7030
|
-
"line":
|
|
7295
|
+
"line": 378,
|
|
7031
7296
|
"character": 13
|
|
7032
7297
|
},
|
|
7033
7298
|
"name": "ComponentID",
|
|
@@ -7045,7 +7310,7 @@
|
|
|
7045
7310
|
"__schema": "ParameterSchema",
|
|
7046
7311
|
"location": {
|
|
7047
7312
|
"filePath": "merging.main.runtime.ts",
|
|
7048
|
-
"line":
|
|
7313
|
+
"line": 379,
|
|
7049
7314
|
"character": 5
|
|
7050
7315
|
},
|
|
7051
7316
|
"name": "options",
|
|
@@ -7053,7 +7318,7 @@
|
|
|
7053
7318
|
"__schema": "TypeRefSchema",
|
|
7054
7319
|
"location": {
|
|
7055
7320
|
"filePath": "merging.main.runtime.ts",
|
|
7056
|
-
"line":
|
|
7321
|
+
"line": 379,
|
|
7057
7322
|
"character": 14
|
|
7058
7323
|
},
|
|
7059
7324
|
"name": "MergeStatusProviderOptions",
|
|
@@ -7066,7 +7331,7 @@
|
|
|
7066
7331
|
"__schema": "ParameterSchema",
|
|
7067
7332
|
"location": {
|
|
7068
7333
|
"filePath": "merging.main.runtime.ts",
|
|
7069
|
-
"line":
|
|
7334
|
+
"line": 380,
|
|
7070
7335
|
"character": 5
|
|
7071
7336
|
},
|
|
7072
7337
|
"name": "currentLane",
|
|
@@ -7074,7 +7339,7 @@
|
|
|
7074
7339
|
"__schema": "TypeRefSchema",
|
|
7075
7340
|
"location": {
|
|
7076
7341
|
"filePath": "merging.main.runtime.ts",
|
|
7077
|
-
"line":
|
|
7342
|
+
"line": 380,
|
|
7078
7343
|
"character": 19
|
|
7079
7344
|
},
|
|
7080
7345
|
"name": "Lane",
|
|
@@ -7087,7 +7352,7 @@
|
|
|
7087
7352
|
"__schema": "ParameterSchema",
|
|
7088
7353
|
"location": {
|
|
7089
7354
|
"filePath": "merging.main.runtime.ts",
|
|
7090
|
-
"line":
|
|
7355
|
+
"line": 381,
|
|
7091
7356
|
"character": 5
|
|
7092
7357
|
},
|
|
7093
7358
|
"name": "otherLane",
|
|
@@ -7095,7 +7360,7 @@
|
|
|
7095
7360
|
"__schema": "TypeRefSchema",
|
|
7096
7361
|
"location": {
|
|
7097
7362
|
"filePath": "merging.main.runtime.ts",
|
|
7098
|
-
"line":
|
|
7363
|
+
"line": 381,
|
|
7099
7364
|
"character": 17
|
|
7100
7365
|
},
|
|
7101
7366
|
"name": "Lane",
|
|
@@ -7109,7 +7374,7 @@
|
|
|
7109
7374
|
"__schema": "TypeRefSchema",
|
|
7110
7375
|
"location": {
|
|
7111
7376
|
"filePath": "merging.main.runtime.ts",
|
|
7112
|
-
"line":
|
|
7377
|
+
"line": 382,
|
|
7113
7378
|
"character": 6
|
|
7114
7379
|
},
|
|
7115
7380
|
"name": "Promise",
|
|
@@ -7118,14 +7383,14 @@
|
|
|
7118
7383
|
"__schema": "TypeArraySchema",
|
|
7119
7384
|
"location": {
|
|
7120
7385
|
"filePath": "merging.main.runtime.ts",
|
|
7121
|
-
"line":
|
|
7386
|
+
"line": 382,
|
|
7122
7387
|
"character": 14
|
|
7123
7388
|
},
|
|
7124
7389
|
"type": {
|
|
7125
7390
|
"__schema": "TypeRefSchema",
|
|
7126
7391
|
"location": {
|
|
7127
7392
|
"filePath": "merging.main.runtime.ts",
|
|
7128
|
-
"line":
|
|
7393
|
+
"line": 382,
|
|
7129
7394
|
"character": 14
|
|
7130
7395
|
},
|
|
7131
7396
|
"name": "ComponentMergeStatus"
|
|
@@ -7141,7 +7406,7 @@
|
|
|
7141
7406
|
"__schema": "VariableLikeSchema",
|
|
7142
7407
|
"location": {
|
|
7143
7408
|
"filePath": "merging.main.runtime.ts",
|
|
7144
|
-
"line":
|
|
7409
|
+
"line": 678,
|
|
7145
7410
|
"character": 3
|
|
7146
7411
|
},
|
|
7147
7412
|
"signature": "(property) MergingMain.slots: never[]",
|
|
@@ -7150,7 +7415,7 @@
|
|
|
7150
7415
|
"__schema": "InferenceTypeSchema",
|
|
7151
7416
|
"location": {
|
|
7152
7417
|
"filePath": "merging.main.runtime.ts",
|
|
7153
|
-
"line":
|
|
7418
|
+
"line": 678,
|
|
7154
7419
|
"character": 3
|
|
7155
7420
|
},
|
|
7156
7421
|
"type": "never[]"
|
|
@@ -7162,7 +7427,7 @@
|
|
|
7162
7427
|
"__schema": "VariableLikeSchema",
|
|
7163
7428
|
"location": {
|
|
7164
7429
|
"filePath": "merging.main.runtime.ts",
|
|
7165
|
-
"line":
|
|
7430
|
+
"line": 679,
|
|
7166
7431
|
"character": 3
|
|
7167
7432
|
},
|
|
7168
7433
|
"signature": "(property) MergingMain.dependencies: Aspect[]",
|
|
@@ -7171,19 +7436,19 @@
|
|
|
7171
7436
|
"__schema": "InferenceTypeSchema",
|
|
7172
7437
|
"location": {
|
|
7173
7438
|
"filePath": "merging.main.runtime.ts",
|
|
7174
|
-
"line":
|
|
7439
|
+
"line": 679,
|
|
7175
7440
|
"character": 3
|
|
7176
7441
|
},
|
|
7177
7442
|
"type": "Aspect[]"
|
|
7178
7443
|
},
|
|
7179
7444
|
"isOptional": true,
|
|
7180
|
-
"defaultValue": "[\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n ]"
|
|
7445
|
+
"defaultValue": "[\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ]"
|
|
7181
7446
|
},
|
|
7182
7447
|
{
|
|
7183
7448
|
"__schema": "VariableLikeSchema",
|
|
7184
7449
|
"location": {
|
|
7185
7450
|
"filePath": "merging.main.runtime.ts",
|
|
7186
|
-
"line":
|
|
7451
|
+
"line": 695,
|
|
7187
7452
|
"character": 3
|
|
7188
7453
|
},
|
|
7189
7454
|
"signature": "(property) MergingMain.runtime: RuntimeDefinition",
|
|
@@ -7192,7 +7457,7 @@
|
|
|
7192
7457
|
"__schema": "InferenceTypeSchema",
|
|
7193
7458
|
"location": {
|
|
7194
7459
|
"filePath": "merging.main.runtime.ts",
|
|
7195
|
-
"line":
|
|
7460
|
+
"line": 695,
|
|
7196
7461
|
"character": 3
|
|
7197
7462
|
},
|
|
7198
7463
|
"type": "RuntimeDefinition"
|
|
@@ -7204,25 +7469,25 @@
|
|
|
7204
7469
|
"__schema": "FunctionLikeSchema",
|
|
7205
7470
|
"location": {
|
|
7206
7471
|
"filePath": "merging.main.runtime.ts",
|
|
7207
|
-
"line":
|
|
7472
|
+
"line": 696,
|
|
7208
7473
|
"character": 3
|
|
7209
7474
|
},
|
|
7210
|
-
"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>",
|
|
7475
|
+
"signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver,]: [\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 DependencyResolverMain\n]): Promise<MergingMain>",
|
|
7211
7476
|
"name": "provider",
|
|
7212
7477
|
"params": [
|
|
7213
7478
|
{
|
|
7214
7479
|
"__schema": "ParameterSchema",
|
|
7215
7480
|
"location": {
|
|
7216
7481
|
"filePath": "merging.main.runtime.ts",
|
|
7217
|
-
"line":
|
|
7482
|
+
"line": 696,
|
|
7218
7483
|
"character": 25
|
|
7219
7484
|
},
|
|
7220
|
-
"name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger ]",
|
|
7485
|
+
"name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver ]",
|
|
7221
7486
|
"type": {
|
|
7222
7487
|
"__schema": "TupleTypeSchema",
|
|
7223
7488
|
"location": {
|
|
7224
7489
|
"filePath": "merging.main.runtime.ts",
|
|
7225
|
-
"line":
|
|
7490
|
+
"line": 711,
|
|
7226
7491
|
"character": 6
|
|
7227
7492
|
},
|
|
7228
7493
|
"elements": [
|
|
@@ -7230,7 +7495,7 @@
|
|
|
7230
7495
|
"__schema": "TypeRefSchema",
|
|
7231
7496
|
"location": {
|
|
7232
7497
|
"filePath": "merging.main.runtime.ts",
|
|
7233
|
-
"line":
|
|
7498
|
+
"line": 712,
|
|
7234
7499
|
"character": 5
|
|
7235
7500
|
},
|
|
7236
7501
|
"name": "CLIMain",
|
|
@@ -7243,7 +7508,7 @@
|
|
|
7243
7508
|
"__schema": "TypeRefSchema",
|
|
7244
7509
|
"location": {
|
|
7245
7510
|
"filePath": "merging.main.runtime.ts",
|
|
7246
|
-
"line":
|
|
7511
|
+
"line": 713,
|
|
7247
7512
|
"character": 5
|
|
7248
7513
|
},
|
|
7249
7514
|
"name": "Workspace",
|
|
@@ -7256,7 +7521,7 @@
|
|
|
7256
7521
|
"__schema": "TypeRefSchema",
|
|
7257
7522
|
"location": {
|
|
7258
7523
|
"filePath": "merging.main.runtime.ts",
|
|
7259
|
-
"line":
|
|
7524
|
+
"line": 714,
|
|
7260
7525
|
"character": 5
|
|
7261
7526
|
},
|
|
7262
7527
|
"name": "ScopeMain",
|
|
@@ -7269,7 +7534,7 @@
|
|
|
7269
7534
|
"__schema": "TypeRefSchema",
|
|
7270
7535
|
"location": {
|
|
7271
7536
|
"filePath": "merging.main.runtime.ts",
|
|
7272
|
-
"line":
|
|
7537
|
+
"line": 715,
|
|
7273
7538
|
"character": 5
|
|
7274
7539
|
},
|
|
7275
7540
|
"name": "SnappingMain",
|
|
@@ -7282,7 +7547,7 @@
|
|
|
7282
7547
|
"__schema": "TypeRefSchema",
|
|
7283
7548
|
"location": {
|
|
7284
7549
|
"filePath": "merging.main.runtime.ts",
|
|
7285
|
-
"line":
|
|
7550
|
+
"line": 716,
|
|
7286
7551
|
"character": 5
|
|
7287
7552
|
},
|
|
7288
7553
|
"name": "CheckoutMain",
|
|
@@ -7295,7 +7560,7 @@
|
|
|
7295
7560
|
"__schema": "TypeRefSchema",
|
|
7296
7561
|
"location": {
|
|
7297
7562
|
"filePath": "merging.main.runtime.ts",
|
|
7298
|
-
"line":
|
|
7563
|
+
"line": 717,
|
|
7299
7564
|
"character": 5
|
|
7300
7565
|
},
|
|
7301
7566
|
"name": "InstallMain",
|
|
@@ -7308,7 +7573,7 @@
|
|
|
7308
7573
|
"__schema": "TypeRefSchema",
|
|
7309
7574
|
"location": {
|
|
7310
7575
|
"filePath": "merging.main.runtime.ts",
|
|
7311
|
-
"line":
|
|
7576
|
+
"line": 718,
|
|
7312
7577
|
"character": 5
|
|
7313
7578
|
},
|
|
7314
7579
|
"name": "LoggerMain",
|
|
@@ -7321,7 +7586,7 @@
|
|
|
7321
7586
|
"__schema": "TypeRefSchema",
|
|
7322
7587
|
"location": {
|
|
7323
7588
|
"filePath": "merging.main.runtime.ts",
|
|
7324
|
-
"line":
|
|
7589
|
+
"line": 719,
|
|
7325
7590
|
"character": 5
|
|
7326
7591
|
},
|
|
7327
7592
|
"name": "ComponentWriterMain",
|
|
@@ -7334,7 +7599,7 @@
|
|
|
7334
7599
|
"__schema": "TypeRefSchema",
|
|
7335
7600
|
"location": {
|
|
7336
7601
|
"filePath": "merging.main.runtime.ts",
|
|
7337
|
-
"line":
|
|
7602
|
+
"line": 720,
|
|
7338
7603
|
"character": 5
|
|
7339
7604
|
},
|
|
7340
7605
|
"name": "ImporterMain",
|
|
@@ -7347,7 +7612,7 @@
|
|
|
7347
7612
|
"__schema": "TypeRefSchema",
|
|
7348
7613
|
"location": {
|
|
7349
7614
|
"filePath": "merging.main.runtime.ts",
|
|
7350
|
-
"line":
|
|
7615
|
+
"line": 721,
|
|
7351
7616
|
"character": 5
|
|
7352
7617
|
},
|
|
7353
7618
|
"name": "ConfigMain",
|
|
@@ -7360,7 +7625,7 @@
|
|
|
7360
7625
|
"__schema": "TypeRefSchema",
|
|
7361
7626
|
"location": {
|
|
7362
7627
|
"filePath": "merging.main.runtime.ts",
|
|
7363
|
-
"line":
|
|
7628
|
+
"line": 722,
|
|
7364
7629
|
"character": 5
|
|
7365
7630
|
},
|
|
7366
7631
|
"name": "RemoveMain",
|
|
@@ -7373,7 +7638,7 @@
|
|
|
7373
7638
|
"__schema": "TypeRefSchema",
|
|
7374
7639
|
"location": {
|
|
7375
7640
|
"filePath": "merging.main.runtime.ts",
|
|
7376
|
-
"line":
|
|
7641
|
+
"line": 723,
|
|
7377
7642
|
"character": 5
|
|
7378
7643
|
},
|
|
7379
7644
|
"name": "GlobalConfigMain",
|
|
@@ -7386,7 +7651,7 @@
|
|
|
7386
7651
|
"__schema": "TypeRefSchema",
|
|
7387
7652
|
"location": {
|
|
7388
7653
|
"filePath": "merging.main.runtime.ts",
|
|
7389
|
-
"line":
|
|
7654
|
+
"line": 724,
|
|
7390
7655
|
"character": 5
|
|
7391
7656
|
},
|
|
7392
7657
|
"name": "ConfigMergerMain",
|
|
@@ -7394,6 +7659,19 @@
|
|
|
7394
7659
|
"scope": "teambit.workspace",
|
|
7395
7660
|
"name": "config-merger"
|
|
7396
7661
|
}
|
|
7662
|
+
},
|
|
7663
|
+
{
|
|
7664
|
+
"__schema": "TypeRefSchema",
|
|
7665
|
+
"location": {
|
|
7666
|
+
"filePath": "merging.main.runtime.ts",
|
|
7667
|
+
"line": 725,
|
|
7668
|
+
"character": 5
|
|
7669
|
+
},
|
|
7670
|
+
"name": "DependencyResolverMain",
|
|
7671
|
+
"componentId": {
|
|
7672
|
+
"scope": "teambit.dependencies",
|
|
7673
|
+
"name": "dependency-resolver"
|
|
7674
|
+
}
|
|
7397
7675
|
}
|
|
7398
7676
|
]
|
|
7399
7677
|
},
|
|
@@ -7405,7 +7683,7 @@
|
|
|
7405
7683
|
"__schema": "InferenceTypeSchema",
|
|
7406
7684
|
"location": {
|
|
7407
7685
|
"filePath": "merging.main.runtime.ts",
|
|
7408
|
-
"line":
|
|
7686
|
+
"line": 696,
|
|
7409
7687
|
"character": 3
|
|
7410
7688
|
},
|
|
7411
7689
|
"type": "Promise<MergingMain>"
|
|
@@ -7425,7 +7703,7 @@
|
|
|
7425
7703
|
"__schema": "TypeSchema",
|
|
7426
7704
|
"location": {
|
|
7427
7705
|
"filePath": "merging.main.runtime.ts",
|
|
7428
|
-
"line":
|
|
7706
|
+
"line": 57,
|
|
7429
7707
|
"character": 1
|
|
7430
7708
|
},
|
|
7431
7709
|
"signature": "type ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n}",
|
|
@@ -7434,7 +7712,7 @@
|
|
|
7434
7712
|
"__schema": "TypeLiteralSchema",
|
|
7435
7713
|
"location": {
|
|
7436
7714
|
"filePath": "merging.main.runtime.ts",
|
|
7437
|
-
"line":
|
|
7715
|
+
"line": 57,
|
|
7438
7716
|
"character": 29
|
|
7439
7717
|
},
|
|
7440
7718
|
"members": [
|
|
@@ -7442,7 +7720,7 @@
|
|
|
7442
7720
|
"__schema": "VariableLikeSchema",
|
|
7443
7721
|
"location": {
|
|
7444
7722
|
"filePath": "merging.main.runtime.ts",
|
|
7445
|
-
"line":
|
|
7723
|
+
"line": 58,
|
|
7446
7724
|
"character": 3
|
|
7447
7725
|
},
|
|
7448
7726
|
"signature": "(property) strategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
@@ -7451,7 +7729,7 @@
|
|
|
7451
7729
|
"__schema": "TypeRefSchema",
|
|
7452
7730
|
"location": {
|
|
7453
7731
|
"filePath": "merging.main.runtime.ts",
|
|
7454
|
-
"line":
|
|
7732
|
+
"line": 58,
|
|
7455
7733
|
"character": 13
|
|
7456
7734
|
},
|
|
7457
7735
|
"name": "MergeStrategy",
|
|
@@ -7463,7 +7741,7 @@
|
|
|
7463
7741
|
"__schema": "VariableLikeSchema",
|
|
7464
7742
|
"location": {
|
|
7465
7743
|
"filePath": "merging.main.runtime.ts",
|
|
7466
|
-
"line":
|
|
7744
|
+
"line": 59,
|
|
7467
7745
|
"character": 3
|
|
7468
7746
|
},
|
|
7469
7747
|
"signature": "(property) headOnCurrentLane: Ref",
|
|
@@ -7472,7 +7750,7 @@
|
|
|
7472
7750
|
"__schema": "TypeRefSchema",
|
|
7473
7751
|
"location": {
|
|
7474
7752
|
"filePath": "merging.main.runtime.ts",
|
|
7475
|
-
"line":
|
|
7753
|
+
"line": 59,
|
|
7476
7754
|
"character": 3
|
|
7477
7755
|
},
|
|
7478
7756
|
"name": "Ref",
|
|
@@ -7484,7 +7762,7 @@
|
|
|
7484
7762
|
"__schema": "VariableLikeSchema",
|
|
7485
7763
|
"location": {
|
|
7486
7764
|
"filePath": "merging.main.runtime.ts",
|
|
7487
|
-
"line":
|
|
7765
|
+
"line": 60,
|
|
7488
7766
|
"character": 3
|
|
7489
7767
|
},
|
|
7490
7768
|
"signature": "(property) unrelatedHead: Ref",
|
|
@@ -7493,7 +7771,7 @@
|
|
|
7493
7771
|
"__schema": "TypeRefSchema",
|
|
7494
7772
|
"location": {
|
|
7495
7773
|
"filePath": "merging.main.runtime.ts",
|
|
7496
|
-
"line":
|
|
7774
|
+
"line": 60,
|
|
7497
7775
|
"character": 3
|
|
7498
7776
|
},
|
|
7499
7777
|
"name": "Ref",
|
|
@@ -7505,7 +7783,7 @@
|
|
|
7505
7783
|
"__schema": "VariableLikeSchema",
|
|
7506
7784
|
"location": {
|
|
7507
7785
|
"filePath": "merging.main.runtime.ts",
|
|
7508
|
-
"line":
|
|
7786
|
+
"line": 61,
|
|
7509
7787
|
"character": 3
|
|
7510
7788
|
},
|
|
7511
7789
|
"signature": "(property) unrelatedLaneId: LaneId",
|
|
@@ -7514,7 +7792,7 @@
|
|
|
7514
7792
|
"__schema": "TypeRefSchema",
|
|
7515
7793
|
"location": {
|
|
7516
7794
|
"filePath": "merging.main.runtime.ts",
|
|
7517
|
-
"line":
|
|
7795
|
+
"line": 61,
|
|
7518
7796
|
"character": 3
|
|
7519
7797
|
},
|
|
7520
7798
|
"name": "LaneId",
|
|
@@ -7533,7 +7811,7 @@
|
|
|
7533
7811
|
"__schema": "UnImplementedSchema",
|
|
7534
7812
|
"location": {
|
|
7535
7813
|
"filePath": "merging.main.runtime.ts",
|
|
7536
|
-
"line":
|
|
7814
|
+
"line": 747,
|
|
7537
7815
|
"character": 1
|
|
7538
7816
|
},
|
|
7539
7817
|
"name": "MergingAspect.addRuntime(MergingMain);",
|
|
@@ -7582,7 +7860,7 @@
|
|
|
7582
7860
|
"componentId": {
|
|
7583
7861
|
"scope": "teambit.component",
|
|
7584
7862
|
"name": "merging",
|
|
7585
|
-
"version": "1.0.
|
|
7863
|
+
"version": "1.0.250"
|
|
7586
7864
|
},
|
|
7587
7865
|
"taggedModuleExports": []
|
|
7588
7866
|
}
|