@ruan-cat/vercel-deploy-tool 0.6.1 → 0.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruan-cat/vercel-deploy-tool",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "阮喵喵自用的vercel部署工具，用于实现复杂项目的部署。",
   "type": "module",
   "main": "./src/index.ts",
@@ -51,7 +51,7 @@
     "rimraf": "^6.0.1",
     "shx": "^0.3.4",
     "vercel": "39.3.0",
-    "@ruan-cat/utils": "^1.5.0"
+    "@ruan-cat/utils": "^1.7.0"
   },
   "devDependencies": {
     "@types/gulp": "^4.0.17",

package/src/config.ts

@@ -109,13 +109,6 @@ export interface Config {
 	 */
 	vercelJsonPath?: string;
 
-	/**
-	 * 是否显示运行命令？
-	 * @description
-	 * 默认不显示运行命令。
-	 */
-	isShowCommand?: boolean;
-
 	/** 在build命令阶段后 执行的用户命令 */
 	afterBuildTasks?: string[];
 

package/src/index.ts

@@ -26,6 +26,7 @@ import {
 	executePromiseTasks,
 } from "@ruan-cat/utils";
 import type { Task } from "@ruan-cat/utils";
+import { generateSpawnSync as generateSpawnSyncUtils, type SpawnSyncSimpleParams } from "@ruan-cat/utils/node";
 
 import { config, getConfig } from "./config";
 import type { Config, Base, DeployTarget, WithUserCommands } from "./config";
@@ -163,25 +164,18 @@ function getTargetCWDCommandArgument(deployTarget: DeployTarget) {
 /**
  * 生成简单的执行命令函数
  * @description
- * 对 execa 做简单的包装
+ * 二次封装函数，在此仅仅负责为打印内容增加颜色。
  *
- * 封装 spawnSync 函数
- * @version 2
+ * @version 3
  */
-function generateExeca(execaSimpleParams: { command: string; parameters: string[] }) {
-	const { command, parameters } = execaSimpleParams;
-
-	if (config?.isShowCommand) {
-		const coloredCommand = gradient(["rgb(0, 153, 247)", "rgb(241, 23, 18)"])(`${command} ${parameters.join(" ")}`);
-		consola.info(` 当前运行的命令为： ${coloredCommand} \n`);
-	}
-
-	return generateSimpleAsyncTask(() => {
-		const result = spawnSync(command, parameters, { stdio: "inherit", shell: true });
-		if (result.error) {
-			throw result.error;
-		}
-		return result;
+function generateSpawnSync(spawnSyncSimpleParams: SpawnSyncSimpleParams) {
+	return generateSpawnSyncUtils({
+		...spawnSyncSimpleParams,
+		printCurrentCommand(params) {
+			const { command, parameters } = params;
+			const coloredCommand = gradient(["rgb(0, 153, 247)", "rgb(241, 23, 18)"])(`${command} ${parameters.join(" ")}`);
+			consola.info(` 当前运行的命令为： ${coloredCommand} \n`);
+		},
 	});
 }
 
@@ -193,7 +187,7 @@ function generateExeca(execaSimpleParams: { command: string; parameters: string[
  * vc link --yes --cwd=${{env.p1}} --project=${{env.pjn}} -t ${{env.vct}}
  */
 function generateLinkTask(deployTarget: DeployTarget) {
-	return generateExeca({
+	return generateSpawnSync({
 		command: "vc link",
 		parameters: concat(
 			getYesCommandArgument(),
@@ -212,7 +206,7 @@ function generateLinkTask(deployTarget: DeployTarget) {
  * vc build --yes --prod --cwd=${{env.p1}} -A ./vercel.null.json -t ${{env.vct}}
  */
 function generateBuildTask(deployTarget: DeployTarget) {
-	return generateExeca({
+	return generateSpawnSync({
 		command: "vc build",
 		parameters: concat(
 			getYesCommandArgument(),
@@ -283,7 +277,7 @@ function generateCopyDistTasks_v1(deployTarget: WithUserCommands) {
 
 	const copyDistTasks = (<const>[delCmd, createCmd, copyFileCmd, printFileCmd]).map((command) => {
 		return generateSimpleAsyncTask(async function () {
-			const commandFunction = generateExeca({
+			const commandFunction = generateSpawnSync({
 				command,
 				parameters: [],
 			});
@@ -360,7 +354,7 @@ function generateCopyDistTasks(deployTarget: WithUserCommands) {
  * vc alias set "$url1" ${{env.p1-url}} -t ${{env.vct}}
  */
 function generateAliasTask(vercelUrl: string, userUrl: string) {
-	return generateExeca({
+	return generateSpawnSync({
 		command: `vc alias set ${vercelUrl} ${userUrl}`,
 		parameters: concat(getVercelTokenCommandArgument()),
 	});
@@ -374,7 +368,7 @@ function generateAliasTask(vercelUrl: string, userUrl: string) {
  * vc deploy --yes --prebuilt --prod --cwd=${{env.p1}} -t ${{env.vct}}
  */
 function generateDeployTask(deployTarget: DeployTarget) {
-	return generateExeca({
+	return generateSpawnSync({
 		command: "vc deploy",
 		parameters: concat(
 			getYesCommandArgument(),
@@ -383,6 +377,8 @@ function generateDeployTask(deployTarget: DeployTarget) {
 			getTargetCWDCommandArgument(deployTarget),
 			getVercelTokenCommandArgument(),
 		),
+		// 部署任务不需要流式输出
+		isFlow: false,
 	});
 }
 
@@ -404,7 +400,7 @@ function generateAfterBuildTasksConfig(config: Config): Task {
 			type: "queue",
 			tasks: afterBuildTasks!.map((command) => {
 				return generateSimpleAsyncTask(async () => {
-					const userCommand = generateExeca({
+					const userCommand = generateSpawnSync({
 						command,
 						parameters: [],
 					});
@@ -482,17 +478,13 @@ async function main() {
 										type: "queue",
 										tasks: deployTarget.userCommands.map((command) => {
 											return generateSimpleAsyncTask(async () => {
-												const userCommand = generateExeca({
+												const userCommand = generateSpawnSync({
 													command,
 													parameters: [],
 												});
 												consola.start(` 开始用户命令任务 `);
-												const child = await userCommand();
-												process.stdout.write(child.stdout);
-												process.stderr.write(child.stderr);
-												// consola.success(` 完成用户命令任务 ${code} `);
+												await userCommand();
 												consola.success(` 完成用户命令任务 `);
-												// consola.box(stdout);
 											});
 										}),
 									},
@@ -531,7 +523,6 @@ async function main() {
 								if (error) {
 									consola.error(" 部署失败了 \n");
 									consola.error(error);
-									process.stderr.write(stderr);
 									return;
 								}
 
@@ -540,7 +531,6 @@ async function main() {
 								consola.box(vercelUrl);
 
 								consola.success(` 部署任务输出如下： \n`);
-								process.stdout.write(stdout);
 								console.log(`\n`);
 
 								return vercelUrl;

package/tsconfig.json

@@ -12,7 +12,7 @@
 		"strict": true,
 		"esModuleInterop": true,
 		"resolveJsonModule": true,
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		// "rootDir": "./",
 		// 不能这样配置 导致路径识别错乱
 		// "rootDirs": [