@socketsecurity/cli-with-sentry 0.14.104 → 0.14.105

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.104:da4a527:b9e86b3d:pub'
+    '0.14.105:2179d68:84daf9f9:pub'
   )
   const constants = require(relConstantsPath)
   if (constants.ENV.SOCKET_CLI_DEBUG) {
@@ -56,5 +56,5 @@ const relConstantsPath = './constants'
   } = constants
   setSentry(Sentry)
 }
-//# debugId=1884a388-d0c1-4d9a-9f7d-5c54d8261263
+//# debugId=af51dcd1-0bfc-466f-8eba-0a73080fc397
 //# 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":"1884a388-d0c1-4d9a-9f7d-5c54d8261263"}
+{"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":"af51dcd1-0bfc-466f-8eba-0a73080fc397"}

package/dist/module-sync/arborist-helpers.d.ts

@@ -53,7 +53,7 @@ declare function updatePackageJsonFromNode(
   node: SafeNode,
   targetVersion: string,
   rangeStyle?: RangeStyle | undefined
-): void
+): boolean
 export {
   Packument,
   findBestPatchVersion,

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.104:da4a527:b9e86b3d:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.105:2179d68:84daf9f9: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'
@@ -4088,19 +4088,6 @@ async function npmFix(
           )
           const newSpec = `${name}@${newVersionRange}`
           const newSpecKey = `${workspaceName ? `${workspaceName}>` : ''}${newSpec}`
-          const branch = isCi
-            ? getSocketBranchName(oldPurl, newVersion, workspaceName)
-            : ''
-          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
               ? {
@@ -4119,30 +4106,45 @@ async function npmFix(
                 }
               : undefined)
           }
