@yarnpkg/plugin-essentials 4.0.0-rc.8 → 4.0.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,32 +28,38 @@ 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);
+            const fullName = core_1.structUtils.stringifyIdent(workspace.anchoredLocator);
             const target = this.relative
                 ? fslib_1.ppath.relative(project.cwd, workspace.cwd)
                 : workspace.cwd;
@@ -62,16 +68,13 @@ class LinkCommand extends cli_1.BaseCommand {
                 reference: `portal:${target}`,
             });
         }
-        const report = await core_1.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             stdout: this.context.stdout,
-        }, async (report) => {
-            await project.install({ cache, report });
+        }, {
+            cache,
         });
-        return report.exitCode();
     }
 }
-exports.default = LinkCommand;
 LinkCommand.paths = [
     [`link`],
 ];
@@ -81,10 +84,11 @@ 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`,
         ]],
 });
+exports.default = LinkCommand;

package/lib/commands/node.js

@@ -12,7 +12,6 @@ class NodeCommand extends cli_1.BaseCommand {
         return this.cli.run([`exec`, `node`, ...this.args]);
     }
 }
-exports.default = NodeCommand;
 NodeCommand.paths = [
     [`node`],
 ];
@@ -28,3 +27,4 @@ NodeCommand.usage = clipanion_1.Command.Usage({
             `$0 node ./my-script.js`,
         ]],
 });
+exports.default = NodeCommand;

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<0 | 1>;
+}

package/lib/commands/plugin/check.js

@@ -0,0 +1,61 @@
+"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) => {
+            for (const rcFile of rcFiles) {
+                if (!rcFile.data?.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();
+    }
+}
+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`,
+        ]],
+});
+exports.default = PluginCheckCommand;

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;
@@ -12,9 +12,9 @@ export default class PluginDlSourcesCommand extends BaseCommand {
     noMinify: boolean;
     force: boolean;
     name: string;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }
-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`, {
@@ -47,7 +47,7 @@ class PluginDlSourcesCommand extends cli_1.BaseCommand {
             const ident = core_1.structUtils.parseIdent(this.name.replace(/^((@yarnpkg\/)?plugin-)?/, `@yarnpkg/plugin-`));
             const identStr = core_1.structUtils.stringifyIdent(ident);
             const data = await (0, list_1.getAvailablePlugins)(configuration, core_1.YarnVersion);
-            if (!Object.prototype.hasOwnProperty.call(data, identStr))
+            if (!Object.hasOwn(data, identStr))
                 throw new core_2.ReportError(core_2.MessageName.PLUGIN_NAME_NOT_FOUND, `Couldn't find a plugin named "${identStr}" on the remote registry. Note that only the plugins referenced on our website (https://github.com/yarnpkg/berry/blob/master/plugins.yml) can be built and imported from sources.`);
             const pluginSpec = identStr;
             await (0, sources_1.prepareRepo)(this, { configuration, report, target });
@@ -56,11 +56,10 @@ class PluginDlSourcesCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = PluginDlSourcesCommand;
-PluginDlSourcesCommand.paths = [
+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: `
@@ -76,6 +75,7 @@ PluginDlSourcesCommand.usage = clipanion_1.Command.Usage({
             `$0 plugin import from sources exec`,
         ]],
 });
+exports.default = PluginImportSourcesCommand;
 async function buildAndSavePlugin(pluginSpec, { context, noMinify }, { project, report, target }) {
     const pluginName = pluginSpec.replace(/@yarnpkg\//, ``);
     const { configuration } = project;

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;
-    execute(): Promise<1 | 0>;
+    checksum: boolean;
+    execute(): Promise<0 | 1>;
 }
-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);
@@ -50,7 +53,7 @@ class PluginDlCommand extends cli_1.BaseCommand {
                         throw new core_1.ReportError(core_1.MessageName.UNNAMED, `Official plugins only accept strict version references. Use an explicit URL if you wish to download them from another location.`);
                     const identStr = core_2.structUtils.stringifyIdent(locator);
                     const data = await (0, list_1.getAvailablePlugins)(configuration, core_2.YarnVersion);
-                    if (!Object.prototype.hasOwnProperty.call(data, identStr)) {
+                    if (!Object.hasOwn(data, identStr)) {
                         let message = `Couldn't find a plugin named ${core_2.structUtils.prettyIdent(configuration, locator)} on the remote registry.\n`;
                         if (configuration.plugins.has(identStr))
                             message += `A plugin named ${core_2.structUtils.prettyIdent(configuration, locator)} is already installed; possibly attempting to import a built-in plugin.`;
@@ -70,16 +73,15 @@ 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 = [
+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 +93,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 +111,8 @@ PluginDlCommand.usage = clipanion_1.Command.Usage({
             `$0 plugin import ./path/to/plugin.js`,
         ]],
 });
