@yarnpkg/plugin-essentials 4.0.0-rc.3 → 4.0.0-rc.30

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;
@@ -236,7 +239,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 +265,7 @@ AddCommand.usage = clipanion_1.Command.Usage({
             `$0 add lodash-es@lodash/lodash#es`,
         ]],
 });
-function suggestTarget(workspace, ident, { dev, peer, preferDev, optional }) {
+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/dedupe.js

@@ -91,7 +91,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.
 

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) => {

package/lib/commands/install.js

@@ -288,7 +288,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 +303,6 @@ 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 = `=======`;
 const MERGE_CONFLICT_START = `<<<<<<<`;
 async function autofixMergeConflicts(configuration, immutable) {
     if (!configuration.projectCwd)
@@ -318,22 +315,57 @@ 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);
-    }
-    catch (error) {
-        throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_FAILED_TO_PARSE, `The individual variants of the lockfile failed to parse`);
-    }
-    const merged = {
-        ...parsedLeft,
-        ...parsedRight,
-    };
+    const commits = await core_1.execUtils.execvp(`git`, [`rev-parse`, `MERGE_HEAD`, `HEAD`], {
+        cwd: configuration.projectCwd,
+    });
+    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 merge 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 +376,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;
+    destinations: string[];
     execute(): Promise<1 | 0>;
 }

package/lib/commands/link.js

