diff --git a/README.md b/README.md index f4747dddab..2ac3e57fc9 100644 --- a/README.md +++ b/README.md @@ -222,11 +222,10 @@ This method is an implementation detail, normally you don't need to call it. It will close the internal browser. ```js -const exitHook = require('exit-hook') - +const { onExit } = require('signal-exit') // automatically teardown resources after // `process.exit` is called -exitHook(browser.close) +onExit(browser.close) ``` ## Using a browser @@ -826,10 +825,10 @@ The [`@browserless/lighthouse`](https://npm.im/@browserless/lighthouse) package const createLighthouse = require('@browserless/lighthouse') const createBrowser = require('browserless') const { writeFile } = require('fs/promises') -const exitHook = require('exit-hook') +const { onExit } = require('signal-exit') const browser = createBrowser() -exitHook(browser.close) +onExit(browser.close) const lighthouse = createLighthouse(async teardown => { const browserless = await browser.createContext() diff --git a/packages/benchmark/src/timing.js b/packages/benchmark/src/timing.js index da9631055c..91e72c4290 100644 --- a/packages/benchmark/src/timing.js +++ b/packages/benchmark/src/timing.js @@ -61,6 +61,5 @@ main(takeScreenshot, { iterations: 100, url: 'https://front-24ypc8or0.zeit.sh/' Object.keys(result).forEach(key => { console.log(` – ${key}: ${prettyMs(percentile(95, result[key]))}`) }) - process.exit() }) - .catch(err => console.error(err) && process.exit(1)) + .catch(error => console.error(error) || process.exit(1)) diff --git a/packages/cli/package.json b/packages/cli/package.json index feb1cffafc..545f1c12b2 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -34,13 +34,13 @@ "beauty-error": "~1.2.15", "browserless": "^9.9.7", "dark-mode": "~3.0.0", - "exit-hook": "~2.2.1", "lodash": "~4.17.21", "meow": "~9.0.0", "ora": "~5.4.1", "picocolors": "~1.0.0", "pretty-bytes": "~5.6.0", "process-stats": "~3.7.0", + "signal-exit": "~4.0.1", "term-img": "~5.0.0", "unique-random-array": "~2.0.0" }, diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js index 16379b9c2a..084d099931 100755 --- a/packages/cli/src/index.js +++ b/packages/cli/src/index.js @@ -4,7 +4,7 @@ const createBrowser = require('browserless') const beautyError = require('beauty-error') -const exitHook = require('exit-hook') +const { onExit } = require('signal-exit') const path = require('path') const fs = require('fs') @@ -45,7 +45,7 @@ const run = async () => { const browser = createBrowser({ headless }) const browserless = await browser.createContext() - exitHook(browser.close) + onExit(browser.close) const result = await fn({ url, browserless, opts: cli.flags }) diff --git a/packages/goto/scripts/postinstall.js b/packages/goto/scripts/postinstall.js index b81131e91a..197dd0be0a 100644 --- a/packages/goto/scripts/postinstall.js +++ b/packages/goto/scripts/postinstall.js @@ -23,6 +23,4 @@ const main = async () => { await writeFile(OUTPUT_FILENAME, engine.serialize()) } -main() - .catch(err => console.error(err) && process.exit(1)) - .then(process.exit) +main().catch(error => console.error(error) || process.exit(1)) diff --git a/packages/test/index.js b/packages/test/index.js index 1e3340cee2..d062177796 100644 --- a/packages/test/index.js +++ b/packages/test/index.js @@ -2,9 +2,9 @@ const { imgDiff } = require('img-diff-js') const existsFile = require('exists-file') +const { onExit } = require('signal-exit') const { createServer } = require('http') const listen = require('test-listen') -const exitHook = require('exit-hook') const { copy } = require('fs-extra') const temp = require('temperment') const pdf = require('pdf-parse') @@ -50,7 +50,7 @@ const getServerUrl = (() => { })() module.exports = (browser, teardown = browser.close) => { - exitHook(teardown) + onExit(teardown) test('.html', async t => { const url = await getServerUrl() diff --git a/packages/test/package.json b/packages/test/package.json index 77edf30baf..d5201bb1ce 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -31,7 +31,7 @@ "devDependencies": { "browserless": "latest", "exists-file": "latest", - "exit-hook": "2", + "signal-exit": "latest", "fs-extra": "latest", "img-diff-js": "latest", "is-ci": "latest", diff --git a/packages/test/util.js b/packages/test/util.js index 744ca423bd..63036cdfae 100644 --- a/packages/test/util.js +++ b/packages/test/util.js @@ -1,13 +1,13 @@ 'use strict' const createBrowser = require('browserless') -const exitHook = require('exit-hook') +const { onExit } = require('signal-exit') let _browser const initBrowser = opts => { const browser = createBrowser(opts) - exitHook(browser.close) + onExit(browser.close) return browser }