marko 5.30.2 → 5.31.1

package/dist/compiler/index.js

@@ -66,9 +66,9 @@ function _compile(src, filename, userConfig, callback) {
 
   if (callback) {
     compiler.compile(src, filename, options).then(
-    (result) => callback(null, resultCompat(result, options)),
-    (error) => callback(error));
-
+      (result) => callback(null, resultCompat(result, options)),
+      (error) => callback(error)
+    );
   } else {
     return resultCompat(compiler.compileSync(src, filename, options), options);
   }
@@ -93,13 +93,13 @@ function compileForBrowser(src, filename, options, callback) {
   }
 
   options = extend(
-  {
-    output: "dom",
-    meta: false,
-    sourceOnly: false
-  },
-  options);
-
+    {
+      output: "dom",
+      meta: false,
+      sourceOnly: false
+    },
+    options
+  );
 
   return compile(src, filename, options, callback);
 }

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

@@ -50,10 +50,10 @@ module.exports = function render(input, out) {
   } else {
     if (isComponent) {
       out.bf(
-      out.j_,
-      out.h_.i_,
-      true);
-
+        out.j_,
+        out.h_.i_,
+        true
+      );
     }
 
     if (input.renderBody) {

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

@@ -93,13 +93,13 @@ AsyncValue.prototype = {
       var asyncValue = this;
 
       var finalPromise = value.then(
-      function onFulfilled(value) {
-        queueMicrotask(asyncValue.w_.bind(asyncValue, value));
-      },
-      function onRejected(err) {
-        queueMicrotask(asyncValue.v_.bind(asyncValue, err));
-      });
-
+        function onFulfilled(value) {
+          queueMicrotask(asyncValue.w_.bind(asyncValue, value));
+        },
+        function onRejected(err) {
+          queueMicrotask(asyncValue.v_.bind(asyncValue, err));
+        }
+      );
 
       if (finalPromise.done) {
         finalPromise.done();

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

@@ -52,44 +52,44 @@ module.exports = function (input, out) {
         if (!global._afRuntime) {
           // Minified version of ./client-reorder-runtime.js
           asyncOut.script(
-          `function $af(d,a,e,l,g,h,k,b,f,c){c=$af;if(a&&!c[a])(c[a+="$"]||(c[a]=[])).push(d);else{e=document;l=e.getElementById("af"+d);g=e.getElementById("afph"+d);h=e.createDocumentFragment();k=l.childNodes;b=0;for(f=k.length;b<f;b++)h.appendChild(k.item(0));g&&g.parentNode.replaceChild(h,g);c[d]=1;if(a=c[d+"$"])for(b=0,f=a.length;b<f;b++)c(a[b])}}`);
-
+            `function $af(d,a,e,l,g,h,k,b,f,c){c=$af;if(a&&!c[a])(c[a+="$"]||(c[a]=[])).push(d);else{e=document;l=e.getElementById("af"+d);g=e.getElementById("afph"+d);h=e.createDocumentFragment();k=l.childNodes;b=0;for(f=k.length;b<f;b++)h.appendChild(k.item(0));g&&g.parentNode.replaceChild(h,g);c[d]=1;if(a=c[d+"$"])for(b=0,f=a.length;b<f;b++)c(a[b])}}`
+          );
           global._afRuntime = true;
         }
 
         if (global.cspNonce) {
           asyncOut.write(
-          '<style nonce="' +
-          escapeDoubleQuotes(global.cspNonce) +
-          '">' +
-          "#af" +
-          awaitInfo.id +
-          "{display:none;}" +
-          "</style>" +
-          '<div id="af' +
-          awaitInfo.id +
-          '">' +
-          result.toString() +
-          "</div>");
-
+            '<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>");
-
+            '<div id="af' +
+            awaitInfo.id +
+            '" style="display:none">' +
+            result.toString() +
+            "</div>"
+          );
         }
 
         asyncOut.script(
-        "$af(" + (
-        typeof awaitInfo.id === "number" ?
-        awaitInfo.id :
-        '"' + awaitInfo.id + '"') + (
-        awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
-        ")");
-
+          "$af(" + (
+          typeof awaitInfo.id === "number" ?
+          awaitInfo.id :
+          '"' + awaitInfo.id + '"') + (
+          awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
+          ")"
+        );
 
         awaitInfo.out.writer = asyncOut.writer;
 

package/dist/node-require/hot-reload.js

@@ -8,9 +8,9 @@ require("../runtime/html/hot-reload");
 exports.handleFileModified = function (filename) {
   if (!fs.existsSync(filename)) {
     console.log(
-    "[marko/hot-reload] WARNING cannot resolve template path: ",
-    filename);
-
+      "[marko/hot-reload] WARNING cannot resolve template path: ",
+      filename
+    );
     return;
   }
 
@@ -35,8 +35,8 @@ function tryReload(filename) {
     delete require.cache[filename];
     require(filename);
     console.log(
-    `[marko] Template successfully reloaded: ${cwdRelative(filename)}`);
-
+      `[marko] Template successfully reloaded: ${cwdRelative(filename)}`
+    );
   } catch (e) {
     console.error(e);
   }

package/dist/node-require/index.js

@@ -27,14 +27,14 @@ function normalizeExtension(extension) {
 
 function compile(templatePath, markoCompiler, userCompilerOptions) {
   return markoCompiler.compileFileSync(
-  templatePath,
-  Object.assign(
-  {},
-  defaultCompilerOptions,
-  userCompilerOptions,
-  requiredCompilerOptions)).
-
-  code;
+    templatePath,
+    Object.assign(
+      {},
+      defaultCompilerOptions,
+      userCompilerOptions,
+      requiredCompilerOptions
+    )
+  ).code;
 }
 
 function install(options) {

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

@@ -8,10 +8,10 @@ ownerComponentDef)
 {
   var componentId = component.id;
   var componentDef = componentsContext.k_ = new ComponentDef(
-  component,
-  componentId,
-  componentsContext);
-
+    component,
+    componentId,
+    componentsContext
+  );
   componentsContext.f_.z_[
   componentId] =
   true;

package/dist/node_modules/@internal/components-beginComponent/index.js

@@ -22,10 +22,10 @@ existingComponentDef)
   var componentDef =
   existingComponentDef || (
   componentsContext.k_ = new ComponentDef(
-  component,
-  componentId,
-  componentsContext));
-
+    component,
+    componentId,
+    componentsContext
+  ));
 
   var ownerIsRenderBoundary =
   ownerComponentDef && ownerComponentDef.B_;
