Merge branch 'main' into barslev/debug-publish-errors

Author: jdalton

.config/rollup.dist.config.mjs

@@ -40,18 +40,24 @@ const {
   ROLLUP_EXTERNAL_SUFFIX,
   SHADOW_NPM_BIN,
   SHADOW_NPM_INJECT,
+  SHADOW_PNPM_BIN,
+  SHADOW_YARN_BIN,
   SLASH_NODE_MODULES_SLASH,
   SOCKET_CLI_BIN_NAME,
   SOCKET_CLI_BIN_NAME_ALIAS,
   SOCKET_CLI_LEGACY_PACKAGE_NAME,
   SOCKET_CLI_NPM_BIN_NAME,
   SOCKET_CLI_NPX_BIN_NAME,
   SOCKET_CLI_PACKAGE_NAME,
+  SOCKET_CLI_PNPM_BIN_NAME,
   SOCKET_CLI_SENTRY_BIN_NAME,
   SOCKET_CLI_SENTRY_BIN_NAME_ALIAS,
   SOCKET_CLI_SENTRY_NPM_BIN_NAME,
   SOCKET_CLI_SENTRY_NPX_BIN_NAME,
   SOCKET_CLI_SENTRY_PACKAGE_NAME,
+  SOCKET_CLI_SENTRY_PNPM_BIN_NAME,
+  SOCKET_CLI_SENTRY_YARN_BIN_NAME,
+  SOCKET_CLI_YARN_BIN_NAME,
 } = constants
 
 const BLESSED = 'blessed'
