@farris/cli 1.0.22 → 1.0.25

package/ci/cli.js

@@ -218,7 +218,7 @@ function updateProjectVersion(projectInfo, updateVersionType) {
         })
 }
 
-function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType) {
+function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl) {
     let npmCommandArray = [];
     switch (updateVersionType) {
         case 'prerelease':
@@ -234,11 +234,25 @@ 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}`);
     monoWorkspace.version = packageConfig.version;
+    // 向git缓冲区中添加变更
+    childProcess.execSync('git', ['add', '.']);
+    // // 提交变更记录
+    childProcess.execSync('git', ['commit', '-m', `Update MonoWorkspace version to v${packageConfig.version}. [skip ci]`]);
+    console.log(`Update MonoWorkspace version to v${packageConfig.version}`);
+    const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+    // 提交变更集
+    if (commitUrl) {
+        console.log(`executing git push ${branch} to ${commitUrl}`);
+        return childProcess.exec("git", ["push", commitUrl]);
+    } else {
+        console.log(`executing git push ${branch}`);
+        return childProcess.exec('git', ['push']);
+    }
 }
 
 function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
@@ -253,8 +267,8 @@ function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
     return `${versionMessage} ${suffix}`;
 }
 
-function commitChanges(updatedVersions, commitUrl) {
-    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, '. [skip ci]');
+function commitVersionChanges(updatedVersions, commitUrl) {
+    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, ' [skip ci]');
 
     if (commitMessage) {
         // 向git缓冲区中添加变更
@@ -265,11 +279,13 @@ function commitChanges(updatedVersions, commitUrl) {
         console.log(commitMessage);
 
         const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-        console.log(`executing git push ${branch}`);
+
         // 提交变更集
         if (commitUrl) {
+            console.log(`executing git push ${branch} to ${commitUrl}`);
             return childProcess.exec("git", ["push", commitUrl]);
         } else {
+            console.log(`executing git push ${branch}`);
             return childProcess.exec('git', ['push']);
         }
     }
@@ -278,7 +294,6 @@ function commitChanges(updatedVersions, commitUrl) {
 function buildWorkspace(workspace) {
     console.log(`executing lerna run build --scope=${workspace.packageName}`)
     return childProcess.exec('lerna', ['run', 'build', `--scope=${workspace.packageName}`]);
-    // lerna run build --scope=@farris/ide-framework
 }
 
 function addTagToMonoWorkspace(monoWorkspace, commitUrl) {
@@ -379,9 +394,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,10 +401,14 @@ function publish(commitUrl, updateVersionType) {
                     Object.assign(workspace.updateResult, updateResult);
                     return workspace;
                 }, monoWorkspace);
-                updateMonoWorkspaceVersion(monoWorkspace, updateVersionType);
                 const updatedVersions = monoWorkspace.updateResult;
-                commitChanges(updatedVersions, commitUrl);
-                return Promise.resolve(monoWorkspace);
+                return commitVersionChanges(updatedVersions, commitUrl)
+                    .then((result) => {
+                        return updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl);
+                    })
+                    .then((reulst) => {
+                        return Promise.resolve(monoWorkspace);
+                    });
             });
     });
     // 5. 编译所有Angular工作区

package/package.json

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