marko 5.30.2 → 5.31.1

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/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"
+    }
+  }
+}

package/src/runtime/components/legacy/defineComponent-legacy.js

@@ -8,11 +8,6 @@ var defineRenderer;
 var defineWidget;
 
 module.exports = function defineComponent(def) {
-  // eslint-disable-next-line no-constant-condition
-  if ("MARKO_DEBUG") {
-    require("complain")("defineComponent is deprecated");
-  }
-
   if (def.___isComponent) {
     return def;
   }

package/src/runtime/components/legacy/defineRenderer-legacy.js

@@ -4,17 +4,12 @@ var getComponentsContext =
   require("../ComponentsContext").___getComponentsContext;
 var componentLookup = require("@internal/components-util").___componentLookup;
 var modernRenderer = require("../renderer");
-var loader = require("@internal/loader");
+var req = require("@internal/require");
 var resolveComponentKey = modernRenderer.___resolveComponentKey;
 
 module.exports = function defineRenderer(renderingLogic) {
   var renderer = renderingLogic.renderer;
 
-  // eslint-disable-next-line no-constant-condition
-  if ("MARKO_DEBUG") {
-    require("complain")("defineRenderer is deprecated");
-  }
-
   if (renderer && renderer.___isRenderer) {
     return renderer;
   }
@@ -22,7 +17,7 @@ module.exports = function defineRenderer(renderingLogic) {
   var template = renderingLogic.template;
 
   if (typeof template === "string") {
-    template = loader(template);
+    template = req(template);
   }
 
   if (!renderer) {