From 5a00438321ccd8720ee5aa9526ec67cd06fc0c99 Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Tue, 7 Jun 2022 17:47:22 +0200 Subject: [PATCH] fix(hmr): emit boot log at boot instead of the 1st livesync --- .../nativescript-hot-loader/hmr.runtime.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts b/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts index 2f51c6a1a..b456a1fdc 100644 --- a/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts +++ b/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts @@ -5,6 +5,7 @@ if (module.hot) { let hash = __webpack_require__.h(); + let hmrBootEmittedSymbol = Symbol.for('HMRBootEmitted'); const logVerbose = (title: string, ...info: any) => { if (__NS_ENV_VERBOSE__) { @@ -115,12 +116,15 @@ if (module.hot) { return false; } - await checkAndApply(); - await originalOnLiveSync(); - - if (!global.hmrBootEmitted) { - global.hmrBootEmitted = true; - setStatus(hash, 'boot', 'HMR Enabled - waiting for changes...'); + if (!(await checkAndApply())) { + return false; } + + await originalOnLiveSync(); }; + + if (!global[hmrBootEmittedSymbol]) { + global[hmrBootEmittedSymbol] = true; + setStatus(hash, 'boot', 'HMR Enabled - waiting for changes...'); + } }