@yarnpkg/plugin-essentials 4.0.0-rc.22 → 4.0.0-rc.23

package/lib/commands/set/version.js

@@ -21,9 +21,17 @@ 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 (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 = (_a = configuration.projectCwd) !== null && _a !== void 0 ? _a : 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`);
@@ -193,11 +201,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/why.js

@@ -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.locator), workspace]));
         const workspace = candidatesByName.get(this.workspaceName);
         if (workspace === undefined) {
             const otherNames = Array.from(candidatesByName.keys()).sort();

package/lib/suggestUtils.js

@@ -109,7 +109,7 @@ async function findProjectDescriptors(ident, { project, target }) {
         if (target === Target.PEER) {
             const peerDescriptor = workspace.manifest.peerDependencies.get(ident.identHash);
             if (peerDescriptor !== undefined) {
-                getDescriptorEntry(peerDescriptor).locators.push(workspace.locator);
+                getDescriptorEntry(peerDescriptor).locators.push(workspace.anchoredLocator);
             }
         }
         else {
@@ -117,18 +117,18 @@ async function findProjectDescriptors(ident, { project, target }) {
             const developmentDescriptor = workspace.manifest.devDependencies.get(ident.identHash);
             if (target === Target.DEVELOPMENT) {
                 if (developmentDescriptor !== undefined) {
-                    getDescriptorEntry(developmentDescriptor).locators.push(workspace.locator);
+                    getDescriptorEntry(developmentDescriptor).locators.push(workspace.anchoredLocator);
                 }
                 else if (regularDescriptor !== undefined) {
-                    getDescriptorEntry(regularDescriptor).locators.push(workspace.locator);
+                    getDescriptorEntry(regularDescriptor).locators.push(workspace.anchoredLocator);
                 }
             }
             else {
                 if (regularDescriptor !== undefined) {
-                    getDescriptorEntry(regularDescriptor).locators.push(workspace.locator);
+                    getDescriptorEntry(regularDescriptor).locators.push(workspace.anchoredLocator);
                 }
                 else if (developmentDescriptor !== undefined) {
-                    getDescriptorEntry(developmentDescriptor).locators.push(workspace.locator);
+                    getDescriptorEntry(developmentDescriptor).locators.push(workspace.anchoredLocator);
                 }
             }
         }

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "4.0.0-rc.22",
+  "version": "4.0.0-rc.23",
+  "stableVersion": "3.2.3",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "exports": {
@@ -8,8 +9,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@yarnpkg/fslib": "^3.0.0-rc.22",
-    "@yarnpkg/parsers": "^3.0.0-rc.22",
+    "@yarnpkg/fslib": "^3.0.0-rc.23",
+    "@yarnpkg/parsers": "^3.0.0-rc.23",
     "ci-info": "^3.2.0",
     "clipanion": "^3.2.0-rc.10",
     "enquirer": "^2.3.6",
@@ -20,17 +21,17 @@
     "typanion": "^3.3.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.0.0-rc.22",
-    "@yarnpkg/core": "^4.0.0-rc.22",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.22"
+    "@yarnpkg/cli": "^4.0.0-rc.23",
+    "@yarnpkg/core": "^4.0.0-rc.23",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.23"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.136",
     "@types/micromatch": "^4.0.1",
     "@types/semver": "^7.1.0",
-    "@yarnpkg/cli": "^4.0.0-rc.22",
-    "@yarnpkg/core": "^4.0.0-rc.22",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.22"
+    "@yarnpkg/cli": "^4.0.0-rc.23",
+    "@yarnpkg/core": "^4.0.0-rc.23",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.23"
   },
   "repository": {
     "type": "git",
@@ -53,6 +54,5 @@
   ],
   "engines": {
     "node": ">=14.15.0"
-  },
-  "stableVersion": "3.2.0"
+  }
 }