@teambit/lanes 1.0.65 → 1.0.67

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.
package/dist/esm.d.mts ADDED
@@ -0,0 +1,4 @@
1
+ export const LanesAspect: any;
2
+ export const LanesModel: any;
3
+ export default cjsModule;
4
+ import cjsModule from "./index.js";
package/dist/esm.mjs ADDED
@@ -0,0 +1,7 @@
1
+ // eslint-disable-next-line import/no-unresolved
2
+ import cjsModule from './index.js';
3
+
4
+ export const LanesAspect = cjsModule.LanesAspect;
5
+ export const LanesModel = cjsModule.LanesModel;
6
+
7
+ export default cjsModule;
package/dist/index.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { LanesAspect } from './lanes.aspect';
2
2
  export type { LanesMain, Lane } from './lanes.main.runtime';
3
- export { LanesModel, LanesQuery } from '@teambit/lanes.ui.models.lanes-model';
3
+ export type { LanesQuery } from '@teambit/lanes.ui.models.lanes-model';
4
+ export { LanesModel } from '@teambit/lanes.ui.models.lanes-model';
4
5
  export type { LanesUI, LaneCompareProps, LaneProviderIgnoreSlot } from './lanes.ui.runtime';
5
6
  export default LanesAspect;
6
7
  export { LanesAspect };
package/dist/index.js CHANGED
@@ -15,12 +15,6 @@ Object.defineProperty(exports, "LanesModel", {
15
15
  return _lanesUiModels().LanesModel;
16
16
  }
17
17
  });
18
- Object.defineProperty(exports, "LanesQuery", {
19
- enumerable: true,
20
- get: function () {
21
- return _lanesUiModels().LanesQuery;
22
- }
23
- });
24
18
  exports.default = void 0;
