feat(taro-cli): 配置文件分开存放，优化 taro config 输出

NervJS · Dec 16, 2019 · 2704979 · 2704979
1 parent 4c945f6
commit 2704979
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/packages/taro-cli/bin/taro-config b/packages/taro-cli/bin/taro-config
@@ -4,6 +4,8 @@ const program = require('commander')
 const helper = require('../dist/taro-config')
 
 program
+  .name('taro config')
+  .usage('<command> [options]')
   .option('--json', '以 JSON 形式输出')
   .on('--help', function () {
     console.log('')
@@ -22,21 +24,22 @@ const [cmd, key, value] = args
 
 switch (cmd) {
   case 'get':
-    if (!key) return
+    if (!key) return console.log('Usage: taro config get foo')
     helper.get(key)
     break
   case 'set':
-    if (!key || !value) return
+    if (!key || !value) return console.log('Usage: taro config set foo bar')
     helper.set(key, value)
     break
   case 'delete':
-    if (!key) return
+    if (!key) return console.log('Usage: taro config delete foo')
     helper.deleteKey(key)
     break
   case 'list':
   case 'ls':
     helper.list(json)
     break
   default:
+    program.help()
     break
 }
diff --git a/packages/taro-cli/src/taro-config/index.ts b/packages/taro-cli/src/taro-config/index.ts
@@ -1,22 +1,31 @@
 import * as fs from 'fs-extra'
 import * as path from 'path'
 import { getUserHomeDir } from '../util'
+import { TARO_CONFIG_FLODER, TARO_BASE_CONFIG } from '../util/constants'
 
 const homedir = getUserHomeDir()
-const configPath = path.join(homedir, '.taro/index.json')
+const configPath = path.join(homedir, `${TARO_CONFIG_FLODER}/${TARO_BASE_CONFIG}`)
+
+function displayConfigPath (configPath) {
+  console.log('Config path:', configPath)
+  console.log()
+}
 
 export function get (key: string) {
   if (!homedir) return console.log('找不到用户根目录')
+
   if (fs.existsSync(configPath)) {
+    displayConfigPath(configPath)
     const config = fs.readJSONSync(configPath)
-    console.log(config[key])
+    console.log('Key:', key, ', value:', config[key])
   }
 }
 
 export function set (key: string, value: string) {
   if (!homedir) return console.log('找不到用户根目录')
 
   if (fs.existsSync(configPath)) {
+    displayConfigPath(configPath)
     const config = fs.readJSONSync(configPath)
     config[key] = value
     fs.writeJSONSync(configPath, config)
@@ -26,21 +35,27 @@ export function set (key: string, value: string) {
       [key]: value
     })
   }
+  console.log('Set key:', key, ', value:', value)
 }
 
 export function deleteKey (key: string) {
   if (!homedir) return console.log('找不到用户根目录')
 
   if (fs.existsSync(configPath)) {
+    displayConfigPath(configPath)
     const config = fs.readJSONSync(configPath)
     delete config[key]
     fs.writeJSONSync(configPath, config)
   }
+  console.log('Deleted:', key)
 }
 
 export function list (isJSONFormat: boolean = false) {
   if (!homedir) return console.log('找不到用户根目录')
+
   if (fs.existsSync(configPath)) {
+    displayConfigPath(configPath)
+    console.log('Config info:')
     const config = fs.readJSONSync(configPath)
     if (isJSONFormat) {
       console.log(JSON.stringify(config, null, 2))

diff --git a/packages/taro-cli/src/util/constants.ts b/packages/taro-cli/src/util/constants.ts
@@ -365,5 +365,5 @@ export const DEVICE_RATIO_NAME = 'deviceRatio'
 export const isWindows = os.platform() === 'win32'
 
 export const DEFAULT_TEMPLATE_SRC = 'github:NervJS/taro-project-templates#next'
-export const TARO_CONFIG_FLODER = '.taro'
+export const TARO_CONFIG_FLODER = '.taro2'
 export const TARO_BASE_CONFIG = 'index.json'