marko 5.30.2 → 5.31.1

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

@@ -106,20 +106,20 @@ function morphdom(fromNode, toNode, host, componentsContext) {
   parentComponent)
   {
     var rootNode = component._G_ = insertBefore(
-    createFragmentNode(),
-    referenceNode,
-    referenceNodeParentEl);
-
+      createFragmentNode(),
+      referenceNode,
+      referenceNodeParentEl
+    );
     componentByDOMNode.set(rootNode, component);
 
     if (key && ownerComponent) {
       key = normalizeComponentKey(key, parentComponent.id);
       addComponentRootToKeyedElements(
-      ownerComponent.l_,
-      key,
-      rootNode,
-      component.id);
-
+        ownerComponent.l_,
+        key,
+        rootNode,
+        component.id
+      );
       keysByDOMNode.set(rootNode, key);
     }
 
@@ -187,15 +187,15 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
             if (ownerComponent && curToNodeKey) {
               curToNodeKey = normalizeComponentKey(
-              curToNodeKey,
-              parentComponent.id);
-
+                curToNodeKey,
+                parentComponent.id
+              );
               addComponentRootToKeyedElements(
-              ownerComponent.l_,
-              curToNodeKey,
-              rootNode,
-              component.id);
-
+                ownerComponent.l_,
+                curToNodeKey,
+                rootNode,
+                component.id
+              );
 
               keysByDOMNode.set(rootNode, curToNodeKey);
             }
@@ -205,14 +205,14 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             curFromNodeChild = nextSibling(rootNode);
           } else {
             insertVirtualComponentBefore(
-            curToNodeChild,
-            curFromNodeChild,
-            fromNode,
-            component,
-            curToNodeKey,
-            ownerComponent,
-            parentComponent);
-
+              curToNodeChild,
+              curFromNodeChild,
+              fromNode,
+              component,
+              curToNodeKey,
+              ownerComponent,
+              parentComponent
+            );
           }
         } else {
           if (matchingFromComponent._G_ !== curFromNodeChild) {
@@ -233,10 +233,10 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             // We need to move the existing component into
             // the correct location
             insertBefore(
-            matchingFromComponent._G_,
-            curFromNodeChild,
-            fromNode);
-
+              matchingFromComponent._G_,
+              curFromNodeChild,
+              fromNode
+            );
           } else {
             curFromNodeChild =
             curFromNodeChild && nextSibling(curFromNodeChild);
@@ -268,7 +268,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         curToNodeKey = (
         keySequences[referenceComponent.id] || (
         keySequences[referenceComponent.id] = new KeySequence())).aK_(
-        curToNodeKey);
+          curToNodeKey);
 
         if (curFromNodeChild) {
           curFromNodeKey = keysByDOMNode.get(curFromNodeChild);
@@ -283,24 +283,24 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
             if (compareNodeNames(curToNodeChild, curVFromNodeChild)) {
               morphEl(
-              curFromNodeChild,
-              curVFromNodeChild,
-              curToNodeChild,
-              parentComponent);
-
+                curFromNodeChild,
+                curVFromNodeChild,
+                curToNodeChild,
+                parentComponent
+              );
             } else {
               // Remove the old node
               detachNode(curFromNodeChild, fromNode, ownerComponent);
 
               // Incompatible nodes. Just move the target VNode into the DOM at this position
               insertVirtualNodeBefore(
-              curToNodeChild,
-              curToNodeKey,
-              curFromNodeChild,
-              fromNode,
-              ownerComponent,
-              parentComponent);
-
+                curToNodeChild,
+                curToNodeKey,
+                curFromNodeChild,
+                fromNode,
+                ownerComponent,
+                parentComponent
+              );
             }
           }
         } else {
@@ -314,9 +314,9 @@ function morphdom(fromNode, toNode, host, componentsContext) {
               curFromNodeChild.nodeType === ELEMENT_NODE && (
               curToNodeChild.o_ ||
               caseInsensitiveCompare(
-              curFromNodeChild.nodeName,
-              curToNodeChild.bZ_ || "")))
-
+                curFromNodeChild.nodeName,
+                curToNodeChild.bZ_ || ""
+              )))
               {
                 curVFromNodeChild = virtualizeElement(curFromNodeChild);
                 curVFromNodeChild.bZ_ = curToNodeChild.bZ_;
@@ -328,11 +328,11 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                   vElementByDOMNode.set(curFromNodeChild, curVFromNodeChild);
                 } else {
                   morphEl(
-                  curFromNodeChild,
-                  curVFromNodeChild,
-                  curToNodeChild,
-                  parentComponent);
-
+                    curFromNodeChild,
+                    curVFromNodeChild,
+                    curToNodeChild,
+                    parentComponent
+                  );
                 }
 
                 curToNodeChild = toNextSibling;
