socket 0.14.104 → 0.14.105

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:eb484e52:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.105:2179d68:b0be6037: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
@@ -4509,20 +4511,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]: {
@@ -4533,7 +4521,7 @@ async function pnpmFix(
                   }
                 }
               }
-            : {}
+            : undefined
           const revertData = {
             ...(isWorkspaceRoot
               ? {
@@ -4568,32 +4556,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
@@ -4651,21 +4654,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
@@ -4857,11 +4854,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
@@ -4909,8 +4907,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)) {
@@ -4931,7 +4929,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
@@ -11936,7 +11934,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 {
@@ -12004,5 +12002,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=1ff2b705-0a33-4f3c-a683-796f4a562081
+//# debugId=355c3c9c-6359-4420-bd4f-783c50a21ad6
 //# sourceMappingURL=cli.js.map