@jsenv/core 37.0.4 → 37.1.0

package/dist/js/autoreload.js

@@ -51,20 +51,20 @@ const getDOMNodesUsingUrl = (urlToReload) => {
     }
     nodes.push({
       node,
-      reload: () => {
+      reload: (hot) => {
         if (node.nodeName === "SCRIPT") {
           const copy = document.createElement("script");
           Array.from(node.attributes).forEach((attribute) => {
             copy.setAttribute(attribute.nodeName, attribute.nodeValue);
           });
-          copy.src = injectQuery(node.src, { hot: Date.now() });
+          copy.src = injectQuery(node.src, { hot });
           if (node.parentNode) {
             node.parentNode.replaceChild(copy, node);
           } else {
             document.body.appendChild(copy);
           }
         } else {
-          node[attributeName] = injectQuery(attribute, { hot: Date.now() });
+          node[attributeName] = injectQuery(attribute, { hot });
         }
       },
     });
@@ -108,16 +108,19 @@ const getDOMNodesUsingUrl = (urlToReload) => {
     visitNodeAttributeAsUrl(img, "src");
     const srcset = img.srcset;
     if (srcset) {
-      const srcCandidates = parseSrcSet(srcset);
-      srcCandidates.forEach((srcCandidate) => {
-        const url = new URL(srcCandidate.specifier, `${window.location.href}`);
-        if (shouldReloadUrl(url)) {
-          srcCandidate.specifier = injectQuery(url, { hot: Date.now() });
-        }
-      });
       nodes.push({
         node: img,
-        reload: () => {
+        reload: (hot) => {
+          const srcCandidates = parseSrcSet(srcset);
+          srcCandidates.forEach((srcCandidate) => {
+            const url = new URL(
+              srcCandidate.specifier,
+              `${window.location.href}`,
+            );
+            if (shouldReloadUrl(url)) {
+              srcCandidate.specifier = injectQuery(url, { hot });
+            }
+          });
           img.srcset = stringifySrcSet(srcCandidates);
         },
       });
@@ -137,8 +140,8 @@ const getDOMNodesUsingUrl = (urlToReload) => {
   return nodes;
 };
 
-const reloadJsImport = async (url) => {
-  const urlWithHotSearchParam = injectQuery(url, { hot: Date.now() });
+const reloadJsImport = async (url, hot) => {
+  const urlWithHotSearchParam = injectQuery(url, { hot });
   const namespace = await import(urlWithHotSearchParam);
   return namespace;
 };
@@ -264,7 +267,7 @@ const dequeue = async () => {
   }
 };
 
-const applyHotReload = async ({ hotInstructions }) => {
+const applyHotReload = async ({ cause, hot, hotInstructions }) => {
   await hotInstructions.reduce(
     async (previous, { type, boundary, acceptedBy }) => {
       await previous;
@@ -280,7 +283,7 @@ const applyHotReload = async ({ hotInstructions }) => {
           delete urlHotMetas[urlToFetch];
           if (urlHotMeta.disposeCallback) {
             console.groupCollapsed(
-              `[jsenv] cleanup ${boundary} (previously used in ${acceptedBy})`,
+              `[jsenv] cleanup ${boundary} (no longer referenced by ${acceptedBy})`,
             );
             console.log(`call dispose callback`);
             await urlHotMeta.disposeCallback();
@@ -291,10 +294,10 @@ const applyHotReload = async ({ hotInstructions }) => {
       }
 
       if (acceptedBy === boundary) {
-        console.groupCollapsed(`[jsenv] hot reloading ${boundary}`);
+        console.groupCollapsed(`[jsenv] hot reloading ${boundary} (${cause})`);
       } else {
         console.groupCollapsed(
-          `[jsenv] hot reloading ${acceptedBy} usage in ${boundary}`,
+          `[jsenv] hot reloading ${acceptedBy} usage in ${boundary} (${cause})`,
         );
       }
       if (type === "js_module") {
@@ -311,7 +314,7 @@ const applyHotReload = async ({ hotInstructions }) => {
           type: "dynamic_import",
           url: urlToFetch,
         };
-        const namespace = await reloadJsImport(urlToFetch);
+        const namespace = await reloadJsImport(urlToFetch, hot);
         if (urlHotMeta.acceptCallback) {
           await urlHotMeta.acceptCallback(namespace);
         }
@@ -338,11 +341,11 @@ const applyHotReload = async ({ hotInstructions }) => {
           console.log(`no dom node using ${acceptedBy}`);
         } else if (domNodesCount === 1) {
           console.log(`reloading`, domNodesUsingUrl[0].node);
-          domNodesUsingUrl[0].reload();
+          domNodesUsingUrl[0].reload(hot);
         } else {
           console.log(`reloading ${domNodesCount} nodes using ${acceptedBy}`);
           domNodesUsingUrl.forEach((domNodesUsingUrl) => {
-            domNodesUsingUrl.reload();
+            domNodesUsingUrl.reload(hot);
           });
         }
         console.groupEnd();

package/dist/js/import_meta_hot.js

@@ -75,7 +75,6 @@ const asUrlWithoutHotSearchParam = (url) => {
   const urlObject = new URL(url);
   if (urlObject.searchParams.has("hot")) {
     urlObject.searchParams.delete("hot");
-    urlObject.searchParams.delete("v");
     return urlObject.href;
   }
   return url;