@teambit/merge-lanes 1.0.1210 → 1.0.1212

package/dist/merge-lanes.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/merge-lanes.spec.js

@@ -0,0 +1,133 @@
+"use strict";
+
+function _chai() {
+  const data = require("chai");
+  _chai = function () {
+    return data;
+  };
+  return data;
+}
+function _harmonyTesting() {
+  const data = require("@teambit/harmony.testing.load-aspect");
+  _harmonyTesting = function () {
+    return data;
+  };
+  return data;
+}
+function _remove() {
+  const data = require("@teambit/remove");
+  _remove = function () {
+    return data;
+  };
+  return data;
+}
+function _snapping() {
+  const data = require("@teambit/snapping");
+  _snapping = function () {
+    return data;
+  };
+  return data;
+}
+function _workspace() {
+  const data = require("@teambit/workspace");
+  _workspace = function () {
+    return data;
+  };
+  return data;
+}
+function _export() {
+  const data = require("@teambit/export");
+  _export = function () {
+    return data;
+  };
+  return data;
+}
+function _lanes() {
+  const data = require("@teambit/lanes");
+  _lanes = function () {
+    return data;
+  };
+  return data;
+}
+function _workspaceTesting() {
+  const data = require("@teambit/workspace.testing.mock-workspace");
+  _workspaceTesting = function () {
+    return data;
+  };
+  return data;
+}
+function _componentTesting() {
+  const data = require("@teambit/component.testing.mock-components");
+  _componentTesting = function () {
+    return data;
+  };
+  return data;
+}
+function _mergeLanes() {
+  const data = require("./merge-lanes.aspect");
+  _mergeLanes = function () {
+    return data;
+  };
+  return data;
+}
+describe('MergeLanesAspect', function () {
+  this.timeout(0);
+  describe('create comps on a lane then switch to main with --head', () => {
+    let lanes;
+    let workspaceData;
+    let snapping;
+    let laneId;
+    let harmony;
+    before(async () => {
+      workspaceData = (0, _workspaceTesting().mockWorkspace)();
+      const {
+        workspacePath
+      } = workspaceData;
+      await (0, _componentTesting().mockComponents)(workspacePath);
+      harmony = await (0, _harmonyTesting().loadManyAspects)([_snapping().SnappingAspect, _export().ExportAspect, _remove().RemoveAspect, _workspace().WorkspaceAspect, _lanes().LanesAspect], workspaceData.workspacePath);
+      lanes = harmony.get(_lanes().LanesAspect.id);
+      await lanes.createLane('stage');
+      const currentLaneId = lanes.getCurrentLaneId();
+      if (!currentLaneId) throw new Error('unable to get the current lane-id');
+      laneId = currentLaneId;
+      snapping = harmony.get(_snapping().SnappingAspect.id);
+      await snapping.snap({
+        build: false
+      });
+      const exporter = harmony.get(_export().ExportAspect.id);
+      await exporter.export();
+
+      // in another workspace, merge the lane into main.
+      const workspaceData2 = (0, _workspaceTesting().mockWorkspace)({
+        bareScopeName: workspaceData.remoteScopeName
+      });
+      const harmony2 = await (0, _harmonyTesting().loadManyAspects)([_snapping().SnappingAspect, _export().ExportAspect, _remove().RemoveAspect, _workspace().WorkspaceAspect, _lanes().LanesAspect, _mergeLanes().MergeLanesAspect], workspaceData2.workspacePath);
+      const mergeLanes2 = harmony2.get(_mergeLanes().MergeLanesAspect.id);
+      const lanes2 = harmony2.get(_lanes().LanesAspect.id);
+      const currentLaneId2 = lanes2.getCurrentLaneId();
+      await mergeLanes2.mergeLane(laneId, currentLaneId2, {
+        mergeStrategy: 'manual',
+        skipDependencyInstallation: true
+      });
+      const export2 = harmony2.get(_export().ExportAspect.id);
+      await export2.export();
+
+      // reload harmony, otherwise, the "lanes" aspect has the workspace of harmony2.
+      harmony = await (0, _harmonyTesting().loadManyAspects)([_lanes().LanesAspect], workspaceData.workspacePath);
+      lanes = harmony.get(_lanes().LanesAspect.id);
+      await lanes.switchLanes('main', {
+        skipDependencyInstallation: true
+      });
+    });
+    after(async () => {
+      await (0, _workspaceTesting().destroyWorkspace)(workspaceData);
+    });
+    it('the components should be available on main', () => {
+      const workspace = harmony.get(_workspace().WorkspaceAspect.id);
+      const ids = workspace.listIds();
+      (0, _chai().expect)(ids.length).to.equal(1);
+    });
+  });
+});
+
+//# sourceMappingURL=merge-lanes.spec.js.map

