feat(cli): 支持更改 CLI 展示的模板名称

NervJS · Jun 18, 2024 · 2fc0933 · 2fc0933
1 parent 9afb28a
commit 2fc0933
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/packages/taro-cli/src/create/fetchTemplate.ts b/packages/taro-cli/src/create/fetchTemplate.ts
@@ -10,6 +10,7 @@ import { TEMPLATE_CREATOR } from './constants'
 
 export interface ITemplates {
   name: string
+  value: string
   platforms?: string | string[]
   desc?: string
   compiler?: string[]
@@ -108,11 +109,12 @@ export default function fetchTemplate (templateSource: string, templateRootPath:
       const res: ITemplates[] = files.map(name => {
         const creatorFile = path.join(templateRootPath, name, TEMPLATE_CREATOR)
 
-        if (!fs.existsSync(creatorFile)) return { name }
-        const { platforms = '', desc = '', compiler } = require(creatorFile)
+        if (!fs.existsSync(creatorFile)) return { name, value: name }
+        const { name: displayName, platforms = '', desc = '', compiler } = require(creatorFile)
 
         return {
-          name,
+          name: displayName || name,
+          value: name,
           platforms,
           compiler,
           desc
@@ -124,15 +126,16 @@ export default function fetchTemplate (templateSource: string, templateRootPath:
       await fs.move(templateFolder, path.join(templateRootPath, name), { overwrite: true })
       await fs.remove(tempPath)
 
-      let res: ITemplates = { name, desc: type === 'url' ? templateSource : '' }
+      let res: ITemplates = { name, value: name, desc: type === 'url' ? templateSource : '' }
 
       const creatorFile = path.join(templateRootPath, name, TEMPLATE_CREATOR)
 
       if (fs.existsSync(creatorFile)) {
-        const { platforms = '', desc = '', compiler } = require(creatorFile)
+        const { name: displayName, platforms = '', desc = '', compiler } = require(creatorFile)
 
         res = {
-          name,
+          name: displayName || name,
+          value: name,
           platforms,
           compiler,
           desc: desc || templateSource

diff --git a/packages/taro-cli/src/create/project.ts b/packages/taro-cli/src/create/project.ts
@@ -336,7 +336,7 @@ export default class Project extends Creator {
   askTemplate: AskMethods = function (conf, prompts, list = []) {
     const choices = list.map(item => ({
       name: item.desc ? `${item.name}（${item.desc}）` : item.name,
-      value: item.name
+      value: item.value || item.name
     }))
 
     if (!conf.hideDefaultTemplate) {
@@ -388,6 +388,7 @@ export default class Project extends Creator {
 
   async fetchTemplates (answers: IProjectConf): Promise<ITemplates[]> {
     const { templateSource, framework, compiler } = answers
+    this.conf.framework = this.conf.framework || framework || ''
     this.conf.templateSource = this.conf.templateSource || templateSource
 
     // 使用默认模版
@@ -402,7 +403,8 @@ export default class Project extends Creator {
     const templateChoices = await fetchTemplate(this.conf.templateSource, this.templatePath(''), isClone)
 
     const filterFramework = (_framework) => {
-      const current = framework.toLowerCase()
+      const current = this.conf.framework?.toLowerCase()
+
       if (typeof _framework === 'string' && _framework) {
         return current === _framework.toLowerCase()
       } else if (isArray(_framework)) {