@yarnpkg/plugin-essentials 4.0.0-rc.9 → 4.0.1

package/lib/commands/runIndex.js

@@ -5,7 +5,7 @@ const core_1 = require("@yarnpkg/core");
 const core_2 = require("@yarnpkg/core");
 const util_1 = require("util");
 // eslint-disable-next-line arca/no-default-export
-class RunCommand extends cli_1.BaseCommand {
+class RunIndexCommand extends cli_1.BaseCommand {
     async execute() {
         const configuration = await core_1.Configuration.find(this.context.cwd, this.context.plugins);
         const { project, workspace } = await core_1.Project.find(configuration, this.context.cwd);
@@ -32,7 +32,7 @@ class RunCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = RunCommand;
-RunCommand.paths = [
+RunIndexCommand.paths = [
     [`run`],
 ];
+exports.default = RunIndexCommand;

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

@@ -6,5 +6,5 @@ export default class SetResolutionCommand extends BaseCommand {
     save: boolean;
     descriptor: string;
     resolution: string;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/set/resolution.js

@@ -28,16 +28,13 @@ class SetResolutionCommand extends cli_1.BaseCommand {
         project.storedDescriptors.set(fromDescriptor.descriptorHash, fromDescriptor);
         project.storedDescriptors.set(toDescriptor.descriptorHash, toDescriptor);
         project.resolutionAliases.set(fromDescriptor.descriptorHash, toDescriptor.descriptorHash);
-        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 = SetResolutionCommand;
 SetResolutionCommand.paths = [
     [`set`, `resolution`],
 ];
@@ -55,3 +52,4 @@ SetResolutionCommand.usage = clipanion_1.Command.Usage({
             `$0 set resolution lodash@npm:^1.2.3 1.5.0`,
         ]],
 });
+exports.default = SetResolutionCommand;

package/lib/commands/set/version/sources.d.ts

@@ -9,17 +9,18 @@ export default class SetVersionSourcesCommand extends BaseCommand {
     repository: string;
     branch: string;
     plugins: string[];
+    dryRun: boolean;
     noMinify: boolean;
     force: boolean;
     skipPlugins: boolean;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }
 export declare function runWorkflow(workflow: Array<Array<string>>, { configuration, context, target }: {
     configuration: Configuration;
     context: CommandContext;
     target: PortablePath;
 }): Promise<void>;
-export declare type PrepareSpec = {
+export type PrepareSpec = {
     branch: string;
     context: CommandContext;
     force: boolean;

package/lib/commands/set/version/sources.js

@@ -27,10 +27,11 @@ const cloneWorkflow = ({ repository, branch }, target) => [
 const updateWorkflow = ({ branch }) => [
     [`git`, `fetch`, `origin`, `--depth=1`, getBranchRef(branch), `--force`],
     [`git`, `reset`, `--hard`, `FETCH_HEAD`],
-    [`git`, `clean`, `-dfx`],
+    [`git`, `clean`, `-dfx`, `-e`, `packages/yarnpkg-cli/bundles`],
 ];
-const buildWorkflow = ({ plugins, noMinify }, target) => [
+const buildWorkflow = ({ plugins, noMinify }, output, target) => [
     [`yarn`, `build:cli`, ...new Array().concat(...plugins.map(plugin => [`--plugin`, fslib_1.ppath.resolve(target, plugin)])), ...noMinify ? [`--no-minify`] : [], `|`],
+    [`mv`, `packages/yarnpkg-cli/bundles/yarn.js`, fslib_1.npath.fromPortablePath(output), `|`],
 ];
 // eslint-disable-next-line arca/no-default-export
 class SetVersionSourcesCommand extends cli_1.BaseCommand {
@@ -48,6 +49,9 @@ class SetVersionSourcesCommand extends cli_1.BaseCommand {
         this.plugins = clipanion_1.Option.Array(`--plugin`, [], {
             description: `An array of additional plugins that should be included in the bundle`,
         });
+        this.dryRun = clipanion_1.Option.Boolean(`-n,--dry-run`, false, {
+            description: `If set, the bundle will be built but not added to the project`,
+        });
         this.noMinify = clipanion_1.Option.Boolean(`--no-minify`, false, {
             description: `Build a bundle for development (debugging) - non-minified and non-mangled`,
         });
@@ -72,21 +76,25 @@ class SetVersionSourcesCommand extends cli_1.BaseCommand {
             report.reportSeparator();
             report.reportInfo(core_1.MessageName.UNNAMED, `Building a fresh bundle`);
             report.reportSeparator();
-            await runWorkflow(buildWorkflow(this, target), { configuration, context: this.context, target });
-            report.reportSeparator();
-            const bundlePath = fslib_1.ppath.resolve(target, `packages/yarnpkg-cli/bundles/yarn.js`);
+            const commitHash = await core_1.execUtils.execvp(`git`, [`rev-parse`, `--short`, `HEAD`], { cwd: target, strict: true });
+            const bundlePath = fslib_1.ppath.join(target, `packages/yarnpkg-cli/bundles/yarn-${commitHash.stdout.trim()}.js`);
+            if (!fslib_1.xfs.existsSync(bundlePath)) {
+                await runWorkflow(buildWorkflow(this, bundlePath, target), { configuration, context: this.context, target });
+                report.reportSeparator();
+            }
             const bundleBuffer = await fslib_1.xfs.readFilePromise(bundlePath);
-            const { bundleVersion } = await (0, version_1.setVersion)(configuration, null, async () => bundleBuffer, {
-                report,
-            });
-            if (!this.skipPlugins) {
-                await updatePlugins(this, bundleVersion, { project, report, target });
+            if (!this.dryRun) {
+                const { bundleVersion } = await (0, version_1.setVersion)(configuration, null, async () => bundleBuffer, {
+                    report,
+                });
+                if (!this.skipPlugins) {
+                    await updatePlugins(this, bundleVersion, { project, report, target });
+                }
             }
         });
         return report.exitCode();
     }
 }
-exports.default = SetVersionSourcesCommand;
 SetVersionSourcesCommand.paths = [
     [`set`, `version`, `from`, `sources`],
 ];
@@ -102,6 +110,7 @@ SetVersionSourcesCommand.usage = clipanion_1.Command.Usage({
             `$0 set version from sources`,
         ]],
 });
+exports.default = SetVersionSourcesCommand;
 async function runWorkflow(workflow, { configuration, context, target }) {
     for (const [fileName, ...args] of workflow) {
         const usePipe = args[args.length - 1] === `|`;
@@ -141,7 +150,7 @@ async function prepareRepo(spec, { configuration, report, target }) {
             await runWorkflow(updateWorkflow(spec), { configuration, context: spec.context, target });
             ready = true;
         }
-        catch (error) {
+        catch {
             report.reportSeparator();
             report.reportWarning(core_1.MessageName.UNNAMED, `Repository update failed; we'll try to regenerate it`);
         }

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

@@ -1,9 +1,8 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { BaseCommand } from '@yarnpkg/cli';
 import { Configuration, Report } from '@yarnpkg/core';
 import { Usage } from 'clipanion';
-export declare type Tags = {
+export type Tags = {
     latest: Record<string, string>;
     tags: Array<string>;
 };
@@ -13,7 +12,7 @@ export default class SetVersionCommand extends BaseCommand {
     useYarnPath: boolean | undefined;
     onlyIfNeeded: boolean;
     version: string;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }
 export declare function resolveRange(configuration: Configuration, request: string): Promise<string>;
 export declare function resolveTag(configuration: Configuration, request: `stable` | `canary`): Promise<string>;

package/lib/commands/set/version.js

@@ -22,8 +22,15 @@ class SetVersionCommand extends cli_1.BaseCommand {
     }
     async execute() {
         const configuration = await core_1.Configuration.find(this.context.cwd, this.context.plugins);
-        if (configuration.get(`yarnPath`) && this.onlyIfNeeded)
-            return 0;
+        if (this.onlyIfNeeded && configuration.get(`yarnPath`)) {
+            const yarnPathSource = configuration.sources.get(`yarnPath`);
+            if (!yarnPathSource)
+                throw new Error(`Assertion failed: Expected 'yarnPath' to have a source`);
+            const projectCwd = configuration.projectCwd ?? configuration.startingCwd;
+            if (fslib_1.ppath.contains(projectCwd, yarnPathSource)) {
+                return 0;
+            }
+        }
         const getBundlePath = () => {
             if (typeof core_1.YarnVersion === `undefined`)
                 throw new clipanion_1.UsageError(`The --install flag can only be used without explicit version specifier from the Yarn CLI`);
@@ -34,13 +41,13 @@ class SetVersionCommand extends cli_1.BaseCommand {
             return { version, url: url.replace(/\{\}/g, version) };
         };
         if (this.version === `self`)
-            bundleRef = { url: getBundlePath(), version: core_1.YarnVersion !== null && core_1.YarnVersion !== void 0 ? core_1.YarnVersion : `self` };
+            bundleRef = { url: getBundlePath(), version: core_1.YarnVersion ?? `self` };
         else if (this.version === `latest` || this.version === `berry` || this.version === `stable`)
             bundleRef = getRef(`https://repo.yarnpkg.com/{}/packages/yarnpkg-cli/bin/yarn.js`, await resolveTag(configuration, `stable`));
         else if (this.version === `canary`)
             bundleRef = getRef(`https://repo.yarnpkg.com/{}/packages/yarnpkg-cli/bin/yarn.js`, await resolveTag(configuration, `canary`));
         else if (this.version === `classic`)
-            bundleRef = { url: `https://nightly.yarnpkg.com/latest.js`, version: `classic` };
+            bundleRef = { url: `https://classic.yarnpkg.com/latest.js`, version: `classic` };
         else if (this.version.match(/^https?:/))
             bundleRef = { url: this.version, version: `remote` };
         else if (this.version.match(/^\.{0,2}[\\/]/) || fslib_1.npath.isAbsolute(this.version))
@@ -61,11 +68,11 @@ class SetVersionCommand extends cli_1.BaseCommand {
             const fetchBuffer = async () => {
                 const filePrefix = `file://`;
                 if (bundleRef.url.startsWith(filePrefix)) {
-                    report.reportInfo(core_1.MessageName.UNNAMED, `Retrieving ${core_2.formatUtils.pretty(configuration, bundleRef.url, core_1.FormatType.PATH)}`);
+                    report.reportInfo(core_1.MessageName.UNNAMED, `Retrieving ${core_2.formatUtils.pretty(configuration, bundleRef.url, core_2.formatUtils.Type.PATH)}`);
                     return await fslib_1.xfs.readFilePromise(bundleRef.url.slice(filePrefix.length));
                 }
                 else {
-                    report.reportInfo(core_1.MessageName.UNNAMED, `Downloading ${core_2.formatUtils.pretty(configuration, bundleRef.url, core_1.FormatType.URL)}`);
+                    report.reportInfo(core_1.MessageName.UNNAMED, `Downloading ${core_2.formatUtils.pretty(configuration, bundleRef.url, core_2.formatUtils.Type.URL)}`);
                     return await core_2.httpUtils.get(bundleRef.url, { configuration });
                 }
             };
@@ -74,7 +81,6 @@ class SetVersionCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = SetVersionCommand;
 SetVersionCommand.paths = [
     [`set`, `version`],
 ];
@@ -85,7 +91,7 @@ SetVersionCommand.usage = clipanion_1.Command.Usage({
 
       By default it only will set the \`packageManager\` field at the root of your project, but if the referenced release cannot be represented this way, if you already have \`yarnPath\` configured, or if you set the \`--yarn-path\` command line flag, then the release will also be downloaded from the Yarn GitHub repository, stored inside your project, and referenced via the \`yarnPath\` settings from your project \`.yarnrc.yml\` file.
 
-      A very good use case for this command is to enforce the version of Yarn used by the any single member of your team inside a same project - by doing this you ensure that you have control on Yarn upgrades and downgrades (including on your deployment servers), and get rid of most of the headaches related to someone using a slightly different version and getting a different behavior than you.
+      A very good use case for this command is to enforce the version of Yarn used by any single member of your team inside the same project - by doing this you ensure that you have control over Yarn upgrades and downgrades (including on your deployment servers), and get rid of most of the headaches related to someone using a slightly different version and getting different behavior.
 
       The version specifier can be:
 
@@ -131,6 +137,7 @@ SetVersionCommand.usage = clipanion_1.Command.Usage({
             `$0 set version self`,
         ]],
 });
+exports.default = SetVersionCommand;
 async function resolveRange(configuration, request) {
     const data = await core_2.httpUtils.get(`https://repo.yarnpkg.com/tags`, { configuration, jsonResponse: true });
     const candidates = data.tags.filter(version => core_2.semverUtils.satisfiesWithPrereleases(version, request));
@@ -148,7 +155,6 @@ async function resolveTag(configuration, request) {
 }
 exports.resolveTag = resolveTag;
 async function setVersion(configuration, bundleVersion, fetchBuffer, { report, useYarnPath }) {
-    var _a;
     let bundleBuffer;
     const ensureBuffer = async () => {
         if (typeof bundleBuffer === `undefined`)
@@ -162,7 +168,7 @@ async function setVersion(configuration, bundleVersion, fetchBuffer, { report, u
             await fslib_1.xfs.writeFilePromise(temporaryPath, bundleBuffer);
             const { stdout } = await core_2.execUtils.execvp(process.execPath, [fslib_1.npath.fromPortablePath(temporaryPath), `--version`], {
                 cwd: tmpDir,
-                env: { ...process.env, YARN_IGNORE_PATH: `1` },
+                env: { ...configuration.env, YARN_IGNORE_PATH: `1` },
             });
             bundleVersion = stdout.trim();
             if (!semver_1.default.valid(bundleVersion)) {
@@ -170,7 +176,7 @@ async function setVersion(configuration, bundleVersion, fetchBuffer, { report, u
             }
         });
     }
-    const projectCwd = (_a = configuration.projectCwd) !== null && _a !== void 0 ? _a : configuration.startingCwd;
+    const projectCwd = configuration.projectCwd ?? configuration.startingCwd;
     const releaseFolder = fslib_1.ppath.resolve(projectCwd, `.yarn/releases`);
     const absolutePath = fslib_1.ppath.resolve(releaseFolder, `yarn-${bundleVersion}.cjs`);
     const displayPath = fslib_1.ppath.relative(configuration.startingCwd, absolutePath);
@@ -193,11 +199,9 @@ async function setVersion(configuration, bundleVersion, fetchBuffer, { report, u
         await fslib_1.xfs.removePromise(fslib_1.ppath.dirname(absolutePath));
         await fslib_1.xfs.mkdirPromise(fslib_1.ppath.dirname(absolutePath), { recursive: true });
         await fslib_1.xfs.writeFilePromise(absolutePath, bundleBuffer, { mode: 0o755 });
-        if (!yarnPath || fslib_1.ppath.contains(releaseFolder, yarnPath)) {
-            await core_1.Configuration.updateConfiguration(projectCwd, {
-                yarnPath: fslib_1.ppath.relative(projectCwd, absolutePath),
-            });
-        }
+        await core_1.Configuration.updateConfiguration(projectCwd, {
+            yarnPath: fslib_1.ppath.relative(projectCwd, absolutePath),
+        });
     }
     else {
         await fslib_1.xfs.removePromise(fslib_1.ppath.dirname(absolutePath));

package/lib/commands/unlink.d.ts

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

package/lib/commands/unlink.js

@@ -41,7 +41,7 @@ class UnlinkCommand extends cli_1.BaseCommand {
                     if (this.all) {
                         for (const workspace of project2.workspaces)
                             if (workspace.manifest.name)
-                                workspacesToUnlink.add(core_1.structUtils.stringifyIdent(workspace.locator));
+                                workspacesToUnlink.add(core_1.structUtils.stringifyIdent(workspace.anchoredLocator));
                         if (workspacesToUnlink.size === 0) {
                             throw new clipanion_1.UsageError(`No workspace found to be unlinked in the target project`);
                         }
@@ -49,7 +49,7 @@ class UnlinkCommand extends cli_1.BaseCommand {
                     else {
                         if (!workspace2.manifest.name)
                             throw new clipanion_1.UsageError(`The target workspace doesn't have a name and thus cannot be unlinked`);
-                        workspacesToUnlink.add(core_1.structUtils.stringifyIdent(workspace2.locator));
+                        workspacesToUnlink.add(core_1.structUtils.stringifyIdent(workspace2.anchoredLocator));
                     }
                 }
                 else {
@@ -63,16 +63,14 @@ class UnlinkCommand extends cli_1.BaseCommand {
         topLevelWorkspace.manifest.resolutions = topLevelWorkspace.manifest.resolutions.filter(({ pattern }) => {
             return !workspacesToUnlink.has(pattern.descriptor.fullName);
         });
-        const report = await core_1.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             stdout: this.context.stdout,
-        }, async (report) => {
-            await project.install({ cache, report });
+            quiet: this.context.quiet,
+        }, {
+            cache,
         });
-        return report.exitCode();
     }
 }
-exports.default = UnlinkCommand;
 UnlinkCommand.paths = [
     [`unlink`],
 ];
@@ -95,3 +93,4 @@ UnlinkCommand.usage = clipanion_1.Command.Usage({
             `$0 unlink '@babel/*' 'pkg-{a,b}'`,
         ]],
 });
+exports.default = UnlinkCommand;

package/lib/commands/up.d.ts

@@ -18,7 +18,7 @@ export default class UpCommand extends BaseCommand {
     }, {
         [key: string]: unknown;
     }>[];
-    execute(): Promise<1 | 0>;
-    executeUpRecursive(): Promise<1 | 0>;
-    executeUpClassic(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
+    executeUpRecursive(): Promise<0 | 1>;
+    executeUpClassic(): Promise<0 | 1>;
 }

package/lib/commands/up.js

@@ -75,16 +75,14 @@ class UpCommand extends cli_1.BaseCommand {
             project.storedDescriptors.delete(descriptor.descriptorHash);
             project.storedResolutions.delete(descriptor.descriptorHash);
         }
-        const installReport = await core_2.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             stdout: this.context.stdout,
-        }, async (report) => {
-            await project.install({ cache, report });
+        }, {
+            cache,
+            mode: this.mode,
         });
-        return installReport.exitCode();
     }
     async executeUpClassic() {
-        var _a;
         const configuration = await core_3.Configuration.find(this.context.cwd, this.context.plugins);
         const { project, workspace } = await core_2.Project.find(configuration, this.context.cwd);
         const cache = await core_3.Cache.find(configuration);
@@ -94,7 +92,7 @@ class UpCommand extends cli_1.BaseCommand {
             restoreResolutions: false,
         });
         const fixed = this.fixed;
-        const interactive = (_a = this.interactive) !== null && _a !== void 0 ? _a : configuration.get(`preferInteractive`);
+        const interactive = this.interactive ?? configuration.get(`preferInteractive`);
         const modifier = suggestUtils.getModifier(this, project);
         const strategies = interactive ? [
             suggestUtils.Strategy.KEEP,
@@ -111,13 +109,18 @@ class UpCommand extends cli_1.BaseCommand {
             let isReferenced = false;
             // The range has to be static
             const pseudoDescriptor = core_1.structUtils.parseDescriptor(pattern);
+            const stringifiedPseudoDescriptor = core_1.structUtils.stringifyIdent(pseudoDescriptor);
             for (const workspace of project.workspaces) {
                 for (const target of [suggestUtils.Target.REGULAR, suggestUtils.Target.DEVELOPMENT]) {
                     const descriptors = workspace.manifest.getForScope(target);
                     const stringifiedIdents = [...descriptors.values()].map(descriptor => {
                         return core_1.structUtils.stringifyIdent(descriptor);
                     });
-                    for (const stringifiedIdent of (0, micromatch_1.default)(stringifiedIdents, core_1.structUtils.stringifyIdent(pseudoDescriptor))) {
+                    // As a special case, we support "*" as a pattern to upgrade all packages
+                    const matches = stringifiedPseudoDescriptor === `*`
+                        ? stringifiedIdents
+                        : (0, micromatch_1.default)(stringifiedIdents, stringifiedPseudoDescriptor);
+                    for (const stringifiedIdent of matches) {
                         const ident = core_1.structUtils.parseIdent(stringifiedIdent);
                         const existingDescriptor = workspace.manifest[target].get(ident.identHash);
                         if (typeof existingDescriptor === `undefined`)
@@ -140,9 +143,9 @@ class UpCommand extends cli_1.BaseCommand {
             }
         }
         if (unreferencedPatterns.length > 1)
-            throw new clipanion_1.UsageError(`Patterns ${core_3.formatUtils.prettyList(configuration, unreferencedPatterns, core_3.FormatType.CODE)} don't match any packages referenced by any workspace`);
+            throw new clipanion_1.UsageError(`Patterns ${core_3.formatUtils.prettyList(configuration, unreferencedPatterns, core_3.formatUtils.Type.CODE)} don't match any packages referenced by any workspace`);
         if (unreferencedPatterns.length > 0)
-            throw new clipanion_1.UsageError(`Pattern ${core_3.formatUtils.prettyList(configuration, unreferencedPatterns, core_3.FormatType.CODE)} doesn't match any packages referenced by any workspace`);
+            throw new clipanion_1.UsageError(`Pattern ${core_3.formatUtils.prettyList(configuration, unreferencedPatterns, core_3.formatUtils.Type.CODE)} doesn't match any packages referenced by any workspace`);
         const allSuggestions = await Promise.all(allSuggestionsPromises);
         const checkReport = await core_3.LightReport.start({
             configuration,
@@ -231,16 +234,14 @@ class UpCommand extends cli_1.BaseCommand {
         await configuration.triggerMultipleHooks((hooks) => hooks.afterWorkspaceDependencyReplacement, afterWorkspaceDependencyReplacementList);
         if (askedQuestions)
             this.context.stdout.write(`\n`);
-        const installReport = 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 installReport.exitCode();
     }
 }
-exports.default = UpCommand;
 UpCommand.paths = [
     [`up`],
 ];
@@ -257,7 +258,7 @@ UpCommand.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.
 
@@ -290,3 +291,4 @@ UpCommand.usage = clipanion_1.Command.Usage({
 UpCommand.schema = [
     t.hasKeyRelationship(`recursive`, t.KeyRelationship.Forbids, [`interactive`, `exact`, `tilde`, `caret`], { ignore: [undefined, false] }),
 ];
+exports.default = UpCommand;

package/lib/commands/why.js

@@ -38,7 +38,6 @@ class WhyCommand extends cli_1.BaseCommand {
         });
     }
 }
-exports.default = WhyCommand;
 WhyCommand.paths = [
     [`why`],
 ];
@@ -54,6 +53,7 @@ WhyCommand.usage = clipanion_1.Command.Usage({
             `$0 why lodash`,
         ]],
 });
+exports.default = WhyCommand;
 function whySimple(project, identHash, { configuration, peers }) {
     const sortedPackages = core_3.miscUtils.sortMap(project.storedPackages.values(), pkg => {
         return core_3.structUtils.stringifyLocator(pkg);
@@ -121,12 +121,8 @@ function whyRecursive(project, identHash, { configuration, peers }) {
             dependents.add(pkg.locatorHash);
         return depends;
     };
-    for (const workspace of sortedWorkspaces) {
-        const pkg = project.storedPackages.get(workspace.anchoredLocator.locatorHash);
-        if (!pkg)
-            throw new Error(`Assertion failed: The package should have been registered`);
-        markAllDependents(pkg);
-    }
+    for (const workspace of sortedWorkspaces)
+        markAllDependents(workspace.anchoredPackage);
     const printed = new Set();
     const rootChildren = {};
     const root = { children: rootChildren };
@@ -164,11 +160,7 @@ function whyRecursive(project, identHash, { configuration, peers }) {
             printAllDependents(nextPkg, nodeChildren, dependency);
         }
     };
-    for (const workspace of sortedWorkspaces) {
-        const pkg = project.storedPackages.get(workspace.anchoredLocator.locatorHash);
-        if (!pkg)
-            throw new Error(`Assertion failed: The package should have been registered`);
-        printAllDependents(pkg, rootChildren, null);
-    }
+    for (const workspace of sortedWorkspaces)
+        printAllDependents(workspace.anchoredPackage, rootChildren, null);
     return root;
 }

package/lib/commands/workspace.js

@@ -18,10 +18,7 @@ class WorkspaceCommand extends cli_1.BaseCommand {
         if (!cwdWorkspace)
             throw new cli_1.WorkspaceRequiredError(project.cwd, this.context.cwd);
         const candidates = project.workspaces;
-        const candidatesByName = new Map(candidates.map((workspace) => {
-            const ident = core_2.structUtils.convertToIdent(workspace.locator);
-            return [core_2.structUtils.stringifyIdent(ident), workspace];
-        }));
+        const candidatesByName = new Map(candidates.map(workspace => [core_2.structUtils.stringifyIdent(workspace.anchoredLocator), workspace]));
         const workspace = candidatesByName.get(this.workspaceName);
         if (workspace === undefined) {
             const otherNames = Array.from(candidatesByName.keys()).sort();
@@ -30,7 +27,6 @@ class WorkspaceCommand extends cli_1.BaseCommand {
         return this.cli.run([this.commandName, ...this.args], { cwd: workspace.cwd });
     }
 }
-exports.default = WorkspaceCommand;
 WorkspaceCommand.paths = [
     [`workspace`],
 ];
@@ -48,3 +44,4 @@ WorkspaceCommand.usage = clipanion_1.Command.Usage({
             `yarn workspace components run build`,
         ]],
 });
+exports.default = WorkspaceCommand;

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

@@ -5,7 +5,8 @@ export default class WorkspacesListCommand extends BaseCommand {
     static usage: Usage;
     since: string | boolean | undefined;
     recursive: boolean;
+    noPrivate: boolean | undefined;
     verbose: boolean;
     json: boolean;
-    execute(): Promise<1 | 0>;
+    execute(): Promise<0 | 1>;
 }

package/lib/commands/workspaces/list.js

@@ -15,6 +15,9 @@ class WorkspacesListCommand extends cli_1.BaseCommand {
         this.recursive = clipanion_1.Option.Boolean(`-R,--recursive`, false, {
             description: `Find packages via dependencies/devDependencies instead of using the workspaces field`,
         });
+        this.noPrivate = clipanion_1.Option.Boolean(`--no-private`, {
+            description: `Exclude workspaces that have the private field set to true`,
+        });
         this.verbose = clipanion_1.Option.Boolean(`-v,--verbose`, false, {
             description: `Also return the cross-dependencies between workspaces`,
         });
@@ -40,6 +43,8 @@ class WorkspacesListCommand extends cli_1.BaseCommand {
                         workspaces.add(dependent);
             for (const workspace of workspaces) {
                 const { manifest } = workspace;
+                if (manifest.private && this.noPrivate)
+                    continue;
                 let extra;
                 if (this.verbose) {
                     const workspaceDependencies = new Set();
@@ -79,7 +84,6 @@ class WorkspacesListCommand extends cli_1.BaseCommand {
         return report.exitCode();
     }
 }
-exports.default = WorkspacesListCommand;
 WorkspacesListCommand.paths = [
     [`workspaces`, `list`],
 ];
@@ -93,6 +97,9 @@ WorkspacesListCommand.usage = clipanion_1.Command.Usage({
 
       - If \`-R,--recursive\` is set, Yarn will find workspaces to run the command on by recursively evaluating \`dependencies\` and \`devDependencies\` fields, instead of looking at the \`workspaces\` fields.
 
+      - If \`--no-private\` is set, Yarn will not list any workspaces that have the \`private\` field set to \`true\`.
+
       - If both the \`-v,--verbose\` and \`--json\` options are set, Yarn will also return the cross-dependencies between each workspaces (useful when you wish to automatically generate Buck / Bazel rules).
     `,
 });
+exports.default = WorkspacesListCommand;

package/lib/dedupeUtils.d.ts

@@ -1,12 +1,12 @@
 import { Project, ResolveOptions, Resolver, Descriptor, Package, Report, Cache } from '@yarnpkg/core';
 import { Fetcher, FetchOptions } from '@yarnpkg/core';
-export declare type PackageUpdate = {
+export type PackageUpdate = {
     descriptor: Descriptor;
     currentPackage: Package;
     updatedPackage: Package;
     resolvedPackage: Package;
 };
-export declare type Algorithm = (project: Project, patterns: Array<string>, opts: {
+export type Algorithm = (project: Project, patterns: Array<string>, opts: {
     resolver: Resolver;
     resolveOptions: ResolveOptions;
     fetcher: Fetcher;
@@ -23,7 +23,7 @@ export declare enum Strategy {
     HIGHEST = "highest"
 }
 export declare const acceptedStrategies: Set<Strategy.HIGHEST>;
-export declare type DedupeOptions = {
+export type DedupeOptions = {
     strategy: Strategy;
     patterns: Array<string>;
     cache: Cache;

package/lib/dedupeUtils.js

@@ -15,7 +15,7 @@ var Strategy;
      * - dependencies are never downgraded
      */
     Strategy["HIGHEST"] = "highest";
-})(Strategy = exports.Strategy || (exports.Strategy = {}));
+})(Strategy || (exports.Strategy = Strategy = {}));
 exports.acceptedStrategies = new Set(Object.values(Strategy));
 const DEDUPE_ALGORITHMS = {
     highest: async (project, patterns, { resolver, fetcher, resolveOptions, fetchOptions }) => {
@@ -44,7 +44,6 @@ const DEDUPE_ALGORITHMS = {
             if (typeof currentPackage === `undefined`)
                 throw new Error(`Assertion failed: The package (${currentResolution}) should have been registered`);
             Promise.resolve().then(async () => {
-                var _a;
                 const dependencies = resolver.getResolutionDependencies(descriptor, resolveOptions);
                 const resolvedDependencies = Object.fromEntries(await core_1.miscUtils.allSettledSafe(Object.entries(dependencies).map(async ([dependencyName, dependency]) => {
                     const dependencyDeferred = deferredMap.get(dependency.descriptorHash);
@@ -74,7 +73,7 @@ const DEDUPE_ALGORITHMS = {
                     return pkg;
                 });
                 const satisfying = await resolver.getSatisfying(descriptor, resolvedDependencies, candidates, resolveOptions);
-                const bestLocator = (_a = satisfying.locators) === null || _a === void 0 ? void 0 : _a[0];
+                const bestLocator = satisfying.locators?.[0];
                 if (typeof bestLocator === `undefined` || !satisfying.sorted)
                     return currentPackage;
                 const updatedPackage = project.originalPackages.get(bestLocator.locatorHash);
@@ -109,7 +108,6 @@ async function dedupe(project, { strategy, patterns, cache, report }) {
         fetcher,
         project,
         report: throwReport,
-        skipIntegrityCheck: true,
         cacheOptions: {
             skipIntegrityCheck: true,
         },
@@ -124,7 +122,7 @@ async function dedupe(project, { strategy, patterns, cache, report }) {
         const algorithm = DEDUPE_ALGORITHMS[strategy];
         const dedupePromises = await algorithm(project, patterns, { resolver, resolveOptions, fetcher, fetchOptions });
         const progress = core_1.Report.progressViaCounter(dedupePromises.length);
-        report.reportProgress(progress);
+        await report.reportProgress(progress);
         let dedupedPackageCount = 0;
         await Promise.all(dedupePromises.map(dedupePromise => dedupePromise
             .then(dedupe => {