npm - @teambit/merge-lanes - Versions diffs - 1.0.487 → 1.0.489 - Mend

@teambit/merge-lanes 1.0.487 → 1.0.489

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/artifacts/__bit_junit.xml +1 -1
package/artifacts/schema.json +751 -432
package/dist/last-merged.d.ts +2 -2
package/dist/last-merged.js +13 -13
package/dist/last-merged.js.map +1 -1
package/dist/merge-lane.cmd.js +5 -5
package/dist/merge-lane.cmd.js.map +1 -1
package/dist/merge-lanes.main.runtime.js.map +1 -1
package/package.json +27 -22
/package/dist/{preview-1733714450424.js → preview-1733851236714.js} +0 -0

package/artifacts/schema.json CHANGED Viewed

@@ -26,7 +26,7 @@
           "__schema": "ClassSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 76,
+            "line": 74,
             "character": 1
           },
           "signature": "class MergeLanesMain",
@@ -36,7 +36,7 @@
               "__schema": "ConstructorSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 77,
+                "line": 75,
                 "character": 3
               },
               "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -46,7 +46,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 78,
+                    "line": 76,
                     "character": 5
                   },
                   "name": "workspace",
@@ -54,7 +54,7 @@
                     "__schema": "TypeUnionSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 78,
+                      "line": 76,
                       "character": 24
                     },
                     "types": [
@@ -62,16 +62,20 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 78,
+                          "line": 76,
                           "character": 24
                         },
-                        "name": "Workspace"
+                        "name": "Workspace",
+                        "componentId": {
+                          "scope": "teambit.workspace",
+                          "name": "workspace"
+                        }
                       },
                       {
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 78,
+                          "line": 76,
                           "character": 36
                         },
                         "name": "undefined"
@@ -85,7 +89,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 79,
+                    "line": 77,
                     "character": 5
                   },
                   "name": "merging",
@@ -93,10 +97,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 79,
+                      "line": 77,
                       "character": 22
                     },
-                    "name": "MergingMain"
+                    "name": "MergingMain",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "merging"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -105,7 +113,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 80,
+                    "line": 78,
                     "character": 5
                   },
                   "name": "lanes",
@@ -113,10 +121,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 80,
+                      "line": 78,
                       "character": 21
                     },
-                    "name": "LanesMain"
+                    "name": "LanesMain",
+                    "componentId": {
+                      "scope": "teambit.lanes",
+                      "name": "lanes"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -125,7 +137,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 81,
+                    "line": 79,
                     "character": 5
                   },
                   "name": "logger",
@@ -133,10 +145,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 81,
+                      "line": 79,
                       "character": 22
                     },
-                    "name": "Logger"
+                    "name": "Logger",
+                    "componentId": {
+                      "scope": "teambit.harmony",
+                      "name": "logger"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -145,7 +161,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 82,
+                    "line": 80,
                     "character": 5
                   },
                   "name": "remove",
@@ -153,10 +169,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 82,
+                      "line": 80,
                       "character": 21
                     },
-                    "name": "RemoveMain"
+                    "name": "RemoveMain",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "remove"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -165,7 +185,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 83,
+                    "line": 81,
                     "character": 5
                   },
                   "name": "scope",
@@ -173,10 +193,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 83,
+                      "line": 81,
                       "character": 20
                     },
-                    "name": "ScopeMain"
+                    "name": "ScopeMain",
+                    "componentId": {
+                      "scope": "teambit.scope",
+                      "name": "scope"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -185,7 +209,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 84,
+                    "line": 82,
                     "character": 5
                   },
                   "name": "exporter",
@@ -193,10 +217,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 84,
+                      "line": 82,
                       "character": 23
                     },
-                    "name": "ExportMain"
+                    "name": "ExportMain",
+                    "componentId": {
+                      "scope": "teambit.scope",
+                      "name": "export"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -205,7 +233,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 85,
+                    "line": 83,
                     "character": 5
                   },
                   "name": "importer",
@@ -213,10 +241,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 85,
+                      "line": 83,
                       "character": 23
                     },
-                    "name": "ImporterMain"
+                    "name": "ImporterMain",
+                    "componentId": {
+                      "scope": "teambit.scope",
+                      "name": "importer"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -225,7 +257,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 86,
+                    "line": 84,
                     "character": 5
                   },
                   "name": "checkout",
@@ -233,10 +265,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 86,
+                      "line": 84,
                       "character": 23
                     },
-                    "name": "CheckoutMain"
+                    "name": "CheckoutMain",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "checkout"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -246,7 +282,7 @@
                 "__schema": "ThisTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 76,
+                  "line": 74,
                   "character": 1
                 },
                 "name": "MergeLanesMain"
@@ -257,7 +293,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 89,
+                "line": 87,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>",
@@ -267,7 +303,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 89,
+                    "line": 87,
                     "character": 24
                   },
                   "name": "laneName",
@@ -275,7 +311,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 89,
+                      "line": 87,
                       "character": 34
                     },
                     "name": "string"
@@ -287,7 +323,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 89,
+                    "line": 87,
                     "character": 42
                   },
                   "name": "options",
@@ -295,10 +331,11 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 89,
+                      "line": 87,
                       "character": 51
                     },
-                    "name": "MergeLaneOptions"
+                    "name": "MergeLaneOptions",
+                    "internalFilePath": "merge-lanes.main.runtime.ts"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -308,7 +345,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 89,
+                  "line": 87,
                   "character": 3
                 },
                 "type": "Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>"
@@ -321,7 +358,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 99,
+                "line": 97,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>",
@@ -331,7 +368,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 100,
+                    "line": 98,
                     "character": 5
                   },
                   "name": "otherLaneId",
@@ -339,10 +376,15 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 100,
+                      "line": 98,
                       "character": 18
                     },
-                    "name": "LaneId"
+                    "name": "LaneId",
+                    "componentId": {
+                      "scope": "teambit.lanes",
+                      "name": "lane-id",
+                      "version": "0.0.311"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -351,7 +393,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 101,
+                    "line": 99,
                     "character": 5
                   },
                   "name": "currentLaneId",
@@ -359,10 +401,15 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 101,
+                      "line": 99,
                       "character": 20
                     },
-                    "name": "LaneId"
+                    "name": "LaneId",
+                    "componentId": {
+                      "scope": "teambit.lanes",
+                      "name": "lane-id",
+                      "version": "0.0.311"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -371,7 +418,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 102,
+                    "line": 100,
                     "character": 5
                   },
                   "name": "options",
@@ -379,10 +426,11 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 102,
+                      "line": 100,
                       "character": 14
                     },
-                    "name": "MergeLaneOptions"
+                    "name": "MergeLaneOptions",
+                    "internalFilePath": "merge-lanes.main.runtime.ts"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -392,7 +440,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 103,
+                  "line": 101,
                   "character": 6
                 },
                 "name": "Promise",
@@ -401,7 +449,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 103,
+                      "line": 101,
                       "character": 14
                     },
                     "members": [
@@ -409,7 +457,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 104,
+                          "line": 102,
                           "character": 5
                         },
                         "signature": "(property) mergeResults: ApplyVersionResults",
@@ -418,7 +466,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 104,
+                            "line": 102,
                             "character": 5
                           },
                           "name": "ApplyVersionResults",
@@ -433,7 +481,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 105,
+                          "line": 103,
                           "character": 5
                         },
                         "signature": "(property) deleteResults: any",
@@ -442,7 +490,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 105,
+                            "line": 103,
                             "character": 20
                           },
                           "name": "any"
