@teambit/merge-lanes 1.0.225 → 1.0.227

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

@@ -1,102 +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;
-};
-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;