import functions from h3 with relative path

nitrojs · Mar 2, 2024 · 5a2ffb1 · 5a2ffb1
1 parent 18f2f33
commit 5a2ffb1
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/build.ts b/src/build.ts
@@ -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))
-      );
-
     const resolvedImportPathMap = new Map<string, string>();
     const imports = await nitro.unimport
       .getImports()
@@ -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}'`)
+    );
     autoImportedTypes = [
       (
         await nitro.unimport.generateTypeDeclarations({