@farris/cli 1.0.27 → 1.0.28

package/ci/cli.js

@@ -183,78 +183,30 @@ function checkProjectChanges(projectInfo, lastCommit) {
  * @returns 更新后的版本
  */
 function updateProjectVersion(projectInfo, updateVersionType) {
-    let npmCommandArray = [];
     const projectPath = projectInfo.project.path;
     if (!projectPath) {
         throw new Error(`update project version error: you must provide project path by project info object.`)
     }
-    switch (updateVersionType) {
-        case 'prerelease':
-            npmCommandArray = ['version', 'prerelease', '--preid=beta', '--prefix', projectPath];
-            break;
-        case 'patch':
-            npmCommandArray = ['version', 'patch', '--prefix', projectPath];
-            break;
-        case 'minor':
-            npmCommandArray = ['version', 'minor', '--prefix', projectPath];
-            break;
-        case 'major':
-            npmCommandArray = ['version', 'major', '--prefix', projectPath];
-            break;
+    const updateProjectVersion = ['version', updateVersionType, '--force', '--no-git-tag-version', '--prefix', projectPath];
+    if (updateVersionType === 'prerelease') {
+        updateProjectVersion.push('--preid=beta');
     }
     return childProcess
         // 使用 npm version prerelease 更新指定工程的预发布版本
-        .exec('npm', npmCommandArray)
+        .exec('npm', updateProjectVersion)
         .then((returnValue) => {
             // 读取目标工程的package.json文件
             const packageJsonFilePath = `${projectPath}/package.json`;
             const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
             // 提取更新后的版本
             const updatedVersion = returnValue.stdout;
-            console.log(`update ${packageConfig.name} prerelease version to ${updatedVersion}`);
+            console.log(`Update ${packageConfig.name} prerelease version to ${updatedVersion}.`);
             const updateResult = {};
             updateResult[packageConfig.name] = updatedVersion;
             return updateResult;
         })
 }
 
-function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl) {
-    let npmCommandArray = [];
-    switch (updateVersionType) {
-        case 'prerelease':
-            npmCommandArray = ['version', 'prerelease', '--preid=beta'];
-            break;
-        case 'patch':
-            npmCommandArray = ['version', 'patch'];
-            break;
-        case 'minor':
-            npmCommandArray = ['version', 'minor'];
-            break;
-        case 'major':
-            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'));
-    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 = '') {
     const versionMessage = Object.keys(updatedVersions).reduce((latestMessage, packageName, index, originalArray) => {
         const version = updatedVersions[packageName];
@@ -274,20 +226,6 @@ function commitVersionChanges(updatedVersions, commitUrl, monoWorkspace, updateV
         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);
 
@@ -300,10 +238,6 @@ function commitVersionChanges(updatedVersions, commitUrl, monoWorkspace, updateV
         // 提交变更记录
         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) {
@@ -322,7 +256,7 @@ function buildWorkspace(workspace) {
 }
 
 function addTagToMonoWorkspace(monoWorkspace, commitUrl) {
-    const monoWorkspaceVersion = monoWorkspace.version;
+    const monoWorkspaceVersion = `v${monoWorkspace.version}`;
     childProcess.execSync('git', ['tag', monoWorkspaceVersion, '-m', 'Publish npm packages. [skip ci]']);
     // 提交变更集
     if (commitUrl) {
@@ -426,15 +360,6 @@ function publish(commitUrl, updateVersionType) {
                 const updatedVersions = monoWorkspace.updateResult;
                 if (updatedVersions) {
                     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.27",
+  "version": "1.0.28",
   "description": "Farris command line interface",
   "main": "index.js",
   "scripts": {