@@ -453,7 +501,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 106,
+                          "line": 104,
                           "character": 5
                         },
                         "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -462,17 +510,21 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 106,
+                            "line": 104,
                             "character": 25
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 106,
+                              "line": 104,
                               "character": 25
                             },
-                            "name": "ConfigMergeResult"
+                            "name": "ConfigMergeResult",
+                            "componentId": {
+                              "scope": "teambit.workspace",
+                              "name": "config-merger"
+                            }
                           }
                         },
                         "isOptional": false
@@ -481,7 +533,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 107,
+                          "line": 105,
                           "character": 5
                         },
                         "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
@@ -490,17 +542,22 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 107,
+                            "line": 105,
                             "character": 28
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 107,
+                              "line": 105,
                               "character": 28
                             },
-                            "name": "ComponentID"
+                            "name": "ComponentID",
+                            "componentId": {
+                              "scope": "teambit.component",
+                              "name": "component-id",
+                              "version": "1.2.2"
+                            }
                           }
                         },
                         "isOptional": false
@@ -509,7 +566,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 108,
+                          "line": 106,
                           "character": 5
                         },
                         "signature": "(property) conflicts: ConflictPerId[]",
@@ -518,17 +575,18 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 108,
+                            "line": 106,
                             "character": 16
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 108,
+                              "line": 106,
                               "character": 16
                             },
-                            "name": "ConflictPerId"
+                            "name": "ConflictPerId",
+                            "internalFilePath": "merge-lanes.main.runtime.ts"
                           }
                         },
                         "isOptional": false
@@ -545,7 +603,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 324,
+                "line": 322,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n    scope?: string;\n}): Promise<CreateLaneResult>",
@@ -555,7 +613,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 324,
+                    "line": 322,
                     "character": 19
                   },
                   "name": "newLaneName",
@@ -563,7 +621,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 324,
+                      "line": 322,
                       "character": 32
                     },
                     "name": "string"
@@ -575,7 +633,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 324,
+                    "line": 322,
                     "character": 40
                   },
                   "name": "options",
@@ -583,7 +641,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 324,
+                      "line": 322,
                       "character": 49
                     },
                     "members": [
@@ -591,7 +649,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 324,
+                          "line": 322,
                           "character": 51
                         },
                         "signature": "(property) scope?: string | undefined",
@@ -600,7 +658,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 324,
+                            "line": 322,
                             "character": 59
                           },
                           "name": "string"
@@ -617,7 +675,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 324,
+                  "line": 322,
                   "character": 3
                 },
                 "type": "Promise<CreateLaneResult>"
@@ -630,7 +688,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 332,
+                "line": 330,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n    checkoutResults: ApplyVersionResults | undefined;\n    restoredItems: string[];\n    checkoutError: Error | undefined;\n}>",
@@ -640,7 +698,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 332,
+                    "line": 330,
                     "character": 24
                   },
                   "name": "checkoutProps",
@@ -648,10 +706,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 332,
+                      "line": 330,
                       "character": 39
                     },
-                    "name": "CheckoutProps"
+                    "name": "CheckoutProps",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "checkout"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -660,7 +722,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 332,
+                    "line": 330,
                     "character": 54
                   },
                   "name": "mergeAbortOpts",
@@ -668,10 +730,11 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 332,
+                      "line": 330,
                       "character": 70
                     },
-                    "name": "MergeAbortOpts"
+                    "name": "MergeAbortOpts",
+                    "internalFilePath": "merge-abort.cmd.ts"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -681,7 +744,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 332,
+                  "line": 330,
                   "character": 3
                 },
                 "type": "Promise<{\n    checkoutResults: ApplyVersionResults | undefined;\n    restoredItems: string[];\n    checkoutError: Error | undefined;\n}>"
@@ -694,7 +757,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 388,
+                "line": 386,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n    push?: boolean;\n    reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -704,7 +767,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 389,
+                    "line": 387,
                     "character": 5
                   },
                   "name": "fromLane",
@@ -712,7 +775,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 389,
+                      "line": 387,
                       "character": 15
                     },
                     "name": "string"
@@ -724,7 +787,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 390,
+                    "line": 388,
                     "character": 5
                   },
                   "name": "toLane",
@@ -732,7 +795,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 390,
+                      "line": 388,
                       "character": 13
                     },
                     "name": "string"
@@ -744,7 +807,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 391,
+                    "line": 389,
                     "character": 5
                   },
                   "name": "options",
@@ -752,7 +815,7 @@
                     "__schema": "TypeIntersectionSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 391,
+                      "line": 389,
                       "character": 14
                     },
                     "types": [
@@ -760,7 +823,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 391,
+                          "line": 389,
                           "character": 14
                         },
                         "name": "Partial",
@@ -769,10 +832,11 @@
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 22
                             },
-                            "name": "MergeLaneOptions"
+                            "name": "MergeLaneOptions",
+                            "internalFilePath": "merge-lanes.main.runtime.ts"
                           }
                         ]
                       },
@@ -780,7 +844,7 @@
                         "__schema": "TypeLiteralSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 391,
+                          "line": 389,
                           "character": 42
                         },
                         "members": [
@@ -788,7 +852,7 @@
                             "__schema": "VariableLikeSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 44
                             },
                             "signature": "(property) push?: boolean | undefined",
@@ -797,7 +861,7 @@
                               "__schema": "KeywordTypeSchema",
                               "location": {
                                 "filePath": "merge-lanes.main.runtime.ts",
-                                "line": 391,
+                                "line": 389,
                                 "character": 51
                               },
                               "name": "boolean"
@@ -808,7 +872,7 @@
                             "__schema": "VariableLikeSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 60
                             },
                             "signature": "(property) reMerge?: boolean | undefined",
@@ -817,7 +881,7 @@
                               "__schema": "KeywordTypeSchema",
                               "location": {
                                 "filePath": "merge-lanes.main.runtime.ts",
-                                "line": 391,
+                                "line": 389,
                                 "character": 70
                               },
                               "name": "boolean"
@@ -836,7 +900,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 392,
+                  "line": 390,
                   "character": 6
                 },
                 "name": "Promise",
@@ -845,10 +909,11 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 392,
+                      "line": 390,
                       "character": 14
                     },
-                    "name": "MergeFromScopeResult"
+                    "name": "MergeFromScopeResult",
+                    "internalFilePath": "merge-lanes.main.runtime.ts"
                   }
                 ]
               },
@@ -860,7 +925,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 485,
+                "line": 483,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.slots: never[]",
@@ -869,7 +934,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 485,
+                  "line": 483,
                   "character": 3
                 },
                 "type": "never[]"
@@ -881,7 +946,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 486,
+                "line": 484,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -890,7 +955,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 486,
+                  "line": 484,
                   "character": 3
                 },
                 "type": "Aspect[]"
@@ -902,7 +967,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 499,
+                "line": 497,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -911,7 +976,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 499,
+                  "line": 497,
                   "character": 3
                 },
                 "type": "RuntimeDefinition"
@@ -923,7 +988,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 501,
+                "line": 499,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    GlobalConfigMain\n]): Promise<MergeLanesMain>",
@@ -933,7 +998,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 501,
+                    "line": 499,
                     "character": 25
                   },
                   "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -941,7 +1006,7 @@
                     "__schema": "TupleTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 513,
+                      "line": 511,
                       "character": 6
                     },
                     "elements": [
@@ -949,100 +1014,144 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 514,
+                          "line": 512,
                           "character": 5
                         },
