@marko/translator-default 6.1.0 → 6.1.2

package/dist/tag/attribute-tag.js

@@ -131,7 +131,7 @@ function translateAttributeTag(tag) {
 }
 
 function getAttrTagObject(tag) {
-  const attrs = (0, _util.getAttrs)(tag);
+  const attrs = (0, _util.getAttrs)(tag, false, true);
 
   if (_compiler.types.isNullLiteral(attrs)) {
     return _compiler.types.objectExpression([]);

package/dist/tag/util.js

@@ -3,7 +3,7 @@ var _compiler = require("@marko/compiler");
 var _classValue = _interopRequireDefault(require("marko/src/runtime/helpers/class-value"));
 var _styleValue = _interopRequireDefault(require("marko/src/runtime/helpers/style-value"));
 
-function getAttrs(path, preserveNames) {
+function getAttrs(path, preserveNames, isAttrTag) {
   const { node } = path;
   const {
     extra,
@@ -109,6 +109,7 @@ function getAttrs(path, preserveNames) {
   properties.length === 0 ?
   _compiler.types.nullLiteral() :
   !hasAttributeTags &&
+  !isAttrTag &&
   properties.length === 1 &&
   _compiler.types.isSpreadElement(properties[0]) ?
   properties[0].argument :

package/dist/util/add-dependencies.js

@@ -7,7 +7,8 @@ var _compiler = require("@marko/compiler");
 var _magicString = _interopRequireDefault(require("magic-string"));
 var _path = _interopRequireDefault(require("path"));
 var _resolveFrom = _interopRequireDefault(require("resolve-from"));
-const kEntryState = Symbol();var _default =
+const kEntryState = Symbol();
+const lassoDepPrefix = "package: ";var _default =
 
 (entryFile, isHydrate) => {
   const program = entryFile.path;
@@ -52,11 +53,8 @@ const entryBuilder = exports.entryBuilder = {
     const { markoOpts } = entryFile;
     const entryMarkoMeta = entryFile.metadata.marko;
     const { body } = state;
-    entryMarkoMeta.watchFiles = Array.from(state.watchFiles);
-    entryMarkoMeta.deps = Array.from(
-      state.lassoDeps,
-      (dep) => `package: ${dep}`
-    );
+    entryMarkoMeta.watchFiles = [...state.watchFiles];
+    entryMarkoMeta.deps = [...state.lassoDeps];
 
     if (state.hasComponents) {
       const initId = _compiler.types.identifier("init");
@@ -211,7 +209,7 @@ function addBrowserImports(seenImports, lassoDeps, body, file, entryFile) {
     } else if (isLassoDep(dep)) {
       if (lassoDeps) {
         lassoDeps.add(
-          resolveRelativeToEntry(entryFile, file, lassoManifestDepToPath(dep))
+          resolveLassoManifestDepRelativeToEntry(entryFile, file, dep)
         );
       }
       continue;
@@ -305,9 +303,27 @@ function toTestFn(val) {
 }
 
 function isLassoDep(dep) {
-  return dep.startsWith("package: ");
+  return dep.startsWith(lassoDepPrefix);
 }
 
-function lassoManifestDepToPath(dep) {
-  return dep.slice(9);
-}
+/**
+ * Lasso manifest deps in `lasso-marko` do not support node module resolution.
+ * eg `package: @ebay/ebayui-core/browser.json` will not resolve.
+ *
+ * This resolution returns a direct posix relative path.
+ */
+function resolveLassoManifestDepRelativeToEntry(entryFile, targetFile, dep) {
+  const entryFileName = entryFile.opts.filename;
+  const targetFileName = targetFile.opts.filename;
+  if (entryFileName === targetFileName) return dep;
+
+  const resolved = toPosix(
+    _path.default.relative(
+      _path.default.dirname(entryFileName),
+      _path.default.join(targetFileName, "..", dep.slice(lassoDepPrefix.length))
+    )
+  );
+  return lassoDepPrefix + (resolved[0] === "." ? resolved : `./${resolved}`);
+}
+
+const toPosix = _path.default.sep === "/" ? (v) => v : (v) => v.replace(/\\/g, "/");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/translator-default",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "description": "Translates Marko templates to the default Marko runtime.",
   "keywords": [
     "babel",
@@ -34,8 +34,8 @@
     "self-closing-tags": "^1.0.1"
   },
   "devDependencies": {
-    "@marko/compiler": "^5.38.0",
-    "marko": "^5.36.0"
+    "@marko/compiler": "^5.38.3",
+    "marko": "^5.36.3"
   },
   "peerDependencies": {
     "@marko/compiler": "^5.16.1",