File tree Expand file tree Collapse file tree 4 files changed +3
-15
lines changed
packages/wrangler/src/api/startDevWorker Expand file tree Collapse file tree 4 files changed +3
-15
lines changed Original file line number Diff line number Diff line change @@ -75,7 +75,6 @@ export abstract class Controller<
75
75
type RuntimeControllerEventMap = ControllerEventMap & {
76
76
reloadStart : [ ReloadStartEvent ] ;
77
77
reloadComplete : [ ReloadCompleteEvent ] ;
78
- teardown : [ ] ;
79
78
} ;
80
79
export abstract class RuntimeController extends Controller < RuntimeControllerEventMap > {
81
80
// ******************
Original file line number Diff line number Diff line change @@ -96,20 +96,18 @@ export class DevEnv extends EventEmitter {
96
96
}
97
97
98
98
/**
99
- * Awaits for all the local runtime controllers to be ready, and when they are
99
+ * Awaits for a runtime controllers to be ready, and when it is
100
100
* it resolves a promise on the proxy controller to let it know that the
101
101
* local server is now ready to handle requests
102
102
*/
103
103
private async resolveAllRuntimeControllersReady ( ) : Promise < void > {
104
- await Promise . all (
104
+ await Promise . race (
105
105
this . runtimes . map ( ( runtime ) => {
106
106
return new Promise < void > ( ( resolve ) => {
107
107
// A runtime controller is ready when it either emits the
108
108
// reloadComplete event (meaning that the runtime is in use and
109
- // ready) or when it emits the teardown event (meaning that the
110
- // runtime is not currently in use)
109
+ // ready)
111
110
runtime . once ( "reloadComplete" , ( ) => resolve ( ) ) ;
112
- runtime . once ( "teardown" , ( ) => resolve ( ) ) ;
113
111
} ) ;
114
112
} )
115
113
) ;
Original file line number Diff line number Diff line change @@ -380,7 +380,6 @@ export class LocalRuntimeController extends RuntimeController {
380
380
} ;
381
381
382
382
#teardown = async ( ) : Promise < void > => {
383
- this . emitTeardownEvent ( ) ;
384
383
logger . debug ( "LocalRuntimeController teardown beginning..." ) ;
385
384
386
385
if ( this . #mf) {
@@ -422,9 +421,6 @@ export class LocalRuntimeController extends RuntimeController {
422
421
emitReloadCompleteEvent ( data : ReloadCompleteEvent ) {
423
422
this . emit ( "reloadComplete" , data ) ;
424
423
}
425
- emitTeardownEvent ( ) {
426
- this . emit ( "teardown" ) ;
427
- }
428
424
}
429
425
430
426
/**
Original file line number Diff line number Diff line change @@ -333,8 +333,6 @@ export class RemoteRuntimeController extends RuntimeController {
333
333
}
334
334
335
335
async teardown ( ) {
336
- this . emitTeardownEvent ( ) ;
337
-
338
336
if ( this . #session) {
339
337
logger . log ( chalk . dim ( "⎔ Shutting down remote preview..." ) ) ;
340
338
}
@@ -354,7 +352,4 @@ export class RemoteRuntimeController extends RuntimeController {
354
352
emitReloadCompleteEvent ( data : ReloadCompleteEvent ) {
355
353
this . emit ( "reloadComplete" , data ) ;
356
354
}
357
- emitTeardownEvent ( ) {
358
- this . emit ( "teardown" ) ;
359
- }
360
355
}
You can’t perform that action at this time.
0 commit comments