@@ -9,15 +9,15 @@ class LinkCommand extends cli_1.BaseCommand {
     constructor() {
         super(...arguments);
         this.all = clipanion_1.Option.Boolean(`-A,--all`, false, {
-            description: `Link all workspaces belonging to the target project to the current one`,
+            description: `Link all workspaces belonging to the target projects to the current one`,
         });
         this.private = clipanion_1.Option.Boolean(`-p,--private`, false, {
-            description: `Also link private workspaces belonging to the target project to the current one`,
+            description: `Also link private workspaces belonging to the target projects to the current one`,
         });
         this.relative = clipanion_1.Option.Boolean(`-r,--relative`, false, {
             description: `Link workspaces using relative paths instead of absolute paths`,
         });
-        this.destination = clipanion_1.Option.String();
+        this.destinations = clipanion_1.Option.Rest();
     }
     async execute() {
         const configuration = await core_1.Configuration.find(this.context.cwd, this.context.plugins);
@@ -28,29 +28,35 @@ class LinkCommand extends cli_1.BaseCommand {
         await project.restoreInstallState({
             restoreResolutions: false,
         });
-        const absoluteDestination = fslib_1.ppath.resolve(this.context.cwd, fslib_1.npath.toPortablePath(this.destination));
-        const configuration2 = await core_1.Configuration.find(absoluteDestination, this.context.plugins, { useRc: false, strict: false });
-        const { project: project2, workspace: workspace2 } = await core_1.Project.find(configuration2, absoluteDestination);
-        if (project.cwd === project2.cwd)
-            throw new clipanion_1.UsageError(`Invalid destination; Can't link the project to itself`);
-        if (!workspace2)
-            throw new cli_1.WorkspaceRequiredError(project2.cwd, absoluteDestination);
         const topLevelWorkspace = project.topLevelWorkspace;
         const linkedWorkspaces = [];
-        if (this.all) {
-            for (const workspace of project2.workspaces)
-                if (workspace.manifest.name && (!workspace.manifest.private || this.private))
-                    linkedWorkspaces.push(workspace);
-            if (linkedWorkspaces.length === 0) {
-                throw new clipanion_1.UsageError(`No workspace found to be linked in the target project`);
+        for (const destination of this.destinations) {
+            const absoluteDestination = fslib_1.ppath.resolve(this.context.cwd, fslib_1.npath.toPortablePath(destination));
+            const configuration2 = await core_1.Configuration.find(absoluteDestination, this.context.plugins, { useRc: false, strict: false });
+            const { project: project2, workspace: workspace2 } = await core_1.Project.find(configuration2, absoluteDestination);
+            if (project.cwd === project2.cwd)
+                throw new clipanion_1.UsageError(`Invalid destination '${destination}'; Can't link the project to itself`);
+            if (!workspace2)
+                throw new cli_1.WorkspaceRequiredError(project2.cwd, absoluteDestination);
+            if (this.all) {
+                let found = false;
+                for (const workspace of project2.workspaces) {
+                    if (workspace.manifest.name && (!workspace.manifest.private || this.private)) {
+                        linkedWorkspaces.push(workspace);
+                        found = true;
+                    }
+                }
+                if (!found) {
+                    throw new clipanion_1.UsageError(`No workspace found to be linked in the target project: ${destination}`);
+                }
+            }
+            else {
+                if (!workspace2.manifest.name)
+                    throw new clipanion_1.UsageError(`The target workspace at '${destination}' doesn't have a name and thus cannot be linked`);
+                if (workspace2.manifest.private && !this.private)
+                    throw new clipanion_1.UsageError(`The target workspace at '${destination}' is marked private - use the --private flag to link it anyway`);
+                linkedWorkspaces.push(workspace2);
             }
-        }
-        else {
-            if (!workspace2.manifest.name)
-                throw new clipanion_1.UsageError(`The target workspace doesn't have a name and thus cannot be linked`);
-            if (workspace2.manifest.private && !this.private)
-                throw new clipanion_1.UsageError(`The target workspace is marked private - use the --private flag to link it anyway`);
-            linkedWorkspaces.push(workspace2);
         }
         for (const workspace of linkedWorkspaces) {
             const fullName = core_1.structUtils.stringifyIdent(workspace.locator);
@@ -81,8 +87,8 @@ LinkCommand.usage = clipanion_1.Command.Usage({
       This command will set a new \`resolutions\` field in the project-level manifest and point it to the workspace at the specified location (even if part of another project).
     `,
     examples: [[
-            `Register a remote workspace for use in the current project`,
-            `$0 link ~/ts-loader`,
+            `Register one or more remote workspaces for use in the current project`,
+            `$0 link ~/ts-loader ~/jest`,
         ], [
             `Register all workspaces from a remote project for use in the current project`,
             `$0 link ~/jest --all`,

package/lib/commands/plugin/check.d.ts

@@ -0,0 +1,8 @@
+import { BaseCommand } from '@yarnpkg/cli';
+import { Usage } from 'clipanion';
+export default class PluginCheckCommand extends BaseCommand {
+    static paths: string[][];
+    static usage: Usage;
+    json: boolean;
+    execute(): Promise<1 | 0>;
+}

package/lib/commands/plugin/check.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("@yarnpkg/cli");
+const core_1 = require("@yarnpkg/core");
+const clipanion_1 = require("clipanion");
+// eslint-disable-next-line arca/no-default-export
+class PluginCheckCommand extends cli_1.BaseCommand {
+    constructor() {
+        super(...arguments);
+        this.json = clipanion_1.Option.Boolean(`--json`, false, {
+            description: `Format the output as an NDJSON stream`,
+        });
+    }
+    async execute() {
+        const configuration = await core_1.Configuration.find(this.context.cwd, this.context.plugins);
+        const rcFiles = await core_1.Configuration.findRcFiles(this.context.cwd);
+        const report = await core_1.StreamReport.start({
+            configuration,
+            json: this.json,
+            stdout: this.context.stdout,
+        }, async (report) => {
+            var _a;
+            for (const rcFile of rcFiles) {
+                if (!((_a = rcFile.data) === null || _a === void 0 ? void 0 : _a.plugins))
+                    continue;
+                for (const plugin of rcFile.data.plugins) {
+                    if (!plugin.checksum)
+                        continue;
+                    if (!plugin.spec.match(/^https?:/))
+                        continue;
+                    const newBuffer = await core_1.httpUtils.get(plugin.spec, { configuration });
+                    const newChecksum = core_1.hashUtils.makeHash(newBuffer);
+                    if (plugin.checksum === newChecksum)
+                        continue;
+                    const prettyPath = core_1.formatUtils.pretty(configuration, plugin.path, core_1.formatUtils.Type.PATH);
+                    const prettySpec = core_1.formatUtils.pretty(configuration, plugin.spec, core_1.formatUtils.Type.URL);
+                    const prettyMessage = `${prettyPath} is different from the file provided by ${prettySpec}`;
+                    report.reportJson({ ...plugin, newChecksum });
+                    report.reportError(core_1.MessageName.UNNAMED, prettyMessage);
+                }
+            }
+        });
+        return report.exitCode();
+    }
+}
+exports.default = PluginCheckCommand;
+PluginCheckCommand.paths = [
+    [`plugin`, `check`],
+];
+PluginCheckCommand.usage = clipanion_1.Command.Usage({
+    category: `Plugin-related commands`,
+    description: `find all third-party plugins that differ from their own spec`,
+    details: `
+      Check only the plugins from https.
+
+      If this command detects any plugin differences in the CI environment, it will throw an error.
+    `,
+    examples: [[
+            `find all third-party plugins that differ from their own spec`,
+            `$0 plugin check`,
+        ]],
+});

package/lib/commands/plugin/import/sources.d.ts

@@ -3,7 +3,7 @@ import { Report, CommandContext } from '@yarnpkg/core';
 import { Project } from '@yarnpkg/core';
 import { PortablePath } from '@yarnpkg/fslib';
 import { Usage } from 'clipanion';
-export default class PluginDlSourcesCommand extends BaseCommand {
+export default class PluginImportSourcesCommand extends BaseCommand {
     static paths: string[][];
     static usage: Usage;
     installPath: string | undefined;
@@ -14,7 +14,7 @@ export default class PluginDlSourcesCommand extends BaseCommand {
     name: string;
     execute(): Promise<1 | 0>;
 }
-export declare type BuildAndSavePluginsSpec = {
+export type BuildAndSavePluginsSpec = {
     context: CommandContext;
     noMinify: boolean;
 };

package/lib/commands/plugin/import/sources.js

@@ -14,7 +14,7 @@ const buildWorkflow = ({ pluginName, noMinify }, target) => [
     [`yarn`, `build:${pluginName}`, ...noMinify ? [`--no-minify`] : [], `|`],
 ];
 // eslint-disable-next-line arca/no-default-export
-class PluginDlSourcesCommand extends cli_1.BaseCommand {
+class PluginImportSourcesCommand extends cli_1.BaseCommand {
     constructor() {
         super(...arguments);
         this.installPath = clipanion_1.Option.String(`--path`, {
@@ -56,11 +56,11 @@ class PluginDlSourcesCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = PluginDlSourcesCommand;
-PluginDlSourcesCommand.paths = [
+exports.default = PluginImportSourcesCommand;
+PluginImportSourcesCommand.paths = [
     [`plugin`, `import`, `from`, `sources`],
 ];
-PluginDlSourcesCommand.usage = clipanion_1.Command.Usage({
+PluginImportSourcesCommand.usage = clipanion_1.Command.Usage({
     category: `Plugin-related commands`,
     description: `build a plugin from sources`,
     details: `

package/lib/commands/plugin/import.d.ts

@@ -1,15 +1,16 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { BaseCommand } from '@yarnpkg/cli';
 import { Project, Report } from '@yarnpkg/core';
 import { Usage } from 'clipanion';
-export default class PluginDlCommand extends BaseCommand {
+export default class PluginImportCommand extends BaseCommand {
     static paths: string[][];
     static usage: Usage;
     name: string;
+    checksum: boolean;
     execute(): Promise<1 | 0>;
 }
-export declare function savePlugin(pluginSpec: string, pluginBuffer: Buffer, { project, report }: {
+export declare function savePlugin(pluginSpec: string, pluginBuffer: Buffer, { checksum, project, report }: {
+    checksum?: boolean;
     project: Project;
     report: Report;
 }): Promise<void>;

package/lib/commands/plugin/import.js

@@ -12,10 +12,13 @@ const url_1 = require("url");
 const vm_1 = require("vm");
 const list_1 = require("./list");
 // eslint-disable-next-line arca/no-default-export
-class PluginDlCommand extends cli_1.BaseCommand {
+class PluginImportCommand extends cli_1.BaseCommand {
     constructor() {
         super(...arguments);
         this.name = clipanion_1.Option.String();
+        this.checksum = clipanion_1.Option.Boolean(`--checksum`, true, {
+            description: `Whether to care if this plugin is modified`,
+        });
     }
     async execute() {
         const configuration = await core_1.Configuration.find(this.context.cwd, this.context.plugins);
@@ -70,16 +73,16 @@ class PluginDlCommand extends cli_1.BaseCommand {
                 report.reportInfo(core_1.MessageName.UNNAMED, `Downloading ${core_2.formatUtils.pretty(configuration, pluginUrl, `green`)}`);
                 pluginBuffer = await core_2.httpUtils.get(pluginUrl, { configuration });
             }
-            await savePlugin(pluginSpec, pluginBuffer, { project, report });
+            await savePlugin(pluginSpec, pluginBuffer, { checksum: this.checksum, project, report });
         });
         return report.exitCode();
     }
 }
-exports.default = PluginDlCommand;
-PluginDlCommand.paths = [
+exports.default = PluginImportCommand;
+PluginImportCommand.paths = [
     [`plugin`, `import`],
 ];
-PluginDlCommand.usage = clipanion_1.Command.Usage({
+PluginImportCommand.usage = clipanion_1.Command.Usage({
     category: `Plugin-related commands`,
     description: `download a plugin`,
     details: `
@@ -91,6 +94,8 @@ PluginDlCommand.usage = clipanion_1.Command.Usage({
       - Third-party plugins can be referenced directly through their public urls.
       - Local plugins can be referenced by their path on the disk.
 
+      If the \`--no-checksum\` option is set, Yarn will no longer care if the plugin is modified.
+
       Plugins cannot be downloaded from the npm registry, and aren't allowed to have dependencies (they need to be bundled into a single file, possibly thanks to the \`@yarnpkg/builder\` package).
     `,
     examples: [[
@@ -107,7 +112,7 @@ PluginDlCommand.usage = clipanion_1.Command.Usage({
             `$0 plugin import ./path/to/plugin.js`,
         ]],
 });
-async function savePlugin(pluginSpec, pluginBuffer, { project, report }) {
+async function savePlugin(pluginSpec, pluginBuffer, { checksum = true, project, report }) {
     const { configuration } = project;
     const vmExports = {};
     const vmModule = { exports: vmExports };
@@ -125,26 +130,8 @@ async function savePlugin(pluginSpec, pluginBuffer, { project, report }) {
         path: relativePath,
         spec: pluginSpec,
     };
-    await core_1.Configuration.updateConfiguration(project.cwd, (current) => {
-        const plugins = [];
-        let hasBeenReplaced = false;
-        for (const entry of current.plugins || []) {
-            const userProvidedPath = typeof entry !== `string`
-                ? entry.path
-                : entry;
-            const pluginPath = fslib_1.ppath.resolve(project.cwd, fslib_1.npath.toPortablePath(userProvidedPath));
-            const { name } = core_1.miscUtils.dynamicRequire(pluginPath);
-            if (name !== pluginName) {
-                plugins.push(entry);
-            }
-            else {
-                plugins.push(pluginMeta);
-                hasBeenReplaced = true;
-            }
-        }
-        if (!hasBeenReplaced)
-            plugins.push(pluginMeta);
-        return { ...current, plugins };
-    });
+    if (checksum)
+        pluginMeta.checksum = core_2.hashUtils.makeHash(pluginBuffer);
+    await core_1.Configuration.addPlugin(project.cwd, [pluginMeta]);
 }
 exports.savePlugin = savePlugin;

package/lib/commands/plugin/list.d.ts

@@ -4,7 +4,7 @@ import { Usage } from 'clipanion';
 export declare function getAvailablePlugins(configuration: Configuration, version: string | null): Promise<{
     [k: string]: any;
 }>;
-export default class PluginDlCommand extends BaseCommand {
+export default class PluginListCommand extends BaseCommand {
     static paths: string[][];
     static usage: Usage;
     json: boolean;

package/lib/commands/plugin/list.js

@@ -16,7 +16,7 @@ async function getAvailablePlugins(configuration, version) {
 }
 exports.getAvailablePlugins = getAvailablePlugins;
 // eslint-disable-next-line arca/no-default-export
-class PluginDlCommand extends cli_1.BaseCommand {
+class PluginListCommand extends cli_1.BaseCommand {
     constructor() {
         super(...arguments);
         this.json = clipanion_1.Option.Boolean(`--json`, false, {
@@ -42,11 +42,11 @@ class PluginDlCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = PluginDlCommand;
-PluginDlCommand.paths = [
+exports.default = PluginListCommand;
+PluginListCommand.paths = [
     [`plugin`, `list`],
 ];
-PluginDlCommand.usage = clipanion_1.Command.Usage({
+PluginListCommand.usage = clipanion_1.Command.Usage({
     category: `Plugin-related commands`,
     description: `list the available official plugins`,
     details: `

package/lib/commands/plugin/runtime.d.ts

@@ -1,6 +1,6 @@
 import { BaseCommand } from '@yarnpkg/cli';
 import { Usage } from 'clipanion';
-export default class PluginListCommand extends BaseCommand {
+export default class PluginRuntimeCommand extends BaseCommand {
     static paths: string[][];
     static usage: Usage;
     json: boolean;

package/lib/commands/plugin/runtime.js

@@ -4,7 +4,7 @@ const cli_1 = require("@yarnpkg/cli");
 const core_1 = require("@yarnpkg/core");
 const clipanion_1 = require("clipanion");
 // eslint-disable-next-line arca/no-default-export
-class PluginListCommand extends cli_1.BaseCommand {
+class PluginRuntimeCommand extends cli_1.BaseCommand {
     constructor() {
         super(...arguments);
         this.json = clipanion_1.Option.Boolean(`--json`, false, {
@@ -30,11 +30,11 @@ class PluginListCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = PluginListCommand;
-PluginListCommand.paths = [
+exports.default = PluginRuntimeCommand;
+PluginRuntimeCommand.paths = [
     [`plugin`, `runtime`],
 ];
-PluginListCommand.usage = clipanion_1.Command.Usage({
+PluginRuntimeCommand.usage = clipanion_1.Command.Usage({
     category: `Plugin-related commands`,
     description: `list the active plugins`,
     details: `