marko 4.28.2 → 4.28.4

package/dist/compiler/Normalizer.js

@@ -107,7 +107,7 @@ class Normalizer {
       } else if (context.ignoreUnrecognizedTags && tagName[0] === "@") {
         let owner = elNode.parentNode;
 
-        while (owner && /^(?:for|while|if|else(?:-if))$/.test(owner.tagName)) {
+        while (owner && /^(?:for|while|if|else(?:-if))$|^@/.test(owner.tagName)) {
           owner = owner.parentNode;
         }
 

package/dist/runtime/vdom/morphdom/index.js

@@ -437,7 +437,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             var curToNodeValue = curToNodeChild.bW_;
             var curFromNodeValue = curFromNodeChild.nodeValue;
             if (curFromNodeValue !== curToNodeValue) {
-              if (isHydrate && curFromNodeType === TEXT_NODE && curFromNodeValue.startsWith(curToNodeValue)) {
+              if (isHydrate && toNextSibling && curFromNodeType === TEXT_NODE && toNextSibling.bX_ === TEXT_NODE && curFromNodeValue.startsWith(curToNodeValue) && toNextSibling.bW_.startsWith(curFromNodeValue.slice(curToNodeValue.length))) {
                 // In hydrate mode we can use splitText to more efficiently handle
                 // adjacent text vdom nodes that were merged.
                 fromNextSibling = curFromNodeChild.splitText(curToNodeValue.length);

package/dist/taglib/taglib-loader/loadTaglibFromProps.js

@@ -197,6 +197,9 @@ class TaglibLoader {
       }
     }
   }
+  scriptLang() {
+    // Marko 4 doesn't read script-lang, but it shouldn't break the app
+  }
   tagsDir(dir) {
     // The "tags-dir" property is used to supporting scanning
     // of a directory to discover custom tags. Scanning a directory

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marko",
-    "version": "4.28.2",
+    "version": "4.28.4",
     "license": "MIT",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "dependencies": {

package/src/compiler/Normalizer.js

@@ -125,7 +125,7 @@ class Normalizer {
       } else if (context.ignoreUnrecognizedTags && tagName[0] === "@") {
         let owner = elNode.parentNode;
 
-        while (owner && /^(?:for|while|if|else(?:-if))$/.test(owner.tagName)) {
+        while (owner && /^(?:for|while|if|else(?:-if))$|^@/.test(owner.tagName)) {
           owner = owner.parentNode;
         }
 

package/src/runtime/vdom/morphdom/index.js

@@ -292,13 +292,13 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                   curFromNodeChild,
                   curVFromNodeChild,
                   curToNodeChild,
-                  parentComponent,
+                  parentComponent
                 );
               } else {
                 morphChildren(
                   curFromNodeChild,
                   curToNodeChild,
-                  parentComponent,
+                  parentComponent
                 );
               }
             } else {
@@ -484,10 +484,9 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                   morphChildren(
                     matchingFromEl,
                     curToNodeChild,
-                    parentComponent,
+                    parentComponent
                   );
                 }
-
               } else {
                 insertVirtualNodeBefore(
                   curToNodeChild,
@@ -594,13 +593,18 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             if (curFromNodeValue !== curToNodeValue) {
               if (
                 isHydrate &&
+                toNextSibling &&
                 curFromNodeType === TEXT_NODE &&
-                curFromNodeValue.startsWith(curToNodeValue)
+                toNextSibling.___nodeType === TEXT_NODE &&
+                curFromNodeValue.startsWith(curToNodeValue) &&
+                toNextSibling.___nodeValue.startsWith(
+                  curFromNodeValue.slice(curToNodeValue.length)
+                )
               ) {
                 // In hydrate mode we can use splitText to more efficiently handle
                 // adjacent text vdom nodes that were merged.
                 fromNextSibling = curFromNodeChild.splitText(
-                  curToNodeValue.length,
+                  curToNodeValue.length
                 );
               } else {
                 // Simply update nodeValue on the original node to

package/src/taglib/taglib-loader/loadTaglibFromProps.js

@@ -222,6 +222,9 @@ class TaglibLoader {
       }
     }
   }
+  scriptLang() {
+    // Marko 4 doesn't read script-lang, but it shouldn't break the app
+  }
   tagsDir(dir) {
     // The "tags-dir" property is used to supporting scanning
     // of a directory to discover custom tags. Scanning a directory