-          if (!installedSpecs.has(newSpecKey)) {
-            testedSpecs.add(newSpecKey)
-            spinner?.info(`Installing ${newSpec}${workspaceDetails}`)
+          const branch = isCi
+            ? getSocketBranchName(oldPurl, newVersion, workspaceName)
+            : ''
+          const baseBranch = isCi ? getBaseGitBranch() : ''
+          const { owner, repo } = isCi
+            ? getGitHubEnvRepoInfo()
+            : {
+                owner: '',
+                repo: ''
+              }
+          const shouldOpenPr = isCi
+            ? // eslint-disable-next-line no-await-in-loop
+              !(await doesPullRequestExistForBranch(owner, repo, branch))
+            : false
+          if (isCi) {
+            // eslint-disable-next-line no-await-in-loop
+            await gitCheckoutBaseBranchIfAvailable(baseBranch, cwd)
           }
-          const baseBranch = getBaseGitBranch()
-
-          // eslint-disable-next-line no-await-in-loop
-          await gitCheckoutBaseBranchIfAvailable(baseBranch, cwd)
+          shadowNpmInject.updatePackageJsonFromNode(
+            editablePkgJson,
+            arb.idealTree,
+            node,
+            newVersion,
+            rangeStyle
+          )
           let error
           let errored = false
           let installed = false
           let saved = false
+
+          // eslint-disable-next-line no-await-in-loop
+          if (await editablePkgJson.save()) {
+            saved = true
+          }
+          if (!installedSpecs.has(newSpecKey)) {
+            testedSpecs.add(newSpecKey)
+            spinner?.info(`Installing ${newSpec}${workspaceDetails}`)
+          }
           try {
-            shadowNpmInject.updatePackageJsonFromNode(
-              editablePkgJson,
-              arb.idealTree,
-              node,
-              newVersion,
-              rangeStyle
-            )
-            // eslint-disable-next-line no-await-in-loop
-            if (await editablePkgJson.save()) {
-              saved = true
-            }
             // eslint-disable-next-line no-await-in-loop
             await install$1(arb.idealTree, {
               cwd
@@ -4513,20 +4515,6 @@ async function pnpmFix(
           )
           const newSpec = `${name}@${newVersionRange}`
           const newSpecKey = `${workspaceName ? `${workspaceName}>` : ''}${newSpec}`
-          const branch = isCi
-            ? getSocketBranchName(oldPurl, newVersion, workspaceName)
-            : ''
-          const baseBranch = isCi ? getBaseGitBranch() : ''
-          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 = isWorkspaceRoot
             ? {
                 [PNPM$8]: {
@@ -4537,7 +4525,7 @@ async function pnpmFix(
                   }
                 }
               }
-            : {}
+            : undefined
           const revertData = {
             ...(isWorkspaceRoot
               ? {
@@ -4572,32 +4560,47 @@ async function pnpmFix(
                 }
               : undefined)
           }
-          if (!installedSpecs.has(newSpecKey)) {
-            installedSpecs.add(newSpecKey)
-            spinner?.info(`Installing ${newSpec}${workspaceDetails}`)
-          }
+          const branch = isCi
+            ? getSocketBranchName(oldPurl, newVersion, workspaceName)
+            : ''
+          const baseBranch = isCi ? getBaseGitBranch() : ''
+          const { owner, repo } = isCi
+            ? getGitHubEnvRepoInfo()
+            : {
+                owner: '',
+                repo: ''
+              }
+          const shouldOpenPr = isCi
+            ? // eslint-disable-next-line no-await-in-loop
+              !(await doesPullRequestExistForBranch(owner, repo, branch))
+            : false
           if (isCi) {
             // eslint-disable-next-line no-await-in-loop
             await gitCheckoutBaseBranchIfAvailable(baseBranch, cwd)
           }
+          if (updateData) {
+            editablePkgJson.update(updateData)
+          }
+          shadowNpmInject.updatePackageJsonFromNode(
+            editablePkgJson,
+            actualTree,
+            node,
+            newVersion,
+            rangeStyle
+          )
           let error
           let errored = false
           let installed = false
-          let saved = false
+
+          // eslint-disable-next-line no-await-in-loop
+          if (!(await editablePkgJson.save())) {
+            continue
+          }
+          if (!installedSpecs.has(newSpecKey)) {
+            installedSpecs.add(newSpecKey)
+            spinner?.info(`Installing ${newSpec}${workspaceDetails}`)
+          }
           try {
-            editablePkgJson.update(updateData)
-            shadowNpmInject.updatePackageJsonFromNode(
-              editablePkgJson,
-              actualTree,
-              node,
-              newVersion,
-              rangeStyle
-            )
-            // eslint-disable-next-line no-await-in-loop
-            if (!(await editablePkgJson.save())) {
-              continue
-            }
-            saved = true
             // eslint-disable-next-line no-await-in-loop
             actualTree = await install(pkgEnvDetails, {
               spinner
@@ -4655,21 +4658,15 @@ async function pnpmFix(
                 spinner?.error(`Reverting ${newSpec}${workspaceDetails}`, error)
               }
             }
+            editablePkgJson.update(revertData)
             if (isRepo) {
               // eslint-disable-next-line no-await-in-loop
               await gitHardReset(cwd)
-            }
-            if (saved) {
-              editablePkgJson.update(revertData)
-              if (!isRepo) {
-                // eslint-disable-next-line no-await-in-loop
-                await editablePkgJson.save()
-              }
-            }
-            if (isRepo) {
               // eslint-disable-next-line no-await-in-loop
               actualTree = await getActualTree(cwd)
             } else if (installed) {
+              // eslint-disable-next-line no-await-in-loop
+              await editablePkgJson.save()
               // eslint-disable-next-line no-await-in-loop
               actualTree = await install(pkgEnvDetails, {
                 spinner
@@ -4861,11 +4858,12 @@ async function detectPackageEnvironment({
         editable: true
       })
     : undefined
-  const pkgJson = editablePkgJson?.content
   // Read Corepack `packageManager` field in package.json:
   // https://nodejs.org/api/packages.html#packagemanager
-  const pkgManager = strings.isNonEmptyString(pkgJson?.packageManager)
-    ? pkgJson.packageManager
+  const pkgManager = strings.isNonEmptyString(
+    editablePkgJson?.content?.packageManager
+  )
+    ? editablePkgJson.content.packageManager
     : undefined
   let agent
   let agentVersion
@@ -4913,8 +4911,8 @@ async function detectPackageEnvironment({
   let pkgNodeRange
   let pkgMinAgentVersion = minSupportedAgentVersion
   let pkgMinNodeVersion = minSupportedNodeVersion
-  if (pkgJson) {
-    const { engines } = pkgJson
+  if (editablePkgJson?.content) {
+    const { engines } = editablePkgJson.content
     const engineAgentRange = engines?.[agent]
     const engineNodeRange = engines?.['node']
     if (strings.isNonEmptyString(engineAgentRange)) {
@@ -4935,7 +4933,7 @@ async function detectPackageEnvironment({
         pkgMinNodeVersion = coerced.version
       }
     }
-    const browserslistQuery = pkgJson['browserslist']
+    const browserslistQuery = editablePkgJson.content['browserslist']
     if (Array.isArray(browserslistQuery)) {
       // List Node targets in ascending version order.
       const browserslistNodeTargets = vendor
@@ -11940,7 +11938,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.104',
+    version: '0.14.105',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12008,5 +12006,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=efb43bfa-f612-4c54-a458-2dcec93289cb
+//# debugId=1651050b-5b34-4e33-bf0e-95c55f069093
 //# sourceMappingURL=cli.js.map