Skip to content

Commit

Permalink
fix(babel-utils): child template analysis in nested node_modules (#1820)
Browse files Browse the repository at this point in the history
  • Loading branch information
DylanPiercey authored Jun 29, 2022
1 parent 1d9ca5c commit 0a207fb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .changeset/cyan-bags-fry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@marko/babel-utils": patch
---

Fix issue with child template analysis not properly resolving nested node_modules with components.
6 changes: 3 additions & 3 deletions packages/babel-utils/src/tags.js
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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),
Expand Down

0 comments on commit 0a207fb

Please sign in to comment.