fix(apply), identify existing components properly and install missing packages for modified components (#9333)

Author: davidfirst

e2e/harmony/apply.e2e.ts

@@ -59,4 +59,39 @@ describe('apply command', function () {
       });
     });
   });
+  describe('apply component changes on existing workspace', () => {
+    let output: string;
+    before(() => {
+      helper.scopeHelper.setNewLocalAndRemoteScopes();
+      helper.fixtures.populateComponents(1);
+      helper.command.tagAllWithoutBuild();
+      helper.command.export();
+
+      const data = [
+        {
+          componentId: `${helper.scopes.remote}/comp1`,
+          message: `msg for first comp`,
+          files: [
+            {
+              path: 'index.js',
+              content: "require('test-dummy-package')",
+            },
+          ],
+        },
+      ];
+      // console.log('command', `bit apply '${JSON.stringify(data)}'`);
+      output = helper.command.apply(data);
+    });
+    it('should modify the component correctly', () => {
+      const indexFile = helper.fs.readFile('comp1/index.js');
+      expect(indexFile).to.have.string("require('test-dummy-package')");
+    });
+    it('should leave the component as modified in bit-status', () => {
+      const status = helper.command.statusJson();
+      expect(status.modifiedComponents).to.have.lengthOf(1);
+    });
+    it('should install the new packages according to the added import statement', () => {
+      expect(output).to.have.string('+ test-dummy-package');
+    });
+  });
 });

scopes/component/apply/apply.main.runtime.ts

@@ -271,7 +271,7 @@ export class ApplyMain {
     const newIds: ComponentID[] = [];
     const updatedIds: ComponentID[] = [];
     await pMapSeries(snapDataPerComp, async (snapData) => {
-      const existing = this.workspace.bitMap.getBitmapEntryIfExist(snapData.componentId);
+      const existing = this.workspace.bitMap.getBitmapEntryIfExist(snapData.componentId, { ignoreVersion: true });
       if (existing && snapData.isNew) {
         throw new Error(
           `component "${snapData.componentId.toString()}" already exists in the workspace. please remove the "isNew" prop`
@@ -310,6 +310,9 @@ export class ApplyMain {
       }
     });
 
+    // without this, when adding new import statements to a component, the installation doesn't pick them up
+    await this.workspace.clearCache();
+
     await this.install.install(undefined, {
       dedupe: true,
       import: false,

src/e2e-helper/e2e-command-helper.ts

@@ -837,6 +837,7 @@ export default class CommandHelper {
         }
       });
     });
+    // console.log('apply command', `bit apply '${JSON.stringify(data)}' ${options}`);
     return this.runCmd(`bit apply '${JSON.stringify(data)}' ${options}`);
   }
   diff(id = '') {