@gx-design-vue/create-gx-cli 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gx-design-vue/create-gx-cli",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "license": "MIT",
   "description": "a cli to bootstrap gx project",
   "main": "src/index.js",
@@ -23,7 +23,7 @@
     "nanospinner": "^1.1.0",
     "ncp": "^2.0.0",
     "obtain-git-repo": "^1.0.2",
-    "prompts": "^2.4.2"
+    "prompts": "^2.4.1"
   },
   "files": [
     "bin/",

package/src/cli.js

@@ -43,6 +43,7 @@ function parseArgumentsIntoOptions() {
 }
 
 async function promptForMissingOptions(options) {
+  console.log(typeof options.template === 'string' && !TEMPLATES.includes(options.template))
   const answers = await prompts([
     {
       type: options.projectName ? null : 'text',
@@ -51,7 +52,7 @@ async function promptForMissingOptions(options) {
       initial: defaultTargetDir
     },
     {
-      type: options.template && TEMPLATES.includes(options.template) ? null : 'select',
+      type: 'select',
       name: 'template',
       message:
         typeof options.template === 'string' && !TEMPLATES.includes(options.template)
@@ -65,8 +66,7 @@ async function promptForMissingOptions(options) {
           title: frameworkColor(framework.name),
           value: framework
         }
-      }),
-      default: 'vue'
+      })
     }
   ])
 
@@ -80,6 +80,7 @@ async function promptForMissingOptions(options) {
 export async function cli() {
   let options = parseArgumentsIntoOptions()
   options = await promptForMissingOptions(options)
+  console.log(options)
   if (options.template && options.projectName) {
     await createProject(options)
   }

package/src/main.js

@@ -8,9 +8,7 @@ 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 = [
   {
@@ -31,7 +29,7 @@ async function copyTemplateFiles(templateDir, root) {
 
 function writeFile(path, content) {
   if (Object.keys(content).length > 0) {
-    writeFileSync(path, content)
+    fs.writeFileSync(path, content)
   }
 }
 
@@ -43,10 +41,11 @@ function editPackageJson(root, projectName) {
       fs.readFileSync(path.join(root, `package.json`), 'utf-8')
     )
 
+    console.log(projectName)
+
     pkg.name = projectName
+    writeFile(path.join(root, 'package.json'), JSON.stringify(pkg, null, 2))
   }
-
-  writeFile(path.join(root, 'package.json'), JSON.stringify(pkg, null, 2))
 }
 
 function doneLog(cwd, root) {
@@ -74,9 +73,9 @@ export async function createProject(options) {
     `template-${options.template}`
   )
 
-  try {
-    await access(templateDir, fs.constants.R_OK)
-  } catch (err) {
+  const dirIsTemplate = fs.existsSync(templateDir)
+
+  if (!dirIsTemplate) {
     if (!downloadGit) {
       console.log(chalk.redBright('模版目录不存在'))
       process.exit(1)
@@ -94,7 +93,7 @@ export async function createProject(options) {
   if (downloadGit) {
     const spinner = createSpinner(`开始下载...${downloadGit.git}`).start()
     // 下载git代码
-    download(`direct:${downloadGit.git}`, root, { clone: true }, async function(err) {
+    download(`direct:${downloadGit.git}`, root, { clone: true }, async function (err) {
       if (err) {
         spinner.error({ text: '下载失败' })
       } else {
@@ -102,26 +101,20 @@ export async function createProject(options) {
         spinner.success({
           text: '项目创建成功，请依次执行以下命令'
         })
-        fs.
-        doneLog(cwd, root)
+        fs.doneLog(cwd, root)
       }
     })
   } 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: '项目创建成功，请依次执行以下命令',
+          title: '项目创建',
           task: () => copyTemplateFiles(templateDir, root)
-        }
+        },
+        options.template !== 'mobile-vant-html' ? {
+          title: '项目文件修改',
+          task: () => editPackageJson(root, options.projectName || getProjectName())
+        } : {}
       ],
       {
         exitOnError: false
@@ -130,7 +123,6 @@ export async function createProject(options) {
 
     await tasks.run()
 
-    await editPackageJson(root)
     doneLog(cwd, root)
   }
   return true

package/template-mobile-vant-cli/package.json

@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@gx-design-vue/pro-hooks": "^0.0.8",
-    "@gx-design-vue/pro-utils": "^0.0.33",
+    "@gx-design-vue/pro-hooks": "^0.1.1",
+    "@gx-design-vue/pro-utils": "^0.1.1",
     "@vueuse/core": "^9.10.0",
     "@vueuse/shared": "^9.10.0",
     "axios": "^1.1.3",
@@ -22,7 +22,7 @@
     "qs": "^6.11.0",
     "unocss": "^0.48.2",
     "vant": "^4.0.8",
-    "vue": "^3.2.41",
+    "vue": "^3.2.45",
     "vue-router": "^4.1.6"
   },
   "devDependencies": {
@@ -54,11 +54,11 @@
     "typescript": "^4.6.4",
     "unplugin-auto-import": "^0.11.4",
     "unplugin-vue-components": "^0.22.9",
-    "vite": "^4.0.0",
+    "vite": "^4.0.4",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-mock": "^2.9.6",
     "vite-plugin-vue-setup-extend": "^0.4.0",
     "vue-eslint-parser": "^9.1.0",
     "vue-tsc": "^1.0.9"
   }
-}
+}