marko 5.21.4 → 5.21.7

package/dist/runtime/vdom/hot-reload.js

@@ -5,7 +5,7 @@ var registry = require("../components/registry");
 var updateManager = require("../components/update-manager");
 
 var createTemplate = runtime.t;
-var createComponent = registry._P_;
+var createComponent = registry._Q_;
 var registered = {};
 var queue;
 
@@ -31,36 +31,36 @@ runtime.t = function (typeName) {
         }
 
         queue.push(function () {
-          var newProto = registry.av_(typeName).prototype;
+          var newProto = registry.aw_(typeName).prototype;
           instances.forEach(function (instance) {
             if (hasLifecycleChanged(instance.__proto__, newProto)) {
-              var startNode = instance.K_.startNode;
-              var endNode = instance.K_.endNode;
+              var startNode = instance.L_.startNode;
+              var endNode = instance.L_.endNode;
               var parentNode = startNode.parentNode;
               var curNode;
 
               instance.bY_ = true;
-              instance._a_();
               instance._b_();
+              instance._c_();
 
-              if (instance.L_) {
-                instance.L_.removeAllListeners();
-                instance.L_ = null;
+              if (instance.M_) {
+                instance.M_.removeAllListeners();
+                instance.M_ = null;
               }
 
               while ((curNode = startNode.nextSibling) !== endNode) {
-                util.D_(curNode);
+                util.E_(curNode);
                 parentNode.removeChild(curNode);
               }
 
               instance.bY_ = false;
-              instance.R_ = false;
+              instance.S_ = false;
             }
 
             instance.__proto__ = newProto;
-            instance._p_(
-            instance.Q_, false).
-            afterInsert(instance.X_);
+            instance._q_(
+            instance.R_, false).
+            afterInsert(instance.Y_);
           });
         });
       }
@@ -74,7 +74,7 @@ runtime.t = function (typeName) {
   }
 };
 
