Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-19 01:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(kit): try extensions with resolvePath with absolute input (#6233)

Browse Source
This commit is contained in:
pooya parsa 2022-07-29 15:53:35 +02:00 committed by GitHub
parent 63cbb773df
commit 5dc864d7bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/kit/src/resolve.ts
View File

@ -28,7 +28,7 @@ export async function resolvePath (path: string, opts: ResolvePathOptions = {}):
path = normalize(path) path = normalize(path)
// Fast return if the path exists // Fast return if the path exists
if (isAbsolute(path) && existsSync(path)) { if (isAbsolute(path) && existsSync(path) && !(await isDirectory(path))) {
return path return path
} }
@ -47,10 +47,10 @@ export async function resolvePath (path: string, opts: ResolvePathOptions = {}):
} }
// Check if resolvedPath is a file // Check if resolvedPath is a file
let isDirectory = false let _isDir = false
if (existsSync(path)) { if (existsSync(path)) {
isDirectory = (await fsp.lstat(path)).isDirectory() _isDir = await isDirectory(path)
if (!isDirectory) { if (!_isDir) {
return path return path
} }
} }
@ -64,7 +64,7 @@ export async function resolvePath (path: string, opts: ResolvePathOptions = {}):
} }
// path/index.[ext] // path/index.[ext]
const pathWithIndex = join(path, 'index' + ext) const pathWithIndex = join(path, 'index' + ext)
if (isDirectory && existsSync(pathWithIndex)) { if (_isDir && existsSync(pathWithIndex)) {
return pathWithIndex return pathWithIndex
} }
} }
@ -89,8 +89,8 @@ export async function findPath (paths: string|string[], opts?: ResolvePathOption
for (const path of paths) { for (const path of paths) {
const rPath = await resolvePath(path, opts) const rPath = await resolvePath(path, opts)
if (await existsSensitive(rPath)) { if (await existsSensitive(rPath)) {
const isDirectory = (await fsp.lstat(rPath)).isDirectory() const _isDir = await isDirectory(rPath)
if (!pathType || (pathType === 'file' && !isDirectory) || (pathType === 'dir' && isDirectory)) { if (!pathType || (pathType === 'file' && !_isDir) || (pathType === 'dir' && _isDir)) {
return rPath return rPath
} }
} }
@ -146,6 +146,11 @@ async function existsSensitive (path: string) {
return dirFiles.includes(basename(path)) return dirFiles.includes(basename(path))
} }
// Usage note: We assume path existance is already ensured
async function isDirectory (path: string) {
return (await fsp.lstat(path)).isDirectory()
}
export async function resolveFiles (path: string, pattern: string | string[]) { export async function resolveFiles (path: string, pattern: string | string[]) {
const files = await globby(pattern, { cwd: path, followSymbolicLinks: true }) const files = await globby(pattern, { cwd: path, followSymbolicLinks: true })
return files.map(p => resolve(path, p)).filter(p => !isIgnored(p)).sort() return files.map(p => resolve(path, p)).filter(p => !isIgnored(p)).sort()