@@ -366,10 +366,10 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                   }
 
                   var fragment = createFragmentNode(
-                  curFromNodeChild,
-                  endNode.nextSibling,
-                  fromNode);
-
+                    curFromNodeChild,
+                    endNode.nextSibling,
+                    fromNode
+                  );
                   keysByDOMNode.set(fragment, curToNodeKey);
                   vElementByDOMNode.set(fragment, curToNodeChild);
                   referenceComponent.l_[curToNodeKey] = fragment;
@@ -388,13 +388,13 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             }
 
             insertVirtualNodeBefore(
-            curToNodeChild,
-            curToNodeKey,
-            curFromNodeChild,
-            fromNode,
-            ownerComponent,
-            parentComponent);
-
+              curToNodeChild,
+              curToNodeKey,
+              curFromNodeChild,
+              fromNode,
+              ownerComponent,
+              parentComponent
+            );
             fromNextSibling = curFromNodeChild;
           } else {
             if (detachedByDOMNode.get(matchingFromEl) !== undefined) {
@@ -456,20 +456,20 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                 }
 
                 morphEl(
-                matchingFromEl,
-                curVFromNodeChild,
-                curToNodeChild,
-                parentComponent);
-
+                  matchingFromEl,
+                  curVFromNodeChild,
+                  curToNodeChild,
+                  parentComponent
+                );
               } else {
                 insertVirtualNodeBefore(
-                curToNodeChild,
-                curToNodeKey,
-                curFromNodeChild,
-                fromNode,
-                ownerComponent,
-                parentComponent);
-
+                  curToNodeChild,
+                  curToNodeKey,
+                  curFromNodeChild,
+                  fromNode,
+                  ownerComponent,
+                  parentComponent
+                );
                 detachNode(matchingFromEl, fromNode, ownerComponent);
               }
             } else {
@@ -524,9 +524,9 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
                 if (
                 caseInsensitiveCompare(
-                curVFromNodeChild.bZ_,
-                curToNodeChild.bZ_))
-
+                  curVFromNodeChild.bZ_,
+                  curToNodeChild.bZ_
+                ))
                 {
                   curVFromNodeChild.bZ_ = curToNodeChild.bZ_;
                 }
