File tree Expand file tree Collapse file tree 3 files changed +13
-18
lines changed
packages/dev-middleware/src Expand file tree Collapse file tree 3 files changed +13
-18
lines changed Original file line number Diff line number Diff line change @@ -18,9 +18,10 @@ import type {
18
18
import type { EventReporter } from '../types/EventReporter' ;
19
19
import type { IncomingMessage , ServerResponse } from 'http' ;
20
20
21
- import Device from './Device' ;
22
21
import url from 'url' ;
23
22
import WS from 'ws' ;
23
+ import getDevToolsFrontendUrl from '../utils/getDevToolsFrontendUrl' ;
24
+ import Device from './Device' ;
24
25
25
26
const debug = require ( 'debug' ) ( 'Metro:InspectorProxy' ) ;
26
27
@@ -114,15 +115,13 @@ export default class InspectorProxy {
114
115
) : PageDescription {
115
116
const debuggerUrl = `${ this . _serverBaseUrl } ${ WS_DEBUGGER_URL } ?device=${ deviceId } &page=${ page . id } ` ;
116
117
const webSocketDebuggerUrl = 'ws://' + debuggerUrl ;
117
- const devtoolsFrontendUrl =
118
- 'devtools://devtools/bundled/js_app.html?experiments=true&v8only=true&ws=' +
119
- encodeURIComponent ( debuggerUrl ) ;
118
+
120
119
return {
121
120
id : `${ deviceId } -${ page . id } ` ,
122
121
description : page . app ,
123
122
title : page . title ,
124
123
faviconUrl : 'https://reactjs.org/favicon.ico' ,
125
- devtoolsFrontendUrl,
124
+ devtoolsFrontendUrl : getDevToolsFrontendUrl ( webSocketDebuggerUrl ) ,
126
125
type : 'node' ,
127
126
webSocketDebuggerUrl,
128
127
vm : page . vm ,
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ import type {Logger} from '../types/Logger';
17
17
18
18
import url from 'url' ;
19
19
import getDevServerUrl from '../utils/getDevServerUrl' ;
20
- import launchChromeDevTools from '../utils/launchChromeDevTools ' ;
20
+ import launchDebuggerAppWindow from '../utils/launchDebuggerAppWindow ' ;
21
21
import queryInspectorTargets from '../utils/queryInspectorTargets' ;
22
22
23
23
const debuggerInstances = new Map < string , LaunchedChrome > ( ) ;
@@ -81,7 +81,10 @@ export default function openDebuggerMiddleware({
81
81
debuggerInstances . get ( appId ) ?. kill ( ) ;
82
82
debuggerInstances . set (
83
83
appId ,
84
- await launchChromeDevTools ( target . webSocketDebuggerUrl ) ,
84
+ await launchDebuggerAppWindow (
85
+ target . devtoolsFrontendUrl ,
86
+ 'open-debugger' ,
87
+ ) ,
85
88
) ;
86
89
res . end ( ) ;
87
90
eventReporter ?. logEvent ( {
Original file line number Diff line number Diff line change 9
9
* @oncall react_native
10
10
*/
11
11
12
- import type { LaunchedChrome } from 'chrome-launcher' ;
13
-
14
- import launchDebuggerAppWindow from './launchDebuggerAppWindow' ;
15
-
16
12
/**
17
13
* The Chrome DevTools frontend revision to use. This should be set to the
18
14
* latest version known to be compatible with Hermes.
@@ -23,16 +19,13 @@ import launchDebuggerAppWindow from './launchDebuggerAppWindow';
23
19
const DEVTOOLS_FRONTEND_REV = 'd9568d04d7dd79269c5a655d7ada69650c5a8336' ; // Chrome 100.0.4896.75
24
20
25
21
/**
26
- * Attempt to launch Chrome DevTools on the host machine for a given CDP target.
22
+ * Construct the URL to Chrome DevTools connected to a given debugger target.
27
23
*/
28
- export default async function launchChromeDevTools (
24
+ export default function getDevToolsFrontendUrl (
29
25
webSocketDebuggerUrl : string ,
30
- ) : Promise < LaunchedChrome > {
26
+ ) : string {
31
27
const urlBase = `https://chrome-devtools-frontend.appspot.com/serve_rev/@${ DEVTOOLS_FRONTEND_REV } /devtools_app.html` ;
32
28
const ws = webSocketDebuggerUrl . replace ( / ^ w s : \/ \/ / , '' ) ;
33
29
34
- return launchDebuggerAppWindow (
35
- `${ urlBase } ?panel=console&ws=${ encodeURIComponent ( ws ) } ` ,
36
- 'open-debugger' ,
37
- ) ;
30
+ return `${ urlBase } ?panel=console&ws=${ encodeURIComponent ( ws ) } ` ;
38
31
}
You can’t perform that action at this time.
0 commit comments