@teambit/merging 1.0.330 → 1.0.331
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 +454 -867
- package/dist/merge-files.d.ts +1 -1
- package/dist/merge-files.js +5 -12
- package/dist/merge-files.js.map +1 -1
- package/dist/merge-version/merge-version.js +4 -4
- package/dist/merge-version/merge-version.js.map +1 -1
- package/dist/merge-version/three-way-merge.d.ts +1 -1
- package/dist/merge-version/three-way-merge.js +23 -14
- package/dist/merge-version/three-way-merge.js.map +1 -1
- package/dist/merging.main.runtime.js +12 -12
- package/dist/merging.main.runtime.js.map +1 -1
- package/merge-version/merge-version.ts +1 -1
- package/merge-version/three-way-merge.ts +3 -2
- package/package.json +24 -17
- /package/dist/{preview-1720513025675.js → preview-1720667996237.js} +0 -0
package/artifacts/schema.json
CHANGED
|
@@ -87,11 +87,7 @@
|
|
|
87
87
|
"line": 152,
|
|
88
88
|
"character": 49
|
|
89
89
|
},
|
|
90
|
-
"name": "ConfigMergeResult"
|
|
91
|
-
"componentId": {
|
|
92
|
-
"scope": "teambit.workspace",
|
|
93
|
-
"name": "config-merger"
|
|
94
|
-
}
|
|
90
|
+
"name": "ConfigMergeResult"
|
|
95
91
|
}
|
|
96
92
|
},
|
|
97
93
|
"isOptional": true
|
|
@@ -213,11 +209,7 @@
|
|
|
213
209
|
"line": 152,
|
|
214
210
|
"character": 49
|
|
215
211
|
},
|
|
216
|
-
"name": "ConfigMergeResult"
|
|
217
|
-
"componentId": {
|
|
218
|
-
"scope": "teambit.workspace",
|
|
219
|
-
"name": "config-merger"
|
|
220
|
-
}
|
|
212
|
+
"name": "ConfigMergeResult"
|
|
221
213
|
}
|
|
222
214
|
},
|
|
223
215
|
"isOptional": true
|
|
@@ -633,12 +625,7 @@
|
|
|
633
625
|
"line": 388,
|
|
634
626
|
"character": 54
|
|
635
627
|
},
|
|
636
|
-
"name": "ComponentID"
|
|
637
|
-
"componentId": {
|
|
638
|
-
"scope": "teambit.component",
|
|
639
|
-
"name": "component-id",
|
|
640
|
-
"version": "1.2.0"
|
|
641
|
-
}
|
|
628
|
+
"name": "ComponentID"
|
|
642
629
|
}
|
|
643
630
|
},
|
|
644
631
|
"isOptional": true,
|
|
@@ -699,12 +686,7 @@
|
|
|
699
686
|
"line": 395,
|
|
700
687
|
"character": 50
|
|
701
688
|
},
|
|
702
|
-
"name": "ComponentID"
|
|
703
|
-
"componentId": {
|
|
704
|
-
"scope": "teambit.component",
|
|
705
|
-
"name": "component-id",
|
|
706
|
-
"version": "1.2.0"
|
|
707
|
-
}
|
|
689
|
+
"name": "ComponentID"
|
|
708
690
|
}
|
|
709
691
|
},
|
|
710
692
|
"isOptional": true,
|
|
@@ -758,11 +740,7 @@
|
|
|
758
740
|
"line": 264,
|
|
759
741
|
"character": 78
|
|
760
742
|
},
|
|
761
|
-
"name": "WorkspaceConfigUpdateResult"
|
|
762
|
-
"componentId": {
|
|
763
|
-
"scope": "teambit.workspace",
|
|
764
|
-
"name": "config-merger"
|
|
765
|
-
}
|
|
743
|
+
"name": "WorkspaceConfigUpdateResult"
|
|
766
744
|
},
|
|
767
745
|
"isOptional": true,
|
|
768
746
|
"isSpread": false
|
|
@@ -824,14 +802,14 @@
|
|
|
824
802
|
"__schema": "FunctionLikeSchema",
|
|
825
803
|
"location": {
|
|
826
804
|
"filePath": "merge-version/three-way-merge.ts",
|
|
827
|
-
"line":
|
|
805
|
+
"line": 67,
|
|
828
806
|
"character": 1
|
|
829
807
|
},
|
|
830
808
|
"doc": {
|
|
831
809
|
"__schema": "DocSchema",
|
|
832
810
|
"location": {
|
|
833
811
|
"filePath": "merge-version/three-way-merge.ts",
|
|
834
|
-
"line":
|
|
812
|
+
"line": 54,
|
|
835
813
|
"character": 1
|
|
836
814
|
},
|
|
837
815
|
"raw": "/**\n * to do the actual merge we use git, specifically `merge-file` command, so we try to use the same\n * terminology as git. From the command help:\n * `git merge-file <current-file> <base-file> <other-file>\n * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into\n * <current-file>. The result ordinarily goes into <current-file>.`\n *\n * see checkout-version.getBaseVersion() for a case when a component is modified and then the base-file is not the\n * common file before other-file and current-file.\n * otherwise, Git terminology pretty much reflects what we do here. current-file is the one that is currently written\n * to the filesystem. other-file is the one the user wants to checkout to. base-file is the original file where both:\n * base-file and other-file were originated from.\n */",
|
|
@@ -845,7 +823,7 @@
|
|
|
845
823
|
"__schema": "ParameterSchema",
|
|
846
824
|
"location": {
|
|
847
825
|
"filePath": "merge-version/three-way-merge.ts",
|
|
848
|
-
"line":
|
|
826
|
+
"line": 67,
|
|
849
827
|
"character": 37
|
|
850
828
|
},
|
|
851
829
|
"name": "{ scope, otherComponent, otherLabel, currentComponent, currentLabel, baseComponent }",
|
|
@@ -853,7 +831,7 @@
|
|
|
853
831
|
"__schema": "TypeLiteralSchema",
|
|
854
832
|
"location": {
|
|
855
833
|
"filePath": "merge-version/three-way-merge.ts",
|
|
856
|
-
"line":
|
|
834
|
+
"line": 74,
|
|
857
835
|
"character": 4
|
|
858
836
|
},
|
|
859
837
|
"members": [
|
|
@@ -861,7 +839,7 @@
|
|
|
861
839
|
"__schema": "VariableLikeSchema",
|
|
862
840
|
"location": {
|
|
863
841
|
"filePath": "merge-version/three-way-merge.ts",
|
|
864
|
-
"line":
|
|
842
|
+
"line": 75,
|
|
865
843
|
"character": 3
|
|
866
844
|
},
|
|
867
845
|
"signature": "(property) scope: Scope",
|
|
@@ -870,7 +848,7 @@
|
|
|
870
848
|
"__schema": "TypeRefSchema",
|
|
871
849
|
"location": {
|
|
872
850
|
"filePath": "merge-version/three-way-merge.ts",
|
|
873
|
-
"line":
|
|
851
|
+
"line": 75,
|
|
874
852
|
"character": 3
|
|
875
853
|
},
|
|
876
854
|
"name": "Scope",
|
|
@@ -882,7 +860,7 @@
|
|
|
882
860
|
"__schema": "VariableLikeSchema",
|
|
883
861
|
"location": {
|
|
884
862
|
"filePath": "merge-version/three-way-merge.ts",
|
|
885
|
-
"line":
|
|
863
|
+
"line": 76,
|
|
886
864
|
"character": 3
|
|
887
865
|
},
|
|
888
866
|
"signature": "(property) otherComponent: Version",
|
|
@@ -891,7 +869,7 @@
|
|
|
891
869
|
"__schema": "TypeRefSchema",
|
|
892
870
|
"location": {
|
|
893
871
|
"filePath": "merge-version/three-way-merge.ts",
|
|
894
|
-
"line":
|
|
872
|
+
"line": 76,
|
|
895
873
|
"character": 3
|
|
896
874
|
},
|
|
897
875
|
"name": "Version",
|
|
@@ -903,7 +881,7 @@
|
|
|
903
881
|
"__schema": "VariableLikeSchema",
|
|
904
882
|
"location": {
|
|
905
883
|
"filePath": "merge-version/three-way-merge.ts",
|
|
906
|
-
"line":
|
|
884
|
+
"line": 77,
|
|
907
885
|
"character": 3
|
|
908
886
|
},
|
|
909
887
|
"signature": "(property) otherLabel: string",
|
|
@@ -912,7 +890,7 @@
|
|
|
912
890
|
"__schema": "KeywordTypeSchema",
|
|
913
891
|
"location": {
|
|
914
892
|
"filePath": "merge-version/three-way-merge.ts",
|
|
915
|
-
"line":
|
|
893
|
+
"line": 77,
|
|
916
894
|
"character": 15
|
|
917
895
|
},
|
|
918
896
|
"name": "string"
|
|
@@ -923,7 +901,7 @@
|
|
|
923
901
|
"__schema": "VariableLikeSchema",
|
|
924
902
|
"location": {
|
|
925
903
|
"filePath": "merge-version/three-way-merge.ts",
|
|
926
|
-
"line":
|
|
904
|
+
"line": 78,
|
|
927
905
|
"character": 3
|
|
928
906
|
},
|
|
929
907
|
"signature": "(property) currentComponent: Component",
|
|
@@ -932,7 +910,7 @@
|
|
|
932
910
|
"__schema": "TypeRefSchema",
|
|
933
911
|
"location": {
|
|
934
912
|
"filePath": "merge-version/three-way-merge.ts",
|
|
935
|
-
"line":
|
|
913
|
+
"line": 78,
|
|
936
914
|
"character": 3
|
|
937
915
|
},
|
|
938
916
|
"name": "Component",
|
|
@@ -944,7 +922,7 @@
|
|
|
944
922
|
"__schema": "VariableLikeSchema",
|
|
945
923
|
"location": {
|
|
946
924
|
"filePath": "merge-version/three-way-merge.ts",
|
|
947
|
-
"line":
|
|
925
|
+
"line": 79,
|
|
948
926
|
"character": 3
|
|
949
927
|
},
|
|
950
928
|
"signature": "(property) currentLabel: string",
|
|
@@ -953,7 +931,7 @@
|
|
|
953
931
|
"__schema": "KeywordTypeSchema",
|
|
954
932
|
"location": {
|
|
955
933
|
"filePath": "merge-version/three-way-merge.ts",
|
|
956
|
-
"line":
|
|
934
|
+
"line": 79,
|
|
957
935
|
"character": 17
|
|
958
936
|
},
|
|
959
937
|
"name": "string"
|
|
@@ -964,7 +942,7 @@
|
|
|
964
942
|
"__schema": "VariableLikeSchema",
|
|
965
943
|
"location": {
|
|
966
944
|
"filePath": "merge-version/three-way-merge.ts",
|
|
967
|
-
"line":
|
|
945
|
+
"line": 80,
|
|
968
946
|
"character": 3
|
|
969
947
|
},
|
|
970
948
|
"signature": "(property) baseComponent: Version",
|
|
@@ -973,7 +951,7 @@
|
|
|
973
951
|
"__schema": "TypeRefSchema",
|
|
974
952
|
"location": {
|
|
975
953
|
"filePath": "merge-version/three-way-merge.ts",
|
|
976
|
-
"line":
|
|
954
|
+
"line": 80,
|
|
977
955
|
"character": 3
|
|
978
956
|
},
|
|
979
957
|
"name": "Version",
|
|
@@ -989,7 +967,7 @@
|
|
|
989
967
|
"__schema": "VariableLikeSchema",
|
|
990
968
|
"location": {
|
|
991
969
|
"filePath": "merge-version/three-way-merge.ts",
|
|
992
|
-
"line":
|
|
970
|
+
"line": 75,
|
|
993
971
|
"character": 3
|
|
994
972
|
},
|
|
995
973
|
"signature": "(property) scope: Scope",
|
|
@@ -998,7 +976,7 @@
|
|
|
998
976
|
"__schema": "TypeRefSchema",
|
|
999
977
|
"location": {
|
|
1000
978
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1001
|
-
"line":
|
|
979
|
+
"line": 75,
|
|
1002
980
|
"character": 3
|
|
1003
981
|
},
|
|
1004
982
|
"name": "Scope",
|
|
@@ -1010,7 +988,7 @@
|
|
|
1010
988
|
"__schema": "VariableLikeSchema",
|
|
1011
989
|
"location": {
|
|
1012
990
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1013
|
-
"line":
|
|
991
|
+
"line": 76,
|
|
1014
992
|
"character": 3
|
|
1015
993
|
},
|
|
1016
994
|
"signature": "(property) otherComponent: Version",
|
|
@@ -1019,7 +997,7 @@
|
|
|
1019
997
|
"__schema": "TypeRefSchema",
|
|
1020
998
|
"location": {
|
|
1021
999
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1022
|
-
"line":
|
|
1000
|
+
"line": 76,
|
|
1023
1001
|
"character": 3
|
|
1024
1002
|
},
|
|
1025
1003
|
"name": "Version",
|
|
@@ -1031,7 +1009,7 @@
|
|
|
1031
1009
|
"__schema": "VariableLikeSchema",
|
|
1032
1010
|
"location": {
|
|
1033
1011
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1034
|
-
"line":
|
|
1012
|
+
"line": 77,
|
|
1035
1013
|
"character": 3
|
|
1036
1014
|
},
|
|
1037
1015
|
"signature": "(property) otherLabel: string",
|
|
@@ -1040,7 +1018,7 @@
|
|
|
1040
1018
|
"__schema": "KeywordTypeSchema",
|
|
1041
1019
|
"location": {
|
|
1042
1020
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1043
|
-
"line":
|
|
1021
|
+
"line": 77,
|
|
1044
1022
|
"character": 15
|
|
1045
1023
|
},
|
|
1046
1024
|
"name": "string"
|
|
@@ -1051,7 +1029,7 @@
|
|
|
1051
1029
|
"__schema": "VariableLikeSchema",
|
|
1052
1030
|
"location": {
|
|
1053
1031
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1054
|
-
"line":
|
|
1032
|
+
"line": 78,
|
|
1055
1033
|
"character": 3
|
|
1056
1034
|
},
|
|
1057
1035
|
"signature": "(property) currentComponent: Component",
|
|
@@ -1060,7 +1038,7 @@
|
|
|
1060
1038
|
"__schema": "TypeRefSchema",
|
|
1061
1039
|
"location": {
|
|
1062
1040
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1063
|
-
"line":
|
|
1041
|
+
"line": 78,
|
|
1064
1042
|
"character": 3
|
|
1065
1043
|
},
|
|
1066
1044
|
"name": "Component",
|
|
@@ -1072,7 +1050,7 @@
|
|
|
1072
1050
|
"__schema": "VariableLikeSchema",
|
|
1073
1051
|
"location": {
|
|
1074
1052
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1075
|
-
"line":
|
|
1053
|
+
"line": 79,
|
|
1076
1054
|
"character": 3
|
|
1077
1055
|
},
|
|
1078
1056
|
"signature": "(property) currentLabel: string",
|
|
@@ -1081,7 +1059,7 @@
|
|
|
1081
1059
|
"__schema": "KeywordTypeSchema",
|
|
1082
1060
|
"location": {
|
|
1083
1061
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1084
|
-
"line":
|
|
1062
|
+
"line": 79,
|
|
1085
1063
|
"character": 17
|
|
1086
1064
|
},
|
|
1087
1065
|
"name": "string"
|
|
@@ -1092,7 +1070,7 @@
|
|
|
1092
1070
|
"__schema": "VariableLikeSchema",
|
|
1093
1071
|
"location": {
|
|
1094
1072
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1095
|
-
"line":
|
|
1073
|
+
"line": 80,
|
|
1096
1074
|
"character": 3
|
|
1097
1075
|
},
|
|
1098
1076
|
"signature": "(property) baseComponent: Version",
|
|
@@ -1101,7 +1079,7 @@
|
|
|
1101
1079
|
"__schema": "TypeRefSchema",
|
|
1102
1080
|
"location": {
|
|
1103
1081
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1104
|
-
"line":
|
|
1082
|
+
"line": 80,
|
|
1105
1083
|
"character": 3
|
|
1106
1084
|
},
|
|
1107
1085
|
"name": "Version",
|
|
@@ -1117,7 +1095,7 @@
|
|
|
1117
1095
|
"__schema": "TypeRefSchema",
|
|
1118
1096
|
"location": {
|
|
1119
1097
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1120
|
-
"line":
|
|
1098
|
+
"line": 81,
|
|
1121
1099
|
"character": 5
|
|
1122
1100
|
},
|
|
1123
1101
|
"name": "Promise",
|
|
@@ -1126,7 +1104,7 @@
|
|
|
1126
1104
|
"__schema": "TypeRefSchema",
|
|
1127
1105
|
"location": {
|
|
1128
1106
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1129
|
-
"line":
|
|
1107
|
+
"line": 81,
|
|
1130
1108
|
"character": 13
|
|
1131
1109
|
},
|
|
1132
1110
|
"name": "MergeResultsThreeWay"
|
|
@@ -1301,7 +1279,7 @@
|
|
|
1301
1279
|
"__schema": "TypeSchema",
|
|
1302
1280
|
"location": {
|
|
1303
1281
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1304
|
-
"line":
|
|
1282
|
+
"line": 14,
|
|
1305
1283
|
"character": 1
|
|
1306
1284
|
},
|
|
1307
1285
|
"signature": "type MergeResultsThreeWay = {\n addFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n removeFiles: Array<{\n filePath: PathLinux;\n }>;\n remainDeletedFiles: Array<{\n filePath: PathLinux;\n }>;\n deletedConflictFiles: Array<{\n filePath: PathLinux;\n fsFile?: SourceFile;\n }>;\n modifiedFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n baseFile?: SourceFileModel;\n otherFile: SourceFileModel;\n output: string | null | undefined;\n conflict: string | null | undefined;\n isBinaryConflict?: boolean;\n }>;\n unModifiedFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n overrideFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n updatedFiles: Array<{\n filePath: PathLinux;\n otherFile: SourceFileModel;\n content: Buffer;\n }>;\n hasConflicts: boolean;\n}",
|
|
@@ -1310,7 +1288,7 @@
|
|
|
1310
1288
|
"__schema": "TypeLiteralSchema",
|
|
1311
1289
|
"location": {
|
|
1312
1290
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1313
|
-
"line":
|
|
1291
|
+
"line": 14,
|
|
1314
1292
|
"character": 36
|
|
1315
1293
|
},
|
|
1316
1294
|
"members": [
|
|
@@ -1318,7 +1296,7 @@
|
|
|
1318
1296
|
"__schema": "VariableLikeSchema",
|
|
1319
1297
|
"location": {
|
|
1320
1298
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1321
|
-
"line":
|
|
1299
|
+
"line": 15,
|
|
1322
1300
|
"character": 3
|
|
1323
1301
|
},
|
|
1324
1302
|
"signature": "(property) addFiles: {\n filePath: PathLinux;\n fsFile: SourceFile;\n}[]",
|
|
@@ -1327,7 +1305,7 @@
|
|
|
1327
1305
|
"__schema": "TypeRefSchema",
|
|
1328
1306
|
"location": {
|
|
1329
1307
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1330
|
-
"line":
|
|
1308
|
+
"line": 15,
|
|
1331
1309
|
"character": 13
|
|
1332
1310
|
},
|
|
1333
1311
|
"name": "Array",
|
|
@@ -1336,7 +1314,7 @@
|
|
|
1336
1314
|
"__schema": "TypeLiteralSchema",
|
|
1337
1315
|
"location": {
|
|
1338
1316
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1339
|
-
"line":
|
|
1317
|
+
"line": 15,
|
|
1340
1318
|
"character": 19
|
|
1341
1319
|
},
|
|
1342
1320
|
"members": [
|
|
@@ -1344,7 +1322,7 @@
|
|
|
1344
1322
|
"__schema": "VariableLikeSchema",
|
|
1345
1323
|
"location": {
|
|
1346
1324
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1347
|
-
"line":
|
|
1325
|
+
"line": 16,
|
|
1348
1326
|
"character": 5
|
|
1349
1327
|
},
|
|
1350
1328
|
"signature": "(property) filePath: string",
|
|
@@ -1353,11 +1331,10 @@
|
|
|
1353
1331
|
"__schema": "TypeRefSchema",
|
|
1354
1332
|
"location": {
|
|
1355
1333
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1356
|
-
"line":
|
|
1334
|
+
"line": 16,
|
|
1357
1335
|
"character": 15
|
|
1358
1336
|
},
|
|
1359
|
-
"name": "PathLinux"
|
|
1360
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
1337
|
+
"name": "PathLinux"
|
|
1361
1338
|
},
|
|
1362
1339
|
"isOptional": false
|
|
1363
1340
|
},
|
|
@@ -1365,7 +1342,7 @@
|
|
|
1365
1342
|
"__schema": "VariableLikeSchema",
|
|
1366
1343
|
"location": {
|
|
1367
1344
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1368
|
-
"line":
|
|
1345
|
+
"line": 17,
|
|
1369
1346
|
"character": 5
|
|
1370
1347
|
},
|
|
1371
1348
|
"signature": "(property) fsFile: SourceFile",
|
|
@@ -1374,7 +1351,7 @@
|
|
|
1374
1351
|
"__schema": "TypeRefSchema",
|
|
1375
1352
|
"location": {
|
|
1376
1353
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1377
|
-
"line":
|
|
1354
|
+
"line": 17,
|
|
1378
1355
|
"character": 5
|
|
1379
1356
|
},
|
|
1380
1357
|
"name": "SourceFile",
|
|
@@ -1392,7 +1369,7 @@
|
|
|
1392
1369
|
"__schema": "VariableLikeSchema",
|
|
1393
1370
|
"location": {
|
|
1394
1371
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1395
|
-
"line":
|
|
1372
|
+
"line": 19,
|
|
1396
1373
|
"character": 3
|
|
1397
1374
|
},
|
|
1398
1375
|
"signature": "(property) removeFiles: {\n filePath: PathLinux;\n}[]",
|
|
@@ -1401,7 +1378,7 @@
|
|
|
1401
1378
|
"__schema": "TypeRefSchema",
|
|
1402
1379
|
"location": {
|
|
1403
1380
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1404
|
-
"line":
|
|
1381
|
+
"line": 19,
|
|
1405
1382
|
"character": 16
|
|
1406
1383
|
},
|
|
1407
1384
|
"name": "Array",
|
|
@@ -1410,7 +1387,7 @@
|
|
|
1410
1387
|
"__schema": "TypeLiteralSchema",
|
|
1411
1388
|
"location": {
|
|
1412
1389
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1413
|
-
"line":
|
|
1390
|
+
"line": 19,
|
|
1414
1391
|
"character": 22
|
|
1415
1392
|
},
|
|
1416
1393
|
"members": [
|
|
@@ -1418,7 +1395,7 @@
|
|
|
1418
1395
|
"__schema": "VariableLikeSchema",
|
|
1419
1396
|
"location": {
|
|
1420
1397
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1421
|
-
"line":
|
|
1398
|
+
"line": 20,
|
|
1422
1399
|
"character": 5
|
|
1423
1400
|
},
|
|
1424
1401
|
"signature": "(property) filePath: string",
|
|
@@ -1427,11 +1404,10 @@
|
|
|
1427
1404
|
"__schema": "TypeRefSchema",
|
|
1428
1405
|
"location": {
|
|
1429
1406
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1430
|
-
"line":
|
|
1407
|
+
"line": 20,
|
|
1431
1408
|
"character": 15
|
|
1432
1409
|
},
|
|
1433
|
-
"name": "PathLinux"
|
|
1434
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
1410
|
+
"name": "PathLinux"
|
|
1435
1411
|
},
|
|
1436
1412
|
"isOptional": false
|
|
1437
1413
|
}
|
|
@@ -1445,7 +1421,7 @@
|
|
|
1445
1421
|
"__schema": "VariableLikeSchema",
|
|
1446
1422
|
"location": {
|
|
1447
1423
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1448
|
-
"line":
|
|
1424
|
+
"line": 22,
|
|
1449
1425
|
"character": 3
|
|
1450
1426
|
},
|
|
1451
1427
|
"signature": "(property) remainDeletedFiles: {\n filePath: PathLinux;\n}[]",
|
|
@@ -1454,7 +1430,7 @@
|
|
|
1454
1430
|
"__schema": "TypeRefSchema",
|
|
1455
1431
|
"location": {
|
|
1456
1432
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1457
|
-
"line":
|
|
1433
|
+
"line": 22,
|
|
1458
1434
|
"character": 23
|
|
1459
1435
|
},
|
|
1460
1436
|
"name": "Array",
|
|
@@ -1463,7 +1439,7 @@
|
|
|
1463
1439
|
"__schema": "TypeLiteralSchema",
|
|
1464
1440
|
"location": {
|
|
1465
1441
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1466
|
-
"line":
|
|
1442
|
+
"line": 22,
|
|
1467
1443
|
"character": 29
|
|
1468
1444
|
},
|
|
1469
1445
|
"members": [
|
|
@@ -1471,7 +1447,7 @@
|
|
|
1471
1447
|
"__schema": "VariableLikeSchema",
|
|
1472
1448
|
"location": {
|
|
1473
1449
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1474
|
-
"line":
|
|
1450
|
+
"line": 23,
|
|
1475
1451
|
"character": 5
|
|
1476
1452
|
},
|
|
1477
1453
|
"signature": "(property) filePath: string",
|
|
@@ -1480,11 +1456,10 @@
|
|
|
1480
1456
|
"__schema": "TypeRefSchema",
|
|
1481
1457
|
"location": {
|
|
1482
1458
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1483
|
-
"line":
|
|
1459
|
+
"line": 23,
|
|
1484
1460
|
"character": 15
|
|
1485
1461
|
},
|
|
1486
|
-
"name": "PathLinux"
|
|
1487
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
1462
|
+
"name": "PathLinux"
|
|
1488
1463
|
},
|
|
1489
1464
|
"isOptional": false
|
|
1490
1465
|
}
|
|
@@ -1498,7 +1473,7 @@
|
|
|
1498
1473
|
"__schema": "VariableLikeSchema",
|
|
1499
1474
|
"location": {
|
|
1500
1475
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1501
|
-
"line":
|
|
1476
|
+
"line": 25,
|
|
1502
1477
|
"character": 3
|
|
1503
1478
|
},
|
|
1504
1479
|
"signature": "(property) deletedConflictFiles: {\n filePath: PathLinux;\n fsFile?: SourceFile | undefined;\n}[]",
|
|
@@ -1507,7 +1482,7 @@
|
|
|
1507
1482
|
"__schema": "TypeRefSchema",
|
|
1508
1483
|
"location": {
|
|
1509
1484
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1510
|
-
"line":
|
|
1485
|
+
"line": 25,
|
|
1511
1486
|
"character": 25
|
|
1512
1487
|
},
|
|
1513
1488
|
"name": "Array",
|
|
@@ -1516,7 +1491,7 @@
|
|
|
1516
1491
|
"__schema": "TypeLiteralSchema",
|
|
1517
1492
|
"location": {
|
|
1518
1493
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1519
|
-
"line":
|
|
1494
|
+
"line": 25,
|
|
1520
1495
|
"character": 31
|
|
1521
1496
|
},
|
|
1522
1497
|
"members": [
|
|
@@ -1524,7 +1499,7 @@
|
|
|
1524
1499
|
"__schema": "VariableLikeSchema",
|
|
1525
1500
|
"location": {
|
|
1526
1501
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1527
|
-
"line":
|
|
1502
|
+
"line": 26,
|
|
1528
1503
|
"character": 5
|
|
1529
1504
|
},
|
|
1530
1505
|
"signature": "(property) filePath: string",
|
|
@@ -1533,11 +1508,10 @@
|
|
|
1533
1508
|
"__schema": "TypeRefSchema",
|
|
1534
1509
|
"location": {
|
|
1535
1510
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1536
|
-
"line":
|
|
1511
|
+
"line": 26,
|
|
1537
1512
|
"character": 15
|
|
1538
1513
|
},
|
|
1539
|
-
"name": "PathLinux"
|
|
1540
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
1514
|
+
"name": "PathLinux"
|
|
1541
1515
|
},
|
|
1542
1516
|
"isOptional": false
|
|
1543
1517
|
},
|
|
@@ -1545,7 +1519,7 @@
|
|
|
1545
1519
|
"__schema": "VariableLikeSchema",
|
|
1546
1520
|
"location": {
|
|
1547
1521
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1548
|
-
"line":
|
|
1522
|
+
"line": 27,
|
|
1549
1523
|
"character": 5
|
|
1550
1524
|
},
|
|
1551
1525
|
"signature": "(property) fsFile?: SourceFile | undefined",
|
|
@@ -1554,11 +1528,10 @@
|
|
|
1554
1528
|
"__schema": "TypeRefSchema",
|
|
1555
1529
|
"location": {
|
|
1556
1530
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1557
|
-
"line":
|
|
1531
|
+
"line": 27,
|
|
1558
1532
|
"character": 14
|
|
1559
1533
|
},
|
|
1560
|
-
"name": "SourceFile"
|
|
1561
|
-
"packageName": "@teambit/legacy/dist/consumer/component/sources"
|
|
1534
|
+
"name": "SourceFile"
|
|
1562
1535
|
},
|
|
1563
1536
|
"isOptional": true
|
|
1564
1537
|
}
|
|
@@ -1572,7 +1545,7 @@
|
|
|
1572
1545
|
"__schema": "VariableLikeSchema",
|
|
1573
1546
|
"location": {
|
|
1574
1547
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1575
|
-
"line":
|
|
1548
|
+
"line": 29,
|
|
1576
1549
|
"character": 3
|
|
1577
1550
|
},
|
|
1578
1551
|
"signature": "(property) modifiedFiles: {\n filePath: PathLinux;\n fsFile: SourceFile;\n baseFile?: SourceFileModel | undefined;\n otherFile: SourceFileModel;\n output: string | null | undefined;\n conflict: string | null | undefined;\n isBinaryConflict?: boolean | undefined;\n}[]",
|
|
@@ -1581,7 +1554,7 @@
|
|
|
1581
1554
|
"__schema": "TypeRefSchema",
|
|
1582
1555
|
"location": {
|
|
1583
1556
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1584
|
-
"line":
|
|
1557
|
+
"line": 29,
|
|
1585
1558
|
"character": 18
|
|
1586
1559
|
},
|
|
1587
1560
|
"name": "Array",
|
|
@@ -1590,7 +1563,7 @@
|
|
|
1590
1563
|
"__schema": "TypeLiteralSchema",
|
|
1591
1564
|
"location": {
|
|
1592
1565
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1593
|
-
"line":
|
|
1566
|
+
"line": 29,
|
|
1594
1567
|
"character": 24
|
|
1595
1568
|
},
|
|
1596
1569
|
"members": [
|
|
@@ -1598,7 +1571,7 @@
|
|
|
1598
1571
|
"__schema": "VariableLikeSchema",
|
|
1599
1572
|
"location": {
|
|
1600
1573
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1601
|
-
"line":
|
|
1574
|
+
"line": 30,
|
|
1602
1575
|
"character": 5
|
|
1603
1576
|
},
|
|
1604
1577
|
"signature": "(property) filePath: string",
|
|
@@ -1607,11 +1580,10 @@
|
|
|
1607
1580
|
"__schema": "TypeRefSchema",
|
|
1608
1581
|
"location": {
|
|
1609
1582
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1610
|
-
"line":
|
|
1583
|
+
"line": 30,
|
|
1611
1584
|
"character": 15
|
|
1612
1585
|
},
|
|
1613
|
-
"name": "PathLinux"
|
|
1614
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
1586
|
+
"name": "PathLinux"
|
|
1615
1587
|
},
|
|
1616
1588
|
"isOptional": false
|
|
1617
1589
|
},
|
|
@@ -1619,7 +1591,7 @@
|
|
|
1619
1591
|
"__schema": "VariableLikeSchema",
|
|
1620
1592
|
"location": {
|
|
1621
1593
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1622
|
-
"line":
|
|
1594
|
+
"line": 31,
|
|
1623
1595
|
"character": 5
|
|
1624
1596
|
},
|
|
1625
1597
|
"signature": "(property) fsFile: SourceFile",
|
|
@@ -1628,7 +1600,7 @@
|
|
|
1628
1600
|
"__schema": "TypeRefSchema",
|
|
1629
1601
|
"location": {
|
|
1630
1602
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1631
|
-
"line":
|
|
1603
|
+
"line": 31,
|
|
1632
1604
|
"character": 5
|
|
1633
1605
|
},
|
|
1634
1606
|
"name": "SourceFile",
|
|
@@ -1640,7 +1612,7 @@
|
|
|
1640
1612
|
"__schema": "VariableLikeSchema",
|
|
1641
1613
|
"location": {
|
|
1642
1614
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1643
|
-
"line":
|
|
1615
|
+
"line": 32,
|
|
1644
1616
|
"character": 5
|
|
1645
1617
|
},
|
|
1646
1618
|
"signature": "(property) baseFile?: SourceFileModel | undefined",
|
|
@@ -1649,11 +1621,10 @@
|
|
|
1649
1621
|
"__schema": "TypeRefSchema",
|
|
1650
1622
|
"location": {
|
|
1651
1623
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1652
|
-
"line":
|
|
1624
|
+
"line": 32,
|
|
1653
1625
|
"character": 16
|
|
1654
1626
|
},
|
|
1655
|
-
"name": "SourceFileModel"
|
|
1656
|
-
"packageName": "@teambit/legacy/dist/scope/models/version"
|
|
1627
|
+
"name": "SourceFileModel"
|
|
1657
1628
|
},
|
|
1658
1629
|
"isOptional": true
|
|
1659
1630
|
},
|
|
@@ -1661,7 +1632,7 @@
|
|
|
1661
1632
|
"__schema": "VariableLikeSchema",
|
|
1662
1633
|
"location": {
|
|
1663
1634
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1664
|
-
"line":
|
|
1635
|
+
"line": 33,
|
|
1665
1636
|
"character": 5
|
|
1666
1637
|
},
|
|
1667
1638
|
"signature": "(property) otherFile: SourceFileModel",
|
|
@@ -1670,7 +1641,7 @@
|
|
|
1670
1641
|
"__schema": "TypeRefSchema",
|
|
1671
1642
|
"location": {
|
|
1672
1643
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1673
|
-
"line":
|
|
1644
|
+
"line": 33,
|
|
1674
1645
|
"character": 5
|
|
1675
1646
|
},
|
|
1676
1647
|
"name": "SourceFileModel",
|
|
@@ -1682,7 +1653,7 @@
|
|
|
1682
1653
|
"__schema": "VariableLikeSchema",
|
|
1683
1654
|
"location": {
|
|
1684
1655
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1685
|
-
"line":
|
|
1656
|
+
"line": 34,
|
|
1686
1657
|
"character": 5
|
|
1687
1658
|
},
|
|
1688
1659
|
"signature": "(property) output: string | null | undefined",
|
|
@@ -1691,7 +1662,7 @@
|
|
|
1691
1662
|
"__schema": "TypeUnionSchema",
|
|
1692
1663
|
"location": {
|
|
1693
1664
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1694
|
-
"line":
|
|
1665
|
+
"line": 34,
|
|
1695
1666
|
"character": 13
|
|
1696
1667
|
},
|
|
1697
1668
|
"types": [
|
|
@@ -1699,7 +1670,7 @@
|
|
|
1699
1670
|
"__schema": "KeywordTypeSchema",
|
|
1700
1671
|
"location": {
|
|
1701
1672
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1702
|
-
"line":
|
|
1673
|
+
"line": 34,
|
|
1703
1674
|
"character": 13
|
|
1704
1675
|
},
|
|
1705
1676
|
"name": "string"
|
|
@@ -1708,7 +1679,7 @@
|
|
|
1708
1679
|
"__schema": "LiteralTypeSchema",
|
|
1709
1680
|
"location": {
|
|
1710
1681
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1711
|
-
"line":
|
|
1682
|
+
"line": 34,
|
|
1712
1683
|
"character": 22
|
|
1713
1684
|
},
|
|
1714
1685
|
"name": "null"
|
|
@@ -1717,7 +1688,7 @@
|
|
|
1717
1688
|
"__schema": "KeywordTypeSchema",
|
|
1718
1689
|
"location": {
|
|
1719
1690
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1720
|
-
"line":
|
|
1691
|
+
"line": 34,
|
|
1721
1692
|
"character": 29
|
|
1722
1693
|
},
|
|
1723
1694
|
"name": "undefined"
|
|
@@ -1730,7 +1701,7 @@
|
|
|
1730
1701
|
"__schema": "VariableLikeSchema",
|
|
1731
1702
|
"location": {
|
|
1732
1703
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1733
|
-
"line":
|
|
1704
|
+
"line": 35,
|
|
1734
1705
|
"character": 5
|
|
1735
1706
|
},
|
|
1736
1707
|
"signature": "(property) conflict: string | null | undefined",
|
|
@@ -1739,7 +1710,7 @@
|
|
|
1739
1710
|
"__schema": "TypeUnionSchema",
|
|
1740
1711
|
"location": {
|
|
1741
1712
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1742
|
-
"line":
|
|
1713
|
+
"line": 35,
|
|
1743
1714
|
"character": 15
|
|
1744
1715
|
},
|
|
1745
1716
|
"types": [
|
|
@@ -1747,7 +1718,7 @@
|
|
|
1747
1718
|
"__schema": "KeywordTypeSchema",
|
|
1748
1719
|
"location": {
|
|
1749
1720
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1750
|
-
"line":
|
|
1721
|
+
"line": 35,
|
|
1751
1722
|
"character": 15
|
|
1752
1723
|
},
|
|
1753
1724
|
"name": "string"
|
|
@@ -1756,7 +1727,7 @@
|
|
|
1756
1727
|
"__schema": "LiteralTypeSchema",
|
|
1757
1728
|
"location": {
|
|
1758
1729
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1759
|
-
"line":
|
|
1730
|
+
"line": 35,
|
|
1760
1731
|
"character": 24
|
|
1761
1732
|
},
|
|
1762
1733
|
"name": "null"
|
|
@@ -1765,7 +1736,7 @@
|
|
|
1765
1736
|
"__schema": "KeywordTypeSchema",
|
|
1766
1737
|
"location": {
|
|
1767
1738
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1768
|
-
"line":
|
|
1739
|
+
"line": 35,
|
|
1769
1740
|
"character": 31
|
|
1770
1741
|
},
|
|
1771
1742
|
"name": "undefined"
|
|
@@ -1778,7 +1749,7 @@
|
|
|
1778
1749
|
"__schema": "VariableLikeSchema",
|
|
1779
1750
|
"location": {
|
|
1780
1751
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1781
|
-
"line":
|
|
1752
|
+
"line": 36,
|
|
1782
1753
|
"character": 5
|
|
1783
1754
|
},
|
|
1784
1755
|
"signature": "(property) isBinaryConflict?: boolean | undefined",
|
|
@@ -1787,7 +1758,7 @@
|
|
|
1787
1758
|
"__schema": "KeywordTypeSchema",
|
|
1788
1759
|
"location": {
|
|
1789
1760
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1790
|
-
"line":
|
|
1761
|
+
"line": 36,
|
|
1791
1762
|
"character": 24
|
|
1792
1763
|
},
|
|
1793
1764
|
"name": "boolean"
|
|
@@ -1804,7 +1775,7 @@
|
|
|
1804
1775
|
"__schema": "VariableLikeSchema",
|
|
1805
1776
|
"location": {
|
|
1806
1777
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1807
|
-
"line":
|
|
1778
|
+
"line": 38,
|
|
1808
1779
|
"character": 3
|
|
1809
1780
|
},
|
|
1810
1781
|
"signature": "(property) unModifiedFiles: {\n filePath: PathLinux;\n fsFile: SourceFile;\n}[]",
|
|
@@ -1813,7 +1784,7 @@
|
|
|
1813
1784
|
"__schema": "TypeRefSchema",
|
|
1814
1785
|
"location": {
|
|
1815
1786
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1816
|
-
"line":
|
|
1787
|
+
"line": 38,
|
|
1817
1788
|
"character": 20
|
|
1818
1789
|
},
|
|
1819
1790
|
"name": "Array",
|
|
@@ -1822,7 +1793,7 @@
|
|
|
1822
1793
|
"__schema": "TypeLiteralSchema",
|
|
1823
1794
|
"location": {
|
|
1824
1795
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1825
|
-
"line":
|
|
1796
|
+
"line": 38,
|
|
1826
1797
|
"character": 26
|
|
1827
1798
|
},
|
|
1828
1799
|
"members": [
|
|
@@ -1830,7 +1801,7 @@
|
|
|
1830
1801
|
"__schema": "VariableLikeSchema",
|
|
1831
1802
|
"location": {
|
|
1832
1803
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1833
|
-
"line":
|
|
1804
|
+
"line": 39,
|
|
1834
1805
|
"character": 5
|
|
1835
1806
|
},
|
|
1836
1807
|
"signature": "(property) filePath: string",
|
|
@@ -1839,11 +1810,10 @@
|
|
|
1839
1810
|
"__schema": "TypeRefSchema",
|
|
1840
1811
|
"location": {
|
|
1841
1812
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1842
|
-
"line":
|
|
1813
|
+
"line": 39,
|
|
1843
1814
|
"character": 15
|
|
1844
1815
|
},
|
|
1845
|
-
"name": "PathLinux"
|
|
1846
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
1816
|
+
"name": "PathLinux"
|
|
1847
1817
|
},
|
|
1848
1818
|
"isOptional": false
|
|
1849
1819
|
},
|
|
@@ -1851,7 +1821,7 @@
|
|
|
1851
1821
|
"__schema": "VariableLikeSchema",
|
|
1852
1822
|
"location": {
|
|
1853
1823
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1854
|
-
"line":
|
|
1824
|
+
"line": 40,
|
|
1855
1825
|
"character": 5
|
|
1856
1826
|
},
|
|
1857
1827
|
"signature": "(property) fsFile: SourceFile",
|
|
@@ -1860,7 +1830,7 @@
|
|
|
1860
1830
|
"__schema": "TypeRefSchema",
|
|
1861
1831
|
"location": {
|
|
1862
1832
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1863
|
-
"line":
|
|
1833
|
+
"line": 40,
|
|
1864
1834
|
"character": 5
|
|
1865
1835
|
},
|
|
1866
1836
|
"name": "SourceFile",
|
|
@@ -1878,7 +1848,7 @@
|
|
|
1878
1848
|
"__schema": "VariableLikeSchema",
|
|
1879
1849
|
"location": {
|
|
1880
1850
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1881
|
-
"line":
|
|
1851
|
+
"line": 42,
|
|
1882
1852
|
"character": 3
|
|
1883
1853
|
},
|
|
1884
1854
|
"signature": "(property) overrideFiles: {\n filePath: PathLinux;\n fsFile: SourceFile;\n}[]",
|
|
@@ -1887,7 +1857,7 @@
|
|
|
1887
1857
|
"__schema": "TypeRefSchema",
|
|
1888
1858
|
"location": {
|
|
1889
1859
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1890
|
-
"line":
|
|
1860
|
+
"line": 42,
|
|
1891
1861
|
"character": 18
|
|
1892
1862
|
},
|
|
1893
1863
|
"name": "Array",
|
|
@@ -1896,7 +1866,7 @@
|
|
|
1896
1866
|
"__schema": "TypeLiteralSchema",
|
|
1897
1867
|
"location": {
|
|
1898
1868
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1899
|
-
"line":
|
|
1869
|
+
"line": 42,
|
|
1900
1870
|
"character": 24
|
|
1901
1871
|
},
|
|
1902
1872
|
"members": [
|
|
@@ -1904,7 +1874,7 @@
|
|
|
1904
1874
|
"__schema": "VariableLikeSchema",
|
|
1905
1875
|
"location": {
|
|
1906
1876
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1907
|
-
"line":
|
|
1877
|
+
"line": 43,
|
|
1908
1878
|
"character": 5
|
|
1909
1879
|
},
|
|
1910
1880
|
"signature": "(property) filePath: string",
|
|
@@ -1913,11 +1883,10 @@
|
|
|
1913
1883
|
"__schema": "TypeRefSchema",
|
|
1914
1884
|
"location": {
|
|
1915
1885
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1916
|
-
"line":
|
|
1886
|
+
"line": 43,
|
|
1917
1887
|
"character": 15
|
|
1918
1888
|
},
|
|
1919
|
-
"name": "PathLinux"
|
|
1920
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
1889
|
+
"name": "PathLinux"
|
|
1921
1890
|
},
|
|
1922
1891
|
"isOptional": false
|
|
1923
1892
|
},
|
|
@@ -1925,7 +1894,7 @@
|
|
|
1925
1894
|
"__schema": "VariableLikeSchema",
|
|
1926
1895
|
"location": {
|
|
1927
1896
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1928
|
-
"line":
|
|
1897
|
+
"line": 44,
|
|
1929
1898
|
"character": 5
|
|
1930
1899
|
},
|
|
1931
1900
|
"signature": "(property) fsFile: SourceFile",
|
|
@@ -1934,7 +1903,7 @@
|
|
|
1934
1903
|
"__schema": "TypeRefSchema",
|
|
1935
1904
|
"location": {
|
|
1936
1905
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1937
|
-
"line":
|
|
1906
|
+
"line": 44,
|
|
1938
1907
|
"character": 5
|
|
1939
1908
|
},
|
|
1940
1909
|
"name": "SourceFile",
|
|
@@ -1952,7 +1921,7 @@
|
|
|
1952
1921
|
"__schema": "VariableLikeSchema",
|
|
1953
1922
|
"location": {
|
|
1954
1923
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1955
|
-
"line":
|
|
1924
|
+
"line": 46,
|
|
1956
1925
|
"character": 3
|
|
1957
1926
|
},
|
|
1958
1927
|
"signature": "(property) updatedFiles: {\n filePath: PathLinux;\n otherFile: SourceFileModel;\n content: Buffer;\n}[]",
|
|
@@ -1961,7 +1930,7 @@
|
|
|
1961
1930
|
"__schema": "TypeRefSchema",
|
|
1962
1931
|
"location": {
|
|
1963
1932
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1964
|
-
"line":
|
|
1933
|
+
"line": 46,
|
|
1965
1934
|
"character": 17
|
|
1966
1935
|
},
|
|
1967
1936
|
"name": "Array",
|
|
@@ -1970,7 +1939,7 @@
|
|
|
1970
1939
|
"__schema": "TypeLiteralSchema",
|
|
1971
1940
|
"location": {
|
|
1972
1941
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1973
|
-
"line":
|
|
1942
|
+
"line": 46,
|
|
1974
1943
|
"character": 23
|
|
1975
1944
|
},
|
|
1976
1945
|
"members": [
|
|
@@ -1978,7 +1947,7 @@
|
|
|
1978
1947
|
"__schema": "VariableLikeSchema",
|
|
1979
1948
|
"location": {
|
|
1980
1949
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1981
|
-
"line":
|
|
1950
|
+
"line": 47,
|
|
1982
1951
|
"character": 5
|
|
1983
1952
|
},
|
|
1984
1953
|
"signature": "(property) filePath: string",
|
|
@@ -1987,11 +1956,10 @@
|
|
|
1987
1956
|
"__schema": "TypeRefSchema",
|
|
1988
1957
|
"location": {
|
|
1989
1958
|
"filePath": "merge-version/three-way-merge.ts",
|
|
1990
|
-
"line":
|
|
1959
|
+
"line": 47,
|
|
1991
1960
|
"character": 15
|
|
1992
1961
|
},
|
|
1993
|
-
"name": "PathLinux"
|
|
1994
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
1962
|
+
"name": "PathLinux"
|
|
1995
1963
|
},
|
|
1996
1964
|
"isOptional": false
|
|
1997
1965
|
},
|
|
@@ -1999,7 +1967,7 @@
|
|
|
1999
1967
|
"__schema": "VariableLikeSchema",
|
|
2000
1968
|
"location": {
|
|
2001
1969
|
"filePath": "merge-version/three-way-merge.ts",
|
|
2002
|
-
"line":
|
|
1970
|
+
"line": 48,
|
|
2003
1971
|
"character": 5
|
|
2004
1972
|
},
|
|
2005
1973
|
"signature": "(property) otherFile: SourceFileModel",
|
|
@@ -2008,7 +1976,7 @@
|
|
|
2008
1976
|
"__schema": "TypeRefSchema",
|
|
2009
1977
|
"location": {
|
|
2010
1978
|
"filePath": "merge-version/three-way-merge.ts",
|
|
2011
|
-
"line":
|
|
1979
|
+
"line": 48,
|
|
2012
1980
|
"character": 5
|
|
2013
1981
|
},
|
|
2014
1982
|
"name": "SourceFileModel",
|
|
@@ -2020,7 +1988,7 @@
|
|
|
2020
1988
|
"__schema": "VariableLikeSchema",
|
|
2021
1989
|
"location": {
|
|
2022
1990
|
"filePath": "merge-version/three-way-merge.ts",
|
|
2023
|
-
"line":
|
|
1991
|
+
"line": 49,
|
|
2024
1992
|
"character": 5
|
|
2025
1993
|
},
|
|
2026
1994
|
"signature": "(property) content: Buffer",
|
|
@@ -2029,7 +1997,7 @@
|
|
|
2029
1997
|
"__schema": "TypeRefSchema",
|
|
2030
1998
|
"location": {
|
|
2031
1999
|
"filePath": "merge-version/three-way-merge.ts",
|
|
2032
|
-
"line":
|
|
2000
|
+
"line": 49,
|
|
2033
2001
|
"character": 14
|
|
2034
2002
|
},
|
|
2035
2003
|
"name": "Buffer"
|
|
@@ -2046,7 +2014,7 @@
|
|
|
2046
2014
|
"__schema": "VariableLikeSchema",
|
|
2047
2015
|
"location": {
|
|
2048
2016
|
"filePath": "merge-version/three-way-merge.ts",
|
|
2049
|
-
"line":
|
|
2017
|
+
"line": 51,
|
|
2050
2018
|
"character": 3
|
|
2051
2019
|
},
|
|
2052
2020
|
"signature": "(property) hasConflicts: boolean",
|
|
@@ -2055,7 +2023,7 @@
|
|
|
2055
2023
|
"__schema": "KeywordTypeSchema",
|
|
2056
2024
|
"location": {
|
|
2057
2025
|
"filePath": "merge-version/three-way-merge.ts",
|
|
2058
|
-
"line":
|
|
2026
|
+
"line": 51,
|
|
2059
2027
|
"character": 17
|
|
2060
2028
|
},
|
|
2061
2029
|
"name": "boolean"
|
|
@@ -2078,7 +2046,7 @@
|
|
|
2078
2046
|
"__schema": "TypeSchema",
|
|
2079
2047
|
"location": {
|
|
2080
2048
|
"filePath": "merge-files.ts",
|
|
2081
|
-
"line":
|
|
2049
|
+
"line": 7,
|
|
2082
2050
|
"character": 1
|
|
2083
2051
|
},
|
|
2084
2052
|
"signature": "type MergeFileResult = {\n filePath: PathLinux;\n output: string | null | undefined;\n conflict: string | null | undefined;\n isBinaryConflict?: boolean | undefined;\n}",
|
|
@@ -2087,7 +2055,7 @@
|
|
|
2087
2055
|
"__schema": "TypeLiteralSchema",
|
|
2088
2056
|
"location": {
|
|
2089
2057
|
"filePath": "merge-files.ts",
|
|
2090
|
-
"line":
|
|
2058
|
+
"line": 7,
|
|
2091
2059
|
"character": 31
|
|
2092
2060
|
},
|
|
2093
2061
|
"members": [
|
|
@@ -2095,7 +2063,7 @@
|
|
|
2095
2063
|
"__schema": "VariableLikeSchema",
|
|
2096
2064
|
"location": {
|
|
2097
2065
|
"filePath": "merge-files.ts",
|
|
2098
|
-
"line":
|
|
2066
|
+
"line": 8,
|
|
2099
2067
|
"character": 3
|
|
2100
2068
|
},
|
|
2101
2069
|
"signature": "(property) filePath: string",
|
|
@@ -2104,11 +2072,10 @@
|
|
|
2104
2072
|
"__schema": "TypeRefSchema",
|
|
2105
2073
|
"location": {
|
|
2106
2074
|
"filePath": "merge-files.ts",
|
|
2107
|
-
"line":
|
|
2075
|
+
"line": 8,
|
|
2108
2076
|
"character": 13
|
|
2109
2077
|
},
|
|
2110
|
-
"name": "PathLinux"
|
|
2111
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
2078
|
+
"name": "PathLinux"
|
|
2112
2079
|
},
|
|
2113
2080
|
"isOptional": false
|
|
2114
2081
|
},
|
|
@@ -2116,7 +2083,7 @@
|
|
|
2116
2083
|
"__schema": "VariableLikeSchema",
|
|
2117
2084
|
"location": {
|
|
2118
2085
|
"filePath": "merge-files.ts",
|
|
2119
|
-
"line":
|
|
2086
|
+
"line": 9,
|
|
2120
2087
|
"character": 3
|
|
2121
2088
|
},
|
|
2122
2089
|
"signature": "(property) output: string | null | undefined",
|
|
@@ -2125,7 +2092,7 @@
|
|
|
2125
2092
|
"__schema": "TypeUnionSchema",
|
|
2126
2093
|
"location": {
|
|
2127
2094
|
"filePath": "merge-files.ts",
|
|
2128
|
-
"line":
|
|
2095
|
+
"line": 9,
|
|
2129
2096
|
"character": 11
|
|
2130
2097
|
},
|
|
2131
2098
|
"types": [
|
|
@@ -2133,7 +2100,7 @@
|
|
|
2133
2100
|
"__schema": "KeywordTypeSchema",
|
|
2134
2101
|
"location": {
|
|
2135
2102
|
"filePath": "merge-files.ts",
|
|
2136
|
-
"line":
|
|
2103
|
+
"line": 9,
|
|
2137
2104
|
"character": 11
|
|
2138
2105
|
},
|
|
2139
2106
|
"name": "string"
|
|
@@ -2142,7 +2109,7 @@
|
|
|
2142
2109
|
"__schema": "LiteralTypeSchema",
|
|
2143
2110
|
"location": {
|
|
2144
2111
|
"filePath": "merge-files.ts",
|
|
2145
|
-
"line":
|
|
2112
|
+
"line": 9,
|
|
2146
2113
|
"character": 20
|
|
2147
2114
|
},
|
|
2148
2115
|
"name": "null"
|
|
@@ -2151,7 +2118,7 @@
|
|
|
2151
2118
|
"__schema": "KeywordTypeSchema",
|
|
2152
2119
|
"location": {
|
|
2153
2120
|
"filePath": "merge-files.ts",
|
|
2154
|
-
"line":
|
|
2121
|
+
"line": 9,
|
|
2155
2122
|
"character": 27
|
|
2156
2123
|
},
|
|
2157
2124
|
"name": "undefined"
|
|
@@ -2164,7 +2131,7 @@
|
|
|
2164
2131
|
"__schema": "VariableLikeSchema",
|
|
2165
2132
|
"location": {
|
|
2166
2133
|
"filePath": "merge-files.ts",
|
|
2167
|
-
"line":
|
|
2134
|
+
"line": 10,
|
|
2168
2135
|
"character": 3
|
|
2169
2136
|
},
|
|
2170
2137
|
"signature": "(property) conflict: string | null | undefined",
|
|
@@ -2173,7 +2140,7 @@
|
|
|
2173
2140
|
"__schema": "TypeUnionSchema",
|
|
2174
2141
|
"location": {
|
|
2175
2142
|
"filePath": "merge-files.ts",
|
|
2176
|
-
"line":
|
|
2143
|
+
"line": 10,
|
|
2177
2144
|
"character": 13
|
|
2178
2145
|
},
|
|
2179
2146
|
"types": [
|
|
@@ -2181,7 +2148,7 @@
|
|
|
2181
2148
|
"__schema": "KeywordTypeSchema",
|
|
2182
2149
|
"location": {
|
|
2183
2150
|
"filePath": "merge-files.ts",
|
|
2184
|
-
"line":
|
|
2151
|
+
"line": 10,
|
|
2185
2152
|
"character": 13
|
|
2186
2153
|
},
|
|
2187
2154
|
"name": "string"
|
|
@@ -2190,7 +2157,7 @@
|
|
|
2190
2157
|
"__schema": "LiteralTypeSchema",
|
|
2191
2158
|
"location": {
|
|
2192
2159
|
"filePath": "merge-files.ts",
|
|
2193
|
-
"line":
|
|
2160
|
+
"line": 10,
|
|
2194
2161
|
"character": 22
|
|
2195
2162
|
},
|
|
2196
2163
|
"name": "null"
|
|
@@ -2199,7 +2166,7 @@
|
|
|
2199
2166
|
"__schema": "KeywordTypeSchema",
|
|
2200
2167
|
"location": {
|
|
2201
2168
|
"filePath": "merge-files.ts",
|
|
2202
|
-
"line":
|
|
2169
|
+
"line": 10,
|
|
2203
2170
|
"character": 29
|
|
2204
2171
|
},
|
|
2205
2172
|
"name": "undefined"
|
|
@@ -2212,7 +2179,7 @@
|
|
|
2212
2179
|
"__schema": "VariableLikeSchema",
|
|
2213
2180
|
"location": {
|
|
2214
2181
|
"filePath": "merge-files.ts",
|
|
2215
|
-
"line":
|
|
2182
|
+
"line": 11,
|
|
2216
2183
|
"character": 3
|
|
2217
2184
|
},
|
|
2218
2185
|
"signature": "(property) isBinaryConflict?: boolean | undefined",
|
|
@@ -2221,7 +2188,7 @@
|
|
|
2221
2188
|
"__schema": "KeywordTypeSchema",
|
|
2222
2189
|
"location": {
|
|
2223
2190
|
"filePath": "merge-files.ts",
|
|
2224
|
-
"line":
|
|
2191
|
+
"line": 11,
|
|
2225
2192
|
"character": 22
|
|
2226
2193
|
},
|
|
2227
2194
|
"name": "boolean"
|
|
@@ -2244,7 +2211,7 @@
|
|
|
2244
2211
|
"__schema": "TypeSchema",
|
|
2245
2212
|
"location": {
|
|
2246
2213
|
"filePath": "merge-files.ts",
|
|
2247
|
-
"line":
|
|
2214
|
+
"line": 13,
|
|
2248
2215
|
"character": 1
|
|
2249
2216
|
},
|
|
2250
2217
|
"signature": "type MergeFileParams = {\n filePath: PathLinux;\n currentFile: {\n label: string;\n path: PathOsBased;\n };\n baseFile: {\n path: PathOsBased;\n };\n otherFile: {\n label: string;\n path: PathOsBased;\n };\n}",
|
|
@@ -2253,7 +2220,7 @@
|
|
|
2253
2220
|
"__schema": "TypeLiteralSchema",
|
|
2254
2221
|
"location": {
|
|
2255
2222
|
"filePath": "merge-files.ts",
|
|
2256
|
-
"line":
|
|
2223
|
+
"line": 13,
|
|
2257
2224
|
"character": 31
|
|
2258
2225
|
},
|
|
2259
2226
|
"members": [
|
|
@@ -2261,7 +2228,7 @@
|
|
|
2261
2228
|
"__schema": "VariableLikeSchema",
|
|
2262
2229
|
"location": {
|
|
2263
2230
|
"filePath": "merge-files.ts",
|
|
2264
|
-
"line":
|
|
2231
|
+
"line": 14,
|
|
2265
2232
|
"character": 3
|
|
2266
2233
|
},
|
|
2267
2234
|
"signature": "(property) filePath: string",
|
|
@@ -2270,11 +2237,10 @@
|
|
|
2270
2237
|
"__schema": "TypeRefSchema",
|
|
2271
2238
|
"location": {
|
|
2272
2239
|
"filePath": "merge-files.ts",
|
|
2273
|
-
"line":
|
|
2240
|
+
"line": 14,
|
|
2274
2241
|
"character": 13
|
|
2275
2242
|
},
|
|
2276
|
-
"name": "PathLinux"
|
|
2277
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
2243
|
+
"name": "PathLinux"
|
|
2278
2244
|
},
|
|
2279
2245
|
"isOptional": false
|
|
2280
2246
|
},
|
|
@@ -2282,7 +2248,7 @@
|
|
|
2282
2248
|
"__schema": "VariableLikeSchema",
|
|
2283
2249
|
"location": {
|
|
2284
2250
|
"filePath": "merge-files.ts",
|
|
2285
|
-
"line":
|
|
2251
|
+
"line": 15,
|
|
2286
2252
|
"character": 3
|
|
2287
2253
|
},
|
|
2288
2254
|
"signature": "(property) currentFile: {\n label: string;\n path: PathOsBased;\n}",
|
|
@@ -2291,7 +2257,7 @@
|
|
|
2291
2257
|
"__schema": "TypeLiteralSchema",
|
|
2292
2258
|
"location": {
|
|
2293
2259
|
"filePath": "merge-files.ts",
|
|
2294
|
-
"line":
|
|
2260
|
+
"line": 15,
|
|
2295
2261
|
"character": 16
|
|
2296
2262
|
},
|
|
2297
2263
|
"members": [
|
|
@@ -2299,7 +2265,7 @@
|
|
|
2299
2265
|
"__schema": "VariableLikeSchema",
|
|
2300
2266
|
"location": {
|
|
2301
2267
|
"filePath": "merge-files.ts",
|
|
2302
|
-
"line":
|
|
2268
|
+
"line": 16,
|
|
2303
2269
|
"character": 5
|
|
2304
2270
|
},
|
|
2305
2271
|
"signature": "(property) label: string",
|
|
@@ -2308,7 +2274,7 @@
|
|
|
2308
2274
|
"__schema": "KeywordTypeSchema",
|
|
2309
2275
|
"location": {
|
|
2310
2276
|
"filePath": "merge-files.ts",
|
|
2311
|
-
"line":
|
|
2277
|
+
"line": 16,
|
|
2312
2278
|
"character": 12
|
|
2313
2279
|
},
|
|
2314
2280
|
"name": "string"
|
|
@@ -2319,7 +2285,7 @@
|
|
|
2319
2285
|
"__schema": "VariableLikeSchema",
|
|
2320
2286
|
"location": {
|
|
2321
2287
|
"filePath": "merge-files.ts",
|
|
2322
|
-
"line":
|
|
2288
|
+
"line": 17,
|
|
2323
2289
|
"character": 5
|
|
2324
2290
|
},
|
|
2325
2291
|
"signature": "(property) path: string",
|
|
@@ -2328,11 +2294,10 @@
|
|
|
2328
2294
|
"__schema": "TypeRefSchema",
|
|
2329
2295
|
"location": {
|
|
2330
2296
|
"filePath": "merge-files.ts",
|
|
2331
|
-
"line":
|
|
2297
|
+
"line": 17,
|
|
2332
2298
|
"character": 11
|
|
2333
2299
|
},
|
|
2334
|
-
"name": "PathOsBased"
|
|
2335
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
2300
|
+
"name": "PathOsBased"
|
|
2336
2301
|
},
|
|
2337
2302
|
"isOptional": false
|
|
2338
2303
|
}
|
|
@@ -2344,7 +2309,7 @@
|
|
|
2344
2309
|
"__schema": "VariableLikeSchema",
|
|
2345
2310
|
"location": {
|
|
2346
2311
|
"filePath": "merge-files.ts",
|
|
2347
|
-
"line":
|
|
2312
|
+
"line": 19,
|
|
2348
2313
|
"character": 3
|
|
2349
2314
|
},
|
|
2350
2315
|
"signature": "(property) baseFile: {\n path: PathOsBased;\n}",
|
|
@@ -2353,7 +2318,7 @@
|
|
|
2353
2318
|
"__schema": "TypeLiteralSchema",
|
|
2354
2319
|
"location": {
|
|
2355
2320
|
"filePath": "merge-files.ts",
|
|
2356
|
-
"line":
|
|
2321
|
+
"line": 19,
|
|
2357
2322
|
"character": 13
|
|
2358
2323
|
},
|
|
2359
2324
|
"members": [
|
|
@@ -2361,7 +2326,7 @@
|
|
|
2361
2326
|
"__schema": "VariableLikeSchema",
|
|
2362
2327
|
"location": {
|
|
2363
2328
|
"filePath": "merge-files.ts",
|
|
2364
|
-
"line":
|
|
2329
|
+
"line": 20,
|
|
2365
2330
|
"character": 5
|
|
2366
2331
|
},
|
|
2367
2332
|
"signature": "(property) path: string",
|
|
@@ -2370,11 +2335,10 @@
|
|
|
2370
2335
|
"__schema": "TypeRefSchema",
|
|
2371
2336
|
"location": {
|
|
2372
2337
|
"filePath": "merge-files.ts",
|
|
2373
|
-
"line":
|
|
2338
|
+
"line": 20,
|
|
2374
2339
|
"character": 11
|
|
2375
2340
|
},
|
|
2376
|
-
"name": "PathOsBased"
|
|
2377
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
2341
|
+
"name": "PathOsBased"
|
|
2378
2342
|
},
|
|
2379
2343
|
"isOptional": false
|
|
2380
2344
|
}
|
|
@@ -2386,7 +2350,7 @@
|
|
|
2386
2350
|
"__schema": "VariableLikeSchema",
|
|
2387
2351
|
"location": {
|
|
2388
2352
|
"filePath": "merge-files.ts",
|
|
2389
|
-
"line":
|
|
2353
|
+
"line": 22,
|
|
2390
2354
|
"character": 3
|
|
2391
2355
|
},
|
|
2392
2356
|
"signature": "(property) otherFile: {\n label: string;\n path: PathOsBased;\n}",
|
|
@@ -2395,7 +2359,7 @@
|
|
|
2395
2359
|
"__schema": "TypeLiteralSchema",
|
|
2396
2360
|
"location": {
|
|
2397
2361
|
"filePath": "merge-files.ts",
|
|
2398
|
-
"line":
|
|
2362
|
+
"line": 22,
|
|
2399
2363
|
"character": 14
|
|
2400
2364
|
},
|
|
2401
2365
|
"members": [
|
|
@@ -2403,7 +2367,7 @@
|
|
|
2403
2367
|
"__schema": "VariableLikeSchema",
|
|
2404
2368
|
"location": {
|
|
2405
2369
|
"filePath": "merge-files.ts",
|
|
2406
|
-
"line":
|
|
2370
|
+
"line": 23,
|
|
2407
2371
|
"character": 5
|
|
2408
2372
|
},
|
|
2409
2373
|
"signature": "(property) label: string",
|
|
@@ -2412,7 +2376,7 @@
|
|
|
2412
2376
|
"__schema": "KeywordTypeSchema",
|
|
2413
2377
|
"location": {
|
|
2414
2378
|
"filePath": "merge-files.ts",
|
|
2415
|
-
"line":
|
|
2379
|
+
"line": 23,
|
|
2416
2380
|
"character": 12
|
|
2417
2381
|
},
|
|
2418
2382
|
"name": "string"
|
|
@@ -2423,7 +2387,7 @@
|
|
|
2423
2387
|
"__schema": "VariableLikeSchema",
|
|
2424
2388
|
"location": {
|
|
2425
2389
|
"filePath": "merge-files.ts",
|
|
2426
|
-
"line":
|
|
2390
|
+
"line": 24,
|
|
2427
2391
|
"character": 5
|
|
2428
2392
|
},
|
|
2429
2393
|
"signature": "(property) path: string",
|
|
@@ -2432,11 +2396,10 @@
|
|
|
2432
2396
|
"__schema": "TypeRefSchema",
|
|
2433
2397
|
"location": {
|
|
2434
2398
|
"filePath": "merge-files.ts",
|
|
2435
|
-
"line":
|
|
2399
|
+
"line": 24,
|
|
2436
2400
|
"character": 11
|
|
2437
2401
|
},
|
|
2438
|
-
"name": "PathOsBased"
|
|
2439
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
2402
|
+
"name": "PathOsBased"
|
|
2440
2403
|
},
|
|
2441
2404
|
"isOptional": false
|
|
2442
2405
|
}
|
|
@@ -2460,14 +2423,14 @@
|
|
|
2460
2423
|
"__schema": "FunctionLikeSchema",
|
|
2461
2424
|
"location": {
|
|
2462
2425
|
"filePath": "merge-files.ts",
|
|
2463
|
-
"line":
|
|
2426
|
+
"line": 37,
|
|
2464
2427
|
"character": 1
|
|
2465
2428
|
},
|
|
2466
2429
|
"doc": {
|
|
2467
2430
|
"__schema": "DocSchema",
|
|
2468
2431
|
"location": {
|
|
2469
2432
|
"filePath": "merge-files.ts",
|
|
2470
|
-
"line":
|
|
2433
|
+
"line": 28,
|
|
2471
2434
|
"character": 1
|
|
2472
2435
|
},
|
|
2473
2436
|
"raw": "/**\n * use git `merge-file` command. From the command help:\n * `git merge-file <current-file> <base-file> <other-file>\n * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into\n * <current-file>. The result ordinarily goes into <current-file>.`\n *\n * Here, we are not going to write the result into current-file. Instead, we'll use the \"-p\" flag,\n * to just return the results.\n */",
|
|
@@ -2481,7 +2444,7 @@
|
|
|
2481
2444
|
"__schema": "ParameterSchema",
|
|
2482
2445
|
"location": {
|
|
2483
2446
|
"filePath": "merge-files.ts",
|
|
2484
|
-
"line":
|
|
2447
|
+
"line": 37,
|
|
2485
2448
|
"character": 34
|
|
2486
2449
|
},
|
|
2487
2450
|
"name": "{ filePath, currentFile, baseFile, otherFile }",
|
|
@@ -2489,7 +2452,7 @@
|
|
|
2489
2452
|
"__schema": "TypeRefSchema",
|
|
2490
2453
|
"location": {
|
|
2491
2454
|
"filePath": "merge-files.ts",
|
|
2492
|
-
"line":
|
|
2455
|
+
"line": 42,
|
|
2493
2456
|
"character": 4
|
|
2494
2457
|
},
|
|
2495
2458
|
"name": "MergeFileParams"
|
|
@@ -2500,7 +2463,7 @@
|
|
|
2500
2463
|
"__schema": "InferenceTypeSchema",
|
|
2501
2464
|
"location": {
|
|
2502
2465
|
"filePath": "merge-files.ts",
|
|
2503
|
-
"line":
|
|
2466
|
+
"line": 38,
|
|
2504
2467
|
"character": 3
|
|
2505
2468
|
},
|
|
2506
2469
|
"name": "filePath",
|
|
@@ -2511,7 +2474,7 @@
|
|
|
2511
2474
|
"__schema": "InferenceTypeSchema",
|
|
2512
2475
|
"location": {
|
|
2513
2476
|
"filePath": "merge-files.ts",
|
|
2514
|
-
"line":
|
|
2477
|
+
"line": 39,
|
|
2515
2478
|
"character": 3
|
|
2516
2479
|
},
|
|
2517
2480
|
"name": "currentFile",
|
|
@@ -2522,7 +2485,7 @@
|
|
|
2522
2485
|
"__schema": "InferenceTypeSchema",
|
|
2523
2486
|
"location": {
|
|
2524
2487
|
"filePath": "merge-files.ts",
|
|
2525
|
-
"line":
|
|
2488
|
+
"line": 40,
|
|
2526
2489
|
"character": 3
|
|
2527
2490
|
},
|
|
2528
2491
|
"name": "baseFile",
|
|
@@ -2533,7 +2496,7 @@
|
|
|
2533
2496
|
"__schema": "InferenceTypeSchema",
|
|
2534
2497
|
"location": {
|
|
2535
2498
|
"filePath": "merge-files.ts",
|
|
2536
|
-
"line":
|
|
2499
|
+
"line": 41,
|
|
2537
2500
|
"character": 3
|
|
2538
2501
|
},
|
|
2539
2502
|
"name": "otherFile",
|
|
@@ -2548,7 +2511,7 @@
|
|
|
2548
2511
|
"__schema": "TypeRefSchema",
|
|
2549
2512
|
"location": {
|
|
2550
2513
|
"filePath": "merge-files.ts",
|
|
2551
|
-
"line":
|
|
2514
|
+
"line": 42,
|
|
2552
2515
|
"character": 22
|
|
2553
2516
|
},
|
|
2554
2517
|
"name": "Promise",
|
|
@@ -2557,7 +2520,7 @@
|
|
|
2557
2520
|
"__schema": "TypeRefSchema",
|
|
2558
2521
|
"location": {
|
|
2559
2522
|
"filePath": "merge-files.ts",
|
|
2560
|
-
"line":
|
|
2523
|
+
"line": 42,
|
|
2561
2524
|
"character": 30
|
|
2562
2525
|
},
|
|
2563
2526
|
"name": "MergeFileResult"
|
|
@@ -2613,11 +2576,7 @@
|
|
|
2613
2576
|
"line": 114,
|
|
2614
2577
|
"character": 24
|
|
2615
2578
|
},
|
|
2616
|
-
"name": "Workspace"
|
|
2617
|
-
"componentId": {
|
|
2618
|
-
"scope": "teambit.workspace",
|
|
2619
|
-
"name": "workspace"
|
|
2620
|
-
}
|
|
2579
|
+
"name": "Workspace"
|
|
2621
2580
|
},
|
|
2622
2581
|
"isOptional": false,
|
|
2623
2582
|
"isSpread": false
|
|
@@ -2637,11 +2596,7 @@
|
|
|
2637
2596
|
"line": 115,
|
|
2638
2597
|
"character": 20
|
|
2639
2598
|
},
|
|
2640
|
-
"name": "ScopeMain"
|
|
2641
|
-
"componentId": {
|
|
2642
|
-
"scope": "teambit.scope",
|
|
2643
|
-
"name": "scope"
|
|
2644
|
-
}
|
|
2599
|
+
"name": "ScopeMain"
|
|
2645
2600
|
},
|
|
2646
2601
|
"isOptional": false,
|
|
2647
2602
|
"isSpread": false
|
|
@@ -2661,11 +2616,7 @@
|
|
|
2661
2616
|
"line": 116,
|
|
2662
2617
|
"character": 22
|
|
2663
2618
|
},
|
|
2664
|
-
"name": "InstallMain"
|
|
2665
|
-
"componentId": {
|
|
2666
|
-
"scope": "teambit.workspace",
|
|
2667
|
-
"name": "install"
|
|
2668
|
-
}
|
|
2619
|
+
"name": "InstallMain"
|
|
2669
2620
|
},
|
|
2670
2621
|
"isOptional": false,
|
|
2671
2622
|
"isSpread": false
|
|
@@ -2685,11 +2636,7 @@
|
|
|
2685
2636
|
"line": 117,
|
|
2686
2637
|
"character": 23
|
|
2687
2638
|
},
|
|
2688
|
-
"name": "SnappingMain"
|
|
2689
|
-
"componentId": {
|
|
2690
|
-
"scope": "teambit.component",
|
|
2691
|
-
"name": "snapping"
|
|
2692
|
-
}
|
|
2639
|
+
"name": "SnappingMain"
|
|
2693
2640
|
},
|
|
2694
2641
|
"isOptional": false,
|
|
2695
2642
|
"isSpread": false
|
|
@@ -2709,11 +2656,7 @@
|
|
|
2709
2656
|
"line": 118,
|
|
2710
2657
|
"character": 23
|
|
2711
2658
|
},
|
|
2712
|
-
"name": "CheckoutMain"
|
|
2713
|
-
"componentId": {
|
|
2714
|
-
"scope": "teambit.component",
|
|
2715
|
-
"name": "checkout"
|
|
2716
|
-
}
|
|
2659
|
+
"name": "CheckoutMain"
|
|
2717
2660
|
},
|
|
2718
2661
|
"isOptional": false,
|
|
2719
2662
|
"isSpread": false
|
|
@@ -2733,11 +2676,7 @@
|
|
|
2733
2676
|
"line": 119,
|
|
2734
2677
|
"character": 21
|
|
2735
2678
|
},
|
|
2736
|
-
"name": "Logger"
|
|
2737
|
-
"componentId": {
|
|
2738
|
-
"scope": "teambit.harmony",
|
|
2739
|
-
"name": "logger"
|
|
2740
|
-
}
|
|
2679
|
+
"name": "Logger"
|
|
2741
2680
|
},
|
|
2742
2681
|
"isOptional": false,
|
|
2743
2682
|
"isSpread": false
|
|
@@ -2757,11 +2696,7 @@
|
|
|
2757
2696
|
"line": 120,
|
|
2758
2697
|
"character": 30
|
|
2759
2698
|
},
|
|
2760
|
-
"name": "ComponentWriterMain"
|
|
2761
|
-
"componentId": {
|
|
2762
|
-
"scope": "teambit.component",
|
|
2763
|
-
"name": "component-writer"
|
|
2764
|
-
}
|
|
2699
|
+
"name": "ComponentWriterMain"
|
|
2765
2700
|
},
|
|
2766
2701
|
"isOptional": false,
|
|
2767
2702
|
"isSpread": false
|
|
@@ -2781,11 +2716,7 @@
|
|
|
2781
2716
|
"line": 121,
|
|
2782
2717
|
"character": 23
|
|
2783
2718
|
},
|
|
2784
|
-
"name": "ImporterMain"
|
|
2785
|
-
"componentId": {
|
|
2786
|
-
"scope": "teambit.scope",
|
|
2787
|
-
"name": "importer"
|
|
2788
|
-
}
|
|
2719
|
+
"name": "ImporterMain"
|
|
2789
2720
|
},
|
|
2790
2721
|
"isOptional": false,
|
|
2791
2722
|
"isSpread": false
|
|
@@ -2805,11 +2736,7 @@
|
|
|
2805
2736
|
"line": 122,
|
|
2806
2737
|
"character": 21
|
|
2807
2738
|
},
|
|
2808
|
-
"name": "ConfigMain"
|
|
2809
|
-
"componentId": {
|
|
2810
|
-
"scope": "teambit.harmony",
|
|
2811
|
-
"name": "config"
|
|
2812
|
-
}
|
|
2739
|
+
"name": "ConfigMain"
|
|
2813
2740
|
},
|
|
2814
2741
|
"isOptional": false,
|
|
2815
2742
|
"isSpread": false
|
|
@@ -2829,11 +2756,7 @@
|
|
|
2829
2756
|
"line": 123,
|
|
2830
2757
|
"character": 21
|
|
2831
2758
|
},
|
|
2832
|
-
"name": "RemoveMain"
|
|
2833
|
-
"componentId": {
|
|
2834
|
-
"scope": "teambit.component",
|
|
2835
|
-
"name": "remove"
|
|
2836
|
-
}
|
|
2759
|
+
"name": "RemoveMain"
|
|
2837
2760
|
},
|
|
2838
2761
|
"isOptional": false,
|
|
2839
2762
|
"isSpread": false
|
|
@@ -2853,11 +2776,7 @@
|
|
|
2853
2776
|
"line": 124,
|
|
2854
2777
|
"character": 27
|
|
2855
2778
|
},
|
|
2856
|
-
"name": "ConfigMergerMain"
|
|
2857
|
-
"componentId": {
|
|
2858
|
-
"scope": "teambit.workspace",
|
|
2859
|
-
"name": "config-merger"
|
|
2860
|
-
}
|
|
2779
|
+
"name": "ConfigMergerMain"
|
|
2861
2780
|
},
|
|
2862
2781
|
"isOptional": false,
|
|
2863
2782
|
"isSpread": false
|
|
@@ -2877,11 +2796,7 @@
|
|
|
2877
2796
|
"line": 125,
|
|
2878
2797
|
"character": 26
|
|
2879
2798
|
},
|
|
2880
|
-
"name": "DependencyResolverMain"
|
|
2881
|
-
"componentId": {
|
|
2882
|
-
"scope": "teambit.dependencies",
|
|
2883
|
-
"name": "dependency-resolver"
|
|
2884
|
-
}
|
|
2799
|
+
"name": "DependencyResolverMain"
|
|
2885
2800
|
},
|
|
2886
2801
|
"isOptional": false,
|
|
2887
2802
|
"isSpread": false
|
|
@@ -3129,8 +3044,7 @@
|
|
|
3129
3044
|
"line": 166,
|
|
3130
3045
|
"character": 15
|
|
3131
3046
|
},
|
|
3132
|
-
"name": "Consumer"
|
|
3133
|
-
"packageName": "@teambit/legacy/dist/consumer"
|
|
3047
|
+
"name": "Consumer"
|
|
3134
3048
|
},
|
|
3135
3049
|
"isOptional": false,
|
|
3136
3050
|
"isSpread": false
|
|
@@ -3157,12 +3071,7 @@
|
|
|
3157
3071
|
"line": 167,
|
|
3158
3072
|
"character": 13
|
|
3159
3073
|
},
|
|
3160
|
-
"name": "ComponentID"
|
|
3161
|
-
"componentId": {
|
|
3162
|
-
"scope": "teambit.component",
|
|
3163
|
-
"name": "component-id",
|
|
3164
|
-
"version": "1.2.0"
|
|
3165
|
-
}
|
|
3074
|
+
"name": "ComponentID"
|
|
3166
3075
|
}
|
|
3167
3076
|
},
|
|
3168
3077
|
"isOptional": false,
|
|
@@ -3419,8 +3328,7 @@
|
|
|
3419
3328
|
"line": 222,
|
|
3420
3329
|
"character": 19
|
|
3421
3330
|
},
|
|
3422
|
-
"name": "Lane"
|
|
3423
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
3331
|
+
"name": "Lane"
|
|
3424
3332
|
},
|
|
3425
3333
|
"isOptional": true
|
|
3426
3334
|
},
|
|
@@ -3617,8 +3525,7 @@
|
|
|
3617
3525
|
"line": 222,
|
|
3618
3526
|
"character": 19
|
|
3619
3527
|
},
|
|
3620
|
-
"name": "Lane"
|
|
3621
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
3528
|
+
"name": "Lane"
|
|
3622
3529
|
},
|
|
3623
3530
|
"isOptional": true
|
|
3624
3531
|
},
|
|
@@ -3782,11 +3689,7 @@
|
|
|
3782
3689
|
"line": 352,
|
|
3783
3690
|
"character": 24
|
|
3784
3691
|
},
|
|
3785
|
-
"name": "ApplyVersionWithComps"
|
|
3786
|
-
"componentId": {
|
|
3787
|
-
"scope": "teambit.component",
|
|
3788
|
-
"name": "checkout"
|
|
3789
|
-
}
|
|
3692
|
+
"name": "ApplyVersionWithComps"
|
|
3790
3693
|
}
|
|
3791
3694
|
},
|
|
3792
3695
|
"isOptional": false,
|
|
@@ -3807,8 +3710,7 @@
|
|
|
3807
3710
|
"line": 353,
|
|
3808
3711
|
"character": 19
|
|
3809
3712
|
},
|
|
3810
|
-
"name": "Lane"
|
|
3811
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
3713
|
+
"name": "Lane"
|
|
3812
3714
|
},
|
|
3813
3715
|
"isOptional": true,
|
|
3814
3716
|
"isSpread": false
|
|
@@ -3828,12 +3730,7 @@
|
|
|
3828
3730
|
"line": 354,
|
|
3829
3731
|
"character": 33
|
|
3830
3732
|
},
|
|
3831
|
-
"name": "ComponentIdList"
|
|
3832
|
-
"componentId": {
|
|
3833
|
-
"scope": "teambit.component",
|
|
3834
|
-
"name": "component-id",
|
|
3835
|
-
"version": "1.2.0"
|
|
3836
|
-
}
|
|
3733
|
+
"name": "ComponentIdList"
|
|
3837
3734
|
},
|
|
3838
3735
|
"isOptional": true,
|
|
3839
3736
|
"isSpread": false
|
|
@@ -3895,12 +3792,7 @@
|
|
|
3895
3792
|
"line": 377,
|
|
3896
3793
|
"character": 13
|
|
3897
3794
|
},
|
|
3898
|
-
"name": "ComponentID"
|
|
3899
|
-
"componentId": {
|
|
3900
|
-
"scope": "teambit.component",
|
|
3901
|
-
"name": "component-id",
|
|
3902
|
-
"version": "1.2.0"
|
|
3903
|
-
}
|
|
3795
|
+
"name": "ComponentID"
|
|
3904
3796
|
}
|
|
3905
3797
|
},
|
|
3906
3798
|
"isOptional": false,
|
|
@@ -3921,8 +3813,7 @@
|
|
|
3921
3813
|
"line": 378,
|
|
3922
3814
|
"character": 14
|
|
3923
3815
|
},
|
|
3924
|
-
"name": "MergeStatusProviderOptions"
|
|
3925
|
-
"internalFilePath": "merge-status-provider.ts"
|
|
3816
|
+
"name": "MergeStatusProviderOptions"
|
|
3926
3817
|
},
|
|
3927
3818
|
"isOptional": false,
|
|
3928
3819
|
"isSpread": false
|
|
@@ -3942,8 +3833,7 @@
|
|
|
3942
3833
|
"line": 379,
|
|
3943
3834
|
"character": 19
|
|
3944
3835
|
},
|
|
3945
|
-
"name": "Lane"
|
|
3946
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
3836
|
+
"name": "Lane"
|
|
3947
3837
|
},
|
|
3948
3838
|
"isOptional": true,
|
|
3949
3839
|
"isSpread": false
|
|
@@ -3963,8 +3853,7 @@
|
|
|
3963
3853
|
"line": 380,
|
|
3964
3854
|
"character": 17
|
|
3965
3855
|
},
|
|
3966
|
-
"name": "Lane"
|
|
3967
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
3856
|
+
"name": "Lane"
|
|
3968
3857
|
},
|
|
3969
3858
|
"isOptional": true,
|
|
3970
3859
|
"isSpread": false
|
|
@@ -4098,11 +3987,7 @@
|
|
|
4098
3987
|
"line": 708,
|
|
4099
3988
|
"character": 5
|
|
4100
3989
|
},
|
|
4101
|
-
"name": "CLIMain"
|
|
4102
|
-
"componentId": {
|
|
4103
|
-
"scope": "teambit.harmony",
|
|
4104
|
-
"name": "cli"
|
|
4105
|
-
}
|
|
3990
|
+
"name": "CLIMain"
|
|
4106
3991
|
},
|
|
4107
3992
|
{
|
|
4108
3993
|
"__schema": "TypeRefSchema",
|
|
@@ -4111,11 +3996,7 @@
|
|
|
4111
3996
|
"line": 709,
|
|
4112
3997
|
"character": 5
|
|
4113
3998
|
},
|
|
4114
|
-
"name": "Workspace"
|
|
4115
|
-
"componentId": {
|
|
4116
|
-
"scope": "teambit.workspace",
|
|
4117
|
-
"name": "workspace"
|
|
4118
|
-
}
|
|
3999
|
+
"name": "Workspace"
|
|
4119
4000
|
},
|
|
4120
4001
|
{
|
|
4121
4002
|
"__schema": "TypeRefSchema",
|
|
@@ -4124,11 +4005,7 @@
|
|
|
4124
4005
|
"line": 710,
|
|
4125
4006
|
"character": 5
|
|
4126
4007
|
},
|
|
4127
|
-
"name": "ScopeMain"
|
|
4128
|
-
"componentId": {
|
|
4129
|
-
"scope": "teambit.scope",
|
|
4130
|
-
"name": "scope"
|
|
4131
|
-
}
|
|
4008
|
+
"name": "ScopeMain"
|
|
4132
4009
|
},
|
|
4133
4010
|
{
|
|
4134
4011
|
"__schema": "TypeRefSchema",
|
|
@@ -4137,11 +4014,7 @@
|
|
|
4137
4014
|
"line": 711,
|
|
4138
4015
|
"character": 5
|
|
4139
4016
|
},
|
|
4140
|
-
"name": "SnappingMain"
|
|
4141
|
-
"componentId": {
|
|
4142
|
-
"scope": "teambit.component",
|
|
4143
|
-
"name": "snapping"
|
|
4144
|
-
}
|
|
4017
|
+
"name": "SnappingMain"
|
|
4145
4018
|
},
|
|
4146
4019
|
{
|
|
4147
4020
|
"__schema": "TypeRefSchema",
|
|
@@ -4150,11 +4023,7 @@
|
|
|
4150
4023
|
"line": 712,
|
|
4151
4024
|
"character": 5
|
|
4152
4025
|
},
|
|
4153
|
-
"name": "CheckoutMain"
|
|
4154
|
-
"componentId": {
|
|
4155
|
-
"scope": "teambit.component",
|
|
4156
|
-
"name": "checkout"
|
|
4157
|
-
}
|
|
4026
|
+
"name": "CheckoutMain"
|
|
4158
4027
|
},
|
|
4159
4028
|
{
|
|
4160
4029
|
"__schema": "TypeRefSchema",
|
|
@@ -4163,11 +4032,7 @@
|
|
|
4163
4032
|
"line": 713,
|
|
4164
4033
|
"character": 5
|
|
4165
4034
|
},
|
|
4166
|
-
"name": "InstallMain"
|
|
4167
|
-
"componentId": {
|
|
4168
|
-
"scope": "teambit.workspace",
|
|
4169
|
-
"name": "install"
|
|
4170
|
-
}
|
|
4035
|
+
"name": "InstallMain"
|
|
4171
4036
|
},
|
|
4172
4037
|
{
|
|
4173
4038
|
"__schema": "TypeRefSchema",
|
|
@@ -4176,11 +4041,7 @@
|
|
|
4176
4041
|
"line": 714,
|
|
4177
4042
|
"character": 5
|
|
4178
4043
|
},
|
|
4179
|
-
"name": "LoggerMain"
|
|
4180
|
-
"componentId": {
|
|
4181
|
-
"scope": "teambit.harmony",
|
|
4182
|
-
"name": "logger"
|
|
4183
|
-
}
|
|
4044
|
+
"name": "LoggerMain"
|
|
4184
4045
|
},
|
|
4185
4046
|
{
|
|
4186
4047
|
"__schema": "TypeRefSchema",
|
|
@@ -4189,11 +4050,7 @@
|
|
|
4189
4050
|
"line": 715,
|
|
4190
4051
|
"character": 5
|
|
4191
4052
|
},
|
|
4192
|
-
"name": "ComponentWriterMain"
|
|
4193
|
-
"componentId": {
|
|
4194
|
-
"scope": "teambit.component",
|
|
4195
|
-
"name": "component-writer"
|
|
4196
|
-
}
|
|
4053
|
+
"name": "ComponentWriterMain"
|
|
4197
4054
|
},
|
|
4198
4055
|
{
|
|
4199
4056
|
"__schema": "TypeRefSchema",
|
|
@@ -4202,11 +4059,7 @@
|
|
|
4202
4059
|
"line": 716,
|
|
4203
4060
|
"character": 5
|
|
4204
4061
|
},
|
|
4205
|
-
"name": "ImporterMain"
|
|
4206
|
-
"componentId": {
|
|
4207
|
-
"scope": "teambit.scope",
|
|
4208
|
-
"name": "importer"
|
|
4209
|
-
}
|
|
4062
|
+
"name": "ImporterMain"
|
|
4210
4063
|
},
|
|
4211
4064
|
{
|
|
4212
4065
|
"__schema": "TypeRefSchema",
|
|
@@ -4215,11 +4068,7 @@
|
|
|
4215
4068
|
"line": 717,
|
|
4216
4069
|
"character": 5
|
|
4217
4070
|
},
|
|
4218
|
-
"name": "ConfigMain"
|
|
4219
|
-
"componentId": {
|
|
4220
|
-
"scope": "teambit.harmony",
|
|
4221
|
-
"name": "config"
|
|
4222
|
-
}
|
|
4071
|
+
"name": "ConfigMain"
|
|
4223
4072
|
},
|
|
4224
4073
|
{
|
|
4225
4074
|
"__schema": "TypeRefSchema",
|
|
@@ -4228,11 +4077,7 @@
|
|
|
4228
4077
|
"line": 718,
|
|
4229
4078
|
"character": 5
|
|
4230
4079
|
},
|
|
4231
|
-
"name": "RemoveMain"
|
|
4232
|
-
"componentId": {
|
|
4233
|
-
"scope": "teambit.component",
|
|
4234
|
-
"name": "remove"
|
|
4235
|
-
}
|
|
4080
|
+
"name": "RemoveMain"
|
|
4236
4081
|
},
|
|
4237
4082
|
{
|
|
4238
4083
|
"__schema": "TypeRefSchema",
|
|
@@ -4241,11 +4086,7 @@
|
|
|
4241
4086
|
"line": 719,
|
|
4242
4087
|
"character": 5
|
|
4243
4088
|
},
|
|
4244
|
-
"name": "GlobalConfigMain"
|
|
4245
|
-
"componentId": {
|
|
4246
|
-
"scope": "teambit.harmony",
|
|
4247
|
-
"name": "global-config"
|
|
4248
|
-
}
|
|
4089
|
+
"name": "GlobalConfigMain"
|
|
4249
4090
|
},
|
|
4250
4091
|
{
|
|
4251
4092
|
"__schema": "TypeRefSchema",
|
|
@@ -4254,11 +4095,7 @@
|
|
|
4254
4095
|
"line": 720,
|
|
4255
4096
|
"character": 5
|
|
4256
4097
|
},
|
|
4257
|
-
"name": "ConfigMergerMain"
|
|
4258
|
-
"componentId": {
|
|
4259
|
-
"scope": "teambit.workspace",
|
|
4260
|
-
"name": "config-merger"
|
|
4261
|
-
}
|
|
4098
|
+
"name": "ConfigMergerMain"
|
|
4262
4099
|
},
|
|
4263
4100
|
{
|
|
4264
4101
|
"__schema": "TypeRefSchema",
|
|
@@ -4267,11 +4104,7 @@
|
|
|
4267
4104
|
"line": 721,
|
|
4268
4105
|
"character": 5
|
|
4269
4106
|
},
|
|
4270
|
-
"name": "DependencyResolverMain"
|
|
4271
|
-
"componentId": {
|
|
4272
|
-
"scope": "teambit.dependencies",
|
|
4273
|
-
"name": "dependency-resolver"
|
|
4274
|
-
}
|
|
4107
|
+
"name": "DependencyResolverMain"
|
|
4275
4108
|
}
|
|
4276
4109
|
]
|
|
4277
4110
|
},
|
|
@@ -4330,11 +4163,7 @@
|
|
|
4330
4163
|
"line": 62,
|
|
4331
4164
|
"character": 36
|
|
4332
4165
|
},
|
|
4333
|
-
"name": "ComponentStatusBase"
|
|
4334
|
-
"componentId": {
|
|
4335
|
-
"scope": "teambit.component",
|
|
4336
|
-
"name": "checkout"
|
|
4337
|
-
}
|
|
4166
|
+
"name": "ComponentStatusBase"
|
|
4338
4167
|
},
|
|
4339
4168
|
{
|
|
4340
4169
|
"__schema": "TypeLiteralSchema",
|
|
@@ -4399,8 +4228,7 @@
|
|
|
4399
4228
|
"line": 64,
|
|
4400
4229
|
"character": 17
|
|
4401
4230
|
},
|
|
4402
|
-
"name": "SnapsDistance"
|
|
4403
|
-
"packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
|
|
4231
|
+
"name": "SnapsDistance"
|
|
4404
4232
|
},
|
|
4405
4233
|
"isOptional": true
|
|
4406
4234
|
},
|
|
@@ -4420,8 +4248,7 @@
|
|
|
4420
4248
|
"line": 65,
|
|
4421
4249
|
"character": 23
|
|
4422
4250
|
},
|
|
4423
|
-
"name": "ResolveUnrelatedData"
|
|
4424
|
-
"internalFilePath": "merging.main.runtime.ts"
|
|
4251
|
+
"name": "ResolveUnrelatedData"
|
|
4425
4252
|
},
|
|
4426
4253
|
"isOptional": true
|
|
4427
4254
|
},
|
|
@@ -4441,11 +4268,7 @@
|
|
|
4441
4268
|
"line": 66,
|
|
4442
4269
|
"character": 23
|
|
4443
4270
|
},
|
|
4444
|
-
"name": "ConfigMergeResult"
|
|
4445
|
-
"componentId": {
|
|
4446
|
-
"scope": "teambit.workspace",
|
|
4447
|
-
"name": "config-merger"
|
|
4448
|
-
}
|
|
4271
|
+
"name": "ConfigMergeResult"
|
|
4449
4272
|
},
|
|
4450
4273
|
"isOptional": true
|
|
4451
4274
|
}
|
|
@@ -4579,12 +4402,7 @@
|
|
|
4579
4402
|
"line": 97,
|
|
4580
4403
|
"character": 23
|
|
4581
4404
|
},
|
|
4582
|
-
"name": "ComponentID"
|
|
4583
|
-
"componentId": {
|
|
4584
|
-
"scope": "teambit.component",
|
|
4585
|
-
"name": "component-id",
|
|
4586
|
-
"version": "1.2.0"
|
|
4587
|
-
}
|
|
4405
|
+
"name": "ComponentID"
|
|
4588
4406
|
}
|
|
4589
4407
|
},
|
|
4590
4408
|
"isOptional": true
|
|
@@ -4612,12 +4430,7 @@
|
|
|
4612
4430
|
"line": 98,
|
|
4613
4431
|
"character": 21
|
|
4614
4432
|
},
|
|
4615
|
-
"name": "ComponentID"
|
|
4616
|
-
"componentId": {
|
|
4617
|
-
"scope": "teambit.component",
|
|
4618
|
-
"name": "component-id",
|
|
4619
|
-
"version": "1.2.0"
|
|
4620
|
-
}
|
|
4433
|
+
"name": "ComponentID"
|
|
4621
4434
|
}
|
|
4622
4435
|
},
|
|
4623
4436
|
"isOptional": true
|
|
@@ -4645,8 +4458,7 @@
|
|
|
4645
4458
|
"line": 99,
|
|
4646
4459
|
"character": 24
|
|
4647
4460
|
},
|
|
4648
|
-
"name": "ConsumerComponent"
|
|
4649
|
-
"packageName": "@teambit/legacy/dist/consumer/component/consumer-component"
|
|
4461
|
+
"name": "ConsumerComponent"
|
|
4650
4462
|
}
|
|
4651
4463
|
},
|
|
4652
4464
|
"isOptional": true
|
|
@@ -4695,8 +4507,7 @@
|
|
|
4695
4507
|
"line": 101,
|
|
4696
4508
|
"character": 22
|
|
4697
4509
|
},
|
|
4698
|
-
"name": "MergeSnapResults"
|
|
4699
|
-
"internalFilePath": "merging.main.runtime.ts"
|
|
4510
|
+
"name": "MergeSnapResults"
|
|
4700
4511
|
},
|
|
4701
4512
|
"isOptional": true
|
|
4702
4513
|
},
|
|
@@ -4864,11 +4675,7 @@
|
|
|
4864
4675
|
"line": 109,
|
|
4865
4676
|
"character": 33
|
|
4866
4677
|
},
|
|
4867
|
-
"name": "WorkspaceConfigUpdateResult"
|
|
4868
|
-
"componentId": {
|
|
4869
|
-
"scope": "teambit.workspace",
|
|
4870
|
-
"name": "config-merger"
|
|
4871
|
-
}
|
|
4678
|
+
"name": "WorkspaceConfigUpdateResult"
|
|
4872
4679
|
},
|
|
4873
4680
|
"isOptional": true
|
|
4874
4681
|
}
|
|
@@ -5433,11 +5240,7 @@
|
|
|
5433
5240
|
"line": 56,
|
|
5434
5241
|
"character": 67
|
|
5435
5242
|
},
|
|
5436
|
-
"name": "GlobalConfigMain"
|
|
5437
|
-
"componentId": {
|
|
5438
|
-
"scope": "teambit.harmony",
|
|
5439
|
-
"name": "global-config"
|
|
5440
|
-
}
|
|
5243
|
+
"name": "GlobalConfigMain"
|
|
5441
5244
|
},
|
|
5442
5245
|
"isOptional": false,
|
|
5443
5246
|
"isSpread": false
|
|
@@ -5995,7 +5798,7 @@
|
|
|
5995
5798
|
"_legacy": {
|
|
5996
5799
|
"scope": "teambit.component",
|
|
5997
5800
|
"name": "merging",
|
|
5998
|
-
"version": "1.0.
|
|
5801
|
+
"version": "1.0.331"
|
|
5999
5802
|
},
|
|
6000
5803
|
"_scope": "teambit.component"
|
|
6001
5804
|
}
|
|
@@ -6069,11 +5872,7 @@
|
|
|
6069
5872
|
"line": 152,
|
|
6070
5873
|
"character": 49
|
|
6071
5874
|
},
|
|
6072
|
-
"name": "ConfigMergeResult"
|
|
6073
|
-
"componentId": {
|
|
6074
|
-
"scope": "teambit.workspace",
|
|
6075
|
-
"name": "config-merger"
|
|
6076
|
-
}
|
|
5875
|
+
"name": "ConfigMergeResult"
|
|
6077
5876
|
}
|
|
6078
5877
|
},
|
|
6079
5878
|
"isOptional": true
|
|
@@ -6195,11 +5994,7 @@
|
|
|
6195
5994
|
"line": 152,
|
|
6196
5995
|
"character": 49
|
|
6197
5996
|
},
|
|
6198
|
-
"name": "ConfigMergeResult"
|
|
6199
|
-
"componentId": {
|
|
6200
|
-
"scope": "teambit.workspace",
|
|
6201
|
-
"name": "config-merger"
|
|
6202
|
-
}
|
|
5997
|
+
"name": "ConfigMergeResult"
|
|
6203
5998
|
}
|
|
6204
5999
|
},
|
|
6205
6000
|
"isOptional": true
|
|
@@ -6257,11 +6052,7 @@
|
|
|
6257
6052
|
"line": 264,
|
|
6258
6053
|
"character": 78
|
|
6259
6054
|
},
|
|
6260
|
-
"name": "WorkspaceConfigUpdateResult"
|
|
6261
|
-
"componentId": {
|
|
6262
|
-
"scope": "teambit.workspace",
|
|
6263
|
-
"name": "config-merger"
|
|
6264
|
-
}
|
|
6055
|
+
"name": "WorkspaceConfigUpdateResult"
|
|
6265
6056
|
},
|
|
6266
6057
|
"isOptional": true,
|
|
6267
6058
|
"isSpread": false
|
|
@@ -6618,12 +6409,7 @@
|
|
|
6618
6409
|
"line": 388,
|
|
6619
6410
|
"character": 54
|
|
6620
6411
|
},
|
|
6621
|
-
"name": "ComponentID"
|
|
6622
|
-
"componentId": {
|
|
6623
|
-
"scope": "teambit.component",
|
|
6624
|
-
"name": "component-id",
|
|
6625
|
-
"version": "1.2.0"
|
|
6626
|
-
}
|
|
6412
|
+
"name": "ComponentID"
|
|
6627
6413
|
}
|
|
6628
6414
|
},
|
|
6629
6415
|
"isOptional": true,
|
|
@@ -6675,12 +6461,7 @@
|
|
|
6675
6461
|
"line": 395,
|
|
6676
6462
|
"character": 50
|
|
6677
6463
|
},
|
|
6678
|
-
"name": "ComponentID"
|
|
6679
|
-
"componentId": {
|
|
6680
|
-
"scope": "teambit.component",
|
|
6681
|
-
"name": "component-id",
|
|
6682
|
-
"version": "1.2.0"
|
|
6683
|
-
}
|
|
6464
|
+
"name": "ComponentID"
|
|
6684
6465
|
}
|
|
6685
6466
|
},
|
|
6686
6467
|
"isOptional": true,
|
|
@@ -6727,11 +6508,7 @@
|
|
|
6727
6508
|
"line": 296,
|
|
6728
6509
|
"character": 56
|
|
6729
6510
|
},
|
|
6730
|
-
"name": "WorkspaceDepsUpdates"
|
|
6731
|
-
"componentId": {
|
|
6732
|
-
"scope": "teambit.workspace",
|
|
6733
|
-
"name": "config-merger"
|
|
6734
|
-
}
|
|
6511
|
+
"name": "WorkspaceDepsUpdates"
|
|
6735
6512
|
},
|
|
6736
6513
|
"isOptional": true,
|
|
6737
6514
|
"isSpread": false
|
|
@@ -6762,7 +6539,7 @@
|
|
|
6762
6539
|
"__schema": "TypeSchema",
|
|
6763
6540
|
"location": {
|
|
6764
6541
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6765
|
-
"line":
|
|
6542
|
+
"line": 14,
|
|
6766
6543
|
"character": 1
|
|
6767
6544
|
},
|
|
6768
6545
|
"signature": "type MergeResultsThreeWay = {\n addFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n removeFiles: Array<{\n filePath: PathLinux;\n }>;\n remainDeletedFiles: Array<{\n filePath: PathLinux;\n }>;\n deletedConflictFiles: Array<{\n filePath: PathLinux;\n fsFile?: SourceFile;\n }>;\n modifiedFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n baseFile?: SourceFileModel;\n otherFile: SourceFileModel;\n output: string | null | undefined;\n conflict: string | null | undefined;\n isBinaryConflict?: boolean;\n }>;\n unModifiedFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n overrideFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n updatedFiles: Array<{\n filePath: PathLinux;\n otherFile: SourceFileModel;\n content: Buffer;\n }>;\n hasConflicts: boolean;\n}",
|
|
@@ -6771,7 +6548,7 @@
|
|
|
6771
6548
|
"__schema": "TypeLiteralSchema",
|
|
6772
6549
|
"location": {
|
|
6773
6550
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6774
|
-
"line":
|
|
6551
|
+
"line": 14,
|
|
6775
6552
|
"character": 36
|
|
6776
6553
|
},
|
|
6777
6554
|
"members": [
|
|
@@ -6779,7 +6556,7 @@
|
|
|
6779
6556
|
"__schema": "VariableLikeSchema",
|
|
6780
6557
|
"location": {
|
|
6781
6558
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6782
|
-
"line":
|
|
6559
|
+
"line": 15,
|
|
6783
6560
|
"character": 3
|
|
6784
6561
|
},
|
|
6785
6562
|
"signature": "(property) addFiles: {\n filePath: PathLinux;\n fsFile: SourceFile;\n}[]",
|
|
@@ -6788,7 +6565,7 @@
|
|
|
6788
6565
|
"__schema": "TypeRefSchema",
|
|
6789
6566
|
"location": {
|
|
6790
6567
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6791
|
-
"line":
|
|
6568
|
+
"line": 15,
|
|
6792
6569
|
"character": 13
|
|
6793
6570
|
},
|
|
6794
6571
|
"name": "Array",
|
|
@@ -6797,7 +6574,7 @@
|
|
|
6797
6574
|
"__schema": "TypeLiteralSchema",
|
|
6798
6575
|
"location": {
|
|
6799
6576
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6800
|
-
"line":
|
|
6577
|
+
"line": 15,
|
|
6801
6578
|
"character": 19
|
|
6802
6579
|
},
|
|
6803
6580
|
"members": [
|
|
@@ -6805,7 +6582,7 @@
|
|
|
6805
6582
|
"__schema": "VariableLikeSchema",
|
|
6806
6583
|
"location": {
|
|
6807
6584
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6808
|
-
"line":
|
|
6585
|
+
"line": 16,
|
|
6809
6586
|
"character": 5
|
|
6810
6587
|
},
|
|
6811
6588
|
"signature": "(property) filePath: string",
|
|
@@ -6814,11 +6591,10 @@
|
|
|
6814
6591
|
"__schema": "TypeRefSchema",
|
|
6815
6592
|
"location": {
|
|
6816
6593
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6817
|
-
"line":
|
|
6594
|
+
"line": 16,
|
|
6818
6595
|
"character": 15
|
|
6819
6596
|
},
|
|
6820
|
-
"name": "PathLinux"
|
|
6821
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
6597
|
+
"name": "PathLinux"
|
|
6822
6598
|
},
|
|
6823
6599
|
"isOptional": false
|
|
6824
6600
|
},
|
|
@@ -6826,7 +6602,7 @@
|
|
|
6826
6602
|
"__schema": "VariableLikeSchema",
|
|
6827
6603
|
"location": {
|
|
6828
6604
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6829
|
-
"line":
|
|
6605
|
+
"line": 17,
|
|
6830
6606
|
"character": 5
|
|
6831
6607
|
},
|
|
6832
6608
|
"signature": "(property) fsFile: SourceFile",
|
|
@@ -6835,7 +6611,7 @@
|
|
|
6835
6611
|
"__schema": "TypeRefSchema",
|
|
6836
6612
|
"location": {
|
|
6837
6613
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6838
|
-
"line":
|
|
6614
|
+
"line": 17,
|
|
6839
6615
|
"character": 5
|
|
6840
6616
|
},
|
|
6841
6617
|
"name": "SourceFile",
|
|
@@ -6853,7 +6629,7 @@
|
|
|
6853
6629
|
"__schema": "VariableLikeSchema",
|
|
6854
6630
|
"location": {
|
|
6855
6631
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6856
|
-
"line":
|
|
6632
|
+
"line": 19,
|
|
6857
6633
|
"character": 3
|
|
6858
6634
|
},
|
|
6859
6635
|
"signature": "(property) removeFiles: {\n filePath: PathLinux;\n}[]",
|
|
@@ -6862,7 +6638,7 @@
|
|
|
6862
6638
|
"__schema": "TypeRefSchema",
|
|
6863
6639
|
"location": {
|
|
6864
6640
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6865
|
-
"line":
|
|
6641
|
+
"line": 19,
|
|
6866
6642
|
"character": 16
|
|
6867
6643
|
},
|
|
6868
6644
|
"name": "Array",
|
|
@@ -6871,7 +6647,7 @@
|
|
|
6871
6647
|
"__schema": "TypeLiteralSchema",
|
|
6872
6648
|
"location": {
|
|
6873
6649
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6874
|
-
"line":
|
|
6650
|
+
"line": 19,
|
|
6875
6651
|
"character": 22
|
|
6876
6652
|
},
|
|
6877
6653
|
"members": [
|
|
@@ -6879,7 +6655,7 @@
|
|
|
6879
6655
|
"__schema": "VariableLikeSchema",
|
|
6880
6656
|
"location": {
|
|
6881
6657
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6882
|
-
"line":
|
|
6658
|
+
"line": 20,
|
|
6883
6659
|
"character": 5
|
|
6884
6660
|
},
|
|
6885
6661
|
"signature": "(property) filePath: string",
|
|
@@ -6888,11 +6664,10 @@
|
|
|
6888
6664
|
"__schema": "TypeRefSchema",
|
|
6889
6665
|
"location": {
|
|
6890
6666
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6891
|
-
"line":
|
|
6667
|
+
"line": 20,
|
|
6892
6668
|
"character": 15
|
|
6893
6669
|
},
|
|
6894
|
-
"name": "PathLinux"
|
|
6895
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
6670
|
+
"name": "PathLinux"
|
|
6896
6671
|
},
|
|
6897
6672
|
"isOptional": false
|
|
6898
6673
|
}
|
|
@@ -6906,7 +6681,7 @@
|
|
|
6906
6681
|
"__schema": "VariableLikeSchema",
|
|
6907
6682
|
"location": {
|
|
6908
6683
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6909
|
-
"line":
|
|
6684
|
+
"line": 22,
|
|
6910
6685
|
"character": 3
|
|
6911
6686
|
},
|
|
6912
6687
|
"signature": "(property) remainDeletedFiles: {\n filePath: PathLinux;\n}[]",
|
|
@@ -6915,7 +6690,7 @@
|
|
|
6915
6690
|
"__schema": "TypeRefSchema",
|
|
6916
6691
|
"location": {
|
|
6917
6692
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6918
|
-
"line":
|
|
6693
|
+
"line": 22,
|
|
6919
6694
|
"character": 23
|
|
6920
6695
|
},
|
|
6921
6696
|
"name": "Array",
|
|
@@ -6924,7 +6699,7 @@
|
|
|
6924
6699
|
"__schema": "TypeLiteralSchema",
|
|
6925
6700
|
"location": {
|
|
6926
6701
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6927
|
-
"line":
|
|
6702
|
+
"line": 22,
|
|
6928
6703
|
"character": 29
|
|
6929
6704
|
},
|
|
6930
6705
|
"members": [
|
|
@@ -6932,7 +6707,7 @@
|
|
|
6932
6707
|
"__schema": "VariableLikeSchema",
|
|
6933
6708
|
"location": {
|
|
6934
6709
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6935
|
-
"line":
|
|
6710
|
+
"line": 23,
|
|
6936
6711
|
"character": 5
|
|
6937
6712
|
},
|
|
6938
6713
|
"signature": "(property) filePath: string",
|
|
@@ -6941,11 +6716,10 @@
|
|
|
6941
6716
|
"__schema": "TypeRefSchema",
|
|
6942
6717
|
"location": {
|
|
6943
6718
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6944
|
-
"line":
|
|
6719
|
+
"line": 23,
|
|
6945
6720
|
"character": 15
|
|
6946
6721
|
},
|
|
6947
|
-
"name": "PathLinux"
|
|
6948
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
6722
|
+
"name": "PathLinux"
|
|
6949
6723
|
},
|
|
6950
6724
|
"isOptional": false
|
|
6951
6725
|
}
|
|
@@ -6959,7 +6733,7 @@
|
|
|
6959
6733
|
"__schema": "VariableLikeSchema",
|
|
6960
6734
|
"location": {
|
|
6961
6735
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6962
|
-
"line":
|
|
6736
|
+
"line": 25,
|
|
6963
6737
|
"character": 3
|
|
6964
6738
|
},
|
|
6965
6739
|
"signature": "(property) deletedConflictFiles: {\n filePath: PathLinux;\n fsFile?: SourceFile | undefined;\n}[]",
|
|
@@ -6968,7 +6742,7 @@
|
|
|
6968
6742
|
"__schema": "TypeRefSchema",
|
|
6969
6743
|
"location": {
|
|
6970
6744
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6971
|
-
"line":
|
|
6745
|
+
"line": 25,
|
|
6972
6746
|
"character": 25
|
|
6973
6747
|
},
|
|
6974
6748
|
"name": "Array",
|
|
@@ -6977,7 +6751,7 @@
|
|
|
6977
6751
|
"__schema": "TypeLiteralSchema",
|
|
6978
6752
|
"location": {
|
|
6979
6753
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6980
|
-
"line":
|
|
6754
|
+
"line": 25,
|
|
6981
6755
|
"character": 31
|
|
6982
6756
|
},
|
|
6983
6757
|
"members": [
|
|
@@ -6985,7 +6759,7 @@
|
|
|
6985
6759
|
"__schema": "VariableLikeSchema",
|
|
6986
6760
|
"location": {
|
|
6987
6761
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6988
|
-
"line":
|
|
6762
|
+
"line": 26,
|
|
6989
6763
|
"character": 5
|
|
6990
6764
|
},
|
|
6991
6765
|
"signature": "(property) filePath: string",
|
|
@@ -6994,11 +6768,10 @@
|
|
|
6994
6768
|
"__schema": "TypeRefSchema",
|
|
6995
6769
|
"location": {
|
|
6996
6770
|
"filePath": "merge-version/three-way-merge.ts",
|
|
6997
|
-
"line":
|
|
6771
|
+
"line": 26,
|
|
6998
6772
|
"character": 15
|
|
6999
6773
|
},
|
|
7000
|
-
"name": "PathLinux"
|
|
7001
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
6774
|
+
"name": "PathLinux"
|
|
7002
6775
|
},
|
|
7003
6776
|
"isOptional": false
|
|
7004
6777
|
},
|
|
@@ -7006,7 +6779,7 @@
|
|
|
7006
6779
|
"__schema": "VariableLikeSchema",
|
|
7007
6780
|
"location": {
|
|
7008
6781
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7009
|
-
"line":
|
|
6782
|
+
"line": 27,
|
|
7010
6783
|
"character": 5
|
|
7011
6784
|
},
|
|
7012
6785
|
"signature": "(property) fsFile?: SourceFile | undefined",
|
|
@@ -7015,11 +6788,10 @@
|
|
|
7015
6788
|
"__schema": "TypeRefSchema",
|
|
7016
6789
|
"location": {
|
|
7017
6790
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7018
|
-
"line":
|
|
6791
|
+
"line": 27,
|
|
7019
6792
|
"character": 14
|
|
7020
6793
|
},
|
|
7021
|
-
"name": "SourceFile"
|
|
7022
|
-
"packageName": "@teambit/legacy/dist/consumer/component/sources"
|
|
6794
|
+
"name": "SourceFile"
|
|
7023
6795
|
},
|
|
7024
6796
|
"isOptional": true
|
|
7025
6797
|
}
|
|
@@ -7033,7 +6805,7 @@
|
|
|
7033
6805
|
"__schema": "VariableLikeSchema",
|
|
7034
6806
|
"location": {
|
|
7035
6807
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7036
|
-
"line":
|
|
6808
|
+
"line": 29,
|
|
7037
6809
|
"character": 3
|
|
7038
6810
|
},
|
|
7039
6811
|
"signature": "(property) modifiedFiles: {\n filePath: PathLinux;\n fsFile: SourceFile;\n baseFile?: SourceFileModel | undefined;\n otherFile: SourceFileModel;\n output: string | null | undefined;\n conflict: string | null | undefined;\n isBinaryConflict?: boolean | undefined;\n}[]",
|
|
@@ -7042,7 +6814,7 @@
|
|
|
7042
6814
|
"__schema": "TypeRefSchema",
|
|
7043
6815
|
"location": {
|
|
7044
6816
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7045
|
-
"line":
|
|
6817
|
+
"line": 29,
|
|
7046
6818
|
"character": 18
|
|
7047
6819
|
},
|
|
7048
6820
|
"name": "Array",
|
|
@@ -7051,7 +6823,7 @@
|
|
|
7051
6823
|
"__schema": "TypeLiteralSchema",
|
|
7052
6824
|
"location": {
|
|
7053
6825
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7054
|
-
"line":
|
|
6826
|
+
"line": 29,
|
|
7055
6827
|
"character": 24
|
|
7056
6828
|
},
|
|
7057
6829
|
"members": [
|
|
@@ -7059,7 +6831,7 @@
|
|
|
7059
6831
|
"__schema": "VariableLikeSchema",
|
|
7060
6832
|
"location": {
|
|
7061
6833
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7062
|
-
"line":
|
|
6834
|
+
"line": 30,
|
|
7063
6835
|
"character": 5
|
|
7064
6836
|
},
|
|
7065
6837
|
"signature": "(property) filePath: string",
|
|
@@ -7068,11 +6840,10 @@
|
|
|
7068
6840
|
"__schema": "TypeRefSchema",
|
|
7069
6841
|
"location": {
|
|
7070
6842
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7071
|
-
"line":
|
|
6843
|
+
"line": 30,
|
|
7072
6844
|
"character": 15
|
|
7073
6845
|
},
|
|
7074
|
-
"name": "PathLinux"
|
|
7075
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
6846
|
+
"name": "PathLinux"
|
|
7076
6847
|
},
|
|
7077
6848
|
"isOptional": false
|
|
7078
6849
|
},
|
|
@@ -7080,7 +6851,7 @@
|
|
|
7080
6851
|
"__schema": "VariableLikeSchema",
|
|
7081
6852
|
"location": {
|
|
7082
6853
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7083
|
-
"line":
|
|
6854
|
+
"line": 31,
|
|
7084
6855
|
"character": 5
|
|
7085
6856
|
},
|
|
7086
6857
|
"signature": "(property) fsFile: SourceFile",
|
|
@@ -7089,7 +6860,7 @@
|
|
|
7089
6860
|
"__schema": "TypeRefSchema",
|
|
7090
6861
|
"location": {
|
|
7091
6862
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7092
|
-
"line":
|
|
6863
|
+
"line": 31,
|
|
7093
6864
|
"character": 5
|
|
7094
6865
|
},
|
|
7095
6866
|
"name": "SourceFile",
|
|
@@ -7101,7 +6872,7 @@
|
|
|
7101
6872
|
"__schema": "VariableLikeSchema",
|
|
7102
6873
|
"location": {
|
|
7103
6874
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7104
|
-
"line":
|
|
6875
|
+
"line": 32,
|
|
7105
6876
|
"character": 5
|
|
7106
6877
|
},
|
|
7107
6878
|
"signature": "(property) baseFile?: SourceFileModel | undefined",
|
|
@@ -7110,11 +6881,10 @@
|
|
|
7110
6881
|
"__schema": "TypeRefSchema",
|
|
7111
6882
|
"location": {
|
|
7112
6883
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7113
|
-
"line":
|
|
6884
|
+
"line": 32,
|
|
7114
6885
|
"character": 16
|
|
7115
6886
|
},
|
|
7116
|
-
"name": "SourceFileModel"
|
|
7117
|
-
"packageName": "@teambit/legacy/dist/scope/models/version"
|
|
6887
|
+
"name": "SourceFileModel"
|
|
7118
6888
|
},
|
|
7119
6889
|
"isOptional": true
|
|
7120
6890
|
},
|
|
@@ -7122,7 +6892,7 @@
|
|
|
7122
6892
|
"__schema": "VariableLikeSchema",
|
|
7123
6893
|
"location": {
|
|
7124
6894
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7125
|
-
"line":
|
|
6895
|
+
"line": 33,
|
|
7126
6896
|
"character": 5
|
|
7127
6897
|
},
|
|
7128
6898
|
"signature": "(property) otherFile: SourceFileModel",
|
|
@@ -7131,7 +6901,7 @@
|
|
|
7131
6901
|
"__schema": "TypeRefSchema",
|
|
7132
6902
|
"location": {
|
|
7133
6903
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7134
|
-
"line":
|
|
6904
|
+
"line": 33,
|
|
7135
6905
|
"character": 5
|
|
7136
6906
|
},
|
|
7137
6907
|
"name": "SourceFileModel",
|
|
@@ -7143,7 +6913,7 @@
|
|
|
7143
6913
|
"__schema": "VariableLikeSchema",
|
|
7144
6914
|
"location": {
|
|
7145
6915
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7146
|
-
"line":
|
|
6916
|
+
"line": 34,
|
|
7147
6917
|
"character": 5
|
|
7148
6918
|
},
|
|
7149
6919
|
"signature": "(property) output: string | null | undefined",
|
|
@@ -7152,7 +6922,7 @@
|
|
|
7152
6922
|
"__schema": "TypeUnionSchema",
|
|
7153
6923
|
"location": {
|
|
7154
6924
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7155
|
-
"line":
|
|
6925
|
+
"line": 34,
|
|
7156
6926
|
"character": 13
|
|
7157
6927
|
},
|
|
7158
6928
|
"types": [
|
|
@@ -7160,7 +6930,7 @@
|
|
|
7160
6930
|
"__schema": "KeywordTypeSchema",
|
|
7161
6931
|
"location": {
|
|
7162
6932
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7163
|
-
"line":
|
|
6933
|
+
"line": 34,
|
|
7164
6934
|
"character": 13
|
|
7165
6935
|
},
|
|
7166
6936
|
"name": "string"
|
|
@@ -7169,7 +6939,7 @@
|
|
|
7169
6939
|
"__schema": "LiteralTypeSchema",
|
|
7170
6940
|
"location": {
|
|
7171
6941
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7172
|
-
"line":
|
|
6942
|
+
"line": 34,
|
|
7173
6943
|
"character": 22
|
|
7174
6944
|
},
|
|
7175
6945
|
"name": "null"
|
|
@@ -7178,7 +6948,7 @@
|
|
|
7178
6948
|
"__schema": "KeywordTypeSchema",
|
|
7179
6949
|
"location": {
|
|
7180
6950
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7181
|
-
"line":
|
|
6951
|
+
"line": 34,
|
|
7182
6952
|
"character": 29
|
|
7183
6953
|
},
|
|
7184
6954
|
"name": "undefined"
|
|
@@ -7191,7 +6961,7 @@
|
|
|
7191
6961
|
"__schema": "VariableLikeSchema",
|
|
7192
6962
|
"location": {
|
|
7193
6963
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7194
|
-
"line":
|
|
6964
|
+
"line": 35,
|
|
7195
6965
|
"character": 5
|
|
7196
6966
|
},
|
|
7197
6967
|
"signature": "(property) conflict: string | null | undefined",
|
|
@@ -7200,7 +6970,7 @@
|
|
|
7200
6970
|
"__schema": "TypeUnionSchema",
|
|
7201
6971
|
"location": {
|
|
7202
6972
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7203
|
-
"line":
|
|
6973
|
+
"line": 35,
|
|
7204
6974
|
"character": 15
|
|
7205
6975
|
},
|
|
7206
6976
|
"types": [
|
|
@@ -7208,7 +6978,7 @@
|
|
|
7208
6978
|
"__schema": "KeywordTypeSchema",
|
|
7209
6979
|
"location": {
|
|
7210
6980
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7211
|
-
"line":
|
|
6981
|
+
"line": 35,
|
|
7212
6982
|
"character": 15
|
|
7213
6983
|
},
|
|
7214
6984
|
"name": "string"
|
|
@@ -7217,7 +6987,7 @@
|
|
|
7217
6987
|
"__schema": "LiteralTypeSchema",
|
|
7218
6988
|
"location": {
|
|
7219
6989
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7220
|
-
"line":
|
|
6990
|
+
"line": 35,
|
|
7221
6991
|
"character": 24
|
|
7222
6992
|
},
|
|
7223
6993
|
"name": "null"
|
|
@@ -7226,7 +6996,7 @@
|
|
|
7226
6996
|
"__schema": "KeywordTypeSchema",
|
|
7227
6997
|
"location": {
|
|
7228
6998
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7229
|
-
"line":
|
|
6999
|
+
"line": 35,
|
|
7230
7000
|
"character": 31
|
|
7231
7001
|
},
|
|
7232
7002
|
"name": "undefined"
|
|
@@ -7239,7 +7009,7 @@
|
|
|
7239
7009
|
"__schema": "VariableLikeSchema",
|
|
7240
7010
|
"location": {
|
|
7241
7011
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7242
|
-
"line":
|
|
7012
|
+
"line": 36,
|
|
7243
7013
|
"character": 5
|
|
7244
7014
|
},
|
|
7245
7015
|
"signature": "(property) isBinaryConflict?: boolean | undefined",
|
|
@@ -7248,7 +7018,7 @@
|
|
|
7248
7018
|
"__schema": "KeywordTypeSchema",
|
|
7249
7019
|
"location": {
|
|
7250
7020
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7251
|
-
"line":
|
|
7021
|
+
"line": 36,
|
|
7252
7022
|
"character": 24
|
|
7253
7023
|
},
|
|
7254
7024
|
"name": "boolean"
|
|
@@ -7265,7 +7035,7 @@
|
|
|
7265
7035
|
"__schema": "VariableLikeSchema",
|
|
7266
7036
|
"location": {
|
|
7267
7037
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7268
|
-
"line":
|
|
7038
|
+
"line": 38,
|
|
7269
7039
|
"character": 3
|
|
7270
7040
|
},
|
|
7271
7041
|
"signature": "(property) unModifiedFiles: {\n filePath: PathLinux;\n fsFile: SourceFile;\n}[]",
|
|
@@ -7274,7 +7044,7 @@
|
|
|
7274
7044
|
"__schema": "TypeRefSchema",
|
|
7275
7045
|
"location": {
|
|
7276
7046
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7277
|
-
"line":
|
|
7047
|
+
"line": 38,
|
|
7278
7048
|
"character": 20
|
|
7279
7049
|
},
|
|
7280
7050
|
"name": "Array",
|
|
@@ -7283,7 +7053,7 @@
|
|
|
7283
7053
|
"__schema": "TypeLiteralSchema",
|
|
7284
7054
|
"location": {
|
|
7285
7055
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7286
|
-
"line":
|
|
7056
|
+
"line": 38,
|
|
7287
7057
|
"character": 26
|
|
7288
7058
|
},
|
|
7289
7059
|
"members": [
|
|
@@ -7291,7 +7061,7 @@
|
|
|
7291
7061
|
"__schema": "VariableLikeSchema",
|
|
7292
7062
|
"location": {
|
|
7293
7063
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7294
|
-
"line":
|
|
7064
|
+
"line": 39,
|
|
7295
7065
|
"character": 5
|
|
7296
7066
|
},
|
|
7297
7067
|
"signature": "(property) filePath: string",
|
|
@@ -7300,11 +7070,10 @@
|
|
|
7300
7070
|
"__schema": "TypeRefSchema",
|
|
7301
7071
|
"location": {
|
|
7302
7072
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7303
|
-
"line":
|
|
7073
|
+
"line": 39,
|
|
7304
7074
|
"character": 15
|
|
7305
7075
|
},
|
|
7306
|
-
"name": "PathLinux"
|
|
7307
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
7076
|
+
"name": "PathLinux"
|
|
7308
7077
|
},
|
|
7309
7078
|
"isOptional": false
|
|
7310
7079
|
},
|
|
@@ -7312,7 +7081,7 @@
|
|
|
7312
7081
|
"__schema": "VariableLikeSchema",
|
|
7313
7082
|
"location": {
|
|
7314
7083
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7315
|
-
"line":
|
|
7084
|
+
"line": 40,
|
|
7316
7085
|
"character": 5
|
|
7317
7086
|
},
|
|
7318
7087
|
"signature": "(property) fsFile: SourceFile",
|
|
@@ -7321,7 +7090,7 @@
|
|
|
7321
7090
|
"__schema": "TypeRefSchema",
|
|
7322
7091
|
"location": {
|
|
7323
7092
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7324
|
-
"line":
|
|
7093
|
+
"line": 40,
|
|
7325
7094
|
"character": 5
|
|
7326
7095
|
},
|
|
7327
7096
|
"name": "SourceFile",
|
|
@@ -7339,7 +7108,7 @@
|
|
|
7339
7108
|
"__schema": "VariableLikeSchema",
|
|
7340
7109
|
"location": {
|
|
7341
7110
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7342
|
-
"line":
|
|
7111
|
+
"line": 42,
|
|
7343
7112
|
"character": 3
|
|
7344
7113
|
},
|
|
7345
7114
|
"signature": "(property) overrideFiles: {\n filePath: PathLinux;\n fsFile: SourceFile;\n}[]",
|
|
@@ -7348,7 +7117,7 @@
|
|
|
7348
7117
|
"__schema": "TypeRefSchema",
|
|
7349
7118
|
"location": {
|
|
7350
7119
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7351
|
-
"line":
|
|
7120
|
+
"line": 42,
|
|
7352
7121
|
"character": 18
|
|
7353
7122
|
},
|
|
7354
7123
|
"name": "Array",
|
|
@@ -7357,7 +7126,7 @@
|
|
|
7357
7126
|
"__schema": "TypeLiteralSchema",
|
|
7358
7127
|
"location": {
|
|
7359
7128
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7360
|
-
"line":
|
|
7129
|
+
"line": 42,
|
|
7361
7130
|
"character": 24
|
|
7362
7131
|
},
|
|
7363
7132
|
"members": [
|
|
@@ -7365,7 +7134,7 @@
|
|
|
7365
7134
|
"__schema": "VariableLikeSchema",
|
|
7366
7135
|
"location": {
|
|
7367
7136
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7368
|
-
"line":
|
|
7137
|
+
"line": 43,
|
|
7369
7138
|
"character": 5
|
|
7370
7139
|
},
|
|
7371
7140
|
"signature": "(property) filePath: string",
|
|
@@ -7374,11 +7143,10 @@
|
|
|
7374
7143
|
"__schema": "TypeRefSchema",
|
|
7375
7144
|
"location": {
|
|
7376
7145
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7377
|
-
"line":
|
|
7146
|
+
"line": 43,
|
|
7378
7147
|
"character": 15
|
|
7379
7148
|
},
|
|
7380
|
-
"name": "PathLinux"
|
|
7381
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
7149
|
+
"name": "PathLinux"
|
|
7382
7150
|
},
|
|
7383
7151
|
"isOptional": false
|
|
7384
7152
|
},
|
|
@@ -7386,7 +7154,7 @@
|
|
|
7386
7154
|
"__schema": "VariableLikeSchema",
|
|
7387
7155
|
"location": {
|
|
7388
7156
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7389
|
-
"line":
|
|
7157
|
+
"line": 44,
|
|
7390
7158
|
"character": 5
|
|
7391
7159
|
},
|
|
7392
7160
|
"signature": "(property) fsFile: SourceFile",
|
|
@@ -7395,7 +7163,7 @@
|
|
|
7395
7163
|
"__schema": "TypeRefSchema",
|
|
7396
7164
|
"location": {
|
|
7397
7165
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7398
|
-
"line":
|
|
7166
|
+
"line": 44,
|
|
7399
7167
|
"character": 5
|
|
7400
7168
|
},
|
|
7401
7169
|
"name": "SourceFile",
|
|
@@ -7413,7 +7181,7 @@
|
|
|
7413
7181
|
"__schema": "VariableLikeSchema",
|
|
7414
7182
|
"location": {
|
|
7415
7183
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7416
|
-
"line":
|
|
7184
|
+
"line": 46,
|
|
7417
7185
|
"character": 3
|
|
7418
7186
|
},
|
|
7419
7187
|
"signature": "(property) updatedFiles: {\n filePath: PathLinux;\n otherFile: SourceFileModel;\n content: Buffer;\n}[]",
|
|
@@ -7422,7 +7190,7 @@
|
|
|
7422
7190
|
"__schema": "TypeRefSchema",
|
|
7423
7191
|
"location": {
|
|
7424
7192
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7425
|
-
"line":
|
|
7193
|
+
"line": 46,
|
|
7426
7194
|
"character": 17
|
|
7427
7195
|
},
|
|
7428
7196
|
"name": "Array",
|
|
@@ -7431,7 +7199,7 @@
|
|
|
7431
7199
|
"__schema": "TypeLiteralSchema",
|
|
7432
7200
|
"location": {
|
|
7433
7201
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7434
|
-
"line":
|
|
7202
|
+
"line": 46,
|
|
7435
7203
|
"character": 23
|
|
7436
7204
|
},
|
|
7437
7205
|
"members": [
|
|
@@ -7439,7 +7207,7 @@
|
|
|
7439
7207
|
"__schema": "VariableLikeSchema",
|
|
7440
7208
|
"location": {
|
|
7441
7209
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7442
|
-
"line":
|
|
7210
|
+
"line": 47,
|
|
7443
7211
|
"character": 5
|
|
7444
7212
|
},
|
|
7445
7213
|
"signature": "(property) filePath: string",
|
|
@@ -7448,11 +7216,10 @@
|
|
|
7448
7216
|
"__schema": "TypeRefSchema",
|
|
7449
7217
|
"location": {
|
|
7450
7218
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7451
|
-
"line":
|
|
7219
|
+
"line": 47,
|
|
7452
7220
|
"character": 15
|
|
7453
7221
|
},
|
|
7454
|
-
"name": "PathLinux"
|
|
7455
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
7222
|
+
"name": "PathLinux"
|
|
7456
7223
|
},
|
|
7457
7224
|
"isOptional": false
|
|
7458
7225
|
},
|
|
@@ -7460,7 +7227,7 @@
|
|
|
7460
7227
|
"__schema": "VariableLikeSchema",
|
|
7461
7228
|
"location": {
|
|
7462
7229
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7463
|
-
"line":
|
|
7230
|
+
"line": 48,
|
|
7464
7231
|
"character": 5
|
|
7465
7232
|
},
|
|
7466
7233
|
"signature": "(property) otherFile: SourceFileModel",
|
|
@@ -7469,7 +7236,7 @@
|
|
|
7469
7236
|
"__schema": "TypeRefSchema",
|
|
7470
7237
|
"location": {
|
|
7471
7238
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7472
|
-
"line":
|
|
7239
|
+
"line": 48,
|
|
7473
7240
|
"character": 5
|
|
7474
7241
|
},
|
|
7475
7242
|
"name": "SourceFileModel",
|
|
@@ -7481,7 +7248,7 @@
|
|
|
7481
7248
|
"__schema": "VariableLikeSchema",
|
|
7482
7249
|
"location": {
|
|
7483
7250
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7484
|
-
"line":
|
|
7251
|
+
"line": 49,
|
|
7485
7252
|
"character": 5
|
|
7486
7253
|
},
|
|
7487
7254
|
"signature": "(property) content: Buffer",
|
|
@@ -7490,7 +7257,7 @@
|
|
|
7490
7257
|
"__schema": "TypeRefSchema",
|
|
7491
7258
|
"location": {
|
|
7492
7259
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7493
|
-
"line":
|
|
7260
|
+
"line": 49,
|
|
7494
7261
|
"character": 14
|
|
7495
7262
|
},
|
|
7496
7263
|
"name": "Buffer"
|
|
@@ -7507,7 +7274,7 @@
|
|
|
7507
7274
|
"__schema": "VariableLikeSchema",
|
|
7508
7275
|
"location": {
|
|
7509
7276
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7510
|
-
"line":
|
|
7277
|
+
"line": 51,
|
|
7511
7278
|
"character": 3
|
|
7512
7279
|
},
|
|
7513
7280
|
"signature": "(property) hasConflicts: boolean",
|
|
@@ -7516,7 +7283,7 @@
|
|
|
7516
7283
|
"__schema": "KeywordTypeSchema",
|
|
7517
7284
|
"location": {
|
|
7518
7285
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7519
|
-
"line":
|
|
7286
|
+
"line": 51,
|
|
7520
7287
|
"character": 17
|
|
7521
7288
|
},
|
|
7522
7289
|
"name": "boolean"
|
|
@@ -7530,14 +7297,14 @@
|
|
|
7530
7297
|
"__schema": "FunctionLikeSchema",
|
|
7531
7298
|
"location": {
|
|
7532
7299
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7533
|
-
"line":
|
|
7300
|
+
"line": 67,
|
|
7534
7301
|
"character": 1
|
|
7535
7302
|
},
|
|
7536
7303
|
"doc": {
|
|
7537
7304
|
"__schema": "DocSchema",
|
|
7538
7305
|
"location": {
|
|
7539
7306
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7540
|
-
"line":
|
|
7307
|
+
"line": 54,
|
|
7541
7308
|
"character": 1
|
|
7542
7309
|
},
|
|
7543
7310
|
"raw": "/**\n * to do the actual merge we use git, specifically `merge-file` command, so we try to use the same\n * terminology as git. From the command help:\n * `git merge-file <current-file> <base-file> <other-file>\n * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into\n * <current-file>. The result ordinarily goes into <current-file>.`\n *\n * see checkout-version.getBaseVersion() for a case when a component is modified and then the base-file is not the\n * common file before other-file and current-file.\n * otherwise, Git terminology pretty much reflects what we do here. current-file is the one that is currently written\n * to the filesystem. other-file is the one the user wants to checkout to. base-file is the original file where both:\n * base-file and other-file were originated from.\n */",
|
|
@@ -7551,7 +7318,7 @@
|
|
|
7551
7318
|
"__schema": "ParameterSchema",
|
|
7552
7319
|
"location": {
|
|
7553
7320
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7554
|
-
"line":
|
|
7321
|
+
"line": 67,
|
|
7555
7322
|
"character": 37
|
|
7556
7323
|
},
|
|
7557
7324
|
"name": "{ scope, otherComponent, otherLabel, currentComponent, currentLabel, baseComponent }",
|
|
@@ -7559,7 +7326,7 @@
|
|
|
7559
7326
|
"__schema": "TypeLiteralSchema",
|
|
7560
7327
|
"location": {
|
|
7561
7328
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7562
|
-
"line":
|
|
7329
|
+
"line": 74,
|
|
7563
7330
|
"character": 4
|
|
7564
7331
|
},
|
|
7565
7332
|
"members": [
|
|
@@ -7567,7 +7334,7 @@
|
|
|
7567
7334
|
"__schema": "VariableLikeSchema",
|
|
7568
7335
|
"location": {
|
|
7569
7336
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7570
|
-
"line":
|
|
7337
|
+
"line": 75,
|
|
7571
7338
|
"character": 3
|
|
7572
7339
|
},
|
|
7573
7340
|
"signature": "(property) scope: Scope",
|
|
@@ -7576,7 +7343,7 @@
|
|
|
7576
7343
|
"__schema": "TypeRefSchema",
|
|
7577
7344
|
"location": {
|
|
7578
7345
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7579
|
-
"line":
|
|
7346
|
+
"line": 75,
|
|
7580
7347
|
"character": 3
|
|
7581
7348
|
},
|
|
7582
7349
|
"name": "Scope",
|
|
@@ -7588,7 +7355,7 @@
|
|
|
7588
7355
|
"__schema": "VariableLikeSchema",
|
|
7589
7356
|
"location": {
|
|
7590
7357
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7591
|
-
"line":
|
|
7358
|
+
"line": 76,
|
|
7592
7359
|
"character": 3
|
|
7593
7360
|
},
|
|
7594
7361
|
"signature": "(property) otherComponent: Version",
|
|
@@ -7597,7 +7364,7 @@
|
|
|
7597
7364
|
"__schema": "TypeRefSchema",
|
|
7598
7365
|
"location": {
|
|
7599
7366
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7600
|
-
"line":
|
|
7367
|
+
"line": 76,
|
|
7601
7368
|
"character": 3
|
|
7602
7369
|
},
|
|
7603
7370
|
"name": "Version",
|
|
@@ -7609,7 +7376,7 @@
|
|
|
7609
7376
|
"__schema": "VariableLikeSchema",
|
|
7610
7377
|
"location": {
|
|
7611
7378
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7612
|
-
"line":
|
|
7379
|
+
"line": 77,
|
|
7613
7380
|
"character": 3
|
|
7614
7381
|
},
|
|
7615
7382
|
"signature": "(property) otherLabel: string",
|
|
@@ -7618,7 +7385,7 @@
|
|
|
7618
7385
|
"__schema": "KeywordTypeSchema",
|
|
7619
7386
|
"location": {
|
|
7620
7387
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7621
|
-
"line":
|
|
7388
|
+
"line": 77,
|
|
7622
7389
|
"character": 15
|
|
7623
7390
|
},
|
|
7624
7391
|
"name": "string"
|
|
@@ -7629,7 +7396,7 @@
|
|
|
7629
7396
|
"__schema": "VariableLikeSchema",
|
|
7630
7397
|
"location": {
|
|
7631
7398
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7632
|
-
"line":
|
|
7399
|
+
"line": 78,
|
|
7633
7400
|
"character": 3
|
|
7634
7401
|
},
|
|
7635
7402
|
"signature": "(property) currentComponent: Component",
|
|
@@ -7638,7 +7405,7 @@
|
|
|
7638
7405
|
"__schema": "TypeRefSchema",
|
|
7639
7406
|
"location": {
|
|
7640
7407
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7641
|
-
"line":
|
|
7408
|
+
"line": 78,
|
|
7642
7409
|
"character": 3
|
|
7643
7410
|
},
|
|
7644
7411
|
"name": "Component",
|
|
@@ -7650,7 +7417,7 @@
|
|
|
7650
7417
|
"__schema": "VariableLikeSchema",
|
|
7651
7418
|
"location": {
|
|
7652
7419
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7653
|
-
"line":
|
|
7420
|
+
"line": 79,
|
|
7654
7421
|
"character": 3
|
|
7655
7422
|
},
|
|
7656
7423
|
"signature": "(property) currentLabel: string",
|
|
@@ -7659,7 +7426,7 @@
|
|
|
7659
7426
|
"__schema": "KeywordTypeSchema",
|
|
7660
7427
|
"location": {
|
|
7661
7428
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7662
|
-
"line":
|
|
7429
|
+
"line": 79,
|
|
7663
7430
|
"character": 17
|
|
7664
7431
|
},
|
|
7665
7432
|
"name": "string"
|
|
@@ -7670,7 +7437,7 @@
|
|
|
7670
7437
|
"__schema": "VariableLikeSchema",
|
|
7671
7438
|
"location": {
|
|
7672
7439
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7673
|
-
"line":
|
|
7440
|
+
"line": 80,
|
|
7674
7441
|
"character": 3
|
|
7675
7442
|
},
|
|
7676
7443
|
"signature": "(property) baseComponent: Version",
|
|
@@ -7679,7 +7446,7 @@
|
|
|
7679
7446
|
"__schema": "TypeRefSchema",
|
|
7680
7447
|
"location": {
|
|
7681
7448
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7682
|
-
"line":
|
|
7449
|
+
"line": 80,
|
|
7683
7450
|
"character": 3
|
|
7684
7451
|
},
|
|
7685
7452
|
"name": "Version",
|
|
@@ -7695,7 +7462,7 @@
|
|
|
7695
7462
|
"__schema": "VariableLikeSchema",
|
|
7696
7463
|
"location": {
|
|
7697
7464
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7698
|
-
"line":
|
|
7465
|
+
"line": 75,
|
|
7699
7466
|
"character": 3
|
|
7700
7467
|
},
|
|
7701
7468
|
"signature": "(property) scope: Scope",
|
|
@@ -7704,7 +7471,7 @@
|
|
|
7704
7471
|
"__schema": "TypeRefSchema",
|
|
7705
7472
|
"location": {
|
|
7706
7473
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7707
|
-
"line":
|
|
7474
|
+
"line": 75,
|
|
7708
7475
|
"character": 3
|
|
7709
7476
|
},
|
|
7710
7477
|
"name": "Scope",
|
|
@@ -7716,7 +7483,7 @@
|
|
|
7716
7483
|
"__schema": "VariableLikeSchema",
|
|
7717
7484
|
"location": {
|
|
7718
7485
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7719
|
-
"line":
|
|
7486
|
+
"line": 76,
|
|
7720
7487
|
"character": 3
|
|
7721
7488
|
},
|
|
7722
7489
|
"signature": "(property) otherComponent: Version",
|
|
@@ -7725,7 +7492,7 @@
|
|
|
7725
7492
|
"__schema": "TypeRefSchema",
|
|
7726
7493
|
"location": {
|
|
7727
7494
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7728
|
-
"line":
|
|
7495
|
+
"line": 76,
|
|
7729
7496
|
"character": 3
|
|
7730
7497
|
},
|
|
7731
7498
|
"name": "Version",
|
|
@@ -7737,7 +7504,7 @@
|
|
|
7737
7504
|
"__schema": "VariableLikeSchema",
|
|
7738
7505
|
"location": {
|
|
7739
7506
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7740
|
-
"line":
|
|
7507
|
+
"line": 77,
|
|
7741
7508
|
"character": 3
|
|
7742
7509
|
},
|
|
7743
7510
|
"signature": "(property) otherLabel: string",
|
|
@@ -7746,7 +7513,7 @@
|
|
|
7746
7513
|
"__schema": "KeywordTypeSchema",
|
|
7747
7514
|
"location": {
|
|
7748
7515
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7749
|
-
"line":
|
|
7516
|
+
"line": 77,
|
|
7750
7517
|
"character": 15
|
|
7751
7518
|
},
|
|
7752
7519
|
"name": "string"
|
|
@@ -7757,7 +7524,7 @@
|
|
|
7757
7524
|
"__schema": "VariableLikeSchema",
|
|
7758
7525
|
"location": {
|
|
7759
7526
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7760
|
-
"line":
|
|
7527
|
+
"line": 78,
|
|
7761
7528
|
"character": 3
|
|
7762
7529
|
},
|
|
7763
7530
|
"signature": "(property) currentComponent: Component",
|
|
@@ -7766,7 +7533,7 @@
|
|
|
7766
7533
|
"__schema": "TypeRefSchema",
|
|
7767
7534
|
"location": {
|
|
7768
7535
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7769
|
-
"line":
|
|
7536
|
+
"line": 78,
|
|
7770
7537
|
"character": 3
|
|
7771
7538
|
},
|
|
7772
7539
|
"name": "Component",
|
|
@@ -7778,7 +7545,7 @@
|
|
|
7778
7545
|
"__schema": "VariableLikeSchema",
|
|
7779
7546
|
"location": {
|
|
7780
7547
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7781
|
-
"line":
|
|
7548
|
+
"line": 79,
|
|
7782
7549
|
"character": 3
|
|
7783
7550
|
},
|
|
7784
7551
|
"signature": "(property) currentLabel: string",
|
|
@@ -7787,7 +7554,7 @@
|
|
|
7787
7554
|
"__schema": "KeywordTypeSchema",
|
|
7788
7555
|
"location": {
|
|
7789
7556
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7790
|
-
"line":
|
|
7557
|
+
"line": 79,
|
|
7791
7558
|
"character": 17
|
|
7792
7559
|
},
|
|
7793
7560
|
"name": "string"
|
|
@@ -7798,7 +7565,7 @@
|
|
|
7798
7565
|
"__schema": "VariableLikeSchema",
|
|
7799
7566
|
"location": {
|
|
7800
7567
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7801
|
-
"line":
|
|
7568
|
+
"line": 80,
|
|
7802
7569
|
"character": 3
|
|
7803
7570
|
},
|
|
7804
7571
|
"signature": "(property) baseComponent: Version",
|
|
@@ -7807,7 +7574,7 @@
|
|
|
7807
7574
|
"__schema": "TypeRefSchema",
|
|
7808
7575
|
"location": {
|
|
7809
7576
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7810
|
-
"line":
|
|
7577
|
+
"line": 80,
|
|
7811
7578
|
"character": 3
|
|
7812
7579
|
},
|
|
7813
7580
|
"name": "Version",
|
|
@@ -7823,7 +7590,7 @@
|
|
|
7823
7590
|
"__schema": "TypeRefSchema",
|
|
7824
7591
|
"location": {
|
|
7825
7592
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7826
|
-
"line":
|
|
7593
|
+
"line": 81,
|
|
7827
7594
|
"character": 5
|
|
7828
7595
|
},
|
|
7829
7596
|
"name": "Promise",
|
|
@@ -7832,7 +7599,7 @@
|
|
|
7832
7599
|
"__schema": "TypeRefSchema",
|
|
7833
7600
|
"location": {
|
|
7834
7601
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7835
|
-
"line":
|
|
7602
|
+
"line": 81,
|
|
7836
7603
|
"character": 13
|
|
7837
7604
|
},
|
|
7838
7605
|
"name": "MergeResultsThreeWay"
|
|
@@ -7850,7 +7617,7 @@
|
|
|
7850
7617
|
"__schema": "FunctionLikeSchema",
|
|
7851
7618
|
"location": {
|
|
7852
7619
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7853
|
-
"line":
|
|
7620
|
+
"line": 210,
|
|
7854
7621
|
"character": 1
|
|
7855
7622
|
},
|
|
7856
7623
|
"signature": "function getMergeResults(scope: Scope, modifiedFiles: MergeResultsThreeWay['modifiedFiles']): Promise<MergeFileResult[]>",
|
|
@@ -7860,7 +7627,7 @@
|
|
|
7860
7627
|
"__schema": "ParameterSchema",
|
|
7861
7628
|
"location": {
|
|
7862
7629
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7863
|
-
"line":
|
|
7630
|
+
"line": 211,
|
|
7864
7631
|
"character": 3
|
|
7865
7632
|
},
|
|
7866
7633
|
"name": "scope",
|
|
@@ -7868,11 +7635,10 @@
|
|
|
7868
7635
|
"__schema": "TypeRefSchema",
|
|
7869
7636
|
"location": {
|
|
7870
7637
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7871
|
-
"line":
|
|
7638
|
+
"line": 211,
|
|
7872
7639
|
"character": 10
|
|
7873
7640
|
},
|
|
7874
|
-
"name": "Scope"
|
|
7875
|
-
"packageName": "@teambit/legacy/dist/scope"
|
|
7641
|
+
"name": "Scope"
|
|
7876
7642
|
},
|
|
7877
7643
|
"isOptional": false,
|
|
7878
7644
|
"isSpread": false
|
|
@@ -7881,7 +7647,7 @@
|
|
|
7881
7647
|
"__schema": "ParameterSchema",
|
|
7882
7648
|
"location": {
|
|
7883
7649
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7884
|
-
"line":
|
|
7650
|
+
"line": 212,
|
|
7885
7651
|
"character": 3
|
|
7886
7652
|
},
|
|
7887
7653
|
"name": "modifiedFiles",
|
|
@@ -7889,14 +7655,14 @@
|
|
|
7889
7655
|
"__schema": "IndexedAccessSchema",
|
|
7890
7656
|
"location": {
|
|
7891
7657
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7892
|
-
"line":
|
|
7658
|
+
"line": 212,
|
|
7893
7659
|
"character": 18
|
|
7894
7660
|
},
|
|
7895
7661
|
"objectType": {
|
|
7896
7662
|
"__schema": "TypeRefSchema",
|
|
7897
7663
|
"location": {
|
|
7898
7664
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7899
|
-
"line":
|
|
7665
|
+
"line": 212,
|
|
7900
7666
|
"character": 18
|
|
7901
7667
|
},
|
|
7902
7668
|
"name": "MergeResultsThreeWay"
|
|
@@ -7905,7 +7671,7 @@
|
|
|
7905
7671
|
"__schema": "LiteralTypeSchema",
|
|
7906
7672
|
"location": {
|
|
7907
7673
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7908
|
-
"line":
|
|
7674
|
+
"line": 212,
|
|
7909
7675
|
"character": 39
|
|
7910
7676
|
},
|
|
7911
7677
|
"name": "'modifiedFiles'"
|
|
@@ -7919,7 +7685,7 @@
|
|
|
7919
7685
|
"__schema": "TypeRefSchema",
|
|
7920
7686
|
"location": {
|
|
7921
7687
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7922
|
-
"line":
|
|
7688
|
+
"line": 213,
|
|
7923
7689
|
"character": 4
|
|
7924
7690
|
},
|
|
7925
7691
|
"name": "Promise",
|
|
@@ -7928,14 +7694,14 @@
|
|
|
7928
7694
|
"__schema": "TypeArraySchema",
|
|
7929
7695
|
"location": {
|
|
7930
7696
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7931
|
-
"line":
|
|
7697
|
+
"line": 213,
|
|
7932
7698
|
"character": 12
|
|
7933
7699
|
},
|
|
7934
7700
|
"type": {
|
|
7935
7701
|
"__schema": "TypeRefSchema",
|
|
7936
7702
|
"location": {
|
|
7937
7703
|
"filePath": "merge-version/three-way-merge.ts",
|
|
7938
|
-
"line":
|
|
7704
|
+
"line": 213,
|
|
7939
7705
|
"character": 12
|
|
7940
7706
|
},
|
|
7941
7707
|
"name": "MergeFileResult"
|
|
@@ -7961,7 +7727,7 @@
|
|
|
7961
7727
|
"__schema": "TypeSchema",
|
|
7962
7728
|
"location": {
|
|
7963
7729
|
"filePath": "merge-files.ts",
|
|
7964
|
-
"line":
|
|
7730
|
+
"line": 7,
|
|
7965
7731
|
"character": 1
|
|
7966
7732
|
},
|
|
7967
7733
|
"signature": "type MergeFileResult = {\n filePath: PathLinux;\n output: string | null | undefined;\n conflict: string | null | undefined;\n isBinaryConflict?: boolean | undefined;\n}",
|
|
@@ -7970,7 +7736,7 @@
|
|
|
7970
7736
|
"__schema": "TypeLiteralSchema",
|
|
7971
7737
|
"location": {
|
|
7972
7738
|
"filePath": "merge-files.ts",
|
|
7973
|
-
"line":
|
|
7739
|
+
"line": 7,
|
|
7974
7740
|
"character": 31
|
|
7975
7741
|
},
|
|
7976
7742
|
"members": [
|
|
@@ -7978,7 +7744,7 @@
|
|
|
7978
7744
|
"__schema": "VariableLikeSchema",
|
|
7979
7745
|
"location": {
|
|
7980
7746
|
"filePath": "merge-files.ts",
|
|
7981
|
-
"line":
|
|
7747
|
+
"line": 8,
|
|
7982
7748
|
"character": 3
|
|
7983
7749
|
},
|
|
7984
7750
|
"signature": "(property) filePath: string",
|
|
@@ -7987,11 +7753,10 @@
|
|
|
7987
7753
|
"__schema": "TypeRefSchema",
|
|
7988
7754
|
"location": {
|
|
7989
7755
|
"filePath": "merge-files.ts",
|
|
7990
|
-
"line":
|
|
7756
|
+
"line": 8,
|
|
7991
7757
|
"character": 13
|
|
7992
7758
|
},
|
|
7993
|
-
"name": "PathLinux"
|
|
7994
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
7759
|
+
"name": "PathLinux"
|
|
7995
7760
|
},
|
|
7996
7761
|
"isOptional": false
|
|
7997
7762
|
},
|
|
@@ -7999,7 +7764,7 @@
|
|
|
7999
7764
|
"__schema": "VariableLikeSchema",
|
|
8000
7765
|
"location": {
|
|
8001
7766
|
"filePath": "merge-files.ts",
|
|
8002
|
-
"line":
|
|
7767
|
+
"line": 9,
|
|
8003
7768
|
"character": 3
|
|
8004
7769
|
},
|
|
8005
7770
|
"signature": "(property) output: string | null | undefined",
|
|
@@ -8008,7 +7773,7 @@
|
|
|
8008
7773
|
"__schema": "TypeUnionSchema",
|
|
8009
7774
|
"location": {
|
|
8010
7775
|
"filePath": "merge-files.ts",
|
|
8011
|
-
"line":
|
|
7776
|
+
"line": 9,
|
|
8012
7777
|
"character": 11
|
|
8013
7778
|
},
|
|
8014
7779
|
"types": [
|
|
@@ -8016,7 +7781,7 @@
|
|
|
8016
7781
|
"__schema": "KeywordTypeSchema",
|
|
8017
7782
|
"location": {
|
|
8018
7783
|
"filePath": "merge-files.ts",
|
|
8019
|
-
"line":
|
|
7784
|
+
"line": 9,
|
|
8020
7785
|
"character": 11
|
|
8021
7786
|
},
|
|
8022
7787
|
"name": "string"
|
|
@@ -8025,7 +7790,7 @@
|
|
|
8025
7790
|
"__schema": "LiteralTypeSchema",
|
|
8026
7791
|
"location": {
|
|
8027
7792
|
"filePath": "merge-files.ts",
|
|
8028
|
-
"line":
|
|
7793
|
+
"line": 9,
|
|
8029
7794
|
"character": 20
|
|
8030
7795
|
},
|
|
8031
7796
|
"name": "null"
|
|
@@ -8034,7 +7799,7 @@
|
|
|
8034
7799
|
"__schema": "KeywordTypeSchema",
|
|
8035
7800
|
"location": {
|
|
8036
7801
|
"filePath": "merge-files.ts",
|
|
8037
|
-
"line":
|
|
7802
|
+
"line": 9,
|
|
8038
7803
|
"character": 27
|
|
8039
7804
|
},
|
|
8040
7805
|
"name": "undefined"
|
|
@@ -8047,7 +7812,7 @@
|
|
|
8047
7812
|
"__schema": "VariableLikeSchema",
|
|
8048
7813
|
"location": {
|
|
8049
7814
|
"filePath": "merge-files.ts",
|
|
8050
|
-
"line":
|
|
7815
|
+
"line": 10,
|
|
8051
7816
|
"character": 3
|
|
8052
7817
|
},
|
|
8053
7818
|
"signature": "(property) conflict: string | null | undefined",
|
|
@@ -8056,7 +7821,7 @@
|
|
|
8056
7821
|
"__schema": "TypeUnionSchema",
|
|
8057
7822
|
"location": {
|
|
8058
7823
|
"filePath": "merge-files.ts",
|
|
8059
|
-
"line":
|
|
7824
|
+
"line": 10,
|
|
8060
7825
|
"character": 13
|
|
8061
7826
|
},
|
|
8062
7827
|
"types": [
|
|
@@ -8064,7 +7829,7 @@
|
|
|
8064
7829
|
"__schema": "KeywordTypeSchema",
|
|
8065
7830
|
"location": {
|
|
8066
7831
|
"filePath": "merge-files.ts",
|
|
8067
|
-
"line":
|
|
7832
|
+
"line": 10,
|
|
8068
7833
|
"character": 13
|
|
8069
7834
|
},
|
|
8070
7835
|
"name": "string"
|
|
@@ -8073,7 +7838,7 @@
|
|
|
8073
7838
|
"__schema": "LiteralTypeSchema",
|
|
8074
7839
|
"location": {
|
|
8075
7840
|
"filePath": "merge-files.ts",
|
|
8076
|
-
"line":
|
|
7841
|
+
"line": 10,
|
|
8077
7842
|
"character": 22
|
|
8078
7843
|
},
|
|
8079
7844
|
"name": "null"
|
|
@@ -8082,7 +7847,7 @@
|
|
|
8082
7847
|
"__schema": "KeywordTypeSchema",
|
|
8083
7848
|
"location": {
|
|
8084
7849
|
"filePath": "merge-files.ts",
|
|
8085
|
-
"line":
|
|
7850
|
+
"line": 10,
|
|
8086
7851
|
"character": 29
|
|
8087
7852
|
},
|
|
8088
7853
|
"name": "undefined"
|
|
@@ -8095,7 +7860,7 @@
|
|
|
8095
7860
|
"__schema": "VariableLikeSchema",
|
|
8096
7861
|
"location": {
|
|
8097
7862
|
"filePath": "merge-files.ts",
|
|
8098
|
-
"line":
|
|
7863
|
+
"line": 11,
|
|
8099
7864
|
"character": 3
|
|
8100
7865
|
},
|
|
8101
7866
|
"signature": "(property) isBinaryConflict?: boolean | undefined",
|
|
@@ -8104,7 +7869,7 @@
|
|
|
8104
7869
|
"__schema": "KeywordTypeSchema",
|
|
8105
7870
|
"location": {
|
|
8106
7871
|
"filePath": "merge-files.ts",
|
|
8107
|
-
"line":
|
|
7872
|
+
"line": 11,
|
|
8108
7873
|
"character": 22
|
|
8109
7874
|
},
|
|
8110
7875
|
"name": "boolean"
|
|
@@ -8118,7 +7883,7 @@
|
|
|
8118
7883
|
"__schema": "TypeSchema",
|
|
8119
7884
|
"location": {
|
|
8120
7885
|
"filePath": "merge-files.ts",
|
|
8121
|
-
"line":
|
|
7886
|
+
"line": 13,
|
|
8122
7887
|
"character": 1
|
|
8123
7888
|
},
|
|
8124
7889
|
"signature": "type MergeFileParams = {\n filePath: PathLinux;\n currentFile: {\n label: string;\n path: PathOsBased;\n };\n baseFile: {\n path: PathOsBased;\n };\n otherFile: {\n label: string;\n path: PathOsBased;\n };\n}",
|
|
@@ -8127,7 +7892,7 @@
|
|
|
8127
7892
|
"__schema": "TypeLiteralSchema",
|
|
8128
7893
|
"location": {
|
|
8129
7894
|
"filePath": "merge-files.ts",
|
|
8130
|
-
"line":
|
|
7895
|
+
"line": 13,
|
|
8131
7896
|
"character": 31
|
|
8132
7897
|
},
|
|
8133
7898
|
"members": [
|
|
@@ -8135,7 +7900,7 @@
|
|
|
8135
7900
|
"__schema": "VariableLikeSchema",
|
|
8136
7901
|
"location": {
|
|
8137
7902
|
"filePath": "merge-files.ts",
|
|
8138
|
-
"line":
|
|
7903
|
+
"line": 14,
|
|
8139
7904
|
"character": 3
|
|
8140
7905
|
},
|
|
8141
7906
|
"signature": "(property) filePath: string",
|
|
@@ -8144,11 +7909,10 @@
|
|
|
8144
7909
|
"__schema": "TypeRefSchema",
|
|
8145
7910
|
"location": {
|
|
8146
7911
|
"filePath": "merge-files.ts",
|
|
8147
|
-
"line":
|
|
7912
|
+
"line": 14,
|
|
8148
7913
|
"character": 13
|
|
8149
7914
|
},
|
|
8150
|
-
"name": "PathLinux"
|
|
8151
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
7915
|
+
"name": "PathLinux"
|
|
8152
7916
|
},
|
|
8153
7917
|
"isOptional": false
|
|
8154
7918
|
},
|
|
@@ -8156,7 +7920,7 @@
|
|
|
8156
7920
|
"__schema": "VariableLikeSchema",
|
|
8157
7921
|
"location": {
|
|
8158
7922
|
"filePath": "merge-files.ts",
|
|
8159
|
-
"line":
|
|
7923
|
+
"line": 15,
|
|
8160
7924
|
"character": 3
|
|
8161
7925
|
},
|
|
8162
7926
|
"signature": "(property) currentFile: {\n label: string;\n path: PathOsBased;\n}",
|
|
@@ -8165,7 +7929,7 @@
|
|
|
8165
7929
|
"__schema": "TypeLiteralSchema",
|
|
8166
7930
|
"location": {
|
|
8167
7931
|
"filePath": "merge-files.ts",
|
|
8168
|
-
"line":
|
|
7932
|
+
"line": 15,
|
|
8169
7933
|
"character": 16
|
|
8170
7934
|
},
|
|
8171
7935
|
"members": [
|
|
@@ -8173,7 +7937,7 @@
|
|
|
8173
7937
|
"__schema": "VariableLikeSchema",
|
|
8174
7938
|
"location": {
|
|
8175
7939
|
"filePath": "merge-files.ts",
|
|
8176
|
-
"line":
|
|
7940
|
+
"line": 16,
|
|
8177
7941
|
"character": 5
|
|
8178
7942
|
},
|
|
8179
7943
|
"signature": "(property) label: string",
|
|
@@ -8182,7 +7946,7 @@
|
|
|
8182
7946
|
"__schema": "KeywordTypeSchema",
|
|
8183
7947
|
"location": {
|
|
8184
7948
|
"filePath": "merge-files.ts",
|
|
8185
|
-
"line":
|
|
7949
|
+
"line": 16,
|
|
8186
7950
|
"character": 12
|
|
8187
7951
|
},
|
|
8188
7952
|
"name": "string"
|
|
@@ -8193,7 +7957,7 @@
|
|
|
8193
7957
|
"__schema": "VariableLikeSchema",
|
|
8194
7958
|
"location": {
|
|
8195
7959
|
"filePath": "merge-files.ts",
|
|
8196
|
-
"line":
|
|
7960
|
+
"line": 17,
|
|
8197
7961
|
"character": 5
|
|
8198
7962
|
},
|
|
8199
7963
|
"signature": "(property) path: string",
|
|
@@ -8202,11 +7966,10 @@
|
|
|
8202
7966
|
"__schema": "TypeRefSchema",
|
|
8203
7967
|
"location": {
|
|
8204
7968
|
"filePath": "merge-files.ts",
|
|
8205
|
-
"line":
|
|
7969
|
+
"line": 17,
|
|
8206
7970
|
"character": 11
|
|
8207
7971
|
},
|
|
8208
|
-
"name": "PathOsBased"
|
|
8209
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
7972
|
+
"name": "PathOsBased"
|
|
8210
7973
|
},
|
|
8211
7974
|
"isOptional": false
|
|
8212
7975
|
}
|
|
@@ -8218,7 +7981,7 @@
|
|
|
8218
7981
|
"__schema": "VariableLikeSchema",
|
|
8219
7982
|
"location": {
|
|
8220
7983
|
"filePath": "merge-files.ts",
|
|
8221
|
-
"line":
|
|
7984
|
+
"line": 19,
|
|
8222
7985
|
"character": 3
|
|
8223
7986
|
},
|
|
8224
7987
|
"signature": "(property) baseFile: {\n path: PathOsBased;\n}",
|
|
@@ -8227,7 +7990,7 @@
|
|
|
8227
7990
|
"__schema": "TypeLiteralSchema",
|
|
8228
7991
|
"location": {
|
|
8229
7992
|
"filePath": "merge-files.ts",
|
|
8230
|
-
"line":
|
|
7993
|
+
"line": 19,
|
|
8231
7994
|
"character": 13
|
|
8232
7995
|
},
|
|
8233
7996
|
"members": [
|
|
@@ -8235,7 +7998,7 @@
|
|
|
8235
7998
|
"__schema": "VariableLikeSchema",
|
|
8236
7999
|
"location": {
|
|
8237
8000
|
"filePath": "merge-files.ts",
|
|
8238
|
-
"line":
|
|
8001
|
+
"line": 20,
|
|
8239
8002
|
"character": 5
|
|
8240
8003
|
},
|
|
8241
8004
|
"signature": "(property) path: string",
|
|
@@ -8244,11 +8007,10 @@
|
|
|
8244
8007
|
"__schema": "TypeRefSchema",
|
|
8245
8008
|
"location": {
|
|
8246
8009
|
"filePath": "merge-files.ts",
|
|
8247
|
-
"line":
|
|
8010
|
+
"line": 20,
|
|
8248
8011
|
"character": 11
|
|
8249
8012
|
},
|
|
8250
|
-
"name": "PathOsBased"
|
|
8251
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
8013
|
+
"name": "PathOsBased"
|
|
8252
8014
|
},
|
|
8253
8015
|
"isOptional": false
|
|
8254
8016
|
}
|
|
@@ -8260,7 +8022,7 @@
|
|
|
8260
8022
|
"__schema": "VariableLikeSchema",
|
|
8261
8023
|
"location": {
|
|
8262
8024
|
"filePath": "merge-files.ts",
|
|
8263
|
-
"line":
|
|
8025
|
+
"line": 22,
|
|
8264
8026
|
"character": 3
|
|
8265
8027
|
},
|
|
8266
8028
|
"signature": "(property) otherFile: {\n label: string;\n path: PathOsBased;\n}",
|
|
@@ -8269,7 +8031,7 @@
|
|
|
8269
8031
|
"__schema": "TypeLiteralSchema",
|
|
8270
8032
|
"location": {
|
|
8271
8033
|
"filePath": "merge-files.ts",
|
|
8272
|
-
"line":
|
|
8034
|
+
"line": 22,
|
|
8273
8035
|
"character": 14
|
|
8274
8036
|
},
|
|
8275
8037
|
"members": [
|
|
@@ -8277,7 +8039,7 @@
|
|
|
8277
8039
|
"__schema": "VariableLikeSchema",
|
|
8278
8040
|
"location": {
|
|
8279
8041
|
"filePath": "merge-files.ts",
|
|
8280
|
-
"line":
|
|
8042
|
+
"line": 23,
|
|
8281
8043
|
"character": 5
|
|
8282
8044
|
},
|
|
8283
8045
|
"signature": "(property) label: string",
|
|
@@ -8286,7 +8048,7 @@
|
|
|
8286
8048
|
"__schema": "KeywordTypeSchema",
|
|
8287
8049
|
"location": {
|
|
8288
8050
|
"filePath": "merge-files.ts",
|
|
8289
|
-
"line":
|
|
8051
|
+
"line": 23,
|
|
8290
8052
|
"character": 12
|
|
8291
8053
|
},
|
|
8292
8054
|
"name": "string"
|
|
@@ -8297,7 +8059,7 @@
|
|
|
8297
8059
|
"__schema": "VariableLikeSchema",
|
|
8298
8060
|
"location": {
|
|
8299
8061
|
"filePath": "merge-files.ts",
|
|
8300
|
-
"line":
|
|
8062
|
+
"line": 24,
|
|
8301
8063
|
"character": 5
|
|
8302
8064
|
},
|
|
8303
8065
|
"signature": "(property) path: string",
|
|
@@ -8306,11 +8068,10 @@
|
|
|
8306
8068
|
"__schema": "TypeRefSchema",
|
|
8307
8069
|
"location": {
|
|
8308
8070
|
"filePath": "merge-files.ts",
|
|
8309
|
-
"line":
|
|
8071
|
+
"line": 24,
|
|
8310
8072
|
"character": 11
|
|
8311
8073
|
},
|
|
8312
|
-
"name": "PathOsBased"
|
|
8313
|
-
"packageName": "@teambit/legacy/dist/utils/path"
|
|
8074
|
+
"name": "PathOsBased"
|
|
8314
8075
|
},
|
|
8315
8076
|
"isOptional": false
|
|
8316
8077
|
}
|
|
@@ -8325,14 +8086,14 @@
|
|
|
8325
8086
|
"__schema": "FunctionLikeSchema",
|
|
8326
8087
|
"location": {
|
|
8327
8088
|
"filePath": "merge-files.ts",
|
|
8328
|
-
"line":
|
|
8089
|
+
"line": 37,
|
|
8329
8090
|
"character": 1
|
|
8330
8091
|
},
|
|
8331
8092
|
"doc": {
|
|
8332
8093
|
"__schema": "DocSchema",
|
|
8333
8094
|
"location": {
|
|
8334
8095
|
"filePath": "merge-files.ts",
|
|
8335
|
-
"line":
|
|
8096
|
+
"line": 28,
|
|
8336
8097
|
"character": 1
|
|
8337
8098
|
},
|
|
8338
8099
|
"raw": "/**\n * use git `merge-file` command. From the command help:\n * `git merge-file <current-file> <base-file> <other-file>\n * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into\n * <current-file>. The result ordinarily goes into <current-file>.`\n *\n * Here, we are not going to write the result into current-file. Instead, we'll use the \"-p\" flag,\n * to just return the results.\n */",
|
|
@@ -8346,7 +8107,7 @@
|
|
|
8346
8107
|
"__schema": "ParameterSchema",
|
|
8347
8108
|
"location": {
|
|
8348
8109
|
"filePath": "merge-files.ts",
|
|
8349
|
-
"line":
|
|
8110
|
+
"line": 37,
|
|
8350
8111
|
"character": 34
|
|
8351
8112
|
},
|
|
8352
8113
|
"name": "{ filePath, currentFile, baseFile, otherFile }",
|
|
@@ -8354,7 +8115,7 @@
|
|
|
8354
8115
|
"__schema": "TypeRefSchema",
|
|
8355
8116
|
"location": {
|
|
8356
8117
|
"filePath": "merge-files.ts",
|
|
8357
|
-
"line":
|
|
8118
|
+
"line": 42,
|
|
8358
8119
|
"character": 4
|
|
8359
8120
|
},
|
|
8360
8121
|
"name": "MergeFileParams"
|
|
@@ -8365,7 +8126,7 @@
|
|
|
8365
8126
|
"__schema": "InferenceTypeSchema",
|
|
8366
8127
|
"location": {
|
|
8367
8128
|
"filePath": "merge-files.ts",
|
|
8368
|
-
"line":
|
|
8129
|
+
"line": 38,
|
|
8369
8130
|
"character": 3
|
|
8370
8131
|
},
|
|
8371
8132
|
"name": "filePath",
|
|
@@ -8376,7 +8137,7 @@
|
|
|
8376
8137
|
"__schema": "InferenceTypeSchema",
|
|
8377
8138
|
"location": {
|
|
8378
8139
|
"filePath": "merge-files.ts",
|
|
8379
|
-
"line":
|
|
8140
|
+
"line": 39,
|
|
8380
8141
|
"character": 3
|
|
8381
8142
|
},
|
|
8382
8143
|
"name": "currentFile",
|
|
@@ -8387,7 +8148,7 @@
|
|
|
8387
8148
|
"__schema": "InferenceTypeSchema",
|
|
8388
8149
|
"location": {
|
|
8389
8150
|
"filePath": "merge-files.ts",
|
|
8390
|
-
"line":
|
|
8151
|
+
"line": 40,
|
|
8391
8152
|
"character": 3
|
|
8392
8153
|
},
|
|
8393
8154
|
"name": "baseFile",
|
|
@@ -8398,7 +8159,7 @@
|
|
|
8398
8159
|
"__schema": "InferenceTypeSchema",
|
|
8399
8160
|
"location": {
|
|
8400
8161
|
"filePath": "merge-files.ts",
|
|
8401
|
-
"line":
|
|
8162
|
+
"line": 41,
|
|
8402
8163
|
"character": 3
|
|
8403
8164
|
},
|
|
8404
8165
|
"name": "otherFile",
|
|
@@ -8413,7 +8174,7 @@
|
|
|
8413
8174
|
"__schema": "TypeRefSchema",
|
|
8414
8175
|
"location": {
|
|
8415
8176
|
"filePath": "merge-files.ts",
|
|
8416
|
-
"line":
|
|
8177
|
+
"line": 42,
|
|
8417
8178
|
"character": 22
|
|
8418
8179
|
},
|
|
8419
8180
|
"name": "Promise",
|
|
@@ -8422,7 +8183,7 @@
|
|
|
8422
8183
|
"__schema": "TypeRefSchema",
|
|
8423
8184
|
"location": {
|
|
8424
8185
|
"filePath": "merge-files.ts",
|
|
8425
|
-
"line":
|
|
8186
|
+
"line": 42,
|
|
8426
8187
|
"character": 30
|
|
8427
8188
|
},
|
|
8428
8189
|
"name": "MergeFileResult"
|
|
@@ -8469,11 +8230,7 @@
|
|
|
8469
8230
|
"line": 62,
|
|
8470
8231
|
"character": 36
|
|
8471
8232
|
},
|
|
8472
|
-
"name": "ComponentStatusBase"
|
|
8473
|
-
"componentId": {
|
|
8474
|
-
"scope": "teambit.component",
|
|
8475
|
-
"name": "checkout"
|
|
8476
|
-
}
|
|
8233
|
+
"name": "ComponentStatusBase"
|
|
8477
8234
|
},
|
|
8478
8235
|
{
|
|
8479
8236
|
"__schema": "TypeLiteralSchema",
|
|
@@ -8538,8 +8295,7 @@
|
|
|
8538
8295
|
"line": 64,
|
|
8539
8296
|
"character": 17
|
|
8540
8297
|
},
|
|
8541
|
-
"name": "SnapsDistance"
|
|
8542
|
-
"packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
|
|
8298
|
+
"name": "SnapsDistance"
|
|
8543
8299
|
},
|
|
8544
8300
|
"isOptional": true
|
|
8545
8301
|
},
|
|
@@ -8559,8 +8315,7 @@
|
|
|
8559
8315
|
"line": 65,
|
|
8560
8316
|
"character": 23
|
|
8561
8317
|
},
|
|
8562
|
-
"name": "ResolveUnrelatedData"
|
|
8563
|
-
"internalFilePath": "merging.main.runtime.ts"
|
|
8318
|
+
"name": "ResolveUnrelatedData"
|
|
8564
8319
|
},
|
|
8565
8320
|
"isOptional": true
|
|
8566
8321
|
},
|
|
@@ -8580,11 +8335,7 @@
|
|
|
8580
8335
|
"line": 66,
|
|
8581
8336
|
"character": 23
|
|
8582
8337
|
},
|
|
8583
|
-
"name": "ConfigMergeResult"
|
|
8584
|
-
"componentId": {
|
|
8585
|
-
"scope": "teambit.workspace",
|
|
8586
|
-
"name": "config-merger"
|
|
8587
|
-
}
|
|
8338
|
+
"name": "ConfigMergeResult"
|
|
8588
8339
|
},
|
|
8589
8340
|
"isOptional": true
|
|
8590
8341
|
}
|
|
@@ -8617,11 +8368,7 @@
|
|
|
8617
8368
|
"line": 69,
|
|
8618
8369
|
"character": 54
|
|
8619
8370
|
},
|
|
8620
|
-
"name": "ComponentStatusBase"
|
|
8621
|
-
"componentId": {
|
|
8622
|
-
"scope": "teambit.component",
|
|
8623
|
-
"name": "checkout"
|
|
8624
|
-
}
|
|
8371
|
+
"name": "ComponentStatusBase"
|
|
8625
8372
|
},
|
|
8626
8373
|
{
|
|
8627
8374
|
"__schema": "TypeLiteralSchema",
|
|
@@ -8647,8 +8394,7 @@
|
|
|
8647
8394
|
"line": 70,
|
|
8648
8395
|
"character": 17
|
|
8649
8396
|
},
|
|
8650
|
-
"name": "SnapsDistance"
|
|
8651
|
-
"packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
|
|
8397
|
+
"name": "SnapsDistance"
|
|
8652
8398
|
},
|
|
8653
8399
|
"isOptional": true
|
|
8654
8400
|
},
|
|
@@ -8668,8 +8414,7 @@
|
|
|
8668
8414
|
"line": 71,
|
|
8669
8415
|
"character": 23
|
|
8670
8416
|
},
|
|
8671
|
-
"name": "ResolveUnrelatedData"
|
|
8672
|
-
"internalFilePath": "merging.main.runtime.ts"
|
|
8417
|
+
"name": "ResolveUnrelatedData"
|
|
8673
8418
|
},
|
|
8674
8419
|
"isOptional": true
|
|
8675
8420
|
},
|
|
@@ -8974,8 +8719,7 @@
|
|
|
8974
8719
|
"line": 85,
|
|
8975
8720
|
"character": 22
|
|
8976
8721
|
},
|
|
8977
|
-
"name": "ConsumerComponent"
|
|
8978
|
-
"packageName": "@teambit/legacy/dist/consumer/component/consumer-component"
|
|
8722
|
+
"name": "ConsumerComponent"
|
|
8979
8723
|
}
|
|
8980
8724
|
},
|
|
8981
8725
|
"isOptional": false
|
|
@@ -9003,8 +8747,7 @@
|
|
|
9003
8747
|
"line": 86,
|
|
9004
8748
|
"character": 23
|
|
9005
8749
|
},
|
|
9006
|
-
"name": "AutoTagResult"
|
|
9007
|
-
"packageName": "@teambit/legacy/dist/scope/component-ops/auto-tag"
|
|
8750
|
+
"name": "AutoTagResult"
|
|
9008
8751
|
}
|
|
9009
8752
|
},
|
|
9010
8753
|
"isOptional": false
|
|
@@ -9025,12 +8768,7 @@
|
|
|
9025
8768
|
"line": 87,
|
|
9026
8769
|
"character": 23
|
|
9027
8770
|
},
|
|
9028
|
-
"name": "ComponentIdList"
|
|
9029
|
-
"componentId": {
|
|
9030
|
-
"scope": "teambit.component",
|
|
9031
|
-
"name": "component-id",
|
|
9032
|
-
"version": "1.2.0"
|
|
9033
|
-
}
|
|
8771
|
+
"name": "ComponentIdList"
|
|
9034
8772
|
},
|
|
9035
8773
|
"isOptional": true
|
|
9036
8774
|
},
|
|
@@ -9057,12 +8795,7 @@
|
|
|
9057
8795
|
"line": 88,
|
|
9058
8796
|
"character": 17
|
|
9059
8797
|
},
|
|
9060
|
-
"name": "ComponentID"
|
|
9061
|
-
"componentId": {
|
|
9062
|
-
"scope": "teambit.component",
|
|
9063
|
-
"name": "component-id",
|
|
9064
|
-
"version": "1.2.0"
|
|
9065
|
-
}
|
|
8798
|
+
"name": "ComponentID"
|
|
9066
8799
|
}
|
|
9067
8800
|
},
|
|
9068
8801
|
"isOptional": true
|
|
@@ -9262,12 +8995,7 @@
|
|
|
9262
8995
|
"line": 97,
|
|
9263
8996
|
"character": 23
|
|
9264
8997
|
},
|
|
9265
|
-
"name": "ComponentID"
|
|
9266
|
-
"componentId": {
|
|
9267
|
-
"scope": "teambit.component",
|
|
9268
|
-
"name": "component-id",
|
|
9269
|
-
"version": "1.2.0"
|
|
9270
|
-
}
|
|
8998
|
+
"name": "ComponentID"
|
|
9271
8999
|
}
|
|
9272
9000
|
},
|
|
9273
9001
|
"isOptional": true
|
|
@@ -9295,12 +9023,7 @@
|
|
|
9295
9023
|
"line": 98,
|
|
9296
9024
|
"character": 21
|
|
9297
9025
|
},
|
|
9298
|
-
"name": "ComponentID"
|
|
9299
|
-
"componentId": {
|
|
9300
|
-
"scope": "teambit.component",
|
|
9301
|
-
"name": "component-id",
|
|
9302
|
-
"version": "1.2.0"
|
|
9303
|
-
}
|
|
9026
|
+
"name": "ComponentID"
|
|
9304
9027
|
}
|
|
9305
9028
|
},
|
|
9306
9029
|
"isOptional": true
|
|
@@ -9328,8 +9051,7 @@
|
|
|
9328
9051
|
"line": 99,
|
|
9329
9052
|
"character": 24
|
|
9330
9053
|
},
|
|
9331
|
-
"name": "ConsumerComponent"
|
|
9332
|
-
"packageName": "@teambit/legacy/dist/consumer/component/consumer-component"
|
|
9054
|
+
"name": "ConsumerComponent"
|
|
9333
9055
|
}
|
|
9334
9056
|
},
|
|
9335
9057
|
"isOptional": true
|
|
@@ -9378,8 +9100,7 @@
|
|
|
9378
9100
|
"line": 101,
|
|
9379
9101
|
"character": 22
|
|
9380
9102
|
},
|
|
9381
|
-
"name": "MergeSnapResults"
|
|
9382
|
-
"internalFilePath": "merging.main.runtime.ts"
|
|
9103
|
+
"name": "MergeSnapResults"
|
|
9383
9104
|
},
|
|
9384
9105
|
"isOptional": true
|
|
9385
9106
|
},
|
|
@@ -9547,11 +9268,7 @@
|
|
|
9547
9268
|
"line": 109,
|
|
9548
9269
|
"character": 33
|
|
9549
9270
|
},
|
|
9550
|
-
"name": "WorkspaceConfigUpdateResult"
|
|
9551
|
-
"componentId": {
|
|
9552
|
-
"scope": "teambit.workspace",
|
|
9553
|
-
"name": "config-merger"
|
|
9554
|
-
}
|
|
9271
|
+
"name": "WorkspaceConfigUpdateResult"
|
|
9555
9272
|
},
|
|
9556
9273
|
"isOptional": true
|
|
9557
9274
|
}
|
|
@@ -9593,11 +9310,7 @@
|
|
|
9593
9310
|
"line": 114,
|
|
9594
9311
|
"character": 24
|
|
9595
9312
|
},
|
|
9596
|
-
"name": "Workspace"
|
|
9597
|
-
"componentId": {
|
|
9598
|
-
"scope": "teambit.workspace",
|
|
9599
|
-
"name": "workspace"
|
|
9600
|
-
}
|
|
9313
|
+
"name": "Workspace"
|
|
9601
9314
|
},
|
|
9602
9315
|
"isOptional": false,
|
|
9603
9316
|
"isSpread": false
|
|
@@ -9617,11 +9330,7 @@
|
|
|
9617
9330
|
"line": 115,
|
|
9618
9331
|
"character": 20
|
|
9619
9332
|
},
|
|
9620
|
-
"name": "ScopeMain"
|
|
9621
|
-
"componentId": {
|
|
9622
|
-
"scope": "teambit.scope",
|
|
9623
|
-
"name": "scope"
|
|
9624
|
-
}
|
|
9333
|
+
"name": "ScopeMain"
|
|
9625
9334
|
},
|
|
9626
9335
|
"isOptional": false,
|
|
9627
9336
|
"isSpread": false
|
|
@@ -9641,11 +9350,7 @@
|
|
|
9641
9350
|
"line": 116,
|
|
9642
9351
|
"character": 22
|
|
9643
9352
|
},
|
|
9644
|
-
"name": "InstallMain"
|
|
9645
|
-
"componentId": {
|
|
9646
|
-
"scope": "teambit.workspace",
|
|
9647
|
-
"name": "install"
|
|
9648
|
-
}
|
|
9353
|
+
"name": "InstallMain"
|
|
9649
9354
|
},
|
|
9650
9355
|
"isOptional": false,
|
|
9651
9356
|
"isSpread": false
|
|
@@ -9665,11 +9370,7 @@
|
|
|
9665
9370
|
"line": 117,
|
|
9666
9371
|
"character": 23
|
|
9667
9372
|
},
|
|
9668
|
-
"name": "SnappingMain"
|
|
9669
|
-
"componentId": {
|
|
9670
|
-
"scope": "teambit.component",
|
|
9671
|
-
"name": "snapping"
|
|
9672
|
-
}
|
|
9373
|
+
"name": "SnappingMain"
|
|
9673
9374
|
},
|
|
9674
9375
|
"isOptional": false,
|
|
9675
9376
|
"isSpread": false
|
|
@@ -9689,11 +9390,7 @@
|
|
|
9689
9390
|
"line": 118,
|
|
9690
9391
|
"character": 23
|
|
9691
9392
|
},
|
|
9692
|
-
"name": "CheckoutMain"
|
|
9693
|
-
"componentId": {
|
|
9694
|
-
"scope": "teambit.component",
|
|
9695
|
-
"name": "checkout"
|
|
9696
|
-
}
|
|
9393
|
+
"name": "CheckoutMain"
|
|
9697
9394
|
},
|
|
9698
9395
|
"isOptional": false,
|
|
9699
9396
|
"isSpread": false
|
|
@@ -9713,11 +9410,7 @@
|
|
|
9713
9410
|
"line": 119,
|
|
9714
9411
|
"character": 21
|
|
9715
9412
|
},
|
|
9716
|
-
"name": "Logger"
|
|
9717
|
-
"componentId": {
|
|
9718
|
-
"scope": "teambit.harmony",
|
|
9719
|
-
"name": "logger"
|
|
9720
|
-
}
|
|
9413
|
+
"name": "Logger"
|
|
9721
9414
|
},
|
|
9722
9415
|
"isOptional": false,
|
|
9723
9416
|
"isSpread": false
|
|
@@ -9737,11 +9430,7 @@
|
|
|
9737
9430
|
"line": 120,
|
|
9738
9431
|
"character": 30
|
|
9739
9432
|
},
|
|
9740
|
-
"name": "ComponentWriterMain"
|
|
9741
|
-
"componentId": {
|
|
9742
|
-
"scope": "teambit.component",
|
|
9743
|
-
"name": "component-writer"
|
|
9744
|
-
}
|
|
9433
|
+
"name": "ComponentWriterMain"
|
|
9745
9434
|
},
|
|
9746
9435
|
"isOptional": false,
|
|
9747
9436
|
"isSpread": false
|
|
@@ -9761,11 +9450,7 @@
|
|
|
9761
9450
|
"line": 121,
|
|
9762
9451
|
"character": 23
|
|
9763
9452
|
},
|
|
9764
|
-
"name": "ImporterMain"
|
|
9765
|
-
"componentId": {
|
|
9766
|
-
"scope": "teambit.scope",
|
|
9767
|
-
"name": "importer"
|
|
9768
|
-
}
|
|
9453
|
+
"name": "ImporterMain"
|
|
9769
9454
|
},
|
|
9770
9455
|
"isOptional": false,
|
|
9771
9456
|
"isSpread": false
|
|
@@ -9785,11 +9470,7 @@
|
|
|
9785
9470
|
"line": 122,
|
|
9786
9471
|
"character": 21
|
|
9787
9472
|
},
|
|
9788
|
-
"name": "ConfigMain"
|
|
9789
|
-
"componentId": {
|
|
9790
|
-
"scope": "teambit.harmony",
|
|
9791
|
-
"name": "config"
|
|
9792
|
-
}
|
|
9473
|
+
"name": "ConfigMain"
|
|
9793
9474
|
},
|
|
9794
9475
|
"isOptional": false,
|
|
9795
9476
|
"isSpread": false
|
|
@@ -9809,11 +9490,7 @@
|
|
|
9809
9490
|
"line": 123,
|
|
9810
9491
|
"character": 21
|
|
9811
9492
|
},
|
|
9812
|
-
"name": "RemoveMain"
|
|
9813
|
-
"componentId": {
|
|
9814
|
-
"scope": "teambit.component",
|
|
9815
|
-
"name": "remove"
|
|
9816
|
-
}
|
|
9493
|
+
"name": "RemoveMain"
|
|
9817
9494
|
},
|
|
9818
9495
|
"isOptional": false,
|
|
9819
9496
|
"isSpread": false
|
|
@@ -9833,11 +9510,7 @@
|
|
|
9833
9510
|
"line": 124,
|
|
9834
9511
|
"character": 27
|
|
9835
9512
|
},
|
|
9836
|
-
"name": "ConfigMergerMain"
|
|
9837
|
-
"componentId": {
|
|
9838
|
-
"scope": "teambit.workspace",
|
|
9839
|
-
"name": "config-merger"
|
|
9840
|
-
}
|
|
9513
|
+
"name": "ConfigMergerMain"
|
|
9841
9514
|
},
|
|
9842
9515
|
"isOptional": false,
|
|
9843
9516
|
"isSpread": false
|
|
@@ -9857,11 +9530,7 @@
|
|
|
9857
9530
|
"line": 125,
|
|
9858
9531
|
"character": 26
|
|
9859
9532
|
},
|
|
9860
|
-
"name": "DependencyResolverMain"
|
|
9861
|
-
"componentId": {
|
|
9862
|
-
"scope": "teambit.dependencies",
|
|
9863
|
-
"name": "dependency-resolver"
|
|
9864
|
-
}
|
|
9533
|
+
"name": "DependencyResolverMain"
|
|
9865
9534
|
},
|
|
9866
9535
|
"isOptional": false,
|
|
9867
9536
|
"isSpread": false
|
|
@@ -10109,8 +9778,7 @@
|
|
|
10109
9778
|
"line": 166,
|
|
10110
9779
|
"character": 15
|
|
10111
9780
|
},
|
|
10112
|
-
"name": "Consumer"
|
|
10113
|
-
"packageName": "@teambit/legacy/dist/consumer"
|
|
9781
|
+
"name": "Consumer"
|
|
10114
9782
|
},
|
|
10115
9783
|
"isOptional": false,
|
|
10116
9784
|
"isSpread": false
|
|
@@ -10137,12 +9805,7 @@
|
|
|
10137
9805
|
"line": 167,
|
|
10138
9806
|
"character": 13
|
|
10139
9807
|
},
|
|
10140
|
-
"name": "ComponentID"
|
|
10141
|
-
"componentId": {
|
|
10142
|
-
"scope": "teambit.component",
|
|
10143
|
-
"name": "component-id",
|
|
10144
|
-
"version": "1.2.0"
|
|
10145
|
-
}
|
|
9808
|
+
"name": "ComponentID"
|
|
10146
9809
|
}
|
|
10147
9810
|
},
|
|
10148
9811
|
"isOptional": false,
|
|
@@ -10399,8 +10062,7 @@
|
|
|
10399
10062
|
"line": 222,
|
|
10400
10063
|
"character": 19
|
|
10401
10064
|
},
|
|
10402
|
-
"name": "Lane"
|
|
10403
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
10065
|
+
"name": "Lane"
|
|
10404
10066
|
},
|
|
10405
10067
|
"isOptional": true
|
|
10406
10068
|
},
|
|
@@ -10597,8 +10259,7 @@
|
|
|
10597
10259
|
"line": 222,
|
|
10598
10260
|
"character": 19
|
|
10599
10261
|
},
|
|
10600
|
-
"name": "Lane"
|
|
10601
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
10262
|
+
"name": "Lane"
|
|
10602
10263
|
},
|
|
10603
10264
|
"isOptional": true
|
|
10604
10265
|
},
|
|
@@ -10762,11 +10423,7 @@
|
|
|
10762
10423
|
"line": 352,
|
|
10763
10424
|
"character": 24
|
|
10764
10425
|
},
|
|
10765
|
-
"name": "ApplyVersionWithComps"
|
|
10766
|
-
"componentId": {
|
|
10767
|
-
"scope": "teambit.component",
|
|
10768
|
-
"name": "checkout"
|
|
10769
|
-
}
|
|
10426
|
+
"name": "ApplyVersionWithComps"
|
|
10770
10427
|
}
|
|
10771
10428
|
},
|
|
10772
10429
|
"isOptional": false,
|
|
@@ -10787,8 +10444,7 @@
|
|
|
10787
10444
|
"line": 353,
|
|
10788
10445
|
"character": 19
|
|
10789
10446
|
},
|
|
10790
|
-
"name": "Lane"
|
|
10791
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
10447
|
+
"name": "Lane"
|
|
10792
10448
|
},
|
|
10793
10449
|
"isOptional": true,
|
|
10794
10450
|
"isSpread": false
|
|
@@ -10808,12 +10464,7 @@
|
|
|
10808
10464
|
"line": 354,
|
|
10809
10465
|
"character": 33
|
|
10810
10466
|
},
|
|
10811
|
-
"name": "ComponentIdList"
|
|
10812
|
-
"componentId": {
|
|
10813
|
-
"scope": "teambit.component",
|
|
10814
|
-
"name": "component-id",
|
|
10815
|
-
"version": "1.2.0"
|
|
10816
|
-
}
|
|
10467
|
+
"name": "ComponentIdList"
|
|
10817
10468
|
},
|
|
10818
10469
|
"isOptional": true,
|
|
10819
10470
|
"isSpread": false
|
|
@@ -10875,12 +10526,7 @@
|
|
|
10875
10526
|
"line": 377,
|
|
10876
10527
|
"character": 13
|
|
10877
10528
|
},
|
|
10878
|
-
"name": "ComponentID"
|
|
10879
|
-
"componentId": {
|
|
10880
|
-
"scope": "teambit.component",
|
|
10881
|
-
"name": "component-id",
|
|
10882
|
-
"version": "1.2.0"
|
|
10883
|
-
}
|
|
10529
|
+
"name": "ComponentID"
|
|
10884
10530
|
}
|
|
10885
10531
|
},
|
|
10886
10532
|
"isOptional": false,
|
|
@@ -10901,8 +10547,7 @@
|
|
|
10901
10547
|
"line": 378,
|
|
10902
10548
|
"character": 14
|
|
10903
10549
|
},
|
|
10904
|
-
"name": "MergeStatusProviderOptions"
|
|
10905
|
-
"internalFilePath": "merge-status-provider.ts"
|
|
10550
|
+
"name": "MergeStatusProviderOptions"
|
|
10906
10551
|
},
|
|
10907
10552
|
"isOptional": false,
|
|
10908
10553
|
"isSpread": false
|
|
@@ -10922,8 +10567,7 @@
|
|
|
10922
10567
|
"line": 379,
|
|
10923
10568
|
"character": 19
|
|
10924
10569
|
},
|
|
10925
|
-
"name": "Lane"
|
|
10926
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
10570
|
+
"name": "Lane"
|
|
10927
10571
|
},
|
|
10928
10572
|
"isOptional": true,
|
|
10929
10573
|
"isSpread": false
|
|
@@ -10943,8 +10587,7 @@
|
|
|
10943
10587
|
"line": 380,
|
|
10944
10588
|
"character": 17
|
|
10945
10589
|
},
|
|
10946
|
-
"name": "Lane"
|
|
10947
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
10590
|
+
"name": "Lane"
|
|
10948
10591
|
},
|
|
10949
10592
|
"isOptional": true,
|
|
10950
10593
|
"isSpread": false
|
|
@@ -11078,11 +10721,7 @@
|
|
|
11078
10721
|
"line": 708,
|
|
11079
10722
|
"character": 5
|
|
11080
10723
|
},
|
|
11081
|
-
"name": "CLIMain"
|
|
11082
|
-
"componentId": {
|
|
11083
|
-
"scope": "teambit.harmony",
|
|
11084
|
-
"name": "cli"
|
|
11085
|
-
}
|
|
10724
|
+
"name": "CLIMain"
|
|
11086
10725
|
},
|
|
11087
10726
|
{
|
|
11088
10727
|
"__schema": "TypeRefSchema",
|
|
@@ -11091,11 +10730,7 @@
|
|
|
11091
10730
|
"line": 709,
|
|
11092
10731
|
"character": 5
|
|
11093
10732
|
},
|
|
11094
|
-
"name": "Workspace"
|
|
11095
|
-
"componentId": {
|
|
11096
|
-
"scope": "teambit.workspace",
|
|
11097
|
-
"name": "workspace"
|
|
11098
|
-
}
|
|
10733
|
+
"name": "Workspace"
|
|
11099
10734
|
},
|
|
11100
10735
|
{
|
|
11101
10736
|
"__schema": "TypeRefSchema",
|
|
@@ -11104,11 +10739,7 @@
|
|
|
11104
10739
|
"line": 710,
|
|
11105
10740
|
"character": 5
|
|
11106
10741
|
},
|
|
11107
|
-
"name": "ScopeMain"
|
|
11108
|
-
"componentId": {
|
|
11109
|
-
"scope": "teambit.scope",
|
|
11110
|
-
"name": "scope"
|
|
11111
|
-
}
|
|
10742
|
+
"name": "ScopeMain"
|
|
11112
10743
|
},
|
|
11113
10744
|
{
|
|
11114
10745
|
"__schema": "TypeRefSchema",
|
|
@@ -11117,11 +10748,7 @@
|
|
|
11117
10748
|
"line": 711,
|
|
11118
10749
|
"character": 5
|
|
11119
10750
|
},
|
|
11120
|
-
"name": "SnappingMain"
|
|
11121
|
-
"componentId": {
|
|
11122
|
-
"scope": "teambit.component",
|
|
11123
|
-
"name": "snapping"
|
|
11124
|
-
}
|
|
10751
|
+
"name": "SnappingMain"
|
|
11125
10752
|
},
|
|
11126
10753
|
{
|
|
11127
10754
|
"__schema": "TypeRefSchema",
|
|
@@ -11130,11 +10757,7 @@
|
|
|
11130
10757
|
"line": 712,
|
|
11131
10758
|
"character": 5
|
|
11132
10759
|
},
|
|
11133
|
-
"name": "CheckoutMain"
|
|
11134
|
-
"componentId": {
|
|
11135
|
-
"scope": "teambit.component",
|
|
11136
|
-
"name": "checkout"
|
|
11137
|
-
}
|
|
10760
|
+
"name": "CheckoutMain"
|
|
11138
10761
|
},
|
|
11139
10762
|
{
|
|
11140
10763
|
"__schema": "TypeRefSchema",
|
|
@@ -11143,11 +10766,7 @@
|
|
|
11143
10766
|
"line": 713,
|
|
11144
10767
|
"character": 5
|
|
11145
10768
|
},
|
|
11146
|
-
"name": "InstallMain"
|
|
11147
|
-
"componentId": {
|
|
11148
|
-
"scope": "teambit.workspace",
|
|
11149
|
-
"name": "install"
|
|
11150
|
-
}
|
|
10769
|
+
"name": "InstallMain"
|
|
11151
10770
|
},
|
|
11152
10771
|
{
|
|
11153
10772
|
"__schema": "TypeRefSchema",
|
|
@@ -11156,11 +10775,7 @@
|
|
|
11156
10775
|
"line": 714,
|
|
11157
10776
|
"character": 5
|
|
11158
10777
|
},
|
|
11159
|
-
"name": "LoggerMain"
|
|
11160
|
-
"componentId": {
|
|
11161
|
-
"scope": "teambit.harmony",
|
|
11162
|
-
"name": "logger"
|
|
11163
|
-
}
|
|
10778
|
+
"name": "LoggerMain"
|
|
11164
10779
|
},
|
|
11165
10780
|
{
|
|
11166
10781
|
"__schema": "TypeRefSchema",
|
|
@@ -11169,11 +10784,7 @@
|
|
|
11169
10784
|
"line": 715,
|
|
11170
10785
|
"character": 5
|
|
11171
10786
|
},
|
|
11172
|
-
"name": "ComponentWriterMain"
|
|
11173
|
-
"componentId": {
|
|
11174
|
-
"scope": "teambit.component",
|
|
11175
|
-
"name": "component-writer"
|
|
11176
|
-
}
|
|
10787
|
+
"name": "ComponentWriterMain"
|
|
11177
10788
|
},
|
|
11178
10789
|
{
|
|
11179
10790
|
"__schema": "TypeRefSchema",
|
|
@@ -11182,11 +10793,7 @@
|
|
|
11182
10793
|
"line": 716,
|
|
11183
10794
|
"character": 5
|
|
11184
10795
|
},
|
|
11185
|
-
"name": "ImporterMain"
|
|
11186
|
-
"componentId": {
|
|
11187
|
-
"scope": "teambit.scope",
|
|
11188
|
-
"name": "importer"
|
|
11189
|
-
}
|
|
10796
|
+
"name": "ImporterMain"
|
|
11190
10797
|
},
|
|
11191
10798
|
{
|
|
11192
10799
|
"__schema": "TypeRefSchema",
|
|
@@ -11195,11 +10802,7 @@
|
|
|
11195
10802
|
"line": 717,
|
|
11196
10803
|
"character": 5
|
|
11197
10804
|
},
|
|
11198
|
-
"name": "ConfigMain"
|
|
11199
|
-
"componentId": {
|
|
11200
|
-
"scope": "teambit.harmony",
|
|
11201
|
-
"name": "config"
|
|
11202
|
-
}
|
|
10805
|
+
"name": "ConfigMain"
|
|
11203
10806
|
},
|
|
11204
10807
|
{
|
|
11205
10808
|
"__schema": "TypeRefSchema",
|
|
@@ -11208,11 +10811,7 @@
|
|
|
11208
10811
|
"line": 718,
|
|
11209
10812
|
"character": 5
|
|
11210
10813
|
},
|
|
11211
|
-
"name": "RemoveMain"
|
|
11212
|
-
"componentId": {
|
|
11213
|
-
"scope": "teambit.component",
|
|
11214
|
-
"name": "remove"
|
|
11215
|
-
}
|
|
10814
|
+
"name": "RemoveMain"
|
|
11216
10815
|
},
|
|
11217
10816
|
{
|
|
11218
10817
|
"__schema": "TypeRefSchema",
|
|
@@ -11221,11 +10820,7 @@
|
|
|
11221
10820
|
"line": 719,
|
|
11222
10821
|
"character": 5
|
|
11223
10822
|
},
|
|
11224
|
-
"name": "GlobalConfigMain"
|
|
11225
|
-
"componentId": {
|
|
11226
|
-
"scope": "teambit.harmony",
|
|
11227
|
-
"name": "global-config"
|
|
11228
|
-
}
|
|
10823
|
+
"name": "GlobalConfigMain"
|
|
11229
10824
|
},
|
|
11230
10825
|
{
|
|
11231
10826
|
"__schema": "TypeRefSchema",
|
|
@@ -11234,11 +10829,7 @@
|
|
|
11234
10829
|
"line": 720,
|
|
11235
10830
|
"character": 5
|
|
11236
10831
|
},
|
|
11237
|
-
"name": "ConfigMergerMain"
|
|
11238
|
-
"componentId": {
|
|
11239
|
-
"scope": "teambit.workspace",
|
|
11240
|
-
"name": "config-merger"
|
|
11241
|
-
}
|
|
10832
|
+
"name": "ConfigMergerMain"
|
|
11242
10833
|
},
|
|
11243
10834
|
{
|
|
11244
10835
|
"__schema": "TypeRefSchema",
|
|
@@ -11247,11 +10838,7 @@
|
|
|
11247
10838
|
"line": 721,
|
|
11248
10839
|
"character": 5
|
|
11249
10840
|
},
|
|
11250
|
-
"name": "DependencyResolverMain"
|
|
11251
|
-
"componentId": {
|
|
11252
|
-
"scope": "teambit.dependencies",
|
|
11253
|
-
"name": "dependency-resolver"
|
|
11254
|
-
}
|
|
10841
|
+
"name": "DependencyResolverMain"
|
|
11255
10842
|
}
|
|
11256
10843
|
]
|
|
11257
10844
|
},
|
|
@@ -11439,7 +11026,7 @@
|
|
|
11439
11026
|
"componentId": {
|
|
11440
11027
|
"scope": "teambit.component",
|
|
11441
11028
|
"name": "merging",
|
|
11442
|
-
"version": "1.0.
|
|
11029
|
+
"version": "1.0.331"
|
|
11443
11030
|
},
|
|
11444
11031
|
"taggedModuleExports": []
|
|
11445
11032
|
}
|