@ruan-cat/vercel-deploy-tool 0.3.1 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruan-cat/vercel-deploy-tool",
-  "version": "0.3.1",
+  "version": "0.4.2",
   "description": "阮喵喵自用的vercel部署工具，用于实现复杂项目的部署。",
   "type": "module",
   "main": "./src/index.ts",
@@ -44,12 +44,7 @@
     "c12": "^1.11.2",
     "commander": "^12.0.0",
     "consola": "^3.2.3",
-    "cpx": "^1.5.0",
-    "cpy": "^11.1.0",
-    "del": "^8.0.0",
-    "execa": "^9.3.1",
     "lodash-es": "4.17.21",
-    "mkdirp": "^3.0.1",
     "pathe": "^1.1.2",
     "rimraf": "^6.0.1",
     "shx": "^0.3.4",
@@ -57,7 +52,6 @@
     "@ruan-cat/utils": "^1.3.0"
   },
   "devDependencies": {
-    "@types/cpx": "^1.5.5",
     "@types/gulp": "^4.0.17",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.5.1"

package/src/config.ts

@@ -57,10 +57,17 @@ export interface WithUserCommands extends Base {
 
 	/**
 	 * 部署输出路径
+	 *
+	 * @version 1
 	 * @description
 	 * 这里要填写满足 cpx 库能够识别glob语法的路径
 	 * @example docs/.vitepress/dist/**\/*
 	 * @example src/.vuepress/dist/**\/*
+	 *
+	 * @version 2
+	 * @description
+	 * 填写打包目录的路径即可。不包含glob语法。
+	 * @example docs/.vitepress/dist
 	 */
 	outputDirectory: string;
 

package/src/index.ts

@@ -1,35 +1,33 @@
 // 学习一下如何使用 https://github.com/sindresorhus/execa/blob/main/readme.md
-import fs from "node:fs";
 import { dirname, resolve } from "node:path";
-import { cp } from "node:fs/promises";
-import { execa } from "execa";
+import { spawnSync } from "node:child_process";
+import fs, {
+	// 文件是否存在
+	existsSync,
+	// 复制文件
+	copyFileSync,
+	// 复制目录
+	cpSync,
+	// 删除目录
+	rmSync,
+	// 新建文件夹
+	mkdir,
+} from "node:fs";
+
 import { concat, isEmpty, isUndefined } from "lodash-es";
 import { consola } from "consola";
-import { isConditionsEvery, isConditionsSome } from "@ruan-cat/utils";
-import { deleteAsync } from "del";
-import { mkdirpSync } from "mkdirp";
-import cpy from "cpy";
-import cpx from "cpx";
-
-import {
-	initVercelConfig,
-	config,
-	getConfig,
-	type Config,
-	type Base,
-	type DeployTarget,
-	type WithUserCommands,
-} from "./config";
-import { generateSimpleAsyncTask } from "@ruan-cat/utils/src/simple-promise-tools";
 
 import {
+	isConditionsEvery,
+	isConditionsSome,
+	generateSimpleAsyncTask,
 	definePromiseTasks,
 	executePromiseTasks,
-	type BaseTask,
-	type ParallelTasks,
-	type QueueTasks,
-	type Task,
-} from "@ruan-cat/utils/src/define-promise-tasks";
+} from "@ruan-cat/utils";
+import type { Task } from "@ruan-cat/utils";
+
+import { config, getConfig } from "./config";
+import type { Config, Base, DeployTarget, WithUserCommands } from "./config";
 
 /**
  * vercel 的空配置
@@ -162,13 +160,16 @@ function getTargetCWDCommandArgument(deployTarget: DeployTarget) {
 }
 
 /**
- * 生成简单的 execa 函数
+ * 生成简单的执行命令函数
  * @description
  * 对 execa 做简单的包装
+ *
+ * 封装 spawnSync 函数
+ * @version 2
  */
 function generateExeca(execaSimpleParams: { command: string; parameters: string[] }) {
 	const { command, parameters } = execaSimpleParams;
-	return generateSimpleAsyncTask(() => execa(command, parameters, { shell: true }));
+	return generateSimpleAsyncTask(() => spawnSync(command, parameters, { shell: true }));
 }
 
 /**
@@ -273,7 +274,7 @@ function generateCopyDistTasks_v1(deployTarget: WithUserCommands) {
 				command,
 				parameters: [],
 			});
-			const { code, stdout } = await commandFunction();
+			const { stdout } = await commandFunction();
 			consola.info(` 执行了命令 🐓： `, command);
 			// consola.box(stdout);
 		});
@@ -303,7 +304,7 @@ function generateCopyDistTasks(deployTarget: WithUserCommands) {
 	 * 本函数仅仅拼接部分路径
 	 */
 	function joinPath<T extends string>(dir: T) {
-		const resPath = resolve(targetCWD, dir);
+		const resPath = resolve(process.cwd(), targetCWD, dir);
 		// console.log(" in joinPath => ", resPath);
 		return <`${string}${typeof targetCWD}/${T}`>resPath;
 	}
@@ -313,13 +314,13 @@ function generateCopyDistTasks(deployTarget: WithUserCommands) {
 
 	async function delVercelOutputStatic() {
 		consola.start(` 开始删除文件任务 `);
-		await deleteAsync(pathVercelOutputStatic);
+		rmSync(pathVercelOutputStatic, { recursive: true });
 		consola.success(` 删除该路径的文件： ${pathVercelOutputStatic} `);
 	}
 
 	async function createVercelOutputStatic() {
 		consola.start(` 开始创建文件夹任务 `);
-		await mkdirpSync(pathVercelOutputStatic);
+		mkdir(pathVercelOutputStatic, () => {});
 		consola.success(` 创建的新目录为： ${pathVercelOutputStatic} `);
 	}
 
@@ -327,10 +328,7 @@ function generateCopyDistTasks(deployTarget: WithUserCommands) {
 		consola.start(` 开始文件复制任务 `);
 		consola.info(` 从 ${pathOutputDirectory} 开始 `);
 		consola.info(` 复制到 ${pathVercelOutputStatic} 内`);
-		// 该写法无误 在liunx github工作流环境下，能完成文件复制。
-		await cpy(pathOutputDirectory, pathVercelOutputStatic);
-		// await cp(pathOutputDirectory, pathVercelOutputStatic, { recursive: true });
-		// await cpx.copy(pathOutputDirectory, pathVercelOutputStatic);
+		cpSync(pathOutputDirectory, pathVercelOutputStatic, { recursive: true });
 		consola.success(` 完成文件复制任务 `);
 	}
 
@@ -398,8 +396,9 @@ function generateAfterBuildTasksConfig(config: Config): Task {
 						parameters: [],
 					});
 					consola.start(` 开始用户 afterBuildTasks 命令任务 `);
-					const { code, stdout } = await userCommand();
-					consola.success(` 完成用户 afterBuildTasks 命令任务 ${code} `);
+					const { stdout } = await userCommand();
+					// consola.success(` 完成用户 afterBuildTasks 命令任务 ${code} `);
+					consola.success(` 完成用户 afterBuildTasks 命令任务 `);
 					// consola.box(stdout);
 				});
 			}),
