Skip to content

Fix error with deprecation warnings and legacy importers #339

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

Merged
merged 4 commits into from
Oct 17, 2024
Merged

Fix error with deprecation warnings and legacy importers #339

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e64025b
Fix error with deprecation warnings and legacy importers
jathak Oct 15, 2024
ca318b0
Fix compatibility with older Node versions
jathak Oct 15, 2024
8322125
Fix static analysis
jathak Oct 15, 2024
eed7555
Code review
jathak Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/src/legacy/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@ export function removeLegacyImporter(string: string): string {
// syntax.
export function removeLegacyImporterFromSpan(span: SourceSpan): SourceSpan {
if (!span.url) return span;
return {...span, url: new URL(removeLegacyImporter(span.url.toString()))};
const url = removeLegacyImporter(span.url.toString());
try {
return {...span, url: new URL(url)};
} catch (_) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the URL is absolute, it won't use the basename anyway, so you can just pass it in eagerly rather than catching this error.

// Relative URL
return {...span, url: new URL(url, `file://${process.cwd()}`)};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just shoving a pathname into a URL string isn't safe in general. Use Node's pathToFileUrl().

}
}

// Converts [path] to a `file:` URL and adds the [legacyImporterProtocolPrefix]
Expand Down