feat: 支持多 Resolver 以及 extraConfig 合并

packages/core/src/utils/injectUtils.ts

@@ -0,0 +1,30 @@
+import type { PluginData } from './types'
+import { deepMerge } from './deepMerge'
+
+function addResolver(plugin: PluginData, resolver: string) {
+  if (plugin.initializer == null || plugin.initializer.includes(resolver)) {
+    return plugin
+  }
+
+  return {
+    ...plugin,
+    initializer: plugin.initializer.replace(
+      /(resolvers\s*:\s*\[)([\s\S]*?)(\])/,
+      (_, prefix, content, suffix) => {
+        const cont = content.trim()
+
+        return `${prefix}${cont}${cont ? ', ' : ''}${resolver}${suffix}`
+      },
+    ),
+  }
+}
+
+function mergeExtraConfig(oldConfig: Record<string, any> | null, config: Record<string, any>) {
+  return deepMerge(oldConfig || {}, config)
+}
+
+export const injectUtils = {
+  deepMerge,
+  addResolver,
+  mergeExtraConfig,
+}

packages/core/src/utils/renderTemplate.ts

@@ -3,6 +3,7 @@ import * as path from 'node:path'
 import { pathToFileURL } from 'node:url'
 
 import { deepMerge } from './deepMerge'
