@pnpm/exe 12.4.1 → 12.4.2

package/dist/node_modules/.pnpm-workspace-state-v1.json

@@ -1,9 +1,9 @@
 {
-  "lastValidatedTimestamp": 1789057805684,
+  "lastValidatedTimestamp": 1789466800429,
   "projects": {
     "/home/runner/_work/pnpm/pnpm/pnpm/npm/pnpm/temp-deploy": {
       "name": "pacquet",
-      "version": "12.4.1"
+      "version": "12.4.2"
     }
   },
   "pnpmfiles": [],
@@ -94,7 +94,6 @@
         "@yarnpkg/lockfile": "^1.1.0",
         "@yarnpkg/nm": "4.1.1",
         "@yarnpkg/pnp": "^4.1.7",
-        "@zkochan/cmd-shim": "^9.0.7",
         "@zkochan/retry": "^0.2.0",
         "@zkochan/rimraf": "^4.0.0",
         "@zkochan/table": "^2.0.1",
@@ -142,7 +141,7 @@
         "fast-glob": "^3.3.3",
         "fs-extra": "^11.4.0",
         "fuse-native": "^2.2.6",
-        "get-pnpm": "^0.0.3",
+        "get-pnpm": "^0.0.4",
         "get-port": "^7.2.0",
         "ghooks": "2.0.4",
         "graceful-fs": "^4.2.11",
@@ -172,6 +171,7 @@
         "lru-cache": "^11.5.2",
         "make-empty-dir": "^4.0.0",
         "mdast-util-to-string": "^4.0.0",
+        "memfs": "^3.5.3",
         "memoize": "^11.0.0",
         "micromatch": "^4.0.8",
         "msgpackr": "2.1.0",
@@ -311,15 +311,13 @@
       "write-ini-file",
       "write-json5-file",
       "write-yaml-file",
-      "http-proxy-middleware@3.0.7",
-      "get-pnpm@0.0.3"
+      "http-proxy-middleware@3.0.7"
     ],
     "minimumReleaseAgeIgnoreMissingTime": true,
     "minimumReleaseAgeStrict": true,
     "nodeLinker": "hoisted",
     "optional": true,
     "patchedDependencies": {
-      "adm-zip@0.6.0": "../../../../__patches__/adm-zip@0.6.0.patch",
       "graceful-fs@4.2.11": "../../../../__patches__/graceful-fs@4.2.11.patch",
       "normalize-registry-url@2.0.1": "../../../../__patches__/normalize-registry-url@2.0.1.patch"
     },

package/dist/node_modules/get-pnpm/lib/platformPackageName.js

