Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ export const allImportsWithStyle: string[] = [
const allImports: PresetImport[] = [
...allImportsWithStyle.map((name) => {
return [name, getComponentPath(name)] as PresetImport
}),
})
]

const allBaseImports: PresetImport[] = [
['ID_INJECTION_KEY', 'es/hooks/use-id/index.mjs'],
['ZINDEX_INJECTION_KEY', 'es/hooks/use-z-index/index.mjs'],
['provideGlobalConfig', 'es/components/config-provider/src/hooks/use-global-config.mjs']
Expand Down Expand Up @@ -103,6 +106,7 @@ export const defaults: ModuleOptions = {
subComponents: allSubComponents,
directives: allDirectives,
imports: allImports,
baseImports: allBaseImports,
importStyle: 'css',
themes: [],
noStylesComponents: allNoStylesComponents,
Expand Down
25 changes: 18 additions & 7 deletions src/core/imports.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
import { addImportsSources } from '@nuxt/kit'
import { iconLibraryName, libraryName } from '../config'
import { genIconPresets, resolvePath, toArray } from '../utils'
import type { ModuleOptions } from '../types'
import type { ModuleOptions, PresetImport } from '../types'

function _resolveImports (imports: Set<PresetImport>) {
imports.forEach(async ([name, path]) => {
addImportsSources({
from: await resolvePath(`${libraryName}/${path}`),
imports: toArray(name)
})
})
}

export async function resolveImports (config: ModuleOptions) {
const { imports, icon } = config
const icons = icon !== false ? genIconPresets(icon) : []
const allImports = new Set(imports)
const allIcons = new Set(icons)

allImports.forEach(async ([name, path]) => {
addImportsSources({
from: await resolvePath(`${libraryName}/${path}`),
imports: toArray(name)
})
})
_resolveImports(allImports)

addImportsSources({
from: await resolvePath(iconLibraryName),
imports: [...allIcons]
})
}

export function resolveBaseImports (config: ModuleOptions) {
const { baseImports } = config
const allBaseImports = new Set(baseImports)

_resolveImports(allBaseImports)
}
6 changes: 3 additions & 3 deletions src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
resolveComponents,
resolveDirectives,
resolveGlobalConfig,
resolveBaseImports,
resolveImports,
resolveInjection,
resolveOptions,
Expand All @@ -25,11 +26,10 @@ export default defineNuxtModule<ModuleOptions>({
}
},
defaults,
setup (_options, nuxt) {
const options = _options as ModuleOptions

setup (options, nuxt) {
resolveOptions()
resolveThemes(options)
resolveBaseImports(options)
nuxt.options.imports.autoImport !== false && resolveImports(options)
nuxt.options.components !== false && resolveComponents(options)

Expand Down
14 changes: 14 additions & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,20 @@ export interface ModuleOptions extends TransformOptions {
* ```
*/
imports: PresetImport[]
/**
*
* List of imports that will be imported whether if autoImports is disabled.
*
* @default
* ```ts
* [
* ["ID_INJECTION_KEY", "es/hooks/use-id/index.mjs"],
* ["ZINDEX_INJECTION_KEY", "es/hooks/use-z-index/index.mjs"],
* ["provideGlobalConfig", "es/components/config-provider/src/hooks/use-global-config.mjs"],
* ]
* ```
*/
baseImports: PresetImport[]
/**
* import style css or sass(scss) with components
*
Expand Down