diff --git a/bin/cli.js b/bin/cli.js index 27553900d..6586ee9cf 100755 --- a/bin/cli.js +++ b/bin/cli.js @@ -4,7 +4,7 @@ const fs = require('fs') const os = require('os') const stream = require('stream') -const opn = require('opn') +const open = require('open') const helpString = `Usage: speedscope [filepath] @@ -89,7 +89,11 @@ async function main() { console.log('Opening', urlToOpen, 'in your default browser') - await opn(urlToOpen, {wait: false}) + // We'd like to avoid blocking the terminal on the browsing closing, + // but for some reason this doesn't work at all on Windows if we + // don't use wait: true. + const wait = process.platform === "win32"; + await open(urlToOpen, {wait}) } main() diff --git a/package-lock.json b/package-lock.json index 192a15f57..21fe93a2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "speedscope", - "version": "1.5.3", + "version": "1.9.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6249,6 +6249,11 @@ "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", "dev": true }, + "is-docker": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz", + "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==" + }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -6397,7 +6402,8 @@ "is-wsl": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", + "dev": true }, "isarray": { "version": "1.0.0", @@ -8139,10 +8145,30 @@ "mimic-fn": "^1.0.0" } }, + "open": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/open/-/open-7.2.0.tgz", + "integrity": "sha512-4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ==", + "requires": { + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" + }, + "dependencies": { + "is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "requires": { + "is-docker": "^2.0.0" + } + } + } + }, "opn": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", + "dev": true, "requires": { "is-wsl": "^1.1.0" } diff --git a/package.json b/package.json index 9ccf4853e..262d18ac3 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ ] }, "dependencies": { - "opn": "5.3.0", + "open": "7.2.0", "react": "^16.13.1" } }