marko 4.27.0 → 4.28.0

package/dist/compiler/CompileContext.js

@@ -103,6 +103,7 @@ const helpers = {
   forIn: "marko/runtime/helpers/for-in",
   forRange: "marko/runtime/helpers/for-range",
   getWidgetFromOut: "marko/runtime/components/legacy/helper-getWidgetFromOut",
+  interopRequireDefault: "marko/runtime/helpers/interop-require",
   loadNestedTag: "marko/runtime/helpers/load-nested-tag",
   loadTag: "marko/runtime/helpers/load-tag",
   loadTemplate: "marko/runtime/helpers/load-template",

package/dist/core-tags/components/TransformHelper/convertToComponent.js

@@ -94,7 +94,7 @@ module.exports = function handleComponentBind(options) {
     if (rendererModule.inlineId) {
       markoComponentVar = rendererModule.inlineId;
     } else if (!isImplicitComponent) {
-      markoComponentVar = context.addStaticVar("marko_component", builder.require(builder.literal(rendererModule.requirePath)));
+      markoComponentVar = context.addStaticVar("marko_component", builder.functionCall(context.helper("interopRequireDefault"), [builder.require(builder.literal(rendererModule.requirePath))]));
     }
   }
 

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

@@ -27,6 +27,8 @@ var deferredDefs;
 var pendingDefs;
 
 function register(type, def) {
+  if (def.default) def = def.default;
+
   var pendingForType;
   if (pendingDefs) {
     pendingForType = pendingDefs[type];

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

@@ -5,6 +5,7 @@ var changeCase = require("./_change-case");
 var ComponentsContext = require("../components/ComponentsContext");
 var getComponentsContext = ComponentsContext.U_;
 var ComponentDef = require("../components/ComponentDef");
+var interopRequire = require("./interop-require");
 var w10NOOP = require("warp10/constants").NOOP;
 var RENDER_BODY_TO_JSON = function () {
   return w10NOOP;
@@ -44,6 +45,8 @@ module.exports = function dynamicTag(out, tag, getAttrs, renderBody, args, props
         }
       }
 
+      tag = interopRequire(tag);
+
       var renderer = tag._ || (tag.renderer ? tag.renderer.renderer || tag.renderer : tag.render);
 
       // eslint-disable-next-line no-constant-condition

package/dist/runtime/helpers/interop-require.js

@@ -0,0 +1,3 @@
+module.exports = function interopRequireDefault(mod) {
+  return mod.default || mod;
+};

package/dist/taglib/taglib-finder/index.js

@@ -124,7 +124,7 @@ function find(dirname, registeredTaglibs) {
       if (!excludedPackages[name]) {
         let taglibPath = resolveFrom(rootPkg.__dirname, name + "/marko.json");
         if (taglibPath) {
-          var taglib = taglibLoader.loadTaglibFromFile(taglibPath);
+          var taglib = taglibLoader.loadTaglibFromFile(taglibPath, true);
           helper.addTaglib(taglib);
         }
       }

package/dist/taglib/taglib-loader/Taglib.js

@@ -28,9 +28,10 @@ function handleImport(taglib, importedTaglib) {
 }
 
 class Taglib {
-  constructor(filePath) {
+  constructor(filePath, isFromPackageJson) {
     ok(filePath, '"filePath" expected');
     this.filePath = this.path /* deprecated */ = this.id = filePath;
+    this.isFromPackageJson = isFromPackageJson === true;
     this.dirname = path.dirname(this.filePath);
     this.tags = {};
     this.textTransformers = [];

package/dist/taglib/taglib-loader/index.js

@@ -8,8 +8,8 @@ function loadTaglibFromProps(taglib, taglibProps) {
   return loaders.loadTaglibFromProps(taglib, taglibProps);
 }
 
-function loadTaglibFromFile(filePath) {
-  return loaders.loadTaglibFromFile(filePath);
+function loadTaglibFromFile(filePath, isFromPackageJson) {
+  return loaders.loadTaglibFromFile(filePath, isFromPackageJson);
 }
 
 function loadTaglibFromDir(filePath) {

package/dist/taglib/taglib-loader/loadTaglibFromFile.js

@@ -5,7 +5,7 @@ var loaders = require("./loaders");
 
 var ok = require("assert").ok;
 
-function loadFromFile(filePath) {
+function loadFromFile(filePath, isFromPackageJson) {
   ok(filePath, '"filePath" is required');
 
   var taglib = cache.get(filePath);
@@ -13,7 +13,7 @@ function loadFromFile(filePath) {
   // Only load a taglib once by caching the loaded taglibs using the file
   // system file path as the key
   if (!taglib) {
-    taglib = new types.Taglib(filePath);
+    taglib = new types.Taglib(filePath, isFromPackageJson);
     cache.put(filePath, taglib);
 
     var taglibProps = jsonFileReader.readFileSync(filePath);

package/dist/taglib/taglib-loader/loadTaglibFromProps.js

@@ -221,6 +221,18 @@ class TaglibLoader {
     }
   }
 
+  exports(dir) {
+    var taglib = this.taglib;
+    var path = this.filePath;
+    var dirname = this.dirname;
+
+    if (taglib.isFromPackageJson) {
+      taglib.tagsDir = false;
+
+      scanTagsDir(path, dirname, dir, taglib, this.dependencyChain.append(`exports`));
+    }
+  }
+
   taglibImports(imports) {
     if (!resolveFrom) {
       return;

package/package.json

@@ -1,10 +1,9 @@
 {
     "name": "marko",
-    "version": "4.27.0",
+    "version": "4.28.0",
     "license": "MIT",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "dependencies": {
-        "acorn": "^7.4.0",
         "app-module-path": "^2.2.0",
         "argly": "^1.0.0",
         "browser-refresh-client": "^1.0.0",

package/src/compiler/CompileContext.js

@@ -106,6 +106,7 @@ const helpers = {
   forIn: "marko/runtime/helpers/for-in",
   forRange: "marko/runtime/helpers/for-range",
   getWidgetFromOut: "marko/runtime/components/legacy/helper-getWidgetFromOut",
+  interopRequireDefault: "marko/runtime/helpers/interop-require",
   loadNestedTag: "marko/runtime/helpers/load-nested-tag",
   loadTag: "marko/runtime/helpers/load-tag",
   loadTemplate: "marko/runtime/helpers/load-template",

package/src/core-tags/components/TransformHelper/convertToComponent.js

@@ -115,7 +115,9 @@ module.exports = function handleComponentBind(options) {
     } else if (!isImplicitComponent) {
       markoComponentVar = context.addStaticVar(
         "marko_component",
-        builder.require(builder.literal(rendererModule.requirePath))
+        builder.functionCall(context.helper("interopRequireDefault"), [
+          builder.require(builder.literal(rendererModule.requirePath))
+        ])
       );
     }
   }

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

@@ -14,7 +14,7 @@ var stateToJSONDef = {
     return this;
   }
 };
-function noop() { }
+function noop() {}
 
 module.exports = function defineWidget(def, renderer) {
   def = def.Widget || def;
@@ -23,7 +23,7 @@ module.exports = function defineWidget(def, renderer) {
     return def;
   }
 
-  var ComponentClass = function () { };
+  var ComponentClass = function () {};
   var proto;
   var legacyInit;
 

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

@@ -29,6 +29,8 @@ var deferredDefs;
 var pendingDefs;
 
 function register(type, def) {
+  if (def.default) def = def.default;
+
   var pendingForType;
   if (pendingDefs) {
     pendingForType = pendingDefs[type];

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

@@ -5,6 +5,7 @@ var changeCase = require("./_change-case");
 var ComponentsContext = require("../components/ComponentsContext");
 var getComponentsContext = ComponentsContext.___getComponentsContext;
 var ComponentDef = require("../components/ComponentDef");
+var interopRequire = require("./interop-require");
 var w10NOOP = require("warp10/constants").NOOP;
 var RENDER_BODY_TO_JSON = function () {
   return w10NOOP;
@@ -66,6 +67,8 @@ module.exports = function dynamicTag(
         }
       }
 
+      tag = interopRequire(tag);
+
       var renderer =
         tag._ ||
         (tag.renderer ? tag.renderer.renderer || tag.renderer : tag.render);

package/src/runtime/helpers/interop-require.js

@@ -0,0 +1,3 @@
+module.exports = function interopRequireDefault(mod) {
+  return mod.default || mod;
+}

package/src/taglib/taglib-finder/index.js

@@ -123,7 +123,7 @@ function find(dirname, registeredTaglibs) {
       if (!excludedPackages[name]) {
         let taglibPath = resolveFrom(rootPkg.__dirname, name + "/marko.json");
         if (taglibPath) {
-          var taglib = taglibLoader.loadTaglibFromFile(taglibPath);
+          var taglib = taglibLoader.loadTaglibFromFile(taglibPath, true);
           helper.addTaglib(taglib);
         }
       }

package/src/taglib/taglib-loader/Taglib.js

@@ -27,9 +27,10 @@ function handleImport(taglib, importedTaglib) {
 }
 
 class Taglib {
-  constructor(filePath) {
+  constructor(filePath, isFromPackageJson) {
     ok(filePath, '"filePath" expected');
     this.filePath = this.path /* deprecated */ = this.id = filePath;
+    this.isFromPackageJson = isFromPackageJson === true;
     this.dirname = path.dirname(this.filePath);
     this.tags = {};
     this.textTransformers = [];

package/src/taglib/taglib-loader/index.js

@@ -8,8 +8,8 @@ function loadTaglibFromProps(taglib, taglibProps) {
   return loaders.loadTaglibFromProps(taglib, taglibProps);
 }
 
-function loadTaglibFromFile(filePath) {
-  return loaders.loadTaglibFromFile(filePath);
+function loadTaglibFromFile(filePath, isFromPackageJson) {
+  return loaders.loadTaglibFromFile(filePath, isFromPackageJson);
 }
 
 function loadTaglibFromDir(filePath) {

package/src/taglib/taglib-loader/loadTaglibFromFile.js

@@ -5,7 +5,7 @@ var loaders = require("./loaders");
 
 var ok = require("assert").ok;
 
-function loadFromFile(filePath) {
+function loadFromFile(filePath, isFromPackageJson) {
   ok(filePath, '"filePath" is required');
 
   var taglib = cache.get(filePath);
@@ -13,7 +13,7 @@ function loadFromFile(filePath) {
   // Only load a taglib once by caching the loaded taglibs using the file
   // system file path as the key
   if (!taglib) {
-    taglib = new types.Taglib(filePath);
+    taglib = new types.Taglib(filePath, isFromPackageJson);
     cache.put(filePath, taglib);
 
     var taglibProps = jsonFileReader.readFileSync(filePath);

package/src/taglib/taglib-loader/loadTaglibFromProps.js

@@ -258,6 +258,24 @@ class TaglibLoader {
     }
   }
 
+  exports(dir) {
+    var taglib = this.taglib;
+    var path = this.filePath;
+    var dirname = this.dirname;
+
+    if (taglib.isFromPackageJson) {
+      taglib.tagsDir = false;
+
+      scanTagsDir(
+        path,
+        dirname,
+        dir,
+        taglib,
+        this.dependencyChain.append(`exports`)
+      );
+    }
+  }
+
   taglibImports(imports) {
     if (!resolveFrom) {
       return;