@taole/deploy-helper 0.0.1 → 0.0.3

package/{index.js → index.mjs}

@@ -30,7 +30,7 @@ async function main() {
 
     // other commands
 
-    if(process.argv[2] === "help"){
+    if (process.argv[2] === "help") {
         console.log(`deploy-helper 部署脚本`);
         console.log(`usage: deploy-helper [mode]`);
         console.log(`mode: prod 生产环境部署`);
@@ -38,7 +38,7 @@ async function main() {
         process.exit(0);
     }
 
-    if(!["prod", "test"].includes(process.argv[2])){
+    if (!["prod", "test"].includes(process.argv[2])) {
         console.log("不支持的命令");
         process.exit(1);
     }
@@ -57,6 +57,12 @@ async function main() {
             return;
         }
 
+        // 需要处理entry
+        const needHandleEntry = (mode === 'prod' && config.entry.onlyProd) || (mode === 'test' && !config.entry.onlyProd);
+        const entryTestBranch = (config.entry && config.entry.testBranch) || "test";
+        const entryProdBranch = (config.entry && config.entry.prodBranch) || "master";
+        const entryTargetBranch = mode === 'prod' ? entryProdBranch : entryTestBranch;
+
         // 检查项目
         // 1. 检查项目是否存在
         const assetsDest = join(workDir, config.assets.dest);
@@ -65,24 +71,25 @@ async function main() {
             console.log(`assets.dest路径不存在: ${assetsDest}, 请先创建`);
             return;
         }
-        // test mode下不需要检查entry.dest
-        if (mode === 'prod' && !fs.existsSync(entryDest)) {
+        // entry.dest
+        if (needHandleEntry && !fs.existsSync(entryDest)) {
             console.log(`entry.dest路径不存在: ${entryDest}, 请先创建`);
             return;
         }
 
         // 2. 检查项目是否clean
         const assetsGit = simpleGit(assetsDest);
-        const assetsStatus = await assetsGit.status();
+        let assetsStatus = await assetsGit.status();
         if (!assetsStatus.isClean()) {
             console.log(`${assetsDest}目前有未提交内容, 请先处理`);
             return;
         }
 
         let entryGit;
-        if (mode === 'prod') {
+        let entryStatus;
+        if (needHandleEntry) {
             entryGit = simpleGit(entryDest);
-            const entryStatus = await entryGit.status();
+            entryStatus = await entryGit.status();
             if (!entryStatus.isClean()) {
                 console.log(`${entryDest}目前有未提交内容, 请先处理`);
                 return;
@@ -90,14 +97,14 @@ async function main() {
         }
 
         // 2.1如果是prod模式，检查当前项目是不是处于master分支
-        if(mode === 'prod'){
+        if (mode === 'prod') {
             const currentGit = simpleGit(workDir);
             const currentStatus = await currentGit.status();
-            if(!currentStatus.isClean()){
+            if (!currentStatus.isClean()) {
                 console.log(`当前项目有未提交内容, 请先处理`);
                 process.exit(1);
             }
-            if(currentStatus.branch !== "master"){
+            if (currentStatus.branch !== "master") {
                 console.log(`当前项目不是master分支, 请切换至master分支`);
                 process.exit(1);
             }
@@ -109,10 +116,10 @@ async function main() {
             await assetsGit.checkout("master");
             console.log(`${assetsDest}切换至master分支成功`);
         }
-        if (entryGit && entryStatus.current !== "master") {
-            console.log(`${entryDest}当前分支不是master, 切换至master分支`);
-            await entryGit.checkout("master");
-            console.log(`${entryDest}切换至master分支成功`);
+        if (needHandleEntry && entryStatus.current !== entryTargetBranch) {
+            console.log(`${entryDest}当前分支不是${entryTargetBranch}, 切换至${entryTargetBranch}分支`);
+            await entryGit.checkout(entryTargetBranch);
+            console.log(`${entryDest}切换至${entryTargetBranch}分支成功`);
         }
 
         // 4. 执行git pull
@@ -140,9 +147,9 @@ async function main() {
             console.log(`assets copy: ${srcPath} -> ${destPath}`);
             assetsFilesCount++;
         }
-        console.log(`assets copy done.`);
+        // console.log(`assets copy done.`);
         // 5.2 复制entry
-        if (mode === 'prod') {
+        if (needHandleEntry) {
             const entryFiles = config.entry.files;
             for (const [src, dest] of Object.entries(entryFiles)) {
                 const srcPath = join(workDir, src);
@@ -158,33 +165,54 @@ async function main() {
                 fs.copyFileSync(srcPath, destPath);
                 console.log(`entry copy: ${srcPath} -> ${destPath}`);
             }
-            console.log(`entry copy done.`);
+            // console.log(`entry copy done.`);
         }
 
         // 6. 提交
-        await assetsGit.add(".");
-        const assetsCommit = `${config.assets.commit || "feat:部署资源文件"} by deploy-helper`;
-        await assetsGit.commit(assetsCommit);
-        console.log(`assets commit: ${assetsCommit}`);
-        if (entryGit) {
-            await entryGit.add(".");
-            const entryCommit = `${config.entry.commit || "feat:部署入口文件"} by deploy-helper`;
-            await entryGit.commit(entryCommit);
-            console.log(`entry commit: ${entryCommit}`);
+        let canPushAssets = false;
+        let canPushEntry = false;
+        assetsStatus = await assetsGit.status();
+        if (!assetsStatus.isClean()) {
+            canPushAssets = true;
+            await assetsGit.add(".");
+            const assetsCommit = `${config.assets.commit || "feat:部署资源文件"} by deploy-helper`;
+            const assetsCommitResult = await assetsGit.commit(assetsCommit);
+            console.log(`assets commit: ${assetsCommit}`);
+            console.log(`assets commit: ${JSON.stringify(assetsCommitResult.summary)}`);
+        } else {
+            console.log(`${assetsDest} 未发现修改内容,跳过提交`);
+        }
+
+        if (needHandleEntry) {
+            entryStatus = await entryGit.status();
+            if (!entryStatus.isClean()) {
+                canPushEntry = true;
+                await entryGit.add(".");
+                const entryCommit = `${config.entry.commit || "feat:部署入口文件"} by deploy-helper`;
+                const entryCommitResult = await entryGit.commit(entryCommit);
+                console.log(`entry commit: ${entryCommit}`);
+                console.log(`entry commit: ${JSON.stringify(entryCommitResult.summary)}`);
+            } else {
+                console.log(`${entryDest} 未发现修改内容,跳过提交`);
+            }
         }
 
         // 7. 推送
-        await assetsGit.push();
-        console.log(`assets push done.`);
-        if(entryGit){
-            await entryGit.push();
+        if (canPushAssets) {
+            const assetsPushResult = await assetsGit.push();
+            console.log(`assets push done.`);
+            // console.log(`assets push: ${JSON.stringify([...assetsPushResult.remoteMessages.all()])}`);
+        }
+        if (canPushEntry) {
+            const entryPushResult = await entryGit.push();
             console.log(`entry push done.`);
+            // console.log(`entry push: ${JSON.stringify([...entryPushResult.remoteMessages.all()])}`);
         }
 
         try {
             // 8 测试环境将entry scp至测试环境
-            if (mode === 'test' && config.entry.syncTestFiles) {
-                const syncTestFiles = config.entry.syncTestFiles;
+            if (mode === 'test' && config.testSync) {
+                const syncTestFiles = config.testSync;
                 // 不能放密码。。残念
                 const scpClientConfig = {
                     host: '192.168.0.35',
@@ -206,7 +234,7 @@ async function main() {
         } catch (error) {
             console.log(`scp error: ${error}`);
             console.log(`复制文件到测试环境服务器失败, 建议配置本机ssh免密登录, 参考地址：https://foochane.cn/article/2019061601.html`);
-            if(assetsFilesCount > 0){
+            if (assetsFilesCount > 0) {
                 console.log(`不过请放心，构建产物的assets已经处理完成，只要手动处理index.html文件即可。`);
             }
             process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.js",
   "type": "module",
@@ -8,14 +8,16 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
-    "deploy-helper": "index.js",
-    "dh": "index.js"
+    "deploy-helper": "index.mjs",
+    "dh": "index.mjs"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "files": ["index.js"],
+  "files": [
+    "index.js"
+  ],
   "keywords": [],
   "author": "",
   "license": "ISC",