socket 0.14.92 → 0.14.94

package/dist/module-sync/cli.js

@@ -43,8 +43,8 @@ const arrays = require('@socketsecurity/registry/lib/arrays')
 const registry = require('@socketsecurity/registry')
 const npm = require('@socketsecurity/registry/lib/npm')
 const packages = require('@socketsecurity/registry/lib/packages')
-const rest = _socketInterop(require('@octokit/rest'))
 const spawn = require('@socketsecurity/registry/lib/spawn')
+const rest = _socketInterop(require('@octokit/rest'))
 const lockfile_fs = _socketInterop(require('@pnpm/lockfile.fs'))
 const lockfile_detectDepTypes = _socketInterop(
   require('@pnpm/lockfile.detect-dep-types')
@@ -918,7 +918,7 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.92:5d5aa04:71fedd04:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.94:8a54136:931df7a9:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
   const nodeVersion = process$1.version
   const apiToken = shadowNpmInject.getDefaultToken()
   const shownToken = apiToken ? getLastFiveOfApiToken(apiToken) : 'no'
@@ -3715,26 +3715,7 @@ const cmdDiffScan = {
   }
 }
 
-const {
-  GITHUB_ACTIONS,
-  GITHUB_REF_NAME,
-  GITHUB_REPOSITORY,
-  SOCKET_SECURITY_GITHUB_PAT
-} = constants
-async function branchExists(branch, cwd = process.cwd()) {
-  try {
-    await spawn.spawn(
-      'git',
-      ['show-ref', '--verify', '--quiet', `refs/heads/${branch}`],
-      {
-        cwd,
-        stdio: 'ignore'
-      }
-    )
-    return true
-  } catch {}
-  return false
-}
+const { GITHUB_REF_NAME } = constants
 async function checkoutBaseBranchIfAvailable(baseBranch, cwd = process.cwd()) {
   try {
     await spawn.spawn('git', ['checkout', baseBranch], {
@@ -3750,6 +3731,21 @@ async function checkoutBaseBranchIfAvailable(baseBranch, cwd = process.cwd()) {
     )
   }
 }
+function getBaseBranch() {
+  // Lazily access constants.ENV[GITHUB_REF_NAME].
+  return (
+    constants.ENV[GITHUB_REF_NAME] ??
+    // GitHub defaults to branch name "main"
+    // https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches#about-the-default-branch
+    'main'
+  )
+}
+function getSocketBranchName(name, version) {
+  return `socket-fix-${name}-${version.replace(/\./g, '-')}`
+}
+
+const { GITHUB_ACTIONS, GITHUB_REPOSITORY, SOCKET_SECURITY_GITHUB_PAT } =
+  constants
 let _octokit
 function getOctokit() {
   if (_octokit === undefined) {
@@ -3811,12 +3807,10 @@ function getGitHubRepoInfo() {
     repo: ownerSlashRepo.slice(slashIndex + 1)
   }
 }
-function getSocketBranchName(name, version) {
-  return `socket-fix-${name}-${version.replace(/\./g, '-')}`
-}
 async function openGitHubPullRequest(
   owner,
   repo,
+  baseBranch,
   branch,
   name,
   version,
@@ -3829,42 +3823,17 @@ async function openGitHubPullRequest(
     if (!pat) {
       throw new Error('Missing SOCKET_SECURITY_GITHUB_PAT environment variable')
     }
-    const baseBranch =
-      // Lazily access constants.ENV[GITHUB_REF_NAME].
-      constants.ENV[GITHUB_REF_NAME] ??
-      // GitHub defaults to branch name "main"
-      // https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches#about-the-default-branch
-      'main'
     const commitMsg = `chore: upgrade ${name} to ${version}`
     const url = `https://x-access-token:${pat}@github.com/${owner}/${repo}`
     await spawn.spawn('git', ['remote', 'set-url', 'origin', url], {
       cwd
     })
-    if (await branchExists(branch, cwd)) {
-      logger.logger.warn(
-        `Branch "${branch}" already exists. Skipping creation.`
-      )
-    } else {
-      await checkoutBaseBranchIfAvailable(baseBranch, cwd)
-      await spawn.spawn('git', ['checkout', '-b', branch], {
-        cwd
-      })
-      await spawn.spawn('git', ['add', 'package.json', 'pnpm-lock.yaml'], {
-        cwd
-      })
-      await spawn.spawn('git', ['commit', '-m', commitMsg], {
-        cwd
-      })
-      await spawn.spawn('git', ['push', '--set-upstream', 'origin', branch], {
-        cwd
-      })
-    }
     const octokit = getOctokit()
     return await octokit.pulls.create({
       owner,
       repo,
       title: commitMsg,
-      head: branch,
+      head: `${owner}:${branch}`,
       base: baseBranch,
       body: `[socket] Upgrade \`${name}\` to ${version}`
     })
@@ -3983,6 +3952,12 @@ async function npmFix(
             : undefined)
         }
         spinner?.info(`Installing ${fixSpec}`)
+        const { owner, repo } = getGitHubRepoInfo()
+        const baseBranch = getBaseBranch()
+        const branch = getSocketBranchName(name, targetVersion)
+
+        // eslint-disable-next-line no-await-in-loop
+        await checkoutBaseBranchIfAvailable(baseBranch, cwd)
         let installed = false
         let saved = false
         try {
@@ -4028,8 +4003,6 @@ async function npmFix(
           spinner?.failAndStop(`Failed to fix ${oldSpec}`)
           return
         }
-        const { owner, repo } = getGitHubRepoInfo()
-        const branch = getSocketBranchName(name, targetVersion)
         if (
           // Lazily access constants.ENV[CI].
           constants.ENV[CI$1] &&
@@ -4042,6 +4015,7 @@ async function npmFix(
             prResponse = await openGitHubPullRequest(
               owner,
               repo,
+              baseBranch,
               branch,
               name,
               targetVersion,
@@ -4414,6 +4388,12 @@ async function pnpmFix(
             : undefined)
         }
         spinner?.info(`Installing ${fixSpec}`)
+        const { owner, repo } = getGitHubRepoInfo()
+        const baseBranch = getBaseBranch()
+        const branch = getSocketBranchName(name, targetVersion)
+
+        // eslint-disable-next-line no-await-in-loop
+        await checkoutBaseBranchIfAvailable(baseBranch, cwd)
         let installed = false
         let saved = false
         try {
@@ -4460,8 +4440,6 @@ async function pnpmFix(
           spinner?.failAndStop(`Failed to fix ${oldSpec}`)
           return
         }
-        const { owner, repo } = getGitHubRepoInfo()
-        const branch = getSocketBranchName(name, targetVersion)
         if (
           // Lazily access constants.ENV[CI].
           constants.ENV[CI] &&
@@ -4474,6 +4452,7 @@ async function pnpmFix(
             prResponse = await openGitHubPullRequest(
               owner,
               repo,
+              baseBranch,
               branch,
               name,
               targetVersion,
@@ -11378,7 +11357,7 @@ void (async () => {
   await updateNotifier({
     name: SOCKET_CLI_BIN_NAME,
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
-    version: '0.14.92',
+    version: '0.14.94',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -11446,5 +11425,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=64db5375-59c3-42aa-a735-1930e57bbe2
+//# debugId=2d759c1d-e112-45d0-b84d-e2f8bdac075e
 //# sourceMappingURL=cli.js.map