-registry._P_ = function (typeName, id) {
+registry._Q_ = function (typeName, id) {
   var template = registered[typeName];
   var instance = createComponent(typeName, id);
 
@@ -108,7 +108,7 @@ function hasLifecycleChanged(oldProto, newProto) {
 }
 
 function batchUpdate() {
-  updateManager._o_(function () {
+  updateManager._p_(function () {
     var pending = queue;
     queue = undefined;
 

package/dist/runtime/vdom/index.js

@@ -15,7 +15,7 @@ function Template(typeName) {
 }
 
 var AsyncVDOMBuilder = require("./AsyncVDOMBuilder");
-require("../createOut").aF_(
+require("../createOut").aG_(
 Template.prototype.createOut = function createOut(
 globalData,
 parent,

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

@@ -1,5 +1,5 @@
 "use strict";var helpers = require("./helpers");
-var insertBefore = helpers.aG_;
+var insertBefore = helpers.aH_;
 
 var fragmentPrototype = {
   nodeType: 12,
@@ -91,5 +91,5 @@ function beginFragmentNode(startNode, parentNode) {
   return fragment;
 }
 
-exports.ao_ = createFragmentNode;
+exports.ap_ = createFragmentNode;
 exports.c__ = beginFragmentNode;

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

@@ -35,8 +35,8 @@ function removeChild(node) {
   node.parentNode.removeChild(node);
 }
 
-exports.aG_ = insertBefore;
-exports.aH_ = insertAfter;
+exports.aH_ = insertBefore;
+exports.aI_ = insertAfter;
 exports.bT_ = nextSibling;
-exports._r_ = firstChild;
-exports.aI_ = removeChild;
+exports._s_ = firstChild;
+exports.aJ_ = removeChild;

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

@@ -2,11 +2,11 @@
 var specialElHandlers = require("./specialElHandlers");
 var KeySequence = require("../../components/KeySequence");
 var componentsUtil = require("../../components/util");
-var existingComponentLookup = componentsUtil.C_;
-var destroyNodeRecursive = componentsUtil.D_;
+var existingComponentLookup = componentsUtil.D_;
+var destroyNodeRecursive = componentsUtil.E_;
 var addComponentRootToKeyedElements =
-componentsUtil.ap_;
-var normalizeComponentKey = componentsUtil.aE_;
+componentsUtil.aq_;
+var normalizeComponentKey = componentsUtil.aF_;
 var VElement = require("../vdom").bb_;
 var virtualizeElement = VElement.bO_;
 var morphAttrs = VElement.bP_;
@@ -14,17 +14,17 @@ var eventDelegation = require("../../components/event-delegation");
 var fragment = require("./fragment");
 var helpers = require("./helpers");
 var domData = require("../../components/dom-data");
-var keysByDOMNode = domData.ag_;
-var componentByDOMNode = domData.E_;
-var vElementByDOMNode = domData.ae_;
-var detachedByDOMNode = domData.af_;
+var keysByDOMNode = domData.ah_;
+var componentByDOMNode = domData.F_;
+var vElementByDOMNode = domData.af_;
+var detachedByDOMNode = domData.ag_;
 
-var insertBefore = helpers.aG_;
-var insertAfter = helpers.aH_;
+var insertBefore = helpers.aH_;
+var insertAfter = helpers.aI_;
 var nextSibling = helpers.bT_;
-var firstChild = helpers._r_;
-var removeChild = helpers.aI_;
-var createFragmentNode = fragment.ao_;
+var firstChild = helpers._s_;
+var removeChild = helpers.aJ_;
+var createFragmentNode = fragment.ap_;
 var beginFragmentNode = fragment.c__;
 
 var ELEMENT_NODE = 1;
@@ -52,7 +52,7 @@ function caseInsensitiveCompare(a, b) {
 
 function onNodeAdded(node, componentsContext) {
   if (node.nodeType === ELEMENT_NODE) {
-    eventDelegation.ab_(node, componentsContext);
+    eventDelegation.ac_(node, componentsContext);
   }
 }
 
@@ -105,7 +105,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
   ownerComponent,
   parentComponent)
   {
-    var rootNode = component.K_ = insertBefore(
+    var rootNode = component.L_ = insertBefore(
     createFragmentNode(),
     referenceNode,
     referenceNodeParentEl);
@@ -127,7 +127,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
   }
 
   function morphComponent(component, vComponent) {
-    morphChildren(component.K_, vComponent, component);
+    morphChildren(component.L_, vComponent, component);
   }
 
   var detachedNodes = [];
@@ -148,7 +148,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
   function morphChildren(fromNode, toNode, parentComponent) {
     var curFromNodeChild = firstChild(fromNode);
-    var curToNodeChild = toNode._r_;
+    var curToNodeChild = toNode._s_;
 
     var curToNodeKey;
     var curFromNodeKey;
@@ -171,7 +171,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         curFromNodeChild = nextSibling(curFromNodeChild);
       }
 
-      var ownerComponent = curToNodeChild.aB_ || parentComponent;
+      var ownerComponent = curToNodeChild.aC_ || parentComponent;
       var referenceComponent;
 
       if (curToNodeType === COMPONENT_NODE) {
@@ -182,7 +182,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         {
           if (isHydrate === true) {
             var rootNode = beginFragmentNode(curFromNodeChild, fromNode);
-            component.K_ = rootNode;
+            component.L_ = rootNode;
             componentByDOMNode.set(rootNode, component);
 
             if (ownerComponent && curToNodeKey) {
@@ -215,17 +215,17 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
           }
         } else {
-          if (matchingFromComponent.K_ !== curFromNodeChild) {
+          if (matchingFromComponent.L_ !== curFromNodeChild) {
             if (
             curFromNodeChild && (
             fromComponent = componentByDOMNode.get(curFromNodeChild)) &&
-            globalComponentsContext._U_[
+            globalComponentsContext._V_[
             fromComponent.id] ===
             undefined)
             {
               // The component associated with the current real DOM node was not rendered
               // so we should just remove it out of the real DOM by destroying it
-              curFromNodeChild = nextSibling(fromComponent.K_);
+              curFromNodeChild = nextSibling(fromComponent.L_);
               destroyComponent(fromComponent);
               continue;
             }
@@ -233,7 +233,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             // We need to move the existing component into
             // the correct location
             insertBefore(
-            matchingFromComponent.K_,
+            matchingFromComponent.L_,
             curFromNodeChild,
             fromNode);
 
@@ -267,7 +267,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         // up elements
         curToNodeKey = (
         keySequences[referenceComponent.id] || (
-        keySequences[referenceComponent.id] = new KeySequence()))._L_(
+        keySequences[referenceComponent.id] = new KeySequence()))._M_(
         curToNodeKey);
 
         if (curFromNodeChild) {
@@ -502,7 +502,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           curFromNodeChild = fromNextSibling;
 
           if (
-          !globalComponentsContext._U_[fromComponent.id])
+          !globalComponentsContext._V_[fromComponent.id])
           {
             destroyComponent(fromComponent);
           }
@@ -626,7 +626,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         if (fromComponent = componentByDOMNode.get(curFromNodeChild)) {
           curFromNodeChild = fromNextSibling;
           if (
-          !globalComponentsContext._U_[fromComponent.id])
+          !globalComponentsContext._V_[fromComponent.id])
           {
             destroyComponent(fromComponent);
           }
@@ -642,7 +642,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           referenceComponent = parentComponent;
         } else {
           referenceComponent =
-          curVFromNodeChild && curVFromNodeChild.aB_;
+          curVFromNodeChild && curVFromNodeChild.aC_;
         }
 
         detachNode(curFromNodeChild, fromNode, referenceComponent);
@@ -698,7 +698,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         detachedFromComponent !== true && detachedFromComponent);
 
 
-        if (eventDelegation.___(node) != false) {
+        if (eventDelegation._a_(node) != false) {
           removeChild(node);
         }
       }

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

@@ -10,7 +10,7 @@
 }
 
 function forEachOption(el, fn, i) {
-  var curChild = el._r_;
+  var curChild = el._s_;
 
   while (curChild) {
     if (curChild.bI_ === "option") {

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "marko",
-    "version": "5.21.4",
+    "version": "5.21.7",
     "license": "MIT",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "dependencies": {
-        "@marko/compiler": "^5.21.7",
+        "@marko/compiler": "^5.22.4",
         "@marko/translator-default": "^5.21.3",
         "app-module-path": "^2.2.0",
         "argly": "^1.2.0",

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

@@ -1,5 +1,8 @@
 "use strict";
 
+var escapeDoubleQuotes =
+  require("../../../runtime/html/helpers/escape-quotes").___escapeDoubleQuotes;
+
 module.exports = function (input, out) {
   // We cannot call beginSync() when using renderSync(). In this case we will
   // ignore the await-reorderer tag.
@@ -54,13 +57,30 @@ module.exports = function (input, out) {
             global._afRuntime = true;
           }
 
-          asyncOut.write(
-            '<div id="af' +
-              awaitInfo.id +
-              '" style="display:none">' +
-              result.toString() +
-              "</div>"
-          );
+          if (global.cspNonce) {
+            asyncOut.write(
+              '<style nonce="' +
+                escapeDoubleQuotes(global.cspNonce) +
+                '">' +
+                "#af" +
+                awaitInfo.id +
+                "{display:none;}" +
+                "</style>" +
+                '<div id="af' +
+                awaitInfo.id +
+                '">' +
+                result.toString() +
+                "</div>"
+            );
+          } else {
+            asyncOut.write(
+              '<div id="af' +
+                awaitInfo.id +
+                '" style="display:none">' +
+                result.toString() +
+                "</div>"
+            );
+          }
 
           asyncOut.script(
             "$af(" +