Merge pull request #4775 from NativeScript/vladimirov/fix-hmr

rosen-vladimirov · web-flow · commit d5bfcb23eb31 · 2019-06-26T20:53:49.000+03:00
fix: hmr is working slowly
diff --git a/lib/controllers/run-controller.ts b/lib/controllers/run-controller.ts
@@ -358,6 +358,7 @@ export class RunController extends EventEmitter implements IRunController {
 					}
 
 					let liveSyncResultInfo = await platformLiveSyncService.liveSyncWatchAction(device, watchInfo);
+					await this.refreshApplication(projectData, liveSyncResultInfo, data, deviceDescriptor);
 
 					if (!liveSyncResultInfo.didRecover && isInHMRMode) {
 						const status = await this.$hmrStatusService.getHmrStatus(device.deviceInfo.identifier, data.hmrData.hash);
@@ -369,8 +370,6 @@ export class RunController extends EventEmitter implements IRunController {
 							await this.refreshApplication(projectData, liveSyncResultInfo, data, deviceDescriptor);
 						}
 					}
-
-					await this.refreshApplication(projectData, liveSyncResultInfo, data, deviceDescriptor);
 				}
 
 				this.$logger.info(`Successfully synced application ${deviceAppData.appIdentifier} on device ${device.deviceInfo.identifier}.`);

Original file line number	Diff line number	Diff line change
`@@ -358,6 +358,7 @@ export class RunController extends EventEmitter implements IRunController {`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`let liveSyncResultInfo = await platformLiveSyncService.liveSyncWatchAction(device, watchInfo);`
	`361`	`+ await this.refreshApplication(projectData, liveSyncResultInfo, data, deviceDescriptor);`
`361`	`362`
`362`	`363`	`if (!liveSyncResultInfo.didRecover && isInHMRMode) {`
`363`	`364`	`const status = await this.$hmrStatusService.getHmrStatus(device.deviceInfo.identifier, data.hmrData.hash);`
`@@ -369,8 +370,6 @@ export class RunController extends EventEmitter implements IRunController {`
`369`	`370`	`await this.refreshApplication(projectData, liveSyncResultInfo, data, deviceDescriptor);`
`370`	`371`	`}`
`371`	`372`	`}`
`372`		`-`
`373`		`- await this.refreshApplication(projectData, liveSyncResultInfo, data, deviceDescriptor);`
`374`	`373`	`}`
`375`	`374`
`376`	`375`	this.$logger.info(`Successfully synced application ${deviceAppData.appIdentifier} on device ${device.deviceInfo.identifier}.`);