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

package/lib/commands/plugin/import.js

@@ -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`) {

package/lib/commands/plugin/list.js

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

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/up.js

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

@@ -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,8 +305,8 @@ 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();
@@ -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,11 +1,11 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.3",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "dependencies": {
-    "@yarnpkg/fslib": "^3.0.0-rc.2",
-    "@yarnpkg/parsers": "^3.0.0-rc.2",
+    "@yarnpkg/fslib": "^3.0.0-rc.3",
+    "@yarnpkg/parsers": "^3.0.0-rc.3",
     "ci-info": "^3.2.0",
     "clipanion": "^3.2.0-rc.10",
     "enquirer": "^2.3.6",
@@ -16,17 +16,17 @@
     "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.3",
+    "@yarnpkg/core": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.3"
   },
   "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.3",
+    "@yarnpkg/core": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.3"
   },
   "repository": {
     "type": "git",