@teambit/workspace 0.0.829 → 0.0.830

package/dist/pick-outdated-pkgs.spec.js

@@ -57,6 +57,63 @@ describe('makeOutdatedPkgChoices', () => {
       targetField: 'peerDependencies'
     }]); // @ts-ignore
 
+    expect(choices).toMatchSnapshot();
+  });
+  it('should group component model updates of the same dependency', () => {
+    const choices = (0, _pickOutdatedPkgs().makeOutdatedPkgChoices)([{
+      name: 'foo',
+      currentRange: '1.0.0',
+      latestRange: '2.0.0',
+      source: 'component-model',
+      componentId: 'comp1',
+      targetField: 'devDependencies'
+    }, {
+      name: 'foo',
+      currentRange: '1.1.0',
+      latestRange: '2.0.0',
+      source: 'component-model',
+      componentId: 'comp2',
+      targetField: 'dependencies'
+    }]); // @ts-ignore
+
+    expect(choices).toMatchSnapshot();
+  });
+  it("should group component model updates of the same dependency and use * as current range when can't compare ranges", () => {
+    const choices = (0, _pickOutdatedPkgs().makeOutdatedPkgChoices)([{
+      name: 'foo',
+      currentRange: '<=10.0.0',
+      latestRange: '2.0.0',
+      source: 'component-model',
+      componentId: 'comp1',
+      targetField: 'dependencies'
+    }, {
+      name: 'foo',
+      currentRange: '1.1.0',
+      latestRange: '2.0.0',
+      source: 'component-model',
+      componentId: 'comp2',
+      targetField: 'dependencies'
+    }]); // @ts-ignore
+
+    expect(choices).toMatchSnapshot();
+  });
+  it('should group component model updates of the same dependency and display the current range when all components use the same range', () => {
+    const choices = (0, _pickOutdatedPkgs().makeOutdatedPkgChoices)([{
+      name: 'foo',
+      currentRange: '^1.2.3',
+      latestRange: '2.0.0',
+      source: 'component-model',
+      componentId: 'comp1',
+      targetField: 'dependencies'
+    }, {
+      name: 'foo',
+      currentRange: '^1.2.3',
+      latestRange: '2.0.0',
+      source: 'component-model',
+      componentId: 'comp2',
+      targetField: 'dependencies'
+    }]); // @ts-ignore
+
     expect(choices).toMatchSnapshot();
   });
 });

package/dist/pick-outdated-pkgs.spec.js.map

