chore(deps): update dependency p-timeout to v6 (#5393)

* chore(deps): update dependency p-timeout to v6 * chore: update pTimeout to new version * chore: lint * chore: run format * chore: run format --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sarah Etter <[email protected]> Co-authored-by: Lewis Thorley <[email protected]>
netlify · Apr 25, 2024 · d74af71 · d74af71 · github-actions · Apr 25, 2024
1 parent fd70ac4
commit d74af71
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 40 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -211,7 +211,7 @@
     "is-ci": "3.0.1",
     "mock-fs": "5.2.0",
     "nock": "13.5.4",
-    "p-timeout": "4.1.0",
+    "p-timeout": "6.1.2",
     "serialize-javascript": "6.0.2",
     "sinon": "14.0.2",
     "strip-ansi": "7.1.0",

diff --git a/tests/integration/utils/dev-server.ts b/tests/integration/utils/dev-server.ts
@@ -11,7 +11,7 @@ import { killProcess } from './process.js'
 
 export const getExecaOptions = ({ cwd, env }) => {
   // Unused vars here are in order to omit LANg and LC_ALL from envs
-  // eslint-disable-next-line no-unused-vars
+
   const { LANG, LC_ALL, ...baseEnv } = process.env
 
   return {
@@ -49,6 +49,9 @@ interface DevServerOptions {
   serve?: boolean
 }
 
+// 240 seconds
+const SERVER_START_TIMEOUT = 24e4
+
 const startServer = async ({
   args = [],
   context = 'dev',
@@ -148,7 +151,10 @@ const startServer = async ({
     ps.catch((error) => !selfKilled && reject(error))
   })
 
-  return await pTimeout(serverPromise, SERVER_START_TIMEOUT, () => ({ timeout: true, output: outputBuffer.join('') }))
+  return await pTimeout(serverPromise, {
+    milliseconds: SERVER_START_TIMEOUT,
+    fallback: () => ({ timeout: true, output: outputBuffer.join('') }),
+  })
 }
 
 export const startDevServer = async (options: DevServerOptions, expectFailure: boolean): Promise<DevServer> => {
@@ -175,15 +181,12 @@ export const startDevServer = async (options: DevServerOptions, expectFailure: b
   throw new Error('this code should be unreachable')
 }
 
-// 240 seconds
-const SERVER_START_TIMEOUT = 24e4
-
 export const withDevServer = async <T>(
   options: DevServerOptions,
   testHandler: (server: DevServer) => Promise<T>,
   expectFailure = false,
 ): Promise<T> => {
-  let server: DevServer | undefined = undefined
+  let server: DevServer | undefined
   try {
     server = await startDevServer(options, expectFailure)
     return await testHandler(server)

diff --git a/tests/integration/utils/process.js b/tests/integration/utils/process.js
@@ -7,8 +7,9 @@ export const killProcess = async (ps) => {
   kill(ps.pid)
   await pTimeout(
     ps.catch(() => {}),
-    PROCESS_EXIT_TIMEOUT,
-    // don't reject on timeout
-    () => {},
+    {
+      milliseconds: PROCESS_EXIT_TIMEOUT,
+      fallback: () => {},
+    },
   )
 }
diff --git a/tools/e2e/setup.js b/tools/e2e/setup.js
@@ -89,7 +89,10 @@ export const startRegistry = async () => {
   const startPort = Math.floor(Math.random() * END_PORT_RANGE) + START_PORT_RANGE
   const freePort = await getPort({ host: 'localhost', port: startPort })
 
-  return await pTimeout(runVerdaccio(config, freePort), VERDACCIO_TIMEOUT_MILLISECONDS, 'Starting Verdaccio timed out')
+  return await pTimeout(runVerdaccio(config, freePort), {
+    milliseconds: VERDACCIO_TIMEOUT_MILLISECONDS,
+    fallback: 'Starting Verdaccio timed out',
+  })
 }
 
 /**