@@ -222,6 +228,8 @@ async function updatePackageJson() {
         [SOCKET_CLI_SENTRY_BIN_NAME]: bin[SOCKET_CLI_BIN_NAME],
         [SOCKET_CLI_SENTRY_NPM_BIN_NAME]: bin[SOCKET_CLI_NPM_BIN_NAME],
         [SOCKET_CLI_SENTRY_NPX_BIN_NAME]: bin[SOCKET_CLI_NPX_BIN_NAME],
+        [SOCKET_CLI_SENTRY_PNPM_BIN_NAME]: bin[SOCKET_CLI_PNPM_BIN_NAME],
+        [SOCKET_CLI_SENTRY_YARN_BIN_NAME]: bin[SOCKET_CLI_YARN_BIN_NAME],
       },
       dependencies: {
         ...dependencies,
@@ -294,6 +302,10 @@ function resetBin(bin) {
       bin?.[SOCKET_CLI_NPM_BIN_NAME] ?? bin?.[SOCKET_CLI_SENTRY_NPM_BIN_NAME],
     [SOCKET_CLI_NPX_BIN_NAME]:
       bin?.[SOCKET_CLI_NPX_BIN_NAME] ?? bin?.[SOCKET_CLI_SENTRY_NPX_BIN_NAME],
+    [SOCKET_CLI_PNPM_BIN_NAME]:
+      bin?.[SOCKET_CLI_PNPM_BIN_NAME] ?? bin?.[SOCKET_CLI_SENTRY_PNPM_BIN_NAME],
+    [SOCKET_CLI_YARN_BIN_NAME]:
+      bin?.[SOCKET_CLI_YARN_BIN_NAME] ?? bin?.[SOCKET_CLI_SENTRY_YARN_BIN_NAME],
   }
   const newBin = {
     ...(tmpBin[SOCKET_CLI_BIN_NAME]
@@ -305,12 +317,20 @@ function resetBin(bin) {
     ...(tmpBin[SOCKET_CLI_NPX_BIN_NAME]
       ? { [SOCKET_CLI_NPX_BIN_NAME]: tmpBin[SOCKET_CLI_NPX_BIN_NAME] }
       : {}),
+    ...(tmpBin[SOCKET_CLI_PNPM_BIN_NAME]
+      ? { [SOCKET_CLI_PNPM_BIN_NAME]: tmpBin[SOCKET_CLI_PNPM_BIN_NAME] }
+      : {}),
+    ...(tmpBin[SOCKET_CLI_YARN_BIN_NAME]
+      ? { [SOCKET_CLI_YARN_BIN_NAME]: tmpBin[SOCKET_CLI_YARN_BIN_NAME] }
+      : {}),
   }
   assert(
     util.isDeepStrictEqual(Object.keys(newBin).sort(naturalCompare), [
       SOCKET_CLI_BIN_NAME,
       SOCKET_CLI_NPM_BIN_NAME,
       SOCKET_CLI_NPX_BIN_NAME,
+      SOCKET_CLI_PNPM_BIN_NAME,
+      SOCKET_CLI_YARN_BIN_NAME,
     ]),
     "Update the rollup Legacy and Sentry build's .bin to match the default build.",
   )
@@ -337,16 +357,28 @@ export default async () => {
   const shadowNpmInjectSrcPath = normalizePath(
     path.join(srcPath, 'shadow/npm/inject.mts'),
   )
+  const shadowPnpmBinSrcPath = normalizePath(
+    path.join(srcPath, 'shadow/pnpm/bin.mts'),
+  )
+  const shadowYarnBinSrcPath = normalizePath(
+    path.join(srcPath, 'shadow/yarn/bin.mts'),
+  )
   const utilsSrcPath = normalizePath(path.join(srcPath, UTILS))
 
   return [
     // Bundle <root>/src/ entry point files and output to <root>/dist/.
     baseConfig({
       input: {
         cli: `${srcPath}/cli.mts`,
+        'npm-cli': `${srcPath}/npm-cli.mts`,
+        'npx-cli': `${srcPath}/npx-cli.mts`,
+        'pnpm-cli': `${srcPath}/pnpm-cli.mts`,
+        'yarn-cli': `${srcPath}/yarn-cli.mts`,
         [CONSTANTS]: `${srcPath}/constants.mts`,
         [SHADOW_NPM_BIN]: `${srcPath}/shadow/npm/bin.mts`,
         [SHADOW_NPM_INJECT]: `${srcPath}/shadow/npm/inject.mts`,
+        [SHADOW_PNPM_BIN]: `${srcPath}/shadow/pnpm/bin.mts`,
+        [SHADOW_YARN_BIN]: `${srcPath}/shadow/yarn/bin.mts`,
         ...(constants.ENV[INLINED_SOCKET_CLI_SENTRY_BUILD]
           ? {
               [INSTRUMENT_WITH_SENTRY]: `${srcPath}/${INSTRUMENT_WITH_SENTRY}.mts`,
@@ -372,6 +404,10 @@ export default async () => {
                 return SHADOW_NPM_BIN
               case shadowNpmInjectSrcPath:
                 return SHADOW_NPM_INJECT
+              case shadowPnpmBinSrcPath:
+                return SHADOW_PNPM_BIN
+              case shadowYarnBinSrcPath:
+                return SHADOW_YARN_BIN
               default:
                 if (id.startsWith(`${utilsSrcPath}/`)) {
                   return UTILS

.github/actions/setup/action.yml

@@ -16,10 +16,10 @@ runs:
         node-version: ${{ inputs.node-version }}
 
     - name: Setup PNPM
-      uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
+      uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       with:
         version: '^10.16.0'
 
     - name: Install dependencies
       shell: bash
-      run: pnpm install
+      run: pnpm install

.github/workflows/provenance.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
+      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
         with:
           version: 10
           run_install: false

CLAUDE.md

@@ -213,11 +213,11 @@ Socket CLI integrates with various third-party tools and services:
   - ❌ `process.exit(1)` (bypasses error handling framework)
 
 ### 🗑️ Safe File Operations (SECURITY CRITICAL)
-- **File deletion**: 🚨 ABSOLUTELY FORBIDDEN - NEVER use `rm -rf`. 🚨 MANDATORY - ALWAYS use `npx trash-cli`
+- **File deletion**: 🚨 ABSOLUTELY FORBIDDEN - NEVER use `rm -rf`. 🚨 MANDATORY - ALWAYS use `pnpm dlx trash-cli`
 - **Examples**:
   - ❌ CATASTROPHIC: `rm -rf directory` (permanent deletion - DATA LOSS RISK)
   - ❌ REPOSITORY DESTROYER: `rm -rf "$(pwd)"` (deletes entire repository)
-  - ✅ SAFE: `npx trash-cli directory` (recoverable deletion)
+  - ✅ SAFE: `pnpm dlx trash-cli directory` (recoverable deletion)
 - **Why this matters**: trash-cli enables recovery from accidental deletions via system trash/recycle bin
 
 ### Formatting

bin/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 'use strict'
-;(async () => {
+
+void (async () => {
   const Module = require('node:module')
   const path = require('node:path')
   const rootPath = path.join(__dirname, '..')

bin/npm-cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 'use strict'
-;(async () => {
+
+void (async () => {
   const Module = require('node:module')
   const path = require('node:path')
   const rootPath = path.join(__dirname, '..')

bin/npx-cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 'use strict'
-;(async () => {
+
+void (async () => {
   const Module = require('node:module')
   const path = require('node:path')
   const rootPath = path.join(__dirname, '..')

bin/pnpm-cli.js

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+'use strict'
+
+void (async () => {
+  const Module = require('node:module')
+  const path = require('node:path')
+  const rootPath = path.join(__dirname, '..')
+  Module.enableCompileCache?.(path.join(rootPath, '.cache'))
+
+  const shadowBin = require(path.join(rootPath, 'dist/shadow-pnpm-bin.js'))
+
+  process.exitCode = 1
+
+  const { spawnPromise } = await shadowBin('pnpm', process.argv.slice(2), {
+    stdio: 'inherit',
+  })
+
+  // See https://nodejs.org/api/child_process.html#event-exit.
+  spawnPromise.process.on('exit', (code, signalName) => {
+    if (signalName) {
+      process.kill(process.pid, signalName)
+    } else if (typeof code === 'number') {
+      // eslint-disable-next-line n/no-process-exit
+      process.exit(code)
+    }
+  })
+
+  await spawnPromise
+})()

bin/yarn-cli.js

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+'use strict'
+
+void (async () => {
+  const Module = require('node:module')
+  const path = require('node:path')
+  const rootPath = path.join(__dirname, '..')
+  Module.enableCompileCache?.(path.join(rootPath, '.cache'))
+
+  const shadowBin = require(path.join(rootPath, 'dist/shadow-yarn-bin.js'))
+
+  process.exitCode = 1
+
+  const { spawnPromise } = await shadowBin('yarn', process.argv.slice(2), {
+    stdio: 'inherit',
+  })
+
+  // See https://nodejs.org/api/child_process.html#event-exit.
+  spawnPromise.process.on('exit', (code, signalName) => {
+    if (signalName) {
+      process.kill(process.pid, signalName)
+    } else if (typeof code === 'number') {
+      // eslint-disable-next-line n/no-process-exit
+      process.exit(code)
+    }
+  })
+
+  await spawnPromise
+})()

package.json

@@ -16,13 +16,17 @@
   "bin": {
     "socket": "bin/cli.js",
     "socket-npm": "bin/npm-cli.js",
-    "socket-npx": "bin/npx-cli.js"
+    "socket-npx": "bin/npx-cli.js",
+    "socket-pnpm": "bin/pnpm-cli.js",
+    "socket-yarn": "bin/yarn-cli.js"
   },
   "types": "./dist/types/src/cli.d.ts",
   "exports": {
     "./bin/cli.js": "./dist/cli.js",
     "./bin/npm-cli.js": "./dist/npm-cli.js",
     "./bin/npx-cli.js": "./dist/npx-cli.js",
+    "./bin/pnpm-cli.js": "./dist/pnpm-cli.js",
+    "./bin/yarn-cli.js": "./dist/yarn-cli.js",
     "./package.json": "./package.json",
     "./requirements.json": "./requirements.json",
     "./translations.json": "./translations.json"
@@ -229,9 +233,9 @@
       "blessed-contrib@4.11.0": "patches/blessed-contrib@4.11.0.patch",
       "brace-expansion@2.0.2": "patches/brace-expansion@2.0.2.patch",
       "bresenham@0.0.3": "patches/bresenham@0.0.3.patch",
-      "tiny-updater@3.5.3": "patches/tiny-updater@3.5.3.patch",
       "lodash@4.17.21": "patches/lodash@4.17.21.patch",
-      "rollup@4.50.1": "patches/rollup@4.50.1.patch"
+      "rollup@4.50.1": "patches/rollup@4.50.1.patch",
+      "tiny-updater@3.5.3": "patches/tiny-updater@3.5.3.patch"
     }
   },
   "engines": {