@ansstory/hias 1.0.7 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ansstory/hias",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "private": false,
   "description": "个人自用脚手架内置个人常用功能",
   "author": "AnsStory story <story0809@163.com>",

package/scripts/cleanup-config.js

@@ -3,6 +3,10 @@ const os = require('os')
 const path = require('path')
 const { spawnSync } = require('child_process')
 
+function getNpmCommand(platform = process.platform) {
+  return platform === 'win32' ? 'npm.cmd' : 'npm'
+}
+
 function getConfigDirectory(homeDir = os.homedir()) {
   return path.join(homeDir, '.hias-cli')
 }
@@ -28,9 +32,16 @@ function clearConfigDirectory({ homeDir = os.homedir(), logger = console, dryRun
 function uninstallPackage({ homeDir = os.homedir(), logger = console, runCommand = spawnSync } = {}) {
   clearConfigDirectory({ homeDir, logger })
 
-  const result = runCommand('npm', ['uninstall', '@ansstory/hias', '-g'], {
+  const command = getNpmCommand()
+  const args = ['uninstall', '@ansstory/hias', '-g']
+
+  if (logger) {
+    logger.log(`Running: npm ${args.join(' ')}`)
+  }
+
+  const result = runCommand(command, args, {
     stdio: 'inherit',
-    shell: true,
+    shell: false,
   })
 
   if (typeof result.status === 'number' && result.status !== 0) {
@@ -64,6 +75,7 @@ if (require.main === module) {
 
 module.exports = {
   clearConfigDirectory,
+  getNpmCommand,
   getConfigDirectory,
   uninstallPackage,
   printUsage,

package/test/cleanup-config.test.js

@@ -4,7 +4,7 @@ const fs = require('fs')
 const os = require('os')
 const path = require('path')
 
-const { clearConfigDirectory, getConfigDirectory, uninstallPackage } = require('../scripts/cleanup-config')
+const { clearConfigDirectory, getConfigDirectory, getNpmCommand, uninstallPackage } = require('../scripts/cleanup-config')
 
 test('clearConfigDirectory removes the hias cli config directory', () => {
   const tempHome = fs.mkdtempSync(path.join(os.tmpdir(), 'hias-clear-'))
@@ -56,6 +56,7 @@ test('uninstallPackage clears config before uninstalling the global package', ()
     homeDir: tempHome,
     logger: null,
     runCommand: (command, args, options) => {
+      assert.equal(fs.existsSync(configDir), false)
       calls.push({ command, args, options })
       return { status: 0 }
     },
@@ -64,9 +65,9 @@ test('uninstallPackage clears config before uninstalling the global package', ()
   assert.equal(fs.existsSync(configDir), false)
   assert.deepEqual(calls, [
     {
-      command: 'npm',
+      command: getNpmCommand(),
       args: ['uninstall', '@ansstory/hias', '-g'],
-      options: { stdio: 'inherit', shell: true },
+      options: { stdio: 'inherit', shell: false },
     },
   ])
 })