Zengtudor
/
Nuxt
mirror of https://github.com/nuxt/nuxt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(kit): avoid fallback to normalized path in module loading (#27507)

This commit is contained in:
Pooya Parsa 2024-06-10 18:18:00 +02:00 committed by GitHub
parent 22cd4770c1
commit da28077be3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/kit/src/module/install.ts
View File

@ -84,7 +84,7 @@ export async function loadNuxtModuleInstance (nuxtModule: string | NuxtModule, n
let error: unknown let error: unknown
for (const path of paths) { for (const path of paths) {
try { try {
const src = await resolvePath(path) const src = await resolvePath(path, { fallbackToOriginal: true })
// Prefer ESM resolution if possible // Prefer ESM resolution if possible
nuxtModule = await importModule(src, nuxt.options.modulesDir).catch(() => null) ?? requireModule(src, { paths: nuxt.options.modulesDir }) nuxtModule = await importModule(src, nuxt.options.modulesDir).catch(() => null) ?? requireModule(src, { paths: nuxt.options.modulesDir })

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

@ -23,6 +23,13 @@ export interface ResolvePathOptions {
* @default false * @default false
*/ */
virtual?: boolean virtual?: boolean
/**
* Whether to fallback to the original path if the resolved path does not exist instead of returning the normalized input path.
*
* @default false
*/
fallbackToOriginal?: boolean
} }
/** /**
@ -99,7 +106,7 @@ export async function resolvePath (path: string, opts: ResolvePathOptions = {}):
} }
// Return normalized input // Return normalized input
return path return opts.fallbackToOriginal ? _path : path
} }
/** /**