Merge pull request #240 from capralifecycle/renovate/read-4.x

fix(deps): update dependency read to v4

Author: joakimen

package-lock.json

@@ -36,7 +36,7 @@
     "p-limit": "^6.0.0",
     "p-map": "^7.0.0",
     "process": "0.11.10",
-    "read": "^1.0.7",
+    "read": "^4.0.0",
     "semver": "^7.6.2",
     "sprintf-js": "^1.1.2",
     "yargs": "17.7.2"

package.json

@@ -1,9 +1,8 @@
 import pLimit from "p-limit"
-import read from "read"
+import { read } from "read"
 import { CommandModule } from "yargs"
 import { Reporter } from "../../reporter"
-import { getGitHubOrgs } from "../../../definition"
-import { Definition } from "../../../definition"
+import { Definition, getGitHubOrgs } from "../../../definition"
 import {
   cleanupChangeSetItems,
   createChangeSetItemsForMembers,
@@ -115,23 +114,12 @@ async function process(
   }
 
   if (execute && changes.length > 0) {
-    const cont = await new Promise<string>((resolve, reject) => {
-      read(
-        {
-          prompt: "Confirm you want to execute the changes [y/N]: ",
-          timeout: 60000,
-        },
-        (err, answer) => {
-          if (err) {
-            // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
-            reject(err)
-          }
-          resolve(answer)
-        },
-      )
+    const answer: string = await read({
+      prompt: "Confirm you want to execute the changes [y/N]: ",
+      timeout: 60000,
     })
 
-    if (cont === "y" || cont === "Y") {
+    if (answer.toLowerCase() === "y") {
       reporter.info("Executing changes")
       await executeChangeSet(github, changes, reporter)
     } else {

src/cli/commands/github/configure.ts

@@ -1,4 +1,4 @@
-import read from "read"
+import { read } from "read"
 import { CommandModule } from "yargs"
 import { GitHubTokenCliProvider } from "../../../github/token"
 import { Reporter } from "../../reporter"
@@ -18,22 +18,11 @@ async function setToken({
     reporter.info(
       "https://github.com/settings/tokens/new?scopes=repo:status,read:repo_hook",
     )
-
-    token = await new Promise<string>((resolve, reject) => {
-      read(
-        {
-          prompt: "Enter new GitHub API token: ",
-          silent: true,
-        },
-        (err, answer) => {
-          if (err) {
-            // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
-            reject(err)
-          }
-          resolve(answer)
-        },
-      )
+    const inputToken = await read({
+      prompt: "Enter new GitHub API token: ",
+      silent: true,
     })
+    token = inputToken
   }
 
   await tokenProvider.setToken(token)

src/cli/commands/github/set-token.ts

@@ -3,7 +3,7 @@ import fs from "node:fs"
 import yaml from "js-yaml"
 import pLimit from "p-limit"
 import path from "path"
-import read from "read"
+import { read } from "read"
 import { CommandModule } from "yargs"
 import { Config } from "../../../config"
 import { DefinitionFile, getRepos } from "../../../definition"
@@ -336,20 +336,9 @@ async function getExpectedRepos(
 }
 
 async function getInput(prompt: string): Promise<string> {
-  return new Promise<string>((resolve, reject) => {
-    read(
-      {
-        prompt,
-        timeout: 60000,
-      },
-      (err, answer) => {
-        if (err) {
-          // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
-          reject(err)
-        }
-        resolve(answer)
-      },
-    )
+  return read({
+    prompt,
+    timeout: 60000,
   })
 }
 

src/cli/commands/github/sync.ts

@@ -1,4 +1,4 @@
-import read from "read"
+import { read } from "read"
 import { CommandModule } from "yargs"
 import { SnykTokenCliProvider } from "../../../snyk/token"
 import { Reporter } from "../../reporter"
@@ -16,22 +16,12 @@ async function setToken({
   if (token === undefined) {
     reporter.info("Need API token to talk to Snyk")
     reporter.info("See https://app.snyk.io/account")
-
-    token = await new Promise<string>((resolve, reject) => {
-      read(
-        {
-          prompt: "Enter new Snyk API token: ",
-          silent: true,
-        },
-        (err, answer) => {
-          if (err) {
-            // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
-            reject(err)
-          }
-          resolve(answer)
-        },
-      )
+    // noinspection UnnecessaryLocalVariableJS
+    const inputToken = await read({
+      prompt: "Enter new Snyk API token: ",
+      silent: true,
     })
+    token = inputToken
   }
 
   await tokenProvider.setToken(token)

src/cli/commands/snyk/set-token.ts

@@ -1,7 +1,7 @@
 import { execa, type Subprocess } from "execa"
 import fs from "node:fs"
 import { performance } from "perf_hooks"
-import read from "read"
+import { read } from "read"
 import { Transform } from "stream"
 import { TestExecutor } from "./executor"
 import { Buffer } from "node:buffer"
@@ -500,19 +500,8 @@ export async function getDockerHostAddress(): Promise<string> {
 export async function waitForEnterToContinue(
   prompt = "Press enter to continue",
 ): Promise<void> {
-  return new Promise((resolve, reject) => {
-    read(
-      {
-        prompt,
-        silent: true,
-      },
-      (err) => {
-        if (err) {
-          // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
-          reject(err)
-        }
-        resolve()
-      },
-    )
+  await read({
+    prompt,
+    silent: true,
   })
 }