@yarnpkg/plugin-essentials 4.0.0-rc.4 → 4.0.0-rc.41

package/lib/commands/add.d.ts

@@ -18,5 +18,5 @@ export default class AddCommand extends BaseCommand {
     mode: InstallMode | undefined;
     silent: boolean | undefined;
     packages: string[];
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/add.js

@@ -86,24 +86,27 @@ class AddCommand extends cli_1.BaseCommand {
                 : core_3.structUtils.tryParseDescriptor(pseudoDescriptor);
             const unsupportedPrefix = pseudoDescriptor.match(/^(https?:|git@github)/);
             if (unsupportedPrefix)
-                throw new clipanion_1.UsageError(`It seems you are trying to add a package using a ${core_1.formatUtils.pretty(configuration, `${unsupportedPrefix[0]}...`, core_1.FormatType.RANGE)} url; we now require package names to be explicitly specified.\nTry running the command again with the package name prefixed: ${core_1.formatUtils.pretty(configuration, `yarn add`, core_1.FormatType.CODE)} ${core_1.formatUtils.pretty(configuration, core_3.structUtils.makeDescriptor(core_3.structUtils.makeIdent(null, `my-package`), `${unsupportedPrefix[0]}...`), core_1.FormatType.DESCRIPTOR)}`);
+                throw new clipanion_1.UsageError(`It seems you are trying to add a package using a ${core_1.formatUtils.pretty(configuration, `${unsupportedPrefix[0]}...`, core_1.formatUtils.Type.RANGE)} url; we now require package names to be explicitly specified.\nTry running the command again with the package name prefixed: ${core_1.formatUtils.pretty(configuration, `yarn add`, core_1.formatUtils.Type.CODE)} ${core_1.formatUtils.pretty(configuration, core_3.structUtils.makeDescriptor(core_3.structUtils.makeIdent(null, `my-package`), `${unsupportedPrefix[0]}...`), core_1.formatUtils.Type.DESCRIPTOR)}`);
             if (!request)
-                throw new clipanion_1.UsageError(`The ${core_1.formatUtils.pretty(configuration, pseudoDescriptor, core_1.FormatType.CODE)} string didn't match the required format (package-name@range). Did you perhaps forget to explicitly reference the package name?`);
-            const target = suggestTarget(workspace, request, {
+                throw new clipanion_1.UsageError(`The ${core_1.formatUtils.pretty(configuration, pseudoDescriptor, core_1.formatUtils.Type.CODE)} string didn't match the required format (package-name@range). Did you perhaps forget to explicitly reference the package name?`);
+            const targetList = suggestTargetList(workspace, request, {
                 dev: this.dev,
                 peer: this.peer,
                 preferDev: this.preferDev,
                 optional: this.optional,
             });
-            const suggestions = await suggestUtils.getSuggestedDescriptors(request, { project, workspace, cache, fixed, target, modifier, strategies, maxResults });
-            return [request, suggestions, target];
-        }));
+            const results = await Promise.all(targetList.map(async (target) => {
+                const suggestedDescriptors = await suggestUtils.getSuggestedDescriptors(request, { project, workspace, cache, fixed, target, modifier, strategies, maxResults });
+                return { request, suggestedDescriptors, target };
+            }));
+            return results;
+        })).then(results => results.flat());
         const checkReport = await core_1.LightReport.start({
             configuration,
             stdout: this.context.stdout,
             suggestInstall: false,
         }, async (report) => {
-            for (const [request, { suggestions, rejections }] of allSuggestions) {
+            for (const { request, suggestedDescriptors: { suggestions, rejections } } of allSuggestions) {
                 const nonNullSuggestions = suggestions.filter(suggestion => {
                     return suggestion.descriptor !== null;
                 });
@@ -125,7 +128,7 @@ class AddCommand extends cli_1.BaseCommand {
         let askedQuestions = false;
         const afterWorkspaceDependencyAdditionList = [];
         const afterWorkspaceDependencyReplacementList = [];
-        for (const [/*request*/ , { suggestions }, target] of allSuggestions) {
+        for (const { suggestedDescriptors: { suggestions }, target } of allSuggestions) {
             let selected;
             const nonNullSuggestions = suggestions.filter(suggestion => {
                 return suggestion.descriptor !== null;
@@ -209,7 +212,6 @@ class AddCommand extends cli_1.BaseCommand {
         return installReport.exitCode();
     }
 }
-exports.default = AddCommand;
 AddCommand.paths = [
     [`add`],
 ];
@@ -236,7 +238,7 @@ AddCommand.usage = clipanion_1.Command.Usage({
 
       If the \`--mode=<mode>\` option is set, Yarn will change which artifacts are generated. The modes currently supported are:
 
-      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the later will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
+      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
 
       - \`update-lockfile\` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.
 
@@ -262,7 +264,8 @@ AddCommand.usage = clipanion_1.Command.Usage({
             `$0 add lodash-es@lodash/lodash#es`,
         ]],
 });
-function suggestTarget(workspace, ident, { dev, peer, preferDev, optional }) {
+exports.default = AddCommand;
+function suggestTargetList(workspace, ident, { dev, peer, preferDev, optional }) {
     const hasRegular = workspace.manifest[suggestUtils.Target.REGULAR].has(ident.identHash);
     const hasDev = workspace.manifest[suggestUtils.Target.DEVELOPMENT].has(ident.identHash);
     const hasPeer = workspace.manifest[suggestUtils.Target.PEER].has(ident.identHash);
@@ -276,13 +279,21 @@ function suggestTarget(workspace, ident, { dev, peer, preferDev, optional }) {
         throw new clipanion_1.UsageError(`Package "${core_3.structUtils.prettyIdent(workspace.project.configuration, ident)}" is already listed as a peer dependency - remove the -O flag or add the -P flag or remove it from your peer dependencies first`);
     if ((dev || preferDev) && optional)
         throw new clipanion_1.UsageError(`Package "${core_3.structUtils.prettyIdent(workspace.project.configuration, ident)}" cannot simultaneously be a dev dependency and an optional dependency`);
+    // When the program executes this line, the command is expected to be legal
+    const targetList = [];
     if (peer)
-        return suggestUtils.Target.PEER;
+        targetList.push(suggestUtils.Target.PEER);
     if (dev || preferDev)
-        return suggestUtils.Target.DEVELOPMENT;
-    if (hasRegular)
-        return suggestUtils.Target.REGULAR;
+        targetList.push(suggestUtils.Target.DEVELOPMENT);
+    if (optional)
+        targetList.push(suggestUtils.Target.REGULAR);
+    // The user explicitly define the targets
+    if (targetList.length > 0)
+        return targetList;
+    // The user does not define the targets, find it from the `workspace.manifest`
     if (hasDev)
-        return suggestUtils.Target.DEVELOPMENT;
-    return suggestUtils.Target.REGULAR;
+        return [suggestUtils.Target.DEVELOPMENT];
+    if (hasPeer)
+        return [suggestUtils.Target.PEER];
+    return [suggestUtils.Target.REGULAR];
 }

package/lib/commands/bin.d.ts

@@ -6,5 +6,5 @@ export default class BinCommand extends BaseCommand {
     verbose: boolean;
     json: boolean;
     name: string | undefined;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/bin.js

@@ -58,7 +58,6 @@ class BinCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = BinCommand;
 BinCommand.paths = [
     [`bin`],
 ];
@@ -77,3 +76,4 @@ BinCommand.usage = clipanion_1.Command.Usage({
             `$0 bin eslint`,
         ]],
 });
+exports.default = BinCommand;

package/lib/commands/cache/clean.d.ts

@@ -5,5 +5,5 @@ export default class CacheCleanCommand extends BaseCommand {
     static usage: Usage;
     mirror: boolean;
     all: boolean;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/cache/clean.js

@@ -35,7 +35,6 @@ class CacheCleanCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = CacheCleanCommand;
 CacheCleanCommand.paths = [
     [`cache`, `clean`],
     [`cache`, `clear`],
@@ -53,3 +52,4 @@ CacheCleanCommand.usage = clipanion_1.Command.Usage({
             `$0 cache clean --mirror`,
         ]],
 });
+exports.default = CacheCleanCommand;

package/lib/commands/config/get.d.ts

@@ -6,5 +6,5 @@ export default class ConfigGetCommand extends BaseCommand {
     json: boolean;
     unsafe: boolean;
     name: string;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/config/get.js

@@ -57,7 +57,6 @@ class ConfigGetCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = ConfigGetCommand;
 ConfigGetCommand.paths = [
     [`config`, `get`],
 ];
@@ -85,3 +84,4 @@ ConfigGetCommand.usage = clipanion_1.Command.Usage({
             `yarn config get packageExtensions --json`,
         ]],
 });
+exports.default = ConfigGetCommand;

package/lib/commands/config/set.d.ts

@@ -7,5 +7,5 @@ export default class ConfigSetCommand extends BaseCommand {
     home: boolean;
     name: string;
     value: string;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/config/set.js

@@ -79,7 +79,6 @@ class ConfigSetCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = ConfigSetCommand;
 ConfigSetCommand.paths = [
     [`config`, `set`],
 ];
@@ -112,3 +111,4 @@ ConfigSetCommand.usage = clipanion_1.Command.Usage({
             `yarn config set 'npmRegistries["//npm.example.com"].npmAuthToken' "ffffffff-ffff-ffff-ffff-ffffffffffff"`,
         ]],
 });
+exports.default = ConfigSetCommand;

package/lib/commands/config/unset.d.ts

@@ -5,5 +5,5 @@ export default class ConfigUnsetCommand extends BaseCommand {
     static usage: Usage;
     home: boolean;
     name: string;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/config/unset.js

@@ -57,7 +57,6 @@ class ConfigUnsetCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = ConfigUnsetCommand;
 ConfigUnsetCommand.paths = [
     [`config`, `unset`],
 ];
@@ -77,3 +76,4 @@ ConfigUnsetCommand.usage = clipanion_1.Command.Usage({
             `yarn config unset npmScopes.company.npmRegistryServer`,
         ]],
 });
+exports.default = ConfigUnsetCommand;

package/lib/commands/config.d.ts

@@ -6,5 +6,5 @@ export default class ConfigCommand extends BaseCommand {
     verbose: boolean;
     why: boolean;
     json: boolean;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/config.js

@@ -85,7 +85,6 @@ class ConfigCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = ConfigCommand;
 ConfigCommand.paths = [
     [`config`],
 ];
@@ -99,3 +98,4 @@ ConfigCommand.usage = clipanion_1.Command.Usage({
             `$0 config`,
         ]],
 });
+exports.default = ConfigCommand;

package/lib/commands/dedupe.d.ts

@@ -22,5 +22,5 @@ export default class DedupeCommand extends BaseCommand {
     json: boolean;
     mode: InstallMode | undefined;
     patterns: string[];
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/dedupe.js

@@ -72,7 +72,6 @@ class DedupeCommand extends cli_1.BaseCommand {
         }
     }
 }
-exports.default = DedupeCommand;
 DedupeCommand.paths = [
     [`dedupe`],
 ];
@@ -91,7 +90,7 @@ DedupeCommand.usage = clipanion_1.Command.Usage({
 
       If the \`--mode=<mode>\` option is set, Yarn will change which artifacts are generated. The modes currently supported are:
 
-      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the later will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
+      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
 
       - \`update-lockfile\` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.
 
@@ -124,3 +123,4 @@ DedupeCommand.usage = clipanion_1.Command.Usage({
             `$0 dedupe --check`,
         ]],
 });
+exports.default = DedupeCommand;

package/lib/commands/entries/clipanion.js

@@ -33,7 +33,7 @@ class ClipanionCommand extends cli_1.BaseCommand {
         this.context.stdout.write(`${JSON.stringify(clipanionDefinitions, null, 2)}\n`);
     }
 }
-exports.default = ClipanionCommand;
 ClipanionCommand.paths = [
     [`--clipanion=definitions`],
 ];
+exports.default = ClipanionCommand;

package/lib/commands/entries/help.js

@@ -7,9 +7,9 @@ class HelpCommand extends cli_1.BaseCommand {
         this.context.stdout.write(this.cli.usage(null));
     }
 }
-exports.default = HelpCommand;
 HelpCommand.paths = [
     [`help`],
     [`--help`],
     [`-h`],
 ];
+exports.default = HelpCommand;

package/lib/commands/entries/version.js

@@ -8,8 +8,8 @@ class VersionCommand extends cli_1.BaseCommand {
         this.context.stdout.write(`${core_1.YarnVersion || `<unknown>`}\n`);
     }
 }
-exports.default = VersionCommand;
 VersionCommand.paths = [
     [`-v`],
     [`--version`],
 ];
+exports.default = VersionCommand;

package/lib/commands/exec.js

@@ -24,7 +24,6 @@ class ExecCommand extends cli_1.BaseCommand {
         });
     }
 }
-exports.default = ExecCommand;
 ExecCommand.paths = [
     [`exec`],
 ];
@@ -43,3 +42,4 @@ ExecCommand.usage = clipanion_1.Command.Usage({
             `$0 exec "tsc & babel src --out-dir lib"`,
         ]],
 });
+exports.default = ExecCommand;

package/lib/commands/explain/peerRequirements.d.ts

@@ -6,8 +6,8 @@ export default class ExplainPeerRequirementsCommand extends BaseCommand {
     static paths: string[][];
     static usage: import("clipanion").Usage;
     hash: string | undefined;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }
 export declare function explainPeerRequirements(peerRequirementsHash: string, project: Project, opts: {
     stdout: Writable;
-}): Promise<1 | 0>;
+}): Promise<0 | 1>;

package/lib/commands/explain/peerRequirements.js

@@ -62,7 +62,6 @@ class ExplainPeerRequirementsCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = ExplainPeerRequirementsCommand;
 ExplainPeerRequirementsCommand.paths = [
     [`explain`, `peer-requirements`],
 ];
@@ -85,6 +84,7 @@ ExplainPeerRequirementsCommand.usage = clipanion_1.Command.Usage({
             `$0 explain peer-requirements`,
         ]],
 });
+exports.default = ExplainPeerRequirementsCommand;
 async function explainPeerRequirements(peerRequirementsHash, project, opts) {
     const { configuration } = project;
     const requirement = project.peerRequirements.get(peerRequirementsHash);

package/lib/commands/explain.js

@@ -78,7 +78,6 @@ class ExplainCommand extends cli_1.BaseCommand {
         }
     }
 }
-exports.default = ExplainCommand;
 ExplainCommand.paths = [
     [`explain`],
 ];
@@ -97,3 +96,4 @@ ExplainCommand.usage = clipanion_1.Command.Usage({
             `$0 explain`,
         ]],
 });
+exports.default = ExplainCommand;

package/lib/commands/info.js

@@ -160,7 +160,7 @@ class InfoCommand extends cli_1.BaseCommand {
         const infoTreeChildren = {};
         const infoTree = { children: infoTreeChildren };
         const fetcher = configuration.makeFetcher();
-        const fetcherOptions = { project, fetcher, cache, checksums: project.storedChecksums, report: new core_1.ThrowReport(), cacheOptions: { skipIntegrityCheck: true }, skipIntegrityCheck: true };
+        const fetcherOptions = { project, fetcher, cache, checksums: project.storedChecksums, report: new core_1.ThrowReport(), cacheOptions: { skipIntegrityCheck: true } };
         const builtinInfoBuilders = [
             // Manifest fields
             async (pkg, extra, registerData) => {
@@ -308,7 +308,6 @@ class InfoCommand extends cli_1.BaseCommand {
         });
     }
 }
-exports.default = InfoCommand;
 InfoCommand.paths = [
     [`info`],
 ];
@@ -328,3 +327,4 @@ InfoCommand.usage = clipanion_1.Command.Usage({
             `$0 info lodash`,
         ]],
 });
+exports.default = InfoCommand;

package/lib/commands/install.d.ts

@@ -21,5 +21,5 @@ export default class YarnCommand extends BaseCommand {
     registry: string | undefined;
     silent: boolean | undefined;
     networkTimeout: string | undefined;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/install.js

@@ -256,7 +256,6 @@ class YarnCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = YarnCommand;
 YarnCommand.paths = [
     [`install`],
     clipanion_1.Command.Default,
@@ -288,7 +287,7 @@ YarnCommand.usage = clipanion_1.Command.Usage({
 
       If the \`--mode=<mode>\` option is set, Yarn will change which artifacts are generated. The modes currently supported are:
 
-      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the later will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
+      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
 
       - \`update-lockfile\` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.
     `,
@@ -303,9 +302,7 @@ YarnCommand.usage = clipanion_1.Command.Usage({
             `$0 install --immutable --immutable-cache --check-cache`,
         ]],
 });
-const MERGE_CONFLICT_ANCESTOR = `|||||||`;
-const MERGE_CONFLICT_END = `>>>>>>>`;
-const MERGE_CONFLICT_SEP = `=======`;
+exports.default = YarnCommand;
 const MERGE_CONFLICT_START = `<<<<<<<`;
 async function autofixMergeConflicts(configuration, immutable) {
     if (!configuration.projectCwd)
@@ -318,22 +315,67 @@ async function autofixMergeConflicts(configuration, immutable) {
         return false;
     if (immutable)
         throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_IMMUTABLE, `Cannot autofix a lockfile when running an immutable install`);
-    const [left, right] = getVariants(file);
-    let parsedLeft;
-    let parsedRight;
-    try {
-        parsedLeft = (0, parsers_1.parseSyml)(left);
-        parsedRight = (0, parsers_1.parseSyml)(right);
+    let commits = await core_1.execUtils.execvp(`git`, [`rev-parse`, `MERGE_HEAD`, `HEAD`], {
+        cwd: configuration.projectCwd,
+    });
+    if (commits.code !== 0) {
+        commits = await core_1.execUtils.execvp(`git`, [`rev-parse`, `REBASE_HEAD`, `HEAD`], {
+            cwd: configuration.projectCwd,
+        });
     }
-    catch (error) {
-        throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_FAILED_TO_PARSE, `The individual variants of the lockfile failed to parse`);
+    if (commits.code !== 0) {
+        commits = await core_1.execUtils.execvp(`git`, [`rev-parse`, `CHERRY_PICK_HEAD`, `HEAD`], {
+            cwd: configuration.projectCwd,
+        });
     }
-    const merged = {
-        ...parsedLeft,
-        ...parsedRight,
-    };
+    if (commits.code !== 0)
+        throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_GIT_ERROR, `Git returned an error when trying to find the commits pertaining to the conflict`);
+    let variants = await Promise.all(commits.stdout.trim().split(/\n/).map(async (hash) => {
+        const content = await core_1.execUtils.execvp(`git`, [`show`, `${hash}:./${fslib_1.Filename.lockfile}`], {
+            cwd: configuration.projectCwd,
+        });
+        if (content.code !== 0)
+            throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_GIT_ERROR, `Git returned an error when trying to access the lockfile content in ${hash}`);
+        try {
+            return (0, parsers_1.parseSyml)(content.stdout);
+        }
+        catch {
+            throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_FAILED_TO_PARSE, `A variant of the conflicting lockfile failed to parse`);
+        }
+    }));
     // Old-style lockfiles should be filtered out (for example when switching
-    // from a Yarn 2 branch to a Yarn 1 branch). Fortunately (?), they actually
+    // from a Yarn 2 branch to a Yarn 1 branch).
+    variants = variants.filter(variant => {
+        return !!variant.__metadata;
+    });
+    for (const variant of variants) {
+        // Pre-lockfile v7, the entries weren't normalized (ie we had "foo@x.y.z"
+        // in the lockfile rather than "foo@npm:x.y.z")
+        if (variant.__metadata.version < 7) {
+            for (const key of Object.keys(variant)) {
+                if (key === `__metadata`)
+                    continue;
+                const descriptor = core_1.structUtils.parseDescriptor(key, true);
+                const normalizedDescriptor = configuration.normalizeDependency(descriptor);
+                const newKey = core_1.structUtils.stringifyDescriptor(normalizedDescriptor);
+                if (newKey !== key) {
+                    variant[newKey] = variant[key];
+                    delete variant[key];
+                }
+            }
+        }
+    }
+    const merged = Object.assign({}, ...variants);
+    // We must keep the lockfile version as small as necessary to force Yarn to
+    // refresh the merged-in lockfile metadata that may be missing.
+    merged.__metadata.version = Math.min(0, ...variants.map(variant => {
+        var _a;
+        return (_a = variant.__metadata.version) !== null && _a !== void 0 ? _a : Infinity;
+    }));
+    merged.__metadata.cacheKey = Math.min(0, ...variants.map(variant => {
+        var _a;
+        return (_a = variant.__metadata.cacheKey) !== null && _a !== void 0 ? _a : 0;
+    }));
     // parse as valid YAML except that the objects become strings. We can use
     // that to detect them. Damn, it's really ugly though.
     for (const [key, value] of Object.entries(merged))
@@ -344,52 +386,3 @@ async function autofixMergeConflicts(configuration, immutable) {
     });
     return true;
 }
