Skip to content

Commit

Permalink
Merge pull request #18157 from The-Code-Monkey/next
Browse files Browse the repository at this point in the history
security: update x-default-browser
  • Loading branch information
shilman committed May 19, 2022
1 parent 04b2058 commit bc8926d
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 59 deletions.
5 changes: 2 additions & 3 deletions lib/core-client/src/typings.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ declare module 'pnp-webpack-plugin';
declare module '@storybook/ui/paths';
declare module 'better-opn';
declare module 'open';
declare module 'x-default-browser';
declare module '@storybook/ui';

declare module '@aw-web-design/x-default-browser';
declare module '@storybook/ui';
4 changes: 2 additions & 2 deletions lib/core-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@aw-web-design/x-default-browser": "1.4.0",
"@discoveryjs/json-ext": "^0.5.3",
"@storybook/builder-webpack4": "6.5.0",
"@storybook/core-client": "6.5.0",
Expand Down Expand Up @@ -82,8 +83,7 @@
"util-deprecate": "^1.0.2",
"watchpack": "^2.2.0",
"webpack": "4",
"ws": "^8.2.3",
"x-default-browser": "^0.4.0"
"ws": "^8.2.3"
},
"devDependencies": {
"@storybook/builder-webpack5": "6.5.0",
Expand Down
10 changes: 5 additions & 5 deletions lib/core-server/src/utils/open-in-browser.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { logger } from '@storybook/node-logger';
import betterOpn from 'better-opn'; // betterOpn alias used because also loading open
import open from 'open';
import getDefaultBrowser from 'x-default-browser';
import getDefaultBrowser from '@aw-web-design/x-default-browser';
import dedent from 'ts-dedent';

export function openInBrowser(address: string) {
Expand All @@ -16,10 +16,10 @@ export function openInBrowser(address: string) {
}
} catch (error) {
logger.error(dedent`
Could not open ${address} inside a browser. If you're running this command inside a
docker container or on a CI, you need to pass the '--ci' flag to prevent opening a
browser by default.
`);
Could not open ${address} inside a browser. If you're running this command inside a
docker container or on a CI, you need to pass the '--ci' flag to prevent opening a
browser by default.
`);
}
});
}
2 changes: 1 addition & 1 deletion lib/core-server/typings.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ declare module '@storybook/theming/paths';
declare module '@storybook/ui/paths';
declare module 'better-opn';
declare module 'open';
declare module 'x-default-browser';
declare module '@aw-web-design/x-default-browser';
declare module '@storybook/ui';
declare module '@discoveryjs/json-ext';
declare module 'watchpack';
Expand Down
2 changes: 1 addition & 1 deletion lib/manager-webpack4/typings.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ declare module '@storybook/theming/paths';
declare module '@storybook/ui/paths';
declare module 'better-opn';
declare module 'open';
declare module 'x-default-browser';
declare module '@aw-web-design/x-default-browser';
declare module '@storybook/ui';
2 changes: 1 addition & 1 deletion lib/manager-webpack5/typings.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ declare module '@storybook/theming/paths';
declare module '@storybook/ui/paths';
declare module 'better-opn';
declare module 'open';
declare module 'x-default-browser';
declare module '@aw-web-design/x-default-browser';
declare module '@storybook/ui';
58 changes: 12 additions & 46 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,15 @@ __metadata:
languageName: node
linkType: hard

"@aw-web-design/x-default-browser@npm:1.4.0":
version: 1.4.0
resolution: "@aw-web-design/x-default-browser@npm:1.4.0"
bin:
x-default-browser: bin/x-default-browser.js
checksum: 1e21253f5af8c9050a511bd4a8342e079f30f662caaa3155afa77474ce12ff014fe4d04859528ccddffd30fb6a4df60acebccc7b657b1639092516e50bb09a6c
languageName: node
linkType: hard

"@axe-core/puppeteer@npm:^4.2.0":
version: 4.4.0
resolution: "@axe-core/puppeteer@npm:4.4.0"
Expand Down Expand Up @@ -7655,6 +7664,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@storybook/core-server@workspace:lib/core-server"
dependencies:
"@aw-web-design/x-default-browser": 1.4.0
"@discoveryjs/json-ext": ^0.5.3
"@storybook/builder-webpack4": 6.5.0
"@storybook/builder-webpack5": 6.5.0
Expand Down Expand Up @@ -7705,7 +7715,6 @@ __metadata:
watchpack: ^2.2.0
webpack: 4
ws: ^8.2.3
x-default-browser: ^0.4.0
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
Expand Down Expand Up @@ -14750,13 +14759,6 @@ __metadata:
languageName: node
linkType: hard

"big-integer@npm:^1.6.7":
version: 1.6.51
resolution: "big-integer@npm:1.6.51"
checksum: c8139662d57f8833a44802f4b65be911679c569535ea73c5cfd3c1c8994eaead1b84b6f63e1db63833e4d4cacb6b6a9e5522178113dfdc8e4c81ed8436f1e8cc
languageName: node
linkType: hard

"big.js@npm:^3.1.3":
version: 3.2.0
resolution: "big.js@npm:3.2.0"
Expand Down Expand Up @@ -14980,15 +14982,6 @@ __metadata:
languageName: node
linkType: hard

"bplist-parser@npm:^0.1.0":
version: 0.1.1
resolution: "bplist-parser@npm:0.1.1"
dependencies:
big-integer: ^1.6.7
checksum: cd50206f956e74f6e46cb5ed14be5eb00b2e14676ea3dd36703470715177a2770fc22032eca63a36adb3b56a1e51138a95bb0fc6849a78c21e92caeedf219ea7
languageName: node
linkType: hard

"brace-expansion@npm:^1.1.7":
version: 1.1.11
resolution: "brace-expansion@npm:1.1.11"
Expand Down Expand Up @@ -19241,19 +19234,6 @@ __metadata:
languageName: node
linkType: hard

"default-browser-id@npm:^1.0.4":
version: 1.0.4
resolution: "default-browser-id@npm:1.0.4"
dependencies:
bplist-parser: ^0.1.0
meow: ^3.1.0
untildify: ^2.0.0
bin:
default-browser-id: cli.js
checksum: a00a2ab66beab70490b4d76258a1f2eadfadca6414bf67ab78aa25b33dc3de0c4c813bb8f204271aa7a08281c39474487db0229e325112456464fb97a0522a8a
languageName: node
linkType: hard

"default-gateway@npm:^4.2.0":
version: 4.2.0
resolution: "default-gateway@npm:4.2.0"
Expand Down Expand Up @@ -31662,7 +31642,7 @@ __metadata:
languageName: node
linkType: hard

"meow@npm:^3.1.0, meow@npm:^3.3.0":
"meow@npm:^3.3.0":
version: 3.7.0
resolution: "meow@npm:3.7.0"
dependencies:
Expand Down Expand Up @@ -45113,7 +45093,7 @@ __metadata:
languageName: node
linkType: hard

"untildify@npm:^2.0.0, untildify@npm:^2.1.0":
"untildify@npm:^2.1.0":
version: 2.1.0
resolution: "untildify@npm:2.1.0"
dependencies:
Expand Down Expand Up @@ -47675,20 +47655,6 @@ __metadata:
languageName: node
linkType: hard

"x-default-browser@npm:^0.4.0":
version: 0.4.0
resolution: "x-default-browser@npm:0.4.0"
dependencies:
default-browser-id: ^1.0.4
dependenciesMeta:
default-browser-id:
optional: true
bin:
x-default-browser: bin/x-default-browser.js
checksum: a19e42ffeab19560ea05a423561f5b3b82bb3a5878dc932cfd0847fadc5890b8b685d6b39e2356c8304b3943f5a7120ba4b233365d686ff8f9bf2499ce11f052
languageName: node
linkType: hard

"xdg-basedir@npm:^4.0.0":
version: 4.0.0
resolution: "xdg-basedir@npm:4.0.0"
Expand Down

0 comments on commit bc8926d

Please sign in to comment.