-async function savePlugin(pluginSpec, pluginBuffer, { project, report }) {
+exports.default = PluginImportCommand;
+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,9 +4,9 @@ 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;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/plugin/list.js

@@ -10,13 +10,12 @@ async function getAvailablePlugins(configuration, version) {
     const raw = await core_1.httpUtils.get(REMOTE_REGISTRY, { configuration });
     const data = (0, parsers_1.parseSyml)(raw.toString());
     return Object.fromEntries(Object.entries(data).filter(([pluginName, pluginData]) => {
-        var _a;
-        return !version || core_1.semverUtils.satisfiesWithPrereleases(version, (_a = pluginData.range) !== null && _a !== void 0 ? _a : `<4.0.0-rc.1`);
+        return !version || core_1.semverUtils.satisfiesWithPrereleases(version, pluginData.range ?? `<4.0.0-rc.1`);
     }));
 }
 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 +41,10 @@ class PluginDlCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = PluginDlCommand;
-PluginDlCommand.paths = [
+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: `
@@ -57,3 +55,4 @@ PluginDlCommand.usage = clipanion_1.Command.Usage({
             `$0 plugin list`,
         ]],
 });
+exports.default = PluginListCommand;

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

@@ -4,5 +4,5 @@ export default class PluginRemoveCommand extends BaseCommand {
     static paths: string[][];
     static usage: Usage;
     name: string;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/plugin/remove.js

@@ -28,24 +28,24 @@ class PluginRemoveCommand extends cli_1.BaseCommand {
                 await fslib_1.xfs.removePromise(absolutePath);
             }
             report.reportInfo(core_1.MessageName.UNNAMED, `Updating the configuration...`);
-            await core_1.Configuration.updateConfiguration(project.cwd, (current) => {
-                if (!Array.isArray(current.plugins))
-                    return current;
-                const plugins = current.plugins.filter((plugin) => {
-                    return plugin.path !== relativePath;
-                });
-                if (current.plugins.length === plugins.length)
-                    return current;
-                return {
-                    ...current,
-                    plugins,
-                };
+            await core_1.Configuration.updateConfiguration(project.cwd, {
+                plugins: plugins => {
+                    if (!Array.isArray(plugins))
+                        return plugins;
+                    const filteredPlugins = plugins.filter((plugin) => {
+                        return plugin.path !== relativePath;
+                    });
+                    if (filteredPlugins.length === 0)
+                        return core_1.Configuration.deleteProperty;
+                    if (filteredPlugins.length === plugins.length)
+                        return plugins;
+                    return filteredPlugins;
+                },
             });
         });
         return report.exitCode();
     }
 }
-exports.default = PluginRemoveCommand;
 PluginRemoveCommand.paths = [
     [`plugin`, `remove`],
 ];
@@ -65,3 +65,4 @@ PluginRemoveCommand.usage = clipanion_1.Command.Usage({
             `$0 plugin remove my-local-plugin`,
         ]],
 });
+exports.default = PluginRemoveCommand;

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

@@ -1,8 +1,8 @@
 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;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

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,10 @@ class PluginListCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = PluginListCommand;
-PluginListCommand.paths = [
+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: `
@@ -45,3 +44,4 @@ PluginListCommand.usage = clipanion_1.Command.Usage({
             `$0 plugin runtime`,
         ]],
 });
+exports.default = PluginRuntimeCommand;

package/lib/commands/rebuild.d.ts

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

package/lib/commands/rebuild.js

