From df3919644e387bf4bee120ee91afb03e9517f4ec Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Tue, 25 Feb 2025 21:32:15 +0100 Subject: [PATCH 1/2] wip --- src/loader.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/loader.ts b/src/loader.ts index 2fdc4bb..6c36b3a 100644 --- a/src/loader.ts +++ b/src/loader.ts @@ -2,7 +2,7 @@ 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 { resolve, extname, dirname, basename, join, normalize } from "pathe"; import { resolveModulePath } from "exsolve"; import { createJiti } from "jiti"; import * as rc9 from "rc9"; @@ -434,11 +434,12 @@ async function resolveConfig< // --- internal --- function tryResolve(id: string, options: LoadConfigOptions) { - return resolveModulePath(id, { + const res = resolveModulePath(id, { try: true, from: pathToFileURL(join(options.cwd || ".", options.configFile || "/")), suffixes: ["", "/index"], extensions: SUPPORTED_EXTENSIONS, cache: false, }); + return res ? normalize(res) : undefined; } From 6b00c1e20bed4f8fdec3998104c2849004e20143 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Tue, 25 Feb 2025 16:21:16 -0800 Subject: [PATCH 2/2] fix: fix windows issues --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- src/update.ts | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 36b71ab..0473602 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "confbox": "^0.1.8", "defu": "^6.1.4", "dotenv": "^16.4.7", - "exsolve": "^0.4.1", + "exsolve": "^0.4.2", "giget": "^2.0.0", "jiti": "^2.4.2", "ohash": "^2.0.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bff791f..2406f69 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^16.4.7 version: 16.4.7 exsolve: - specifier: ^0.4.1 - version: 0.4.1 + specifier: ^0.4.2 + version: 0.4.2 giget: specifier: ^2.0.0 version: 2.0.0 @@ -1335,8 +1335,8 @@ packages: resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==} engines: {node: '>=12.0.0'} - exsolve@0.4.1: - resolution: {integrity: sha512-4eEqlWpgrVFf6C7s6YyKPaBlZvx1Hbs+e2pnW25nr+qcdd9vytr/KhX2mRIB2kNfYdXhbmmvKFDHjzriPSdxhA==} + exsolve@0.4.2: + resolution: {integrity: sha512-sLGq+3R6ISovHNxuENnZ69paPIQm8h2bfeSefXIKvBLNCgh4pc+luHtgTLC4ij2zN6KFm1aMG8efQXcjyNy3lw==} fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} @@ -3730,7 +3730,7 @@ snapshots: expect-type@1.1.0: {} - exsolve@0.4.1: {} + exsolve@0.4.2: {} fast-deep-equal@3.1.3: {} diff --git a/src/update.ts b/src/update.ts index 4c376ca..7d67555 100644 --- a/src/update.ts +++ b/src/update.ts @@ -1,6 +1,6 @@ import { resolveModulePath } from "exsolve"; import { SUPPORTED_EXTENSIONS } from "./loader"; -import { join } from "pathe"; +import { join, normalize } from "pathe"; import { readFile, writeFile, mkdir } from "node:fs/promises"; import { dirname, extname } from "node:path"; @@ -80,13 +80,14 @@ export async function updateConfig( // --- Internal --- function tryResolve(path: string, cwd: string, extensions: string[]) { - return resolveModulePath(path, { + const res = resolveModulePath(path, { try: true, from: join(cwd, "/"), extensions, suffixes: ["", "/index"], cache: false, }); + return res ? normalize(res) : undefined; } // --- Types ---