@pnpm/installing.package-requester 1101.0.2 → 1101.0.4

package/lib/packageRequester.js

@@ -9,7 +9,7 @@ import gfs from '@pnpm/fs.graceful-fs';
 import { logger } from '@pnpm/logger';
 import { resolvePlatformSelector, selectPlatformVariant, } from '@pnpm/resolving.resolver-base';
 import { normalizeBundledManifest, } from '@pnpm/store.cafs';
-import { gitHostedStoreIndexKey, storeIndexKey } from '@pnpm/store.index';
+import { pickStoreIndexKey } from '@pnpm/store.index';
 import { calcMaxWorkers, readPkgFromCafs as _readPkgFromCafs, } from '@pnpm/worker';
 import { familySync } from 'detect-libc';
 import { loadJsonFile } from 'load-json-file';
@@ -225,29 +225,19 @@ async function resolveAndFetch(ctx, wantedDependency, options) {
 function getFilesIndexFilePath(ctx, opts) {
     const targetRelative = depPathToFilename(opts.pkg.id, ctx.virtualStoreDirMaxLength);
     const target = path.join(ctx.storeDir, targetRelative);
-    if (opts.pkg.resolution.integrity) {
-        return {
-            target,
-            filesIndexFile: storeIndexKey(opts.pkg.resolution.integrity, opts.pkg.id),
-            resolution: opts.pkg.resolution,
-        };
-    }
+    const built = !opts.ignoreScripts;
     let resolution;
     if (opts.pkg.resolution.type === 'variations') {
         resolution = findResolution(opts.pkg.resolution.variants, opts.supportedArchitectures);
-        if (resolution.integrity) {
-            return {
-                target,
-                filesIndexFile: storeIndexKey(resolution.integrity, opts.pkg.id),
-                resolution,
-            };
-        }
     }
     else {
         resolution = opts.pkg.resolution;
     }
-    const filesIndexFile = gitHostedStoreIndexKey(opts.pkg.id, { built: !opts.ignoreScripts });
-    return { filesIndexFile, target, resolution };
+    return {
+        target,
+        filesIndexFile: pickStoreIndexKey(resolution, opts.pkg.id, { built }),
+        resolution,
+    };
 }
 function findResolution(resolutionVariants, supportedArchitectures) {
     const selector = resolvePlatformSelector(supportedArchitectures, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.package-requester",
-  "version": "1101.0.2",
+  "version": "1101.0.4",
   "description": "Concurrent downloader of npm-compatible packages",
   "keywords": [
     "pnpm",
@@ -26,32 +26,32 @@
     "!*.map"
   ],
   "dependencies": {
-    "detect-libc": "^2.0.3",
+    "detect-libc": "^2.1.2",
     "load-json-file": "^7.0.1",
     "p-defer": "^4.0.1",
-    "p-limit": "^7.1.0",
-    "p-queue": "^9.1.0",
+    "p-limit": "^7.3.0",
+    "p-queue": "^9.2.0",
     "promise-share": "^2.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
-    "semver": "^7.7.2",
+    "semver": "^7.7.4",
     "ssri": "13.0.1",
     "@pnpm/config.package-is-installable": "1100.0.3",
     "@pnpm/deps.path": "1100.0.2",
-    "@pnpm/fetching.fetcher-base": "1100.1.1",
     "@pnpm/core-loggers": "1100.0.1",
-    "@pnpm/fetching.pick-fetcher": "1100.0.4",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/hooks.types": "1100.0.4",
-    "@pnpm/fs.graceful-fs": "1100.1.0",
-    "@pnpm/store.cafs": "1100.1.1",
-    "@pnpm/store.controller-types": "1100.0.4",
-    "@pnpm/resolving.resolver-base": "1100.1.1",
-    "@pnpm/store.index": "1100.0.0",
-    "@pnpm/types": "1101.0.0"
+    "@pnpm/fetching.fetcher-base": "1100.1.2",
+    "@pnpm/fetching.pick-fetcher": "1100.0.5",
+    "@pnpm/hooks.types": "1100.0.5",
+    "@pnpm/resolving.resolver-base": "1100.1.2",
+    "@pnpm/store.cafs": "1100.1.2",
+    "@pnpm/store.controller-types": "1100.0.5",
+    "@pnpm/store.index": "1100.1.0",
+    "@pnpm/types": "1101.0.0",
+    "@pnpm/fs.graceful-fs": "1100.1.0"
   },
   "peerDependencies": {
-    "@pnpm/logger": ">=1001.0.0 <1002.0.0",
-    "@pnpm/worker": "^1100.1.1"
+    "@pnpm/logger": "^1001.0.1",
+    "@pnpm/worker": "^1100.1.3"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
@@ -63,12 +63,12 @@
     "delay": "^7.0.0",
     "normalize-path": "^3.0.0",
     "tempy": "3.0.0",
-    "@pnpm/installing.package-requester": "1101.0.2",
+    "@pnpm/installing.package-requester": "1101.0.4",
+    "@pnpm/installing.client": "1100.0.12",
     "@pnpm/logger": "1100.0.0",
     "@pnpm/store.cafs-types": "1100.0.1",
-    "@pnpm/installing.client": "1100.0.7",
-    "@pnpm/store.create-cafs-store": "1100.0.4",
     "@pnpm/test-fixtures": "1100.0.0",
+    "@pnpm/store.create-cafs-store": "1100.0.5",
     "@pnpm/testing.mock-agent": "1100.0.2"
   },
   "engines": {