fix: hmr runtime on preloaded stylesheet link (#686)

webpack-contrib · Jan 27, 2021 · 05e2951 · 05e2951
1 parent a451223
commit 05e2951
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 0 deletions.
diff --git a/src/hmr/hotModuleReplacement.js b/src/hmr/hotModuleReplacement.js
@@ -108,11 +108,19 @@ function updateCss(el, url) {
   newEl.isLoaded = false;
 
   newEl.addEventListener('load', () => {
+    if (newEl.isLoaded) {
+      return;
+    }
+
     newEl.isLoaded = true;
     el.parentNode.removeChild(el);
   });
 
   newEl.addEventListener('error', () => {
+    if (newEl.isLoaded) {
+      return;
+    }
+
     newEl.isLoaded = true;
     el.parentNode.removeChild(el);
   });

diff --git a/test/HMR.test.js b/test/HMR.test.js
@@ -306,4 +306,29 @@ describe('HMR', () => {
       done();
     }, 100);
   });
+
+  it('should not remove old link when new link is loaded twice', (done) => {
+    const link = document.createElement('link');
+
+    link.innerHTML = '<link rel="preload stylesheet" href="./dist/main.css" />';
+    document.head.appendChild(link);
+    document.head.removeChild = jest.fn();
+
+    const update = hotModuleReplacement('./dist/main.css', {});
+
+    update();
+
+    setTimeout(() => {
+      const links = Array.prototype.slice.call(
+        document.querySelectorAll('link')
+      );
+
+      links[1].dispatchEvent(getLoadEvent());
+      links[1].dispatchEvent(getLoadEvent());
+
+      expect(document.head.removeChild).toHaveBeenCalledTimes(1);
+
+      done();
+    }, 100);
+  });
 });
diff --git a/test/cases/hmr/expected/webpack-4/main.js b/test/cases/hmr/expected/webpack-4/main.js
@@ -987,11 +987,19 @@ function updateCss(el, url) {
   newEl.isLoaded = false;
 
   newEl.addEventListener('load', () => {
+    if (newEl.isLoaded) {
+      return;
+    }
+
     newEl.isLoaded = true;
     el.parentNode.removeChild(el);
   });
 
   newEl.addEventListener('error', () => {
+    if (newEl.isLoaded) {
+      return;
+    }
+
     newEl.isLoaded = true;
     el.parentNode.removeChild(el);
   });

diff --git a/test/cases/hmr/expected/webpack-5/main.js b/test/cases/hmr/expected/webpack-5/main.js
@@ -129,11 +129,19 @@ function updateCss(el, url) {
   newEl.isLoaded = false;
 
   newEl.addEventListener('load', () => {
+    if (newEl.isLoaded) {
+      return;
+    }
+
     newEl.isLoaded = true;
     el.parentNode.removeChild(el);
   });
 
   newEl.addEventListener('error', () => {
+    if (newEl.isLoaded) {
+      return;
+    }
+
     newEl.isLoaded = true;
     el.parentNode.removeChild(el);
   });