@yarnpkg/plugin-essentials 4.0.0-rc.48 → 4.0.0-rc.49

package/lib/commands/add.js

@@ -54,7 +54,6 @@ class AddCommand extends cli_1.BaseCommand {
         this.packages = clipanion_1.Option.Rest();
     }
     async execute() {
-        var _a;
         const configuration = await core_1.Configuration.find(this.context.cwd, this.context.plugins);
         const { project, workspace } = await core_2.Project.find(configuration, this.context.cwd);
         const cache = await core_1.Cache.find(configuration);
@@ -64,7 +63,7 @@ class AddCommand 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 reuse = interactive || configuration.get(`preferReuse`);
         const modifier = suggestUtils.getModifier(this, project);
         const strategies = [

package/lib/commands/explain/peerRequirements.js

@@ -35,7 +35,6 @@ class ExplainPeerRequirementsCommand extends cli_1.BaseCommand {
             stdout: this.context.stdout,
             includeFooter: false,
         }, async (report) => {
-            var _a;
             const sortCriterias = [
                 ([, requirement]) => core_1.structUtils.stringifyLocator(project.storedPackages.get(requirement.subject)),
                 ([, requirement]) => core_1.structUtils.stringifyIdent(requirement.requested),
@@ -47,7 +46,7 @@ class ExplainPeerRequirementsCommand extends cli_1.BaseCommand {
                 const rootRequester = project.storedPackages.get(requirement.rootRequester);
                 if (typeof rootRequester === `undefined`)
                     throw new Error(`Assertion failed: Expected the root package to have been registered`);
-                const providedDescriptor = (_a = subject.dependencies.get(requirement.requested.identHash)) !== null && _a !== void 0 ? _a : null;
+                const providedDescriptor = subject.dependencies.get(requirement.requested.identHash) ?? null;
                 const prettyHash = core_1.formatUtils.pretty(configuration, hash, core_1.formatUtils.Type.CODE);
                 const prettySubject = core_1.structUtils.prettyLocator(configuration, subject);
                 const prettyIdent = core_1.structUtils.prettyIdent(configuration, requirement.requested);
@@ -95,14 +94,13 @@ async function explainPeerRequirements(peerRequirementsHash, project, opts) {
         stdout: opts.stdout,
         includeFooter: false,
     }, async (report) => {
-        var _a, _b;
         const subject = project.storedPackages.get(requirement.subject);
         if (typeof subject === `undefined`)
             throw new Error(`Assertion failed: Expected the subject package to have been registered`);
         const rootRequester = project.storedPackages.get(requirement.rootRequester);
         if (typeof rootRequester === `undefined`)
             throw new Error(`Assertion failed: Expected the root package to have been registered`);
-        const providedDescriptor = (_a = subject.dependencies.get(requirement.requested.identHash)) !== null && _a !== void 0 ? _a : null;
+        const providedDescriptor = subject.dependencies.get(requirement.requested.identHash) ?? null;
         const providedResolution = providedDescriptor !== null
             ? project.storedResolutions.get(providedDescriptor.descriptorHash)
             : null;
@@ -130,7 +128,7 @@ async function explainPeerRequirements(peerRequirementsHash, project, opts) {
             const satisfiesAllRanges = allRequesters.every(({ peerDependency }) => {
                 return core_1.semverUtils.satisfiesWithPrereleases(provided.version, peerDependency.range);
             });
-            report.reportInfo(core_1.MessageName.UNNAMED, `${core_1.structUtils.prettyLocator(configuration, subject)} provides ${core_1.structUtils.prettyLocator(configuration, provided)} with version ${core_1.structUtils.prettyReference(configuration, (_b = provided.version) !== null && _b !== void 0 ? _b : `<missing>`)}, which ${satisfiesAllRanges ? `satisfies` : `doesn't satisfy`} the following requirements:`);
+            report.reportInfo(core_1.MessageName.UNNAMED, `${core_1.structUtils.prettyLocator(configuration, subject)} provides ${core_1.structUtils.prettyLocator(configuration, provided)} with version ${core_1.structUtils.prettyReference(configuration, provided.version ?? `<missing>`)}, which ${satisfiesAllRanges ? `satisfies` : `doesn't satisfy`} the following requirements:`);
         }
         else {
             report.reportInfo(core_1.MessageName.UNNAMED, `${core_1.structUtils.prettyLocator(configuration, subject)} doesn't provide ${core_1.structUtils.prettyIdent(configuration, requirement.requested)}, breaking the following requirements:`);

package/lib/commands/info.js

@@ -164,7 +164,6 @@ class InfoCommand extends cli_1.BaseCommand {
         const builtinInfoBuilders = [
             // Manifest fields
             async (pkg, extra, registerData) => {
-                var _a, _b;
                 if (!extra.has(`manifest`))
                     return;
                 const fetchResult = await fetcher.fetch(pkg, fetcherOptions);
@@ -173,23 +172,22 @@ class InfoCommand extends cli_1.BaseCommand {
                     manifest = await core_1.Manifest.find(fetchResult.prefixPath, { baseFs: fetchResult.packageFs });
                 }
                 finally {
-                    (_a = fetchResult.releaseFs) === null || _a === void 0 ? void 0 : _a.call(fetchResult);
+                    fetchResult.releaseFs?.();
                 }
                 registerData(`Manifest`, {
                     [`License`]: core_1.formatUtils.tuple(core_1.formatUtils.Type.NO_HINT, manifest.license),
-                    [`Homepage`]: core_1.formatUtils.tuple(core_1.formatUtils.Type.URL, (_b = manifest.raw.homepage) !== null && _b !== void 0 ? _b : null),
+                    [`Homepage`]: core_1.formatUtils.tuple(core_1.formatUtils.Type.URL, manifest.raw.homepage ?? null),
                 });
             },
             // Cache info
             async (pkg, extra, registerData) => {
-                var _a;
                 if (!extra.has(`cache`))
                     return;
                 const cacheOptions = {
                     mockedPackages: project.disabledLocators,
                     unstablePackages: project.conditionalLocators,
                 };
-                const checksum = (_a = project.storedChecksums.get(pkg.locatorHash)) !== null && _a !== void 0 ? _a : null;
+                const checksum = project.storedChecksums.get(pkg.locatorHash) ?? null;
                 const cachePath = cache.getLocatorPath(pkg, checksum, cacheOptions);
                 let stat;
                 if (cachePath !== null) {
@@ -272,10 +270,9 @@ class InfoCommand extends cli_1.BaseCommand {
             }
             if (pkg.dependencies.size > 0 && !isVirtual) {
                 registerData(`Dependencies`, [...pkg.dependencies.values()].map(dependency => {
-                    var _a;
                     const resolutionHash = project.storedResolutions.get(dependency.descriptorHash);
                     const resolution = typeof resolutionHash !== `undefined`
-                        ? (_a = project.storedPackages.get(resolutionHash)) !== null && _a !== void 0 ? _a : null
+                        ? project.storedPackages.get(resolutionHash) ?? null
                         : null;
                     return core_1.formatUtils.tuple(core_1.formatUtils.Type.RESOLUTION, {
                         descriptor: dependency,
@@ -285,13 +282,12 @@ class InfoCommand extends cli_1.BaseCommand {
             }
             if (pkg.peerDependencies.size > 0 && isVirtual) {
                 registerData(`Peer dependencies`, [...pkg.peerDependencies.values()].map(peerDependency => {
-                    var _a, _b;
                     const dependency = pkg.dependencies.get(peerDependency.identHash);
                     const resolutionHash = typeof dependency !== `undefined`
-                        ? (_a = project.storedResolutions.get(dependency.descriptorHash)) !== null && _a !== void 0 ? _a : null
+                        ? project.storedResolutions.get(dependency.descriptorHash) ?? null
                         : null;
                     const resolution = resolutionHash !== null
-                        ? (_b = project.storedPackages.get(resolutionHash)) !== null && _b !== void 0 ? _b : null
+                        ? project.storedPackages.get(resolutionHash) ?? null
                         : null;
                     return core_1.formatUtils.tuple(core_1.formatUtils.Type.RESOLUTION, {
                         descriptor: peerDependency,

package/lib/commands/install.js

@@ -63,7 +63,6 @@ class YarnCommand extends cli_1.BaseCommand {
         this.networkTimeout = clipanion_1.Option.String(`--network-timeout`, { hidden: true });
     }
     async execute() {
-        var _a, _b, _c;
         const configuration = await core_1.Configuration.find(this.context.cwd, this.context.plugins);
         if (typeof this.inlineBuilds !== `undefined`)
             configuration.useWithSource(`<cli>`, { enableInlineBuilds: this.inlineBuilds }, configuration.startingCwd, { overwrite: true });
@@ -177,7 +176,7 @@ class YarnCommand extends cli_1.BaseCommand {
         const updateMode = this.mode === core_1.InstallMode.UpdateLockfile;
         if (updateMode && (this.immutable || this.immutableCache))
             throw new clipanion_1.UsageError(`${core_1.formatUtils.pretty(configuration, `--immutable`, core_1.formatUtils.Type.CODE)} and ${core_1.formatUtils.pretty(configuration, `--immutable-cache`, core_1.formatUtils.Type.CODE)} cannot be used with ${core_1.formatUtils.pretty(configuration, `--mode=update-lockfile`, core_1.formatUtils.Type.CODE)}`);
-        const immutable = ((_a = this.immutable) !== null && _a !== void 0 ? _a : configuration.get(`enableImmutableInstalls`)) && !updateMode;
+        const immutable = (this.immutable ?? configuration.get(`enableImmutableInstalls`)) && !updateMode;
         const immutableCache = this.immutableCache && !updateMode;
         if (configuration.projectCwd !== null) {
             const fixReport = await core_1.StreamReport.start({
@@ -210,38 +209,36 @@ class YarnCommand extends cli_1.BaseCommand {
                 stdout: this.context.stdout,
                 includeFooter: false,
             }, async (report) => {
-                var _a, _b;
-                if ((_a = core_1.Configuration.telemetry) === null || _a === void 0 ? void 0 : _a.isNew) {
-                    core_1.Configuration.telemetry.commitMotd();
+                if (core_1.Configuration.telemetry?.isNew) {
+                    core_1.Configuration.telemetry.commitTips();
                     report.reportInfo(core_1.MessageName.TELEMETRY_NOTICE, `Yarn will periodically gather anonymous telemetry: https://yarnpkg.com/advanced/telemetry`);
                     report.reportInfo(core_1.MessageName.TELEMETRY_NOTICE, `Run ${core_1.formatUtils.pretty(configuration, `yarn config set --home enableTelemetry 0`, core_1.formatUtils.Type.CODE)} to disable`);
                     report.reportSeparator();
                 }
-                else if (((_b = core_1.Configuration.telemetry) === null || _b === void 0 ? void 0 : _b.isMotd) && configuration.get(`enableMotd`)) {
-                    const data = await fetch(`https://repo.yarnpkg.com/tags`).then(res => res.json()).catch(() => null);
+                else if (core_1.Configuration.telemetry?.shouldShowTips) {
+                    const data = await core_1.httpUtils.get(`https://repo.yarnpkg.com/tags`, { configuration, jsonResponse: true }).catch(() => null);
                     if (data !== null) {
                         let newVersion = null;
-                        const YarnVersion = `3.0.0`;
-                        if (YarnVersion !== null) {
-                            const isRcBinary = semver_1.default.prerelease(YarnVersion);
+                        if (core_1.YarnVersion !== null) {
+                            const isRcBinary = semver_1.default.prerelease(core_1.YarnVersion);
                             const releaseType = isRcBinary ? `canary` : `stable`;
                             const candidate = data.latest[releaseType];
-                            if (semver_1.default.gt(candidate, YarnVersion)) {
+                            if (semver_1.default.gt(candidate, core_1.YarnVersion)) {
                                 newVersion = [releaseType, candidate];
                             }
                         }
                         if (newVersion) {
-                            core_1.Configuration.telemetry.commitMotd();
+                            core_1.Configuration.telemetry.commitTips();
                             report.reportInfo(core_1.MessageName.VERSION_NOTICE, `${core_1.formatUtils.applyStyle(configuration, `A new ${newVersion[0]} version of Yarn is available:`, core_1.formatUtils.Style.BOLD)} ${core_1.structUtils.prettyReference(configuration, newVersion[1])}!`);
                             report.reportInfo(core_1.MessageName.VERSION_NOTICE, `Upgrade now by running ${core_1.formatUtils.pretty(configuration, `yarn set version ${newVersion[1]}`, core_1.formatUtils.Type.CODE)}`);
                             report.reportSeparator();
                         }
                         else {
-                            const motd = core_1.Configuration.telemetry.selectMotd(data.motd);
-                            if (motd) {
-                                report.reportInfo(core_1.MessageName.MOTD_NOTICE, core_1.formatUtils.pretty(configuration, motd.message, core_1.formatUtils.Type.MARKDOWN_INLINE));
-                                if (motd.url)
-                                    report.reportInfo(core_1.MessageName.MOTD_NOTICE, `Learn more at ${motd.url}`);
+                            const tip = core_1.Configuration.telemetry.selectTip(data.tips);
+                            if (tip) {
+                                report.reportInfo(core_1.MessageName.TIPS_NOTICE, core_1.formatUtils.pretty(configuration, tip.message, core_1.formatUtils.Type.MARKDOWN_INLINE));
+                                if (tip.url)
+                                    report.reportInfo(core_1.MessageName.TIPS_NOTICE, `Learn more at ${tip.url}`);
                                 report.reportSeparator();
                             }
                         }
@@ -285,9 +282,9 @@ class YarnCommand extends cli_1.BaseCommand {
             restoreResolutions: false,
         });
         const enableHardenedMode = configuration.get(`enableHardenedMode`);
-        if ((_b = this.refreshLockfile) !== null && _b !== void 0 ? _b : enableHardenedMode)
+        if (this.refreshLockfile ?? enableHardenedMode)
             project.lockfileNeedsRefresh = true;
-        const checkResolutions = (_c = this.checkResolutions) !== null && _c !== void 0 ? _c : enableHardenedMode;
+        const checkResolutions = this.checkResolutions ?? enableHardenedMode;
         // Important: Because other commands also need to run installs, if you
         // get in a situation where you need to change this file in order to
         // customize the install it's very likely you're doing something wrong.
@@ -357,7 +354,7 @@ const MERGE_CONFLICT_START = `<<<<<<<`;
 async function autofixMergeConflicts(configuration, immutable) {
     if (!configuration.projectCwd)
         return false;
-    const lockfilePath = fslib_1.ppath.join(configuration.projectCwd, configuration.get(`lockfileFilename`));
+    const lockfilePath = fslib_1.ppath.join(configuration.projectCwd, fslib_1.Filename.lockfile);
     if (!await fslib_1.xfs.existsPromise(lockfilePath))
         return false;
     const file = await fslib_1.xfs.readFilePromise(lockfilePath, `utf8`);
@@ -414,18 +411,25 @@ async function autofixMergeConflicts(configuration, immutable) {
                 }
             }
         }
+        // We encode the cacheKeys inside the checksums so that the reconciliation
+        // can merge the data together
+        for (const key of Object.keys(variant)) {
+            if (key === `__metadata`)
+                continue;
+            const checksum = variant[key].checksum;
+            if (typeof checksum === `string` && checksum.includes(`/`))
+                continue;
+            variant[key].checksum = `${variant.__metadata.cacheKey}/${checksum}`;
+        }
     }
     const merged = Object.assign({}, ...variants);
     // We must keep the lockfile version as small as necessary to force Yarn to
     // refresh the merged-in lockfile metadata that may be missing.
     merged.__metadata.version = `${Math.min(...variants.map(variant => {
-        var _a;
-        return parseInt((_a = variant.__metadata.version) !== null && _a !== void 0 ? _a : 0);
-    }))}`;
-    merged.__metadata.cacheKey = `${Math.min(...variants.map(variant => {
-        var _a;
-        return parseInt((_a = variant.__metadata.cacheKey) !== null && _a !== void 0 ? _a : 0);
+        return parseInt(variant.__metadata.version ?? 0);
     }))}`;
+    // It shouldn't matter, since the cacheKey have been embed within the checksums
+    merged.__metadata.cacheKey = `merged`;
     // parse as valid YAML except that the objects become strings. We can use
     // that to detect them. Damn, it's really ugly though.
     for (const [key, value] of Object.entries(merged))

package/lib/commands/link.js

@@ -59,7 +59,7 @@ class LinkCommand extends cli_1.BaseCommand {
             }
         }
         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;

package/lib/commands/plugin/check.js

@@ -19,9 +19,8 @@ class PluginCheckCommand extends cli_1.BaseCommand {
             json: this.json,
             stdout: this.context.stdout,
         }, async (report) => {
-            var _a;
             for (const rcFile of rcFiles) {
-                if (!((_a = rcFile.data) === null || _a === void 0 ? void 0 : _a.plugins))
+                if (!rcFile.data?.plugins)
                     continue;
                 for (const plugin of rcFile.data.plugins) {
                     if (!plugin.checksum)

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

@@ -47,7 +47,7 @@ class PluginImportSourcesCommand 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 });

package/lib/commands/plugin/import.js

@@ -53,7 +53,7 @@ class PluginImportCommand 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.`;

package/lib/commands/plugin/list.js

@@ -10,8 +10,7 @@ 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;

package/lib/commands/set/version.js

@@ -21,13 +21,12 @@ class SetVersionCommand extends cli_1.BaseCommand {
         this.version = clipanion_1.Option.String();
     }
     async execute() {
-        var _a;
         const configuration = await core_1.Configuration.find(this.context.cwd, this.context.plugins);
         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 = (_a = configuration.projectCwd) !== null && _a !== void 0 ? _a : configuration.startingCwd;
+            const projectCwd = configuration.projectCwd ?? configuration.startingCwd;
             if (fslib_1.ppath.contains(projectCwd, yarnPathSource)) {
                 return 0;
             }
@@ -42,7 +41,7 @@ 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`)
@@ -156,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`)
@@ -178,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);

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 {

package/lib/commands/up.js

@@ -79,10 +79,10 @@ class UpCommand extends cli_1.BaseCommand {
             stdout: this.context.stdout,
         }, {
             cache,
+            mode: this.mode,
         });
     }
     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);
@@ -92,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,

package/lib/commands/workspace.js

@@ -18,7 +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 => [core_2.structUtils.stringifyIdent(workspace.locator), 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();

package/lib/dedupeUtils.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "4.0.0-rc.48",
+  "version": "4.0.0-rc.49",
   "stableVersion": "3.3.0",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
@@ -9,29 +9,29 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@yarnpkg/fslib": "^3.0.0-rc.48",
-    "@yarnpkg/parsers": "^3.0.0-rc.48",
+    "@yarnpkg/fslib": "^3.0.0-rc.49",
+    "@yarnpkg/parsers": "^3.0.0-rc.49",
     "ci-info": "^3.2.0",
-    "clipanion": "^3.2.1",
+    "clipanion": "^4.0.0-rc.2",
     "enquirer": "^2.3.6",
     "lodash": "^4.17.15",
     "micromatch": "^4.0.2",
     "semver": "^7.1.2",
     "tslib": "^2.4.0",
-    "typanion": "^3.12.1"
+    "typanion": "^3.14.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.0.0-rc.48",
-    "@yarnpkg/core": "^4.0.0-rc.48",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.48"
+    "@yarnpkg/cli": "^4.0.0-rc.49",
+    "@yarnpkg/core": "^4.0.0-rc.49",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.49"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.136",
     "@types/micromatch": "^4.0.1",
     "@types/semver": "^7.1.0",
-    "@yarnpkg/cli": "^4.0.0-rc.48",
-    "@yarnpkg/core": "^4.0.0-rc.48",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.48"
+    "@yarnpkg/cli": "^4.0.0-rc.49",
+    "@yarnpkg/core": "^4.0.0-rc.49",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.49"
   },
   "repository": {
     "type": "git",