@@ -33,6 +33,11 @@ let socket;
33
33
const workerOnMessage = message => {
34
34
const { data } = message ;
35
35
36
+ if ( data && data . source === 'apollo-devtools-proxy' ) {
37
+ const message = typeof data . payload === 'string' ? { event : data . payload } : data . payload ;
38
+ worker . postMessage ( { source : 'apollo-devtools-proxy' , ...message } ) ;
39
+ }
40
+
36
41
if ( data . source === 'apollo-devtools-backend' ) {
37
42
if ( ! window . __APOLLO_DEVTOOLS_SHOULD_DISPLAY_PANEL__ ) {
38
43
window . __APOLLO_DEVTOOLS_SHOULD_DISPLAY_PANEL__ = true ;
@@ -55,21 +60,13 @@ const workerOnMessage = message => {
55
60
socket . send ( JSON . stringify ( data ) ) ;
56
61
} ;
57
62
58
- const onWindowMessage = e => {
59
- if ( e . data && e . data . source === 'apollo-devtools-proxy' ) {
60
- const message = typeof e . data . payload === 'string' ? { event : e . data . payload } : e . data . payload ;
61
- worker . postMessage ( { source : 'apollo-devtools-proxy' , ...message } ) ;
62
- }
63
- } ;
64
-
65
63
const createJSRuntime = ( ) => {
66
64
// This worker will run the application javascript code,
67
65
// making sure that it's run in an environment without a global
68
66
// document, to make it consistent with the JSC executor environment.
69
67
// eslint-disable-next-line
70
68
worker = new Worker ( `${ __webpack_public_path__ } RNDebuggerWorker.js` ) ;
71
69
worker . addEventListener ( 'message' , workerOnMessage ) ;
72
- window . addEventListener ( 'message' , onWindowMessage ) ;
73
70
actions . setDebuggerWorker ( worker , 'connected' ) ;
74
71
} ;
75
72
@@ -78,7 +75,6 @@ const shutdownJSRuntime = () => {
78
75
scriptExecuted = false ;
79
76
if ( worker ) {
80
77
worker . terminate ( ) ;
81
- window . removeEventListener ( 'messsage' , onWindowMessage ) ;
82
78
setDevMenuMethods ( [ ] ) ;
83
79
}
84
80
worker = null ;
0 commit comments