@teambit/merge-lanes 1.0.754 → 1.0.755

package/dist/last-merged.js

@@ -46,13 +46,6 @@ function _legacy() {
   };
   return data;
 }
-function _legacyCli() {
-  const data = require("@teambit/legacy.cli.prompts");
-  _legacyCli = function () {
-    return data;
-  };
-  return data;
-}
 function _objects() {
   const data = require("@teambit/objects");
   _objects = function () {
@@ -75,6 +68,11 @@ function _bitError() {
   return data;
 }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+class PromptCanceled extends _bitError().BitError {
+  constructor() {
+    super(_chalk().default.yellow('operation aborted'));
+  }
+}
 const LAST_MERGED_LANE_FILENAME = 'lane';
 const LAST_MERGED_BITMAP_FILENAME = 'bitmap';
 class LastMerged {
@@ -201,7 +199,7 @@ This action is irreversible.
 ${_chalk().default.bold('Do you want to continue? [yes(y)/no(n)]')}`
     });
     if (!ok) {
-      throw new (_legacyCli().PromptCanceled)();
+      throw new PromptCanceled();
     }
   }
   async getLastMergedLaneContentIfExists() {

package/dist/last-merged.js.map

@@ -1 +1 @@
-{"version":3,"names":["_path","data","_interopRequireDefault","require","_tempy","_fsExtra","_yesno","_chalk","_legacy","_legacyCli","_objects","_legacy2","_bitError","e","__esModule","default","LAST_MERGED_LANE_FILENAME","LAST_MERGED_BITMAP_FILENAME","LastMerged","constructor","scope","consumer","logger","path","getLastMergedPath","takeSnapshot","currentLane","copyOfCurrentLane","clone","undefined","copyOfBitmap","tempy","file","copyOfWorkspaceJsonc","copyOfStagedSnaps","fs","copyFile","bitMap","mapPath","config","stagedSnaps","isEmpty","StagedSnaps","getPath","stagedConfig","getStagedConfig","copyOfStagedConfig","filePath","persistSnapshot","snapshot","remove","ensureDir","getLastMergedBitmapPath","getLastMergedWorkspacePath","compressed","compress","outputFile","getLastMergedLanePath","getLastMergedStagedSnapsPath","getLastMergedStagedConfigPath","restoreLaneObjectFromLastMerged","pathExistsSync","BitError","lastLane","getLastMergedLaneContentIfExists","laneFromBackup","BitObject","parseObject","legacyScope","objects","writeObjectsToTheFS","restoreFromLastMerged","mergeAbortOpts","previousBitmapBuffer","readFile","previousBitmap","BitMap","loadFromContentWithoutLoadingFiles","currentRootDirs","getAllTrackDirs","previousRootDirs","compDirsToRemove","Object","keys","filter","dir","silent","mergeAbortPrompt","Promise","all","map","deleteFile","dirsToRemove","clearStatusLine","dirsToRemoveStr","length","join","ok","yesno","question","chalk","bold","PromptCanceled","filename","getFileContentIfExist","err","code","exports"],"sources":["last-merged.ts"],"sourcesContent":["import path from 'path';\nimport tempy from 'tempy';\nimport fs from 'fs-extra';\nimport yesno from 'yesno';\nimport chalk from 'chalk';\nimport { BitMap } from '@teambit/legacy.bit-map';\nimport { PromptCanceled } from '@teambit/legacy.cli.prompts';\nimport type { ScopeMain } from '@teambit/scope';\nimport type { Lane } from '@teambit/objects';\nimport { BitObject } from '@teambit/objects';\nimport { StagedSnaps } from '@teambit/legacy.scope';\nimport type { Consumer } from '@teambit/legacy.consumer';\nimport { BitError } from '@teambit/bit-error';\nimport type { Logger } from '@teambit/logger';\nimport type { MergeAbortOpts } from './merge-abort.cmd';\n\nconst LAST_MERGED_LANE_FILENAME = 'lane';\nconst LAST_MERGED_BITMAP_FILENAME = 'bitmap';\n\ntype Snapshot = {\n  copyOfCurrentLane?: Lane;\n  copyOfBitmap: string;\n  copyOfWorkspaceJsonc: string;\n  copyOfStagedSnaps?: string;\n  copyOfStagedConfig?: string;\n};\n\nexport class LastMerged {\n  constructor(\n    private scope: ScopeMain,\n    private consumer: Consumer,\n    private logger: Logger\n  ) {}\n\n  get path() {\n    return this.scope.getLastMergedPath();\n  }\n\n  async takeSnapshot(currentLane?: Lane | null): Promise<Snapshot> {\n    const consumer = this.consumer;\n    const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;\n    const copyOfBitmap = tempy.file();\n    const copyOfWorkspaceJsonc = tempy.file();\n    let copyOfStagedSnaps: string | undefined;\n    await fs.copyFile(consumer.bitMap.mapPath, copyOfBitmap);\n    await fs.copyFile(consumer.config.path, copyOfWorkspaceJsonc);\n    if (!consumer.scope.stagedSnaps.isEmpty()) {\n      copyOfStagedSnaps = tempy.file();\n      await fs.copyFile(StagedSnaps.getPath(consumer.scope.path), copyOfStagedSnaps);\n    }\n    const stagedConfig = await this.scope.getStagedConfig();\n    let copyOfStagedConfig: string | undefined;\n    if (!stagedConfig.isEmpty()) {\n      copyOfStagedConfig = tempy.file();\n      await fs.copyFile(stagedConfig.filePath, copyOfStagedConfig);\n    }\n\n    return {\n      copyOfCurrentLane,\n      copyOfBitmap,\n      copyOfWorkspaceJsonc,\n      copyOfStagedSnaps,\n      copyOfStagedConfig,\n    };\n  }\n\n  async persistSnapshot(snapshot: Snapshot) {\n    const { copyOfCurrentLane, copyOfBitmap, copyOfWorkspaceJsonc, copyOfStagedSnaps, copyOfStagedConfig } = snapshot;\n    await fs.remove(this.path);\n    await fs.ensureDir(this.path);\n    await fs.copyFile(copyOfBitmap, this.getLastMergedBitmapPath());\n    await fs.copyFile(copyOfWorkspaceJsonc, this.getLastMergedWorkspacePath());\n    if (copyOfCurrentLane) {\n      const compressed = await copyOfCurrentLane.compress();\n      await fs.outputFile(this.getLastMergedLanePath(), compressed);\n    }\n    if (copyOfStagedSnaps) {\n      await fs.copyFile(copyOfStagedSnaps, this.getLastMergedStagedSnapsPath());\n    }\n    if (copyOfStagedConfig) {\n      await fs.copyFile(copyOfStagedConfig, this.getLastMergedStagedConfigPath());\n    }\n  }\n\n  async restoreLaneObjectFromLastMerged() {\n    if (!fs.pathExistsSync(this.path)) {\n      throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n    }\n    const lastLane = await this.getLastMergedLaneContentIfExists();\n    if (!lastLane) {\n      throw new BitError(\n        `unable to revert the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.path}`\n      );\n    }\n    const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n    await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n  }\n\n  async restoreFromLastMerged(mergeAbortOpts: MergeAbortOpts, currentLane?: Lane | null) {\n    if (!fs.pathExistsSync(this.path)) {\n      throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n    }\n    const lastLane = await this.getLastMergedLaneContentIfExists();\n\n    if (!fs.pathExistsSync(this.getLastMergedBitmapPath())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the ${LAST_MERGED_BITMAP_FILENAME} is missing from ${this.path}`\n      );\n    }\n    if (!fs.pathExistsSync(this.getLastMergedWorkspacePath())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the workspace.jsonc is missing from ${this.path}`\n      );\n    }\n    if (currentLane) {\n      if (!lastLane) {\n        throw new BitError(\n          `unable to abort the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.path}`\n        );\n      }\n      const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n      await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n    }\n    const previousBitmapBuffer = await fs.readFile(this.getLastMergedBitmapPath());\n    const previousBitmap = BitMap.loadFromContentWithoutLoadingFiles(previousBitmapBuffer, '', '', '');\n    const currentRootDirs = this.consumer.bitMap.getAllTrackDirs();\n    const previousRootDirs = previousBitmap.getAllTrackDirs();\n    const compDirsToRemove = Object.keys(currentRootDirs).filter((dir) => !previousRootDirs[dir]);\n\n    if (!mergeAbortOpts.silent) {\n      await this.mergeAbortPrompt(compDirsToRemove);\n    }\n    await Promise.all(compDirsToRemove.map((dir) => fs.remove(dir))); // it doesn't throw if not-exist, so we're good here.\n    await fs.copyFile(this.getLastMergedBitmapPath(), this.consumer.bitMap.mapPath);\n    await fs.copyFile(this.getLastMergedWorkspacePath(), this.consumer.config.path);\n    if (fs.pathExistsSync(this.getLastMergedStagedSnapsPath())) {\n      await fs.copyFile(this.getLastMergedStagedSnapsPath(), StagedSnaps.getPath(this.scope.path));\n    } else {\n      await this.scope.legacyScope.stagedSnaps.deleteFile();\n    }\n    const stagedConfig = await this.scope.getStagedConfig();\n    if (fs.pathExistsSync(this.getLastMergedStagedConfigPath())) {\n      await fs.copyFile(this.getLastMergedStagedConfigPath(), stagedConfig.filePath);\n    } else {\n      await stagedConfig.deleteFile();\n    }\n    await fs.remove(this.path);\n\n    return {\n      compDirsToRemove,\n    };\n  }\n\n  private async mergeAbortPrompt(dirsToRemove: string[]) {\n    this.logger.clearStatusLine();\n    const dirsToRemoveStr = dirsToRemove.length\n      ? `\\nThe following directories introduced by the merge will be deleted: ${dirsToRemove.join(', ')}`\n      : '';\n    const ok = await yesno({\n      question: `Code changes that were done since the last lane-merge will be lost.${dirsToRemoveStr}\nThe .bitmap and workspace.jsonc files will be restored to the state before the merge.\nThis action is irreversible.\n${chalk.bold('Do you want to continue? [yes(y)/no(n)]')}`,\n    });\n    if (!ok) {\n      throw new PromptCanceled();\n    }\n  }\n\n  private async getLastMergedLaneContentIfExists(): Promise<Buffer | null> {\n    const filename = this.getLastMergedLanePath();\n    return this.getFileContentIfExist(filename);\n  }\n  private async getFileContentIfExist(filename: string): Promise<Buffer | null> {\n    try {\n      return await fs.readFile(filename);\n    } catch (err: any) {\n      if (err.code === 'ENOENT') return null;\n      throw err;\n    }\n  }\n  private getLastMergedBitmapPath() {\n    return path.join(this.path, LAST_MERGED_BITMAP_FILENAME);\n  }\n  private getLastMergedWorkspacePath() {\n    return path.join(this.path, 'workspace.jsonc');\n  }\n  private getLastMergedLanePath() {\n    return path.join(this.path, LAST_MERGED_LANE_FILENAME);\n  }\n  private getLastMergedStagedSnapsPath() {\n    return path.join(this.path, 'staged-snaps');\n  }\n  private getLastMergedStagedConfigPath() {\n    return path.join(this.path, 'staged-config.json');\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_path","data","_interopRequireDefault","require","_tempy","_fsExtra","_yesno","_chalk","_legacy","_objects","_legacy2","_bitError","e","__esModule","default","PromptCanceled","BitError","constructor","chalk","yellow","LAST_MERGED_LANE_FILENAME","LAST_MERGED_BITMAP_FILENAME","LastMerged","scope","consumer","logger","path","getLastMergedPath","takeSnapshot","currentLane","copyOfCurrentLane","clone","undefined","copyOfBitmap","tempy","file","copyOfWorkspaceJsonc","copyOfStagedSnaps","fs","copyFile","bitMap","mapPath","config","stagedSnaps","isEmpty","StagedSnaps","getPath","stagedConfig","getStagedConfig","copyOfStagedConfig","filePath","persistSnapshot","snapshot","remove","ensureDir","getLastMergedBitmapPath","getLastMergedWorkspacePath","compressed","compress","outputFile","getLastMergedLanePath","getLastMergedStagedSnapsPath","getLastMergedStagedConfigPath","restoreLaneObjectFromLastMerged","pathExistsSync","lastLane","getLastMergedLaneContentIfExists","laneFromBackup","BitObject","parseObject","legacyScope","objects","writeObjectsToTheFS","restoreFromLastMerged","mergeAbortOpts","previousBitmapBuffer","readFile","previousBitmap","BitMap","loadFromContentWithoutLoadingFiles","currentRootDirs","getAllTrackDirs","previousRootDirs","compDirsToRemove","Object","keys","filter","dir","silent","mergeAbortPrompt","Promise","all","map","deleteFile","dirsToRemove","clearStatusLine","dirsToRemoveStr","length","join","ok","yesno","question","bold","filename","getFileContentIfExist","err","code","exports"],"sources":["last-merged.ts"],"sourcesContent":["import path from 'path';\nimport tempy from 'tempy';\nimport fs from 'fs-extra';\nimport yesno from 'yesno';\nimport chalk from 'chalk';\nimport { BitMap } from '@teambit/legacy.bit-map';\nimport type { ScopeMain } from '@teambit/scope';\nimport type { Lane } from '@teambit/objects';\nimport { BitObject } from '@teambit/objects';\nimport { StagedSnaps } from '@teambit/legacy.scope';\nimport type { Consumer } from '@teambit/legacy.consumer';\nimport { BitError } from '@teambit/bit-error';\nimport type { Logger } from '@teambit/logger';\nimport type { MergeAbortOpts } from './merge-abort.cmd';\n\nclass PromptCanceled extends BitError {\n  constructor() {\n    super(chalk.yellow('operation aborted'));\n  }\n}\n\nconst LAST_MERGED_LANE_FILENAME = 'lane';\nconst LAST_MERGED_BITMAP_FILENAME = 'bitmap';\n\ntype Snapshot = {\n  copyOfCurrentLane?: Lane;\n  copyOfBitmap: string;\n  copyOfWorkspaceJsonc: string;\n  copyOfStagedSnaps?: string;\n  copyOfStagedConfig?: string;\n};\n\nexport class LastMerged {\n  constructor(\n    private scope: ScopeMain,\n    private consumer: Consumer,\n    private logger: Logger\n  ) {}\n\n  get path() {\n    return this.scope.getLastMergedPath();\n  }\n\n  async takeSnapshot(currentLane?: Lane | null): Promise<Snapshot> {\n    const consumer = this.consumer;\n    const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;\n    const copyOfBitmap = tempy.file();\n    const copyOfWorkspaceJsonc = tempy.file();\n    let copyOfStagedSnaps: string | undefined;\n    await fs.copyFile(consumer.bitMap.mapPath, copyOfBitmap);\n    await fs.copyFile(consumer.config.path, copyOfWorkspaceJsonc);\n    if (!consumer.scope.stagedSnaps.isEmpty()) {\n      copyOfStagedSnaps = tempy.file();\n      await fs.copyFile(StagedSnaps.getPath(consumer.scope.path), copyOfStagedSnaps);\n    }\n    const stagedConfig = await this.scope.getStagedConfig();\n    let copyOfStagedConfig: string | undefined;\n    if (!stagedConfig.isEmpty()) {\n      copyOfStagedConfig = tempy.file();\n      await fs.copyFile(stagedConfig.filePath, copyOfStagedConfig);\n    }\n\n    return {\n      copyOfCurrentLane,\n      copyOfBitmap,\n      copyOfWorkspaceJsonc,\n      copyOfStagedSnaps,\n      copyOfStagedConfig,\n    };\n  }\n\n  async persistSnapshot(snapshot: Snapshot) {\n    const { copyOfCurrentLane, copyOfBitmap, copyOfWorkspaceJsonc, copyOfStagedSnaps, copyOfStagedConfig } = snapshot;\n    await fs.remove(this.path);\n    await fs.ensureDir(this.path);\n    await fs.copyFile(copyOfBitmap, this.getLastMergedBitmapPath());\n    await fs.copyFile(copyOfWorkspaceJsonc, this.getLastMergedWorkspacePath());\n    if (copyOfCurrentLane) {\n      const compressed = await copyOfCurrentLane.compress();\n      await fs.outputFile(this.getLastMergedLanePath(), compressed);\n    }\n    if (copyOfStagedSnaps) {\n      await fs.copyFile(copyOfStagedSnaps, this.getLastMergedStagedSnapsPath());\n    }\n    if (copyOfStagedConfig) {\n      await fs.copyFile(copyOfStagedConfig, this.getLastMergedStagedConfigPath());\n    }\n  }\n\n  async restoreLaneObjectFromLastMerged() {\n    if (!fs.pathExistsSync(this.path)) {\n      throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n    }\n    const lastLane = await this.getLastMergedLaneContentIfExists();\n    if (!lastLane) {\n      throw new BitError(\n        `unable to revert the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.path}`\n      );\n    }\n    const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n    await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n  }\n\n  async restoreFromLastMerged(mergeAbortOpts: MergeAbortOpts, currentLane?: Lane | null) {\n    if (!fs.pathExistsSync(this.path)) {\n      throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n    }\n    const lastLane = await this.getLastMergedLaneContentIfExists();\n\n    if (!fs.pathExistsSync(this.getLastMergedBitmapPath())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the ${LAST_MERGED_BITMAP_FILENAME} is missing from ${this.path}`\n      );\n    }\n    if (!fs.pathExistsSync(this.getLastMergedWorkspacePath())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the workspace.jsonc is missing from ${this.path}`\n      );\n    }\n    if (currentLane) {\n      if (!lastLane) {\n        throw new BitError(\n          `unable to abort the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.path}`\n        );\n      }\n      const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n      await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n    }\n    const previousBitmapBuffer = await fs.readFile(this.getLastMergedBitmapPath());\n    const previousBitmap = BitMap.loadFromContentWithoutLoadingFiles(previousBitmapBuffer, '', '', '');\n    const currentRootDirs = this.consumer.bitMap.getAllTrackDirs();\n    const previousRootDirs = previousBitmap.getAllTrackDirs();\n    const compDirsToRemove = Object.keys(currentRootDirs).filter((dir) => !previousRootDirs[dir]);\n\n    if (!mergeAbortOpts.silent) {\n      await this.mergeAbortPrompt(compDirsToRemove);\n    }\n    await Promise.all(compDirsToRemove.map((dir) => fs.remove(dir))); // it doesn't throw if not-exist, so we're good here.\n    await fs.copyFile(this.getLastMergedBitmapPath(), this.consumer.bitMap.mapPath);\n    await fs.copyFile(this.getLastMergedWorkspacePath(), this.consumer.config.path);\n    if (fs.pathExistsSync(this.getLastMergedStagedSnapsPath())) {\n      await fs.copyFile(this.getLastMergedStagedSnapsPath(), StagedSnaps.getPath(this.scope.path));\n    } else {\n      await this.scope.legacyScope.stagedSnaps.deleteFile();\n    }\n    const stagedConfig = await this.scope.getStagedConfig();\n    if (fs.pathExistsSync(this.getLastMergedStagedConfigPath())) {\n      await fs.copyFile(this.getLastMergedStagedConfigPath(), stagedConfig.filePath);\n    } else {\n      await stagedConfig.deleteFile();\n    }\n    await fs.remove(this.path);\n\n    return {\n      compDirsToRemove,\n    };\n  }\n\n  private async mergeAbortPrompt(dirsToRemove: string[]) {\n    this.logger.clearStatusLine();\n    const dirsToRemoveStr = dirsToRemove.length\n      ? `\\nThe following directories introduced by the merge will be deleted: ${dirsToRemove.join(', ')}`\n      : '';\n    const ok = await yesno({\n      question: `Code changes that were done since the last lane-merge will be lost.${dirsToRemoveStr}\nThe .bitmap and workspace.jsonc files will be restored to the state before the merge.\nThis action is irreversible.\n${chalk.bold('Do you want to continue? [yes(y)/no(n)]')}`,\n    });\n    if (!ok) {\n      throw new PromptCanceled();\n    }\n  }\n\n  private async getLastMergedLaneContentIfExists(): Promise<Buffer | null> {\n    const filename = this.getLastMergedLanePath();\n    return this.getFileContentIfExist(filename);\n  }\n  private async getFileContentIfExist(filename: string): Promise<Buffer | null> {\n    try {\n      return await fs.readFile(filename);\n    } catch (err: any) {\n      if (err.code === 'ENOENT') return null;\n      throw err;\n    }\n  }\n  private getLastMergedBitmapPath() {\n    return path.join(this.path, LAST_MERGED_BITMAP_FILENAME);\n  }\n  private getLastMergedWorkspacePath() {\n    return path.join(this.path, 'workspace.jsonc');\n  }\n  private getLastMergedLanePath() {\n    return path.join(this.path, LAST_MERGED_LANE_FILENAME);\n  }\n  private getLastMergedStagedSnapsPath() {\n    return path.join(this.path, 'staged-snaps');\n  }\n  private getLastMergedStagedConfigPath() {\n    return path.join(this.path, 'staged-config.json');\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.754",
+  "version": "1.0.755",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.754"
+    "version": "1.0.755"
   },
   "dependencies": {
     "chalk": "4.1.2",
@@ -15,32 +15,31 @@
     "yesno": "0.4.0",
     "lodash": "4.17.21",
     "p-map-series": "2.1.0",
-    "@teambit/express": "0.0.1372",
-    "@teambit/logger": "0.0.1366",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/legacy.bit-map": "0.0.131",
-    "@teambit/legacy.cli.prompts": "0.0.25",
-    "@teambit/legacy.consumer": "0.0.74",
-    "@teambit/legacy.scope": "0.0.74",
-    "@teambit/cli": "0.0.1273",
-    "@teambit/component.modules.merge-helper": "0.0.14",
-    "@teambit/config-store": "0.0.153",
     "@teambit/legacy.constants": "0.0.18",
     "@teambit/harmony": "0.4.7",
     "@teambit/component-id": "1.2.4",
-    "@teambit/component.snap-distance": "0.0.75",
-    "@teambit/harmony.modules.get-basic-log": "0.0.75",
     "@teambit/lane-id": "0.0.312",
-    "@teambit/objects": "0.0.260",
-    "@teambit/scope": "1.0.753",
-    "@teambit/checkout": "1.0.753",
-    "@teambit/merging": "1.0.753",
-    "@teambit/remove": "1.0.753",
-    "@teambit/config-merger": "0.0.620",
-    "@teambit/export": "1.0.753",
-    "@teambit/importer": "1.0.753",
-    "@teambit/lanes": "1.0.754",
-    "@teambit/workspace": "1.0.753"
+    "@teambit/express": "0.0.1373",
+    "@teambit/logger": "0.0.1367",
+    "@teambit/legacy.bit-map": "0.0.132",
+    "@teambit/legacy.consumer": "0.0.75",
+    "@teambit/legacy.scope": "0.0.75",
+    "@teambit/objects": "0.0.261",
+    "@teambit/scope": "1.0.754",
+    "@teambit/checkout": "1.0.754",
+    "@teambit/cli": "0.0.1274",
+    "@teambit/component.modules.merge-helper": "0.0.15",
+    "@teambit/config-store": "0.0.154",
+    "@teambit/merging": "1.0.754",
+    "@teambit/remove": "1.0.754",
+    "@teambit/component.snap-distance": "0.0.76",
+    "@teambit/config-merger": "0.0.621",
+    "@teambit/export": "1.0.754",
+    "@teambit/harmony.modules.get-basic-log": "0.0.76",
+    "@teambit/importer": "1.0.754",
+    "@teambit/lanes": "1.0.755",
+    "@teambit/workspace": "1.0.754"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",