marko 4.28.3 → 4.28.5

package/dist/node_modules/@internal/loader/index.js

@@ -94,22 +94,22 @@ function getCachedTemplate(path) {
 function getPreviousTemplate(templatePath, options) {
   /*
     The require.cache is search in the following order:
-    1) /path/to/my-template.js
-    2) /path/to/my-template.marko.js
+    1) /path/to/my-template.marko.js
+    2) /path/to/my-template.js
     3) /path/to/my-template.marko
      *
     If the template is not found in require.cache and `assumeUpToDate` is true
     then we will check the disk for the precompiled templates in the following
     order:
-    1) /path/to/my-template.js
-    2) /path/to/my-template.marko.js
+    1) /path/to/my-template.marko.js
+    2) /path/to/my-template.js
     */
   var ext = nodePath.extname(templatePath);
-  var targetFilePrecompiled = templatePath.slice(0, 0 - ext.length) + ".js";
-  var targetFileDebug = templatePath + ".js";
+  var targetPrecompiledMarkoJS = templatePath + ".js";
+  var targetPrecompiledJS = templatePath.slice(0, 0 - ext.length) + ".js";
 
   // Short-circuit loading if the template has already been cached in the Node.js require cache
-  var cachedTemplate = getCachedTemplate(targetFilePrecompiled) || getCachedTemplate(targetFileDebug) || getCachedTemplate(templatePath);
+  var cachedTemplate = getCachedTemplate(targetPrecompiledMarkoJS) || getCachedTemplate(targetPrecompiledJS) || getCachedTemplate(templatePath);
 
   if (cachedTemplate) {
     return cachedTemplate;
@@ -119,12 +119,11 @@ function getPreviousTemplate(templatePath, options) {
   templatePath = nodePath.resolve(cwd, templatePath);
 
   if (options.assumeUpToDate) {
-    if (fs.existsSync(targetFilePrecompiled)) {
-      return require(targetFilePrecompiled);
+    if (fs.existsSync(targetPrecompiledMarkoJS)) {
+      return require(targetPrecompiledMarkoJS);
     }
-
-    if (fs.existsSync(targetFileDebug)) {
-      return require(targetFileDebug);
+    if (fs.existsSync(targetPrecompiledJS)) {
+      return require(targetPrecompiledJS);
     }
   }
 

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/package.json

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

package/src/node_modules/@internal/loader/index.js

@@ -96,24 +96,24 @@ function getCachedTemplate(path) {
 function getPreviousTemplate(templatePath, options) {
   /*
     The require.cache is search in the following order:
-    1) /path/to/my-template.js
-    2) /path/to/my-template.marko.js
+    1) /path/to/my-template.marko.js
+    2) /path/to/my-template.js
     3) /path/to/my-template.marko
      *
     If the template is not found in require.cache and `assumeUpToDate` is true
     then we will check the disk for the precompiled templates in the following
     order:
-    1) /path/to/my-template.js
-    2) /path/to/my-template.marko.js
+    1) /path/to/my-template.marko.js
+    2) /path/to/my-template.js
     */
   var ext = nodePath.extname(templatePath);
-  var targetFilePrecompiled = templatePath.slice(0, 0 - ext.length) + ".js";
-  var targetFileDebug = templatePath + ".js";
+  var targetPrecompiledMarkoJS = templatePath + ".js";
+  var targetPrecompiledJS = templatePath.slice(0, 0 - ext.length) + ".js";
 
   // Short-circuit loading if the template has already been cached in the Node.js require cache
   var cachedTemplate =
-    getCachedTemplate(targetFilePrecompiled) ||
-    getCachedTemplate(targetFileDebug) ||
+    getCachedTemplate(targetPrecompiledMarkoJS) ||
+    getCachedTemplate(targetPrecompiledJS) ||
     getCachedTemplate(templatePath);
 
   if (cachedTemplate) {
@@ -124,12 +124,11 @@ function getPreviousTemplate(templatePath, options) {
   templatePath = nodePath.resolve(cwd, templatePath);
 
   if (options.assumeUpToDate) {
-    if (fs.existsSync(targetFilePrecompiled)) {
-      return require(targetFilePrecompiled);
+    if (fs.existsSync(targetPrecompiledMarkoJS)) {
+      return require(targetPrecompiledMarkoJS);
     }
-
-    if (fs.existsSync(targetFileDebug)) {
-      return require(targetFileDebug);
+    if (fs.existsSync(targetPrecompiledJS)) {
+      return require(targetPrecompiledJS);
     }
   }
 

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