@farris/cli 1.0.26 → 1.0.27

package/ci/cli.js

@@ -240,10 +240,10 @@ function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl)
     const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
     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}`);
+    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) {
@@ -267,17 +267,44 @@ function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
     return `${versionMessage} ${suffix}`;
 }
 
-function commitVersionChanges(updatedVersions, commitUrl) {
-    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, ' [skip ci]');
-
+function commitVersionChanges(updatedVersions, commitUrl, monoWorkspace, updateVersionType) {
+    const commitMessage = builderVersionChangeMessage('update', updatedVersions, '');
     if (commitMessage) {
+        const updateWorkspaceVersion = ['version', '--force', '--no-git-tag-version', updateVersionType];
+        if (updateVersionType === 'prerelease') {
+            updateWorkspaceVersion.push('--preid=beta');
+        }
+        // switch (updateVersionType) {
+        //     case 'prerelease':
+        //         updateWorkspaceVersion = ['version', 'prerelease', '--preid=beta', '--force', '--no-git-tag-version'];
+        //         break;
+        //     case 'patch':
+        //         updateWorkspaceVersion = ['version', 'patch', '--force', '--no-git-tag-version'];
+        //         break;
+        //     case 'minor':
+        //         updateWorkspaceVersion = ['version', 'minor', '--force', '--no-git-tag-version'];
+        //         break;
+        //     case 'major':
+        //         updateWorkspaceVersion = ['version', 'major', '--force', '--no-git-tag-version'];
+        //         break;
+        // }
+        console.log(`executing npm ${updateWorkspaceVersion.join(' ')} in root directory.`)
+        childProcess.execSync('npm', updateWorkspaceVersion);
+
+        const packageJsonFilePath = `./package.json`;
+        const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
+        monoWorkspace.version = packageConfig.version;
+
         // 向git缓冲区中添加变更
         childProcess.execSync('git', ['add', '.']);
-        // // 提交变更记录
-        childProcess.execSync('git', ['commit', '-m', `${commitMessage}`]);
+        // 提交变更记录
+        childProcess.execSync('git', ['commit', '-m', `Update workspace version to v${packageConfig.version} for ${commitMessage}. [skip ci]`]);
 
+        // // 向git缓冲区中添加变更
+        // childProcess.execSync('git', ['add', '.']);
+        // // // 提交变更记录
+        // childProcess.execSync('git', ['commit', '-m', `${commitMessage}`]);
         const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-
         // 提交变更集
         if (commitUrl) {
             console.log(`executing git push ${branch} to ${commitUrl}`);
@@ -295,9 +322,6 @@ function buildWorkspace(workspace) {
 }
 
 function addTagToMonoWorkspace(monoWorkspace, commitUrl) {
-    // const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
-    // const date = moment(new Date());
-    // const tagVersion = `v${date.format('YYYYMMDDHHmmss')}`;
     const monoWorkspaceVersion = monoWorkspace.version;
     childProcess.execSync('git', ['tag', monoWorkspaceVersion, '-m', 'Publish npm packages. [skip ci]']);
     // 提交变更集
@@ -401,16 +425,16 @@ function publish(commitUrl, updateVersionType) {
                 }, monoWorkspace);
                 const updatedVersions = monoWorkspace.updateResult;
                 if (updatedVersions) {
-                    return commitVersionChanges(updatedVersions, commitUrl)
-                        .then((result) => {
-                            if (result.stderr) {
-                                console.log(result.stderr);
-                            }
-                            if (result.stdout) {
-                                console.log(result.stdout);
-                            }
-                            return updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl);
-                        })
+                    return commitVersionChanges(updatedVersions, commitUrl, monoWorkspace, updateVersionType)
+                        // .then((result) => {
+                        //     if (result.stderr) {
+                        //         console.log(result.stderr);
+                        //     }
+                        //     if (result.stdout) {
+                        //         console.log(result.stdout);
+                        //     }
+                        //     return updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl);
+                        // })
                         .then((result) => {
                             if (result.stderr) {
                                 console.log(result.stderr);

package/package.json

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