marko 5.25.2 → 5.25.3

package/dist/compiler/modules.js

@@ -1,5 +1,5 @@
 "use strict";
 
-if (typeof window === "undefined") {
+if (typeof document === "undefined") {
   exports.require = require;
 }

package/dist/core-tags/components/preserve-tag.js

@@ -0,0 +1,81 @@
+"use strict";var ComponentsContext = require("../../runtime/components/ComponentsContext");
+var getComponentsContext = ComponentsContext.e_;
+
+module.exports = function render(input, out) {
+  var isComponent = !input.n;
+  var shouldPreserve = !("i" in input) || input.i;
+  var componentsContext = out.b_;
+
+  if (typeof document === "object") {
+    var isHydrate =
+    componentsContext && componentsContext.f_.g_;
+    var ownerComponent = out.h_.i_;
+    var referenceComponent = ownerComponent;
+    var key = out.j_;
+    var checkKey = key;
+
+    if (key[0] !== "@") {
+      var parentComponent = componentsContext.k_.i_;
+      if (ownerComponent !== parentComponent) {
+        referenceComponent = parentComponent;
+        checkKey += ":" + ownerComponent.id;
+      }
+    }
+
+    var isPreserved =
+    shouldPreserve && (
+    isHydrate || referenceComponent.l_[checkKey]);
+
+    if (isComponent) {
+      out.bf(key, ownerComponent, shouldPreserve);
+
+      if (!isPreserved && input.renderBody) {
+        input.renderBody(out);
+      }
+
+      out.ef();
+    } else {
+      if (isPreserved) {
+        if (input.b) {
+          out.m_.n_ = true;
+        } else {
+          out.beginElement("", null, key, ownerComponent);
+          out.m_.o_ = true;
+          out.endElement();
+        }
+      } else if (input.renderBody) {
+        input.renderBody(out);
+      }
+    }
+  } else {
+    if (isComponent) {
+      out.bf(
+      out.j_,
+      out.h_.i_,
+      true);
+
+    }
+
+    if (input.renderBody) {
+      if (shouldPreserve) {
+        var parentPreserved = false;
+
+        if (componentsContext) {
+          parentPreserved = componentsContext.p_;
+        } else {
+          componentsContext = getComponentsContext(out);
+        }
+
+        componentsContext.p_ = true;
+        input.renderBody(out);
+        componentsContext.p_ = parentPreserved;
+      } else {
+        input.renderBody(out);
+      }
+    }
+
+    if (isComponent) {
+      out.ef();
+    }
+  }
+};

package/dist/core-tags/core/await/renderer.js

@@ -81,7 +81,7 @@ const LAST_OPTIONS = { last: true, name: "await:finish" };
 
 module.exports = function awaitTag(input, out) {
   var clientReorder =
-  typeof window === "undefined" &&
+  typeof document === "undefined" &&
   input.clientReorder === true &&
   !out.isVDOM;
 

package/dist/runtime/RenderResult.js

@@ -37,7 +37,7 @@ var proto = RenderResult.prototype = {
     var components = [];
 
     componentDefs.forEach(function (componentDef) {
-      var component = componentDef.h_;
+      var component = componentDef.i_;
       if (!selector || selector(component)) {
         components.push(component);
       }

package/dist/runtime/components/Component.js

@@ -6,7 +6,7 @@
 var domInsert = require("../dom-insert");
 var defaultCreateOut = require("../createOut");
 var getComponentsContext =
-require("./ComponentsContext").o_;
+require("./ComponentsContext").e_;
 var componentsUtil = require("./util");
 var componentLookup = componentsUtil.D_;
 var destroyNodeRecursive = componentsUtil.E_;
@@ -189,10 +189,10 @@ function Component(id) {
   var ssrKeyedElements = keyedElementsByComponentId[id];
 
   if (ssrKeyedElements) {
-    this.k_ = ssrKeyedElements;
+    this.l_ = ssrKeyedElements;
     delete keyedElementsByComponentId[id];
   } else {
-    this.k_ = {};
+    this.l_ = {};
   }
 }
 
@@ -248,7 +248,7 @@ Component.prototype = componentProto = {
   getEl: function (key, index) {
     if (key) {
       var keyedElement =
-      this.k_["@" + resolveKeyHelper(key, index)];
+      this.l_["@" + resolveKeyHelper(key, index)];
 
       // eslint-disable-next-line no-constant-condition
 
@@ -280,7 +280,7 @@ Component.prototype = componentProto = {
     return els;
   },
   getComponent: function (key, index) {
-    var rootNode = this.k_["@" + resolveKeyHelper(key, index)];
+    var rootNode = this.l_["@" + resolveKeyHelper(key, index)];
     // eslint-disable-next-line no-constant-condition
 
 
@@ -293,7 +293,7 @@ Component.prototype = componentProto = {
     return rootNode && componentsByDOMNode.get(rootNode);
   },
   getComponents: function (key) {
-    var lookup = this.k_["@" + key + "[]"];
+    var lookup = this.l_["@" + key + "[]"];
     return lookup ?
     Object.keys(lookup).
     map(function (key) {
@@ -324,7 +324,7 @@ Component.prototype = componentProto = {
     root.detached = true;
 
     delete componentLookup[this.id];
-    this.k_ = {};
+    this.l_ = {};
   },
 
   ___: function () {
@@ -544,9 +544,9 @@ Component.prototype = componentProto = {
     out[CONTEXT_KEY] = this._i_;
 
     var componentsContext = getComponentsContext(out);
-    var globalComponentsContext = componentsContext.e_;
+    var globalComponentsContext = componentsContext.f_;
     globalComponentsContext._r_ = this;
-    globalComponentsContext.f_ = isHydrate;
+    globalComponentsContext.g_ = isHydrate;
 
     renderer(input, out);
 

package/dist/runtime/components/ComponentDef.js

@@ -19,7 +19,7 @@ var FLAG_HAS_RENDER_BODY = 2;
  */
 function ComponentDef(component, componentId, componentsContext) {
   this._F_ = componentsContext; // The AsyncWriter that this component is associated with
-  this.h_ = component;
+  this.i_ = component;
   this.id = componentId;
 
   this._G_ = undefined; // An array of DOM events that need to be added (in sets of three)
@@ -80,7 +80,7 @@ ComponentDef.prototype = {
   },
 
   get _O_() {
-    return this.h_._O_;
+    return this.i_._O_;
   }
 };
 
@@ -146,7 +146,7 @@ ComponentDef._P_ = function (o, types, global, registry) {
 
   return {
     id: id,
-    h_: component,
+    i_: component,
     _G_: extra.d,
     _J_: extra.f || 0
   };

package/dist/runtime/components/ComponentsContext.js

@@ -6,8 +6,8 @@ function ComponentsContext(out, parentComponentsContext) {
   var componentDef;
 
   if (parentComponentsContext) {
-    globalComponentsContext = parentComponentsContext.e_;
-    componentDef = parentComponentsContext.j_;
+    globalComponentsContext = parentComponentsContext.f_;
+    componentDef = parentComponentsContext.k_;
 
     var nestedContextsForParent;
     if (
@@ -25,10 +25,10 @@ function ComponentsContext(out, parentComponentsContext) {
     }
   }
 
-  this.e_ = globalComponentsContext;
+  this.f_ = globalComponentsContext;
   this.b_ = [];
   this.z_ = out;
-  this.j_ = componentDef;
+  this.k_ = componentDef;
   this._R_ = undefined;
   this.p_ =
   parentComponentsContext && parentComponentsContext.p_;
@@ -56,4 +56,4 @@ function getComponentsContext(out) {
 
 module.exports = exports = ComponentsContext;
 
-exports.o_ = getComponentsContext;
+exports.e_ = getComponentsContext;

package/dist/runtime/components/State.js

@@ -15,7 +15,7 @@ function ensure(state, propertyName) {
 }
 
 function State(component) {
-  this.h_ = component;
+  this.i_ = component;
   this._v_ = {};
 
   this.W_ = false;
@@ -84,7 +84,7 @@ State.prototype = {
       this._m_ = rawState;
       this._v_ = rawState = extend({}, rawState);
       this._l_ = {};
-      this.h_._f_();
+      this.i_._f_();
     }
 
     this._l_[name] = value;

package/dist/runtime/components/beginComponent/index-browser.js

@@ -7,17 +7,17 @@ key,
 ownerComponentDef)
 {
   var componentId = component.id;
-  var componentDef = componentsContext.j_ = new ComponentDef(
+  var componentDef = componentsContext.k_ = new ComponentDef(
   component,
   componentId,
   componentsContext);
 
-  componentsContext.e_._V_[
+  componentsContext.f_._V_[
   componentId] =
   true;
   componentsContext.b_.push(componentDef);
 
   var out = componentsContext.z_;
-  out.bc(component, key, ownerComponentDef && ownerComponentDef.h_);
+  out.bc(component, key, ownerComponentDef && ownerComponentDef.i_);
   return componentDef;
 };

package/dist/runtime/components/beginComponent/index.js

@@ -15,7 +15,7 @@ isImplicitComponent)
 {
   var componentId = component.id;
 
-  var componentDef = componentsContext.j_ = new ComponentDef(
+  var componentDef = componentsContext.k_ = new ComponentDef(
   component,
   componentId,
   componentsContext);

package/dist/runtime/components/endComponent/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var ComponentsContext = require("../ComponentsContext");
-var getComponentsContext = ComponentsContext.o_;
+var getComponentsContext = ComponentsContext.e_;
 
 module.exports = function endComponent(out, componentDef) {
   if (componentDef._I_) {

package/dist/runtime/components/entry/index.js

@@ -63,7 +63,7 @@ function addComponentsFromContext(componentsContext, componentsToHydrate) {
   for (var i = 0; i < len; i++) {
     var componentDef = components[i];
     var id = componentDef.id;
-    var component = componentDef.h_;
+    var component = componentDef.i_;
     var flags = componentDef._J_;
     var input = component.input || 0;
     var typeName = component.typeName;

package/dist/runtime/components/registry/index-browser.js

@@ -186,7 +186,7 @@ function indexServerComponentBoundaries(node, runtimeId, stack) {
             ownerId = parts[1];
             componentId = parts[0];
             if (ownerComponent = componentLookup[ownerId]) {
-              keyedElements = ownerComponent.k_;
+              keyedElements = ownerComponent.l_;
             } else {
               keyedElements =
               keyedElementsByComponentId[ownerId] || (
@@ -215,7 +215,7 @@ function indexServerComponentBoundaries(node, runtimeId, stack) {
         ownerId = markoKey.substring(separatorIndex + 1);
         markoKey = markoKey.substring(0, separatorIndex);
         if (ownerComponent = componentLookup[ownerId]) {
-          keyedElements = ownerComponent.k_;
+          keyedElements = ownerComponent.l_;
         } else {
           keyedElements =
           keyedElementsByComponentId[ownerId] || (
@@ -288,7 +288,7 @@ handles)
 }
 
 function initComponent(componentDef, host) {
-  var component = componentDef.h_;
+  var component = componentDef.i_;
 
   component.J_();
   component.Y_ = host;
@@ -308,7 +308,7 @@ function initComponent(componentDef, host) {
 
       var eventType = domEventArgs[0];
       var targetMethodName = domEventArgs[1];
-      var eventEl = component.k_[domEventArgs[2]];
+      var eventEl = component.l_[domEventArgs[2]];
       var isOnce = domEventArgs[3];
       var extraArgs = domEventArgs[4];
 
@@ -524,7 +524,7 @@ function tryHydrateComponent(rawDef, meta, host, runtimeId) {
 
 function hydrateComponentAndGetMount(componentDef, host) {
   var componentId = componentDef.id;
-  var component = componentDef.h_;
+  var component = componentDef.i_;
   var rootNode = serverComponentRootNodes[componentId];
   var renderResult;
 
@@ -552,7 +552,7 @@ function hydrateComponentAndGetMount(componentDef, host) {
 }
 
 function trackComponent(componentDef) {
-  var component = componentDef.h_;
+  var component = componentDef.i_;
   if (component) {
     componentLookup[component.id] = component;
   }

package/dist/runtime/components/renderer.js

@@ -2,7 +2,7 @@
 var componentLookup = componentsUtil.D_;
 
 var ComponentsContext = require("./ComponentsContext");
-var getComponentsContext = ComponentsContext.o_;
+var getComponentsContext = ComponentsContext.e_;
 var registry = require("./registry");
 var copyProps = require("raptor-util/copyProps");
 var isServer = componentsUtil.au_ === true;
@@ -40,8 +40,8 @@ function handleBeginAsync(event) {
   }
   // Carry along the component arguments
   asyncOut.c(
-  parentOut.g_,
-  parentOut.i_,
+  parentOut.h_,
+  parentOut.j_,
   parentOut.av_);
 
 }
@@ -80,17 +80,17 @@ renderingLogic)
     trackAsyncComponents(out);
 
     var componentsContext = getComponentsContext(out);
-    var globalComponentsContext = componentsContext.e_;
+    var globalComponentsContext = componentsContext.f_;
 
     var component = globalComponentsContext._r_;
     var isRerender = component !== undefined;
     var id;
     var isExisting;
     var customEvents;
-    var parentComponentDef = componentsContext.j_;
-    var ownerComponentDef = out.g_;
+    var parentComponentDef = componentsContext.k_;
+    var ownerComponentDef = out.h_;
     var ownerComponentId = ownerComponentDef && ownerComponentDef.id;
-    var key = out.i_;
+    var key = out.j_;
 
     if (component) {
       // If component is provided then we are currently rendering
@@ -225,7 +225,7 @@ renderingLogic)
 
 
     endComponent(out, componentDef);
-    componentsContext.j_ = parentComponentDef;
+    componentsContext.k_ = parentComponentDef;
   };
 }
 

package/dist/runtime/components/util/index-browser.js

@@ -51,13 +51,13 @@ function destroyNodeRecursive(node, component) {
     var key;
 
     if (component && (key = keysByDOMNode.get(node))) {
-      if (node === component.k_[key]) {
+      if (node === component.l_[key]) {
         if (componentsByDOMNode.get(node) && /\[\]$/.test(key)) {
-          delete component.k_[key][
+          delete component.l_[key][
           componentsByDOMNode.get(node).id];
 
         } else {
-          delete component.k_[key];
+          delete component.l_[key];
         }
       }
     }

package/dist/runtime/components/util/index.js

@@ -18,7 +18,7 @@ extraArgs)
 {
   if (handlerMethodName) {
     if (extraArgs) {
-      var component = componentDef.h_;
+      var component = componentDef.i_;
       var eventIndex = component._X_++;
 
       // If we are not going to be doing a rerender in the browser

package/dist/runtime/helpers/dynamic-tag.js

@@ -3,7 +3,7 @@
 
 var changeCase = require("./_change-case");
 var ComponentsContext = require("../components/ComponentsContext");
-var getComponentsContext = ComponentsContext.o_;
+var getComponentsContext = ComponentsContext.e_;
 var ComponentDef = require("../components/ComponentDef");
 var w10NOOP = require("warp10/constants").NOOP;
 var RENDER_BODY_TO_JSON = function () {
@@ -12,7 +12,7 @@ var RENDER_BODY_TO_JSON = function () {
 
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_RENDER_BODY = 2;
-var IS_SERVER = typeof window === "undefined";
+var IS_SERVER = typeof document === "undefined";
 
 /**
  * Helper to render a dynamic tag
@@ -34,7 +34,7 @@ customEvents)
     }
 
     var attrs = getAttrs && getAttrs();
-    var component = componentDef && componentDef.h_;
+    var component = componentDef && componentDef.i_;
     if (typeof tag === "string") {
       if (renderBody) {
         out.aJ_(
@@ -83,7 +83,7 @@ customEvents)
       if (renderer) {
         out.c(componentDef, key, customEvents);
         renderer(attrs, out);
-        out.g_ = null;
+        out.h_ = null;
       } else {
         var render = tag && tag.renderBody || tag;
         var isFn = typeof render === "function";
@@ -104,9 +104,9 @@ customEvents)
           out.bf(key, component, preserve);
           if (!isW10NOOP && isFn) {
             var componentsContext = getComponentsContext(out);
-            var parentComponentDef = componentsContext.j_;
-            var globalContext = componentsContext.e_;
-            componentsContext.j_ = new ComponentDef(
+            var parentComponentDef = componentsContext.k_;
+            var globalContext = componentsContext.f_;
+            componentsContext.k_ = new ComponentDef(
             component,
             parentComponentDef.id + "-" + parentComponentDef._M_(key),
             globalContext);
@@ -119,7 +119,7 @@ customEvents)
               render(out, attrs);
             }
 
-            componentsContext.j_ = parentComponentDef;
+            componentsContext.k_ = parentComponentDef;
           }
           out.ef();
         } else {

package/dist/runtime/helpers/render-tag.js

@@ -16,5 +16,5 @@ customEvents)
   input,
   out);
 
-  out.g_ = null;
+  out.h_ = null;
 };

package/dist/runtime/html/AsyncStream.js

@@ -91,8 +91,8 @@ function AsyncStream(global, writer, parentOut) {
 
   this.b_ = null; // ComponentsContext
 
-  this.g_ = null;
-  this.i_ = null;
+  this.h_ = null;
+  this.j_ = null;
   this.av_ = null;
   this.aN_ = false;
 }
@@ -650,8 +650,8 @@ var proto = AsyncStream.prototype = {
   },
 
   c: function (componentDef, key, customEvents) {
-    this.g_ = componentDef;
-    this.i_ = key;
+    this.h_ = componentDef;
+    this.j_ = key;
     this.av_ = customEvents;
   }
 };

package/dist/runtime/vdom/AsyncVDOMBuilder.js

@@ -39,15 +39,15 @@ function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
 
   this.data = {};
   this.K_ = state;
-  this.l_ = parentNode;
+  this.m_ = parentNode;
   this.global = globalData || {};
   this.bl_ = [parentNode];
   this.bm_ = false;
   this.bn_ = undefined;
   this.b_ = null;
 
-  this.g_ = null;
-  this.i_ = null;
+  this.h_ = null;
+  this.j_ = null;
   this.av_ = null;
 }
 
@@ -66,10 +66,10 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   bo_: function (child, childCount, pushToStack) {
-    this.l_.bp_(child);
+    this.m_.bp_(child);
     if (pushToStack === true) {
       this.bl_.push(child);
-      this.l_ = child;
+      this.m_ = child;
     }
     return childCount === 0 ? this : child;
   },
@@ -92,7 +92,7 @@ var proto = AsyncVDOMBuilder.prototype = {
     tagName,
     attrsHelper(attrs),
     key,
-    componentDef.h_,
+    componentDef.i_,
     0,
     0,
     props);
@@ -110,7 +110,7 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   node: function (node) {
-    this.l_.bp_(node);
+    this.m_.bp_(node);
     return this;
   },
 
@@ -129,7 +129,7 @@ var proto = AsyncVDOMBuilder.prototype = {
       text = text.toString();
     }
 
-    this.l_.bp_(new VText(text, ownerComponent));
+    this.m_.bp_(new VText(text, ownerComponent));
     return this;
   },
 
@@ -169,7 +169,7 @@ var proto = AsyncVDOMBuilder.prototype = {
     tagName,
     attrsHelper(attrs),
     key,
-    componentDef.h_,
+    componentDef.i_,
     0,
     0,
     props);
@@ -189,11 +189,11 @@ var proto = AsyncVDOMBuilder.prototype = {
   endElement: function () {
     var stack = this.bl_;
     stack.pop();
-    this.l_ = stack[stack.length - 1];
+    this.m_ = stack[stack.length - 1];
   },
 
   end: function () {
-    this.l_ = undefined;
+    this.m_ = undefined;
 
     var remaining = --this.bh_;
     var parentOut = this.bk_;
@@ -283,7 +283,7 @@ var proto = AsyncVDOMBuilder.prototype = {
 
     this.bh_++;
 
-    var documentFragment = this.l_.bu_();
+    var documentFragment = this.m_.bu_();
     var asyncOut = new AsyncVDOMBuilder(this.global, documentFragment, this);
 
     state.be_.emit("beginAsync", {
@@ -435,8 +435,8 @@ var proto = AsyncVDOMBuilder.prototype = {
   isVDOM: true,
 
   c: function (componentDef, key, customEvents) {
-    this.g_ = componentDef;
-    this.i_ = key;
+    this.h_ = componentDef;
+    this.j_ = key;
     this.av_ = customEvents;
   }
 };

package/dist/runtime/vdom/VComponent.js

@@ -4,8 +4,8 @@ var inherit = require("raptor-util/inherit");
 function VComponent(component, key, ownerComponent, preserve) {
   this.bx_(null /* childCount */, ownerComponent);
   this.by_ = key;
-  this.h_ = component;
-  this.n_ = preserve;
+  this.i_ = component;
+  this.o_ = preserve;
 }
 
 VComponent.prototype = {

package/dist/runtime/vdom/VElement.js

@@ -100,8 +100,8 @@ props)
   this.bF_ = tagName;
   this.bG_ = null;
   this.bH_ = constId;
+  this.o_ = false;
   this.n_ = false;
-  this.m_ = false;
 }
 
 VElement.prototype = {

package/dist/runtime/vdom/VFragment.js

@@ -8,7 +8,7 @@ var createFragmentNode = require("./morphdom/fragment").ap_;
 function VFragment(key, ownerComponent, preserve) {
   this.bx_(null /* childCount */, ownerComponent);
   this.by_ = key;
-  this.n_ = preserve;
+  this.o_ = preserve;
 }
 
 VFragment.prototype = {

package/dist/runtime/vdom/VNode.js

@@ -52,7 +52,7 @@ VNode.prototype = {
       if (child.bR_) {
         var childValue = child.bS_;
         this.bG_ = (this.bG_ || "") + childValue;
-      } else if (child.n_ || child.m_) {
+      } else if (child.o_ || child.n_) {
         this.bT_ = true;
       } else {
         throw TypeError();

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

@@ -62,8 +62,8 @@ function morphdom(fromNode, toNode, host, componentsContext) {
   var keySequences = Object.create(null);
 
   if (componentsContext) {
-    globalComponentsContext = componentsContext.e_;
-    isHydrate = globalComponentsContext.f_;
+    globalComponentsContext = componentsContext.f_;
+    isHydrate = globalComponentsContext.g_;
   }
 
   function insertVirtualNodeBefore(
@@ -83,7 +83,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
     {
       if (key) {
         keysByDOMNode.set(realNode, key);
-        (isAutoKey(key) ? parentComponent : ownerComponent).k_[
+        (isAutoKey(key) ? parentComponent : ownerComponent).l_[
         key] =
         realNode;
       }
@@ -115,7 +115,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
     if (key && ownerComponent) {
       key = normalizeComponentKey(key, parentComponent.id);
       addComponentRootToKeyedElements(
-      ownerComponent.k_,
+      ownerComponent.l_,
       key,
       rootNode,
       component.id);
@@ -175,7 +175,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
       var referenceComponent;
 
       if (curToNodeType === COMPONENT_NODE) {
-        var component = curToNodeChild.h_;
+        var component = curToNodeChild.i_;
         if (
         (matchingFromComponent = existingComponentLookup[component.id]) ===
         undefined)
@@ -191,7 +191,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
               parentComponent.id);
 
               addComponentRootToKeyedElements(
-              ownerComponent.k_,
+              ownerComponent.l_,
               curToNodeKey,
               rootNode,
               component.id);
@@ -242,7 +242,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             curFromNodeChild && nextSibling(curFromNodeChild);
           }
 
-          if (!curToNodeChild.n_) {
+          if (!curToNodeChild.o_) {
             morphComponent(component, curToNodeChild);
           }
         }
@@ -278,7 +278,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
         if (curFromNodeKey === curToNodeKey) {
           // Elements line up. Now we just have to make sure they are compatible
-          if (!curToNodeChild.n_) {
+          if (!curToNodeChild.o_) {
             // We just skip over the fromNode if it is preserved
 
             if (compareNodeNames(curToNodeChild, curVFromNodeChild)) {
@@ -304,7 +304,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             }
           }
         } else {
-          matchingFromEl = referenceComponent.k_[curToNodeKey];
+          matchingFromEl = referenceComponent.l_[curToNodeKey];
           if (
           matchingFromEl === undefined ||
           matchingFromEl === curFromNodeChild)
@@ -312,7 +312,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             if (isHydrate === true && curFromNodeChild) {
               if (
               curFromNodeChild.nodeType === ELEMENT_NODE && (
-              curToNodeChild.n_ ||
+              curToNodeChild.o_ ||
               caseInsensitiveCompare(
               curFromNodeChild.nodeName,
               curToNodeChild.bF_ || "")))
@@ -321,10 +321,10 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                 curVFromNodeChild = virtualizeElement(curFromNodeChild);
                 curVFromNodeChild.bF_ = curToNodeChild.bF_;
                 keysByDOMNode.set(curFromNodeChild, curToNodeKey);
-                referenceComponent.k_[curToNodeKey] =
+                referenceComponent.l_[curToNodeKey] =
                 curFromNodeChild;
 
-                if (curToNodeChild.n_) {
+                if (curToNodeChild.o_) {
                   vElementByDOMNode.set(curFromNodeChild, curVFromNodeChild);
                 } else {
                   morphEl(
@@ -372,11 +372,11 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
                   keysByDOMNode.set(fragment, curToNodeKey);
                   vElementByDOMNode.set(fragment, curToNodeChild);
-                  referenceComponent.k_[curToNodeKey] = fragment;
+                  referenceComponent.l_[curToNodeKey] = fragment;
                   removeChild(curFromNodeChild);
                   removeChild(endNode);
 
-                  if (!curToNodeChild.n_) {
+                  if (!curToNodeChild.o_) {
                     morphChildren(fragment, curToNodeChild, parentComponent);
                   }
 
@@ -401,7 +401,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
               detachedByDOMNode.set(matchingFromEl, undefined);
             }
 
-            if (!curToNodeChild.n_) {
+            if (!curToNodeChild.o_) {
               curVFromNodeChild = vElementByDOMNode.get(matchingFromEl);
 
               if (compareNodeNames(curVFromNodeChild, curToNodeChild)) {
@@ -662,7 +662,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
     morphAttrs(fromEl, vFromEl, toEl);
 
-    if (toEl.m_) {
+    if (toEl.n_) {
       return;
     }
 
@@ -681,7 +681,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
 
 
-  morphChildren(fromNode, toNode, toNode.h_);
+  morphChildren(fromNode, toNode, toNode.i_);
 
   detachedNodes.forEach(function (node) {
     var detachedFromComponent = detachedByDOMNode.get(node);

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "marko",
-    "version": "5.25.2",
+    "version": "5.25.3",
     "license": "MIT",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "dependencies": {
-        "@marko/compiler": "^5.27.2",
-        "@marko/translator-default": "^5.25.2",
+        "@marko/compiler": "^5.27.3",
+        "@marko/translator-default": "^5.25.3",
         "app-module-path": "^2.2.0",
         "argly": "^1.2.0",
         "browser-refresh-client": "1.1.4",

package/src/compiler/modules.js

@@ -1,5 +1,5 @@
 "use strict";
 
-if (typeof window === "undefined") {
+if (typeof document === "undefined") {
   exports.require = require;
 }

package/src/core-tags/components/preserve-tag.js

@@ -0,0 +1,81 @@
+var ComponentsContext = require("../../runtime/components/ComponentsContext");
+var getComponentsContext = ComponentsContext.___getComponentsContext;
+
+module.exports = function render(input, out) {
+  var isComponent = !input.n;
+  var shouldPreserve = !("i" in input) || input.i;
+  var componentsContext = out.___components;
+
+  if (typeof document === "object") {
+    var isHydrate =
+      componentsContext && componentsContext.___globalContext.___isHydrate;
+    var ownerComponent = out.___assignedComponentDef.___component;
+    var referenceComponent = ownerComponent;
+    var key = out.___assignedKey;
+    var checkKey = key;
+
+    if (key[0] !== "@") {
+      var parentComponent = componentsContext.___componentDef.___component;
+      if (ownerComponent !== parentComponent) {
+        referenceComponent = parentComponent;
+        checkKey += ":" + ownerComponent.id;
+      }
+    }
+
+    var isPreserved =
+      shouldPreserve &&
+      (isHydrate || referenceComponent.___keyedElements[checkKey]);
+
+    if (isComponent) {
+      out.bf(key, ownerComponent, shouldPreserve);
+
+      if (!isPreserved && input.renderBody) {
+        input.renderBody(out);
+      }
+
+      out.ef();
+    } else {
+      if (isPreserved) {
+        if (input.b) {
+          out.___parent.___preserveBody = true;
+        } else {
+          out.beginElement("", null, key, ownerComponent);
+          out.___parent.___preserve = true;
+          out.endElement();
+        }
+      } else if (input.renderBody) {
+        input.renderBody(out);
+      }
+    }
+  } else {
+    if (isComponent) {
+      out.bf(
+        out.___assignedKey,
+        out.___assignedComponentDef.___component,
+        true
+      );
+    }
+
+    if (input.renderBody) {
+      if (shouldPreserve) {
+        var parentPreserved = false;
+
+        if (componentsContext) {
+          parentPreserved = componentsContext.___isPreserved;
+        } else {
+          componentsContext = getComponentsContext(out);
+        }
+
+        componentsContext.___isPreserved = true;
+        input.renderBody(out);
+        componentsContext.___isPreserved = parentPreserved;
+      } else {
+        input.renderBody(out);
+      }
+    }
+
+    if (isComponent) {
+      out.ef();
+    }
+  }
+};

package/src/core-tags/core/await/renderer.js

@@ -81,7 +81,7 @@ const LAST_OPTIONS = { last: true, name: "await:finish" };
 
 module.exports = function awaitTag(input, out) {
   var clientReorder =
-    typeof window === "undefined" &&
+    typeof document === "undefined" &&
     input.clientReorder === true &&
     !out.isVDOM;
 

package/src/runtime/helpers/dynamic-tag.js

@@ -12,7 +12,7 @@ var RENDER_BODY_TO_JSON = function () {
 
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_RENDER_BODY = 2;
-var IS_SERVER = typeof window === "undefined";
+var IS_SERVER = typeof document === "undefined";
 
 /**
  * Helper to render a dynamic tag

package/dist/core-tags/components/preserve-tag/index-browser.js

@@ -1,45 +0,0 @@
-"use strict";module.exports = function render(input, out) {
-  var componentsContext = out.b_;
-  var isHydrate =
-  componentsContext && componentsContext.e_.f_;
-  var ownerComponent = out.g_.h_;
-  var shouldPreserve = !("i" in input) || input.i;
-  var referenceComponent = ownerComponent;
-  var key = out.i_;
-  var checkKey = key;
-
-  if (key[0] !== "@") {
-    var parentComponent = componentsContext.j_.h_;
-    if (ownerComponent !== parentComponent) {
-      referenceComponent = parentComponent;
-      checkKey += ":" + ownerComponent.id;
-    }
-  }
-
-  var isPreserved = Boolean(
-  shouldPreserve && (
-  isHydrate || referenceComponent.k_[checkKey]));
-
-
-  if (input.n) {
-    if (isPreserved) {
-      if (input.b) {
-        out.l_.m_ = true;
-      } else {
-        out.beginElement("", null, key, ownerComponent);
-        out.l_.n_ = true;
-        out.endElement();
-      }
-    } else if (input.renderBody) {
-      input.renderBody(out);
-    }
-  } else {
-    out.bf(key, ownerComponent, shouldPreserve);
-
-    if (!isPreserved && input.renderBody) {
-      input.renderBody(out);
-    }
-
-    out.ef();
-  }
-};

package/dist/core-tags/components/preserve-tag/index.js

@@ -1,27 +0,0 @@
-"use strict";var ComponentsContext = require("../../../runtime/components/ComponentsContext");
-var getComponentsContext = ComponentsContext.o_;
-
-module.exports = function render(input, out) {
-  var shouldPreserve = Boolean(!("i" in input) || input.i);
-  var isComponent = !input.n;
-
-  if (isComponent) {
-    out.bf(out.i_, out.g_.h_, true);
-  }
-
-  if (input.renderBody) {
-    if (shouldPreserve) {
-      var componentsContext = getComponentsContext(out);
-      var parentPreserved = componentsContext.p_;
-      componentsContext.p_ = true;
-      input.renderBody(out);
-      componentsContext.p_ = parentPreserved;
-    } else {
-      input.renderBody(out);
-    }
-  }
-
-  if (isComponent) {
-    out.ef();
-  }
-};

package/dist/core-tags/components/preserve-tag/package.json

@@ -1,11 +0,0 @@
-{
-  "main": "./index.js",
-  "browser": "./index-browser.js",
-  "exports": {
-    ".": {
-      "worker": "./index.js",
-      "browser": "./index-browser.js",
-      "default": "./index.js"
-    }
-  }
-}

package/src/core-tags/components/preserve-tag/index-browser.js

@@ -1,45 +0,0 @@
-module.exports = function render(input, out) {
-  var componentsContext = out.___components;
-  var isHydrate =
-    componentsContext && componentsContext.___globalContext.___isHydrate;
-  var ownerComponent = out.___assignedComponentDef.___component;
-  var shouldPreserve = !("i" in input) || input.i;
-  var referenceComponent = ownerComponent;
-  var key = out.___assignedKey;
-  var checkKey = key;
-
-  if (key[0] !== "@") {
-    var parentComponent = componentsContext.___componentDef.___component;
-    if (ownerComponent !== parentComponent) {
-      referenceComponent = parentComponent;
-      checkKey += ":" + ownerComponent.id;
-    }
-  }
-
-  var isPreserved = Boolean(
-    shouldPreserve &&
-      (isHydrate || referenceComponent.___keyedElements[checkKey])
-  );
-
-  if (input.n) {
-    if (isPreserved) {
-      if (input.b) {
-        out.___parent.___preserveBody = true;
-      } else {
-        out.beginElement("", null, key, ownerComponent);
-        out.___parent.___preserve = true;
-        out.endElement();
-      }
-    } else if (input.renderBody) {
-      input.renderBody(out);
-    }
-  } else {
-    out.bf(key, ownerComponent, shouldPreserve);
-
-    if (!isPreserved && input.renderBody) {
-      input.renderBody(out);
-    }
-
-    out.ef();
-  }
-};

package/src/core-tags/components/preserve-tag/index.js

@@ -1,27 +0,0 @@
-var ComponentsContext = require("../../../runtime/components/ComponentsContext");
-var getComponentsContext = ComponentsContext.___getComponentsContext;
-
-module.exports = function render(input, out) {
-  var shouldPreserve = Boolean(!("i" in input) || input.i);
-  var isComponent = !input.n;
-
-  if (isComponent) {
-    out.bf(out.___assignedKey, out.___assignedComponentDef.___component, true);
-  }
-
-  if (input.renderBody) {
-    if (shouldPreserve) {
-      var componentsContext = getComponentsContext(out);
-      var parentPreserved = componentsContext.___isPreserved;
-      componentsContext.___isPreserved = true;
-      input.renderBody(out);
-      componentsContext.___isPreserved = parentPreserved;
-    } else {
-      input.renderBody(out);
-    }
-  }
-
-  if (isComponent) {
-    out.ef();
-  }
-};

package/src/core-tags/components/preserve-tag/package.json

@@ -1,11 +0,0 @@
-{
-  "main": "./index.js",
-  "browser": "./index-browser.js",
-  "exports": {
-    ".": {
-      "worker": "./index.js",
-      "browser": "./index-browser.js",
-      "default": "./index.js"
-    }
-  }
-}