@socketsecurity/cli-with-sentry 0.14.100 → 0.14.102

package/dist/instrument-with-sentry.js

@@ -41,7 +41,7 @@ const relConstantsPath = './constants'
   Sentry.setTag(
     'version',
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
-    '0.14.100:7c35eec:441641a1:pub'
+    '0.14.102:51e000d:4c8b52e6:pub'
   )
   const constants = require(relConstantsPath)
   if (constants.ENV.SOCKET_CLI_DEBUG) {
@@ -56,5 +56,5 @@ const relConstantsPath = './constants'
   } = constants
   setSentry(Sentry)
 }
-//# debugId=68401e4a-2e60-44b9-9a70-e0e2b7c44c44
+//# debugId=53e9e69e-32ef-4d48-a639-445fc330d92e
 //# sourceMappingURL=instrument-with-sentry.js.map

package/dist/instrument-with-sentry.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrument-with-sentry.js","sources":["../../src/instrument-with-sentry.ts"],"sourcesContent":["// This should ONLY be included in the special Sentry build!\n// Otherwise the Sentry dependency won't even be present in the manifest.\n\nimport { logger } from '@socketsecurity/registry/lib/logger'\n\n// Require constants with require(relConstantsPath) instead of require('./constants')\n// so Rollup doesn't generate a constants2.js chunk.\nconst relConstantsPath = './constants'\n// The '@rollup/plugin-replace' will replace \"process.env['INLINED_SOCKET_CLI_SENTRY_BUILD']\".\nif (process.env['INLINED_SOCKET_CLI_SENTRY_BUILD']) {\n  const Sentry = require('@sentry/node')\n  Sentry.init({\n    onFatalError(error: Error) {\n      // Defer module loads until after Sentry.init is called.\n      if (require(relConstantsPath).ENV.SOCKET_CLI_DEBUG) {\n        logger.fail('[DEBUG] [Sentry onFatalError]:', error)\n      }\n    },\n    dsn: 'https://66736701db8e4ffac046bd09fa6aaced@o555220.ingest.us.sentry.io/4508846967619585',\n    enabled: true,\n    integrations: []\n  })\n  Sentry.setTag(\n    'environment',\n    // The '@rollup/plugin-replace' will replace \"process.env['INLINED_SOCKET_CLI_PUBLISHED_BUILD']\".\n    process.env['INLINED_SOCKET_CLI_PUBLISHED_BUILD']\n      ? 'pub'\n      : // The NODE_ENV convention is used by apps to define the runtime environment.\n        // https://nodejs.org/en/learn/getting-started/nodejs-the-difference-between-development-and-production\n        process.env['NODE_ENV']\n  )\n  Sentry.setTag(\n    'version',\n    // The '@rollup/plugin-replace' will replace \"process.env['INLINED_SOCKET_CLI_VERSION_HASH']\".\n    process.env['INLINED_SOCKET_CLI_VERSION_HASH']\n  )\n  const constants = require(relConstantsPath)\n  if (constants.ENV.SOCKET_CLI_DEBUG) {\n    Sentry.setTag('debugging', true)\n    logger.log('[DEBUG] Set up Sentry.')\n  } else {\n    Sentry.setTag('debugging', false)\n  }\n  const {\n    kInternalsSymbol,\n    [kInternalsSymbol as unknown as 'Symbol(kInternalsSymbol)']: { setSentry }\n  } = constants\n  setSentry(Sentry)\n} else if (require(relConstantsPath).ENV.SOCKET_CLI_DEBUG) {\n  logger.log('[DEBUG] Sentry disabled explicitly.')\n}\n"],"names":["logger","dsn","enabled","integrations","process","Sentry","setSentry"],"mappings":";;;;;;;;;;;;;;;AAAA;AACA;;;AAIA;AACA;AACA;AACA;AACoD;AAClD;;;AAGI;;AAEEA;AACF;;AAEFC;AACAC;AACAC;AACF;;AAGE;AACAC;;AAQA;AACAA;AAEF;AACA;AACEC;AACAL;AACF;AACEK;AACF;;;AAGE;AAA+DC;AAAU;AAC3E;;AAEF","debugId":"68401e4a-2e60-44b9-9a70-e0e2b7c44c44"}
+{"version":3,"file":"instrument-with-sentry.js","sources":["../../src/instrument-with-sentry.ts"],"sourcesContent":["// This should ONLY be included in the special Sentry build!\n// Otherwise the Sentry dependency won't even be present in the manifest.\n\nimport { logger } from '@socketsecurity/registry/lib/logger'\n\n// Require constants with require(relConstantsPath) instead of require('./constants')\n// so Rollup doesn't generate a constants2.js chunk.\nconst relConstantsPath = './constants'\n// The '@rollup/plugin-replace' will replace \"process.env['INLINED_SOCKET_CLI_SENTRY_BUILD']\".\nif (process.env['INLINED_SOCKET_CLI_SENTRY_BUILD']) {\n  const Sentry = require('@sentry/node')\n  Sentry.init({\n    onFatalError(error: Error) {\n      // Defer module loads until after Sentry.init is called.\n      if (require(relConstantsPath).ENV.SOCKET_CLI_DEBUG) {\n        logger.fail('[DEBUG] [Sentry onFatalError]:', error)\n      }\n    },\n    dsn: 'https://66736701db8e4ffac046bd09fa6aaced@o555220.ingest.us.sentry.io/4508846967619585',\n    enabled: true,\n    integrations: []\n  })\n  Sentry.setTag(\n    'environment',\n    // The '@rollup/plugin-replace' will replace \"process.env['INLINED_SOCKET_CLI_PUBLISHED_BUILD']\".\n    process.env['INLINED_SOCKET_CLI_PUBLISHED_BUILD']\n      ? 'pub'\n      : // The NODE_ENV convention is used by apps to define the runtime environment.\n        // https://nodejs.org/en/learn/getting-started/nodejs-the-difference-between-development-and-production\n        process.env['NODE_ENV']\n  )\n  Sentry.setTag(\n    'version',\n    // The '@rollup/plugin-replace' will replace \"process.env['INLINED_SOCKET_CLI_VERSION_HASH']\".\n    process.env['INLINED_SOCKET_CLI_VERSION_HASH']\n  )\n  const constants = require(relConstantsPath)\n  if (constants.ENV.SOCKET_CLI_DEBUG) {\n    Sentry.setTag('debugging', true)\n    logger.log('[DEBUG] Set up Sentry.')\n  } else {\n    Sentry.setTag('debugging', false)\n  }\n  const {\n    kInternalsSymbol,\n    [kInternalsSymbol as unknown as 'Symbol(kInternalsSymbol)']: { setSentry }\n  } = constants\n  setSentry(Sentry)\n} else if (require(relConstantsPath).ENV.SOCKET_CLI_DEBUG) {\n  logger.log('[DEBUG] Sentry disabled explicitly.')\n}\n"],"names":["logger","dsn","enabled","integrations","process","Sentry","setSentry"],"mappings":";;;;;;;;;;;;;;;AAAA;AACA;;;AAIA;AACA;AACA;AACA;AACoD;AAClD;;;AAGI;;AAEEA;AACF;;AAEFC;AACAC;AACAC;AACF;;AAGE;AACAC;;AAQA;AACAA;AAEF;AACA;AACEC;AACAL;AACF;AACEK;AACF;;;AAGE;AAA+DC;AAAU;AAC3E;;AAEF","debugId":"53e9e69e-32ef-4d48-a639-445fc330d92e"}

