diff --git a/src/module.ts b/src/module.ts index c6beb34..a2def66 100644 --- a/src/module.ts +++ b/src/module.ts @@ -30,6 +30,9 @@ export default defineNuxtModule({ } }, defaults, + onInstall () { + resolveBaseImports({} as ModuleOptions) + }, setup (options, nuxt) { const layers = getLayersDir(nuxt.options._layers) @@ -45,33 +48,40 @@ export default defineNuxtModule({ nuxt.options.components !== false && resolveComponents(options) options.cache && addTemplate(resolveCache(options)) options.globalConfig && addPluginTemplate(resolveGlobalConfig(options)) - options.importStyle === 'scss' && options.themeChalk && resolveThemeChalk(options).map(addTemplate) + options.importStyle === 'scss' && + options.themeChalk && + resolveThemeChalk(options).map(addTemplate) if (nuxt.options.ssr !== false) { addPluginTemplate(resolveInjection(options)) addPluginTemplate(resolveTeleports(options)) - options.installMethods.length && addPluginTemplate(resolveMethods(options)) + options.installMethods.length && + addPluginTemplate(resolveMethods(options)) } nuxt.hook('vite:extendConfig', (config, { isClient }) => { const mode = isClient ? 'client' : 'server' config.plugins = config.plugins || [] - config.plugins.push(transformPlugin.vite({ - layers, - cache: options.cache, - include: options.include, - exclude: options.exclude, - sourcemap: nuxt.options.sourcemap[mode], - transformStyles: name => resolveStyles(options, name), - transformDirectives: name => resolveDirectives(options, name) - })) + config.plugins.push( + transformPlugin.vite({ + layers, + cache: options.cache, + include: options.include, + exclude: options.exclude, + sourcemap: nuxt.options.sourcemap[mode], + transformStyles: name => resolveStyles(options, name), + transformDirectives: name => resolveDirectives(options, name) + }) + ) if (options.defaultLocale !== 'en') { - config.plugins.push(localePlugin.vite({ - sourcemap: nuxt.options.sourcemap[mode], - locale: options.defaultLocale - })) + config.plugins.push( + localePlugin.vite({ + sourcemap: nuxt.options.sourcemap[mode], + locale: options.defaultLocale + }) + ) } }) @@ -80,21 +90,25 @@ export default defineNuxtModule({ const mode = config.name === 'client' ? 'client' : 'server' config.plugins = config.plugins || [] - config.plugins.push(transformPlugin.webpack({ - layers, - cache: options.cache, - include: options.include, - exclude: options.exclude, - sourcemap: nuxt.options.sourcemap[mode], - transformStyles: name => resolveStyles(options, name), - transformDirectives: name => resolveDirectives(options, name) - })) + config.plugins.push( + transformPlugin.webpack({ + layers, + cache: options.cache, + include: options.include, + exclude: options.exclude, + sourcemap: nuxt.options.sourcemap[mode], + transformStyles: name => resolveStyles(options, name), + transformDirectives: name => resolveDirectives(options, name) + }) + ) if (options.defaultLocale !== 'en') { - config.plugins.push(localePlugin.webpack({ - sourcemap: nuxt.options.sourcemap[mode], - locale: options.defaultLocale - })) + config.plugins.push( + localePlugin.webpack({ + sourcemap: nuxt.options.sourcemap[mode], + locale: options.defaultLocale + }) + ) } }) }) diff --git a/src/utils.ts b/src/utils.ts index 8abc522..f3bf9b6 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -27,6 +27,7 @@ export function getLayersDir (layers: readonly NuxtConfigLayer[]) { const srcDir = layer.config.srcDir || layer.cwd if ( srcDir.includes('node_modules') && + isObject(layer.config.elementPlus) && layer.config.elementPlus?.importStyle !== false ) { list.push(srcDir)