fix(lane-merge): avoid loosing app data when merging from main (#9780)

For some reason, when merging from main without `-x` flag, after the
installation is running, the load-aspects of the apps fails with "Cannot
find module" error.
This is a workaround to load the apps as aspects before running the
installation.

Author: davidfirst

scopes/component/merging/merging.main.runtime.ts

@@ -49,6 +49,7 @@ import {
   MergeOptions,
 } from './merge-version';
 import { ConfigStoreAspect, ConfigStoreMain } from '@teambit/config-store';
+import { ApplicationAspect, ApplicationMain } from '@teambit/application';
 
 type ResolveUnrelatedData = {
   strategy: MergeStrategy;
@@ -124,7 +125,8 @@ export class MergingMain {
     private config: ConfigMain,
     private remove: RemoveMain,
     private configMerger: ConfigMergerMain,
-    private depResolver: DependencyResolverMain
+    private depResolver: DependencyResolverMain,
+    private application: ApplicationMain
   ) {}
 
   async merge(
@@ -297,7 +299,14 @@ export class MergingMain {
 
     const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());
     const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';
+
     if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {
+      // this is a workaround.
+      // keep this here. although it gets called before snapping.
+      // the reason is that when the installation is running, for some reason, some apps are unable to load in the same process.
+      // they throw an error "Cannot find module" during the aspect loading.
+      await this.application.loadAllAppsAsAspects();
+
       try {
         await this.install.install(undefined, {
           dedupe: true,
@@ -327,8 +336,13 @@ export class MergingMain {
         const { taggedComponents, autoTaggedResults, removedComponents } = results;
         return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };
       }
-      return this.snapResolvedComponents(allComponentsStatus, snapMessage, build, currentLane?.toLaneId(),
-      updatedComponents);
+      return this.snapResolvedComponents(
+        allComponentsStatus,
+        snapMessage,
+        build,
+        currentLane?.toLaneId(),
+        updatedComponents
+      );
     };
     let mergeSnapResults: MergeSnapResults = null;
     let mergeSnapError: Error | undefined;
@@ -637,7 +651,11 @@ export class MergingMain {
           .filter((c) => {
             const conflictedAspects = c.dataMergeResult?.conflictedAspects || {};
             const aspectIds = Object.keys(conflictedAspects);
-            aspectIds.forEach(aspectId => this.logger.debug(`conflicted-data for "${c.id.toString()}". aspectId: ${aspectId}. reason: ${conflictedAspects[aspectId]}`));
+            aspectIds.forEach((aspectId) =>
+              this.logger.debug(
+                `conflicted-data for "${c.id.toString()}". aspectId: ${aspectId}. reason: ${conflictedAspects[aspectId]}`
+              )
+            );
             return aspectIds.length;
           })
           .map((c) => c.id);
@@ -740,6 +758,7 @@ export class MergingMain {
     ConfigStoreAspect,
     ConfigMergerAspect,
     DependencyResolverAspect,
+    ApplicationAspect,
   ];
   static runtime = MainRuntime;
   static async provider([
@@ -757,6 +776,7 @@ export class MergingMain {
     configStore,
     configMerger,
     depResolver,
+    application,
   ]: [
     CLIMain,
     Workspace,
@@ -772,6 +792,7 @@ export class MergingMain {
     ConfigStoreMain,
     ConfigMergerMain,
     DependencyResolverMain,
+    ApplicationMain,
   ]) {
     const logger = loggerMain.createLogger(MergingAspect.id);
     const merging = new MergingMain(
@@ -786,7 +807,8 @@ export class MergingMain {
       config,
       remove,
       configMerger,
-      depResolver
+      depResolver,
+      application
     );
     cli.register(new MergeCmd(merging, configStore));
     return merging;