-                        "name": "LanesMain"
+                        "name": "LanesMain",
+                        "componentId": {
+                          "scope": "teambit.lanes",
+                          "name": "lanes"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 515,
+                          "line": 513,
                           "character": 5
                         },
-                        "name": "CLIMain"
+                        "name": "CLIMain",
+                        "componentId": {
+                          "scope": "teambit.harmony",
+                          "name": "cli"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 516,
+                          "line": 514,
                           "character": 5
                         },
-                        "name": "Workspace"
+                        "name": "Workspace",
+                        "componentId": {
+                          "scope": "teambit.workspace",
+                          "name": "workspace"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 517,
+                          "line": 515,
                           "character": 5
                         },
-                        "name": "MergingMain"
+                        "name": "MergingMain",
+                        "componentId": {
+                          "scope": "teambit.component",
+                          "name": "merging"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 518,
+                          "line": 516,
                           "character": 5
                         },
-                        "name": "LoggerMain"
+                        "name": "LoggerMain",
+                        "componentId": {
+                          "scope": "teambit.harmony",
+                          "name": "logger"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 519,
+                          "line": 517,
                           "character": 5
                         },
-                        "name": "RemoveMain"
+                        "name": "RemoveMain",
+                        "componentId": {
+                          "scope": "teambit.component",
+                          "name": "remove"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 520,
+                          "line": 518,
                           "character": 5
                         },
-                        "name": "ScopeMain"
+                        "name": "ScopeMain",
+                        "componentId": {
+                          "scope": "teambit.scope",
+                          "name": "scope"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 521,
+                          "line": 519,
                           "character": 5
                         },
-                        "name": "ExportMain"
+                        "name": "ExportMain",
+                        "componentId": {
+                          "scope": "teambit.scope",
+                          "name": "export"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 522,
+                          "line": 520,
                           "character": 5
                         },
-                        "name": "ImporterMain"
+                        "name": "ImporterMain",
+                        "componentId": {
+                          "scope": "teambit.scope",
+                          "name": "importer"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 523,
+                          "line": 521,
                           "character": 5
                         },
-                        "name": "CheckoutMain"
+                        "name": "CheckoutMain",
+                        "componentId": {
+                          "scope": "teambit.component",
+                          "name": "checkout"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 524,
+                          "line": 522,
                           "character": 5
                         },
-                        "name": "GlobalConfigMain"
+                        "name": "GlobalConfigMain",
+                        "componentId": {
+                          "scope": "teambit.harmony",
+                          "name": "global-config"
+                        }
                       }
                     ]
                   },
@@ -1054,7 +1163,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 501,
+                  "line": 499,
                   "character": 3
                 },
                 "type": "Promise<MergeLanesMain>"
@@ -1131,7 +1240,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 41,
+            "line": 39,
             "character": 1
           },
           "signature": "type MergeLaneOptions = {\n    mergeStrategy: MergeStrategy;\n    ours?: boolean | undefined;\n    theirs?: boolean | undefined;\n    noAutoSnap?: boolean | undefined;\n    noSnap?: boolean | undefined;\n    snapMessage?: string | undefined;\n    existingOnWorkspaceOnly?: boolean | undefined;\n    ... 14 more ...;\n    fetchCurrent?: boolean | undefined;\n}",
@@ -1140,7 +1249,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 41,
+              "line": 39,
               "character": 32
             },
             "members": [
@@ -1148,7 +1257,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 42,
+                  "line": 40,
                   "character": 3
                 },
                 "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
@@ -1157,10 +1266,14 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 42,
+                    "line": 40,
                     "character": 18
                   },
-                  "name": "MergeStrategy"
+                  "name": "MergeStrategy",
+                  "componentId": {
+                    "scope": "teambit.component",
+                    "name": "merging"
+                  }
                 },
                 "isOptional": false
               },
@@ -1168,7 +1281,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 43,
+                  "line": 41,
                   "character": 3
                 },
                 "signature": "(property) ours?: boolean | undefined",
@@ -1177,7 +1290,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 43,
+                    "line": 41,
                     "character": 10
                   },
                   "name": "boolean"
@@ -1188,7 +1301,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 44,
+                  "line": 42,
                   "character": 3
                 },
                 "signature": "(property) theirs?: boolean | undefined",
@@ -1197,7 +1310,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 44,
+                    "line": 42,
                     "character": 12
                   },
                   "name": "boolean"
@@ -1208,7 +1321,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 45,
+                  "line": 43,
                   "character": 3
                 },
                 "signature": "(property) noAutoSnap?: boolean | undefined",
@@ -1217,7 +1330,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 45,
+                    "line": 43,
                     "character": 16
                   },
                   "name": "boolean"
@@ -1228,7 +1341,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 46,
+                  "line": 44,
                   "character": 3
                 },
                 "signature": "(property) noSnap?: boolean | undefined",
@@ -1237,7 +1350,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 46,
+                    "line": 44,
                     "character": 12
                   },
                   "name": "boolean"
@@ -1248,7 +1361,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 47,
+                  "line": 45,
                   "character": 3
                 },
                 "signature": "(property) snapMessage?: string | undefined",
@@ -1257,7 +1370,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 47,
+                    "line": 45,
                     "character": 17
                   },
                   "name": "string"
@@ -1268,7 +1381,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 48,
+                  "line": 46,
                   "character": 3
                 },
                 "signature": "(property) existingOnWorkspaceOnly?: boolean | undefined",
@@ -1277,7 +1390,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 48,
+                    "line": 46,
                     "character": 29
                   },
                   "name": "boolean"
@@ -1288,7 +1401,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 49,
+                  "line": 47,
                   "character": 3
                 },
                 "signature": "(property) build?: boolean | undefined",
@@ -1297,7 +1410,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 49,
+                    "line": 47,
                     "character": 11
                   },
                   "name": "boolean"
@@ -1308,7 +1421,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 50,
+                  "line": 48,
                   "character": 3
                 },
                 "signature": "(property) keepReadme?: boolean | undefined",
@@ -1317,7 +1430,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 50,
+                    "line": 48,
                     "character": 16
                   },
                   "name": "boolean"
@@ -1328,7 +1441,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 51,
+                  "line": 49,
                   "character": 3
                 },
                 "signature": "(property) squash?: boolean | undefined",
@@ -1337,7 +1450,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 51,
+                    "line": 49,
                     "character": 12
                   },
                   "name": "boolean"
@@ -1348,7 +1461,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 52,
+                  "line": 50,
                   "character": 3
                 },
                 "signature": "(property) noSquash?: boolean | undefined",
@@ -1357,7 +1470,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 52,
+                    "line": 50,
                     "character": 14
                   },
                   "name": "boolean"
@@ -1368,7 +1481,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 53,
+                  "line": 51,
                   "character": 3
                 },
                 "signature": "(property) tag?: boolean | undefined",
@@ -1377,7 +1490,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 53,
+                    "line": 51,
                     "character": 9
                   },
                   "name": "boolean"
@@ -1388,7 +1501,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 54,
+                  "line": 52,
                   "character": 3
                 },
                 "signature": "(property) pattern?: string | undefined",
@@ -1397,7 +1510,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 54,
+                    "line": 52,
                     "character": 13
                   },
                   "name": "string"
@@ -1408,7 +1521,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 55,
+                  "line": 53,
                   "character": 3
                 },
                 "signature": "(property) includeDeps?: boolean | undefined",
@@ -1417,7 +1530,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 55,
+                    "line": 53,
                     "character": 17
                   },
                   "name": "boolean"
