refactor: fully migrate to exsolve for module resolution

Author: pi0

package.json

@@ -35,7 +35,7 @@
     "confbox": "^0.1.8",
     "defu": "^6.1.4",
     "dotenv": "^16.4.7",
-    "exsolve": "^0.4.0",
+    "exsolve": "^0.4.1",
     "giget": "^1.2.5",
     "jiti": "^2.4.2",
     "ohash": "^2.0.5",

pnpm-lock.yaml

@@ -1,9 +1,10 @@
 import { existsSync } from "node:fs";
 import { readFile, rm } from "node:fs/promises";
+import { pathToFileURL } from "node:url";
 import { homedir } from "node:os";
 import { resolve, extname, dirname, basename, join } from "pathe";
+import { resolveModulePath } from "exsolve";
 import { createJiti } from "jiti";
-import { fileURLToPath } from "mlly";
 import * as rc9 from "rc9";
 import { defu } from "defu";
 import { findWorkspaceDir, readPackageJSON } from "pkg-types";
@@ -31,7 +32,7 @@ const ASYNC_LOADERS = {
   ".toml": () => import("confbox/toml").then((r) => r.parseTOML),
 } as const;
 
-export const SUPPORTED_EXTENSIONS = [
+export const SUPPORTED_EXTENSIONS = Object.freeze([
   // with jiti
   ".js",
   ".ts",
@@ -46,7 +47,7 @@ export const SUPPORTED_EXTENSIONS = [
   ".yaml",
   ".yml",
   ".toml",
-] as const;
+]) as unknown as string[];
 
 export async function loadConfig<
   T extends UserInputConfig = UserInputConfig,
@@ -355,15 +356,9 @@ async function resolveConfig<
     source = cloned.dir;
   }
 
-  // Util to try resolving a module
-  const tryResolve = (id: string) => {
-    const resolved = options.jiti!.esmResolve(id, { try: true });
-    return resolved ? fileURLToPath(resolved) : undefined;
-  };
-
   // Try resolving as npm package
   if (NPM_PACKAGE_RE.test(source)) {
-    source = tryResolve(source) || source;
+    source = tryResolve(source, options) || source;
   }
 
   // Import from local fs
@@ -382,9 +377,12 @@ async function resolveConfig<
   };
 
   res.configFile =
-    tryResolve(resolve(cwd, source)) ||
-    tryResolve(resolve(cwd, ".config", source.replace(/\.config$/, ""))) ||
-    tryResolve(resolve(cwd, ".config", source)) ||
+    tryResolve(resolve(cwd, source), options) ||
+    tryResolve(
+      resolve(cwd, ".config", source.replace(/\.config$/, "")),
+      options,
+    ) ||
+    tryResolve(resolve(cwd, ".config", source), options) ||
     source;
 
   if (!existsSync(res.configFile!)) {
@@ -432,3 +430,15 @@ async function resolveConfig<
 
   return res;
 }
+
+// --- internal ---
+
+function tryResolve(id: string, options: LoadConfigOptions<any, any>) {
+  return resolveModulePath(id, {
+    try: true,
+    from: pathToFileURL(join(options.cwd || ".", options.configFile || "/")),
+    suffixes: ["", "/index"],
+    extensions: SUPPORTED_EXTENSIONS,
+    cache: false,
+  });
+}

src/loader.ts

@@ -79,11 +79,13 @@ export async function updateConfig(
 
 // --- Internal ---
 
-function tryResolve(path: string, cwd: string, exts: readonly string[]) {
+function tryResolve(path: string, cwd: string, extensions: string[]) {
   return resolveModulePath(path, {
     try: true,
     from: join(cwd, "/"),
-    extensions: exts as string[],
+    extensions,
+    suffixes: ["", "/index"],
+    cache: false,
   });
 }