@pnpm/exe 11.0.0-rc.3 → 11.0.0-rc.4

package/dist/worker.js

@@ -485,7 +485,7 @@ var require_graceful_fs = __commonJS({
     var polyfills = require_polyfills();
     var legacy = require_legacy_streams();
     var clone = require_clone();
-    var util8 = __require("util");
+    var util9 = __require("util");
     var gracefulQueue;
     var previousSymbol;
     if (typeof Symbol === "function" && typeof Symbol.for === "function") {
@@ -505,11 +505,11 @@ var require_graceful_fs = __commonJS({
       });
     }
     var debug = noop;
-    if (util8.debuglog)
-      debug = util8.debuglog("gfs4");
+    if (util9.debuglog)
+      debug = util9.debuglog("gfs4");
     else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || ""))
       debug = function() {
-        var m = util8.format.apply(util8, arguments);
+        var m = util9.format.apply(util9, arguments);
         m = "GFS4: " + m.split(/\n/).join("\nGFS4: ");
         console.error(m);
       };
@@ -3423,14 +3423,13 @@ var init_parseTarball = __esm({
 
 // ../store/cafs/lib/addFilesFromTarball.js
 import { gunzipSync } from "node:zlib";
-function addFilesFromTarball(addBufferToCafs2, _ignore, tarballBuffer, readManifest) {
-  const ignore = _ignore ?? (() => false);
+function addFilesFromTarball(addBufferToCafs2, tarballBuffer, readManifest, ignore) {
   const tarContent = (0, import_is_gzip.default)(tarballBuffer) ? gunzipSync(tarballBuffer, { chunkSize: 128 * 1024 }) : Buffer.isBuffer(tarballBuffer) ? tarballBuffer : Buffer.from(tarballBuffer);
   const { files } = parseTarball(tarContent);
   const filesIndex = /* @__PURE__ */ new Map();
   let manifestBuffer;
   for (const [relativePath, { mode, offset, size }] of files) {
-    if (ignore(relativePath))
+    if (ignore?.(relativePath))
       continue;
     const fileBuffer = tarContent.subarray(offset, offset + size);
     if (readManifest && relativePath === "package.json") {
@@ -5791,11 +5790,18 @@ function createCafs(storeDir, { ignoreFile, cafsLocker: cafsLocker2 } = {}) {
   const addBuffer = addBufferToCafs.bind(null, _writeBufferToCafs);
   return {
     addFilesFromDir: addFilesFromDir.bind(null, addBuffer),
-    addFilesFromTarball: addFilesFromTarball.bind(null, addBuffer, ignoreFile ?? null),
+    addFilesFromTarball: (tarballBuffer, readManifest, callIgnore) => addFilesFromTarball(addBuffer, tarballBuffer, readManifest, combineIgnore(ignoreFile, callIgnore)),
     addFile: addBuffer,
     getFilePathByModeInCafs: getFilePathByModeInCafs.bind(null, storeDir)
   };
 }
+function combineIgnore(a, b) {
+  if (!a)
+    return b;
+  if (!b)
+    return a;
+  return (filename) => a(filename) || b(filename);
+}
 function addBufferToCafs(writeBufferToCafs2, buffer, mode) {
   const digest = crypto4.hash(HASH_ALGORITHM, buffer, "hex");
   const isExecutable = modeIsExecutable(mode);
@@ -6472,6 +6478,7 @@ var require_msgpackr_extract = __commonJS({
 import crypto5 from "node:crypto";
 import fs12 from "node:fs";
 import path16 from "node:path";
+import util8 from "node:util";
 import { parentPort } from "node:worker_threads";
 
 // ../building/pkg-requires-build/lib/index.js
@@ -10958,7 +10965,7 @@ If you want to ignore this issue, set strictStorePkgContentCheck to false in you
     });
   }
 }
-function addTarballToStore({ buffer, storeDir, integrity, filesIndexFile, appendManifest }) {
+function addTarballToStore({ buffer, storeDir, integrity, filesIndexFile, appendManifest, ignoreFilePattern }) {
   if (integrity) {
     const { algorithm, hexDigest } = parseIntegrity(integrity);
     const calculatedHash = crypto5.hash(algorithm, buffer, "hex");
@@ -10978,7 +10985,8 @@ function addTarballToStore({ buffer, storeDir, integrity, filesIndexFile, append
     cafsCache.set(storeDir, createCafs(storeDir));
   }
   const cafs = cafsCache.get(storeDir);
-  let { filesIndex, manifest } = cafs.addFilesFromTarball(buffer, true);
+  const ignore = ignoreFilePattern ? makeIgnoreFromPattern(ignoreFilePattern) : void 0;
+  let { filesIndex, manifest } = cafs.addFilesFromTarball(buffer, true, ignore);
   if (appendManifest && manifest == null) {
     manifest = appendManifest;
     addManifestToCafs(cafs, filesIndex, appendManifest);
@@ -11009,6 +11017,16 @@ function calcIntegrity(buffer) {
   const calculatedHash = crypto5.hash("sha512", buffer, "hex");
   return formatIntegrity("sha512", calculatedHash);
 }
+function makeIgnoreFromPattern(pattern) {
+  let regex;
+  try {
+    regex = new RegExp(pattern);
+  } catch (err) {
+    const detail = util8.types.isNativeError(err) ? `: ${err.message}` : "";
+    throw new PnpmError("INVALID_IGNORE_FILE_PATTERN", `Invalid ignoreFilePattern regex${detail}: ${pattern}`);
+  }
+  return (filename) => regex.test(filename);
+}
 function packToShared(data) {
   const packed = packForStorage(data);
   const shared = new SharedArrayBuffer(packed.byteLength);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/exe",
-  "version": "11.0.0-rc.3",
+  "version": "11.0.0-rc.4",
   "description": "Fast, disk space efficient package manager",
   "keywords": [
     "pnpm",
@@ -32,21 +32,20 @@
     "detect-libc": "^2.0.3"
   },
   "optionalDependencies": {
-    "@pnpm/exe.darwin-arm64": "11.0.0-rc.3",
-    "@pnpm/exe.darwin-x64": "11.0.0-rc.3",
-    "@pnpm/exe.linux-arm64": "11.0.0-rc.3",
-    "@pnpm/exe.linux-x64": "11.0.0-rc.3",
-    "@pnpm/exe.linux-arm64-musl": "11.0.0-rc.3",
-    "@pnpm/exe.linux-x64-musl": "11.0.0-rc.3",
-    "@pnpm/exe.win32-arm64": "11.0.0-rc.3",
-    "@pnpm/exe.win32-x64": "11.0.0-rc.3"
+    "@pnpm/linux-arm64": "11.0.0-rc.4",
+    "@pnpm/linux-x64": "11.0.0-rc.4",
+    "@pnpm/linuxstatic-arm64": "11.0.0-rc.4",
+    "@pnpm/linuxstatic-x64": "11.0.0-rc.4",
+    "@pnpm/macos-arm64": "11.0.0-rc.4",
+    "@pnpm/macos-x64": "11.0.0-rc.4",
+    "@pnpm/win-arm64": "11.0.0-rc.4",
+    "@pnpm/win-x64": "11.0.0-rc.4"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
     "execa": "npm:safe-execa@0.3.0",
-    "tar": "^7.5.10",
-    "@pnpm/exe": "11.0.0-rc.3",
-    "@pnpm/jest-config": "1100.0.2"
+    "@pnpm/jest-config": "1100.0.3",
+    "@pnpm/exe": "11.0.0-rc.4"
   },
   "jest": {
     "preset": "@pnpm/jest-config"
@@ -56,7 +55,8 @@
     "tag": "next-10"
   },
   "scripts": {
-    "preinstall": "node setup.js"
+    "preinstall": "node setup.js",
+    "build-artifacts": "pn --filter=pnpm prepublishOnly && node ./scripts/build-artifacts.ts"
   },
   "bin": {
     "pnpm": "pnpm",

package/platform-pkg-name.js

@@ -1,9 +1,18 @@
 // Shared between setup.js (preinstall hook) and the test suite.
 // Computes the npm package name of the matching @pnpm/exe platform child for a
-// given host: `@pnpm/exe.<platform>-<arch>[-musl]`. Pure — no I/O, no detect-libc
-// call — so the musl branch is unit-testable without mocking.
+// given host. Returns `@pnpm/<os>-<arch>`, where <os> is `macos` (darwin),
+// `win` (win32), `linux` (glibc), or `linuxstatic` (musl). Pure — no I/O, no
+// detect-libc call — so the musl branch is unit-testable without mocking.
 export function exePlatformPkgName(platform, arch, libcFamily) {
   const normalizedArch = platform === 'win32' && arch === 'ia32' ? 'x86' : arch
-  const libcSuffix = platform === 'linux' && libcFamily === 'musl' ? '-musl' : ''
-  return `@pnpm/exe.${platform}-${normalizedArch}${libcSuffix}`
+  return `@pnpm/${legacyOsSegment(platform, libcFamily)}-${normalizedArch}`
+}
+
+function legacyOsSegment(platform, libcFamily) {
+  switch (platform) {
+    case 'darwin': return 'macos'
+    case 'win32': return 'win'
+    case 'linux': return libcFamily === 'musl' ? 'linuxstatic' : 'linux'
+    default: return platform
+  }
 }

package/setup.js

@@ -4,11 +4,14 @@ import fs from 'fs'
 import { familySync } from 'detect-libc'
 import { exePlatformPkgName } from './platform-pkg-name.js'
 
-// Platform names match process.platform (linux | darwin | win32). On linux,
-// add a `-musl` libc suffix when detect-libc reports musl, matching the
-// @pnpm/exe.linux-<arch>-musl optional-dep naming. The name computation lives
-// in platform-pkg-name.js so it can be unit-tested without triggering the
-// side effects of this preinstall script.
+// Platform package names use the legacy scheme: `@pnpm/macos-<arch>` (darwin),
+// `@pnpm/win-<arch>` (win32), `@pnpm/linux-<arch>` (glibc), and
+// `@pnpm/linuxstatic-<arch>` (musl Linux, detected via detect-libc). This is
+// the naming published on npm, even though the workspace directories use the
+// newer `<os>-<arch>[-musl]` scheme. Keeping these names lets `pnpm
+// self-update` from older majors continue to resolve the right platform child.
+// The name computation lives in platform-pkg-name.js so it can be unit-tested
+// without triggering the side effects of this preinstall script.
 const platform = process.platform
 const pkgName = exePlatformPkgName(platform, process.arch, familySync())
 const pkgJson = fileURLToPath(import.meta.resolve(`${pkgName}/package.json`))