feat(info): remove --all

Author: FliPPeDround

README.md

@@ -58,7 +58,7 @@ npx @create-uni/info@latest
 | UI | ui | u | 见[组件列表](#组件列表) |
 | Eslint | eslint | e | —— |
 | gui | gui | —— | —— |
-| info | info |  —— | all |
+| info | info |  —— | —— |
 
 #### 📦模板列表
 

packages/core/src/command/actions/info.ts

@@ -1,7 +1,7 @@
 import { sync } from 'cross-spawn'
 import { composeCommand } from '../composeCommand'
 
-export function actionInfoCLI(argv: any) {
+export function actionInfoCLI() {
   // #if CREATE_UNI_DEV
   // @ts-expect-error compile
   const fullCustomCommand = 'pnpm create-uni-info'
@@ -14,7 +14,7 @@ export function actionInfoCLI(argv: any) {
   // #endif
 
   const [command, ..._args] = fullCustomCommand.split(' ')
-  const { error } = sync(command, [..._args, argv ?? ''], {
+  const { error } = sync(command, [..._args], {
     stdio: 'inherit',
   })
 

packages/core/src/command/index.ts

@@ -8,8 +8,8 @@ const actions = {
     console.log(helpMessage)
     process.exit(0)
   },
-  info: (argv?: any) => {
-    actionInfoCLI(argv)
+  info: () => {
+    actionInfoCLI()
     process.exit(0)
   },
   gui: () => {
@@ -22,7 +22,7 @@ export function commandAction(argv: any) {
     actions.help()
   }
   else if (argv.info) {
-    actions.info(argv)
+    actions.info()
   }
   else if (argv.gui) {
     return actions.gui()

packages/info/package.json

@@ -38,7 +38,6 @@
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "@clack/prompts": "^0.9.0",
     "@create-uni/shared": "workspace:*",
     "@types/envinfo": "^7.8.4",
     "@types/minimist": "^1.2.5",

packages/info/src/index.ts

@@ -2,20 +2,17 @@
 
 import type { UniPresetEnvInfo } from './types'
 import process from 'node:process'
-import { intro, outro, spinner } from '@clack/prompts'
-import { generateBanner } from '@create-uni/shared'
+import { generateBanner, ora } from '@create-uni/shared'
 import envinfo from 'envinfo'
 import { gray, italic, link, red, yellow } from 'kolorist'
 import { uniDependenciesMap } from './constants'
-import { getBaseDependencies, getErrorDependencies, getUniHelperDependencies } from './utils/dependencies'
-import { getErrorExtensions, getUniHelperExtensions, getVolarExtensions, getVSCodeExtensions, paserExtensionList } from './utils/extensions'
+import { getBaseDependencies, getUniHelperDependencies } from './utils/dependencies'
+import { getUniHelperExtensions, getVolarExtensions, getVSCodeExtensions, paserExtensionList } from './utils/extensions'
 import { whichPm } from './utils/whichPm'
 
 export async function getBaseEnvInfo() {
-  const s = spinner()
-  s.start('正在获取环境信息...')
   const loadingStopInfo = {
-    message: '获取环境信息完成',
+    message: '',
     code: 0,
   }
 
@@ -44,7 +41,7 @@ export async function getBaseEnvInfo() {
     baseDependencies = getBaseDependencies(packageInfo)
   }
   else {
-    loadingStopInfo.message = red('当前目录未安装uni-app，请在uni-app项目根目录下执行, 以获取依赖信息！！！')
+    loadingStopInfo.message = red('⛔ 当前目录未安装uni-app，请在uni-app项目根目录下执行, 以获取依赖信息！！！')
     loadingStopInfo.code = 1
   }
 
@@ -58,17 +55,16 @@ export async function getBaseEnvInfo() {
   }
   else {
     if (loadingStopInfo.code === 1) {
-      loadingStopInfo.message += `\n   ${yellow('未找到vscode, 无法获取插件信息, 请自行补充vscode插件信息')}`
+      loadingStopInfo.message += `\n${yellow('⚠️ 未找到vscode, 无法获取插件信息, 请自行补充vscode插件信息')}`
     }
     else {
-      loadingStopInfo.message += `${yellow('未找到vscode, 无法获取插件信息, 请自行补充vscode插件信息')}`
-      loadingStopInfo.code = 2
+      loadingStopInfo.message += `${yellow('⚠️ 未找到vscode, 无法获取插件信息, 请自行补充vscode插件信息')}`
+      loadingStopInfo.code = 1
     }
   }
 
   const pm = await whichPm()
 
-  s.stop(loadingStopInfo.message, loadingStopInfo.code)
   return {
     os,
     node,
@@ -79,18 +75,25 @@ export async function getBaseEnvInfo() {
     packageInfo,
     uniHelperDependencies,
     packageManager: pm?.name,
+    loadingStopInfo,
   }
 }
 
 export async function getUniAppInfo() {
-  const argv = process.argv?.[2]
+  console.log(generateBanner('@uni-create/info - 快速检测 uni-app 环境信息'))
+  console.log()
+  const loading = ora('正在获取环境信息...').start()
 
-  intro(generateBanner('@uni-create/info - 快速检测 uni-app 环境信息'))
   // 获取环境信息
   const baseEnvInfo = await getBaseEnvInfo()
-  const errorDependencies = await getErrorDependencies(argv, baseEnvInfo.uniHelperDependencies!)
-  const errorExtensions = await getErrorExtensions(argv, baseEnvInfo.uniHelperExtensions!)
-  outro('🎉 检测完成')
+  const errorDependencies = baseEnvInfo.uniHelperDependencies || []
+  const errorExtensions = baseEnvInfo.uniHelperExtensions || []
+  loading.succeed('获取环境信息完成')
+
+  if (baseEnvInfo.loadingStopInfo.code !== 0) {
+    console.log()
+    console.log(baseEnvInfo.loadingStopInfo.message)
+  }
 
   const splitter = '----------------------------------------------'
   console.log()

packages/info/src/utils/dependencies.ts

@@ -1,5 +1,4 @@
 import type { UniPresetEnvInfo } from '../types'
-import question from '../question'
 
 export function getBaseDependencies(packageInfo: UniPresetEnvInfo['npmPackages']) {
   const baseDependenciesName = ['vue', 'vite', '@dcloudio/uni-app']
@@ -21,23 +20,23 @@ export function getUniHelperDependencies(packageInfo: UniPresetEnvInfo['npmPacka
   return uniHelperDependencies
 }
 
-export async function getErrorDependencies(
-  argv: string,
-  uniHelperDependencies: Record<string, string>,
-) {
-  if (!uniHelperDependencies)
-    return {}
-  let errorDependencies: Record<string, string> = {}
-  if (argv === 'all') {
-    errorDependencies = uniHelperDependencies
-  }
-  else {
-    const uniHelperDependenciesName = Object.keys(uniHelperDependencies)
-    const errorIndexList = await question(uniHelperDependenciesName, '请选择需要反馈的依赖')
+// export async function getErrorDependencies(
+//   argv: string,
+//   uniHelperDependencies: Record<string, string>,
+// ) {
+//   if (!uniHelperDependencies)
+//     return {}
+//   let errorDependencies: Record<string, string> = {}
+//   if (argv === 'all') {
+//     errorDependencies = uniHelperDependencies
+//   }
+//   else {
+//     const uniHelperDependenciesName = Object.keys(uniHelperDependencies)
+//     const errorIndexList = await question(uniHelperDependenciesName, '请选择需要反馈的依赖')
 
-    errorIndexList.forEach((item) => {
-      errorDependencies[item] = uniHelperDependencies[item]
-    })
-  }
-  return errorDependencies
-}
+//     errorIndexList.forEach((item) => {
+//       errorDependencies[item] = uniHelperDependencies[item]
+//     })
+//   }
+//   return errorDependencies
+// }

packages/info/src/utils/extensions.ts

@@ -1,5 +1,4 @@
 import { execSync } from 'node:child_process'
-import question from '../question'
 
 export function getVSCodeExtensions() {
   try {
@@ -34,25 +33,25 @@ export function paserExtensionList(list: string[]) {
   })
 }
 
-export async function getErrorExtensions(
-  argv: string,
-  uniHelperExtensions: ReturnType<typeof paserExtensionList>,
-) {
-  if (!uniHelperExtensions)
-    return []
-
-  const choices = uniHelperExtensions.map(item => item.name)
-
-  let errorExtensions: typeof uniHelperExtensions = []
-  if (argv === 'all') {
-    errorExtensions = uniHelperExtensions
-  }
-  else {
-    const errorIndexList = await question(choices, '请选择需要反馈的vscode插件')
-
-    errorIndexList.forEach((item) => {
-      errorExtensions.push(uniHelperExtensions.find(i => i.name === item)!)
-    })
-  }
-  return errorExtensions
-}
+// export async function getErrorExtensions(
+//   argv: string,
+//   uniHelperExtensions: ReturnType<typeof paserExtensionList>,
+// ) {
+//   if (!uniHelperExtensions)
+//     return []
+
+//   const choices = uniHelperExtensions.map(item => item.name)
+
+//   let errorExtensions: typeof uniHelperExtensions = []
+//   if (argv === 'all') {
+//     errorExtensions = uniHelperExtensions
+//   }
+//   else {
+//     const errorIndexList = await question(choices, '请选择需要反馈的vscode插件')
+
+//     errorIndexList.forEach((item) => {
+//       errorExtensions.push(uniHelperExtensions.find(i => i.name === item)!)
+//     })
+//   }
+//   return errorExtensions
+// }

packages/shared/src/index.ts

@@ -1,5 +1,6 @@
 import process from 'node:process'
-import { bgLightGreen, bold } from 'kolorist'
+
+import { bgLightGreen, bold, green, red } from 'kolorist'
 
 export function generateBanner(text: string) {
   console.log()
@@ -30,3 +31,55 @@ export function generateBanner(text: string) {
 
   return colorText
 }
+
+class Ora {
+  private message: string
+  private interval: NodeJS.Timeout | null
+  private frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']
+  private cross = '✖'
+  private tick = '✔'
+
+  constructor(message: string) {
+    this.message = message
+    this.interval = null
+  }
+
+  private setFinishMessage(newMessage: string): string {
+    return newMessage + ' '.repeat(this.message.length - newMessage.length)
+  }
+
+  start(): Ora {
+    let i = 0
+    process.stdout.write('\r' + `${green(this.frames[i % 9])} ${this.message}`)
+    this.interval = setInterval(() => {
+      process.stdout.write('\r' + `${green(this.frames[i % 9])} ${this.message}`)
+      i++
+    }, 100)
+    return this
+  }
+
+  fail(message: string): void {
+    if (!this.interval)
+      return
+    clearInterval(this.interval)
+    process.stdout.write('\r' + `${red(this.cross)} ${this.setFinishMessage(message)}\n`)
+  }
+
+  succeed(message: string): void {
+    if (!this.interval)
+      return
+    clearInterval(this.interval)
+    process.stdout.write('\r' + `${green(this.tick)} ${this.setFinishMessage(message)}\n`)
+  }
+
+  finish(): void {
+    if (!this.interval)
+      return
+    clearInterval(this.interval)
+    process.stdout.write('')
+  }
+}
+
+export function ora(message: string) {
+  return new Ora(message)
+}