@teambit/merge-lanes 1.0.226 → 1.0.228

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.226",
+  "version": "1.0.228",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.226"
+    "version": "1.0.228"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -19,25 +19,25 @@
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "1.2.0",
-    "@teambit/logger": "0.0.952",
-    "@teambit/scope": "1.0.226",
-    "@teambit/checkout": "1.0.226",
-    "@teambit/cli": "0.0.859",
-    "@teambit/global-config": "0.0.862",
-    "@teambit/merging": "1.0.226",
-    "@teambit/remove": "1.0.226",
-    "@teambit/config-merger": "0.0.93",
-    "@teambit/export": "1.0.226",
-    "@teambit/importer": "1.0.226",
-    "@teambit/lanes": "1.0.226",
-    "@teambit/workspace": "1.0.226"
+    "@teambit/logger": "0.0.954",
+    "@teambit/scope": "1.0.228",
+    "@teambit/checkout": "1.0.228",
+    "@teambit/cli": "0.0.861",
+    "@teambit/global-config": "0.0.864",
+    "@teambit/merging": "1.0.228",
+    "@teambit/remove": "1.0.228",
+    "@teambit/config-merger": "0.0.95",
+    "@teambit/export": "1.0.228",
+    "@teambit/importer": "1.0.228",
+    "@teambit/lanes": "1.0.228",
+    "@teambit/workspace": "1.0.228"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
     "@types/lodash": "4.14.165",
     "@types/mocha": "9.1.0",
     "chai": "4.3.0",
-    "@teambit/harmony.envs.core-aspect-env": "0.0.27"
+    "@teambit/harmony.envs.core-aspect-env": "0.0.30"
   },
   "peerDependencies": {
     "@teambit/legacy": "1.0.624"

package/tsconfig.json

@@ -20,7 +20,8 @@
     "emitDeclarationOnly": true,
     "strict": true,
     "strictPropertyInitialization": false,
-    "noImplicitAny": false
+    "noImplicitAny": false,
+    "composite": true
   },
   "exclude": [
     "artifacts",
@@ -35,5 +36,43 @@
   "include": [
     "**/*",
     "**/*.json"
+  ],
+  "references": [
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_logger@0.0.954"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.scope_scope@1.0.228"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_checkout@1.0.228"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_cli@0.0.861"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_global-config@0.0.864"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_merging@1.0.228"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_remove@1.0.228"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_config-merger@0.0.95"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.scope_export@1.0.228"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.scope_importer@1.0.228"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@1.0.228"
+    },
+    {
+      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@1.0.228"
+    }
   ]
 }

package/dist/exceptions/missing-comps-to-merge.d.ts

@@ -1,6 +0,0 @@
-import { BitError } from '@teambit/bit-error';
-export declare class MissingCompsToMerge extends BitError {
-    constructor(missingDepsFromHead: {
-        [depId: string]: string[];
-    }, missingDepsFromHistory: string[]);
-}

package/dist/index.d.ts

@@ -1,4 +0,0 @@
-import { MergeLanesAspect } from './merge-lanes.aspect';
-export type { MergeLanesMain } from './merge-lanes.main.runtime';
-export default MergeLanesAspect;
-export { MergeLanesAspect };

package/dist/last-merged.d.ts

@@ -1,33 +0,0 @@
-import { ScopeMain } from '@teambit/scope';
-import { Lane } from '@teambit/legacy/dist/scope/models';
-import { Consumer } from '@teambit/legacy/dist/consumer';
-import { Logger } from '@teambit/logger';
-import { MergeAbortOpts } from './merge-abort.cmd';
-type Snapshot = {
-    copyOfCurrentLane?: Lane;
-    copyOfBitmap: string;
-    copyOfWorkspaceJsonc: string;
-    copyOfStagedSnaps?: string;
-    copyOfStagedConfig?: string;
-};
-export declare class LastMerged {
-    private scope;
-    private consumer;
-    private logger;
-    constructor(scope: ScopeMain, consumer: Consumer, logger: Logger);
-    get path(): string;
-    takeSnapshot(currentLane?: Lane | null): Promise<Snapshot>;
-    persistSnapshot(snapshot: Snapshot): Promise<void>;
-    restoreFromLastMerged(mergeAbortOpts: MergeAbortOpts, currentLane?: Lane | null): Promise<{
-        compDirsToRemove: string[];
-    }>;
-    private mergeAbortPrompt;
-    private getLastMergedLaneContentIfExists;
-    private getFileContentIfExist;
-    private getLastMergedBitmapPath;
-    private getLastMergedWorkspacePath;
-    private getLastMergedLanePath;
-    private getLastMergedStagedSnapsPath;
-    private getLastMergedStagedConfigPath;
-}
-export {};