+import { injectUtils } from './injectUtils'
 import { sortDependencies } from './sortDependencies'
 
 /**
@@ -77,6 +78,7 @@ export function renderTemplate(src: string, dest: string, callbacks: Callback[])
       // Though current `getData` are all sync, we still retain the possibility of async
       dataStore[dest] = await getData({
         oldData: dataStore[dest] || {},
+        utils: injectUtils,
       })
     })
 

packages/core/src/utils/types.ts

@@ -0,0 +1,6 @@
+export interface PluginData {
+  id: string
+  importer?: string
+  dynamicImporter?: string
+  initializer?: string
+}

packages/core/template/UI/ano/vite.config.js.data.mjs

@@ -1,21 +1,15 @@
-export default function getData({ oldData }) {
+export default function getData({ oldData, utils }) {
   const autoImportAnoUiPlugin = {
     id: 'ano-ui',
     importer: `import { AnoResolver } from '@uni-helper/vite-plugin-uni-components/resolvers'`,
-    initializer: `Components({
-      dts: true,
-      resolvers: [AnoResolver()]
-    })`,
   }
 
   return {
     ...oldData,
-    plugins: oldData.plugins.some(plugin => plugin.id === 'autoImport')
-      ? oldData.plugins.flatMap(plugin =>
-          plugin.id === 'autoImport' ? [{ id: plugin.id, importer: plugin.importer }, autoImportAnoUiPlugin] : plugin,
-        )
-      : oldData.plugins.flatMap(plugin =>
-          plugin.id === 'uni' ? [autoImportAnoUiPlugin, plugin] : plugin,
-        ),
+    plugins: oldData.plugins.flatMap(plugin =>
+      plugin.id === 'autoImport'
+        ? [utils.addResolver(plugin, 'AnoResolver()'), autoImportAnoUiPlugin]
+        : plugin,
+    ),
   }
 }

packages/core/template/UI/nut/vite.config.js.data.mjs

@@ -1,11 +1,7 @@
-export default function getData({ oldData }) {
+export default function getData({ oldData, utils }) {
   const autoImportNutUiPlugin = {
     id: 'nutui-uniapp',
     importer: `import { NutResolver } from 'nutui-uniapp'`,
-    initializer: `Components({
-      dts: true,
-      resolvers: [NutResolver()]
-    })`,
   }
 
   const nutuiExtraConfig = {
@@ -20,13 +16,11 @@ export default function getData({ oldData }) {
 
   return {
     ...oldData,
-    plugins: oldData.plugins.some(plugin => plugin.id === 'autoImport')
-      ? oldData.plugins.flatMap(plugin =>
-          plugin.id === 'autoImport' ? [{ id: plugin.id, importer: plugin.importer }, autoImportNutUiPlugin] : plugin,
-        )
-      : oldData.plugins.flatMap(plugin =>
-          plugin.id === 'uni' ? [autoImportNutUiPlugin, plugin] : plugin,
-        ),
-    extraConfig: oldData?.extraConfig ? { ...oldData.extraConfig, ...nutuiExtraConfig } : nutuiExtraConfig,
+    plugins: oldData.plugins.flatMap(plugin =>
+      plugin.id === 'autoImport'
+        ? [utils.addResolver(plugin, 'NutResolver()'), autoImportNutUiPlugin]
+        : plugin,
+    ),
+    extraConfig: utils.mergeExtraConfig(oldData.extraConfig, nutuiExtraConfig),
   }
 }

packages/core/template/UI/skiyee/vite.config.js.data.mjs

@@ -1,21 +1,15 @@
-export default function getData({ oldData }) {
+export default function getData({ oldData, utils }) {
   const autoImportSkiyeeUiPlugin = {
     id: 'skiyee-ui',
     importer: `import SkResolver from '@skiyee/ui-resolver'`,
-    initializer: `Components({
-      dts: true,
-      resolvers: [SkResolver()]
-    })`,
   }
 
   return {
     ...oldData,
-    plugins: oldData.plugins.some(plugin => plugin.id === 'autoImport')
-      ? oldData.plugins.flatMap(plugin =>
-          plugin.id === 'autoImport' ? [{ id: plugin.id, importer: plugin.importer }, autoImportSkiyeeUiPlugin] : plugin,
-        )
-      : oldData.plugins.flatMap(plugin =>
-          plugin.id === 'uni' ? [autoImportSkiyeeUiPlugin, plugin] : plugin,
-        ),
+    plugins: oldData.plugins.flatMap(plugin =>
+      plugin.id === 'autoImport'
+        ? [utils.addResolver(plugin, 'SkResolver()'), autoImportSkiyeeUiPlugin]
+        : plugin,
+    ),
   }
 }

packages/core/template/UI/uni/vite.config.js.data.mjs

@@ -1,29 +1,18 @@
-export default function getData({ oldData }) {
+export default function getData({ oldData, utils }) {
   const hasRootPlugin = oldData.plugins.some(plugin => plugin.id === 'root')
   const resolverOptions = hasRootPlugin ? '{ exclude: \'UniKuAppRoot\' }' : ''
 
   const autoImportUniUiPlugin = {
     id: 'uni-ui',
     importer: `import { UniUIResolver } from '@uni-helper/vite-plugin-uni-components/resolvers'`,
-    initializer: `Components({
-      dts: true,
-      resolvers: [UniUIResolver(${resolverOptions})]
-    })`,
   }
 
   return {
     ...oldData,
-    plugins: oldData.plugins.some(plugin => plugin.id === 'autoImport')
-      ? oldData.plugins.flatMap(plugin =>
-          plugin.id === 'autoImport'
-            ? [
-                { id: plugin.id, importer: plugin.importer },
-                autoImportUniUiPlugin,
-              ]
-            : plugin,
-        )
-      : oldData.plugins.flatMap(plugin =>
-          plugin.id === 'uni' ? [autoImportUniUiPlugin, plugin] : plugin,
-        ),
+    plugins: oldData.plugins.flatMap(plugin =>
+      plugin.id === 'autoImport'
+        ? [utils.addResolver(plugin, `UniUIResolver(${resolverOptions})`), autoImportUniUiPlugin]
+        : plugin,
+    ),
   }
 }

packages/core/template/UI/uv/vite.config.js.data.mjs

@@ -1,21 +1,15 @@
-export default function getData({ oldData }) {
+export default function getData({ oldData, utils }) {
   const autoImportUvUiPlugin = {
     id: 'uv-ui',
     importer: `import { UvResolver } from '@uni-helper/vite-plugin-uni-components/resolvers'`,
-    initializer: `Components({
-      dts: true,
-      resolvers: [UvResolver()]
-    })`,
   }
 
   return {
     ...oldData,
-    plugins: oldData.plugins.some(plugin => plugin.id === 'autoImport')
-      ? oldData.plugins.flatMap(plugin =>
-          plugin.id === 'autoImport' ? [{ id: plugin.id, importer: plugin.importer }, autoImportUvUiPlugin] : plugin,
-        )
-      : oldData.plugins.flatMap(plugin =>
-          plugin.id === 'uni' ? [autoImportUvUiPlugin, plugin] : plugin,
-        ),
+    plugins: oldData.plugins.flatMap(plugin =>
+      plugin.id === 'autoImport'
+        ? [utils.addResolver(plugin, 'UvResolver()'), autoImportUvUiPlugin]
+        : plugin,
+    ),
   }
 }

packages/core/template/UI/uview-pro/vite.config.js.data.mjs

@@ -1,11 +1,7 @@
-export default function getData({ oldData }) {
+export default function getData({ oldData, utils }) {
   const autoImportUviewProPlugin = {
     id: 'uview-pro',
     importer: `import { uViewProResolver } from '@uni-helper/vite-plugin-uni-components/resolvers'`,
-    initializer: `Components({
-      dts: true,
-      resolvers: [uViewProResolver()]
-    })`,
   }
 
   const uviewProExtraConfig = {
@@ -20,13 +16,11 @@ export default function getData({ oldData }) {
 
   return {
     ...oldData,
-    plugins: oldData.plugins.some(plugin => plugin.id === 'autoImport')
-      ? oldData.plugins.flatMap(plugin =>
-          plugin.id === 'autoImport' ? [{ id: plugin.id, importer: plugin.importer }, autoImportUviewProPlugin] : plugin,
-        )
-      : oldData.plugins.flatMap(plugin =>
-          plugin.id === 'uni' ? [autoImportUviewProPlugin, plugin] : plugin,
-        ),
-    extraConfig: oldData?.extraConfig ? { ...oldData.extraConfig, ...uviewProExtraConfig } : uviewProExtraConfig,
+    plugins: oldData.plugins.flatMap(plugin =>
+      plugin.id === 'autoImport'
+        ? [utils.addResolver(plugin, 'uViewProResolver()'), autoImportUviewProPlugin]
+        : plugin,
+    ),
+    extraConfig: utils.mergeExtraConfig(oldData.extraConfig, uviewProExtraConfig),
   }
 }

packages/core/template/UI/wot/vite.config.js.data.mjs

@@ -1,21 +1,15 @@
-export default function getData({ oldData }) {
+export default function getData({ oldData, utils }) {
   const autoImportWotDesignUiPlugin = {
     id: 'wot-design-ui',
     importer: `import { WotResolver } from '@uni-helper/vite-plugin-uni-components/resolvers'`,
-    initializer: `Components({
-      dts: true,
-      resolvers: [WotResolver()]
-    })`,
   }
 
   return {
     ...oldData,
-    plugins: oldData.plugins.some(plugin => plugin.id === 'autoImport')
-      ? oldData.plugins.flatMap(plugin =>
-          plugin.id === 'autoImport' ? [{ id: plugin.id, importer: plugin.importer }, autoImportWotDesignUiPlugin] : plugin,
-        )
-      : oldData.plugins.flatMap(plugin =>
-          plugin.id === 'uni' ? [autoImportWotDesignUiPlugin, plugin] : plugin,
-        ),
+    plugins: oldData.plugins.flatMap(plugin =>
+      plugin.id === 'autoImport'
+        ? [utils.addResolver(plugin, 'WotResolver()'), autoImportWotDesignUiPlugin]
+        : plugin,
+    ),
   }
 }

packages/core/template/base/vite.config.js.data.mjs

@@ -4,7 +4,7 @@ export default function getData() {
       id: 'uni',
       importer: `import Uni from '@uni-helper/plugin-uni'`,
       initializer: `// https://uni-helper.js.org/plugin-uni
-      Uni()`,
+    Uni()`,
     }],
     extraConfig: null,
     dynamic: false,

packages/core/template/module/uniPromises/vite.config.js.data.mjs

@@ -1,4 +1,4 @@
-export default function getData({ oldData }) {
+export default function getData({ oldData, utils }) {
   const promisesExtraConfig = {
     build: {
       target: 'es6',
@@ -8,8 +8,9 @@ export default function getData({ oldData }) {
       exclude: ['vue-demi'],
     },
   }
+
   return {
     ...oldData,
-    extraConfig: oldData?.extraConfig ? { ...oldData.extraConfig, ...promisesExtraConfig } : promisesExtraConfig,
+    extraConfig: utils.mergeExtraConfig(oldData.extraConfig, promisesExtraConfig),
   }
 }

packages/core/template/module/uniUse/vite.config.js.data.mjs

@@ -1,4 +1,4 @@
-export default function getData({ oldData }) {
+export default function getData({ oldData, utils }) {
   const uniUseExtraConfig = {
     build: {
       target: 'es6',
@@ -11,6 +11,6 @@ export default function getData({ oldData }) {
 
   return {
     ...oldData,
-    extraConfig: oldData?.extraConfig ? { ...oldData.extraConfig, ...uniUseExtraConfig } : uniUseExtraConfig,
+    extraConfig: utils.mergeExtraConfig(oldData.extraConfig, uniUseExtraConfig),
   }
 }

packages/core/template/plugin/import/vite.config.js.data.mjs

@@ -5,6 +5,7 @@ export default function getData({ oldData }) {
     initializer: `// https://uni-helper.js.org/vite-plugin-uni-components
     Components({
       dts: true,
+      resolvers: []
     })`,
   }