Merge pull request #4391 from christlee1989/master

feat(cli): taro-init新增clone选项
NervJS · Sep 4, 2019 · e76cd6f · e76cd6f
2 parents 9390598 + 268bf3d
commit e76cd6f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/docs/template.md b/docs/template.md
@@ -28,6 +28,12 @@ title: 项目模板
 
 * GitHub - github:owner/name
 * GitLab - gitlab:owner/name
+* Direct - direct:url
+
+```sh
+# 初始化项目时可以使用 --clone 选项指定拉取远程模板时使用git clone
+taro init --clone
+```
 
 #### url 模板源
 

diff --git a/packages/taro-cli/bin/taro-init b/packages/taro-cli/bin/taro-init
@@ -10,12 +10,13 @@ program
   .option('--typescript', '使用TypeScript')
   .option('--no-typescript', '不使用TypeScript')
   .option('--template-source [templateSource]', '项目模板源')
+  .option('--clone [clone]', '拉取远程模板时使用git clone')
   .option('--template [template]', '项目模板')
   .option('--css [css]', 'CSS预处理器(sass/less/stylus/none)')
   .parse(process.argv)
 
 const args = program.args
-const { template, templateSource, description, name, css } = program
+const { template, templateSource, clone, description, name, css } = program
 let typescript
 
 /**
@@ -34,6 +35,7 @@ const project = new Project({
   projectName,
   projectDir: process.cwd(),
   templateSource,
+  clone,
   template,
   description,
   typescript,

diff --git a/packages/taro-cli/src/create/fetchTemplate.ts b/packages/taro-cli/src/create/fetchTemplate.ts
@@ -9,7 +9,7 @@ import { getTemplateSourceType, readDirWithFileTypes } from '../util'
 
 const TEMP_DOWNLOAD_FLODER = 'taro-temp'
 
-export default function fetchTemplate (templateSource: string, templateRootPath: string): Promise<any> {
+export default function fetchTemplate (templateSource: string, templateRootPath: string, clone?: boolean): Promise<any> {
   const type = getTemplateSourceType(templateSource)
   const tempPath = path.join(templateRootPath, TEMP_DOWNLOAD_FLODER)
   let name: string
@@ -23,7 +23,7 @@ export default function fetchTemplate (templateSource: string, templateRootPath:
 
     if (type === 'git') {
       name = path.basename(templateSource)
-      download(templateSource, path.join(tempPath, name), async error => {
+      download(templateSource, path.join(tempPath, name), { clone }, async error => {
         if (error) {
           spinner.color = 'red'
           spinner.fail(chalk.red('拉取远程模板仓库失败！'))

diff --git a/packages/taro-cli/src/create/project.ts b/packages/taro-cli/src/create/project.ts
@@ -14,6 +14,7 @@ export interface IProjectConf {
   projectName: string,
   projectDir: string,
   templateSource: string,
+  clone?: boolean,
   template: string,
   description?: string,
   typescript?: boolean,
@@ -96,7 +97,7 @@ export default class Project extends Creator {
     }
 
     // 从模板源下载模板
-    return fetchTemplate(this.conf.templateSource, this.templatePath(''))
+    return fetchTemplate(this.conf.templateSource, this.templatePath(''), this.conf.clone)
   }
 
   ask (templateChoices: string[]) {

diff --git a/packages/taro-cli/src/util/index.ts b/packages/taro-cli/src/util/index.ts
@@ -790,7 +790,7 @@ export function getUserHomeDir (): string {
 export type TemplateSourceType = 'git' | 'url'
 
 export function getTemplateSourceType (url: string): TemplateSourceType {
-  if (/^github:/.test(url) || /^gitlab:/.test(url)) {
+  if (/^github:/.test(url) || /^gitlab:/.test(url) || /^direct:/.test(url)) {
     return 'git'
   } else {
     return 'url'