feat: compatible with the original additionalData

Author: tolking

src/core/options.ts

@@ -1,6 +1,7 @@
 import { useNuxt } from '@nuxt/kit'
 import { libraryName, optimizeDeps } from '../config'
 import type { ModuleOptions, Themes } from '../types'
+import { isFunction } from '../utils'
 
 export function resolveOptions (config: ModuleOptions) {
   const { cache, importStyle, namespace, themeChalk } = config
@@ -18,11 +19,17 @@ export function resolveOptions (config: ModuleOptions) {
     nuxt.options.vite.optimizeDeps.exclude.push(libraryName)
   }
 
+  nuxt.options.vite.css ||= {}
+  nuxt.options.vite.css.preprocessorOptions ||= {}
+  nuxt.options.vite.css.preprocessorOptions.scss ||= {}
+  nuxt.options.vite.css.preprocessorOptions.scss.api = 'modern-compiler'
+  nuxt.options.webpack.loaders.scss.api = 'modern-compiler'
+
   if (importStyle === 'scss' && themeChalk) {
     const keys = Object.keys(themeChalk)
     const files: Array<'namespace' | 'common' | Themes> = []
 
-    if (namespace) {
+    if (namespace && namespace !== 'el') {
       files.push('namespace')
     }
     if (keys.some(key => key.startsWith('$'))) {
@@ -35,13 +42,21 @@ export function resolveOptions (config: ModuleOptions) {
       return all
     }, '')
 
-    nuxt.options.vite.css ||= {}
-    nuxt.options.vite.css.preprocessorOptions ||= {}
-    nuxt.options.vite.css.preprocessorOptions.scss ||= {}
-    nuxt.options.vite.css.preprocessorOptions.scss.api = 'modern-compiler'
-    nuxt.options.vite.css.preprocessorOptions.scss.additionalData = additionalData
+    async function genAdditionalData (old: string | Function | undefined, source: string, ...arg: unknown[]) {
+      const res = isFunction(old) ? await old(source, ...arg) : (old ?? '') + source
+      return additionalData + res
+    }
+
+    if (additionalData) {
+      const oldVite = nuxt.options.vite.css!.preprocessorOptions!.scss.additionalData
+      nuxt.options.vite.css.preprocessorOptions.scss.additionalData = (source: string, ...arg: unknown[]) => {
+        return genAdditionalData(oldVite, source, ...arg)
+      }
 
-    nuxt.options.webpack.loaders.scss.api = 'modern-compiler'
-    nuxt.options.webpack.loaders.scss.additionalData = additionalData
+      const oldWebpack = nuxt.options.webpack.loaders.scss.additionalData
+      nuxt.options.webpack.loaders.scss.additionalData = (source: string, ...arg: unknown[]) => {
+        return genAdditionalData(oldWebpack, source, ...arg)
+      }
+    }
   }
 }

src/core/themeChalk.ts

@@ -20,7 +20,7 @@ export function resolveThemeChalk (config: ModuleOptions) {
     }
   })
 
-  if (namespace) {
+  if (namespace && namespace !== 'el') {
     files.push(genNamespaceFile())
   }
 

src/utils.ts

@@ -31,7 +31,11 @@ export function getLayersDir (layers: NuxtConfigLayer[]) {
 }
 
 export function isObject (value: any): value is Record<string, any> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
+  return typeof value === 'object' && value !== null && !isArray(value)
+}
+
+export function isFunction (value: any): value is Function {
+  return typeof value === 'function'
 }
 
 export function isArray (value: any): value is any[] {