package/dist/merge-abort.cmd.d.ts

@@ -1,22 +0,0 @@
-import { Command, CommandOptions } from '@teambit/cli';
-import { MergeLanesMain } from './merge-lanes.main.runtime';
-export type MergeAbortOpts = {
-    silent?: boolean;
-};
-export declare class MergeAbortLaneCmd implements Command {
-    private mergeLanes;
-    name: string;
-    description: string;
-    extendedDescription: string;
-    alias: string;
-    options: CommandOptions;
-    loader: boolean;
-    private: boolean;
-    remoteOp: boolean;
-    constructor(mergeLanes: MergeLanesMain);
-    report(_: any, { skipDependencyInstallation, verbose, silent, }: {
-        skipDependencyInstallation?: boolean;
-        verbose?: boolean;
-        silent?: boolean;
-    }): Promise<string>;
-}

package/dist/merge-lane-from-scope.cmd.d.ts

@@ -1,60 +0,0 @@
-import { Command, CommandOptions } from '@teambit/cli';
-import { MergeLanesMain } from './merge-lanes.main.runtime';
-type Flags = {
-    pattern?: string;
-    push?: boolean;
-    keepReadme?: boolean;
-    noSquash: boolean;
-    includeDeps?: boolean;
-    title?: string;
-    titleBase64?: string;
-    reMerge?: boolean;
-};
-/**
- * private command. the underscore prefix is intended.
- */
-export declare class MergeLaneFromScopeCmd implements Command {
-    private mergeLanes;
-    name: string;
-    description: string;
-    extendedDescription: string;
-    arguments: {
-        name: string;
-        description: string;
-    }[];
-    alias: string;
-    options: CommandOptions;
-    loader: boolean;
-    private: boolean;
-    remoteOp: boolean;
-    constructor(mergeLanes: MergeLanesMain);
-    report([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, title, titleBase64, reMerge, }: Flags): Promise<string>;
-    json([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, reMerge }: Flags): Promise<{
-        code: number;
-        data: {
-            mergedNow: string[];
-            mergedPreviously: string[];
-            exportedIds: string[];
-            unmerged: {
-                id: string;
-                reason: string;
-            }[];
-            conflicts: {
-                files: string[];
-                config?: boolean | undefined;
-                id: string;
-            }[] | undefined;
-            snappedIds: string[] | undefined;
-            mergeSnapError: {
-                message: string;
-                stack: string | undefined;
-            } | undefined;
-        };
-        error?: undefined;
-    } | {
-        code: number;
-        error: any;
-        data?: undefined;
-    }>;
-}
-export {};

package/dist/merge-lane.cmd.d.ts

@@ -1,41 +0,0 @@
-import { Command, CommandOptions } from '@teambit/cli';
-import { GlobalConfigMain } from '@teambit/global-config';
-import { MergeLanesMain } from './merge-lanes.main.runtime';
-export declare class MergeLaneCmd implements Command {
-    private mergeLanes;
-    private globalConfig;
-    name: string;
-    description: string;
-    extendedDescription: string;
-    arguments: {
-        name: string;
-        description: string;
-    }[];
-    alias: string;
-    options: CommandOptions;
-    loader: boolean;
-    private: boolean;
-    remoteOp: boolean;
-    constructor(mergeLanes: MergeLanesMain, globalConfig: GlobalConfigMain);
-    report([name, pattern]: [string, string], { ours, theirs, manual, autoMergeResolve, build, workspace: existingOnWorkspaceOnly, squash, noSnap, tag, message: snapMessage, keepReadme, noSquash, skipDependencyInstallation, skipFetch, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, excludeNonLaneComps, }: {
-        ours?: boolean;
-        theirs?: boolean;
-        manual?: boolean;
-        autoMergeResolve?: string;
-        workspace?: boolean;
-        build?: boolean;
-        noSnap: boolean;
-        tag: boolean;
-        message: string;
-        keepReadme?: boolean;
-        squash?: boolean;
-        noSquash: boolean;
-        skipDependencyInstallation?: boolean;
-        skipFetch: boolean;
-        includeDeps?: boolean;
-        resolveUnrelated?: string | boolean;
-        ignoreConfigChanges?: boolean;
-        verbose?: boolean;
-        excludeNonLaneComps?: boolean;
-    }): Promise<string>;
-}

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

