fix(cli): 修复 create 命令，fix #6852

NervJS · Jul 13, 2020 · fea55af · fea55af
1 parent ad897eb
commit fea55af
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 105 deletions.
diff --git a/packages/taro-cli/__tests__/cli.spec.ts b/packages/taro-cli/__tests__/cli.spec.ts
@@ -143,48 +143,6 @@ describe('inspect', () => {
     })
   })
 
-  describe('create', () => {
-    const baseOpts = {
-      appPath: APP_PATH,
-      type: undefined,
-      name: undefined,
-      description: undefined,
-      isHelp: false
-    }
-
-    it('should make configs', () => {
-      const type = 'component'
-      const name = 'detail'
-      const description = 'chore'
-      setProcessArgv('taro create component detail --description=chore')
-      cli.run()
-      const ins = MockedKernel.mock.instances[0]
-      expect(ins.run).toHaveBeenCalledWith({
-        name: 'create',
-        opts: Object.assign({}, baseOpts, {
-          type,
-          name,
-          description
-        })
-      })
-    })
-
-    it('should set type and name', () => {
-      const type = 'page'
-      const name = 'my'
-      setProcessArgv('taro create --name my')
-      cli.run()
-      const ins = MockedKernel.mock.instances[0]
-      expect(ins.run).toHaveBeenCalledWith({
-        name: 'create',
-        opts: Object.assign({}, baseOpts, {
-          type,
-          name
-        })
-      })
-    })
-  })
-
   describe('convert', () => {
     it('should make configs', () => {
       setProcessArgv('taro convert')

diff --git a/packages/taro-cli/src/cli.ts b/packages/taro-cli/src/cli.ts
@@ -5,7 +5,6 @@ import { Kernel } from '@tarojs/service'
 
 import build from './commands/build'
 import init from './commands/init'
-import create from './commands/create'
 import convert from './commands/convert'
 import customCommand from './commands/customCommand'
 import { getPkgVersion } from './util'
@@ -68,18 +67,6 @@ export default class CLI {
           })
           break
         }
-        case 'create': {
-          const type = _[1] || 'page'
-          const name = _[2] || args.name
-          create(kernel, {
-            appPath: this.appPath,
-            type,
-            name,
-            description: args.description,
-            isHelp: args.h
-          })
-          break
-        }
         case 'convert': {
           convert(kernel, {
             appPath: this.appPath,

diff --git a/packages/taro-cli/src/commands/create.ts b/packages/taro-cli/src/commands/create.ts
diff --git a/packages/taro-cli/src/create/page.ts b/packages/taro-cli/src/create/page.ts
@@ -54,8 +54,11 @@ export default class Page extends Creator {
       css: 'none',
       typescript: false
     }
+
+    // set template name
     templateInfo.template = templateInfo.name
     delete templateInfo.name
+
     this.conf = Object.assign(this.conf, templateInfo)
   }
 

diff --git a/packages/taro-cli/src/create/project.ts b/packages/taro-cli/src/create/project.ts
@@ -129,7 +129,7 @@ export default class Project extends Creator {
       const newTemplateChoices: ITemplates[] = templateChoices
         .filter(templateChoice => {
           const { platforms } = templateChoice
-          if (typeof platforms === 'string') {
+          if (typeof platforms === 'string' && platforms) {
             return answers.framework === templateChoice.platforms
           } else if (isArray(platforms)) {
             return templateChoice.platforms?.includes(answers.framework)

diff --git a/packages/taro-cli/src/presets/commands/create.ts b/packages/taro-cli/src/presets/commands/create.ts
@@ -7,27 +7,29 @@ export default (ctx: IPluginContext) => {
       '--name [name]': '名称',
       '--description [description]': '介绍'
     },
-    fn () {
-      const {
-        type,
-        name,
-        description
-      } = ctx.runOpts
+    synopsisList: [
+      'taro create page',
+      'taro create --name=page --description=desc'
+    ],
+    fn ({ _, options }) {
+      const name = _[1] || options.name
+      const description = options.description || ''
       const { chalk } = ctx.helper
       const { appPath } = ctx.paths
+
       if (typeof name !== 'string') {
         return console.log(chalk.red('请输入需要创建的页面名称'))
       }
-      if (type === 'page') {
-        const Page = require('../../create/page').default
-        const page = new Page({
-          pageName: name,
-          projectDir: appPath,
-          description
-        })
 
-        page.create()
-      }
+      const Page = require('../../create/page').default
+      const page = new Page({
+        pageName: name,
+        projectDir: appPath,
+        description,
+        framework: ctx.initialConfig.framework
+      })
+
+      page.create()
     }
   })
 }
diff --git a/packages/taro-cli/templates/default/src/pages/index/index.jsx b/packages/taro-cli/templates/default/src/pages/index/index.jsx
@@ -4,7 +4,7 @@ import React, { Component } from 'react'
 import Nerv, { Component } from 'nervjs'
 <%}-%>
 import { View, Text } from '@tarojs/components'
-import './<%= pageName %>.<%= cssExt %>'
+import './index.<%= cssExt %>'
 
 export default class <%= _.capitalize(pageName) %> extends Component {
 

diff --git a/packages/taro-cli/templates/default/src/pages/index/index.vue b/packages/taro-cli/templates/default/src/pages/index/index.vue
@@ -8,21 +8,23 @@
 <%if (framework === 'vue3') {-%>
 import { ref } from 'vue'
 <%}-%>
+import './index.<%= cssExt %>'
+
 export default {
-  <%if (framework === 'vue') {-%>
+<%if (framework === 'vue') {-%>
   data () {
     return {
       msg: 'Hello world!'
     }
   }
-  <%}-%>
-  <%if (framework === 'vue3') {-%>
+<%}-%>
+<%if (framework === 'vue3') {-%>
   setup () {
     const msg = ref('Hello world')
     return {
       msg
     }
   }
-  <%}-%>
+<%}-%>
 }
 </script>
diff --git a/packages/taro-cli/templates/default/template_creator.js b/packages/taro-cli/templates/default/template_creator.js
@@ -6,16 +6,24 @@ const handler = {
   '/global.d.ts': createWhenTs,
   '/tsconfig.json': createWhenTs,
   '/src/pages/index/index.jsx' ({ pageName }) {
-    return { setPageName: `/src/pages/${pageName}/${pageName}.jsx` }
+    return { setPageName: `/src/pages/${pageName}/index.jsx` }
   },
   '/src/pages/index/index.css' ({ pageName }) {
-    return { setPageName: `/src/pages/${pageName}/${pageName}.css` }
+    return { setPageName: `/src/pages/${pageName}/index.css` }
+  },
+  '/src/pages/index/index.vue' ({ pageName }) {
+    return { setPageName: `/src/pages/${pageName}/index.vue` }
+  },
+  '/src/pages/index/index.config.js' ({ pageName }) {
+    return { setPageName: `/src/pages/${pageName}/index.config.js` }
   }
 }
 
 const basePageFiles = [
   '/src/pages/index/index.jsx',
-  '/src/pages/index/index.css'
+  '/src/pages/index/index.vue',
+  '/src/pages/index/index.css',
+  '/src/pages/index/index.config.js'
 ]
 
 module.exports = {