25
19
  function _lanes() {
26
20
  const data = require("./lanes.aspect");
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_lanes","data","require","_lanesUiModels","_default","exports","default","LanesAspect"],"sources":["index.ts"],"sourcesContent":["import { LanesAspect } from './lanes.aspect';\n\nexport type { LanesMain, Lane } from './lanes.main.runtime';\nexport { LanesModel, LanesQuery } from '@teambit/lanes.ui.models.lanes-model';\nexport type { LanesUI, LaneCompareProps, LaneProviderIgnoreSlot } from './lanes.ui.runtime';\nexport default LanesAspect;\nexport { LanesAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAE,eAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,cAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA8E,IAAAG,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAE/DC,oBAAW"}
1
+ {"version":3,"names":["_lanes","data","require","_lanesUiModels","_default","exports","default","LanesAspect"],"sources":["index.ts"],"sourcesContent":["import { LanesAspect } from './lanes.aspect';\n\nexport type { LanesMain, Lane } from './lanes.main.runtime';\nexport type { LanesQuery } from '@teambit/lanes.ui.models.lanes-model';\nexport { LanesModel } from '@teambit/lanes.ui.models.lanes-model';\nexport type { LanesUI, LaneCompareProps, LaneProviderIgnoreSlot } from './lanes.ui.runtime';\nexport default LanesAspect;\nexport { LanesAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA,SAAAE,eAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,cAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAkE,IAAAG,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEnDC,oBAAW"}
@@ -1,5 +1,5 @@
1
- import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@1.0.65/dist/lanes.composition.js';
2
- import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@1.0.65/dist/lanes.docs.mdx';
1
+ import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@1.0.67/dist/lanes.composition.js';
2
+ import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@1.0.67/dist/lanes.docs.mdx';
3
3
 
4
4
  export const compositions = [compositions_0];
5
5
  export const overview = [overview_0];
@@ -97,7 +97,7 @@ class LaneSwitcher {
97
97
  throw new (_bitError().BitError)('error: use --pattern only when the workspace is empty');
98
98
  }
99
99
  const allIds = await this.workspace.resolveMultipleComponentIds(this.switchProps.ids || []);
100
- const patternIds = this.workspace.scope.filterIdsFromPoolIdsByPattern(this.switchProps.pattern, allIds);
100
+ const patternIds = await this.workspace.filterIdsFromPoolIdsByPattern(this.switchProps.pattern, allIds);
101
101
  this.switchProps.ids = patternIds.map(id => id);
102
102
  }
103
103
  }
@@ -1 +1 @@
1
- {"version":3,"names":["_laneId","data","require","_componentId","_bitError","_createLane","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","obj","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","LaneSwitcher","constructor","workspace","logger","switchProps","checkoutProps","Lanes","consumer","switch","setStatusLine","isOnMain","throwForStagedComponents","populateSwitchProps","bitMapIds","bitmapIdsFromCurrentLaneIncludeRemoved","idsToSwitch","ids","idsWithVersion","map","id","bitMapId","searchWithoutVersion","resolveMultipleComponentIds","allowAddingComponentsFromScope","versionPerId","lane","laneToSwitchTo","results","checkout","saveLanesData","onDestroy","laneId","scope","lanes","parseLaneIdFromString","laneName","localLane","loadLane","mainIds","getIdsOfDefaultLane","isDefault","populatePropsAccordingToDefaultLane","laneIds","populatePropsAccordingToLocalLane","populatePropsAccordingToRemoteLane","idsOnLaneOnly","find","i","isEqualWithoutVersion","idsOnMainOnly","laneBitIds","pattern","bitMap","getAllBitIdsFromAllLanes","BitError","allIds","patternIds","filterIdsFromPoolIdsByPattern","remoteLaneId","laneIdToSwitchTo","debug","toString","throwForSwitchingToCurrentLane","remoteLane","fetchLaneWithItsComponents","name","localTrackedLane","getAliasByLaneId","components","l","changeVersion","head","LaneId","from","DEFAULT_LANE","toLaneId","c","getCurrentLaneId","isEqual","laneIdStr","_this$laneToSwitchTo","localLaneName","alias","trackLane","remoteScope","setCurrentLane","isNew","syncWithIds","ComponentIdList","fromArray","exports"],"sources":["switch-lanes.ts"],"sourcesContent":["import { Consumer } from '@teambit/legacy/dist/consumer';\nimport { LaneId, DEFAULT_LANE } from '@teambit/lane-id';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { ApplyVersionResults } from '@teambit/merging';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { CheckoutPropsLegacy, CheckoutProps } from '@teambit/checkout';\nimport { Workspace } from '@teambit/workspace';\nimport { Logger } from '@teambit/logger';\nimport { BitError } from '@teambit/bit-error';\nimport { LanesMain } from './lanes.main.runtime';\nimport { throwForStagedComponents } from './create-lane';\n\nexport type SwitchProps = {\n laneName: string;\n ids?: ComponentID[];\n laneBitIds?: ComponentID[]; // only needed for the deprecated onLanesOnly prop. once this prop is removed, this prop can be removed as well.\n pattern?: string;\n existingOnWorkspaceOnly: boolean;\n remoteLane?: Lane;\n localTrackedLane?: string;\n alias?: string;\n};\n\nexport class LaneSwitcher {\n private consumer: Consumer;\n private laneIdToSwitchTo: LaneId; // populated by `this.populateSwitchProps()`\n private laneToSwitchTo: Lane | undefined; // populated by `this.populateSwitchProps()`, if default-lane, it's undefined\n constructor(\n private workspace: Workspace,\n private logger: Logger,\n private switchProps: SwitchProps,\n private checkoutProps: CheckoutPropsLegacy,\n private Lanes: LanesMain\n ) {\n this.consumer = this.workspace.consumer;\n }\n\n async switch(): Promise<ApplyVersionResults> {\n this.logger.setStatusLine(`switching lanes`);\n if (this.workspace.isOnMain()) {\n await throwForStagedComponents(this.consumer);\n }\n await this.populateSwitchProps();\n const bitMapIds = this.workspace.consumer.bitmapIdsFromCurrentLaneIncludeRemoved;\n const idsToSwitch = this.switchProps.ids || [];\n const idsWithVersion = idsToSwitch.map((id) => {\n const bitMapId = bitMapIds.searchWithoutVersion(id);\n return bitMapId || id;\n });\n const ids = await this.workspace.resolveMultipleComponentIds(idsWithVersion);\n\n const checkoutProps: CheckoutProps = {\n ...this.checkoutProps,\n ids,\n allowAddingComponentsFromScope: true,\n versionPerId: await this.workspace.resolveMultipleComponentIds(idsToSwitch),\n lane: this.laneToSwitchTo,\n };\n\n const results = await this.Lanes.checkout.checkout(checkoutProps);\n\n await this.saveLanesData();\n await this.consumer.onDestroy('lane-switch');\n\n return results;\n }\n\n private async populateSwitchProps() {\n const laneId = await this.consumer.scope.lanes.parseLaneIdFromString(this.switchProps.laneName);\n\n const localLane = await this.consumer.scope.loadLane(laneId);\n const mainIds = await this.consumer.getIdsOfDefaultLane();\n if (laneId.isDefault()) {\n await this.populatePropsAccordingToDefaultLane();\n this.switchProps.ids = mainIds;\n } else {\n const laneIds = localLane\n ? this.populatePropsAccordingToLocalLane(localLane)\n : await this.populatePropsAccordingToRemoteLane(laneId);\n const idsOnLaneOnly = laneIds.filter((id) => !mainIds.find((i) => i.isEqualWithoutVersion(id)));\n const idsOnMainOnly = mainIds.filter((id) => !laneIds.find((i) => i.isEqualWithoutVersion(id)));\n this.switchProps.ids = [...idsOnMainOnly, ...laneIds];\n this.switchProps.laneBitIds = idsOnLaneOnly;\n }\n\n if (this.switchProps.pattern) {\n if (this.consumer.bitMap.getAllBitIdsFromAllLanes().length) {\n // if the workspace is not empty, it's possible that it has components from lane-x, and is now switching\n // partially to lane-y, while lane-y has the same components as lane-x. in which case, the user ends up with\n // an invalid state of components from lane-x and lane-y together.\n throw new BitError('error: use --pattern only when the workspace is empty');\n }\n const allIds = await this.workspace.resolveMultipleComponentIds(this.switchProps.ids || []);\n const patternIds = this.workspace.scope.filterIdsFromPoolIdsByPattern(this.switchProps.pattern, allIds);\n this.switchProps.ids = patternIds.map((id) => id);\n }\n }\n\n private async populatePropsAccordingToRemoteLane(remoteLaneId: LaneId): Promise<ComponentID[]> {\n this.laneIdToSwitchTo = remoteLaneId;\n this.logger.debug(`populatePropsAccordingToRemoteLane, remoteLaneId: ${remoteLaneId.toString()}`);\n this.throwForSwitchingToCurrentLane();\n const remoteLane = await this.Lanes.fetchLaneWithItsComponents(remoteLaneId);\n this.switchProps.laneName = remoteLaneId.name;\n this.switchProps.localTrackedLane = this.consumer.scope.lanes.getAliasByLaneId(remoteLaneId) || undefined;\n this.switchProps.remoteLane = remoteLane;\n this.laneToSwitchTo = remoteLane;\n this.logger.debug(`populatePropsAccordingToRemoteLane, completed`);\n return remoteLane.components.map((l) => l.id.changeVersion(l.head.toString()));\n }\n\n private async populatePropsAccordingToDefaultLane() {\n this.laneIdToSwitchTo = LaneId.from(DEFAULT_LANE, this.consumer.scope.name);\n this.throwForSwitchingToCurrentLane();\n }\n\n private populatePropsAccordingToLocalLane(localLane: Lane): ComponentID[] {\n this.laneIdToSwitchTo = localLane.toLaneId();\n this.laneToSwitchTo = localLane;\n this.throwForSwitchingToCurrentLane();\n return localLane.components.map((c) => c.id.changeVersion(c.head.toString()));\n }\n\n private throwForSwitchingToCurrentLane() {\n if (this.consumer.getCurrentLaneId().isEqual(this.laneIdToSwitchTo)) {\n const laneIdStr = this.laneIdToSwitchTo.isDefault()\n ? this.laneIdToSwitchTo.name\n : this.laneIdToSwitchTo.toString();\n throw new BitError(`already checked out to \"${laneIdStr}\".\nto be up to date with the remote lane, please run \"bit checkout head\"\"`);\n }\n }\n\n private async saveLanesData() {\n const localLaneName = this.switchProps.alias || this.laneIdToSwitchTo.name;\n if (this.switchProps.remoteLane) {\n if (!this.switchProps.localTrackedLane) {\n this.consumer.scope.lanes.trackLane({\n localLane: localLaneName,\n remoteLane: this.laneIdToSwitchTo.name,\n remoteScope: this.laneIdToSwitchTo.scope,\n });\n }\n }\n\n this.consumer.setCurrentLane(this.laneIdToSwitchTo, !this.laneToSwitchTo?.isNew);\n this.consumer.bitMap.syncWithIds(\n ComponentIdList.fromArray(this.switchProps.ids || []),\n ComponentIdList.fromArray(this.switchProps.laneBitIds || [])\n );\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"names":["_laneId","data","require","_componentId","_bitError","_createLane","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","obj","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","LaneSwitcher","constructor","workspace","logger","switchProps","checkoutProps","Lanes","consumer","switch","setStatusLine","isOnMain","throwForStagedComponents","populateSwitchProps","bitMapIds","bitmapIdsFromCurrentLaneIncludeRemoved","idsToSwitch","ids","idsWithVersion","map","id","bitMapId","searchWithoutVersion","resolveMultipleComponentIds","allowAddingComponentsFromScope","versionPerId","lane","laneToSwitchTo","results","checkout","saveLanesData","onDestroy","laneId","scope","lanes","parseLaneIdFromString","laneName","localLane","loadLane","mainIds","getIdsOfDefaultLane","isDefault","populatePropsAccordingToDefaultLane","laneIds","populatePropsAccordingToLocalLane","populatePropsAccordingToRemoteLane","idsOnLaneOnly","find","i","isEqualWithoutVersion","idsOnMainOnly","laneBitIds","pattern","bitMap","getAllBitIdsFromAllLanes","BitError","allIds","patternIds","filterIdsFromPoolIdsByPattern","remoteLaneId","laneIdToSwitchTo","debug","toString","throwForSwitchingToCurrentLane","remoteLane","fetchLaneWithItsComponents","name","localTrackedLane","getAliasByLaneId","components","l","changeVersion","head","LaneId","from","DEFAULT_LANE","toLaneId","c","getCurrentLaneId","isEqual","laneIdStr","_this$laneToSwitchTo","localLaneName","alias","trackLane","remoteScope","setCurrentLane","isNew","syncWithIds","ComponentIdList","fromArray","exports"],"sources":["switch-lanes.ts"],"sourcesContent":["import { Consumer } from '@teambit/legacy/dist/consumer';\nimport { LaneId, DEFAULT_LANE } from '@teambit/lane-id';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { ApplyVersionResults } from '@teambit/merging';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { CheckoutPropsLegacy, CheckoutProps } from '@teambit/checkout';\nimport { Workspace } from '@teambit/workspace';\nimport { Logger } from '@teambit/logger';\nimport { BitError } from '@teambit/bit-error';\nimport { LanesMain } from './lanes.main.runtime';\nimport { throwForStagedComponents } from './create-lane';\n\nexport type SwitchProps = {\n laneName: string;\n ids?: ComponentID[];\n laneBitIds?: ComponentID[]; // only needed for the deprecated onLanesOnly prop. once this prop is removed, this prop can be removed as well.\n pattern?: string;\n existingOnWorkspaceOnly: boolean;\n remoteLane?: Lane;\n localTrackedLane?: string;\n alias?: string;\n};\n\nexport class LaneSwitcher {\n private consumer: Consumer;\n private laneIdToSwitchTo: LaneId; // populated by `this.populateSwitchProps()`\n private laneToSwitchTo: Lane | undefined; // populated by `this.populateSwitchProps()`, if default-lane, it's undefined\n constructor(\n private workspace: Workspace,\n private logger: Logger,\n private switchProps: SwitchProps,\n private checkoutProps: CheckoutPropsLegacy,\n private Lanes: LanesMain\n ) {\n this.consumer = this.workspace.consumer;\n }\n\n async switch(): Promise<ApplyVersionResults> {\n this.logger.setStatusLine(`switching lanes`);\n if (this.workspace.isOnMain()) {\n await throwForStagedComponents(this.consumer);\n }\n await this.populateSwitchProps();\n const bitMapIds = this.workspace.consumer.bitmapIdsFromCurrentLaneIncludeRemoved;\n const idsToSwitch = this.switchProps.ids || [];\n const idsWithVersion = idsToSwitch.map((id) => {\n const bitMapId = bitMapIds.searchWithoutVersion(id);\n return bitMapId || id;\n });\n const ids = await this.workspace.resolveMultipleComponentIds(idsWithVersion);\n\n const checkoutProps: CheckoutProps = {\n ...this.checkoutProps,\n ids,\n allowAddingComponentsFromScope: true,\n versionPerId: await this.workspace.resolveMultipleComponentIds(idsToSwitch),\n lane: this.laneToSwitchTo,\n };\n\n const results = await this.Lanes.checkout.checkout(checkoutProps);\n\n await this.saveLanesData();\n await this.consumer.onDestroy('lane-switch');\n\n return results;\n }\n\n private async populateSwitchProps() {\n const laneId = await this.consumer.scope.lanes.parseLaneIdFromString(this.switchProps.laneName);\n\n const localLane = await this.consumer.scope.loadLane(laneId);\n const mainIds = await this.consumer.getIdsOfDefaultLane();\n if (laneId.isDefault()) {\n await this.populatePropsAccordingToDefaultLane();\n this.switchProps.ids = mainIds;\n } else {\n const laneIds = localLane\n ? this.populatePropsAccordingToLocalLane(localLane)\n : await this.populatePropsAccordingToRemoteLane(laneId);\n const idsOnLaneOnly = laneIds.filter((id) => !mainIds.find((i) => i.isEqualWithoutVersion(id)));\n const idsOnMainOnly = mainIds.filter((id) => !laneIds.find((i) => i.isEqualWithoutVersion(id)));\n this.switchProps.ids = [...idsOnMainOnly, ...laneIds];\n this.switchProps.laneBitIds = idsOnLaneOnly;\n }\n\n if (this.switchProps.pattern) {\n if (this.consumer.bitMap.getAllBitIdsFromAllLanes().length) {\n // if the workspace is not empty, it's possible that it has components from lane-x, and is now switching\n // partially to lane-y, while lane-y has the same components as lane-x. in which case, the user ends up with\n // an invalid state of components from lane-x and lane-y together.\n throw new BitError('error: use --pattern only when the workspace is empty');\n }\n const allIds = await this.workspace.resolveMultipleComponentIds(this.switchProps.ids || []);\n const patternIds = await this.workspace.filterIdsFromPoolIdsByPattern(this.switchProps.pattern, allIds);\n this.switchProps.ids = patternIds.map((id) => id);\n }\n }\n\n private async populatePropsAccordingToRemoteLane(remoteLaneId: LaneId): Promise<ComponentID[]> {\n this.laneIdToSwitchTo = remoteLaneId;\n this.logger.debug(`populatePropsAccordingToRemoteLane, remoteLaneId: ${remoteLaneId.toString()}`);\n this.throwForSwitchingToCurrentLane();\n const remoteLane = await this.Lanes.fetchLaneWithItsComponents(remoteLaneId);\n this.switchProps.laneName = remoteLaneId.name;\n this.switchProps.localTrackedLane = this.consumer.scope.lanes.getAliasByLaneId(remoteLaneId) || undefined;\n this.switchProps.remoteLane = remoteLane;\n this.laneToSwitchTo = remoteLane;\n this.logger.debug(`populatePropsAccordingToRemoteLane, completed`);\n return remoteLane.components.map((l) => l.id.changeVersion(l.head.toString()));\n }\n\n private async populatePropsAccordingToDefaultLane() {\n this.laneIdToSwitchTo = LaneId.from(DEFAULT_LANE, this.consumer.scope.name);\n this.throwForSwitchingToCurrentLane();\n }\n\n private populatePropsAccordingToLocalLane(localLane: Lane): ComponentID[] {\n this.laneIdToSwitchTo = localLane.toLaneId();\n this.laneToSwitchTo = localLane;\n this.throwForSwitchingToCurrentLane();\n return localLane.components.map((c) => c.id.changeVersion(c.head.toString()));\n }\n\n private throwForSwitchingToCurrentLane() {\n if (this.consumer.getCurrentLaneId().isEqual(this.laneIdToSwitchTo)) {\n const laneIdStr = this.laneIdToSwitchTo.isDefault()\n ? this.laneIdToSwitchTo.name\n : this.laneIdToSwitchTo.toString();\n throw new BitError(`already checked out to \"${laneIdStr}\".\nto be up to date with the remote lane, please run \"bit checkout head\"\"`);\n }\n }\n\n private async saveLanesData() {\n const localLaneName = this.switchProps.alias || this.laneIdToSwitchTo.name;\n if (this.switchProps.remoteLane) {\n if (!this.switchProps.localTrackedLane) {\n this.consumer.scope.lanes.trackLane({\n localLane: localLaneName,\n remoteLane: this.laneIdToSwitchTo.name,\n remoteScope: this.laneIdToSwitchTo.scope,\n });\n }\n }\n\n this.consumer.setCurrentLane(this.laneIdToSwitchTo, !this.laneToSwitchTo?.isNew);\n this.consumer.bitMap.syncWithIds(\n ComponentIdList.fromArray(this.switchProps.ids || []),\n ComponentIdList.fromArray(this.switchProps.laneBitIds || [])\n );\n }\n}\n"],"mappings":"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"}
package/esm.mjs ADDED
@@ -0,0 +1,7 @@
1
+ // eslint-disable-next-line import/no-unresolved
2
+ import cjsModule from './index.js';
3
+
4
+ export const LanesAspect = cjsModule.LanesAspect;
5
+ export const LanesModel = cjsModule.LanesModel;
6
+
7
+ export default cjsModule;
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/lanes",
3
- "version": "1.0.65",
3
+ "version": "1.0.67",
4
4
  "homepage": "https://bit.cloud/teambit/lanes/lanes",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.lanes",
8
8
  "name": "lanes",
9
- "version": "1.0.65"
9
+ "version": "1.0.67"
10
10
  },
11
11
  "dependencies": {
12
12
  "lodash": "4.17.21",
@@ -38,24 +38,24 @@
38
38
  "@teambit/ui-foundation.ui.menu": "0.0.502",
39
39
  "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.506",
40
40
  "@teambit/ui-foundation.ui.react-router.use-query": "0.0.501",
41
- "@teambit/scope": "1.0.65",
42
- "@teambit/snapping": "1.0.65",
43
- "@teambit/workspace": "1.0.65",
44
- "@teambit/cli": "0.0.822",
45
- "@teambit/express": "0.0.921",
46
- "@teambit/logger": "0.0.915",
47
- "@teambit/graphql": "1.0.65",
48
- "@teambit/checkout": "1.0.65",
49
- "@teambit/component-compare": "1.0.65",
50
- "@teambit/component-writer": "1.0.65",
51
- "@teambit/component": "1.0.65",
52
- "@teambit/export": "1.0.65",
53
- "@teambit/importer": "1.0.65",
41
+ "@teambit/scope": "1.0.67",
42
+ "@teambit/snapping": "1.0.67",
43
+ "@teambit/workspace": "1.0.67",
44
+ "@teambit/cli": "0.0.824",
45
+ "@teambit/express": "0.0.923",
46
+ "@teambit/logger": "0.0.917",
47
+ "@teambit/graphql": "1.0.67",
48
+ "@teambit/checkout": "1.0.67",
49
+ "@teambit/component-compare": "1.0.67",
50
+ "@teambit/component-writer": "1.0.67",
51
+ "@teambit/component": "1.0.67",
52
+ "@teambit/export": "1.0.67",
53
+ "@teambit/importer": "1.0.67",
54
54
  "@teambit/lanes.entities.lane-diff": "0.0.164",
55
- "@teambit/lanes.modules.diff": "0.0.437",
56
- "@teambit/merging": "1.0.65",
57
- "@teambit/remove": "1.0.65",
58
- "@teambit/ui": "1.0.65"
55
+ "@teambit/lanes.modules.diff": "0.0.438",
56
+ "@teambit/merging": "1.0.67",
57
+ "@teambit/remove": "1.0.67",
58
+ "@teambit/ui": "1.0.67"
59
59
  },
60
60
  "devDependencies": {
61
61
  "@types/lodash": "4.14.165",
@@ -67,13 +67,13 @@
67
67
  "@types/react-dom": "^17.0.5",
68
68
  "@types/jest": "^26.0.0",
69
69
  "@types/testing-library__jest-dom": "5.9.5",
70
- "@teambit/component.testing.mock-components": "0.0.174",
71
- "@teambit/harmony.testing.load-aspect": "0.0.173",
70
+ "@teambit/component.testing.mock-components": "0.0.175",
71
+ "@teambit/harmony.testing.load-aspect": "0.0.174",
72
72
  "@teambit/workspace.testing.mock-workspace": "0.0.18"
73
73
  },
74
74
  "peerDependencies": {
75
75
  "react-router-dom": "^6.0.0",
76
- "@teambit/legacy": "1.0.605",
76
+ "@teambit/legacy": "1.0.607",
77
77
  "react": "^16.8.0 || ^17.0.0",
78
78
  "react-dom": "^16.8.0 || ^17.0.0"
79
79
  },