@@ -550,11 +550,11 @@ function morphdom(fromNode, toNode, host, componentsContext) {
               // the current "from" node to match the current
               // target DOM node.
               morphEl(
-              curFromNodeChild,
-              curVFromNodeChild,
-              curToNodeChild,
-              parentComponent);
-
+                curFromNodeChild,
+                curVFromNodeChild,
+                curToNodeChild,
+                parentComponent
+              );
             }
           } else if (
           curFromNodeType === TEXT_NODE ||
@@ -572,8 +572,8 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             toNextSibling.bT_ === TEXT_NODE)
             {
               fromNextSibling = curFromNodeChild.splitText(
-              curToNodeChild.cl_.length);
-
+                curToNodeChild.cl_.length
+              );
             }
             if (curFromNodeChild.nodeValue !== curToNodeChild.cl_) {
               curFromNodeChild.nodeValue = curToNodeChild.cl_;
@@ -597,13 +597,13 @@ function morphdom(fromNode, toNode, host, componentsContext) {
       // nodes. Therefore, we will just append the current "to" node
       // to the end
       insertVirtualNodeBefore(
-      curToNodeChild,
-      curToNodeKey,
-      curFromNodeChild,
-      fromNode,
-      ownerComponent,
-      parentComponent);
-
+        curToNodeChild,
+        curToNodeKey,
+        curFromNodeChild,
+        fromNode,
+        ownerComponent,
+        parentComponent
+      );
 
       curToNodeChild = toNextSibling;
       curFromNodeChild = fromNextSibling;
@@ -694,9 +694,9 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         componentToDestroy.destroy();
       } else if (node.parentNode) {
         destroyNodeRecursive(
-        node,
-        detachedFromComponent !== true && detachedFromComponent);
-
+          node,
+          detachedFromComponent !== true && detachedFromComponent
+        );
 
         if (eventDelegation.al_(node) != false) {
           removeChild(node);

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

@@ -87,14 +87,14 @@ SpecialElHandlers.prototype = {
     if (!toEl.cc_("multiple")) {
       var selected = 0;
       forEachOption(
-      toEl,
-      function (option, i) {
-        if (option.cc_("selected")) {
-          selected = i;
-        }
-      },
-      -1);
-
+        toEl,
+        function (option, i) {
+          if (option.cc_("selected")) {
+            selected = i;
+          }
+        },
+        -1
+      );
 
       if (fromEl.selectedIndex !== selected) {
         fromEl.selectedIndex = selected;

package/dist/runtime/vdom/vdom.js

@@ -25,8 +25,8 @@ function virtualize(node, ownerComponent) {
     case 11:
       var vdomDocFragment = new VDocumentFragment();
       virtualizeChildNodes(node, vdomDocFragment, ownerComponent);
-      return vdomDocFragment;}
-
+      return vdomDocFragment;
+  }
 }
 
 function virtualizeHTML(html, ownerComponent) {

package/dist/taglib/index.js

@@ -13,9 +13,9 @@ function register(taglibProps, taglibPath) {
 
 function registerFromFile(taglibPath) {
   return register(
-  compiler.taglib._loader.loadTaglibFromFile(taglibPath),
-  taglibPath);
-
+    compiler.taglib._loader.loadTaglibFromFile(taglibPath),
+    taglibPath
+  );
 }
 
 exports.clearCache = clearCache;

package/docs/compiler.md

@@ -296,6 +296,12 @@ import "./baz.wasm";
 
 For `hydrate` output, with the default `hydrateIncludeImports`, would only cause `./foo.css` to be loaded in the browser.
 
+#### `hydrateInit`
+
+This option is only used for `output: "hydrate"`. It defaults to `true` and causes the hydrate output to include code which tells the Marko runtime to begin hydrating any registered components.
+
+Setting to false will disable that `init` call and allow you to generate code which _just_ imports any hydrate dependencies for a template.
+
 #### `cache`
 
 Type: typeof [`Map`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map) (specifically, `.get()` is required)<br>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marko",
-    "version": "5.30.2",
+    "version": "5.31.1",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "keywords": [
         "front-end",
@@ -64,8 +64,8 @@
         "build": "babel ./src --out-dir ./dist --delete-dir-on-start --copy-files --config-file ../../babel.config.js --env-name=production"
     },
     "dependencies": {
-        "@marko/compiler": "^5.32.0",
-        "@marko/translator-default": "^5.30.1",
+        "@marko/compiler": "^5.33.0",
+        "@marko/translator-default": "^5.31.0",
         "app-module-path": "^2.2.0",
         "argly": "^1.2.0",
         "browser-refresh-client": "1.1.4",

package/src/node_modules/@internal/components-define-widget-legacy/index-browser.js

@@ -4,7 +4,7 @@
 var BaseState;
 var BaseComponent;
 var inherit;
-var loader = require("@internal/loader");
+var req = require("@internal/require");
 var registry = require("@internal/components-registry");
 var jQuery = require("../../../runtime/components/legacy/jquery");
 var ready = require("../../../runtime/components/legacy/ready");
@@ -14,9 +14,9 @@ var stateToJSONDef = {
   enumerable: false,
   value: function returnSelf() {
     return this;
-  }
+  },
 };
-function noop() { }
+function noop() {}
 
 module.exports = function defineWidget(def, renderer) {
   def = def.Widget || def;
@@ -25,7 +25,7 @@ module.exports = function defineWidget(def, renderer) {
     return def;
   }
 
-  var ComponentClass = function () { };
+  var ComponentClass = function () {};
   var proto;
   var legacyInit;
 
@@ -94,7 +94,7 @@ module.exports = function defineWidget(def, renderer) {
       }
 
       this.setState(newState);
-    }
+    },
   });
 
   Object.defineProperty(proto, "__document", {
@@ -104,7 +104,7 @@ module.exports = function defineWidget(def, renderer) {
         complain("__document is deprecated");
       }
       return this.___host;
-    }
+    },
   });
 
   Object.defineProperty(proto, "el", {
@@ -122,7 +122,7 @@ module.exports = function defineWidget(def, renderer) {
       }
 
       return this.___currentLegacyBindEl;
-    }
+    },
   });
 
   // get legacy methods
