mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-26 15:42:09 +00:00
Merge 38bfe2a6bc
into cf8142b734
This commit is contained in:
commit
b09764cdd4
@ -122,7 +122,25 @@ export default defineNuxtModule<Partial<ImportsOptions>>({
|
|||||||
const scannedImports = await scanDirExports(composablesDirs, {
|
const scannedImports = await scanDirExports(composablesDirs, {
|
||||||
fileFilter: file => !isIgnored(file),
|
fileFilter: file => !isIgnored(file),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const presetMap = new Map<string, string>()
|
||||||
|
|
||||||
|
for (const preset of presets) {
|
||||||
|
preset.imports = preset.imports ?? []
|
||||||
|
for (const i of preset.imports) {
|
||||||
|
presetMap.set(i, preset.from)
|
||||||
|
}
|
||||||
|
presetMap.set(preset.as, preset.from)
|
||||||
|
}
|
||||||
|
|
||||||
for (const i of scannedImports) {
|
for (const i of scannedImports) {
|
||||||
|
const name = i.as ?? i.name
|
||||||
|
const preset = presetMap.get(name)
|
||||||
|
|
||||||
|
if (preset) {
|
||||||
|
console.warn(`[imports] "${name}" is already defined and auto imported from "${preset ?? 'unknown preset'}" within nuxt itself. Please consider renaming "${name}" at ${i.from}.`)
|
||||||
|
}
|
||||||
|
|
||||||
i.priority = i.priority || priorities.find(([dir]) => i.from.startsWith(dir))?.[1]
|
i.priority = i.priority || priorities.find(([dir]) => i.from.startsWith(dir))?.[1]
|
||||||
}
|
}
|
||||||
imports.push(...scannedImports)
|
imports.push(...scannedImports)
|
||||||
|
Loading…
Reference in New Issue
Block a user