From f884519691b46ec89a6dbef1267f1434a8063d5b Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 7 Jun 2023 11:46:05 +0200 Subject: [PATCH 1/4] upgrade open, better-opn, x-default-browser --- code/lib/core-server/package.json | 6 ++--- code/yarn.lock | 38 ++++++++++++------------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index 7c2bad104752..0c7895c4c599 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -54,7 +54,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@aw-web-design/x-default-browser": "1.4.88", + "@aw-web-design/x-default-browser": "1.4.126", "@discoveryjs/json-ext": "^0.5.3", "@storybook/builder-manager": "7.1.0-alpha.29", "@storybook/core-common": "7.1.0-alpha.29", @@ -72,7 +72,6 @@ "@types/node": "^16.0.0", "@types/pretty-hrtime": "^1.0.0", "@types/semver": "^7.3.4", - "better-opn": "^2.1.1", "boxen": "^5.1.2", "chalk": "^4.1.0", "cli-table3": "^0.6.1", @@ -83,7 +82,6 @@ "globby": "^11.0.2", "ip": "^2.0.0", "lodash": "^4.17.21", - "open": "^8.4.0", "pretty-hrtime": "^1.0.3", "prompts": "^2.4.0", "read-pkg-up": "^7.0.1", @@ -102,9 +100,11 @@ "@types/node-fetch": "^2.5.7", "@types/serve-favicon": "^2.5.2", "@types/ws": "^8", + "better-opn": "^3.0.2", "jest-os-detection": "^1.3.1", "jest-specific-snapshot": "^7.0.0", "node-fetch": "^3.3.1", + "open": "^9.1.0", "slash": "^5.0.0", "typescript": "~4.9.3" }, diff --git a/code/yarn.lock b/code/yarn.lock index 95c6c0712ea3..4109b24400a1 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -360,14 +360,14 @@ __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" +"@aw-web-design/x-default-browser@npm:1.4.126": + version: 1.4.126 + resolution: "@aw-web-design/x-default-browser@npm:1.4.126" dependencies: default-browser-id: 3.0.0 bin: x-default-browser: bin/x-default-browser.js - checksum: ae604e01aeb226b48cad226bfce55a88a12d759d139ede20aa71ee9ed94fefe912659678ae663bb277d9c02f281f62a965bdc0adf43817b0f95d397cbf97d8b2 + checksum: 634c7fad7a5f4df86e3fcd3a11e50034fcb6f6302281569727574cbda7532850063cb34ec328384a686ab0812f297bf301a5e2450bc7b93b5f80a006b1f2dfd7 languageName: node linkType: hard @@ -6332,7 +6332,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 + "@aw-web-design/x-default-browser": 1.4.126 "@discoveryjs/json-ext": ^0.5.3 "@storybook/builder-manager": 7.1.0-alpha.29 "@storybook/core-common": 7.1.0-alpha.29 @@ -6355,7 +6355,7 @@ __metadata: "@types/semver": ^7.3.4 "@types/serve-favicon": ^2.5.2 "@types/ws": ^8 - better-opn: ^2.1.1 + better-opn: ^3.0.2 boxen: ^5.1.2 chalk: ^4.1.0 cli-table3: ^0.6.1 @@ -6369,7 +6369,7 @@ __metadata: jest-specific-snapshot: ^7.0.0 lodash: ^4.17.21 node-fetch: ^3.3.1 - open: ^8.4.0 + open: ^9.1.0 pretty-hrtime: ^1.0.3 prompts: ^2.4.0 read-pkg-up: ^7.0.1 @@ -11255,12 +11255,12 @@ __metadata: languageName: node linkType: hard -"better-opn@npm:^2.1.1": - version: 2.1.1 - resolution: "better-opn@npm:2.1.1" +"better-opn@npm:^3.0.2": + version: 3.0.2 + resolution: "better-opn@npm:3.0.2" dependencies: - open: ^7.0.3 - checksum: c483f52a1c71555926df37a89ae7e521cddff6509e2a02c6af83c2c500e20cb3307417579ce1d5ec4d09855cc7d30f608b20934e7cedc54218888722d5bfc1d3 + open: ^8.0.4 + checksum: 911ef25d44da75aabfd2444ce7a4294a8000ebcac73068c04a60298b0f7c7506b60421aa4cd02ac82502fb42baaff7e4892234b51e6923eded44c5a11185f2f5 languageName: node linkType: hard @@ -19154,7 +19154,7 @@ __metadata: languageName: node linkType: hard -"is-wsl@npm:^2.1.1, is-wsl@npm:^2.2.0": +"is-wsl@npm:^2.2.0": version: 2.2.0 resolution: "is-wsl@npm:2.2.0" dependencies: @@ -24058,7 +24058,7 @@ __metadata: languageName: node linkType: hard -"open@npm:8.4.2, open@npm:^8.0.9, open@npm:^8.4.0, open@npm:~8.4.0": +"open@npm:8.4.2, open@npm:^8.0.4, open@npm:^8.0.9, open@npm:^8.4.0, open@npm:~8.4.0": version: 8.4.2 resolution: "open@npm:8.4.2" dependencies: @@ -24069,16 +24069,6 @@ __metadata: languageName: node linkType: hard -"open@npm:^7.0.3": - version: 7.4.2 - resolution: "open@npm:7.4.2" - dependencies: - is-docker: ^2.0.0 - is-wsl: ^2.1.1 - checksum: 77573a6a68f7364f3a19a4c80492712720746b63680ee304555112605ead196afe91052bd3c3d165efdf4e9d04d255e87de0d0a77acec11ef47fd5261251813f - languageName: node - linkType: hard - "open@npm:^9.1.0": version: 9.1.0 resolution: "open@npm:9.1.0" From 3882f4d53de5cbc272acd0ea04227980c6d17cab Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 7 Jun 2023 11:51:27 +0200 Subject: [PATCH 2/4] fix the bundled dep needing util package --- code/lib/core-server/package.json | 1 + code/yarn.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index 0c7895c4c599..8d2dbba364a1 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -90,6 +90,7 @@ "telejson": "^7.0.3", "tiny-invariant": "^1.3.1", "ts-dedent": "^2.0.0", + "util": "^0.12.4", "util-deprecate": "^1.0.2", "watchpack": "^2.2.0", "ws": "^8.2.3" diff --git a/code/yarn.lock b/code/yarn.lock index 4109b24400a1..092effa54157 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6380,6 +6380,7 @@ __metadata: tiny-invariant: ^1.3.1 ts-dedent: ^2.0.0 typescript: ~4.9.3 + util: ^0.12.4 util-deprecate: ^1.0.2 watchpack: ^2.2.0 ws: ^8.2.3 From d3fb916e2453a43891b65c652a81885c4fdebe96 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 7 Jun 2023 11:57:43 +0200 Subject: [PATCH 3/4] =?UTF-8?q?slight=20downgrade,=20because=20the=20ESM?= =?UTF-8?q?=20is=20problematic=20=F0=9F=98=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/lib/core-server/package.json | 4 ++-- code/yarn.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index 8d2dbba364a1..068a1b3bc0b2 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -72,6 +72,7 @@ "@types/node": "^16.0.0", "@types/pretty-hrtime": "^1.0.0", "@types/semver": "^7.3.4", + "better-opn": "^3.0.2", "boxen": "^5.1.2", "chalk": "^4.1.0", "cli-table3": "^0.6.1", @@ -82,6 +83,7 @@ "globby": "^11.0.2", "ip": "^2.0.0", "lodash": "^4.17.21", + "open": "^8.0.0", "pretty-hrtime": "^1.0.3", "prompts": "^2.4.0", "read-pkg-up": "^7.0.1", @@ -101,11 +103,9 @@ "@types/node-fetch": "^2.5.7", "@types/serve-favicon": "^2.5.2", "@types/ws": "^8", - "better-opn": "^3.0.2", "jest-os-detection": "^1.3.1", "jest-specific-snapshot": "^7.0.0", "node-fetch": "^3.3.1", - "open": "^9.1.0", "slash": "^5.0.0", "typescript": "~4.9.3" }, diff --git a/code/yarn.lock b/code/yarn.lock index 092effa54157..28301a746e3c 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6369,7 +6369,7 @@ __metadata: jest-specific-snapshot: ^7.0.0 lodash: ^4.17.21 node-fetch: ^3.3.1 - open: ^9.1.0 + open: ^8.0.0 pretty-hrtime: ^1.0.3 prompts: ^2.4.0 read-pkg-up: ^7.0.1 @@ -24059,7 +24059,7 @@ __metadata: languageName: node linkType: hard -"open@npm:8.4.2, open@npm:^8.0.4, open@npm:^8.0.9, open@npm:^8.4.0, open@npm:~8.4.0": +"open@npm:8.4.2, open@npm:^8.0.0, open@npm:^8.0.4, open@npm:^8.0.9, open@npm:^8.4.0, open@npm:~8.4.0": version: 8.4.2 resolution: "open@npm:8.4.2" dependencies: From b2071a7829507ba3d1e2a1081e8d35b8164e896b Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 7 Jun 2023 12:01:57 +0200 Subject: [PATCH 4/4] revert open upgrade entirely --- code/lib/core-server/package.json | 2 +- code/yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index 068a1b3bc0b2..deb6cd567727 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -83,7 +83,7 @@ "globby": "^11.0.2", "ip": "^2.0.0", "lodash": "^4.17.21", - "open": "^8.0.0", + "open": "^8.4.0", "pretty-hrtime": "^1.0.3", "prompts": "^2.4.0", "read-pkg-up": "^7.0.1", diff --git a/code/yarn.lock b/code/yarn.lock index 28301a746e3c..11ed1882e537 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6369,7 +6369,7 @@ __metadata: jest-specific-snapshot: ^7.0.0 lodash: ^4.17.21 node-fetch: ^3.3.1 - open: ^8.0.0 + open: ^8.4.0 pretty-hrtime: ^1.0.3 prompts: ^2.4.0 read-pkg-up: ^7.0.1 @@ -24059,7 +24059,7 @@ __metadata: languageName: node linkType: hard -"open@npm:8.4.2, open@npm:^8.0.0, open@npm:^8.0.4, open@npm:^8.0.9, open@npm:^8.4.0, open@npm:~8.4.0": +"open@npm:8.4.2, open@npm:^8.0.4, open@npm:^8.0.9, open@npm:^8.4.0, open@npm:~8.4.0": version: 8.4.2 resolution: "open@npm:8.4.2" dependencies: