marko 4.26.1 → 4.26.3

package/dist/core-tags/migrate/all-tags/index.js

@@ -1,4 +1,4 @@
-const commonMigrators = [require("./control-flow-directives"), require("./body-only-if"), require("./partial-dynamic-tag"), require("./dynamic-attributes"), require("./include-directive"), require("./legacy-nested-tag"), require("./legacy-nested-tag"), require("./marko-init"), require("./modifier-key"), require("./params"), require("./ref"), require("./w-bind"), require("./w-body"), require("./w-config"), require("./w-for"), require("./w-id"), require("./w-on"), require("./w-preserve"), require("./w-preserve-attrs"), require("./widget-in-attrs")];
+const commonMigrators = [require("./control-flow-directives"), require("./body-only-if"), require("./dynamic-attributes"), require("./include-directive"), require("./legacy-nested-tag"), require("./legacy-nested-tag"), require("./marko-init"), require("./modifier-key"), require("./params"), require("./ref"), require("./w-bind"), require("./w-body"), require("./w-config"), require("./w-for"), require("./w-id"), require("./w-on"), require("./w-preserve"), require("./w-preserve-attrs"), require("./widget-in-attrs")];
 
 module.exports = function (el, context) {
   if (el.detachNode) {

package/dist/node_modules/@internal/components-registry/index-browser.js

@@ -7,6 +7,7 @@ var createFragmentNode = require("../../../runtime/vdom/morphdom/fragment")._m_;
 var ComponentDef = require("../../../runtime/components/ComponentDef");
 var domData = require("../../../runtime/components/dom-data");
 var componentsUtil = require("@internal/components-util");
+var loader = require("@internal/loader");
 var componentLookup = componentsUtil._n_;
 var addComponentRootToKeyedElements = componentsUtil._o_;
 var keyedElementsByComponentId = domData._p_;
@@ -391,7 +392,11 @@ function initServerRendered(renderedComponents, host) {
   (renderedComponents.w || []).map(function (componentDef) {
     var typeName = meta._C_[componentDef[1]];
 
-    return registered[typeName] || document.readyState === "complete" ? tryHydrateComponent(componentDef, meta, host, runtimeId) : addPendingDef(componentDef, typeName, meta, host, runtimeId);
+    return registered[typeName] || document.readyState === "complete" ||
+    // loader.runtime is only going to exist for lasso apps
+    // this code is used to detect if a module was registered
+    // via a browser.json but not executed.
+    loader.runtime && loader.runtime.resolve && loader.runtime.resolve(typeName) ? tryHydrateComponent(componentDef, meta, host, runtimeId) : addPendingDef(componentDef, typeName, meta, host, runtimeId);
   }).reverse().forEach(tryInvoke);
 
   return this;

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

@@ -44,7 +44,7 @@ module.exports = function dynamicTag(out, tag, getAttrs, renderBody, args, props
         }
       }
 
-      var renderer = tag._ || tag.render || tag.renderer && tag.renderer.renderer || tag.renderer;
+      var renderer = tag._ || (tag.renderer ? tag.renderer.renderer || tag.renderer : tag.render);
 
       // eslint-disable-next-line no-constant-condition
 

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

@@ -5,14 +5,16 @@
  */
 
 module.exports = function loadTagHelper(handler) {
-  var renderer = handler.renderer || handler._ || typeof handler === "function" && handler || function deferredRenderer(input, out) {
-    // Allows for circular dependencies by lazily defining renderer
-    // on the first render.
-    (renderer = handler.renderer || handler._ || handler.render)(input, out);
-  };
+  var renderer = getRenderer(handler) || (typeof handler === "function" ? handler : function deferredRenderer(input, out) {
+    (renderer = getRenderer(handler) || handler.render)(input, out);
+  });
 
   return function wrappedRenderer(input, out, componentDef, key, customEvents) {
     out.c(componentDef, key, customEvents);
     renderer(input, out);
   };
-};
+};
+
+function getRenderer(handler) {
+  return handler._ || handler.renderer;
+}

package/dist/runtime/renderable.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var defaultCreateOut = require("./createOut");
 var setImmediate = require("@internal/set-immediate").af_;
 var extend = require("raptor-util/extend");
@@ -26,6 +28,7 @@ module.exports = function (target, renderer) {
   var createOut = target.createOut || renderer.createOut || defaultCreateOut;
 
   return extend(target, {
+    _: renderFunc,
     createOut: createOut,
 
     renderToString: function (data, callback) {

package/package.json

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

package/src/core-tags/migrate/all-tags/index.js

@@ -1,7 +1,6 @@
 const commonMigrators = [
   require("./control-flow-directives"),
   require("./body-only-if"),
-  require("./partial-dynamic-tag"),
   require("./dynamic-attributes"),
   require("./include-directive"),
   require("./legacy-nested-tag"),

package/src/node_modules/@internal/components-registry/index-browser.js

@@ -8,6 +8,7 @@ var createFragmentNode =
 var ComponentDef = require("../../../runtime/components/ComponentDef");
 var domData = require("../../../runtime/components/dom-data");
 var componentsUtil = require("@internal/components-util");
+var loader = require("@internal/loader");
 var componentLookup = componentsUtil.___componentLookup;
 var addComponentRootToKeyedElements =
   componentsUtil.___addComponentRootToKeyedElements;
@@ -498,7 +499,18 @@ function initServerRendered(renderedComponents, host) {
     .map(function (componentDef) {
       var typeName = meta.___types[componentDef[1]];
 
-      return registered[typeName] || document.readyState === "complete"
+      return (
+        registered[typeName] ||
+        document.readyState === "complete" ||
+        (
+          // loader.runtime is only going to exist for lasso apps
+          // this code is used to detect if a module was registered
+          // via a browser.json but not executed.
+          loader.runtime &&
+          loader.runtime.resolve &&
+          loader.runtime.resolve(typeName)
+        )
+      )
         ? tryHydrateComponent(componentDef, meta, host, runtimeId)
         : addPendingDef(componentDef, typeName, meta, host, runtimeId);
     })

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

@@ -68,13 +68,11 @@ module.exports = function dynamicTag(
 
       var renderer =
         tag._ ||
-        tag.render ||
-        (tag.renderer && tag.renderer.renderer) ||
-        tag.renderer;
+        (tag.renderer ? tag.renderer.renderer || tag.renderer : tag.render);
 
       // eslint-disable-next-line no-constant-condition
       if ("MARKO_DEBUG") {
-        if (tag.renderer && tag.renderer.renderer === renderer) {
+        if (tag.renderer && tag.renderer.renderer) {
           complain(
             "An object with a 'renderer' was passed to the dynamic tag, but renderer was another template."
           );

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

@@ -5,17 +5,19 @@
  */
 module.exports = function loadTagHelper(handler) {
   var renderer =
-    handler.renderer ||
-    handler._ ||
-    (typeof handler === "function" && handler) ||
-    function deferredRenderer(input, out) {
-      // Allows for circular dependencies by lazily defining renderer
-      // on the first render.
-      (renderer = handler.renderer || handler._ || handler.render)(input, out);
-    };
+    getRenderer(handler) ||
+    (typeof handler === "function"
+      ? handler
+      : function deferredRenderer(input, out) {
+          (renderer = getRenderer(handler) || handler.render)(input, out);
+        });
 
   return function wrappedRenderer(input, out, componentDef, key, customEvents) {
     out.c(componentDef, key, customEvents);
     renderer(input, out);
   };
 };
+
+function getRenderer(handler) {
+  return handler._ || handler.renderer;
+}

package/src/runtime/renderable.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var defaultCreateOut = require("./createOut");
 var setImmediate = require("@internal/set-immediate").___setImmediate;
 var extend = require("raptor-util/extend");
@@ -27,6 +29,7 @@ module.exports = function (target, renderer) {
   var createOut = target.createOut || renderer.createOut || defaultCreateOut;
 
   return extend(target, {
+    _: renderFunc,
     createOut: createOut,
 
     renderToString: function (data, callback) {

package/dist/core-tags/migrate/all-tags/partial-dynamic-tag.js

@@ -1,9 +0,0 @@
-module.exports = function migrator(elNode, context) {
-  if (!elNode.rawTagNameExpression || elNode.tagName[0] === "$") {
-    return;
-  }
-
-  context.deprecate('The "<partial-${dynamic}>" tag is syntax deprecated. Please use the regular dynamic tag syntax instead with a template literal "<${`partial-${dynamic}`}/>". See: https://github.com/marko-js/marko/wiki/Deprecation:-partial-dynamic-tag');
-
-  elNode.rawTagNameExpression = `\`${elNode.tagName}\``;
-};

package/src/core-tags/migrate/all-tags/partial-dynamic-tag.js

@@ -1,11 +0,0 @@
-module.exports = function migrator(elNode, context) {
-  if (!elNode.rawTagNameExpression || elNode.tagName[0] === "$") {
-    return;
-  }
-
-  context.deprecate(
-    'The "<partial-${dynamic}>" tag is syntax deprecated. Please use the regular dynamic tag syntax instead with a template literal "<${`partial-${dynamic}`}/>". See: https://github.com/marko-js/marko/wiki/Deprecation:-partial-dynamic-tag'
-  );
-
-  elNode.rawTagNameExpression = `\`${elNode.tagName}\``;
-};