@farris/cli 1.0.20 → 1.0.23

package/ci/cli.js

@@ -156,8 +156,8 @@ function hasTags() {
  * @returns 检查结果
  */
 function checkProjectChanges(projectInfo, lastCommit) {
-    const projectPath = projectInfo?.project?.path;
-    const packageName = projectInfo?.package?.name || projectPath;
+    const projectPath = projectInfo.project.path;
+    const packageName = projectInfo.package.name || projectPath;
     return childProcess
         // 使用 git diff 命令查询自上传提交以来，目标工程路径下是否有变更的文件
         .exec("git", ["diff", "--name-only", lastCommit, projectPath])
@@ -234,10 +234,15 @@ function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType) {
             npmCommandArray = ['version', 'major'];
             break;
     }
+    console.log(`executing npm version --${updateVersionType} in root directory.`)
     childProcess.execSync('npm', npmCommandArray);
     const packageJsonFilePath = `./package.json`;
     const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
-    console.log(`update MonoWorkspace version to v${packageConfig.version}`);
+    // 向git缓冲区中添加变更
+    childProcess.execSync('git', ['add', '.']);
+    // // 提交变更记录
+    childProcess.execSync('git', ['commit', '-m', `Update MonoWorkspace version to v${packageConfig.version}`]);
+    console.log(`Update MonoWorkspace version to v${packageConfig.version}`);
     monoWorkspace.version = packageConfig.version;
 }
 
@@ -253,7 +258,7 @@ function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
     return `${versionMessage} ${suffix}`;
 }
 
-function commitChanges(updatedVersions, commitUrl) {
+function commitVersionChanges(updatedVersions) {
     const commitMessage = builderVersionChangeMessage('Update', updatedVersions, '. [skip ci]');
 
     if (commitMessage) {
@@ -263,15 +268,17 @@ function commitChanges(updatedVersions, commitUrl) {
         childProcess.execSync('git', ['commit', '-m', `${commitMessage}`]);
 
         console.log(commitMessage);
+    }
+}
 
-        const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-        console.log(`executing git push ${branch}`);
-        // 提交变更集
-        if (commitUrl) {
-            return childProcess.exec("git", ["push", commitUrl]);
-        } else {
-            return childProcess.exec('git', ['push']);
-        }
+function pushCommits(commitUrl) {
+    const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+    console.log(`executing git push ${branch}`);
+    // 提交变更集
+    if (commitUrl) {
+        return childProcess.exec("git", ["push", commitUrl]);
+    } else {
+        return childProcess.exec('git', ['push']);
     }
 }
 
@@ -361,7 +368,7 @@ function publish(commitUrl, updateVersionType) {
         const projects = monoWorkspace.projects;
         const checkProjects = projects.map((projectInfo) => {
             const lastCommit = getLastCommit();
-            console.log(`last commit ${lastCommit}`); Í
+            console.log(`last commit ${lastCommit}`);
             let checkPromise = checkProjectChanges(projectInfo, lastCommit);
             let changedPromise = checkPromise.then(hasChanged => {
                 projectInfo.hasChanged = hasChanged;
@@ -379,9 +386,6 @@ function publish(commitUrl, updateVersionType) {
     chain = chain.then(monoWorkspace => {
         const changedProjects = monoWorkspace.changedProjects;
         const prereleasePromise = changedProjects.map(projectInfo => updateProjectVersion(projectInfo, updateVersionType));
-        if (changedProjects) {
-
-        }
         return Promise.all(prereleasePromise)
             .then((results) => {
                 results.reduce((workspace, updateResult) => {
@@ -389,9 +393,10 @@ function publish(commitUrl, updateVersionType) {
                     Object.assign(workspace.updateResult, updateResult);
                     return workspace;
                 }, monoWorkspace);
-                updateMonoWorkspaceVersion(monoWorkspace, updateVersionType);
                 const updatedVersions = monoWorkspace.updateResult;
-                commitChanges(updatedVersions, commitUrl);
+                commitVersionChanges(updatedVersions, commitUrl);
+                updateMonoWorkspaceVersion(monoWorkspace, updateVersionType);
+                pushCommits(commitUrl);
                 return Promise.resolve(monoWorkspace);
             });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/cli",
-  "version": "1.0.20",
+  "version": "1.0.23",
   "description": "Farris command line interface",
   "main": "index.js",
   "scripts": {