@@ -66,16 +66,16 @@ existingComponentDef)
 
   if ((ownerIsRenderBoundary || ownerWillRerender) && key != null) {
     out.w(
-    "<!--" +
-    runtimeId +
-    "^" +
-    componentId +
-    " " +
-    ownerComponentDef.id +
-    " " +
-    key +
-    "-->");
-
+      "<!--" +
+      runtimeId +
+      "^" +
+      componentId +
+      " " +
+      ownerComponentDef.id +
+      " " +
+      key +
+      "-->"
+    );
   } else {
     out.w("<!--" + runtimeId + "#" + componentId + "-->");
   }

package/dist/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");
@@ -265,10 +265,10 @@ module.exports = function defineWidget(def, renderer) {
   proto.V_ = State;
 
   jQuery.patchComponent(
-  window.$,
-  proto,
-  true /* don't throw error until used if `$` is missing*/);
-
+    window.$,
+    proto,
+    true /* don't throw error until used if `$` is missing*/
+  );
 
   ready.patchComponent(proto);
 
@@ -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.X_, function () {return Component;});
+    registry.r(template.X_, function () {
+      return Component;
+    });
   }
 
   return Component;

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

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

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

@@ -30,9 +30,9 @@ function isNotEmpty(obj) {
 }
 function safeStringify(data) {
   return JSON.stringify(warp10.stringifyPrepare(data)).replace(
-  safeJSONRegExp,
-  safeJSONReplacer);
-
+    safeJSONRegExp,
+    safeJSONReplacer
+  );
 }
 
 function getSerializedGlobals($global) {
@@ -282,8 +282,8 @@ componentDefs)
   runtimeId === DEFAULT_RUNTIME_ID ? "MC" : runtimeId + "_C";
 
   return `$${componentGlobalKey}=(window.$${componentGlobalKey}||[]).concat(${safeStringify(
-  initComponentsData)
-  })`;
+    initComponentsData
+  )})`;
 };
 
 exports.__ = addComponentsFromContext;

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

@@ -1,5 +1,5 @@
 "use strict";var Component = require("../../../runtime/components/Component");
-var loader = require("@internal/loader");
+var req = require("@internal/require");
 var getComponentForEl =
 require("@internal/components-util").Y_;
 
@@ -8,14 +8,15 @@ require("@internal/components-util").Y_;
 // expose legacy
 require("@internal/components-registry")._k_ = 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/dist/node_modules/@internal/components-entry-legacy/index.js

@@ -4,7 +4,8 @@
 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/dist/node_modules/@internal/components-registry/index-browser.js

@@ -8,7 +8,7 @@ require("../../../runtime/vdom/morphdom/fragment")._n_;
 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._o_;
 var addComponentRootToKeyedElements =
 componentsUtil._p_;
@@ -69,8 +69,8 @@ function addPendingDef(def, type, meta, host, runtimeId) {
   def,
   meta,
   host,
-  runtimeId]);
-
+  runtimeId]
+  );
 }
 
 function load(typeName, isLegacy) {
@@ -83,7 +83,7 @@ function load(typeName, isLegacy) {
     } else if (isLegacy) {
       target = exports._k_.load(typeName);
     } else {
-      target = loader(typeName);
+      target = req(typeName);
       // eslint-disable-next-line no-constant-condition
 
 
@@ -184,9 +184,9 @@ function indexServerComponentBoundaries(node, runtimeId, stack) {
             rootNode = createFragmentNode(startNode.nextSibling, endNode);
           } else {
             rootNode = createFragmentNode(
-            endNode.parentNode.firstChild,
-            endNode);
-
+              endNode.parentNode.firstChild,
+              endNode
+            );
           }
 
           componentId = startNode.nodeValue.substring(runtimeLength + 1);
@@ -205,11 +205,11 @@ function indexServerComponentBoundaries(node, runtimeId, stack) {
               keyedElementsByComponentId[ownerId] = {});
             }
             addComponentRootToKeyedElements(
-            keyedElements,
-            key,
-            rootNode,
-            componentId);
-
+              keyedElements,
+              key,
+              rootNode,
+              componentId
+            );
           }
 
           serverComponentRootNodes[componentId] = rootNode;
@@ -284,18 +284,18 @@ extraArgs,
 handles)
 {
   var removeListener = addEventListenerHelper(
-  el,
-  eventType,
-  isOnce,
-  function (event) {
-    var args = [event, el];
-    if (extraArgs) {
-      args = extraArgs.concat(args);
-    }
-
-    invokeComponentEventHandler(component, targetMethodName, args);
-  });
+    el,
+    eventType,
+    isOnce,
+    function (event) {
+      var args = [event, el];
+      if (extraArgs) {
+        args = extraArgs.concat(args);
+      }
 
+      invokeComponentEventHandler(component, targetMethodName, args);
+    }
+  );
   handles.push(removeListener);
 }
 
@@ -329,14 +329,14 @@ function initComponent(componentDef, host) {
       var extraArgs = domEventArgs[4];
 
       addDOMEventListeners(
-      component,
-      eventEl,
-      eventType,
-      targetMethodName,
-      isOnce,
-      extraArgs,
-      eventListenerHandles);
-
+        component,
+        eventEl,
+        eventType,
+        targetMethodName,
+        isOnce,
+        extraArgs,
+        eventListenerHandles
+      );
     });
 
     if (eventListenerHandles.length) {
@@ -495,20 +495,11 @@ function initServerRendered(renderedComponents, host) {
   map(function (componentDef) {
     var typeName = meta._E_[componentDef[1]];
 
-    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));
+    return registered[typeName] ||
+    document.readyState === "complete" ||
+    req.e(typeName) ?
+    tryHydrateComponent(componentDef, meta, host, runtimeId) :
+    addPendingDef(componentDef, typeName, meta, host, runtimeId);
   }).
   reverse().
   forEach(tryInvoke);
@@ -518,11 +509,11 @@ function initServerRendered(renderedComponents, host) {
 
 function tryHydrateComponent(rawDef, meta, host, runtimeId) {
   var componentDef = ComponentDef._F_(
-  rawDef,
-  meta._E_,
-  meta._D_,
-  exports);
-
+    rawDef,
+    meta._E_,
+    meta._D_,
+    exports
+  );
   var mount = hydrateComponentAndGetMount(componentDef, host);
 
   if (!mount) {
@@ -594,4 +585,5 @@ exports._I_ = createComponent;
 exports._J_ = getComponentClass;
 exports.Z_ = win.$initComponents = initServerRendered;
 
-require("../../../runtime/components/ComponentsContext")._K_ = initClientRendered;
+require("../../../runtime/components/ComponentsContext")._K_ =
+initClientRendered;

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

@@ -109,9 +109,9 @@ function getMarkoPropsFromEl(el) {
     if (!virtualProps) {
       virtualProps = el.getAttribute("data-marko");
       vPropsByDOMNode.set(
-      el,
-      virtualProps = virtualProps ? JSON.parse(virtualProps) : EMPTY_OBJECT);
-
+        el,
+        virtualProps = virtualProps ? JSON.parse(virtualProps) : EMPTY_OBJECT
+      );
     }
   }
 

package/dist/node_modules/@internal/create-readable/index-browser.js

@@ -14,11 +14,11 @@ module.exports = function (data) {
     }
   };
   var out = this.createOut(
-  data && data.$global,
-  facade,
-  undefined,
-  this._Y_);
-
+    data && data.$global,
+    facade,
+    undefined,
+    this._Y_
+  );
   out.once("error", (err) => {
     facade.write = facade.end = noop;
     writer.abort(err);

package/dist/node_modules/@internal/create-readable/index.js

@@ -42,11 +42,11 @@ class Readable extends stream.Readable {
     var data = this.a__;
     var globalData = data && data.$global;
     var out = this._Z_.createOut(
-    globalData,
-    this,
-    undefined,
-    template._Y_);
-
+      globalData,
+      this,
+      undefined,
+      template._Y_
+    );
     template.render(data, out);
     out.end();
   }

package/dist/node_modules/@internal/loader/fallback-node.js

@@ -0,0 +1,89 @@
+"use strict";
+
+var nodePath = require("path");
+var fs = require("fs");
+var Module = require("module").Module;
+var markoCompiler = require("../../../compiler");
+var cwd = process.cwd();
+var fsOptions = { encoding: "utf8" };
+var requiredCompilerOptions = { modules: "cjs" };
+
+module.exports = function load(templatePath, templateSrc, options) {
+  if (arguments.length === 1) {
+    return doLoad(templatePath);
+  } else if (arguments.length === 2) {
+    // see if second argument is templateSrc (a String)
+    // or options (an Object)
+    var lastArg = arguments[arguments.length - 1];
+    if (typeof lastArg === "string") {
+      return doLoad(templatePath, templateSrc);
+    } else {
+      var finalOptions = templateSrc;
+      return doLoad(templatePath, null, finalOptions);
+    }
+  } else if (arguments.length === 3) {
+    // assume function called according to function signature
+    return doLoad(templatePath, templateSrc, options);
+  } else {
+    throw new Error("Illegal arguments");
+  }
+};
+
+function loadSource(templatePath, compiledSrc) {
+  // Short-circuit loading if the template has already been cached in the Node.js require cache
+  var cached = require.cache[templatePath];
+  if (cached) {
+    return cached.exports;
+  }
+
+  var templateModule = new Module(templatePath, module);
+  templateModule.paths = Module._nodeModulePaths(
+    nodePath.dirname(templatePath)
+  );
+  templateModule.filename = templatePath;
+
+  Module._cache[templatePath] = templateModule;
+
+  templateModule._compile(compiledSrc, templatePath);
+
+  return templateModule.exports;
+}
+
+function getCachedTemplate(templatePath) {
+  var precompiledTemplatePath = templatePath + ".js";
+  var templateModule =
+  require.cache[templatePath] || require.cache[precompiledTemplatePath];
+
+  if (templateModule) {
+    return templateModule.exports;
+  } else if (fs.existsSync(precompiledTemplatePath)) {
+    return require(precompiledTemplatePath);
+  }
+}
+
+function doLoad(templatePath, templateSrc, options) {
+  options = Object.assign(
+    {},
+    markoCompiler.defaultOptions,
+    options,
+    requiredCompilerOptions
+  );
+  templatePath = nodePath.resolve(cwd, templatePath);
+  var template = getCachedTemplate(templatePath);
+
+  if (!template) {
+    if (templateSrc == null) {
+      templateSrc = fs.readFileSync(templatePath, fsOptions);
+    }
+
+    var compiledSrc = markoCompiler.compile(templateSrc, templatePath, options);
+
+    template = loadSource(templatePath, compiledSrc);
+  }
+
+  if (template.default) {
+    template = template.default;
+  }
+
+  return template;
+}

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

@@ -1,4 +1,2 @@
 "use strict";
-module.exports =
-// eslint-disable-next-line no-undef
-typeof __webpack_require__ !== "undefined" ? __webpack_require__ : require;
+module.exports = require("@internal/require");