@@ -1 +1 @@
-{"version":3,"names":["describe","it","choices","makeOutdatedPkgChoices","name","currentRange","latestRange","source","targetField","expect","toMatchSnapshot","componentId","variantPattern"],"sources":["pick-outdated-pkgs.spec.ts"],"sourcesContent":["import { makeOutdatedPkgChoices } from './pick-outdated-pkgs';\n\ndescribe('makeOutdatedPkgChoices', () => {\n  it('should render choices in correct order', () => {\n    const choices = makeOutdatedPkgChoices([\n      {\n        name: 'zoo',\n        currentRange: '1.0.0',\n        latestRange: '1.1.0',\n        source: 'rootPolicy',\n        targetField: 'devDependencies',\n      },\n      {\n        name: 'qar',\n        currentRange: '1.0.0',\n        latestRange: '1.1.0',\n        source: 'rootPolicy',\n        targetField: 'dependencies',\n      },\n      {\n        name: 'foo',\n        currentRange: '1.0.0',\n        latestRange: '2.0.0',\n        source: 'rootPolicy',\n        targetField: 'dependencies',\n      },\n      {\n        name: 'bar',\n        currentRange: '1.0.0',\n        latestRange: '1.1.0',\n        source: 'rootPolicy',\n        targetField: 'peerDependencies',\n      },\n    ]);\n    // @ts-ignore\n    expect(choices).toMatchSnapshot();\n  });\n  it('should render choices with context information', () => {\n    const choices = makeOutdatedPkgChoices([\n      {\n        name: 'foo',\n        currentRange: '1.0.0',\n        latestRange: '2.0.0',\n        source: 'component',\n        componentId: 'comp1',\n        targetField: 'dependencies',\n      },\n      {\n        name: 'bar',\n        currentRange: '1.0.0',\n        latestRange: '1.1.0',\n        source: 'variants',\n        variantPattern: '{comp2}',\n        targetField: 'peerDependencies',\n      },\n    ]);\n    // @ts-ignore\n    expect(choices).toMatchSnapshot();\n  });\n});\n"],"mappings":";;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEAA,QAAQ,CAAC,wBAAD,EAA2B,MAAM;EACvCC,EAAE,CAAC,wCAAD,EAA2C,MAAM;IACjD,MAAMC,OAAO,GAAG,IAAAC,0CAAA,EAAuB,CACrC;MACEC,IAAI,EAAE,KADR;MAEEC,YAAY,EAAE,OAFhB;MAGEC,WAAW,EAAE,OAHf;MAIEC,MAAM,EAAE,YAJV;MAKEC,WAAW,EAAE;IALf,CADqC,EAQrC;MACEJ,IAAI,EAAE,KADR;MAEEC,YAAY,EAAE,OAFhB;MAGEC,WAAW,EAAE,OAHf;MAIEC,MAAM,EAAE,YAJV;MAKEC,WAAW,EAAE;IALf,CARqC,EAerC;MACEJ,IAAI,EAAE,KADR;MAEEC,YAAY,EAAE,OAFhB;MAGEC,WAAW,EAAE,OAHf;MAIEC,MAAM,EAAE,YAJV;MAKEC,WAAW,EAAE;IALf,CAfqC,EAsBrC;MACEJ,IAAI,EAAE,KADR;MAEEC,YAAY,EAAE,OAFhB;MAGEC,WAAW,EAAE,OAHf;MAIEC,MAAM,EAAE,YAJV;MAKEC,WAAW,EAAE;IALf,CAtBqC,CAAvB,CAAhB,CADiD,CA+BjD;;IACAC,MAAM,CAACP,OAAD,CAAN,CAAgBQ,eAAhB;EACD,CAjCC,CAAF;EAkCAT,EAAE,CAAC,gDAAD,EAAmD,MAAM;IACzD,MAAMC,OAAO,GAAG,IAAAC,0CAAA,EAAuB,CACrC;MACEC,IAAI,EAAE,KADR;MAEEC,YAAY,EAAE,OAFhB;MAGEC,WAAW,EAAE,OAHf;MAIEC,MAAM,EAAE,WAJV;MAKEI,WAAW,EAAE,OALf;MAMEH,WAAW,EAAE;IANf,CADqC,EASrC;MACEJ,IAAI,EAAE,KADR;MAEEC,YAAY,EAAE,OAFhB;MAGEC,WAAW,EAAE,OAHf;MAIEC,MAAM,EAAE,UAJV;MAKEK,cAAc,EAAE,SALlB;MAMEJ,WAAW,EAAE;IANf,CATqC,CAAvB,CAAhB,CADyD,CAmBzD;;IACAC,MAAM,CAACP,OAAD,CAAN,CAAgBQ,eAAhB;EACD,CArBC,CAAF;AAsBD,CAzDO,CAAR"}
+{"version":3,"names":["describe","it","choices","makeOutdatedPkgChoices","name","currentRange","latestRange","source","targetField","expect","toMatchSnapshot","componentId","variantPattern"],"sources":["pick-outdated-pkgs.spec.ts"],"sourcesContent":["import { makeOutdatedPkgChoices } from './pick-outdated-pkgs';\n\ndescribe('makeOutdatedPkgChoices', () => {\n  it('should render choices in correct order', () => {\n    const choices = makeOutdatedPkgChoices([\n      {\n        name: 'zoo',\n        currentRange: '1.0.0',\n        latestRange: '1.1.0',\n        source: 'rootPolicy',\n        targetField: 'devDependencies',\n      },\n      {\n        name: 'qar',\n        currentRange: '1.0.0',\n        latestRange: '1.1.0',\n        source: 'rootPolicy',\n        targetField: 'dependencies',\n      },\n      {\n        name: 'foo',\n        currentRange: '1.0.0',\n        latestRange: '2.0.0',\n        source: 'rootPolicy',\n        targetField: 'dependencies',\n      },\n      {\n        name: 'bar',\n        currentRange: '1.0.0',\n        latestRange: '1.1.0',\n        source: 'rootPolicy',\n        targetField: 'peerDependencies',\n      },\n    ]);\n    // @ts-ignore\n    expect(choices).toMatchSnapshot();\n  });\n  it('should render choices with context information', () => {\n    const choices = makeOutdatedPkgChoices([\n      {\n        name: 'foo',\n        currentRange: '1.0.0',\n        latestRange: '2.0.0',\n        source: 'component',\n        componentId: 'comp1',\n        targetField: 'dependencies',\n      },\n      {\n        name: 'bar',\n        currentRange: '1.0.0',\n        latestRange: '1.1.0',\n        source: 'variants',\n        variantPattern: '{comp2}',\n        targetField: 'peerDependencies',\n      },\n    ]);\n    // @ts-ignore\n    expect(choices).toMatchSnapshot();\n  });\n  it('should group component model updates of the same dependency', () => {\n    const choices = makeOutdatedPkgChoices([\n      {\n        name: 'foo',\n        currentRange: '1.0.0',\n        latestRange: '2.0.0',\n        source: 'component-model',\n        componentId: 'comp1',\n        targetField: 'devDependencies',\n      },\n      {\n        name: 'foo',\n        currentRange: '1.1.0',\n        latestRange: '2.0.0',\n        source: 'component-model',\n        componentId: 'comp2',\n        targetField: 'dependencies',\n      },\n    ]);\n    // @ts-ignore\n    expect(choices).toMatchSnapshot();\n  });\n  it(\"should group component model updates of the same dependency and use * as current range when can't compare ranges\", () => {\n    const choices = makeOutdatedPkgChoices([\n      {\n        name: 'foo',\n        currentRange: '<=10.0.0',\n        latestRange: '2.0.0',\n        source: 'component-model',\n        componentId: 'comp1',\n        targetField: 'dependencies',\n      },\n      {\n        name: 'foo',\n        currentRange: '1.1.0',\n        latestRange: '2.0.0',\n        source: 'component-model',\n        componentId: 'comp2',\n        targetField: 'dependencies',\n      },\n    ]);\n    // @ts-ignore\n    expect(choices).toMatchSnapshot();\n  });\n  it('should group component model updates of the same dependency and display the current range when all components use the same range', () => {\n    const choices = makeOutdatedPkgChoices([\n      {\n        name: 'foo',\n        currentRange: '^1.2.3',\n        latestRange: '2.0.0',\n        source: 'component-model',\n        componentId: 'comp1',\n        targetField: 'dependencies',\n      },\n      {\n        name: 'foo',\n        currentRange: '^1.2.3',\n        latestRange: '2.0.0',\n        source: 'component-model',\n        componentId: 'comp2',\n        targetField: 'dependencies',\n      },\n    ]);\n    // @ts-ignore\n    expect(choices).toMatchSnapshot();\n  });\n});\n"],"mappings":"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"}

package/dist/workspace.js

@@ -2289,10 +2289,12 @@ needed-for: ${neededFor || '<unknown>'}`);
 
     const variantPoliciesByPatterns = this._variantPatternsToDepPolicesDict(variantPatterns);
 
+    const components = await this.list();
     const outdatedPkgs = await this.dependencyResolver.getOutdatedPkgsFromPolicies({
       rootDir: this.path,
       variantPoliciesByPatterns,
-      componentPoliciesById
+      componentPoliciesById,
+      components
     });
     let outdatedPkgsToUpdate;