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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/exe",
-  "version": "11.0.0-rc.2",
+  "version": "11.0.0-rc.4",
   "description": "Fast, disk space efficient package manager",
   "keywords": [
     "pnpm",
@@ -17,6 +17,7 @@
   "type": "module",
   "files": [
     "setup.js",
+    "platform-pkg-name.js",
     "prepare.js",
     "dist/",
     "pn.cmd",
@@ -27,22 +28,24 @@
     "pnx.ps1"
   ],
   "dependencies": {
-    "@reflink/reflink": "0.1.19"
+    "@reflink/reflink": "0.1.19",
+    "detect-libc": "^2.0.3"
   },
   "optionalDependencies": {
-    "@pnpm/linux-x64": "11.0.0-rc.2",
-    "@pnpm/linux-arm64": "11.0.0-rc.2",
-    "@pnpm/macos-x64": "11.0.0-rc.2",
-    "@pnpm/win-arm64": "11.0.0-rc.2",
-    "@pnpm/macos-arm64": "11.0.0-rc.2",
-    "@pnpm/win-x64": "11.0.0-rc.2"
+    "@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/jest-config": "1100.0.1",
-    "@pnpm/exe": "11.0.0-rc.2"
+    "@pnpm/jest-config": "1100.0.3",
+    "@pnpm/exe": "11.0.0-rc.4"
   },
   "jest": {
     "preset": "@pnpm/jest-config"
@@ -52,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

@@ -0,0 +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. 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
+  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

@@ -1,17 +1,21 @@
 import { fileURLToPath } from 'url'
 import path from 'path'
 import fs from 'fs'
-
-const platform = process.platform === 'win32'
-  ? 'win'
-  : process.platform === 'darwin'
-  ? 'macos'
-  : process.platform
-const arch = platform === 'win' && process.arch === 'ia32' ? 'x86' : process.arch
-
-const pkgName = `@pnpm/${platform}-${arch}`
+import { familySync } from 'detect-libc'
+import { exePlatformPkgName } from './platform-pkg-name.js'
+
+// 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`))
-const executable = platform === 'win' ? 'pnpm.exe' : 'pnpm'
+const executable = platform === 'win32' ? 'pnpm.exe' : 'pnpm'
 const platformDir = path.dirname(pkgJson)
 const bin = path.resolve(platformDir, executable)
 
@@ -21,7 +25,7 @@ if (!fs.existsSync(bin)) process.exit(0)
 
 linkSync(bin, path.resolve(ownDir, executable))
 
-if (platform === 'win') {
+if (platform === 'win32') {
   // On Windows, also hardlink the binary as 'pnpm' (no .exe extension).
   // npm's bin shims point to the name from publishConfig.bin, and npm
   // does NOT re-read package.json after preinstall, so rewriting the bin