@pnpm/fetching.tarball-fetcher 1102.1.2 → 1102.1.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pnpm/tarball-fetcher
 
+## 1102.1.3
+
+### Patch Changes
+
+- `pnpm install` now installs git-hosted dependencies without preparing them when their builds are explicitly denied by `allowBuilds`. Dependencies that require preparation still need an explicit allow or deny decision [pnpm/pnpm#10522](https://github.com/pnpm/pnpm/issues/10522).
+
+- Updated dependencies:
+  - @pnpm/core-loggers@1101.0.0
+  - @pnpm/exec.prepare-package@1100.0.37
+  - @pnpm/fetching.fetcher-base@1100.2.10
+  - @pnpm/fs.graceful-fs@1100.2.2
+
 ## 1102.1.2
 
 ### Patch Changes

package/lib/gitHostedTarballFetcher.d.ts

@@ -1,5 +1,5 @@
 import type { FetchFunction } from '@pnpm/fetching.fetcher-base';
-import type { StoreIndex } from '@pnpm/store.index';
+import { type StoreIndex } from '@pnpm/store.index';
 export interface CreateGitHostedTarballFetcher {
     ignoreScripts?: boolean;
     storeIndex: StoreIndex;

package/lib/gitHostedTarballFetcher.js

@@ -3,6 +3,7 @@ import util from 'node:util';
 import { preparePackage } from '@pnpm/exec.prepare-package';
 import { packlist } from '@pnpm/fs.packlist';
 import { globalWarn } from '@pnpm/logger';
+import { gitHostedStoreIndexKey } from '@pnpm/store.index';
 import { addFilesFromDir } from '@pnpm/worker';
 export function createGitHostedTarballFetcher(fetchRemoteTarball, fetcherOpts) {
     const fetch = async (cafs, resolution, opts) => {
@@ -20,10 +21,12 @@ export function createGitHostedTarballFetcher(fetchRemoteTarball, fetcherOpts) {
                 globalWarn(`The git-hosted package fetched from "${resolution.tarball}" has to be built but the build scripts were ignored.`);
             }
             return {
+                filesIndexFile: prepareResult.filesIndexFile,
                 filesMap: prepareResult.filesMap,
                 manifest: prepareResult.manifest ?? manifest,
                 requiresBuild,
                 requiresPrepare: prepareResult.requiresPrepare,
+                ignoredBuild: prepareResult.ignoredBuild,
                 // Propagate the raw tarball integrity so the lockfile pins it and
                 // future installs detect a tampered tarball from the git host.
                 integrity,
@@ -47,33 +50,31 @@ async function prepareGitHostedPkg(filesMap, cafs, rawFilesIndexFile, filesIndex
         },
         force: true,
     });
-    const { shouldBeBuilt, pkgDir } = await preparePackage({
+    const { shouldBeBuilt, pkgDir, ignoredBuild = false } = await preparePackage({
         ...opts,
         allowBuild: fetcherOpts.allowBuild,
         pkgResolutionId: fetcherOpts.pkgResolutionId ?? createGitHostedTarballPkgResolutionId(resolution),
     }, tempLocation, resolution.path ?? '');
+    if (shouldBeBuilt && ((ignoredBuild && !opts.ignoreScripts) || (!ignoredBuild && filesIndexFile.endsWith('\tnot-built')))) {
+        filesIndexFile = gitHostedStoreIndexKey(fetcherOpts.pkgResolutionId ?? createGitHostedTarballPkgResolutionId(resolution), { built: !ignoredBuild });
+    }
     const files = await packlist(pkgDir);
     const { storeIndex } = opts;
     if (!resolution.path && files.length === filesMap.size) {
-        if (!shouldBeBuilt) {
-            const data = storeIndex.get(rawFilesIndexFile);
-            if (data) {
-                data.requiresPrepare = false;
-                storeIndex.set(filesIndexFile, data);
-                storeIndex.delete(rawFilesIndexFile);
+        if (!shouldBeBuilt || ignoredBuild) {
+            if (!ignoredBuild || !opts.ignoreScripts) {
+                const data = storeIndex.get(rawFilesIndexFile);
+                if (data) {
+                    data.requiresPrepare = shouldBeBuilt;
+                    storeIndex.set(filesIndexFile, data);
+                }
             }
-            return {
-                filesMap,
-                ignoredBuild: false,
-                requiresPrepare: false,
-            };
-        }
-        if (opts.ignoreScripts) {
             storeIndex.delete(rawFilesIndexFile);
             return {
+                filesIndexFile,
                 filesMap,
-                ignoredBuild: true,
-                requiresPrepare: true,
+                ignoredBuild,
+                requiresPrepare: shouldBeBuilt,
             };
         }
     }
@@ -82,6 +83,7 @@ async function prepareGitHostedPkg(filesMap, cafs, rawFilesIndexFile, filesIndex
     // Even though we have the index of the package,
     // the linking of files to the store is in progress.
     return {
+        filesIndexFile,
         ...await addFilesFromDir({
             storeDir: cafs.storeDir,
             storeIndex: opts.storeIndex,
@@ -92,7 +94,7 @@ async function prepareGitHostedPkg(filesMap, cafs, rawFilesIndexFile, filesIndex
             readManifest: fetcherOpts.readManifest,
             requiresPrepare: shouldBeBuilt,
         }),
-        ignoredBuild: Boolean(opts.ignoreScripts),
+        ignoredBuild,
         requiresPrepare: shouldBeBuilt,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/fetching.tarball-fetcher",
-  "version": "1102.1.2",
+  "version": "1102.1.3",
   "description": "Fetcher for packages hosted as tarballs",
   "keywords": [
     "pnpm",
@@ -29,12 +29,12 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/core-loggers": "1100.3.4",
+    "@pnpm/core-loggers": "1101.0.0",
     "@pnpm/error": "1100.1.4",
-    "@pnpm/exec.prepare-package": "1100.0.36",
-    "@pnpm/fetching.fetcher-base": "1100.2.9",
+    "@pnpm/exec.prepare-package": "1100.0.37",
+    "@pnpm/fetching.fetcher-base": "1100.2.10",
     "@pnpm/fetching.types": "1100.0.3",
-    "@pnpm/fs.graceful-fs": "1100.2.1",
+    "@pnpm/fs.graceful-fs": "1100.2.2",
     "@pnpm/fs.packlist": "1100.0.4",
     "@pnpm/store.index": "1100.3.1",
     "@pnpm/types": "1102.1.0",
@@ -44,15 +44,15 @@
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0",
-    "@pnpm/worker": "^1100.4.2"
+    "@pnpm/worker": "^1100.4.3"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/fetching.tarball-fetcher": "1102.1.2",
+    "@pnpm/fetching.tarball-fetcher": "1102.1.3",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/network.fetch": "1100.1.16",
+    "@pnpm/network.fetch": "1100.1.17",
     "@pnpm/store.cafs-types": "1100.1.0",
-    "@pnpm/store.create-cafs-store": "1100.0.29",
+    "@pnpm/store.create-cafs-store": "1100.0.30",
     "@pnpm/test-fixtures": "1100.0.1",
     "@pnpm/text.ordinal-comparator": "1100.0.0",
     "@pnpm/types": "1102.1.0",