🎨 fix(template): fix template build error

ErKeLost · Aug 14, 2022 · 68a8976 · 68a8976
1 parent bc46f85
commit 68a8976
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/packages/vite-cli/src/core/command/create/createProject/install.ts b/packages/vite-cli/src/core/command/create/createProject/install.ts
@@ -34,11 +34,11 @@ async function installationDeps() {
   console.log('')
   cyan('Project created successfully')
   console.log('')
-  cyan(` cd ${options.name}`)
+  cyan(`cd ${options.name}`)
   cyan(
     options.package === 'npm'
-      ? ` ${options.package} run dev`
-      : ` ${options.package} dev`
+      ? `${options.package} run dev`
+      : `${options.package} dev`
   )
 }
 export default installationDeps
diff --git a/packages/vite-cli/src/core/questions/vue/index.ts b/packages/vite-cli/src/core/questions/vue/index.ts
@@ -10,7 +10,8 @@ import {
   lintMap,
   pluginMap,
   pluginImportStatement,
-  componentResolverMap
+  componentResolverMap,
+  notComponentResolverMap
 } from '@/shared/vueEjsMapConstant'
 import createQuestion from '@/utils/question'
 async function getVueProperty() {
@@ -20,8 +21,12 @@ async function getVueProperty() {
   const Router = futureMap.get('Router')
   const Pinia = futureMap.get('Pinia')
   const currentComponentResolver = componentResolverMap.get(options.components)
+  const notComponentResolver = notComponentResolverMap.includes(
+    options.components
+  )
   options.ui = currentLibrary
   options.ComponentResolver = currentComponentResolver
+  options.notComponentResolver = notComponentResolver
   options.EslintScript = lintMap.get('EslintScript')
   options.PrettierScript = lintMap.get('PrettierScript')
   options.EslintWithPrettierScript = lintMap.get('EslintWithPrettierScript')

diff --git a/packages/vite-cli/src/shared/options.ts b/packages/vite-cli/src/shared/options.ts
@@ -28,6 +28,7 @@ interface Options {
   pluginImportStatement?: string
   // vue-components-import
   ComponentResolver?: string
+  notComponentResolver?: boolean
 }
 
 const options: Options = {

diff --git a/packages/vite-cli/src/shared/vueEjsMapConstant.ts b/packages/vite-cli/src/shared/vueEjsMapConstant.ts
@@ -64,19 +64,22 @@ const pluginImportStatement = new Map([
 ])
 const componentResolverMap = new Map([
   ['element-plus', 'ElementPlusResolver'],
+  ['vuetify', 'VuetifyResolver'],
   ['arco', 'ArcoResolver'],
   ['naive-ui', 'NaiveUiResolver'],
   ['tencent', 'TDesignResolver'],
   ['devui', 'DevUiResolver'],
   ['ant-design', 'AntDesignVueResolver'],
   ['varlet', 'VarletUIResolver']
 ])
+const notComponentResolverMap = ['vuetify', 'ant-design']
 
 export {
   componentsMap,
   futureMap,
   lintMap,
   pluginMap,
   componentResolverMap,
+  notComponentResolverMap,
   pluginImportStatement
 }
diff --git a/packages/vite-cli/template/vue/build/vite/plugin.ejs b/packages/vite-cli/template/vue/build/vite/plugin.ejs
@@ -41,8 +41,8 @@ export function createVitePlugins(viteEnv, isDev: boolean) {
                 prefix: "Icon"
               }),
             <% } -%>
-            <% if (components !== 'vuetify' || components !== 'ant-design') { -%>
-            <%- ComponentResolver %>()
+            <% if (!notComponentResolver) { -%>
+            <%- ComponentResolver + '()' %>
             <% } -%>
           ],
         dts: "src/types/components.d.ts"