Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Security: Update x-default-browser and fix issue with package. #18277

Merged
merged 9 commits into from
Jul 1, 2022
Merged

Security: Update x-default-browser and fix issue with package. #18277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
21ec836
Update package.json
The-Code-Monkey May 19, 2022
a0f44b3
update x-default-browser with fixes
The-Code-Monkey May 19, 2022
052bcd7
Update open-in-browser.ts
The-Code-Monkey May 19, 2022
92e657e
Update typings.d.ts
The-Code-Monkey May 19, 2022
6a5a833
Update typings.d.ts
The-Code-Monkey May 19, 2022
31a9b65
Update typings.d.ts
The-Code-Monkey May 19, 2022
98f413f
Update typings.d.ts
The-Code-Monkey May 19, 2022
1953d71
verifying it works locally, and bumping the version number
ndelangen Jul 1, 2022
669c265
Merge branch 'next' into monkey/next
ndelangen Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/core-client/src/typings.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ declare module 'pnp-webpack-plugin';
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';

4 changes: 2 additions & 2 deletions lib/core-server/package.json
View file
Open in desktop
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.88",
"@discoveryjs/json-ext": "^0.5.3",
"@storybook/builder-webpack4": "6.5.0-rc.1",
"@storybook/core-client": "6.5.0-rc.1",
Expand Down Expand Up @@ -81,8 +82,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-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion lib/core-server/src/utils/open-in-browser.ts
View file
Open in desktop
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 Down
2 changes: 1 addition & 1 deletion lib/core-server/typings.d.ts
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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: 26 additions & 32 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,17 @@ __metadata:
languageName: node
linkType: hard

"@aw-web-design/x-default-browser@npm:1.4.88":
version: 1.4.88
resolution: "@aw-web-design/x-default-browser@npm:1.4.88"
dependencies:
default-browser-id: 3.0.0
bin:
x-default-browser: bin/x-default-browser.js
checksum: ae604e01aeb226b48cad226bfce55a88a12d759d139ede20aa71ee9ed94fefe912659678ae663bb277d9c02f281f62a965bdc0adf43817b0f95d397cbf97d8b2
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 @@ -7736,6 +7747,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.88
"@discoveryjs/json-ext": ^0.5.3
"@storybook/builder-webpack4": 6.5.0-rc.1
"@storybook/builder-webpack5": 6.5.0-rc.1
Expand Down Expand Up @@ -7785,7 +7797,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 @@ -14888,7 +14899,7 @@ __metadata:
languageName: node
linkType: hard

"big-integer@npm:^1.6.7":
"big-integer@npm:^1.6.44":
version: 1.6.51
resolution: "big-integer@npm:1.6.51"
checksum: c8139662d57f8833a44802f4b65be911679c569535ea73c5cfd3c1c8994eaead1b84b6f63e1db63833e4d4cacb6b6a9e5522178113dfdc8e4c81ed8436f1e8cc
Expand Down Expand Up @@ -15118,12 +15129,12 @@ __metadata:
languageName: node
linkType: hard

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

Expand Down Expand Up @@ -19369,16 +19380,13 @@ __metadata:
languageName: node
linkType: hard

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

Expand Down Expand Up @@ -31844,7 +31852,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 @@ -45397,7 +45405,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 @@ -47974,20 +47982,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