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

fix: import functions from h3 with relative path #2207

Closed
wants to merge 1 commit into from
Closed

fix: import functions from h3 with relative path #2207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions src/build.ts
View file
Open in desktop
Expand Up @@ -131,13 +131,6 @@ export async function writeTypes(nitro: Nitro) {

if (nitro.unimport) {
await nitro.unimport.init();
// TODO: fully resolve utils exported from `#imports`
autoImportExports = await nitro.unimport
.toExports(typesDir)
.then((r) =>
r.replace(/#internal\/nitro/g, relative(typesDir, runtimeDir))
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to retain this?

);

const resolvedImportPathMap = new Map<string, string>();
const imports = await nitro.unimport
.getImports()
Expand Down Expand Up @@ -171,6 +164,12 @@ export async function writeTypes(nitro: Nitro) {
resolvedImportPathMap.set(i.from, path);
}

// TODO: fully resolve utils exported from `#imports`
autoImportExports = await nitro.unimport
.toExports(typesDir)
.then((r) =>
r.replace(/'(.*)'/g, (_, i) => `'${resolvedImportPathMap.get(i) ?? i}'`)
Copy link
Member

Choose a reason for hiding this comment

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

This might be also something potentially unimport could directly solve. /cc @antfu

);
autoImportedTypes = [
(
await nitro.unimport.generateTypeDeclarations({
Expand Down