@pnpm/building.after-install 1101.0.5 → 1101.0.7

package/lib/index.js

@@ -19,7 +19,7 @@ import { logger, streamParser } from '@pnpm/logger';
 import npa from '@pnpm/npm-package-arg';
 import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader';
 import { createStoreController } from '@pnpm/store.connection-manager';
-import { StoreIndex, storeIndexKey } from '@pnpm/store.index';
+import { pickStoreIndexKey, StoreIndex } from '@pnpm/store.index';
 import { hardLinkDir } from '@pnpm/worker';
 import pLimit from 'p-limit';
 import { runGroups } from 'run-groups';
@@ -250,9 +250,12 @@ async function _rebuild(ctx, opts) {
             }
             const resolution = pkgSnapshot.resolution;
             let sideEffectsCacheKey;
-            const pkgId = `${pkgInfo.name}@${pkgInfo.version}`;
-            if (opts.skipIfHasSideEffectsCache && resolution.integrity) {
-                const filesIndexFile = storeIndexKey(resolution.integrity.toString(), pkgId);
+            // Match the resolver-supplied pkg.id used by the writer in
+            // @pnpm/installing.package-requester: that's the tarball URL for
+            // git-hosted packages (nonSemverVersion) and `name@version` otherwise.
+            const pkgId = pkgInfo.nonSemverVersion ?? `${pkgInfo.name}@${pkgInfo.version}`;
+            if (opts.skipIfHasSideEffectsCache && (resolution.gitHosted || resolution.integrity)) {
+                const filesIndexFile = pickStoreIndexKey(resolution, pkgId, { built: true });
                 const pkgFilesIndex = storeIndex.get(filesIndexFile);
                 if (pkgFilesIndex) {
                     sideEffectsCacheKey = calcDepState(depGraph, depsStateCache, depPath, {
@@ -284,9 +287,9 @@ async function _rebuild(ctx, opts) {
                 unsafePerm: opts.unsafePerm || false,
                 userAgent: opts.userAgent,
             });
-            if (hasSideEffects && (opts.sideEffectsCacheWrite ?? true) && resolution.integrity) {
+            if (hasSideEffects && (opts.sideEffectsCacheWrite ?? true) && (resolution.gitHosted || resolution.integrity)) {
                 builtDepPaths.add(depPath);
-                const filesIndexFile = storeIndexKey(resolution.integrity.toString(), pkgId);
+                const filesIndexFile = pickStoreIndexKey(resolution, pkgId, { built: true });
                 try {
                     if (!sideEffectsCacheKey) {
                         sideEffectsCacheKey = calcDepState(depGraph, depsStateCache, depPath, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/building.after-install",
-  "version": "1101.0.5",
+  "version": "1101.0.7",
   "description": "Rebuild packages that are already installed by running their lifecycle scripts",
   "keywords": [
     "pnpm",
@@ -27,40 +27,40 @@
   "dependencies": {
     "@pnpm/npm-package-arg": "^2.0.0",
     "load-json-file": "^7.0.1",
-    "p-limit": "^7.1.0",
+    "p-limit": "^7.3.0",
     "run-groups": "^5.0.0",
-    "semver": "^7.7.2",
-    "@pnpm/building.pkg-requires-build": "1100.0.2",
+    "semver": "^7.7.4",
     "@pnpm/bins.linker": "1100.0.3",
+    "@pnpm/building.pkg-requires-build": "1100.0.2",
     "@pnpm/config.normalize-registries": "1100.0.2",
-    "@pnpm/building.policy": "1100.0.2",
-    "@pnpm/config.reader": "1101.1.4",
+    "@pnpm/building.policy": "1100.0.3",
+    "@pnpm/config.reader": "1101.2.1",
+    "@pnpm/constants": "1100.0.0",
     "@pnpm/core-loggers": "1100.0.1",
+    "@pnpm/deps.graph-hasher": "1100.1.3",
     "@pnpm/deps.graph-sequencer": "1100.0.0",
-    "@pnpm/deps.path": "1100.0.2",
-    "@pnpm/deps.graph-hasher": "1100.1.2",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/installing.modules-yaml": "1100.0.2",
-    "@pnpm/exec.lifecycle": "1100.0.5",
-    "@pnpm/lockfile.types": "1100.0.3",
-    "@pnpm/installing.context": "1100.0.5",
-    "@pnpm/lockfile.utils": "1100.0.4",
-    "@pnpm/store.cafs": "1100.1.1",
-    "@pnpm/lockfile.walker": "1100.0.3",
-    "@pnpm/store.connection-manager": "1100.0.9",
-    "@pnpm/types": "1101.0.0",
+    "@pnpm/installing.context": "1100.0.6",
+    "@pnpm/deps.path": "1100.0.2",
+    "@pnpm/exec.lifecycle": "1100.0.6",
+    "@pnpm/installing.modules-yaml": "1100.0.3",
+    "@pnpm/lockfile.types": "1100.0.4",
+    "@pnpm/lockfile.utils": "1100.0.5",
+    "@pnpm/lockfile.walker": "1100.0.4",
+    "@pnpm/store.cafs": "1100.1.2",
     "@pnpm/pkg-manifest.reader": "1100.0.2",
-    "@pnpm/store.controller-types": "1100.0.4",
+    "@pnpm/store.connection-manager": "1100.0.11",
     "@pnpm/store.index": "1100.0.0",
-    "@pnpm/constants": "1100.0.0"
+    "@pnpm/types": "1101.0.0",
+    "@pnpm/store.controller-types": "1100.0.5"
   },
   "peerDependencies": {
-    "@pnpm/logger": ">=1001.0.0 <1002.0.0",
-    "@pnpm/worker": "^1100.1.1"
+    "@pnpm/logger": "^1001.0.1",
+    "@pnpm/worker": "^1100.1.2"
   },
   "devDependencies": {
     "@types/semver": "7.7.1",
-    "@pnpm/building.after-install": "1101.0.5"
+    "@pnpm/building.after-install": "1101.0.7"
   },
   "engines": {
     "node": ">=22.13"