From ff5e1a605ad4a905053292ff8231828087153336 Mon Sep 17 00:00:00 2001 From: Wendi Du Date: Mon, 18 Mar 2024 14:29:02 -0700 Subject: [PATCH] Revert D55013623: Migrate back to chromium-edge-launcher since Windows fix was merged Differential Revision: D55013623 Original commit changeset: bff2aa2801dd Original Phabricator Diff: D55013623 fbshipit-source-id: d7f19068327b5cf427750fbcae01d3c10f9c89b5 --- .../chromium-edge-launcher_v1.x.x.js} | 2 +- packages/dev-middleware/package.json | 2 +- .../src/utils/DefaultBrowserLauncher.js | 2 +- yarn.lock | 24 +++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) rename flow-typed/npm/{chromium-edge-launcher_v0.2.x.js => @rnx-kit/chromium-edge-launcher_v1.x.x.js} (96%) diff --git a/flow-typed/npm/chromium-edge-launcher_v0.2.x.js b/flow-typed/npm/@rnx-kit/chromium-edge-launcher_v1.x.x.js similarity index 96% rename from flow-typed/npm/chromium-edge-launcher_v0.2.x.js rename to flow-typed/npm/@rnx-kit/chromium-edge-launcher_v1.x.x.js index dc3e9962ab83d4..4ee3ba0d5df351 100644 --- a/flow-typed/npm/chromium-edge-launcher_v0.2.x.js +++ b/flow-typed/npm/@rnx-kit/chromium-edge-launcher_v1.x.x.js @@ -9,7 +9,7 @@ * @oncall react_native */ -declare module 'chromium-edge-launcher' { +declare module '@rnx-kit/chromium-edge-launcher' { import typeof fs from 'fs'; import typeof childProcess from 'child_process'; import type {ChildProcess} from 'child_process'; diff --git a/packages/dev-middleware/package.json b/packages/dev-middleware/package.json index 0b174b0c1daa3b..dafb0ac74dacb1 100644 --- a/packages/dev-middleware/package.json +++ b/packages/dev-middleware/package.json @@ -24,8 +24,8 @@ "dependencies": { "@isaacs/ttlcache": "^1.4.1", "@react-native/debugger-frontend": "0.75.0-main", + "@rnx-kit/chromium-edge-launcher": "^1.0.0", "chrome-launcher": "^0.15.2", - "chromium-edge-launcher": "^0.2.0", "connect": "^3.6.5", "debug": "^2.2.0", "node-fetch": "^2.2.0", diff --git a/packages/dev-middleware/src/utils/DefaultBrowserLauncher.js b/packages/dev-middleware/src/utils/DefaultBrowserLauncher.js index 9e2b728dd33f4f..8992f194c54192 100644 --- a/packages/dev-middleware/src/utils/DefaultBrowserLauncher.js +++ b/packages/dev-middleware/src/utils/DefaultBrowserLauncher.js @@ -15,8 +15,8 @@ import {promises as fs} from 'fs'; import path from 'path'; import osTempDir from 'temp-dir'; +const {Launcher: EdgeLauncher} = require('@rnx-kit/chromium-edge-launcher'); const ChromeLauncher = require('chrome-launcher'); -const {Launcher: EdgeLauncher} = require('chromium-edge-launcher'); /** * Default `BrowserLauncher` implementation which opens URLs on the host diff --git a/yarn.lock b/yarn.lock index 9d7bc0f3663014..72e2b95a0950bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2537,6 +2537,18 @@ prompts "^2.4.2" semver "^7.5.2" +"@rnx-kit/chromium-edge-launcher@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@rnx-kit/chromium-edge-launcher/-/chromium-edge-launcher-1.0.0.tgz#c0df8ea00a902c7a417cd9655aab06de398b939c" + integrity sha512-lzD84av1ZQhYUS+jsGqJiCMaJO2dn9u+RTT9n9q6D3SaKVwWqv+7AoRKqBu19bkwyE+iFRl1ymr40QS90jVFYg== + dependencies: + "@types/node" "^18.0.0" + escape-string-regexp "^4.0.0" + is-wsl "^2.2.0" + lighthouse-logger "^1.0.0" + mkdirp "^1.0.4" + rimraf "^3.0.2" + "@rnx-kit/rn-changelog-generator@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@rnx-kit/rn-changelog-generator/-/rn-changelog-generator-0.4.0.tgz#637d87bcf8de6e87599930ed88d9375010277660" @@ -3836,18 +3848,6 @@ chrome-launcher@^0.15.0, chrome-launcher@^0.15.2: is-wsl "^2.2.0" lighthouse-logger "^1.0.0" -chromium-edge-launcher@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/chromium-edge-launcher/-/chromium-edge-launcher-0.2.0.tgz#0c378f28c99aefc360705fa155de0113997f62fc" - integrity sha512-JfJjUnq25y9yg4FABRRVPmBGWPZZi+AQXT4mxupb67766/0UlhG8PAZCz6xzEMXTbW3CsSoE8PcCWA49n35mKg== - dependencies: - "@types/node" "*" - escape-string-regexp "^4.0.0" - is-wsl "^2.2.0" - lighthouse-logger "^1.0.0" - mkdirp "^1.0.4" - rimraf "^3.0.2" - ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"