@@ -1428,7 +1541,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 56,
+                  "line": 54,
                   "character": 3
                 },
                 "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -1437,7 +1550,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 56,
+                    "line": 54,
                     "character": 32
                   },
                   "name": "boolean"
@@ -1448,7 +1561,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 57,
+                  "line": 55,
                   "character": 3
                 },
                 "signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
@@ -1457,10 +1570,14 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 57,
+                    "line": 55,
                     "character": 22
                   },
-                  "name": "MergeStrategy"
+                  "name": "MergeStrategy",
+                  "componentId": {
+                    "scope": "teambit.component",
+                    "name": "merging"
+                  }
                 },
                 "isOptional": true
               },
@@ -1468,7 +1585,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 58,
+                  "line": 56,
                   "character": 3
                 },
                 "signature": "(property) ignoreConfigChanges?: boolean | undefined",
@@ -1477,7 +1594,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 58,
+                    "line": 56,
                     "character": 25
                   },
                   "name": "boolean"
@@ -1488,7 +1605,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 59,
+                  "line": 57,
                   "character": 3
                 },
                 "signature": "(property) skipFetch?: boolean | undefined",
@@ -1497,7 +1614,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 59,
+                    "line": 57,
                     "character": 15
                   },
                   "name": "boolean"
@@ -1508,7 +1625,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 60,
+                  "line": 58,
                   "character": 3
                 },
                 "signature": "(property) excludeNonLaneComps?: boolean | undefined",
@@ -1517,7 +1634,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 60,
+                    "line": 58,
                     "character": 25
                   },
                   "name": "boolean"
@@ -1528,7 +1645,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 61,
+                  "line": 59,
                   "character": 3
                 },
                 "signature": "(property) shouldIncludeUpdateDependents?: boolean | undefined",
@@ -1537,7 +1654,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 61,
+                    "line": 59,
                     "character": 35
                   },
                   "name": "boolean"
@@ -1548,7 +1665,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 62,
+                  "line": 60,
                   "character": 3
                 },
                 "signature": "(property) throwIfNotUpToDate?: boolean | undefined",
@@ -1557,7 +1674,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 62,
+                    "line": 60,
                     "character": 24
                   },
                   "name": "boolean"
@@ -1568,7 +1685,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 63,
+                  "line": 61,
                   "character": 3
                 },
                 "signature": "(property) fetchCurrent?: boolean | undefined",
@@ -1577,7 +1694,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 63,
+                    "line": 61,
                     "character": 18
                   },
                   "name": "boolean"
@@ -1591,7 +1708,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 65,
+            "line": 63,
             "character": 1
           },
           "signature": "type ConflictPerId = {\n    id: ComponentID;\n    files: string[];\n    config?: boolean | undefined;\n}",
@@ -1600,7 +1717,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 65,
+              "line": 63,
               "character": 29
             },
             "members": [
@@ -1608,7 +1725,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 65,
+                  "line": 63,
                   "character": 31
                 },
                 "signature": "(property) id: ComponentID",
@@ -1617,7 +1734,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 65,
+                    "line": 63,
                     "character": 31
                   },
                   "name": "ComponentID",
@@ -1633,7 +1750,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 65,
+                  "line": 63,
                   "character": 48
                 },
                 "signature": "(property) files: string[]",
@@ -1642,14 +1759,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 65,
+                    "line": 63,
                     "character": 55
                   },
                   "type": {
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 65,
+                      "line": 63,
                       "character": 55
                     },
                     "name": "string"
@@ -1661,7 +1778,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 65,
+                  "line": 63,
                   "character": 65
                 },
                 "signature": "(property) config?: boolean | undefined",
@@ -1670,7 +1787,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 65,
+                    "line": 63,
                     "character": 74
                   },
                   "name": "boolean"
@@ -1684,7 +1801,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 66,
+            "line": 64,
             "character": 1
           },
           "signature": "type MergeFromScopeResult = {\n    mergedNow: ComponentID[];\n    exportedIds: ComponentID[];\n    unmerged: {\n        id: ComponentID;\n        reason: string;\n    }[];\n    conflicts?: ConflictPerId[] | undefined;\n    snappedIds?: ComponentID[] | undefined;\n    mergedPreviously: ComponentID[];\n    mergeSnapError?: Error | undefined;\n}",
@@ -1693,7 +1810,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 66,
+              "line": 64,
               "character": 36
             },
             "members": [
@@ -1701,7 +1818,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 67,
+                  "line": 65,
                   "character": 3
                 },
                 "signature": "(property) mergedNow: ComponentID[]",
@@ -1710,17 +1827,22 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 67,
+                    "line": 65,
                     "character": 14
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 67,
+                      "line": 65,
                       "character": 14
                     },
-                    "name": "ComponentID"
+                    "name": "ComponentID",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "component-id",
+                      "version": "1.2.2"
+                    }
                   }
                 },
                 "isOptional": false
@@ -1729,7 +1851,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 68,
+                  "line": 66,
                   "character": 3
                 },
                 "signature": "(property) exportedIds: ComponentID[]",
@@ -1738,17 +1860,22 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 68,
+                    "line": 66,
                     "character": 16
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 68,
+                      "line": 66,
                       "character": 16
                     },
-                    "name": "ComponentID"
+                    "name": "ComponentID",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "component-id",
+                      "version": "1.2.2"
+                    }
                   }
                 },
                 "isOptional": false
@@ -1757,7 +1884,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 69,
+                  "line": 67,
                   "character": 3
                 },
                 "signature": "(property) unmerged: {\n    id: ComponentID;\n    reason: string;\n}[]",
@@ -1766,14 +1893,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 69,
+                    "line": 67,
                     "character": 13
                   },
                   "type": {
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 69,
+                      "line": 67,
                       "character": 13
                     },
                     "members": [
@@ -1781,7 +1908,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 69,
+                          "line": 67,
                           "character": 15
                         },
                         "signature": "(property) id: ComponentID",
@@ -1790,7 +1917,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 69,
+                            "line": 67,
                             "character": 15
                           },
                           "name": "ComponentID",
@@ -1806,7 +1933,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 69,
+                          "line": 67,
                           "character": 32
                         },
                         "signature": "(property) reason: string",
@@ -1815,7 +1942,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 69,
+                            "line": 67,
                             "character": 40
                           },
                           "name": "string"
@@ -1831,7 +1958,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 70,
+                  "line": 68,
                   "character": 3
                 },
                 "signature": "(property) conflicts?: ConflictPerId[] | undefined",
@@ -1840,17 +1967,18 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 70,
+                    "line": 68,
                     "character": 15
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 70,
+                      "line": 68,
                       "character": 15
                     },
-                    "name": "ConflictPerId"
+                    "name": "ConflictPerId",
+                    "internalFilePath": "merge-lanes.main.runtime.ts"
                   }
                 },
                 "isOptional": true
@@ -1859,7 +1987,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 71,
+                  "line": 69,
                   "character": 3
                 },
                 "signature": "(property) snappedIds?: ComponentID[] | undefined",
@@ -1868,17 +1996,22 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 71,
+                    "line": 69,
                     "character": 16
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 71,
+                      "line": 69,
                       "character": 16
                     },
-                    "name": "ComponentID"
+                    "name": "ComponentID",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "component-id",
+                      "version": "1.2.2"
+                    }
                   }
                 },
                 "isOptional": true
@@ -1887,7 +2020,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 72,
+                  "line": 70,
                   "character": 3
                 },
                 "signature": "(property) mergedPreviously: ComponentID[]",
@@ -1896,17 +2029,22 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 72,
+                    "line": 70,
                     "character": 21
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 72,
+                      "line": 70,
                       "character": 21
                     },
-                    "name": "ComponentID"
+                    "name": "ComponentID",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "component-id",
+                      "version": "1.2.2"
+                    }
                   }
                 },
                 "isOptional": false
@@ -1915,7 +2053,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 73,
+                  "line": 71,
                   "character": 3
                 },
                 "signature": "(property) mergeSnapError?: Error | undefined",
@@ -1924,7 +2062,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 73,
+                    "line": 71,
                     "character": 20
                   },
                   "name": "Error"
@@ -1938,7 +2076,7 @@
           "__schema": "ClassSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 76,
+            "line": 74,
             "character": 1
           },
           "signature": "class MergeLanesMain",
@@ -1948,7 +2086,7 @@
               "__schema": "ConstructorSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 77,
+                "line": 75,
                 "character": 3
               },
               "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -1958,7 +2096,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 78,
+                    "line": 76,
                     "character": 5
                   },
                   "name": "workspace",
@@ -1966,7 +2104,7 @@
                     "__schema": "TypeUnionSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 78,
+                      "line": 76,
                       "character": 24
                     },
                     "types": [
@@ -1974,16 +2112,20 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 78,
+                          "line": 76,
                           "character": 24
                         },
-                        "name": "Workspace"
+                        "name": "Workspace",
+                        "componentId": {
+                          "scope": "teambit.workspace",
+                          "name": "workspace"
+                        }
                       },
                       {
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 78,
+                          "line": 76,
                           "character": 36
                         },
                         "name": "undefined"
@@ -1997,7 +2139,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 79,
+                    "line": 77,
                     "character": 5
                   },
                   "name": "merging",
@@ -2005,10 +2147,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 79,
+                      "line": 77,
                       "character": 22
                     },
-                    "name": "MergingMain"
+                    "name": "MergingMain",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "merging"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2017,7 +2163,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 80,
+                    "line": 78,
                     "character": 5
                   },
                   "name": "lanes",
@@ -2025,10 +2171,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 80,
+                      "line": 78,
                       "character": 21
                     },
-                    "name": "LanesMain"
+                    "name": "LanesMain",
+                    "componentId": {
+                      "scope": "teambit.lanes",
+                      "name": "lanes"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2037,7 +2187,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 81,
+                    "line": 79,
                     "character": 5
                   },
                   "name": "logger",
@@ -2045,10 +2195,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 81,
+                      "line": 79,
                       "character": 22
                     },
-                    "name": "Logger"
+                    "name": "Logger",
+                    "componentId": {
+                      "scope": "teambit.harmony",
+                      "name": "logger"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2057,7 +2211,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 82,
+                    "line": 80,
                     "character": 5
                   },
                   "name": "remove",
@@ -2065,10 +2219,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 82,
+                      "line": 80,
                       "character": 21
                     },
-                    "name": "RemoveMain"
+                    "name": "RemoveMain",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "remove"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2077,7 +2235,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 83,
+                    "line": 81,
                     "character": 5
                   },
                   "name": "scope",
@@ -2085,10 +2243,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 83,
+                      "line": 81,
                       "character": 20
                     },
-                    "name": "ScopeMain"
+                    "name": "ScopeMain",
+                    "componentId": {
+                      "scope": "teambit.scope",
+                      "name": "scope"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2097,7 +2259,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 84,
+                    "line": 82,
                     "character": 5
                   },
                   "name": "exporter",
@@ -2105,10 +2267,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 84,
+                      "line": 82,
                       "character": 23
                     },
-                    "name": "ExportMain"
+                    "name": "ExportMain",
+                    "componentId": {
+                      "scope": "teambit.scope",
+                      "name": "export"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2117,7 +2283,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 85,
+                    "line": 83,
                     "character": 5
                   },
                   "name": "importer",
@@ -2125,10 +2291,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 85,
+                      "line": 83,
                       "character": 23
                     },
-                    "name": "ImporterMain"
+                    "name": "ImporterMain",
+                    "componentId": {
+                      "scope": "teambit.scope",
+                      "name": "importer"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2137,7 +2307,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 86,
+                    "line": 84,
                     "character": 5
                   },
                   "name": "checkout",
@@ -2145,10 +2315,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 86,
+                      "line": 84,
                       "character": 23
                     },
-                    "name": "CheckoutMain"
+                    "name": "CheckoutMain",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "checkout"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2158,7 +2332,7 @@
                 "__schema": "ThisTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 76,
+                  "line": 74,
                   "character": 1
                 },
                 "name": "MergeLanesMain"
@@ -2169,7 +2343,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 89,
+                "line": 87,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>",
@@ -2179,7 +2353,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 89,
+                    "line": 87,
                     "character": 24
                   },
                   "name": "laneName",
@@ -2187,7 +2361,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 89,
+                      "line": 87,
                       "character": 34
                     },
                     "name": "string"
@@ -2199,7 +2373,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 89,
+                    "line": 87,
                     "character": 42
                   },
                   "name": "options",
@@ -2207,10 +2381,11 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 89,
+                      "line": 87,
                       "character": 51
                     },
-                    "name": "MergeLaneOptions"
+                    "name": "MergeLaneOptions",
+                    "internalFilePath": "merge-lanes.main.runtime.ts"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2220,7 +2395,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 89,
+                  "line": 87,
                   "character": 3
                 },
                 "type": "Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>"
@@ -2233,7 +2408,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 99,
+                "line": 97,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>",
@@ -2243,7 +2418,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 100,
+                    "line": 98,
                     "character": 5
                   },
                   "name": "otherLaneId",
@@ -2251,10 +2426,15 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 100,
+                      "line": 98,
                       "character": 18
                     },
-                    "name": "LaneId"
+                    "name": "LaneId",
+                    "componentId": {
+                      "scope": "teambit.lanes",
+                      "name": "lane-id",
+                      "version": "0.0.311"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2263,7 +2443,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 101,
+                    "line": 99,
                     "character": 5
                   },
                   "name": "currentLaneId",
@@ -2271,10 +2451,15 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 101,
+                      "line": 99,
                       "character": 20
                     },
-                    "name": "LaneId"
+                    "name": "LaneId",
+                    "componentId": {
+                      "scope": "teambit.lanes",
+                      "name": "lane-id",
+                      "version": "0.0.311"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2283,7 +2468,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 102,
+                    "line": 100,
                     "character": 5
                   },
                   "name": "options",
@@ -2291,10 +2476,11 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 102,
+                      "line": 100,
                       "character": 14
                     },
-                    "name": "MergeLaneOptions"
+                    "name": "MergeLaneOptions",
+                    "internalFilePath": "merge-lanes.main.runtime.ts"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2304,7 +2490,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 103,
+                  "line": 101,
                   "character": 6
                 },
                 "name": "Promise",
@@ -2313,7 +2499,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 103,
+                      "line": 101,
                       "character": 14
                     },
                     "members": [
@@ -2321,7 +2507,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 104,
+                          "line": 102,
                           "character": 5
                         },
                         "signature": "(property) mergeResults: ApplyVersionResults",
@@ -2330,7 +2516,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 104,
+                            "line": 102,
                             "character": 5
                           },
                           "name": "ApplyVersionResults",
@@ -2345,7 +2531,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 105,
+                          "line": 103,
                           "character": 5
                         },
                         "signature": "(property) deleteResults: any",
@@ -2354,7 +2540,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 105,
+                            "line": 103,
                             "character": 20
                           },
                           "name": "any"
