@gx-design-vue/create-gx-cli 0.0.3 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gx-design-vue/create-gx-cli",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "license": "MIT",
   "description": "a cli to bootstrap gx project",
   "main": "src/index.js",
@@ -9,7 +9,7 @@
     "access": "public"
   },
   "keywords": [
-    "gx-cli",
+    "create-gx-cli",
     "create-project"
   ],
   "author": "gx12358",
@@ -20,7 +20,9 @@
     "kolorist": "^1.6.0",
     "listr": "^0.14.3",
     "minimist": "^1.2.7",
+    "nanospinner": "^1.1.0",
     "ncp": "^2.0.0",
+    "obtain-git-repo": "^1.0.2",
     "prompts": "^2.4.2"
   },
   "files": [

package/src/cli.js

@@ -1,28 +1,32 @@
-import fs from 'fs'
-import path from 'path'
 import minimist from 'minimist'
 import prompts from 'prompts'
-import { yellow, reset } from 'kolorist'
+import { yellow, reset, blue, red, green } from 'kolorist'
 import { createProject } from './main'
 
 const defaultTargetDir = 'gx-cli-project'
 
-function getTemplate() {
-  const templateList = []
-  const files = fs.readdirSync(path.join(process.cwd(), '../'))
-
-  for (const file of files) {
-    if (file.indexOf('template') >= 0) {
-      templateList.push(file)
-    }
+const FRAMEWORKS = [
+  {
+    name: 'gx-design-pro',
+    color: red
+  },
+  {
+    name: 'design-pro',
+    color: blue
+  },
+  {
+    name: 'mobile-vant-cli',
+    color: yellow
+  },
+  {
+    name: 'mobile-vant-html',
+    color: green
   }
-  return templateList.map((el) => {
-    return {
-      name: el.split('-')[1],
-      color: yellow
-    }
-  })
-}
+]
+
+const TEMPLATES = FRAMEWORKS.map(
+  (f) => (f.variants && f.variants.map((v) => v.name)) || [f.name]
+).reduce((a, b) => a.concat(b), [])
 
 function formatTargetDir(targetDir) {
   return targetDir ? targetDir.trim().replace(/\/+$/g, '') : ''
@@ -39,11 +43,6 @@ function parseArgumentsIntoOptions() {
 }
 
 async function promptForMissingOptions(options) {
-  const FRAMEWORKS = getTemplate()
-
-  const TEMPLATES = FRAMEWORKS.map(
-    (f) => (f.variants && f.variants.map((v) => v.name)) || [f.name]
-  ).reduce((a, b) => a.concat(b), [])
   const answers = await prompts([
     {
       type: options.projectName ? null : 'text',
@@ -59,7 +58,7 @@ async function promptForMissingOptions(options) {
           ? reset(
             `"${options.template}" isn't a valid template. Please choose from below: `,
           )
-          : reset('Select a framework:'),
+          : reset('Select a Template:'),
       choices: FRAMEWORKS.map((framework) => {
         const frameworkColor = framework.color
         return {

package/src/main.js

@@ -5,11 +5,20 @@ import Listr from 'listr'
 import ncp from 'ncp'
 import path from 'path'
 import { promisify } from 'util'
+import { createSpinner } from 'nanospinner'
+import { download } from 'obtain-git-repo'
 
 const access = promisify(fs.access)
 const copy = promisify(ncp)
 const writeFileSync = promisify(fs.writeFileSync)
 
+const gitRepositoryList = [
+  {
+    name: 'gx-design-pro',
+    git: 'https://gitee.com/gx12358/vue-antd-admin.git#v2'
+  }
+]
+
 async function copyTemplateFiles(templateDir, root) {
   return copy(templateDir, root, {
     clobber: false
@@ -17,7 +26,32 @@ async function copyTemplateFiles(templateDir, root) {
 }
 
 function writeFile(path, content) {
-  writeFileSync(path, content)
+  if (Object.keys(content).length > 0) {
+    writeFileSync(path, content)
+  }
+}
+
+function editPackageJson(root, projectName) {
+  let pkg = {}
+
+  if (fs.existsSync(path.join(root, `package.json`))) {
+    pkg = JSON.parse(
+      fs.readFileSync(path.join(root, `package.json`), 'utf-8')
+    )
+
+    pkg.name = projectName
+  }
+
+  writeFile(path.join(root, 'package.json'), JSON.stringify(pkg, null, 2))
+}
+
+function doneLog(cwd, root) {
+  if (root !== cwd) {
+    console.log(chalk.blueBright(`cd ${path.relative(cwd, root)}`))
+  }
+  console.log(chalk.blueBright(`pnpm(yarn、npm) install`))
+  console.log(chalk.blueBright(`pnpm(yarn、npm) run dev`))
+  console.log()
 }
 
 export async function createProject(options) {
@@ -28,48 +62,70 @@ export async function createProject(options) {
   const getProjectName = () =>
     options.projectName === '.' ? path.basename(path.resolve()) : options.projectName
 
+  const downloadGit = gitRepositoryList.find(el => el.name === options.template)
+
   const templateDir = path.resolve(
     fileURLToPath(import.meta.url),
     '../..',
-    `template-${options.template}-ts`
+    `template-${options.template}`
   )
 
-  const pkg = JSON.parse(
-    fs.readFileSync(path.join(templateDir, `package.json`), 'utf-8')
-  )
-
-  pkg.name = options.projectName || getProjectName()
-
   try {
     await access(templateDir, fs.constants.R_OK)
   } catch (err) {
-    console.error('%s Invalid template name', chalk.red.bold('ERROR'))
+    if (!downloadGit) {
+      console.log(chalk.redBright('模版目录不存在'))
+      process.exit(1)
+    }
+  }
+
+  //目录是否已经存在
+  const dirIsExists = fs.existsSync(root)
+
+  if (dirIsExists) {
+    console.log(chalk.redBright('目录已经存在'))
     process.exit(1)
   }
 
-  const tasks = new Listr(
-    [
-      {
-        title: 'Copy Project Files',
-        task: () => copyTemplateFiles(templateDir, root)
-      },
-      {
-        title: 'Edit Project package.json',
-        task: () => writeFile(path.join(root, 'package.json'), JSON.stringify(pkg, null, 2))
+  if (downloadGit) {
+    const spinner = createSpinner(`开始下载...${downloadGit.git}`).start()
+    // 下载git代码
+    download(`direct:${downloadGit.git}`, root, { clone: true }, async function(err) {
+      if (err) {
+        spinner.error({ text: '下载失败' })
+      } else {
+        await editPackageJson(root, options.projectName || getProjectName())
+        spinner.success({
+          text: '项目创建成功，请依次执行以下命令'
+        })
+        doneLog(cwd, root)
       }
-    ],
-    {
-      exitOnError: false
+    })
+  } else {
+    let pkg = {}
+
+    if (fs.existsSync(path.join(templateDir, `package.json`))) {
+      pkg = JSON.parse(
+        fs.readFileSync(path.join(templateDir, `package.json`), 'utf-8')
+      )
+
+      pkg.name = options.projectName || getProjectName()
     }
-  )
+    const tasks = new Listr(
+      [
+        {
+          title: '项目创建成功，请依次执行以下命令',
+          task: () => copyTemplateFiles(templateDir, root)
+        }
+      ],
+      {
+        exitOnError: false
+      }
+    )
 
-  await tasks.run()
-  console.log(`\nDone. Now run:\n`)
-  if (root !== cwd) {
-    console.log(`cd ${path.relative(cwd, root)}`)
+    await tasks.run()
+    await editPackageJson(root)
+    doneLog(cwd, root)
   }
-  console.log(`pnpm(yarn、npm) install`)
-  console.log(`pnpm(yarn、npm) run dev`)
-  console.log()
   return true
 }

package/template-mobile-vant-html/README.md

@@ -0,0 +1,4 @@
+# vue-mobile
+
+#### 介绍
+使用vue3.0 + vant 搭建的手机端项目，旨在不用任何构建工具（html+js+less）