New Case Study:See how Anthropic automated 95% of dependency reviews with Socket.Learn More
Socket
Sign inDemoInstall
Socket

balm-git-flow

Package Overview
Dependencies
Maintainers
1
Versions
59
Alerts
File Explorer

Advanced tools

Socket logo

Install Socket

Detect and block malicious and high-risk dependencies

Install

balm-git-flow - npm Package Compare versions

Comparing version

to
0.10.4-legacy

55

lib/deploy.js

@@ -28,27 +28,28 @@ "use strict";

_context.next = 3;
return (0, _cmd.clean)(false);
case 3:
_context.next = 5;
return (0, _cmd.checkStatus)();
case 3:
case 5:
hasUncommitted = _context.sent;
if (!hasUncommitted) {
_context.next = 14;
_context.next = 15;
break;
}
if (!ignoreUncommitted) {
_context.next = 11;
_context.next = 13;
break;
}
_context.next = 8;
_context.next = 10;
return (0, _cmd.runCommands)('git stash');
case 8:
case 10:
_logger["default"].log("You can use ".concat(_chalk["default"].yellow('git stash pop'), " to restore the latest status after release completed"));
_context.next = 14;
_context.next = 15;
break;
case 11:
_context.next = 13;
return (0, _cmd.clean)(false, _chalk["default"].yellow('Local changes were not restored'));
case 13:
_logger["default"].log(_chalk["default"].yellow('Local changes were not restored'));
return _context.abrupt("return", false);
case 14:
case 15:
if (!(release.includes(releaseBranch) && currentBranch === main)) {
_context.next = 30;
_context.next = 31;
break;

@@ -58,7 +59,7 @@ }

if (!devBranch) {
_context.next = 30;
_context.next = 31;
break;
}
_context.prev = 17;
_context.next = 20;
_context.prev = 18;
_context.next = 21;
return (0, _cmd.runCommands)("git merge --no-ff origin/".concat(devBranch), {

@@ -68,27 +69,27 @@ debug: debug,

});
case 20:
_context.next = 26;
case 21:
_context.next = 27;
break;
case 22:
_context.prev = 22;
_context.t0 = _context["catch"](17);
_context.next = 26;
case 23:
_context.prev = 23;
_context.t0 = _context["catch"](18);
_context.next = 27;
return (0, _cmd.runCommands)("git merge --no-ff ".concat(devBranch), {
debug: debug
});
case 26:
_context.prev = 26;
_context.next = 29;
case 27:
_context.prev = 27;
_context.next = 30;
return (0, _cmd.runCommands)("git push origin ".concat(main), {
debug: debug
});
case 29:
return _context.finish(26);
case 30:
return _context.finish(27);
case 31:
return _context.abrupt("return", true);
case 31:
case 32:
case "end":
return _context.stop();
}
}, _callee, null, [[17, 22, 26, 30]]);
}, _callee, null, [[18, 23, 27, 31]]);
}));

@@ -95,0 +96,0 @@ return _checkReleaseBranch.apply(this, arguments);

{
"name": "balm-git-flow",
"version": "0.10.3-legacy",
"version": "0.10.4-legacy",
"description": "The best practices for front-end git flow",

@@ -5,0 +5,0 @@ "keywords": [