@atlaspack/runtime-browser-hmr 2.14.12 → 2.14.14

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaspack/runtime-browser-hmr
 
+## 2.14.14
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.15.2
+  - @atlaspack/plugin@2.14.14
+
+## 2.14.13
+
+### Patch Changes
+
+- [#633](https://github.com/atlassian-labs/atlaspack/pull/633) [`26aa9c5`](https://github.com/atlassian-labs/atlaspack/commit/26aa9c599d2be45ce1438a74c5fa22f39b9b554b) Thanks [@sbhuiyan-atlassian](https://github.com/sbhuiyan-atlassian)! - Ported various HMR changes from Parcel
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.15.1
+  - @atlaspack/plugin@2.14.13
+
 ## 2.14.12
 
 ### Patch Changes

package/lib/loaders/hmr-runtime.js

@@ -67,7 +67,7 @@ function Module(moduleName) {
 }
 module.bundle.Module = Module;
 module.bundle.hotData = {};
-var checkedAssets /*: {|[string]: boolean|} */, assetsToDispose /*: Array<[ParcelRequire, string]> */, assetsToAccept /*: Array<[ParcelRequire, string]> */;
+var checkedAssets /*: {|[string]: boolean|} */, disposedAssets /*: {|[string]: boolean|} */, assetsToDispose /*: Array<[ParcelRequire, string]> */, assetsToAccept /*: Array<[ParcelRequire, string]> */;
 
 function getHostname() {
   return HMR_HOST || (location.protocol.indexOf('http') === 0 ? location.hostname : 'localhost');
@@ -111,6 +111,7 @@ if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
   // $FlowFixMe
   ws.onmessage = async function (event /*: {data: string, ...} */) {
     checkedAssets = {} /*: {|[string]: boolean|} */;
+    disposedAssets = {} /*: {|[string]: boolean|} */;
     assetsToAccept = [];
     assetsToDispose = [];
     var data /*: HMRMessage */ = JSON.parse(event.data);
@@ -135,19 +136,10 @@ if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
           window.dispatchEvent(new CustomEvent('parcelhmraccept'));
         }
         await hmrApplyUpdates(assets);
-
-        // Dispose all old assets.
-        let processedAssets = {} /*: {|[string]: boolean|} */;
-        for (let i = 0; i < assetsToDispose.length; i++) {
-          let id = assetsToDispose[i][1];
-          if (!processedAssets[id]) {
-            hmrDispose(assetsToDispose[i][0], id);
-            processedAssets[id] = true;
-          }
-        }
+        hmrDisposeQueue();
 
         // Run accept callbacks. This will also re-execute other disposed assets in topological order.
-        processedAssets = {};
+        let processedAssets = {};
         for (let i = 0; i < assetsToAccept.length; i++) {
           let id = assetsToAccept[i][1];
           if (!processedAssets[id]) {
@@ -385,7 +377,11 @@ function hmrApply(bundle /*: ParcelRequire */, asset /*:  HMRAsset */) {
       // $FlowFixMe
       let fn = global.parcelHotUpdate[asset.id];
       modules[asset.id] = [fn, deps];
-    } else if (bundle.parent) {
+    }
+
+    // Always traverse to the parent bundle, even if we already replaced the asset in this bundle.
+    // This is required in case modules are duplicated. We need to ensure all instances have the updated code.
+    if (bundle.parent) {
       hmrApply(bundle.parent, asset);
     }
   }
@@ -469,6 +465,17 @@ function hmrAcceptCheckOne(bundle /*: ParcelRequire */, id /*: string */, depsBy
     return true;
   }
 }
+function hmrDisposeQueue() {
+  // Dispose all old assets.
+  for (let i = 0; i < assetsToDispose.length; i++) {
+    let id = assetsToDispose[i][1];
+    if (!disposedAssets[id]) {
+      hmrDispose(assetsToDispose[i][0], id);
+      disposedAssets[id] = true;
+    }
+  }
+  assetsToDispose = [];
+}
 function hmrDispose(bundle /*: ParcelRequire */, id /*: string */) {
   var cached = bundle.cache[id];
   bundle.hotData[id] = {};
@@ -489,18 +496,23 @@ function hmrAccept(bundle /*: ParcelRequire */, id /*: string */) {
   // Run the accept callbacks in the new version of the module.
   var cached = bundle.cache[id];
   if (cached && cached.hot && cached.hot._acceptCallbacks.length) {
+    let assetsToAlsoAccept = [];
     cached.hot._acceptCallbacks.forEach(function (cb) {
-      var assetsToAlsoAccept = cb(function () {
+      let additionalAssets = cb(function () {
         return getParents(module.bundle.root, id);
       });
-      if (assetsToAlsoAccept && assetsToAccept.length) {
-        assetsToAlsoAccept.forEach(function (a) {
-          hmrDispose(a[0], a[1]);
-        });
-
-        // $FlowFixMe[method-unbinding]
-        assetsToAccept.push.apply(assetsToAccept, assetsToAlsoAccept);
+      if (Array.isArray(additionalAssets) && additionalAssets.length) {
+        assetsToAlsoAccept.push(...additionalAssets);
       }
     });
+    if (assetsToAlsoAccept.length > 0) {
+      let handled = assetsToAlsoAccept.every(function (a) {
+        return hmrAcceptCheck(a[0], a[1]);
+      });
+      if (!handled) {
+        return fullReload();
+      }
+      hmrDisposeQueue();
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/runtime-browser-hmr",
-  "version": "2.14.12",
+  "version": "2.14.14",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,8 +15,8 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.14.12",
-    "@atlaspack/utils": "2.15.0"
+    "@atlaspack/plugin": "2.14.14",
+    "@atlaspack/utils": "2.15.2"
   },
   "type": "commonjs"
 }

package/src/loaders/hmr-runtime.js

@@ -72,6 +72,7 @@ module.bundle.Module = Module;
 module.bundle.hotData = {};
 
 var checkedAssets /*: {|[string]: boolean|} */,
+  disposedAssets /*: {|[string]: boolean|} */,
   assetsToDispose /*: Array<[ParcelRequire, string]> */,
   assetsToAccept /*: Array<[ParcelRequire, string]> */;
 
@@ -134,6 +135,7 @@ if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
   // $FlowFixMe
   ws.onmessage = async function (event /*: {data: string, ...} */) {
     checkedAssets = ({} /*: {|[string]: boolean|} */);
+    disposedAssets = ({} /*: {|[string]: boolean|} */);
     assetsToAccept = [];
     assetsToDispose = [];
 
@@ -173,19 +175,10 @@ if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
 
         await hmrApplyUpdates(assets);
 
-        // Dispose all old assets.
-        let processedAssets = ({} /*: {|[string]: boolean|} */);
-        for (let i = 0; i < assetsToDispose.length; i++) {
-          let id = assetsToDispose[i][1];
-
-          if (!processedAssets[id]) {
-            hmrDispose(assetsToDispose[i][0], id);
-            processedAssets[id] = true;
-          }
-        }
+        hmrDisposeQueue();
 
         // Run accept callbacks. This will also re-execute other disposed assets in topological order.
-        processedAssets = {};
+        let processedAssets = {};
         for (let i = 0; i < assetsToAccept.length; i++) {
           let id = assetsToAccept[i][1];
 
@@ -493,7 +486,11 @@ function hmrApply(bundle /*: ParcelRequire */, asset /*:  HMRAsset */) {
       // $FlowFixMe
       let fn = global.parcelHotUpdate[asset.id];
       modules[asset.id] = [fn, deps];
-    } else if (bundle.parent) {
+    }
+
+    // Always traverse to the parent bundle, even if we already replaced the asset in this bundle.
+    // This is required in case modules are duplicated. We need to ensure all instances have the updated code.
+    if (bundle.parent) {
       hmrApply(bundle.parent, asset);
     }
   }
@@ -597,6 +594,20 @@ function hmrAcceptCheckOne(
   }
 }
 
+function hmrDisposeQueue() {
+  // Dispose all old assets.
+  for (let i = 0; i < assetsToDispose.length; i++) {
+    let id = assetsToDispose[i][1];
+
+    if (!disposedAssets[id]) {
+      hmrDispose(assetsToDispose[i][0], id);
+      disposedAssets[id] = true;
+    }
+  }
+
+  assetsToDispose = [];
+}
+
 function hmrDispose(bundle /*: ParcelRequire */, id /*: string */) {
   var cached = bundle.cache[id];
   bundle.hotData[id] = {};
@@ -620,18 +631,26 @@ function hmrAccept(bundle /*: ParcelRequire */, id /*: string */) {
   // Run the accept callbacks in the new version of the module.
   var cached = bundle.cache[id];
   if (cached && cached.hot && cached.hot._acceptCallbacks.length) {
+    let assetsToAlsoAccept = [];
     cached.hot._acceptCallbacks.forEach(function (cb) {
-      var assetsToAlsoAccept = cb(function () {
+      let additionalAssets = cb(function () {
         return getParents(module.bundle.root, id);
       });
-      if (assetsToAlsoAccept && assetsToAccept.length) {
-        assetsToAlsoAccept.forEach(function (a) {
-          hmrDispose(a[0], a[1]);
-        });
-
-        // $FlowFixMe[method-unbinding]
-        assetsToAccept.push.apply(assetsToAccept, assetsToAlsoAccept);
+      if (Array.isArray(additionalAssets) && additionalAssets.length) {
+        assetsToAlsoAccept.push(...additionalAssets);
       }
     });
+
+    if (assetsToAlsoAccept.length > 0) {
+      let handled = assetsToAlsoAccept.every(function (a) {
+        return hmrAcceptCheck(a[0], a[1]);
+      });
+
+      if (!handled) {
+        return fullReload();
+      }
+
+      hmrDisposeQueue();
+    }
   }
 }