-function getVariants(file) {
-    const variants = [[], []];
-    const lines = file.split(/\r?\n/g);
-    let skip = false;
-    while (lines.length > 0) {
-        const line = lines.shift();
-        if (typeof line === `undefined`)
-            throw new Error(`Assertion failed: Some lines should remain`);
-        if (line.startsWith(MERGE_CONFLICT_START)) {
-            // get the first variant
-            while (lines.length > 0) {
-                const conflictLine = lines.shift();
-                if (typeof conflictLine === `undefined`)
-                    throw new Error(`Assertion failed: Some lines should remain`);
-                if (conflictLine === MERGE_CONFLICT_SEP) {
-                    skip = false;
-                    break;
-                }
-                else if (skip || conflictLine.startsWith(MERGE_CONFLICT_ANCESTOR)) {
-                    skip = true;
-                    continue;
-                }
-                else {
-                    variants[0].push(conflictLine);
-                }
-            }
-            // get the second variant
-            while (lines.length > 0) {
-                const conflictLine = lines.shift();
-                if (typeof conflictLine === `undefined`)
-                    throw new Error(`Assertion failed: Some lines should remain`);
-                if (conflictLine.startsWith(MERGE_CONFLICT_END)) {
-                    break;
-                }
-                else {
-                    variants[1].push(conflictLine);
-                }
-            }
-        }
-        else {
-            variants[0].push(line);
-            variants[1].push(line);
-        }
-    }
-    return [
-        variants[0].join(`\n`),
-        variants[1].join(`\n`),
-    ];
-}

package/lib/commands/link.d.ts

@@ -6,6 +6,6 @@ export default class LinkCommand extends BaseCommand {
     all: boolean;
     private: boolean;
     relative: boolean;
-    destination: string;
-    execute(): Promise<1 | 0>;
+    destinations: string[];
+    execute(): Promise<0 | 1>;
 }