@farris/cli 1.0.10 → 1.0.13

package/ci/cli.js

@@ -134,8 +134,7 @@ function checkProjectChanges(projectPath) {
  * @param {string} projectPath 目标工程路径
  * @returns 更新后的版本
  */
-function updateProjectPrereleaseVersion(projectPath, monoWorkspace) {
-    monoWorkspace.updateResult = monoWorkspace.updateResult || {};
+function updateProjectPrereleaseVersion(projectPath) {
     return childProcess
         // 使用 npm version prerelease 更新指定工程的预发布版本
         .exec('npm', ['version', 'prerelease', '--preid=beta', '--prefix', projectPath])
@@ -146,25 +145,35 @@ function updateProjectPrereleaseVersion(projectPath, monoWorkspace) {
             // 提取更新后的版本
             const updatedVersion = returnValue.stdout;
             console.log(`update ${packageConfig.name} prerelease version to ${updatedVersion}`);
-            monoWorkspace.updateResult[packageConfig.name] = updatedVersion;
-            return monoWorkspace;
+            const updateResult = {};
+            updateResult[packageConfig.name] = updatedVersion;
+            return updateResult;
         })
 }
 
 function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
-    const versionMessage = updatedVersions.reduce((latestMessage, updateVersion, index, originalArray) => {
-        if (Object.keys(updateVersion).length) {
-            const packageName = Object.keys(updateVersion)[0];
-            const version = updateVersion[packageName];
-            let message = `${packageName} to ${version}`;
-            if (index <= originalArray.length - 2) {
-                message = message + ', ';
-            }
-            latestMessage = latestMessage + message;
+    const versionMessage = Object.keys(updatedVersions).reduce((latestMessage, packageName, index, originalArray) => {
+        const version = updatedVersions[packageName];
+        let message = `${packageName} to ${version}`;
+        if (index <= originalArray.length - 2) {
+            message = message + ', ';
         }
-        return latestMessage;
-    }, `${prefix} `);
-    return `${versionMessage} ${suffix}ß`;
+        return latestMessage = latestMessage + message;
+    }, `${prefix} `)
+    return `${versionMessage} ${suffix}`;
+    // const versionMessage = updatedVersions.reduce((latestMessage, updateVersion, index, originalArray) => {
+    //     if (Object.keys(updateVersion).length) {
+    //         const packageName = Object.keys(updateVersion)[0];
+    //         const version = updateVersion[packageName];
+    //         let message = `${packageName} to ${version}`;
+    //         if (index <= originalArray.length - 2) {
+    //             message = message + ', ';
+    //         }
+    //         latestMessage = latestMessage + message;
+    //     }
+    //     return latestMessage;
+    // }, `${prefix} `);
+    // return `${versionMessage} ${suffix}`;
 }
 
 function commitChanges(updatedVersions, commitUrl) {
@@ -190,21 +199,21 @@ 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 tagMonoWorkspace(monoWorkspace, commitUrl) {
-    const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
-    /*from   www.w3cschool.cn*/
+    // const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
     const date = moment(new Date());
-    const tagVersion = `v${date.format('yyyyMMddhhmmss')}`;
-    childProcess.execSync('git', ['tag', tagVersion, '-m', tagMessage]);
+    const tagVersion = `v${date.format('YYYMMDDHHmmss')}`;
+    childProcess.execSync('git', ['tag', tagVersion, '-m', "publish npm package"]);
     // 提交变更集
     if (commitUrl) {
-        return childProcess.exec("git", ["push", '-o', 'ci.skip', commitUrl]);
+        return childProcess.exec("git", ["push", '--tags', '-o', 'ci.skip', commitUrl]);
     } else {
-        return childProcess.exec('git', ['push', '-o', 'ci.skip']);
+        return childProcess.exec('git', ['push', '--tags', '-o', 'ci.skip']);
     }
 }
 
@@ -270,7 +279,12 @@ function publishAll(commitUrl) {
         const changedProjects = monoWorkspace.changedProjects;
         const prereleasePromise = changedProjects.map(projectInfo => updateProjectPrereleaseVersion(projectInfo.project.path, monoWorkspace));
         return Promise.all(prereleasePromise)
-            .then((monoWorkspace) => {
+            .then((results) => {
+                results.reduce((workspace, updateResult) => {
+                    workspace.updateResult = workspace.updateResult || {};
+                    Object.assign(workspace.updateResult, updateResult);
+                    return workspace;
+                }, monoWorkspace);
                 const updatedVersions = monoWorkspace.updateResult;
                 commitChanges(updatedVersions, commitUrl);
                 return Promise.resolve(monoWorkspace);
@@ -279,7 +293,7 @@ function publishAll(commitUrl) {
     chain = chain.then(monoWorkspace => {
         const buildPromises = monoWorkspace.workspaces.map((workspace) => buildWorkspace(workspace));
         return Promise.all(buildPromises)
-            .then(() => {
+            .then((results) => {
                 return Promise.resolve(monoWorkspace);
             });
     });

package/package.json

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