@@ -132,7 +132,7 @@ module.exports = function defineWidget(def, renderer) {
     get: noop,
     set: function (v) {
       proto.___legacyOnRender = v;
-    }
+    },
   });
 
   proto.___legacyOnUpdate = proto.onUpdate;
@@ -142,7 +142,7 @@ module.exports = function defineWidget(def, renderer) {
     },
     set: function (v) {
       proto.___legacyOnUpdate = v;
-    }
+    },
   });
 
   proto.___legacyOnDestroy = proto.onDestroy;
@@ -152,7 +152,7 @@ module.exports = function defineWidget(def, renderer) {
     },
     set: function (v) {
       proto.___legacyOnDestroy = v;
-    }
+    },
   });
 
   proto.getWidget = proto.getComponent;
@@ -172,7 +172,7 @@ module.exports = function defineWidget(def, renderer) {
         complain(
           "widget was updated after it was destroyed, if this widget is migrated to a modern component this will become a noop.",
           {
-            location: this.___type
+            location: this.___type,
           }
         );
       }
@@ -216,7 +216,7 @@ module.exports = function defineWidget(def, renderer) {
             get: function () {
               complain("__widget is deprecated");
               return self;
-            }
+            },
           });
         } else {
           el.__widget = this;
@@ -308,7 +308,7 @@ module.exports = function defineWidget(def, renderer) {
       get: function () {
         complain("_isWidget is deprecated");
         return true;
-      }
+      },
     });
   } else {
     Component._isWidget = true;
@@ -317,10 +317,12 @@ module.exports = function defineWidget(def, renderer) {
   var template = def.template;
   if (template) {
     if (typeof template === "string") {
-      template = loader(template);
+      template = req(template);
     }
 
-    registry.r(template.___typeName, function () { return Component });
+    registry.r(template.___typeName, function () {
+      return Component;
+    });
   }
 
   return Component;

package/src/node_modules/@internal/components-define-widget-legacy/index.js

@@ -10,7 +10,7 @@ module.exports = function defineWidget(def, renderer) {
       renderer: renderer,
       render: renderer.render,
       renderSync: renderer.renderSync,
-      template: renderer.template
+      template: renderer.template,
     };
   } else {
     return { ___isComponent: true, _isWidget: true };

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

@@ -1,6 +1,7 @@
 var registry = require("@internal/components-registry");
 
-exports.getComponentForEl = require("@internal/components-util").___getComponentForEl;
+exports.getComponentForEl =
+  require("@internal/components-util").___getComponentForEl;
 exports.init = registry.___initServerRendered;
 exports.register = function (id, component) {
   registry.r(id, function () {

package/src/node_modules/@internal/components-entry/index.js

@@ -152,7 +152,7 @@ function addComponentsFromContext(componentsContext, componentsToHydrate) {
       s: needsState && state,
       u: undefinedPropNames,
       w: serializedProps,
-      r: renderBody
+      r: renderBody,
     };
 
     var parts = [id, typeName];
@@ -233,7 +233,7 @@ function getInitComponentsData(out, componentDefs) {
     l: isLast && 1,
     g: serializedGlobals,
     w: componentDefs,
-    t: newTypes
+    t: newTypes,
   };
 }
 

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

@@ -1,5 +1,5 @@
 var Component = require("../../../runtime/components/Component");
-var loader = require("@internal/loader");
+var req = require("@internal/require");
 var getComponentForEl =
   require("@internal/components-util").___getComponentForEl;
 
@@ -8,14 +8,15 @@ var complain = "MARKO_DEBUG" && require("complain");
 // expose legacy
 require("@internal/components-registry").___legacy = exports;
 exports.load = function (typeName) {
-  return exports.defineWidget(loader(typeName));
+  return exports.defineWidget(req(typeName));
 };
 
 // legacy api
 exports.defineComponent = require("../../../runtime/components/legacy/defineComponent-legacy");
 exports.defineWidget = require("@internal/components-define-widget-legacy");
 exports.defineRenderer = require("../../../runtime/components/legacy/defineRenderer-legacy");
-exports.makeRenderable = exports.renderable = require("../../../runtime/renderable");
+exports.makeRenderable =
+  exports.renderable = require("../../../runtime/renderable");
 
 // browser only
 var Widget = (exports.Widget = Component);

package/src/node_modules/@internal/components-entry-legacy/index.js

@@ -4,7 +4,8 @@ var modernMarko = require("@internal/components-entry");
 exports.defineComponent = require("../../../runtime/components/legacy/defineComponent-legacy");
 exports.defineWidget = require("@internal/components-define-widget-legacy");
 exports.defineRenderer = require("../../../runtime/components/legacy/defineRenderer-legacy");
-exports.makeRenderable = exports.renderable = require("../../../runtime/renderable");
+exports.makeRenderable =
+  exports.renderable = require("../../../runtime/renderable");
 
 // server only
 exports.writeInitWidgetsCode = modernMarko.writeInitComponentsCode;

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

@@ -8,7 +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 req = require("@internal/require");
 var componentLookup = componentsUtil.___componentLookup;
 var addComponentRootToKeyedElements =
   componentsUtil.___addComponentRootToKeyedElements;
@@ -69,7 +69,7 @@ function addPendingDef(def, type, meta, host, runtimeId) {
     def,
     meta,
     host,
-    runtimeId
+    runtimeId,
   ]);
 }
 
@@ -83,7 +83,7 @@ function load(typeName, isLegacy) {
     } else if (isLegacy) {
       target = exports.___legacy.load(typeName);
     } else {
-      target = loader(typeName);
+      target = req(typeName);
       // eslint-disable-next-line no-constant-condition
       if ("MARKO_DEBUG") {
         complain(
@@ -140,7 +140,7 @@ function getComponentClass(typeName, isLegacy) {
     ComponentClass = {
       [className]: function (id, doc) {
         OldComponentClass.call(this, id, doc);
-      }
+      },
     }[className];
     ComponentClass.prototype = OldComponentClass.prototype;
   }
@@ -414,7 +414,7 @@ function initServerRendered(renderedComponents, host) {
 
     var fakeArray = (win[globalKey] = {
       r: runtimeId,
-      concat: initServerRendered
+      concat: initServerRendered,
     });
 
     // eslint-disable-next-line no-constant-condition
@@ -495,18 +495,9 @@ function initServerRendered(renderedComponents, host) {
     .map(function (componentDef) {
       var typeName = meta.___types[componentDef[1]];
 
-      return (
-        registered[typeName] ||
+      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)
-        )
-      )
+        req.e(typeName)
         ? tryHydrateComponent(componentDef, meta, host, runtimeId)
         : addPendingDef(componentDef, typeName, meta, host, runtimeId);
     })
@@ -594,4 +585,5 @@ exports.___createComponent = createComponent;
 exports.___getComponentClass = getComponentClass;
 exports.___initServerRendered = win.$initComponents = initServerRendered;
 
-require("../../../runtime/components/ComponentsContext").___initClientRendered = initClientRendered;
+require("../../../runtime/components/ComponentsContext").___initClientRendered =
+  initClientRendered;