@yarnpkg/plugin-essentials 4.0.0-rc.2 → 4.0.0-rc.21

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;
@@ -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/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/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/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;

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,9 +1,8 @@
 /// <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;

package/lib/commands/plugin/import.js

@@ -12,7 +12,7 @@ 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();
@@ -50,8 +50,14 @@ 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))
-                        throw new core_1.ReportError(core_1.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 referenced by their name; any other plugin will have to be referenced through its public url (for example https://github.com/yarnpkg/berry/raw/master/packages/plugin-typescript/bin/%40yarnpkg/plugin-typescript.js).`);
+                    if (!Object.prototype.hasOwnProperty.call(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.`;
+                        else
+                            message += `Note that only the plugins referenced on our website (${core_2.formatUtils.pretty(configuration, `https://github.com/yarnpkg/berry/blob/master/plugins.yml`, core_2.formatUtils.Type.URL)}) can be referenced by their name; any other plugin will have to be referenced through its public url (for example ${core_2.formatUtils.pretty(configuration, `https://github.com/yarnpkg/berry/raw/master/packages/plugin-typescript/bin/%40yarnpkg/plugin-typescript.js`, core_2.formatUtils.Type.URL)}).`;
+                        throw new core_1.ReportError(core_1.MessageName.PLUGIN_NAME_NOT_FOUND, message);
+                    }
                     pluginSpec = identStr;
                     pluginUrl = data[identStr].url;
                     if (locator.reference !== `unknown`) {
@@ -69,11 +75,11 @@ class PluginDlCommand extends cli_1.BaseCommand {
         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: `

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

@@ -11,12 +11,12 @@ async function getAvailablePlugins(configuration, version) {
     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`);
+        return !version || core_1.semverUtils.satisfiesWithPrereleases(version, (_a = pluginData.range) !== null && _a !== void 0 ? _a : `<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 +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: `

package/lib/commands/rebuild.d.ts

@@ -1,6 +1,6 @@
 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[];

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();
@@ -46,11 +46,11 @@ class RunCommand extends cli_1.BaseCommand {
         return installReport.exitCode();
     }
 }
-exports.default = RunCommand;
-RunCommand.paths = [
+exports.default = RebuildCommand;
+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.

package/lib/commands/remove.js

@@ -89,7 +89,7 @@ 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({

package/lib/commands/run.d.ts

@@ -7,6 +7,7 @@ export default class RunCommand extends BaseCommand {
     inspectBrk: string | boolean;
     topLevel: boolean;
     binariesOnly: boolean;
+    require: string | undefined;
     silent: boolean | undefined;
     scriptName: string;
     args: string[];

package/lib/commands/run.js

@@ -22,6 +22,9 @@ class RunCommand extends cli_1.BaseCommand {
         this.binariesOnly = clipanion_1.Option.Boolean(`-B,--binaries-only`, false, {
             description: `Ignore any user defined scripts and only check for binaries`,
         });
+        this.require = clipanion_1.Option.String(`--require`, {
+            description: `Forwarded to the underlying Node process when executing a binary`,
+        });
         // The v1 used to print the Yarn version header when using "yarn run", which
         // was messing with the output of things like `--version` & co. We don't do
         // this anymore, but many workflows use `yarn run --silent` to make sure that
@@ -64,6 +67,8 @@ class RunCommand extends cli_1.BaseCommand {
                     nodeArgs.push(`--inspect-brk`);
                 }
             }
+            if (this.require)
+                nodeArgs.push(`--require=${this.require}`);
             return await core_2.scriptUtils.executePackageAccessibleBinary(effectiveLocator, this.scriptName, this.args, {
                 cwd: this.context.cwd,
                 project,

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>;
 }

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 = [
+exports.default = RunIndexCommand;
+RunIndexCommand.paths = [
     [`run`],
 ];

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

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { BaseCommand } from '@yarnpkg/cli';
 import { Configuration, Report } from '@yarnpkg/core';
 import { Usage } from 'clipanion';

package/lib/commands/set/version.js

@@ -40,7 +40,7 @@ class SetVersionCommand extends cli_1.BaseCommand {
         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 +61,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 });
                 }
             };

package/lib/commands/up.js

@@ -140,9 +140,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,
@@ -223,7 +223,8 @@ class UpCommand extends cli_1.BaseCommand {
             else {
                 const resolver = configuration.makeResolver();
                 const resolveOptions = { project, resolver };
-                const bound = resolver.bindDescriptor(current, workspace.anchoredLocator, resolveOptions);
+                const normalizedDependency = configuration.normalizeDependency(current);
+                const bound = resolver.bindDescriptor(normalizedDependency, workspace.anchoredLocator, resolveOptions);
                 project.forgetResolution(bound);
             }
         }

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

@@ -5,6 +5,7 @@ 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>;

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();
@@ -93,6 +98,8 @@ 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).
     `,
 });

package/lib/dedupeUtils.js

@@ -109,7 +109,6 @@ async function dedupe(project, { strategy, patterns, cache, report }) {
         fetcher,
         project,
         report: throwReport,
-        skipIntegrityCheck: true,
         cacheOptions: {
             skipIntegrityCheck: true,
         },

package/lib/index.d.ts

@@ -1,8 +1,81 @@
 import { Descriptor, Plugin, Package, formatUtils } from '@yarnpkg/core';
 import { Workspace } from '@yarnpkg/core';
+import AddCommand from './commands/add';
+import BinCommand from './commands/bin';
+import CacheCleanCommand from './commands/cache/clean';
+import ConfigGetCommand from './commands/config/get';
+import ConfigSetCommand from './commands/config/set';
+import ConfigUnsetCommand from './commands/config/unset';
+import ConfigCommand from './commands/config';
+import DedupeCommand from './commands/dedupe';
+import ClipanionCommand from './commands/entries/clipanion';
+import HelpCommand from './commands/entries/help';
+import EntryCommand from './commands/entries/run';
+import VersionCommand from './commands/entries/version';
+import ExecCommand from './commands/exec';
+import ExplainPeerRequirementsCommand from './commands/explain/peerRequirements';
+import ExplainCommand from './commands/explain';
+import InfoCommand from './commands/info';
+import YarnCommand from './commands/install';
+import LinkCommand from './commands/link';
+import NodeCommand from './commands/node';
+import PluginImportSourcesCommand from './commands/plugin/import/sources';
+import PluginImportCommand from './commands/plugin/import';
+import PluginListCommand from './commands/plugin/list';
+import PluginRemoveCommand from './commands/plugin/remove';
+import PluginRuntimeCommand from './commands/plugin/runtime';
+import RebuildCommand from './commands/rebuild';
+import RemoveCommand from './commands/remove';
+import RunIndexCommand from './commands/runIndex';
+import RunCommand from './commands/run';
+import SetResolutionCommand from './commands/set/resolution';
+import SetVersionSourcesCommand from './commands/set/version/sources';
+import SetVersionCommand from './commands/set/version';
+import UnlinkCommand from './commands/unlink';
+import UpCommand from './commands/up';
+import WhyCommand from './commands/why';
+import WorkspacesListCommand from './commands/workspaces/list';
+import WorkspaceCommand from './commands/workspace';
 import * as dedupeUtils from './dedupeUtils';
 import * as suggestUtils from './suggestUtils';
-export { dedupeUtils, suggestUtils, };
+export { AddCommand };
+export { BinCommand };
+export { CacheCleanCommand };
+export { ConfigGetCommand };
+export { ConfigSetCommand };
+export { ConfigUnsetCommand };
+export { ConfigCommand };
+export { DedupeCommand };
+export { ClipanionCommand };
+export { HelpCommand };
+export { EntryCommand };
+export { VersionCommand };
+export { ExecCommand };
+export { ExplainPeerRequirementsCommand };
+export { ExplainCommand };
+export { InfoCommand };
+export { YarnCommand };
+export { LinkCommand };
+export { NodeCommand };
+export { PluginImportSourcesCommand };
+export { PluginImportCommand };
+export { PluginListCommand };
+export { PluginRemoveCommand };
+export { PluginRuntimeCommand };
+export { RebuildCommand };
+export { RemoveCommand };
+export { RunIndexCommand };
+export { RunCommand };
+export { SetResolutionCommand };
+export { SetVersionSourcesCommand };
+export { SetVersionCommand };
+export { UnlinkCommand };
+export { UpCommand };
+export { WhyCommand };
+export { WorkspacesListCommand };
+export { WorkspaceCommand };
+export { dedupeUtils };
+export { suggestUtils };
 export interface Hooks {
     /**
      * Called when a new dependency is added to a workspace. Note that this hook

package/lib/index.js

@@ -1,45 +1,81 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.suggestUtils = exports.dedupeUtils = void 0;
+exports.suggestUtils = exports.dedupeUtils = exports.WorkspaceCommand = exports.WorkspacesListCommand = exports.WhyCommand = exports.UpCommand = exports.UnlinkCommand = exports.SetVersionCommand = exports.SetVersionSourcesCommand = exports.SetResolutionCommand = exports.RunCommand = exports.RunIndexCommand = exports.RemoveCommand = exports.RebuildCommand = exports.PluginRuntimeCommand = exports.PluginRemoveCommand = exports.PluginListCommand = exports.PluginImportCommand = exports.PluginImportSourcesCommand = exports.NodeCommand = exports.LinkCommand = exports.YarnCommand = exports.InfoCommand = exports.ExplainCommand = exports.ExplainPeerRequirementsCommand = exports.ExecCommand = exports.VersionCommand = exports.EntryCommand = exports.HelpCommand = exports.ClipanionCommand = exports.DedupeCommand = exports.ConfigCommand = exports.ConfigUnsetCommand = exports.ConfigSetCommand = exports.ConfigGetCommand = exports.CacheCleanCommand = exports.BinCommand = exports.AddCommand = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@yarnpkg/core");
 const ci_info_1 = require("ci-info");
 const add_1 = tslib_1.__importDefault(require("./commands/add"));
+exports.AddCommand = add_1.default;
 const bin_1 = tslib_1.__importDefault(require("./commands/bin"));
+exports.BinCommand = bin_1.default;
 const clean_1 = tslib_1.__importDefault(require("./commands/cache/clean"));
+exports.CacheCleanCommand = clean_1.default;
 const get_1 = tslib_1.__importDefault(require("./commands/config/get"));
+exports.ConfigGetCommand = get_1.default;
 const set_1 = tslib_1.__importDefault(require("./commands/config/set"));
+exports.ConfigSetCommand = set_1.default;
 const unset_1 = tslib_1.__importDefault(require("./commands/config/unset"));
+exports.ConfigUnsetCommand = unset_1.default;
 const config_1 = tslib_1.__importDefault(require("./commands/config"));
+exports.ConfigCommand = config_1.default;
 const dedupe_1 = tslib_1.__importDefault(require("./commands/dedupe"));
+exports.DedupeCommand = dedupe_1.default;
 const clipanion_1 = tslib_1.__importDefault(require("./commands/entries/clipanion"));
+exports.ClipanionCommand = clipanion_1.default;
 const help_1 = tslib_1.__importDefault(require("./commands/entries/help"));
+exports.HelpCommand = help_1.default;
 const run_1 = tslib_1.__importDefault(require("./commands/entries/run"));
+exports.EntryCommand = run_1.default;
 const version_1 = tslib_1.__importDefault(require("./commands/entries/version"));
+exports.VersionCommand = version_1.default;
 const exec_1 = tslib_1.__importDefault(require("./commands/exec"));
+exports.ExecCommand = exec_1.default;
 const peerRequirements_1 = tslib_1.__importDefault(require("./commands/explain/peerRequirements"));
+exports.ExplainPeerRequirementsCommand = peerRequirements_1.default;
 const explain_1 = tslib_1.__importDefault(require("./commands/explain"));
+exports.ExplainCommand = explain_1.default;
 const info_1 = tslib_1.__importDefault(require("./commands/info"));
+exports.InfoCommand = info_1.default;
 const install_1 = tslib_1.__importDefault(require("./commands/install"));
+exports.YarnCommand = install_1.default;
 const link_1 = tslib_1.__importDefault(require("./commands/link"));
+exports.LinkCommand = link_1.default;
 const node_1 = tslib_1.__importDefault(require("./commands/node"));
+exports.NodeCommand = node_1.default;
 const sources_1 = tslib_1.__importDefault(require("./commands/plugin/import/sources"));
+exports.PluginImportSourcesCommand = sources_1.default;
 const import_1 = tslib_1.__importDefault(require("./commands/plugin/import"));
+exports.PluginImportCommand = import_1.default;
 const list_1 = tslib_1.__importDefault(require("./commands/plugin/list"));
+exports.PluginListCommand = list_1.default;
 const remove_1 = tslib_1.__importDefault(require("./commands/plugin/remove"));
+exports.PluginRemoveCommand = remove_1.default;
 const runtime_1 = tslib_1.__importDefault(require("./commands/plugin/runtime"));
+exports.PluginRuntimeCommand = runtime_1.default;
 const rebuild_1 = tslib_1.__importDefault(require("./commands/rebuild"));
+exports.RebuildCommand = rebuild_1.default;
 const remove_2 = tslib_1.__importDefault(require("./commands/remove"));
+exports.RemoveCommand = remove_2.default;
 const runIndex_1 = tslib_1.__importDefault(require("./commands/runIndex"));
+exports.RunIndexCommand = runIndex_1.default;
 const run_2 = tslib_1.__importDefault(require("./commands/run"));
+exports.RunCommand = run_2.default;
 const resolution_1 = tslib_1.__importDefault(require("./commands/set/resolution"));
+exports.SetResolutionCommand = resolution_1.default;
 const sources_2 = tslib_1.__importDefault(require("./commands/set/version/sources"));
+exports.SetVersionSourcesCommand = sources_2.default;
 const version_2 = tslib_1.__importDefault(require("./commands/set/version"));
+exports.SetVersionCommand = version_2.default;
 const unlink_1 = tslib_1.__importDefault(require("./commands/unlink"));
+exports.UnlinkCommand = unlink_1.default;
 const up_1 = tslib_1.__importDefault(require("./commands/up"));
+exports.UpCommand = up_1.default;
 const why_1 = tslib_1.__importDefault(require("./commands/why"));
+exports.WhyCommand = why_1.default;
 const list_2 = tslib_1.__importDefault(require("./commands/workspaces/list"));
+exports.WorkspacesListCommand = list_2.default;
 const workspace_1 = tslib_1.__importDefault(require("./commands/workspace"));
+exports.WorkspaceCommand = workspace_1.default;
 const dedupeUtils = tslib_1.__importStar(require("./dedupeUtils"));
 exports.dedupeUtils = dedupeUtils;
 const suggestUtils = tslib_1.__importStar(require("./suggestUtils"));

package/lib/suggestUtils.d.ts

@@ -88,9 +88,15 @@ export declare function getSuggestedDescriptors(request: Descriptor, { project,
     strategies: Array<Strategy>;
     maxResults?: number;
 }): Promise<Results>;
-export declare function fetchDescriptorFrom(ident: Ident, range: string, { project, cache, workspace, preserveModifier }: {
+export declare type FetchDescriptorFromOptions = {
     project: Project;
     cache: Cache;
     workspace: Workspace;
+} & ({
     preserveModifier?: boolean | string;
-}): Promise<Descriptor | null>;
+    modifier?: undefined;
+} | {
+    preserveModifier?: undefined;
+    modifier: Modifier;
+});
+export declare function fetchDescriptorFrom(ident: Ident, range: string, { project, cache, workspace, preserveModifier, modifier }: FetchDescriptorFromOptions): Promise<Descriptor | null>;

package/lib/suggestUtils.js

@@ -169,7 +169,7 @@ async function getSuggestedDescriptors(request, { project, workspace, cache, tar
     if (!(maxResults >= 0))
         throw new Error(`Invalid maxResults (${maxResults})`);
     const [requestRange, requestTag] = request.range !== `unknown`
-        ? fixed || semver_1.default.validRange(request.range) || !request.range.match(/^[a-z0-9._-]+$/i)
+        ? fixed || core_2.semverUtils.validRange(request.range) || !request.range.match(/^[a-z0-9._-]+$/i)
             ? [request.range, `latest`]
             : [`unknown`, request.range]
         : [`unknown`, `latest`];
@@ -285,9 +285,8 @@ async function getSuggestedDescriptors(request, { project, workspace, cache, tar
                             });
                         }
                         else {
-                            let latest = await fetchDescriptorFrom(request, `${project.configuration.get(`defaultProtocol`)}${requestTag}`, { project, cache, workspace, preserveModifier: false });
+                            const latest = await fetchDescriptorFrom(request, requestTag, { project, cache, workspace, modifier });
                             if (latest) {
-                                latest = applyModifier(latest, modifier);
                                 suggested.push({
                                     descriptor: latest,
                                     name: `Use ${core_2.structUtils.prettyDescriptor(project.configuration, latest)}`,
@@ -306,12 +305,12 @@ async function getSuggestedDescriptors(request, { project, workspace, cache, tar
     };
 }
 exports.getSuggestedDescriptors = getSuggestedDescriptors;
-async function fetchDescriptorFrom(ident, range, { project, cache, workspace, preserveModifier = true }) {
-    const latestDescriptor = core_2.structUtils.makeDescriptor(ident, range);
+async function fetchDescriptorFrom(ident, range, { project, cache, workspace, preserveModifier = true, modifier }) {
+    const latestDescriptor = project.configuration.normalizeDependency(core_2.structUtils.makeDescriptor(ident, range));
     const report = new core_1.ThrowReport();
     const fetcher = project.configuration.makeFetcher();
     const resolver = project.configuration.makeResolver();
-    const fetchOptions = { project, fetcher, cache, checksums: project.storedChecksums, report, cacheOptions: { skipIntegrityCheck: true }, skipIntegrityCheck: true };
+    const fetchOptions = { project, fetcher, cache, checksums: project.storedChecksums, report, cacheOptions: { skipIntegrityCheck: true } };
     const resolveOptions = { ...fetchOptions, resolver, fetchOptions };
     // The descriptor has to be bound for the resolvers that need a parent locator. (e.g. FileResolver)
     // If we didn't bind it, `yarn add ./folder` wouldn't work.
@@ -324,12 +323,32 @@ async function fetchDescriptorFrom(ident, range, { project, cache, workspace, pr
     let { protocol, source, params, selector } = core_2.structUtils.parseRange(core_2.structUtils.convertToManifestRange(bestLocator.reference));
     if (protocol === project.configuration.get(`defaultProtocol`))
         protocol = null;
-    if (semver_1.default.valid(selector) && preserveModifier !== false) {
-        const referenceRange = typeof preserveModifier === `string`
-            ? preserveModifier
-            : latestDescriptor.range;
-        const modifier = extractRangeModifier(referenceRange, { project });
-        selector = modifier + selector;
+    if (semver_1.default.valid(selector)) {
+        const rawSelector = selector;
+        if (typeof modifier !== `undefined`) {
+            selector = modifier + selector;
+        }
+        else if (preserveModifier !== false) {
+            const referenceRange = typeof preserveModifier === `string`
+                ? preserveModifier
+                : latestDescriptor.range;
+            const modifier = extractRangeModifier(referenceRange, { project });
+            selector = modifier + selector;
+        }
+        const screeningDescriptor = core_2.structUtils.makeDescriptor(bestLocator, core_2.structUtils.makeRange({ protocol, source, params, selector }));
+        const screeningLocators = await resolver.getCandidates(project.configuration.normalizeDependency(screeningDescriptor), {}, resolveOptions);
+        // If turning 1.0.0 into ^1.0.0 would cause it to resolve to something else
+        // (for example 1.1.0), then we don't add the modifier.
+        //
+        // This is to account for "weird" release strategies where things like
+        // prereleases are released as older versions than the latest available
+        // ones.
+        //
+        // Ex 1: https://github.com/parcel-bundler/parcel/issues/8010
+        // Ex 2: https://github.com/sveltejs/kit/discussions/4645
+        if (screeningLocators.length !== 1) {
+            selector = rawSelector;
+        }
     }
     return core_2.structUtils.makeDescriptor(bestLocator, core_2.structUtils.makeRange({ protocol, source, params, selector }));
 }

package/package.json

@@ -1,32 +1,36 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.21",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./package.json": "./package.json"
+  },
   "dependencies": {
-    "@yarnpkg/fslib": "^3.0.0-rc.2",
-    "@yarnpkg/parsers": "^3.0.0-rc.2",
+    "@yarnpkg/fslib": "^3.0.0-rc.21",
+    "@yarnpkg/parsers": "^3.0.0-rc.21",
     "ci-info": "^3.2.0",
     "clipanion": "^3.2.0-rc.10",
     "enquirer": "^2.3.6",
     "lodash": "^4.17.15",
     "micromatch": "^4.0.2",
     "semver": "^7.1.2",
-    "tslib": "^1.13.0",
+    "tslib": "^2.4.0",
     "typanion": "^3.3.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.0.0-rc.2",
-    "@yarnpkg/core": "^4.0.0-rc.2",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.2"
+    "@yarnpkg/cli": "^4.0.0-rc.21",
+    "@yarnpkg/core": "^4.0.0-rc.21",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.21"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.136",
     "@types/micromatch": "^4.0.1",
     "@types/semver": "^7.1.0",
-    "@yarnpkg/cli": "^4.0.0-rc.2",
-    "@yarnpkg/core": "^4.0.0-rc.2",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.2"
+    "@yarnpkg/cli": "^4.0.0-rc.21",
+    "@yarnpkg/core": "^4.0.0-rc.21",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.21"
   },
   "repository": {
     "type": "git",
@@ -39,7 +43,10 @@
   },
   "publishConfig": {
     "main": "./lib/index.js",
-    "typings": "./lib/index.d.ts"
+    "exports": {
+      ".": "./lib/index.js",
+      "./package.json": "./package.json"
+    }
   },
   "files": [
     "/lib/**/*"
@@ -47,6 +54,5 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "stableVersion": "3.2.0",
-  "typings": "./lib/index.d.ts"
+  "stableVersion": "3.2.0"
 }