fix: importing some Marko files properly includes meta

marko-js · Jan 25, 2021 · d67bac5 · d67bac5
1 parent 8113e25
commit d67bac5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/packages/babel-utils/src/tags.js b/packages/babel-utils/src/tags.js
@@ -206,10 +206,6 @@ export function resolveTagImport(path, request) {
   }
 
   if (request.endsWith(".marko")) {
-    if (!file.metadata.marko.tags.includes(request)) {
-      file.metadata.marko.tags.push(request);
-    }
-
     return resolveRelativePath(file, request);
   }
 }
diff --git a/packages/translator-default/src/index.js b/packages/translator-default/src/index.js
@@ -352,8 +352,16 @@ export const translate = {
   ImportDeclaration: {
     exit(path) {
       const source = path.get("source");
-      const request = source.node.value;
-      source.node.value = resolveTagImport(source, request) || request;
+      const tagEntry = resolveTagImport(source, source.node.value);
+
+      if (tagEntry) {
+        const meta = path.hub.file.metadata.marko;
+        source.node.value = tagEntry;
+
+        if (!meta.tags.includes(tagEntry)) {
+          meta.tags.push(tagEntry);
+        }
+      }
     }
   }
 };