foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-26 00:59:24 -05:00
Code Issues Packages 1 Wiki Activity

fix(tools/publish): correctly handle importing from self in unfurling (#22774)

Browse source 
We emitted `import "./` rather than `import "./$NAME"`. This is now
fixed.

Also makes a cosmetic change so that `../` imports are now just imported
as `../`, not `./../`.
This commit is contained in:
Luca Casonato 2024-03-07 17:29:17 +01:00 committed by GitHub
parent f0ec4fe1b8
commit 87a08fc3b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cli/tools/registry/unfurl.rs
View file

@ -280,7 +280,15 @@ fn relative_url(
referrer: &ModuleSpecifier,
) -> String {
if resolved.scheme() == "file" {
format!("./{}", referrer.make_relative(resolved).unwrap())
let relative = referrer.make_relative(resolved).unwrap();
if relative.is_empty() {
let last = resolved.path_segments().unwrap().last().unwrap();
format!("./{last}")
} else if relative.starts_with("../") {
relative
} else {
format!("./{relative}")
}
} else {
resolved.to_string()
}
@ -380,6 +388,7 @@ import chalk from "chalk";
import baz from "./baz";
import b from "./b.js";
import b2 from "./b";
import "./mod.ts";
import url from "url";
// TODO: unfurl these to jsr
// import "npm:@jsr/std__fs@1/file";
@ -428,6 +437,7 @@ import chalk from "npm:chalk@5";
import baz from "./baz/index.js";
import b from "./b.ts";
import b2 from "./b.ts";
import "./mod.ts";
import url from "node:url";
// TODO: unfurl these to jsr
// import "npm:@jsr/std__fs@1/file";