@yarnpkg/plugin-essentials 4.0.0-rc.9 → 4.0.1

package/lib/index.d.ts

@@ -1,8 +1,83 @@
 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 PluginCheckCommand from './commands/plugin/check';
+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 { PluginCheckCommand };
+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,83 @@
 "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.PluginCheckCommand = 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 check_1 = tslib_1.__importDefault(require("./commands/plugin/check"));
+exports.PluginCheckCommand = check_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"));
@@ -88,6 +126,7 @@ const plugin = {
         link_1.default,
         unlink_1.default,
         node_1.default,
+        check_1.default,
         sources_1.default,
         import_1.default,
         remove_1.default,

package/lib/suggestUtils.d.ts

@@ -1,16 +1,16 @@
 import { Cache, DescriptorHash, Descriptor, Ident, Locator, Project, Workspace } from '@yarnpkg/core';
 import { PortablePath } from '@yarnpkg/fslib';
-export declare type Suggestion = {
+export type Suggestion = {
     descriptor: Descriptor;
     name: string;
     reason: string;
 };
-export declare type NullableSuggestion = {
+export type NullableSuggestion = {
     descriptor: Descriptor | null;
     name: string;
     reason: string;
 };
-export declare type Results = {
+export type Results = {
     suggestions: Array<NullableSuggestion>;
     rejections: Array<Error>;
 };
@@ -88,7 +88,7 @@ export declare function getSuggestedDescriptors(request: Descriptor, { project,
     strategies: Array<Strategy>;
     maxResults?: number;
 }): Promise<Results>;
-export declare type FetchDescriptorFromOptions = {
+export type FetchDescriptorFromOptions = {
     project: Project;
     cache: Cache;
     workspace: Workspace;

package/lib/suggestUtils.js

@@ -12,19 +12,19 @@ var Target;
     Target["REGULAR"] = "dependencies";
     Target["DEVELOPMENT"] = "devDependencies";
     Target["PEER"] = "peerDependencies";
-})(Target = exports.Target || (exports.Target = {}));
+})(Target || (exports.Target = Target = {}));
 var Modifier;
 (function (Modifier) {
     Modifier["CARET"] = "^";
     Modifier["TILDE"] = "~";
     Modifier["EXACT"] = "";
-})(Modifier = exports.Modifier || (exports.Modifier = {}));
+})(Modifier || (exports.Modifier = Modifier = {}));
 var WorkspaceModifier;
 (function (WorkspaceModifier) {
     WorkspaceModifier["CARET"] = "^";
     WorkspaceModifier["TILDE"] = "~";
     WorkspaceModifier["EXACT"] = "*";
-})(WorkspaceModifier = exports.WorkspaceModifier || (exports.WorkspaceModifier = {}));
+})(WorkspaceModifier || (exports.WorkspaceModifier = WorkspaceModifier = {}));
 var Strategy;
 (function (Strategy) {
     /**
@@ -52,7 +52,7 @@ var Strategy;
      * versions of the package that are already within our cache.
      */
     Strategy["CACHE"] = "cache";
-})(Strategy = exports.Strategy || (exports.Strategy = {}));
+})(Strategy || (exports.Strategy = Strategy = {}));
 function getModifier(flags, project) {
     if (flags.exact)
         return Modifier.EXACT;
@@ -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);
                 }
             }
         }
@@ -269,6 +269,8 @@ async function getSuggestedDescriptors(request, { project, workspace, cache, tar
                 break;
             case Strategy.LATEST:
                 {
+                    const hasNetwork = project.configuration.get(`enableNetwork`);
+                    const isOfflineMode = project.configuration.get(`enableOfflineMode`);
                     await trySuggest(async () => {
                         if (target === Target.PEER) {
                             suggested.push({
@@ -277,7 +279,7 @@ async function getSuggestedDescriptors(request, { project, workspace, cache, tar
                                 reason: `(catch-all peer dependency pattern)`,
                             });
                         }
-                        else if (!project.configuration.get(`enableNetwork`)) {
+                        else if (!hasNetwork && !isOfflineMode) {
                             suggested.push({
                                 descriptor: null,
                                 name: `Resolve from latest`,
@@ -290,7 +292,7 @@ async function getSuggestedDescriptors(request, { project, workspace, cache, tar
                                 suggested.push({
                                     descriptor: latest,
                                     name: `Use ${core_2.structUtils.prettyDescriptor(project.configuration, latest)}`,
-                                    reason: `(resolved from latest)`,
+                                    reason: `(resolved from ${isOfflineMode ? `the cache` : `latest`})`,
                                 });
                             }
                         }
@@ -310,7 +312,7 @@ async function fetchDescriptorFrom(ident, range, { project, cache, workspace, pr
     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.

package/package.json

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