marko 5.31.0 → 5.31.2

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;

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

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

package/src/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/src/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");

package/src/node_modules/@internal/loader/index.js

@@ -1,88 +1,23 @@
 "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;
-}
+const req = require("@internal/require");
+let fallback;
+module.exports = !require.extensions[".marko"]
+  ? require("./fallback-node")
+  : function load(templatePath, templateSrc, options) {
+      switch (arguments.length) {
+        case 1:
+          return req(templatePath);
+        case 2:
+          return (fallback = fallback || require("./fallback-node"))(
+            templatePath,
+            templateSrc
+          );
+        case 3:
+          return (fallback = fallback || require("./fallback-node"))(
+            templatePath,
+            templateSrc,
+            options
+          );
+      }
+    };

package/src/node_modules/@internal/loader/package.json

@@ -3,9 +3,8 @@
   "browser": "./index-browser.js",
   "exports": {
     ".": {
-      "webpack": "./index-browser.js",
-      "browser": "./index-browser.js",
-      "default": "./index.js"
+      "node": "./index.js",
+      "default": "./index-browser.js"
     }
   }
 }

package/src/node_modules/@internal/preserve-tag/index-browser.js

@@ -0,0 +1,45 @@
+module.exports = function render(input, out) {
+  var isComponent = !input.n;
+  var shouldPreserve = !("i" in input) || input.i;
+  var componentsContext = out.___components;
+  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);
+    }
+  }
+};

package/src/node_modules/@internal/preserve-tag/index.js

@@ -0,0 +1,34 @@
+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 (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/node_modules/@internal/preserve-tag/package.json

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

package/src/node_modules/@internal/require/index-browser.js

@@ -0,0 +1,13 @@
+"use strict";
+load.e = exists;
+module.exports = load;
+
+function load() {
+  throw new Error(
+    "The require API cannot be used in the browser in the current environment."
+  );
+}
+
+function exists() {
+  return false;
+}

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

@@ -0,0 +1,20 @@
+"use strict";
+load.e = exists;
+module.exports = load;
+
+function load(id) {
+  return interopRequire(require(id));
+}
+
+function exists(id) {
+  // In lasso this helper is used to determine if a module was loaded but not run.
+  return !!(
+    require.runtime &&
+    require.runtime.resolve &&
+    require.runtime.resolve(id, "/")
+  );
+}
+
+function interopRequire(mod) {
+  return mod.default || mod;
+}

package/src/node_modules/@internal/require/index-webpack.js

@@ -0,0 +1,11 @@
+"use strict";
+load.e = __webpack_is_included__;
+module.exports = load;
+
+function load(id) {
+  return interopRequire(__webpack_require__(id));
+}
+
+function interopRequire(mod) {
+  return mod.default || mod;
+}

package/src/node_modules/@internal/require/index.js

@@ -0,0 +1,15 @@
+"use strict";
+load.e = exists;
+module.exports = load;
+
+function load(id) {
+  return interopRequire(require(id));
+}
+
+function exists() {
+  return false;
+}
+
+function interopRequire(mod) {
+  return mod.default || mod;
+}

package/src/node_modules/@internal/require/package.json

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