@ruan-cat/vercel-deploy-tool 0.7.5 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruan-cat/vercel-deploy-tool",
-  "version": "0.7.5",
+  "version": "0.8.1",
   "description": "阮喵喵自用的vercel部署工具，用于实现复杂项目的部署。",
   "type": "module",
   "main": "./src/index.ts",
@@ -50,7 +50,7 @@
     "pathe": "^1.1.2",
     "rimraf": "^6.0.1",
     "shx": "^0.3.4",
-    "vercel": "39.3.0",
+    "vercel": "^41.2.0",
     "@ruan-cat/utils": "^3.0.0"
   },
   "devDependencies": {

package/src/config.ts

@@ -2,7 +2,7 @@ import { resolve } from "pathe";
 import { loadConfig } from "c12";
 import { config as dotenvConfig } from "@dotenvx/dotenvx";
 import { consola } from "consola";
-import { merge } from "lodash-es";
+import { merge, isEmpty } from "lodash-es";
 import { program } from "commander";
 
 /**
@@ -226,17 +226,21 @@ export async function initVercelConfig() {
 	const vercelProjectId = currentDotenvConfig!.VERCEL_PROJECT_ID ?? process.env.VERCEL_PROJECT_ID;
 	const vercelToken = currentDotenvConfig!.VERCEL_TOKEN ?? process.env.VERCEL_TOKEN;
 
-	const res: Config = merge(userConfig, {
-		vercelOrgId,
-		vercelProjectId,
-		vercelToken,
-	} satisfies Partial<Config>);
+	if (!isEmpty(vercelOrgId)) {
+		userConfig.vercelOrgId = vercelOrgId;
+	}
+	if (!isEmpty(vercelProjectId)) {
+		userConfig.vercelProjectId = vercelProjectId;
+	}
+	if (!isEmpty(vercelToken)) {
+		userConfig.vercelToken = vercelToken;
+	}
 
 	consola.success(" 完成初始化项目配置 ");
 	// 显示效果没有那么好看
-	consola.box(res);
+	consola.box(userConfig);
 
-	return res;
+	return userConfig;
 }
 
 /** 项目内的vercel配置 */

package/src/index.ts

@@ -140,6 +140,18 @@ function getVercelProjetNameCommandArgument() {
 	return <const>[`--project=${config.vercelProjetName}`];
 }
 
+/**
+ * 以命令参数数组的形式，获得范围名称
+ * @see https://vercel.com/docs/cli/global-options#scope
+ *
+ * 为什么传递组织id？
+ * 此篇讨论内 使用了组织id
+ * @see https://vercel.community/t/deployment-via-gitlab-ci-to-dev-domain/523/3
+ */
+function getVercelScopeCommandArgument() {
+	return <const>[`--scope=${config.vercelOrgId}`];
+}
+
 /** 以命令参数数组的形式，获得项目token */
 function getVercelTokenCommandArgument() {
 	return <const>[`--token=${config.vercelToken}`];
@@ -352,11 +364,15 @@ function generateCopyDistTasks(deployTarget: WithUserCommands) {
  * 旨在于封装类似于这样的命令：
  *
  * vc alias set "$url1" ${{env.p1-url}} -t ${{env.vct}}
+ *
+ * 封装出类似的命令：
+ * vercel alias set $DEPLOYMENT_URL domain2.com --token=$VERCEL_TOKEN --scope=$VERCEL_ORG_ID
+ * @see https://vercel.community/t/deployment-via-gitlab-ci-to-dev-domain/523/3
  */
 function generateAliasTask(vercelUrl: string, userUrl: string) {
 	return generateSpawnSync({
 		command: `vc alias set ${vercelUrl} ${userUrl}`,
-		parameters: concat(getVercelTokenCommandArgument()),
+		parameters: concat(getVercelTokenCommandArgument(), getVercelScopeCommandArgument()),
 	});
 }