@@ -2365,7 +2551,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 106,
+                          "line": 104,
                           "character": 5
                         },
                         "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -2374,17 +2560,21 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 106,
+                            "line": 104,
                             "character": 25
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 106,
+                              "line": 104,
                               "character": 25
                             },
-                            "name": "ConfigMergeResult"
+                            "name": "ConfigMergeResult",
+                            "componentId": {
+                              "scope": "teambit.workspace",
+                              "name": "config-merger"
+                            }
                           }
                         },
                         "isOptional": false
@@ -2393,7 +2583,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 107,
+                          "line": 105,
                           "character": 5
                         },
                         "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
@@ -2402,17 +2592,22 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 107,
+                            "line": 105,
                             "character": 28
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 107,
+                              "line": 105,
                               "character": 28
                             },
-                            "name": "ComponentID"
+                            "name": "ComponentID",
+                            "componentId": {
+                              "scope": "teambit.component",
+                              "name": "component-id",
+                              "version": "1.2.2"
+                            }
                           }
                         },
                         "isOptional": false
@@ -2421,7 +2616,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 108,
+                          "line": 106,
                           "character": 5
                         },
                         "signature": "(property) conflicts: ConflictPerId[]",
@@ -2430,17 +2625,18 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 108,
+                            "line": 106,
                             "character": 16
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 108,
+                              "line": 106,
                               "character": 16
                             },
-                            "name": "ConflictPerId"
+                            "name": "ConflictPerId",
+                            "internalFilePath": "merge-lanes.main.runtime.ts"
                           }
                         },
                         "isOptional": false
@@ -2457,7 +2653,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 324,
+                "line": 322,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n    scope?: string;\n}): Promise<CreateLaneResult>",
@@ -2467,7 +2663,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 324,
+                    "line": 322,
                     "character": 19
                   },
                   "name": "newLaneName",
@@ -2475,7 +2671,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 324,
+                      "line": 322,
                       "character": 32
                     },
                     "name": "string"
@@ -2487,7 +2683,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 324,
+                    "line": 322,
                     "character": 40
                   },
                   "name": "options",
@@ -2495,7 +2691,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 324,
+                      "line": 322,
                       "character": 49
                     },
                     "members": [
@@ -2503,7 +2699,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 324,
+                          "line": 322,
                           "character": 51
                         },
                         "signature": "(property) scope?: string | undefined",
@@ -2512,7 +2708,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 324,
+                            "line": 322,
                             "character": 59
                           },
                           "name": "string"
@@ -2529,7 +2725,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 324,
+                  "line": 322,
                   "character": 3
                 },
                 "type": "Promise<CreateLaneResult>"
@@ -2542,7 +2738,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 332,
+                "line": 330,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n    checkoutResults: ApplyVersionResults | undefined;\n    restoredItems: string[];\n    checkoutError: Error | undefined;\n}>",
@@ -2552,7 +2748,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 332,
+                    "line": 330,
                     "character": 24
                   },
                   "name": "checkoutProps",
@@ -2560,10 +2756,14 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 332,
+                      "line": 330,
                       "character": 39
                     },
-                    "name": "CheckoutProps"
+                    "name": "CheckoutProps",
+                    "componentId": {
+                      "scope": "teambit.component",
+                      "name": "checkout"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2572,7 +2772,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 332,
+                    "line": 330,
                     "character": 54
                   },
                   "name": "mergeAbortOpts",
@@ -2580,10 +2780,11 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 332,
+                      "line": 330,
                       "character": 70
                     },
-                    "name": "MergeAbortOpts"
+                    "name": "MergeAbortOpts",
+                    "internalFilePath": "merge-abort.cmd.ts"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -2593,7 +2794,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 332,
+                  "line": 330,
                   "character": 3
                 },
                 "type": "Promise<{\n    checkoutResults: ApplyVersionResults | undefined;\n    restoredItems: string[];\n    checkoutError: Error | undefined;\n}>"
@@ -2606,7 +2807,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 388,
+                "line": 386,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n    push?: boolean;\n    reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -2616,7 +2817,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 389,
+                    "line": 387,
                     "character": 5
                   },
                   "name": "fromLane",
@@ -2624,7 +2825,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 389,
+                      "line": 387,
                       "character": 15
                     },
                     "name": "string"
@@ -2636,7 +2837,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 390,
+                    "line": 388,
                     "character": 5
                   },
                   "name": "toLane",
@@ -2644,7 +2845,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 390,
+                      "line": 388,
                       "character": 13
                     },
                     "name": "string"
@@ -2656,7 +2857,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 391,
+                    "line": 389,
                     "character": 5
                   },
                   "name": "options",
@@ -2664,7 +2865,7 @@
                     "__schema": "TypeIntersectionSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 391,
+                      "line": 389,
                       "character": 14
                     },
                     "types": [
@@ -2672,7 +2873,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 391,
+                          "line": 389,
                           "character": 14
                         },
                         "name": "Partial",
@@ -2681,10 +2882,11 @@
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 22
                             },
-                            "name": "MergeLaneOptions"
+                            "name": "MergeLaneOptions",
+                            "internalFilePath": "merge-lanes.main.runtime.ts"
                           }
                         ]
                       },
@@ -2692,7 +2894,7 @@
                         "__schema": "TypeLiteralSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 391,
+                          "line": 389,
                           "character": 42
                         },
                         "members": [
@@ -2700,7 +2902,7 @@
                             "__schema": "VariableLikeSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 44
                             },
                             "signature": "(property) push?: boolean | undefined",
@@ -2709,7 +2911,7 @@
                               "__schema": "KeywordTypeSchema",
                               "location": {
                                 "filePath": "merge-lanes.main.runtime.ts",
-                                "line": 391,
+                                "line": 389,
                                 "character": 51
                               },
                               "name": "boolean"
@@ -2720,7 +2922,7 @@
                             "__schema": "VariableLikeSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 60
                             },
                             "signature": "(property) reMerge?: boolean | undefined",
@@ -2729,7 +2931,7 @@
                               "__schema": "KeywordTypeSchema",
                               "location": {
                                 "filePath": "merge-lanes.main.runtime.ts",
-                                "line": 391,
+                                "line": 389,
                                 "character": 70
                               },
                               "name": "boolean"
@@ -2748,7 +2950,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 392,
+                  "line": 390,
                   "character": 6
                 },
                 "name": "Promise",
@@ -2757,10 +2959,11 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 392,
+                      "line": 390,
                       "character": 14
                     },
-                    "name": "MergeFromScopeResult"
+                    "name": "MergeFromScopeResult",
+                    "internalFilePath": "merge-lanes.main.runtime.ts"
                   }
                 ]
               },
@@ -2772,7 +2975,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 485,
+                "line": 483,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.slots: never[]",
@@ -2781,7 +2984,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 485,
+                  "line": 483,
                   "character": 3
                 },
                 "type": "never[]"
@@ -2793,7 +2996,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 486,
+                "line": 484,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -2802,7 +3005,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 486,
+                  "line": 484,
                   "character": 3
                 },
                 "type": "Aspect[]"
@@ -2814,7 +3017,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 499,
+                "line": 497,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -2823,7 +3026,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 499,
+                  "line": 497,
                   "character": 3
                 },
                 "type": "RuntimeDefinition"
@@ -2835,7 +3038,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 501,
+                "line": 499,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    GlobalConfigMain\n]): Promise<MergeLanesMain>",
@@ -2845,7 +3048,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 501,
+                    "line": 499,
                     "character": 25
                   },
                   "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -2853,7 +3056,7 @@
                     "__schema": "TupleTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 513,
