From f2133bcd19917cb04b27382ffccd8d708ac98960 Mon Sep 17 00:00:00 2001 From: Dylan Piercey Date: Sat, 27 Mar 2021 10:11:46 -0700 Subject: [PATCH] fix(babel-utils): issue with child template analysis in node_modules --- packages/babel-utils/src/tags.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/babel-utils/src/tags.js b/packages/babel-utils/src/tags.js index 09c59816ba..ef7595486b 100644 --- a/packages/babel-utils/src/tags.js +++ b/packages/babel-utils/src/tags.js @@ -1,6 +1,7 @@ import { relative, resolve } from "path"; import { createHash } from "crypto"; import { types as t } from "@marko/compiler"; +import * as compilerModules from "@marko/compiler/modules"; import { getRootDir } from "lasso-package-root"; import { getTagDefForTagName } from "./taglib"; import { resolveRelativePath } from "./imports"; @@ -185,11 +186,10 @@ export function loadFileForImport(file, request) { const relativeRequest = resolveTagImport(file.path, request); if (relativeRequest) { - const sourceFileName = resolve( - file.opts.sourceFileName, - "..", - relativeRequest - ); + const sourceFileName = + relativeRequest[0] === "." + ? resolve(file.opts.sourceFileName, "..", relativeRequest) + : compilerModules.require.resolve(relativeRequest); return file.___getMarkoFile( fs.readFileSync(sourceFileName).toString("utf-8"), { ...file.opts, sourceFileName },