- fix bug: deleted files are not removed from release branch when publishing to github

 - bump version

Author: zbryikt

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Logs
 
+## v1.4.5
+
+ - fix bug: deleted files are not removed from release branch when publishing to github
+
+
 ## v1.4.4
 
  - support release to github with `publish -g` option

cli.js

@@ -480,13 +480,9 @@ makeGithubRelease = function(arg$){
       fsExtra.removeSync(releaseFolder);
     }
     return exec(['git', 'worktree', 'add', '--force'].concat([releaseFolder, branch])).then(function(){
-      var cmd;
-      fsExtra.copySync(workFolder, releaseFolder, {
-        overwrite: true
-      });
-      cmd = "cd .fedep/_public && git add * && git commit -m \"regen\" && git push -u " + remote + " " + branch + " && cd .. && rm -rf _public";
       return new Promise(function(res, rej){
-        return child_process.exec(cmd, function(e, sout, serr){
+        return child_process.exec("cd " + releaseFolder + " && git rm -r *", function(e, sout, serr){
+          var cmd;
           serr == null && (serr = "");
           if (e) {
             return rej(new Error([sout, serr].map(function(it){
@@ -495,7 +491,21 @@ makeGithubRelease = function(arg$){
               return it;
             }).join('\n')));
           }
-          return res();
+          fsExtra.copySync(workFolder, releaseFolder, {
+            overwrite: true
+          });
+          cmd = "cd " + releaseFolder + " && git add * && git commit -m \"regen\" && git push -u " + remote + " " + branch + " && cd .. && rm -rf _public";
+          return child_process.exec(cmd, function(e, sout, serr){
+            serr == null && (serr = "");
+            if (e) {
+              return rej(new Error([sout, serr].map(function(it){
+                return (it || '').trim();
+              }).filter(function(it){
+                return it;
+              }).join('\n')));
+            }
+            return res();
+          });
         });
       });
     });

lib/release.ls

@@ -85,9 +85,11 @@ make-github-release = ({branch = "release"}) ->
     if !fs.exists-sync work-folder => return Promise.reject("work folder #work-folder doesn't exist")
     if fs.exists-sync release-folder => fs-extra.remove-sync release-folder
     <- exec <[git worktree add --force]> ++ [release-folder, branch] .then _
-    fs-extra.copy-sync work-folder, release-folder, {overwrite: true}
-    cmd = "cd .fedep/_public && git add * && git commit -m \"regen\" && git push -u #remote #branch && cd .. && rm -rf _public"
     (res, rej) <- new Promise _
+    (e, sout, serr = "") <- child_process.exec "cd #release-folder && git rm -r *", _
+    if e => return rej new Error([sout, serr].map(->(it or '').trim!).filter(->it).join(\\n))
+    fs-extra.copy-sync work-folder, release-folder, {overwrite: true}
+    cmd = "cd #release-folder && git add * && git commit -m \"regen\" && git push -u #remote #branch && cd .. && rm -rf _public"
     (e, sout, serr = "") <- child_process.exec cmd, _
     if e => return rej new Error([sout, serr].map(->(it or '').trim!).filter(->it).join(\\n))
     return res!

package-lock.json

@@ -6,7 +6,7 @@
     "cli.js"
   ],
   "description": "Frontend dependency installer",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "homepage": "https://github.com/plotdb/fedep",
   "repository": {
     "type": "git",