@@ -441,9 +440,9 @@ async function main() {
 					return generateSimpleAsyncTask(async () => {
 						const build = generateBuildTask(deployTarget);
 						consola.start(` 开始build任务 `);
-						const { code, stdout } = await build();
+						const { stdout } = await build();
 						consola.success(` 完成build任务 `);
-						consola.info(` 完成命令 ${code} `);
+						// consola.info(` 完成命令 ${code} `);
 						// consola.box(stdout);
 					});
 				}),
@@ -475,8 +474,11 @@ async function main() {
 													parameters: [],
 												});
 												consola.start(` 开始用户命令任务 `);
-												const { code, stdout } = await userCommand();
-												consola.success(` 完成用户命令任务 ${code} `);
+												const child = await userCommand();
+												process.stdout.write(child.stdout);
+												process.stderr.write(child.stderr);
+												// consola.success(` 完成用户命令任务 ${code} `);
+												consola.success(` 完成用户命令任务 `);
 												// consola.box(stdout);
 											});
 										}),
@@ -511,9 +513,23 @@ async function main() {
 							generateSimpleAsyncTask(async () => {
 								const deploy = generateDeployTask(deployTarget);
 								consola.start(` 开始部署任务 `);
-								const { stdout: vercelUrl } = await deploy();
+								const { stdout, error, stderr } = await deploy();
+
+								if (error) {
+									consola.error(" 部署失败了 \n");
+									consola.error(error);
+									process.stderr.write(stderr);
+									return;
+								}
+
+								const vercelUrl = stdout.toString();
 								consola.success(` 完成部署任务 检查生成的url为 \n `);
 								consola.box(vercelUrl);
+
+								consola.success(` 部署任务输出如下： \n`);
+								process.stdout.write(stdout);
+								console.log(`\n`);
+
 								return vercelUrl;
 							}),
 
@@ -524,8 +540,8 @@ async function main() {
 									return generateSimpleAsyncTask(async (vercelUrl: string) => {
 										const alias = generateAliasTask(vercelUrl, userUrl);
 										consola.start(` 开始别名任务 `);
-										const { stdout, command } = await alias();
-										consola.success(` 执行了： ${command} `);
+										const { stdout } = await alias();
+										// consola.success(` 执行了： ${command} `);
 										consola.success(` 完成别名任务 可用的别名地址为 \n`);
 										consola.box(`https://${userUrl}`);
 									});

package/tsconfig.json

@@ -37,7 +37,7 @@
 		"./src/**/*.ts",
 		"./tests/**/*.test.ts",
 		"./tests/**/*.ts",
-		"../utils/src/define-promise-tasks.ts" // "src",
+		// "src",
 		// "tests"
 	]
 }