From b6d35cd2688360a62c51499bb9e82bfd014d1b81 Mon Sep 17 00:00:00 2001
From: neverland <jait.chen@foxmail.com>
Date: Sun, 30 Jul 2023 11:50:56 +0800
Subject: [PATCH] feat(cli): support gitTag option for release command (#12134)

* feat(cli): support gitTag option for release command

* chore: exclude temp file

* release: vant v4.6.4-beta.1
---
 .gitignore                                |  3 +++
 packages/vant-cli/src/cli.ts              |  1 +
 packages/vant-cli/src/commands/release.ts | 25 ++++++++++++++++++++---
 packages/vant/package.json                |  4 ++--
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index bbfb1619c..3df2278cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ lib
 dist
 **/site-dist
 changelog.generated.md
+
+# temp file
+packages/vant/README.md
diff --git a/packages/vant-cli/src/cli.ts b/packages/vant-cli/src/cli.ts
index e3b311f96..03531135d 100644
--- a/packages/vant-cli/src/cli.ts
+++ b/packages/vant-cli/src/cli.ts
@@ -75,6 +75,7 @@ program
   .command('release')
   .description('Compile components and release it')
   .option('--tag <tag>', 'Release tag')
+  .option('--gitTag', 'Generate git tag')
   .action(async (options) => {
     const { release } = await import('./commands/release.js');
     return release(options);
diff --git a/packages/vant-cli/src/commands/release.ts b/packages/vant-cli/src/commands/release.ts
index 4723bed63..178c8cd2e 100644
--- a/packages/vant-cli/src/commands/release.ts
+++ b/packages/vant-cli/src/commands/release.ts
@@ -75,12 +75,30 @@ function publishPackage(packageManager: string, tag: string) {
   execSync(command, { stdio: 'inherit' });
 }
 
-function commitChanges(pkgName: string, version: string) {
+function commitChanges(pkgName: string, version: string, gitTag?: boolean) {
   const message = `release: ${pkgName} v${version}`;
   execSync(`git add -A && git commit -m "${message}"`, { stdio: 'inherit' });
+
+  if (gitTag) {
+    execSync(`git tag -a v${version} -m "${message}"`, { stdio: 'inherit' });
+  }
 }
 
-export async function release(command: { tag?: string }) {
+function getCurrentBranch() {
+  const branch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
+  return branch;
+}
+
+function pushChanges(gitTag?: boolean) {
+  const branch = getCurrentBranch();
+  execSync(`git push origin ${branch}`, { stdio: 'inherit' });
+
+  if (gitTag) {
+    execSync(`git push origin ${branch} --tags`, { stdio: 'inherit' });
+  }
+}
+
+export async function release(command: { tag?: string; gitTag?: boolean }) {
   const cwd = process.cwd();
   const { pkgName, currentVersion } = logCurrentVersion(cwd);
   const version = await getNewVersion();
@@ -99,5 +117,6 @@ export async function release(command: { tag?: string }) {
   }
 
   publishPackage(packageManager, tag);
-  commitChanges(pkgName, version);
+  commitChanges(pkgName, version, command.gitTag);
+  pushChanges(command.gitTag);
 }
diff --git a/packages/vant/package.json b/packages/vant/package.json
index 36ca292fa..ad38a0bdc 100644
--- a/packages/vant/package.json
+++ b/packages/vant/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "4.6.3",
+  "version": "4.6.4-beta.1",
   "description": "Mobile UI Components built on Vue",
   "main": "lib/vant.cjs.js",
   "module": "es/index.mjs",
@@ -18,7 +18,7 @@
     "test": "vant-cli test",
     "build": "vant-cli build",
     "build:site": "vant-cli build-site",
-    "release": "cp ../../README.md ./ && vant-cli release && rm ./README.md",
+    "release": "cp ../../README.md ./ && vant-cli release --gitTag && rm ./README.md",
     "release:site": "pnpm build:site && npx gh-pages -d site-dist --add",
     "test:update": "vant-cli test --updateSnapshot",
     "test:watch": "vant-cli test --watch",