marko 5.39.14 → 5.39.16

package/dist/translator/index.js

@@ -309,7 +309,12 @@ const translate = exports.translate = {
             _compiler.types.identifier("withPageAssets")
           )],
 
-          _compiler.types.stringLiteral("marko/src/runtime/helpers/load-tag.js")
+          _compiler.types.stringLiteral(
+            (0, _babelUtils.resolveRelativePath)(
+              file,
+              "marko/src/runtime/helpers/load-tag.js"
+            )
+          )
         ),
         _compiler.types.exportAllDeclaration(_compiler.types.stringLiteral(relPath)),
         _compiler.types.exportDefaultDeclaration(

package/dist/translator/util/load-import.js

@@ -11,17 +11,27 @@ const loadTagsByFile = new WeakMap();
 function analyzeLoadImport(importDecl, tagEntry) {
   if (!importDecl.node.attributes?.length) return;
 
-  const loadAttrValuePath = importDecl.
+  const loadAttrPath = importDecl.
   get("attributes").
   find(
     (p) =>
     (p.node.key.type === "Identifier" ?
     p.node.key.name :
     p.node.key.value) === "load"
-  )?.
-  get("value");
+  );
+
+  if (!loadAttrPath) return;
+
+  // Under hot reload every module is already eagerly loaded, so the lazy facade
+  // buys nothing and its HMR-cached template collides with the real template's
+  // `_` slot, recursing on render (see load-tag-browser.js). Drop the attribute
+  // so the import compiles as a normal eager tag import in dev.
+  if (importDecl.hub.file.markoOpts.hot) {
+    loadAttrPath.remove();
+    return;
+  }
 
-  if (!loadAttrValuePath) return;
+  const loadAttrValuePath = loadAttrPath.get("value");
 
   if (!tagEntry) {
     throw importDecl.buildCodeFrameError(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.39.14",
+  "version": "5.39.16",
   "private": false,
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
@@ -71,7 +71,7 @@
   },
   "dependencies": {
     "@marko/compiler": "^5.40.1",
-    "@marko/runtime-tags": "^6.1.19",
+    "@marko/runtime-tags": "^6.2.5",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",

package/src/translator/index.js

@@ -309,7 +309,12 @@ export const translate = {
                 t.identifier("withPageAssets"),
               ),
             ],
-            t.stringLiteral("marko/src/runtime/helpers/load-tag.js"),
+            t.stringLiteral(
+              resolveRelativePath(
+                file,
+                "marko/src/runtime/helpers/load-tag.js",
+              ),
+            ),
           ),
           t.exportAllDeclaration(t.stringLiteral(relPath)),
           t.exportDefaultDeclaration(

package/src/translator/util/load-import.js

@@ -11,17 +11,27 @@ const loadTagsByFile = new WeakMap();
 export function analyzeLoadImport(importDecl, tagEntry) {
   if (!importDecl.node.attributes?.length) return;
 
-  const loadAttrValuePath = importDecl
+  const loadAttrPath = importDecl
     .get("attributes")
     .find(
       (p) =>
         (p.node.key.type === "Identifier"
           ? p.node.key.name
           : p.node.key.value) === "load",
-    )
-    ?.get("value");
+    );
+
+  if (!loadAttrPath) return;
+
+  // Under hot reload every module is already eagerly loaded, so the lazy facade
+  // buys nothing and its HMR-cached template collides with the real template's
+  // `_` slot, recursing on render (see load-tag-browser.js). Drop the attribute
+  // so the import compiles as a normal eager tag import in dev.
+  if (importDecl.hub.file.markoOpts.hot) {
+    loadAttrPath.remove();
+    return;
+  }
 
-  if (!loadAttrValuePath) return;
+  const loadAttrValuePath = loadAttrPath.get("value");
 
   if (!tagEntry) {
     throw importDecl.buildCodeFrameError(