@yarnpkg/plugin-essentials 4.0.0-rc.5 → 4.0.0-rc.51

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,37 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "4.0.0-rc.5",
+  "version": "4.0.0-rc.51",
+  "stableVersion": "3.3.0",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./package.json": "./package.json"
+  },
   "dependencies": {
-    "@yarnpkg/fslib": "^3.0.0-rc.5",
-    "@yarnpkg/parsers": "^3.0.0-rc.5",
+    "@yarnpkg/fslib": "^3.0.0-rc.51",
+    "@yarnpkg/parsers": "^3.0.0-rc.51",
     "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.5",
-    "@yarnpkg/core": "^4.0.0-rc.5",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.5"
+    "@yarnpkg/cli": "^4.0.0-rc.51",
+    "@yarnpkg/core": "^4.0.0-rc.51",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.51"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.136",
     "@types/micromatch": "^4.0.1",
     "@types/semver": "^7.1.0",
-    "@yarnpkg/cli": "^4.0.0-rc.5",
-    "@yarnpkg/core": "^4.0.0-rc.5",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.5"
+    "@yarnpkg/cli": "^4.0.0-rc.51",
+    "@yarnpkg/core": "^4.0.0-rc.51",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.51"
   },
   "repository": {
     "type": "git",
@@ -39,14 +44,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"
+  }
 }