fix: 修复@142vip/utils模块相互调用异常

Author: mmdapl

eslint.config.js

@@ -6,6 +6,6 @@ export default defineVipEslintConfig({
   ],
   rules: {
     // 用于在模块构建后基于dist导出时找不到文件，忽略校验
-    'antfu/no-import-dist': 1,
+    'antfu/no-import-dist': 0,
   },
 })

packages/changelog/src/git.ts

@@ -1,12 +1,4 @@
-import { execSync } from 'node:child_process'
-
-/**
- * todo 迁移到@142vip/utils模块中
- */
-
-export function execCommand(cmd: string, cwd?: string): string {
-  return execSync(cmd, { encoding: 'utf8', cwd }).trim()
-}
+import { VipExecutor } from '@142vip/utils'
 
 export interface GitCommitAuthor {
   name: string
@@ -59,7 +51,7 @@ export async function getGitDiff(params: {
   }
 
   // 获取commit记录
-  const commitStr = execCommand(`git --no-pager log "${params.from}${params.to}" --pretty="----%n%s|%h|%an|%ae%n%b" --name-status`)
+  const commitStr = VipExecutor.execCommandSync(`git --no-pager log "${params.from}${params.to}" --pretty="----%n%s|%h|%an|%ae%n%b" --name-status`)
 
   return commitStr
     .split('----\n')

packages/release-version/src/core/git.ts

@@ -1,4 +1,4 @@
-import { execShell } from '@142vip/utils'
+import { VipExecutor } from '@142vip/utils'
 import { ProgressEvent } from '../types'
 import type { Operation } from './operation'
 
@@ -31,7 +31,7 @@ export async function gitCommit(operation: Operation): Promise<Operation> {
   if (!all)
     args = args.concat(updatedFiles)
 
-  await execShell({ command: `git commit ${args.join(' ')}`, description: '提交git commit信息' })
+  await VipExecutor.execShell({ command: `git commit ${args.join(' ')}`, description: '提交git commit信息' })
 
   return operation.update({ event: ProgressEvent.GitCommit, commitMessage })
 }
@@ -61,7 +61,7 @@ export async function gitTag(operation: Operation): Promise<Operation> {
   const tagName = formatVersionString(tag.name, newVersion)
   args.push(tagName)
 
-  await execShell({ command: `git tag ${args.join(' ')}`, description: '创建Tag标签' })
+  await VipExecutor.execShell({ command: `git tag ${args.join(' ')}`, description: '创建Tag标签' })
 
   return operation.update({ event: ProgressEvent.GitTag, tagName })
 }
@@ -74,11 +74,11 @@ export async function gitPush(operation: Operation): Promise<Operation> {
     return operation
 
   // Push the commit
-  await execShell({ command: 'git push', description: '推送变更' })
+  await VipExecutor.execShell({ command: 'git push', description: '推送变更' })
 
   if (operation.options.tag) {
     // Push the tag
-    await execShell({ command: 'git push --tags', description: '推送所有标签' })
+    await VipExecutor.execShell({ command: 'git push --tags', description: '推送所有标签' })
   }
 
   return operation.update({ event: ProgressEvent.GitPush })

packages/release-version/src/core/npm-script.ts

@@ -1,4 +1,4 @@
-import { execShell } from '@142vip/utils'
+import { VipExecutor } from '@142vip/utils'
 import type { NpmScript } from '../types'
 import { ProgressEvent } from '../types'
 import { readJsonFile } from './fs'
@@ -18,7 +18,7 @@ export async function runScript(script: NpmScript, operation: Operation): Promis
     const { data: manifest } = await readJsonFile('package.json', cwd)
 
     if (isManifest(manifest) && hasScript(manifest, script)) {
-      await execShell({ command: `npm run ${script} --silent`, description: '运行脚本命令' })
+      await VipExecutor.execShell({ command: `npm run ${script} --silent`, description: '运行脚本命令' })
       operation.update({ event: ProgressEvent.NpmScript, script })
     }
   }

scripts/bundle

@@ -8,11 +8,11 @@
  */
 
 import { createRequire } from 'node:module'
-import process from 'node:process'
 import {
   OPEN_SOURCE_ADDRESS,
   VipGit,
   VipDocker,
+  VipNodeJS
 } from '@142vip/utils'
 
 (async () => {
@@ -24,14 +24,14 @@ import {
     const imageName = `${OPEN_SOURCE_ADDRESS.DOCKER_ALIYUNCS_VIP}/docs:${pkg.name.split('/')[1]}-${pkg.version}`
 
     // 最近一次提交信息
-    const { hash: gitHash } = await VipGit.getRecentGitCommit()
+    const gitHash = VipGit.getFirstCommitHash()
 
     // 构建镜像
     await VipDocker.buildImage({
       imageName,
       buildArgs: [
         // 参数中是否包含 --proxy
-        ['NEED_PROXY', process.argv.includes('--proxy')],
+        ['NEED_PROXY', VipNodeJS.getProcessArgv().includes('--proxy')],
         ['APP_NAME', pkg.name],
         ['APP_VERSION', pkg.version],
         ['APP_DESCRIPTION', pkg.description],

verify-commit.js

@@ -1,5 +1,4 @@
-import process from 'node:process'
-import { VipColor } from '@142vip/utils'
+import { VipColor, VipNodeJS } from '@142vip/utils'
 import {
   getReleasePkgJSON,
   verifyCommit,
@@ -23,7 +22,7 @@ if (!isSuccess) {
     )}\n\n${
       VipColor.red(`  See .github/commit-convention.md for more details.\n`)}`,
   )
-  process.exit(1)
+  VipNodeJS.exitProcess(1)
 }
 
 const typeList = [
@@ -47,7 +46,7 @@ if (type == null || !typeList.includes(type)) {
       `invalid commit type , support ${typeList.join('|')}`,
     )}`,
   )
-  process.exit(1)
+  VipNodeJS.exitProcess(1)
 }
 
 // 获取packages目录下所有的模块名
@@ -66,7 +65,7 @@ if (scope != null && !scopeList.includes(scope)) {
       `invalid commit scope name , Examples:\n${scopeList.join('\n')}`,
     )}`,
   )
-  process.exit(1)
+  VipNodeJS.exitProcess(1)
 }
 
 // 判断message长度
@@ -76,7 +75,7 @@ if (message == null || message.length > 80) {
       `invalid commit message length , max length is 80`,
     )}`,
   )
-  process.exit(1)
+  VipNodeJS.exitProcess(1)
 }
 
 // 提交符合规范，打印相关信息