From 0a207fbf1515fcd6d4045b527c9eb16babb96032 Mon Sep 17 00:00:00 2001 From: Dylan Piercey Date: Wed, 29 Jun 2022 08:28:22 -0700 Subject: [PATCH] fix(babel-utils): child template analysis in nested node_modules (#1820) --- .changeset/cyan-bags-fry.md | 5 +++++ packages/babel-utils/src/tags.js | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .changeset/cyan-bags-fry.md diff --git a/.changeset/cyan-bags-fry.md b/.changeset/cyan-bags-fry.md new file mode 100644 index 0000000000..4b3eaf6f81 --- /dev/null +++ b/.changeset/cyan-bags-fry.md @@ -0,0 +1,5 @@ +--- +"@marko/babel-utils": patch +--- + +Fix issue with child template analysis not properly resolving nested node_modules with components. diff --git a/packages/babel-utils/src/tags.js b/packages/babel-utils/src/tags.js index 5fd5055a6d..c35f5d5a5c 100644 --- a/packages/babel-utils/src/tags.js +++ b/packages/babel-utils/src/tags.js @@ -1,7 +1,7 @@ -import { relative, resolve, basename } from "path"; +import { relative, resolve, basename, dirname } from "path"; +import resolveFrom from "resolve-from"; 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"; @@ -190,7 +190,7 @@ export function loadFileForImport(file, request) { const filename = relativeRequest[0] === "." ? resolve(file.opts.filename, "..", relativeRequest) - : compilerModules.require.resolve(relativeRequest); + : resolveFrom(dirname(file.opts.filename), relativeRequest); return file.___getMarkoFile( fs.readFileSync(filename).toString("utf-8"), createNewFileOpts(file.opts, filename),