Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle relative paths when fixing keys #390

Merged
merged 2 commits into from
Nov 7, 2023
Merged

Handle relative paths when fixing keys #390

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61eaa8f
Handle relative paths when fixing keys
wagenet Oct 5, 2023
5d0ec98
Fix issue with embroider
wagenet Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/ember-cli-code-coverage/lib/attach-middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,16 @@ function adjustCoverageKey(
modifyAssetLocation
) {
let relativePath = path.relative(root, filepath);

let embroiderTmpPathRegex = /embroider\/.{6}/gm;

// we can determine if file is coming from embroider based on how the path looks
if (embroiderTmpPathRegex.test(filepath)) {
relativePath = normalizeRelativePath(root, filepath);
} else if (relativePath.startsWith('..')) {
// This lives in a directory outside of the current one, likely a monorepo.
// In this case we can assume that the original path is correct.
return filepath;
}

let namespace = relativePath.split(path.sep)[0];
Expand Down