@@ -1,2 +0,0 @@
-import { Aspect } from '@teambit/harmony';
-export declare const MergeLanesAspect: Aspect;

package/dist/merge-lanes.main.runtime.d.ts

@@ -1,103 +0,0 @@
-import { CLIMain } from '@teambit/cli';
-import { ImporterMain } from '@teambit/importer';
-import { LanesMain } from '@teambit/lanes';
-import { MergingMain, ApplyVersionResults } from '@teambit/merging';
-import { Workspace } from '@teambit/workspace';
-import { ComponentID } from '@teambit/component-id';
-import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
-import { ScopeMain } from '@teambit/scope';
-import { LaneId } from '@teambit/lane-id';
-import { ConfigMergeResult } from '@teambit/config-merger';
-import { Logger, LoggerMain } from '@teambit/logger';
-import { CheckoutMain, CheckoutProps } from '@teambit/checkout';
-import { RemoveMain } from '@teambit/remove';
-import { ExportMain } from '@teambit/export';
-import { GlobalConfigMain } from '@teambit/global-config';
-import { MergeAbortOpts } from './merge-abort.cmd';
-export type MergeLaneOptions = {
-    mergeStrategy: MergeStrategy;
-    ours?: boolean;
-    theirs?: boolean;
-    noSnap: boolean;
-    snapMessage: string;
-    existingOnWorkspaceOnly: boolean;
-    build: boolean;
-    keepReadme: boolean;
-    squash?: boolean;
-    noSquash: boolean;
-    tag?: boolean;
-    pattern?: string;
-    includeDeps?: boolean;
-    skipDependencyInstallation?: boolean;
-    resolveUnrelated?: MergeStrategy;
-    ignoreConfigChanges?: boolean;
-    skipFetch?: boolean;
-    excludeNonLaneComps?: boolean;
-    shouldIncludeUpdateDependents?: boolean;
-};
-export type MergeFromScopeResult = {
-    mergedNow: ComponentID[];
-    exportedIds: ComponentID[];
-    unmerged: {
-        id: ComponentID;
-        reason: string;
-    }[];
-    conflicts?: Array<{
-        id: ComponentID;
-        files: string[];
-        config?: boolean;
-    }>;
-    snappedIds?: ComponentID[];
-    mergedPreviously: ComponentID[];
-    mergeSnapError?: Error;
-};
-export declare class MergeLanesMain {
-    private workspace;
-    private merging;
-    private lanes;
-    readonly logger: Logger;
-    private remove;
-    private scope;
-    private exporter;
-    private importer;
-    private checkout;
-    constructor(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain);
-    mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{
-        mergeResults: ApplyVersionResults;
-        deleteResults: any;
-        configMergeResults: ConfigMergeResult[];
-    }>;
-    mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{
-        mergeResults: ApplyVersionResults;
-        deleteResults: any;
-        configMergeResults: ConfigMergeResult[];
-    }>;
-    abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{
-        checkoutResults: ApplyVersionResults | undefined;
-        restoredItems: string[];
-        checkoutError: Error | undefined;
-    }>;
-    private getMainIdsToMerge;
-    mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {
-        push?: boolean;
-        reMerge?: boolean;
-    }): Promise<MergeFromScopeResult>;
-    private throwIfNotUpToDate;
-    static slots: never[];
-    static dependencies: import("@teambit/harmony").Aspect[];
-    static runtime: import("@teambit/harmony").RuntimeDefinition;
-    static provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [
-        LanesMain,
-        CLIMain,
-        Workspace,
-        MergingMain,
-        LoggerMain,
-        RemoveMain,
-        ScopeMain,
-        ExportMain,
-        ImporterMain,
-        CheckoutMain,
-        GlobalConfigMain
-    ]): Promise<MergeLanesMain>;
-}
-export default MergeLanesMain;