+                      "line": 511,
                       "character": 6
                     },
                     "elements": [
@@ -2861,100 +3064,144 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 514,
+                          "line": 512,
                           "character": 5
                         },
-                        "name": "LanesMain"
+                        "name": "LanesMain",
+                        "componentId": {
+                          "scope": "teambit.lanes",
+                          "name": "lanes"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 515,
+                          "line": 513,
                           "character": 5
                         },
-                        "name": "CLIMain"
+                        "name": "CLIMain",
+                        "componentId": {
+                          "scope": "teambit.harmony",
+                          "name": "cli"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 516,
+                          "line": 514,
                           "character": 5
                         },
-                        "name": "Workspace"
+                        "name": "Workspace",
+                        "componentId": {
+                          "scope": "teambit.workspace",
+                          "name": "workspace"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 517,
+                          "line": 515,
                           "character": 5
                         },
-                        "name": "MergingMain"
+                        "name": "MergingMain",
+                        "componentId": {
+                          "scope": "teambit.component",
+                          "name": "merging"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 518,
+                          "line": 516,
                           "character": 5
                         },
-                        "name": "LoggerMain"
+                        "name": "LoggerMain",
+                        "componentId": {
+                          "scope": "teambit.harmony",
+                          "name": "logger"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 519,
+                          "line": 517,
                           "character": 5
                         },
-                        "name": "RemoveMain"
+                        "name": "RemoveMain",
+                        "componentId": {
+                          "scope": "teambit.component",
+                          "name": "remove"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 520,
+                          "line": 518,
                           "character": 5
                         },
-                        "name": "ScopeMain"
+                        "name": "ScopeMain",
+                        "componentId": {
+                          "scope": "teambit.scope",
+                          "name": "scope"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 521,
+                          "line": 519,
                           "character": 5
                         },
-                        "name": "ExportMain"
+                        "name": "ExportMain",
+                        "componentId": {
+                          "scope": "teambit.scope",
+                          "name": "export"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 522,
+                          "line": 520,
                           "character": 5
                         },
-                        "name": "ImporterMain"
+                        "name": "ImporterMain",
+                        "componentId": {
+                          "scope": "teambit.scope",
+                          "name": "importer"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 523,
+                          "line": 521,
                           "character": 5
                         },
-                        "name": "CheckoutMain"
+                        "name": "CheckoutMain",
+                        "componentId": {
+                          "scope": "teambit.component",
+                          "name": "checkout"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 524,
+                          "line": 522,
                           "character": 5
                         },
-                        "name": "GlobalConfigMain"
+                        "name": "GlobalConfigMain",
+                        "componentId": {
+                          "scope": "teambit.harmony",
+                          "name": "global-config"
+                        }
                       }
                     ]
                   },
@@ -2966,7 +3213,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 501,
+                  "line": 499,
                   "character": 3
                 },
                 "type": "Promise<MergeLanesMain>"
@@ -2984,7 +3231,7 @@
           "__schema": "UnImplementedSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 796,
+            "line": 794,
             "character": 16
           },
           "name": "MergeLanesMain",
@@ -2996,7 +3243,7 @@
           "__schema": "FunctionLikeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 547,
+            "line": 545,
             "character": 1
           },
           "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
@@ -3006,7 +3253,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 548,
+                "line": 546,
                 "character": 3
               },
               "name": "allComponentsStatus",
@@ -3014,17 +3261,21 @@
                 "__schema": "TypeArraySchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 548,
+                  "line": 546,
                   "character": 24
                 },
                 "type": {
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 548,
+                    "line": 546,
                     "character": 24
                   },
-                  "name": "ComponentMergeStatus"
+                  "name": "ComponentMergeStatus",
+                  "componentId": {
+                    "scope": "teambit.component",
+                    "name": "merging"
+                  }
                 }
               },
               "isOptional": false,
@@ -3034,7 +3285,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 549,
+                "line": 547,
                 "character": 3
               },
               "name": "compIdsToKeep",
@@ -3042,17 +3293,22 @@
                 "__schema": "TypeArraySchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 549,
+                  "line": 547,
                   "character": 18
                 },
                 "type": {
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 549,
+                    "line": 547,
                     "character": 18
                   },
-                  "name": "ComponentID"
+                  "name": "ComponentID",
+                  "componentId": {
+                    "scope": "teambit.component",
+                    "name": "component-id",
+                    "version": "1.2.2"
+                  }
                 }
               },
               "isOptional": false,
@@ -3062,7 +3318,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 550,
+                "line": 548,
                 "character": 3
               },
               "name": "allBitIds",
@@ -3070,17 +3326,22 @@
                 "__schema": "TypeArraySchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 550,
+                  "line": 548,
                   "character": 14
                 },
                 "type": {
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 550,
+                    "line": 548,
                     "character": 14
                   },
-                  "name": "ComponentID"
+                  "name": "ComponentID",
+                  "componentId": {
+                    "scope": "teambit.component",
+                    "name": "component-id",
+                    "version": "1.2.2"
+                  }
                 }
               },
               "isOptional": false,
@@ -3090,7 +3351,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 551,
+                "line": 549,
                 "character": 3
               },
               "name": "legacyScope",
@@ -3098,7 +3359,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 551,
+                  "line": 549,
                   "character": 16
                 },
                 "name": "LegacyScope"
@@ -3110,7 +3371,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 552,
+                "line": 550,
                 "character": 3
               },
               "name": "includeDeps",
@@ -3118,7 +3379,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 552,
+                  "line": 550,
                   "character": 3
                 },
                 "type": "boolean"
@@ -3131,7 +3392,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 553,
+                "line": 551,
                 "character": 3
               },
               "name": "otherLane",
@@ -3139,10 +3400,15 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 553,
+                  "line": 551,
                   "character": 15
                 },
-                "name": "Lane"
+                "name": "Lane",
+                "componentId": {
+                  "scope": "teambit.scope",
+                  "name": "objects",
+                  "version": "0.0.2"
+                }
               },
               "isOptional": true,
               "isSpread": false
@@ -3151,7 +3417,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 554,
+                "line": 552,
                 "character": 3
               },
               "name": "shouldSquash",
@@ -3159,7 +3425,7 @@
                 "__schema": "KeywordTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 554,
+                  "line": 552,
                   "character": 18
                 },
                 "name": "boolean"
@@ -3172,7 +3438,7 @@
             "__schema": "TypeRefSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 555,
+              "line": 553,
               "character": 4
             },
             "name": "Promise",
@@ -3181,17 +3447,21 @@
                 "__schema": "TypeArraySchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 555,
+                  "line": 553,
                   "character": 12
                 },
                 "type": {
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 555,
+                    "line": 553,
                     "character": 12
                   },
-                  "name": "ComponentMergeStatus"
+                  "name": "ComponentMergeStatus",
+                  "componentId": {
+                    "scope": "teambit.component",
+                    "name": "merging"
+                  }
                 }
               }
             ]
@@ -3204,7 +3474,7 @@
           "__schema": "FunctionLikeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 664,
+            "line": 662,
             "character": 1
           },
           "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n    message: string;\n    date: string;\n    username: string | undefined;\n    email: string | undefined;\n}>",
@@ -3214,7 +3484,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 664,
+                "line": 662,
                 "character": 32
               },
               "name": "otherLaneId",
@@ -3222,10 +3492,15 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 664,
+                  "line": 662,
                   "character": 45
                 },
