@yarnpkg/plugin-essentials 4.6.0 → 4.6.1

package/lib/commands/add.js

@@ -59,7 +59,7 @@ class AddCommand extends cli_1.BaseCommand {
     async execute() {
         const configuration = await core_1.Configuration.find(this.context.cwd, this.context.plugins);
         if (this.noTimeGate)
-            configuration.useWithSource(`<cli>`, { npmMinimalAgeGate: `0` }, configuration.startingCwd, { overwrite: true });
+            suggestUtils.disableTimeGate(configuration);
         const { project, workspace } = await core_2.Project.find(configuration, this.context.cwd);
         const cache = await core_1.Cache.find(configuration);
         if (!workspace)

package/lib/commands/up.js

@@ -52,7 +52,7 @@ class UpCommand extends cli_1.BaseCommand {
     async executeUpRecursive() {
         const configuration = await core_3.Configuration.find(this.context.cwd, this.context.plugins);
         if (this.noTimeGate)
-            configuration.useWithSource(`<cli>`, { npmMinimalAgeGate: `0` }, configuration.startingCwd, { overwrite: true });
+            suggestUtils.disableTimeGate(configuration);
         const { project, workspace } = await core_2.Project.find(configuration, this.context.cwd);
         const cache = await core_3.Cache.find(configuration);
         if (!workspace)
@@ -90,7 +90,7 @@ class UpCommand extends cli_1.BaseCommand {
     async executeUpClassic() {
         const configuration = await core_3.Configuration.find(this.context.cwd, this.context.plugins);
         if (this.noTimeGate)
-            configuration.useWithSource(`<cli>`, { npmMinimalAgeGate: `0` }, configuration.startingCwd, { overwrite: true });
+            suggestUtils.disableTimeGate(configuration);
         const { project, workspace } = await core_2.Project.find(configuration, this.context.cwd);
         const cache = await core_3.Cache.find(configuration);
         if (!workspace)

package/lib/commands/why.js

@@ -71,7 +71,7 @@ function whySimple(project, targetPkg, { configuration, peers }) {
         const nodeChildren = {};
         const node = null;
         for (const dependency of pkg.dependencies.values()) {
-            if (!peers && pkg.peerDependencies.has(dependency.identHash))
+            if (!peers && isVirtualPeerDependency(pkg, dependency))
                 continue;
             const resolution = project.storedResolutions.get(dependency.descriptorHash);
             if (!resolution)
@@ -112,7 +112,7 @@ function whyRecursive(project, targetPkg, { configuration, peers }) {
         }
         let depends = false;
         for (const dependency of pkg.dependencies.values()) {
-            if (!peers && pkg.peerDependencies.has(dependency.identHash))
+            if (!peers && isVirtualPeerDependency(pkg, dependency))
                 continue;
             const resolution = project.storedResolutions.get(dependency.descriptorHash);
             if (!resolution)
@@ -156,7 +156,7 @@ function whyRecursive(project, targetPkg, { configuration, peers }) {
             return;
         printed.add(pkg.locatorHash);
         for (const dependency of pkg.dependencies.values()) {
-            if (!peers && pkg.peerDependencies.has(dependency.identHash))
+            if (!peers && isVirtualPeerDependency(pkg, dependency))
                 continue;
             const resolution = project.storedResolutions.get(dependency.descriptorHash);
             if (!resolution)
@@ -171,3 +171,6 @@ function whyRecursive(project, targetPkg, { configuration, peers }) {
         printAllDependents(workspace.anchoredPackage, rootChildren, null);
     return root;
 }
+function isVirtualPeerDependency(pkg, dependency) {
+    return core_2.structUtils.isVirtualLocator(pkg) && pkg.peerDependencies.has(dependency.identHash);
+}

package/lib/suggestUtils.d.ts

@@ -1,4 +1,4 @@
-import { Cache, DescriptorHash, Descriptor, Ident, Locator, Project, Workspace } from '@yarnpkg/core';
+import { Cache, DescriptorHash, Descriptor, Ident, Locator, Project, Workspace, Configuration } from '@yarnpkg/core';
 import { PortablePath } from '@yarnpkg/fslib';
 export type Suggestion = {
     descriptor: Descriptor;
@@ -56,6 +56,7 @@ export declare enum Strategy {
      */
     CACHE = "cache"
 }
+export declare function disableTimeGate(configuration: Configuration): void;
 export declare function getModifier(flags: {
     exact: boolean;
     caret: boolean;

package/lib/suggestUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Strategy = exports.WorkspaceModifier = exports.Modifier = exports.Target = void 0;
+exports.disableTimeGate = disableTimeGate;
 exports.getModifier = getModifier;
 exports.extractRangeModifier = extractRangeModifier;
 exports.applyModifier = applyModifier;
@@ -62,6 +63,13 @@ var Strategy;
      */
     Strategy["CACHE"] = "cache";
 })(Strategy || (exports.Strategy = Strategy = {}));
+function disableTimeGate(configuration) {
+    configuration.useWithSource(`<cli>`, { npmMinimalAgeGate: `0` }, configuration.startingCwd, { overwrite: true });
+    const npmScopes = configuration.get(`npmScopes`);
+    for (const scopeConfiguration of npmScopes.values()) {
+        scopeConfiguration.delete(`npmMinimalAgeGate`);
+    }
+}
 function getModifier(flags, project) {
     if (flags.exact)
         return Modifier.EXACT;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "exports": {
@@ -20,15 +20,15 @@
     "typanion": "^3.14.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.15.0",
-    "@yarnpkg/core": "^4.8.0",
+    "@yarnpkg/cli": "^4.17.0",
+    "@yarnpkg/core": "^4.9.0",
     "@yarnpkg/plugin-git": "^3.2.0"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.1",
     "@types/semver": "^7.1.0",
-    "@yarnpkg/cli": "^4.15.0",
-    "@yarnpkg/core": "^4.8.0",
+    "@yarnpkg/cli": "^4.17.0",
+    "@yarnpkg/core": "^4.9.0",
     "@yarnpkg/plugin-git": "^3.2.0"
   },
   "repository": {