@@ -5,7 +5,7 @@ const core_1 = require("@yarnpkg/core");
 const core_2 = require("@yarnpkg/core");
 const clipanion_1 = require("clipanion");
 // eslint-disable-next-line arca/no-default-export
-class RunCommand extends cli_1.BaseCommand {
+class RebuildCommand extends cli_1.BaseCommand {
     constructor() {
         super(...arguments);
         this.idents = clipanion_1.Option.Rest();
@@ -30,27 +30,26 @@ class RunCommand extends cli_1.BaseCommand {
             for (const pkg of project.storedPackages.values()) {
                 if (filteredIdents.has(pkg.identHash)) {
                     project.storedBuildState.delete(pkg.locatorHash);
+                    project.skippedBuilds.delete(pkg.locatorHash);
                 }
             }
         }
         else {
             project.storedBuildState.clear();
+            project.skippedBuilds.clear();
         }
-        const installReport = await core_1.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             stdout: this.context.stdout,
-            includeLogs: !this.context.quiet,
-        }, async (report) => {
-            await project.install({ cache, report });
+            quiet: this.context.quiet,
+        }, {
+            cache,
         });
-        return installReport.exitCode();
     }
 }
-exports.default = RunCommand;
-RunCommand.paths = [
+RebuildCommand.paths = [
     [`rebuild`],
 ];
-RunCommand.usage = clipanion_1.Command.Usage({
+RebuildCommand.usage = clipanion_1.Command.Usage({
     description: `rebuild the project's native packages`,
     details: `
       This command will automatically cause Yarn to forget about previous compilations of the given packages and to run them again.
@@ -67,3 +66,4 @@ RunCommand.usage = clipanion_1.Command.Usage({
             `$0 rebuild fsevents`,
         ]],
 });
+exports.default = RebuildCommand;

package/lib/commands/remove.d.ts

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

package/lib/commands/remove.js

@@ -89,21 +89,19 @@ class RemoveCommand extends cli_1.BaseCommand {
             ? `any`
             : `this`;
         if (unreferencedPatterns.length > 0)
-            throw new clipanion_1.UsageError(`${patterns} ${core_1.formatUtils.prettyList(configuration, unreferencedPatterns, core_1.FormatType.CODE)} ${dont} match any packages referenced by ${which} workspace`);
+            throw new clipanion_1.UsageError(`${patterns} ${core_1.formatUtils.prettyList(configuration, unreferencedPatterns, core_1.formatUtils.Type.CODE)} ${dont} match any packages referenced by ${which} workspace`);
         if (hasChanged) {
             await configuration.triggerMultipleHooks((hooks) => hooks.afterWorkspaceDependencyRemoval, afterWorkspaceDependencyRemovalList);
-            const report = await core_2.StreamReport.start({
-                configuration,
+            return await project.installWithNewReport({
                 stdout: this.context.stdout,
-            }, async (report) => {
-                await project.install({ cache, report, mode: this.mode });
+            }, {
+                cache,
+                mode: this.mode,
             });
-            return report.exitCode();
         }
         return 0;
     }
 }
-exports.default = RemoveCommand;
 RemoveCommand.paths = [
     [`remove`],
 ];
@@ -114,7 +112,7 @@ RemoveCommand.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.
 
@@ -137,3 +135,4 @@ RemoveCommand.usage = clipanion_1.Command.Usage({
             `$0 remove 'react-{dom,helmet}'`,
         ]],
 });
+exports.default = RemoveCommand;

package/lib/commands/run.js

@@ -117,7 +117,6 @@ class RunCommand extends cli_1.BaseCommand {
         }
     }
 }
-exports.default = RunCommand;
 RunCommand.paths = [
     [`run`],
 ];
@@ -145,3 +144,4 @@ RunCommand.usage = clipanion_1.Command.Usage({
             `$0 run --inspect-brk webpack`,
         ]],
 });
+exports.default = RunCommand;

package/lib/commands/runIndex.d.ts

@@ -1,5 +1,5 @@
 import { BaseCommand } from '@yarnpkg/cli';
-export default class RunCommand extends BaseCommand {
+export default class RunIndexCommand extends BaseCommand {
     static paths: string[][];
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }