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

feat!(nuxt3): extend auto imports on `generateApp` hook (#3480)

This commit is contained in:
Dizzy 2022-03-07 06:39:54 -04:00 committed by Pooya Parsa
parent 33ffd8be0a
commit 120ee4f795
2 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/nuxt3/src/auto-imports/composables.ts
View File

@ -6,10 +6,9 @@ import { AutoImport } from '@nuxt/schema'
import { resolveFiles } from '@nuxt/kit' import { resolveFiles } from '@nuxt/kit'
import { filterInPlace } from './utils' import { filterInPlace } from './utils'
export async function scanForComposables (dir: string, autoImports: AutoImport[]) { export async function scanForComposables (dir: string | string[], autoImports: AutoImport[]) {
if (!existsSync(dir)) { return } const performScan = async (entry: string) => {
const files = await resolveFiles(entry, [
const files = await resolveFiles(dir, [
'*.{ts,js,mjs,cjs,mts,cts}', '*.{ts,js,mjs,cjs,mts,cts}',
'*/index.{ts,js,mjs,cjs,mts,cts}' '*/index.{ts,js,mjs,cjs,mts,cts}'
]) ])
@ -42,3 +41,10 @@ export async function scanForComposables (dir: string, autoImports: AutoImport[]
}) })
) )
} }
for (const entry of Array.isArray(dir) ? dir : [dir]) {
if (!existsSync(entry)) { continue }
await performScan(entry)
}
}

9
packages/nuxt3/src/auto-imports/module.ts
View File

@ -72,9 +72,7 @@ export default defineNuxtModule<AutoImportsOptions>({
: { name: importName.name, as: importName.as || importName.name, from: source.from } : { name: importName.name, as: importName.as || importName.name, from: source.from }
)) ))
// Scan composables/ // Scan composables/
for (const composablesDir of composablesDirs) { await scanForComposables(composablesDirs, ctx.autoImports)
await scanForComposables(composablesDir, ctx.autoImports)
}
// Allow modules extending // Allow modules extending
await nuxt.callHook('autoImports:extend', ctx.autoImports) await nuxt.callHook('autoImports:extend', ctx.autoImports)
// Update context // Update context
@ -96,10 +94,13 @@ export default defineNuxtModule<AutoImportsOptions>({
nuxt.hook('builder:watch', async (_, path) => { nuxt.hook('builder:watch', async (_, path) => {
const _resolved = resolve(nuxt.options.srcDir, path) const _resolved = resolve(nuxt.options.srcDir, path)
if (composablesDirs.find(dir => _resolved.startsWith(dir))) { if (composablesDirs.find(dir => _resolved.startsWith(dir))) {
await regenerateAutoImports()
await nuxt.callHook('builder:generateApp') await nuxt.callHook('builder:generateApp')
} }
}) })
nuxt.hook('builder:generateApp', async () => {
await regenerateAutoImports()
})
} }
}) })