package/dist/module-sync/cli.js

@@ -900,7 +900,7 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.100:7c35eec:441641a1:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.102:51e000d:4c8b52e6: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'
@@ -3724,6 +3724,9 @@ async function branchExists(branch, cwd = process.cwd()) {
 }
 async function checkoutBaseBranchIfAvailable(baseBranch, cwd = process.cwd()) {
   try {
+    await spawn.spawn('git', ['fetch', '--depth=1', 'origin', baseBranch], {
+      cwd
+    })
     await spawn.spawn('git', ['checkout', baseBranch], {
       cwd
     })
@@ -3731,10 +3734,11 @@ async function checkoutBaseBranchIfAvailable(baseBranch, cwd = process.cwd()) {
       cwd
     })
     logger.logger.info(`Checked out and reset to ${baseBranch}`)
-  } catch {
+  } catch (e) {
     logger.logger.warn(
       `Could not switch to ${baseBranch}. Proceeding with HEAD.`
     )
+    debug.debugLog(e)
   }
 }
 async function createAndPushBranchIfNeeded(
@@ -3965,6 +3969,8 @@ async function npmFix(
   const editablePkgJson = await packages.readPackageJson(cwd, {
     editable: true
   })
+  // Lazily access constants.ENV[CI].
+  const isCi = constants.ENV[CI$1]
   await arb.buildIdealTree()
   for (const { 0: name, 1: infos } of infoByPkg) {
     const hasUpgrade = !!registry.getManifestData(NPM$f, name)
@@ -4010,8 +4016,8 @@ async function npmFix(
         if (
           !shadowNpmInject.updateNode(node, packument, vulnerableVersionRange)
         ) {
-          spinner?.failAndStop(`Could not patch ${fromSpec}`)
-          return
+          spinner?.fail(`Could not patch ${fromSpec}`)
+          continue
         }
         const toVersion = node.package.version
         const toVersionRange = shadowNpmInject.applyRange(
@@ -4020,21 +4026,17 @@ async function npmFix(
           rangeStyle
         )
         const toSpec = `${name}@${toVersionRange}`
-        let branch
-        let owner
-        let repo
-        let shouldOpenPr = false
-        // Lazily access constants.ENV[CI].
-        if (constants.ENV[CI$1]) {
-          ;({ owner, repo } = getGitHubEnvRepoInfo())
-          branch = getSocketBranchName(fromPurl, toVersion)
-          // eslint-disable-next-line no-await-in-loop
-          shouldOpenPr = !(await doesPullRequestExistForBranch(
-            owner,
-            repo,
-            branch
-          ))
-        }
+        const branch = isCi ? getSocketBranchName(fromPurl, toVersion) : ''
+        const { owner, repo } = isCi
+          ? getGitHubEnvRepoInfo()
+          : {
+              owner: '',
+              repo: ''
+            }
+        const shouldOpenPr = isCi
+          ? // eslint-disable-next-line no-await-in-loop
+            !(await doesPullRequestExistForBranch(owner, repo, branch))
+          : false
         const revertData = {
           ...(editablePkgJson.content.dependencies
             ? {
@@ -4058,6 +4060,8 @@ async function npmFix(
 
         // eslint-disable-next-line no-await-in-loop
         await checkoutBaseBranchIfAvailable(baseBranch, cwd)
+        let error
+        let errored = false
         let installed = false
         let saved = false
         try {
@@ -4087,23 +4091,11 @@ async function npmFix(
           }
           spinner?.successAndStop(`Fixed ${name}`)
           spinner?.start()
-        } catch {
-          spinner?.error(`Reverting ${toSpec}`)
-          if (saved) {
-            editablePkgJson.update(revertData)
-            // eslint-disable-next-line no-await-in-loop
-            await editablePkgJson.save()
-          }
-          if (installed) {
-            // eslint-disable-next-line no-await-in-loop
-            await install$1(revertTree, {
-              cwd
-            })
-          }
-          spinner?.failAndStop(`Failed to fix ${fromSpec}`)
-          return
+        } catch (e) {
+          error = e
+          errored = true
         }
-        if (shouldOpenPr) {
+        if (!errored && shouldOpenPr) {
           // eslint-disable-next-line no-await-in-loop
           await createAndPushBranchIfNeeded(
             branch,
@@ -4125,6 +4117,25 @@ async function npmFix(
             await enableAutoMerge(prResponse.data)
           }
         }
+        if (errored || isCi) {
+          if (errored) {
+            spinner?.error(`Reverting ${toSpec}`, error)
+          }
+          if (saved) {
+            editablePkgJson.update(revertData)
+            // eslint-disable-next-line no-await-in-loop
+            await editablePkgJson.save()
+          }
+          if (installed) {
+            // eslint-disable-next-line no-await-in-loop
+            await install$1(revertTree, {
+              cwd
+            })
+          }
+          if (errored) {
+            spinner?.failAndStop(`Failed to fix ${fromSpec}`)
+          }
+        }
       }
     }
   }
@@ -4379,6 +4390,8 @@ async function pnpmFix(
   const editablePkgJson = await packages.readPackageJson(cwd, {
     editable: true
   })
+  // Lazily access constants.ENV[CI].
+  const isCi = constants.ENV[CI]
   let actualTree = await getActualTree(cwd)
   for (const { 0: name, 1: infos } of infoByPkg) {
     if (registry.getManifestData(NPM$c, name)) {
@@ -4426,8 +4439,8 @@ async function pnpmFix(
           ? packument.versions[toVersion]
           : undefined
         if (!(toVersion && targetPackument)) {
-          spinner?.failAndStop(`Could not patch ${fromSpec}`)
-          return
+          spinner?.fail(`Could not patch ${fromSpec}`)
+          continue
         }
         const oldPnpm = editablePkgJson.content[PNPM$9]
         const oldPnpmKeyCount = oldPnpm ? Object.keys(oldPnpm).length : 0
@@ -4442,21 +4455,17 @@ async function pnpmFix(
           rangeStyle
         )
         const toSpec = `${name}@${toVersionRange}`
-        let branch
-        let owner
-        let repo
-        let shouldOpenPr = false
-        // Lazily access constants.ENV[CI].
-        if (constants.ENV[CI]) {
-          ;({ owner, repo } = getGitHubEnvRepoInfo())
-          branch = getSocketBranchName(fromPurl, toVersion)
-          // eslint-disable-next-line no-await-in-loop
-          shouldOpenPr = !(await doesPullRequestExistForBranch(
-            owner,
-            repo,
-            branch
-          ))
-        }
+        const branch = isCi ? getSocketBranchName(fromPurl, toVersion) : ''
+        const { owner, repo } = isCi
+          ? getGitHubEnvRepoInfo()
+          : {
+              owner: '',
+              repo: ''
+            }
+        const shouldOpenPr = isCi
+          ? // eslint-disable-next-line no-await-in-loop
+            !(await doesPullRequestExistForBranch(owner, repo, branch))
+          : false
         const updateData = {
           [PNPM$9]: {
             ...oldPnpm,
@@ -4501,6 +4510,8 @@ async function pnpmFix(
 
         // eslint-disable-next-line no-await-in-loop
         await checkoutBaseBranchIfAvailable(baseBranch, cwd)
+        let error
+        let errored = false
         let installed = false
         let saved = false
         try {
@@ -4532,22 +4543,10 @@ async function pnpmFix(
           spinner?.successAndStop(`Fixed ${name}`)
           spinner?.start()
         } catch (e) {
-          spinner?.error(`Reverting ${toSpec}`, e)
-          if (saved) {
-            editablePkgJson.update(revertData)
-            // eslint-disable-next-line no-await-in-loop
-            await editablePkgJson.save()
-          }
-          if (installed) {
-            // eslint-disable-next-line no-await-in-loop
-            actualTree = await install(pkgEnvDetails, {
-              spinner
-            })
-          }
-          spinner?.failAndStop(`Failed to fix ${fromSpec}`)
-          return
+          error = e
+          errored = true
         }
-        if (shouldOpenPr) {
+        if (!errored && shouldOpenPr) {
           // eslint-disable-next-line no-await-in-loop
           await createAndPushBranchIfNeeded(
             branch,
@@ -4569,6 +4568,25 @@ async function pnpmFix(
             await enableAutoMerge(prResponse.data)
           }
         }
+        if (errored || isCi) {
+          if (errored) {
+            spinner?.error(`Reverting ${toSpec}`, error)
+          }
+          if (saved) {
+            editablePkgJson.update(revertData)
+            // eslint-disable-next-line no-await-in-loop
+            await editablePkgJson.save()
+          }
+          if (installed) {
+            // eslint-disable-next-line no-await-in-loop
+            actualTree = await install(pkgEnvDetails, {
+              spinner
+            })
+          }
+          if (errored) {
+            spinner?.failAndStop(`Failed to fix ${fromSpec}`)
+          }
+        }
       }
     }
   }
@@ -11488,7 +11506,7 @@ void (async () => {
   await vendor.updater({
     name: SOCKET_CLI_BIN_NAME,
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
-    version: '0.14.100',
+    version: '0.14.102',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -11556,5 +11574,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=2e3e51cb-a35e-46da-91f3-dc2cdc8797d7
+//# debugId=522cbad6-7bef-48c2-95d7-5233b81e92ca
 //# sourceMappingURL=cli.js.map