package/dist/merge-lanes.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_chai","data","require","_harmonyTesting","_remove","_snapping","_workspace","_export","_lanes","_workspaceTesting","_componentTesting","_mergeLanes","describe","timeout","lanes","workspaceData","snapping","laneId","harmony","before","mockWorkspace","workspacePath","mockComponents","loadManyAspects","SnappingAspect","ExportAspect","RemoveAspect","WorkspaceAspect","LanesAspect","get","id","createLane","currentLaneId","getCurrentLaneId","Error","snap","build","exporter","export","workspaceData2","bareScopeName","remoteScopeName","harmony2","MergeLanesAspect","mergeLanes2","lanes2","currentLaneId2","mergeLane","mergeStrategy","skipDependencyInstallation","export2","switchLanes","after","destroyWorkspace","it","workspace","ids","listIds","expect","length","to","equal"],"sources":["merge-lanes.spec.ts"],"sourcesContent":["import { expect } from 'chai';\nimport type { Harmony } from '@teambit/harmony';\nimport { loadManyAspects } from '@teambit/harmony.testing.load-aspect';\nimport { RemoveAspect } from '@teambit/remove';\nimport type { SnappingMain } from '@teambit/snapping';\nimport { SnappingAspect } from '@teambit/snapping';\nimport type { Workspace } from '@teambit/workspace';\nimport { WorkspaceAspect } from '@teambit/workspace';\nimport type { ExportMain } from '@teambit/export';\nimport { ExportAspect } from '@teambit/export';\nimport type { LaneId } from '@teambit/lane-id';\nimport type { LanesMain } from '@teambit/lanes';\nimport { LanesAspect } from '@teambit/lanes';\nimport type { WorkspaceData } from '@teambit/workspace.testing.mock-workspace';\nimport { mockWorkspace, destroyWorkspace } from '@teambit/workspace.testing.mock-workspace';\nimport { mockComponents } from '@teambit/component.testing.mock-components';\nimport type { MergeLanesMain } from './merge-lanes.main.runtime';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\n\ndescribe('MergeLanesAspect', function () {\n  this.timeout(0);\n\n  describe('create comps on a lane then switch to main with --head', () => {\n    let lanes: LanesMain;\n    let workspaceData: WorkspaceData;\n    let snapping: SnappingMain;\n    let laneId: LaneId;\n    let harmony: Harmony;\n    before(async () => {\n      workspaceData = mockWorkspace();\n      const { workspacePath } = workspaceData;\n      await mockComponents(workspacePath);\n      harmony = await loadManyAspects(\n        [SnappingAspect, ExportAspect, RemoveAspect, WorkspaceAspect, LanesAspect],\n        workspaceData.workspacePath\n      );\n      lanes = harmony.get(LanesAspect.id);\n      await lanes.createLane('stage');\n\n      const currentLaneId = lanes.getCurrentLaneId();\n      if (!currentLaneId) throw new Error('unable to get the current lane-id');\n      laneId = currentLaneId;\n\n      snapping = harmony.get(SnappingAspect.id);\n      await snapping.snap({ build: false });\n      const exporter: ExportMain = harmony.get(ExportAspect.id);\n      await exporter.export();\n\n      // in another workspace, merge the lane into main.\n      const workspaceData2 = mockWorkspace({ bareScopeName: workspaceData.remoteScopeName });\n      const harmony2 = await loadManyAspects(\n        [SnappingAspect, ExportAspect, RemoveAspect, WorkspaceAspect, LanesAspect, MergeLanesAspect],\n        workspaceData2.workspacePath\n      );\n      const mergeLanes2 = harmony2.get<MergeLanesMain>(MergeLanesAspect.id);\n      const lanes2 = harmony2.get<LanesMain>(LanesAspect.id);\n      const currentLaneId2 = lanes2.getCurrentLaneId() as LaneId;\n      await mergeLanes2.mergeLane(laneId, currentLaneId2, {\n        mergeStrategy: 'manual',\n        skipDependencyInstallation: true,\n      });\n      const export2 = harmony2.get<ExportMain>(ExportAspect.id);\n      await export2.export();\n\n      // reload harmony, otherwise, the \"lanes\" aspect has the workspace of harmony2.\n      harmony = await loadManyAspects([LanesAspect], workspaceData.workspacePath);\n      lanes = harmony.get(LanesAspect.id);\n      await lanes.switchLanes('main', { skipDependencyInstallation: true });\n    });\n    after(async () => {\n      await destroyWorkspace(workspaceData);\n    });\n    it('the components should be available on main', () => {\n      const workspace: Workspace = harmony.get(WorkspaceAspect.id);\n      const ids = workspace.listIds();\n      expect(ids.length).to.equal(1);\n    });\n  });\n});\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.1210",
+  "version": "1.0.1212",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.1210"
+    "version": "1.0.1212"
   },
   "dependencies": {
     "chalk": "4.1.2",
@@ -15,41 +15,47 @@
     "yesno": "0.4.0",
     "lodash": "4.17.21",
     "p-map-series": "2.1.0",
+    "@teambit/express": "0.0.1500",
+    "@teambit/logger": "0.0.1494",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/legacy.bit-map": "0.0.228",
-    "@teambit/legacy.consumer": "0.0.171",
-    "@teambit/legacy.scope": "0.0.171",
-    "@teambit/component.modules.merge-helper": "0.0.114",
     "@teambit/legacy.constants": "0.0.46",
     "@teambit/harmony": "0.4.12",
     "@teambit/component-id": "1.2.4",
     "@teambit/component-version": "1.0.4",
-    "@teambit/component.snap-distance": "0.0.172",
-    "@teambit/harmony.modules.get-basic-log": "0.0.172",
-    "@teambit/lane-id": "0.0.312",
-    "@teambit/express": "0.0.1500",
-    "@teambit/logger": "0.0.1494",
-    "@teambit/objects": "0.0.695",
-    "@teambit/scope": "1.0.1188",
-    "@teambit/checkout": "1.0.1190",
-    "@teambit/cli": "0.0.1401",
-    "@teambit/config-store": "0.0.282",
-    "@teambit/merging": "1.0.1192",
-    "@teambit/remove": "1.0.1188",
-    "@teambit/config-merger": "0.0.1055",
-    "@teambit/export": "1.0.1188",
     "@teambit/harmony.modules.runtimes": "0.0.1",
-    "@teambit/importer": "1.0.1188",
-    "@teambit/lanes": "1.0.1210",
-    "@teambit/workspace": "1.0.1188"
+    "@teambit/lane-id": "0.0.312",
+    "@teambit/legacy.bit-map": "0.0.229",
+    "@teambit/legacy.consumer": "0.0.172",
+    "@teambit/legacy.scope": "0.0.172",
+    "@teambit/objects": "0.0.696",
+    "@teambit/scope": "1.0.1189",
+    "@teambit/checkout": "1.0.1191",
+    "@teambit/cli": "0.0.1402",
+    "@teambit/component.modules.merge-helper": "0.0.115",
+    "@teambit/config-store": "0.0.283",
+    "@teambit/merging": "1.0.1193",
+    "@teambit/remove": "1.0.1189",
+    "@teambit/component.snap-distance": "0.0.173",
+    "@teambit/config-merger": "0.0.1056",
+    "@teambit/export": "1.0.1189",
+    "@teambit/harmony.modules.get-basic-log": "0.0.173",
+    "@teambit/importer": "1.0.1189",
+    "@teambit/lanes": "1.0.1212",
+    "@teambit/workspace": "1.0.1189"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
     "@types/lodash": "4.14.165",
     "@types/mocha": "9.1.0",
-    "@teambit/harmony.envs.core-aspect-env": "2.1.1"
+    "@teambit/harmony.envs.core-aspect-env": "2.1.1",
+    "@teambit/component.testing.mock-components": "0.0.446",
+    "@teambit/harmony.testing.load-aspect": "0.0.440",
+    "@teambit/snapping": "1.0.1189",
+    "@teambit/workspace.testing.mock-workspace": "0.0.254"
+  },
+  "peerDependencies": {
+    "chai": "5.2.1"
   },
-  "peerDependencies": {},
   "license": "Apache-2.0",
   "optionalDependencies": {},
   "peerDependenciesMeta": {},