@@ -1,3 +1,11 @@
+const V12_ONLY_TARGETS = new Set([
+    'android-arm64',
+    'android-x64',
+    'freebsd-x64',
+    'linux-ppc64',
+    'linux-riscv64',
+    'linux-s390x',
+]);
 /**
  * Name of the npm package that carries the pnpm executable for `target`.
  *
@@ -6,15 +14,22 @@
  * publishes `@pnpm/exe.<process.platform>-<arch>[-musl]`, while v11 and older
  * publish `@pnpm/<macos|win|linux|linuxstatic>-<arch>`.
  *
- * @throws if pnpm publishes no binary for the host — either because the
- * architecture was never supported, or because of the v11-only Intel macOS gap.
+ * @throws if pnpm publishes no binary for the host — because the host is not
+ * built for at all, because the binary arrived in v12 and an older major was
+ * asked for, or because of the v11-only Intel macOS gap.
  */
 export function platformPackageName({ major, platform, arch, musl }) {
-    if (arch !== 'x64' && arch !== 'arm64') {
-        throw new Error('Sorry! pnpm currently only provides pre-built binaries for x86_64/arm64 architectures.');
+    const target = `${platform}-${arch}`;
+    if (V12_ONLY_TARGETS.has(target)) {
+        if (major >= 12)
+            return `@pnpm/exe.${target}`;
+        throw new Error(`pnpm v${major} does not provide a pre-built binary for ${target}. pnpm 12 does:
+
+  npx get-pnpm 12`);
     }
-    if (platform !== 'darwin' && platform !== 'linux' && platform !== 'win32') {
-        throw new Error(`Sorry! pnpm does not provide a pre-built binary for ${platform}.`);
+    if ((arch !== 'x64' && arch !== 'arm64') ||
+        (platform !== 'darwin' && platform !== 'linux' && platform !== 'win32')) {
+        throw new Error(`Sorry! pnpm does not provide a pre-built binary for ${target}.`);
     }
     if (platform === 'darwin' && arch === 'x64' && major === 11) {
         throw new Error(`pnpm v11 does not provide a working binary for Intel macOS (darwin-x64) due to an upstream Node.js SEA bug.

package/dist/node_modules/get-pnpm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "get-pnpm",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Installs pnpm as a standalone executable",
   "keywords": [
     "pnpm",

package/package.json

@@ -9,7 +9,7 @@
       "./dist/node_modules/node-gyp/gyp/gyp"
     ]
   },
-  "version": "12.4.1",
+  "version": "12.4.2",
   "description": "Fast, disk space efficient package manager",
   "keywords": [
     "pnpm",
@@ -46,20 +46,20 @@
     "THIRD-PARTY-NOTICES.md"
   ],
   "optionalDependencies": {
-    "@pnpm/exe.win32-x64": "12.4.1",
-    "@pnpm/exe.win32-arm64": "12.4.1",
-    "@pnpm/exe.darwin-x64": "12.4.1",
-    "@pnpm/exe.darwin-arm64": "12.4.1",
-    "@pnpm/exe.linux-x64": "12.4.1",
-    "@pnpm/exe.linux-arm64": "12.4.1",
-    "@pnpm/exe.linux-riscv64": "12.4.1",
-    "@pnpm/exe.linux-ppc64": "12.4.1",
-    "@pnpm/exe.linux-s390x": "12.4.1",
-    "@pnpm/exe.linux-x64-musl": "12.4.1",
-    "@pnpm/exe.linux-arm64-musl": "12.4.1",
-    "@pnpm/exe.freebsd-x64": "12.4.1",
-    "@pnpm/exe.android-arm64": "12.4.1",
-    "@pnpm/exe.android-x64": "12.4.1"
+    "@pnpm/exe.win32-x64": "12.4.2",
+    "@pnpm/exe.win32-arm64": "12.4.2",
+    "@pnpm/exe.darwin-x64": "12.4.2",
+    "@pnpm/exe.darwin-arm64": "12.4.2",
+    "@pnpm/exe.linux-x64": "12.4.2",
+    "@pnpm/exe.linux-arm64": "12.4.2",
+    "@pnpm/exe.linux-riscv64": "12.4.2",
+    "@pnpm/exe.linux-ppc64": "12.4.2",
+    "@pnpm/exe.linux-s390x": "12.4.2",
+    "@pnpm/exe.linux-x64-musl": "12.4.2",
+    "@pnpm/exe.linux-arm64-musl": "12.4.2",
+    "@pnpm/exe.freebsd-x64": "12.4.2",
+    "@pnpm/exe.android-arm64": "12.4.2",
+    "@pnpm/exe.android-x64": "12.4.2"
   },
   "scripts": {
     "preinstall": "node install.js",

package/pn

@@ -1,2 +1,36 @@
 #!/bin/sh
-exec pnpm "$@"
+# `pn` is `pnpm`. The pnpm it hands over to is the one installed alongside it,
+# found relative to this file: a `PATH` lookup would run whatever other pnpm
+# comes first there, and would find nothing at all when the directory holding
+# these bins is not on `PATH`.
+#
+# $0 is whatever shim or symlink `pn` was launched through, so walk to the file
+# itself first. The hop cap matches the kernel's ELOOP limit, so a cycle cannot
+# hang the script. Directories come from `${self%/*}` and `readlink` runs through
+# `command -p`, so the caller's `PATH` decides nothing here.
+self=$0
+# `${self%/*}` needs a slash to strip. A bare name came from a `PATH` lookup and
+# stands for a file in the current directory.
+case $self in
+  */*) ;;
+  *) self=./$self ;;
+esac
+hops=0
+while [ -L "$self" ] && [ "$hops" -lt 40 ]; do
+  hops=$((hops + 1))
+  link=$(command -p readlink "$self")
+  case $link in
+    /*) self=$link ;;
+    *) self=${self%/*}/$link ;;
+  esac
+done
+# The walk has to end at a regular file. Running out of hops leaves $self a
+# symlink; a chain that changed under us can leave it dangling or a directory, and
+# a failed readlink leaves a trailing slash. Each case would take `pnpm` from the
+# wrong directory — the substitution this script exists to prevent.
+if [ -L "$self" ] || [ ! -f "$self" ]; then
+  echo "pn: could not resolve $0 to a regular file within 40 symlink hops." >&2
+  exit 1
+fi
+
+exec "${self%/*}/pnpm" "$@"

package/pnpm

@@ -24,15 +24,25 @@ fi
 # $0 is whatever shim or symlink pnpm was launched through; ./bin/pnpm.mjs is
 # found relative to this file. The hop cap matches the kernel's ELOOP limit, so
 # a cycle cannot hang the script.
+#
+# `readlink` runs through `command -p`, which searches the system default path,
+# and directories come from `${self%/*}`, which runs nothing at all. The caller's
+# PATH therefore decides only which `node` runs, which is what it is for.
 self=$0
+# `${self%/*}` needs a slash to strip. A bare name came from a PATH lookup and
+# stands for a file in the current directory.
+case $self in
+  */*) ;;
+  *) self=./$self ;;
+esac
 hops=0
 while [ -L "$self" ] && [ "$hops" -lt 40 ]; do
   hops=$((hops + 1))
-  link=$(readlink "$self")
+  link=$(command -p readlink "$self")
   case $link in
     /*) self=$link ;;
-    *) self=$(dirname "$self")/$link ;;
+    *) self=${self%/*}/$link ;;
   esac
 done
 
-exec node "$(dirname "$self")/bin/pnpm.mjs" "$@"
+exec node "${self%/*}/bin/pnpm.mjs" "$@"

package/pnpx

@@ -1,2 +1,36 @@
 #!/bin/sh
-exec pnpm dlx "$@"
+# `pnpx` is `pnpm dlx`. The pnpm it hands over to is the one installed alongside
+# it, found relative to this file: a `PATH` lookup would run whatever other pnpm
+# comes first there, and would find nothing at all when the directory holding
+# these bins is not on `PATH`.
+#
+# $0 is whatever shim or symlink `pnpx` was launched through, so walk to the file
+# itself first. The hop cap matches the kernel's ELOOP limit, so a cycle cannot
+# hang the script. Directories come from `${self%/*}` and `readlink` runs through
+# `command -p`, so the caller's `PATH` decides nothing here.
+self=$0
+# `${self%/*}` needs a slash to strip. A bare name came from a `PATH` lookup and
+# stands for a file in the current directory.
+case $self in
+  */*) ;;
+  *) self=./$self ;;
+esac
+hops=0
+while [ -L "$self" ] && [ "$hops" -lt 40 ]; do
+  hops=$((hops + 1))
+  link=$(command -p readlink "$self")
+  case $link in
+    /*) self=$link ;;
+    *) self=${self%/*}/$link ;;
+  esac
+done
+# The walk has to end at a regular file. Running out of hops leaves $self a
+# symlink; a chain that changed under us can leave it dangling or a directory, and
+# a failed readlink leaves a trailing slash. Each case would take `pnpm` from the
+# wrong directory — the substitution this script exists to prevent.
+if [ -L "$self" ] || [ ! -f "$self" ]; then
+  echo "pnpx: could not resolve $0 to a regular file within 40 symlink hops." >&2
+  exit 1
+fi
+
+exec "${self%/*}/pnpm" dlx "$@"

package/pnx

@@ -1,2 +1,36 @@
 #!/bin/sh
-exec pnpm dlx "$@"
+# `pnx` is `pnpm dlx`. The pnpm it hands over to is the one installed alongside
+# it, found relative to this file: a `PATH` lookup would run whatever other pnpm
+# comes first there, and would find nothing at all when the directory holding
+# these bins is not on `PATH`.
+#
+# $0 is whatever shim or symlink `pnx` was launched through, so walk to the file
+# itself first. The hop cap matches the kernel's ELOOP limit, so a cycle cannot
+# hang the script. Directories come from `${self%/*}` and `readlink` runs through
+# `command -p`, so the caller's `PATH` decides nothing here.
+self=$0
+# `${self%/*}` needs a slash to strip. A bare name came from a `PATH` lookup and
+# stands for a file in the current directory.
+case $self in
+  */*) ;;
+  *) self=./$self ;;
+esac
+hops=0
+while [ -L "$self" ] && [ "$hops" -lt 40 ]; do
+  hops=$((hops + 1))
+  link=$(command -p readlink "$self")
+  case $link in
+    /*) self=$link ;;
+    *) self=${self%/*}/$link ;;
+  esac
+done
+# The walk has to end at a regular file. Running out of hops leaves $self a
+# symlink; a chain that changed under us can leave it dangling or a directory, and
+# a failed readlink leaves a trailing slash. Each case would take `pnpm` from the
+# wrong directory — the substitution this script exists to prevent.
+if [ -L "$self" ] || [ ! -f "$self" ]; then
+  echo "pnx: could not resolve $0 to a regular file within 40 symlink hops." >&2
+  exit 1
+fi
+
+exec "${self%/*}/pnpm" dlx "$@"

package/dist/node_modules/.package-map.json

@@ -1 +0,0 @@
-{"packages":{".":{"url":"..","dependencies":{"get-pnpm":"get-pnpm","node-gyp":"node-gyp","pacquet":"."}},"@isaacs/fs-minipass":{"url":"./@isaacs/fs-minipass","dependencies":{"@isaacs/fs-minipass":"@isaacs/fs-minipass","minipass":"minipass"}},"abbrev":{"url":"./abbrev","dependencies":{"abbrev":"abbrev"}},"chownr":{"url":"./chownr","dependencies":{"chownr":"chownr"}},"env-paths":{"url":"./env-paths","dependencies":{"env-paths":"env-paths"}},"exponential-backoff":{"url":"./exponential-backoff","dependencies":{"exponential-backoff":"exponential-backoff"}},"fdir":{"url":"./fdir","dependencies":{"fdir":"fdir","picomatch":"picomatch"}},"get-pnpm":{"url":"./get-pnpm","dependencies":{"get-pnpm":"get-pnpm"}},"graceful-fs":{"url":"./graceful-fs","dependencies":{"graceful-fs":"graceful-fs"}},"isexe":{"url":"./isexe","dependencies":{"isexe":"isexe"}},"minipass":{"url":"./minipass","dependencies":{"minipass":"minipass"}},"minizlib":{"url":"./minizlib","dependencies":{"minipass":"minipass","minizlib":"minizlib"}},"node-gyp":{"url":"./node-gyp","dependencies":{"env-paths":"env-paths","exponential-backoff":"exponential-backoff","graceful-fs":"graceful-fs","node-gyp":"node-gyp","nopt":"nopt","proc-log":"proc-log","semver":"semver","tar":"tar","tinyglobby":"tinyglobby","undici":"undici","which":"which"}},"nopt":{"url":"./nopt","dependencies":{"abbrev":"abbrev","nopt":"nopt"}},"picomatch":{"url":"./picomatch","dependencies":{"picomatch":"picomatch"}},"proc-log":{"url":"./proc-log","dependencies":{"proc-log":"proc-log"}},"semver":{"url":"./semver","dependencies":{"semver":"semver"}},"tar":{"url":"./tar","dependencies":{"@isaacs/fs-minipass":"@isaacs/fs-minipass","chownr":"chownr","minipass":"minipass","minizlib":"minizlib","tar":"tar","yallist":"yallist"}},"tinyglobby":{"url":"./tinyglobby","dependencies":{"fdir":"fdir","picomatch":"picomatch","tinyglobby":"tinyglobby"}},"undici":{"url":"./undici","dependencies":{"undici":"undici"}},"which":{"url":"./which","dependencies":{"isexe":"isexe","which":"which"}},"yallist":{"url":"./yallist","dependencies":{"yallist":"yallist"}}}}