-                "name": "LaneId"
+                "name": "LaneId",
+                "componentId": {
+                  "scope": "teambit.lanes",
+                  "name": "lane-id",
+                  "version": "0.0.311"
+                }
               },
               "isOptional": false,
               "isSpread": false
@@ -3235,7 +3510,7 @@
             "__schema": "InferenceTypeSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 664,
+              "line": 662,
               "character": 1
             },
             "type": "Promise<{\n    message: string;\n    date: string;\n    username: string | undefined;\n    email: string | undefined;\n}>"
@@ -3248,7 +3523,7 @@
           "__schema": "FunctionLikeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 673,
+            "line": 671,
             "character": 1
           },
           "signature": "function squashSnaps(succeededComponents: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, messageTitle?: string): Promise<void>",
@@ -3258,7 +3533,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 674,
+                "line": 672,
                 "character": 3
               },
               "name": "succeededComponents",
@@ -3266,17 +3541,21 @@
                 "__schema": "TypeArraySchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 674,
+                  "line": 672,
                   "character": 24
                 },
                 "type": {
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 674,
+                    "line": 672,
                     "character": 24
                   },
-                  "name": "ComponentMergeStatus"
+                  "name": "ComponentMergeStatus",
+                  "componentId": {
+                    "scope": "teambit.component",
+                    "name": "merging"
+                  }
                 }
               },
               "isOptional": false,
@@ -3286,7 +3565,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 675,
+                "line": 673,
                 "character": 3
               },
               "name": "currentLaneId",
@@ -3294,10 +3573,15 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 675,
+                  "line": 673,
                   "character": 18
                 },
-                "name": "LaneId"
+                "name": "LaneId",
+                "componentId": {
+                  "scope": "teambit.lanes",
+                  "name": "lane-id",
+                  "version": "0.0.311"
+                }
               },
               "isOptional": false,
               "isSpread": false
@@ -3306,7 +3590,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 676,
+                "line": 674,
                 "character": 3
               },
               "name": "otherLaneId",
@@ -3314,10 +3598,15 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 676,
+                  "line": 674,
                   "character": 16
                 },
-                "name": "LaneId"
+                "name": "LaneId",
+                "componentId": {
+                  "scope": "teambit.lanes",
+                  "name": "lane-id",
+                  "version": "0.0.311"
+                }
               },
               "isOptional": false,
               "isSpread": false
@@ -3326,7 +3615,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 677,
+                "line": 675,
                 "character": 3
               },
               "name": "scope",
@@ -3334,7 +3623,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 677,
+                  "line": 675,
                   "character": 10
                 },
                 "name": "LegacyScope"
@@ -3346,7 +3635,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 678,
+                "line": 676,
                 "character": 3
               },
               "name": "messageTitle",
@@ -3354,7 +3643,7 @@
                 "__schema": "KeywordTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 678,
+                  "line": 676,
                   "character": 18
                 },
                 "name": "string"
@@ -3367,7 +3656,7 @@
             "__schema": "InferenceTypeSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 673,
+              "line": 671,
               "character": 1
             },
             "type": "Promise<void>"
@@ -3380,14 +3669,14 @@
           "__schema": "FunctionLikeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 712,
+            "line": 710,
             "character": 1
           },
           "doc": {
             "__schema": "DocSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 709,
+              "line": 707,
               "character": 1
             },
             "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -3401,7 +3690,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 713,
+                "line": 711,
                 "character": 3
               },
               "name": "currentLaneName",
@@ -3409,7 +3698,7 @@
                 "__schema": "KeywordTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 713,
+                  "line": 711,
                   "character": 20
                 },
                 "name": "string"
@@ -3421,7 +3710,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 714,
+                "line": 712,
                 "character": 3
               },
               "name": "otherLaneId",
@@ -3429,10 +3718,15 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 714,
+                  "line": 712,
                   "character": 16
                 },
-                "name": "LaneId"
+                "name": "LaneId",
+                "componentId": {
+                  "scope": "teambit.lanes",
+                  "name": "lane-id",
+                  "version": "0.0.311"
+                }
               },
               "isOptional": false,
               "isSpread": false
@@ -3441,7 +3735,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 715,
+                "line": 713,
                 "character": 3
               },
               "name": "id",
@@ -3449,10 +3743,15 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 715,
+                  "line": 713,
                   "character": 7
                 },
-                "name": "ComponentID"
+                "name": "ComponentID",
+                "componentId": {
+                  "scope": "teambit.component",
+                  "name": "component-id",
+                  "version": "1.2.2"
+                }
               },
               "isOptional": false,
               "isSpread": false
@@ -3461,7 +3760,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 716,
+                "line": 714,
                 "character": 3
               },
               "name": "divergeData",
@@ -3469,10 +3768,15 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 716,
+                  "line": 714,
                   "character": 16
                 },
-                "name": "SnapsDistance"
+                "name": "SnapsDistance",
+                "componentId": {
+                  "scope": "teambit.component",
+                  "name": "snap-distance",
+                  "version": "0.0.2"
+                }
               },
               "isOptional": false,
               "isSpread": false
@@ -3481,7 +3785,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 717,
+                "line": 715,
                 "character": 3
               },
               "name": "log",
@@ -3489,10 +3793,15 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 717,
+                  "line": 715,
                   "character": 8
                 },
-                "name": "Log"
+                "name": "Log",
+                "componentId": {
+                  "scope": "teambit.scope",
+                  "name": "objects",
+                  "version": "0.0.2"
+                }
               },
               "isOptional": false,
               "isSpread": false
@@ -3501,7 +3810,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 718,
+                "line": 716,
                 "character": 3
               },
               "name": "scope",
@@ -3509,7 +3818,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 718,
+                  "line": 716,
                   "character": 10
                 },
                 "name": "LegacyScope"
@@ -3521,7 +3830,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 719,
+                "line": 717,
                 "character": 3
               },
               "name": "componentFromModel",
@@ -3529,10 +3838,15 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 719,
+                  "line": 717,
                   "character": 24
                 },
-                "name": "Version"
+                "name": "Version",
+                "componentId": {
+                  "scope": "teambit.scope",
+                  "name": "objects",
+                  "version": "0.0.2"
+                }
               },
               "isOptional": true,
               "isSpread": false
@@ -3541,7 +3855,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 720,
+                "line": 718,
                 "character": 3
               },
               "name": "messageTitle",
@@ -3549,7 +3863,7 @@
                 "__schema": "KeywordTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 720,
+                  "line": 718,
                   "character": 18
                 },
                 "name": "string"
@@ -3562,7 +3876,7 @@
             "__schema": "TypeRefSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 721,
+              "line": 719,
               "character": 4
             },
             "name": "Promise",
@@ -3571,7 +3885,7 @@
                 "__schema": "TypeUnionSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 721,
+                  "line": 719,
                   "character": 12
                 },
                 "types": [
@@ -3579,16 +3893,21 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 721,
+                      "line": 719,
                       "character": 12
                     },
-                    "name": "Version"
+                    "name": "Version",
+                    "componentId": {
+                      "scope": "teambit.scope",
+                      "name": "objects",
+                      "version": "0.0.2"
+                    }
                   },
                   {
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 721,
+                      "line": 719,
                       "character": 22
                     },
                     "name": "undefined"
@@ -3605,7 +3924,7 @@
           "__schema": "UnImplementedSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 794,
+            "line": 792,
             "character": 1
           },
           "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -3654,7 +3973,7 @@
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.487"
+    "version": "1.0.489"
   },
   "taggedModuleExports": []
 }