alex-c-line 1.3.5 → 1.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +1 -1
- package/dist/index.js +1 -1
- package/package.json +4 -4
package/dist/index.cjs
CHANGED
|
@@ -164,6 +164,7 @@ function gitPostMergeCleanup(program2) {
|
|
|
164
164
|
}
|
|
165
165
|
yield runCommandAndLogToConsole("git", ["checkout", "main"]);
|
|
166
166
|
yield runCommandAndLogToConsole("git", ["pull", "origin", "main"]);
|
|
167
|
+
yield runCommandAndLogToConsole("git", ["fetch", "--prune"]);
|
|
167
168
|
if (rebase) {
|
|
168
169
|
const { stdout: changes } = yield import_execa2.execa`git diff main..${currentBranch}`;
|
|
169
170
|
if (changes) {
|
|
@@ -171,7 +172,6 @@ function gitPostMergeCleanup(program2) {
|
|
|
171
172
|
yield import_execa2.execa`git checkout ${currentBranch}`;
|
|
172
173
|
process.exit(1);
|
|
173
174
|
}
|
|
174
|
-
yield runCommandAndLogToConsole("git", ["fetch", "--prune"]);
|
|
175
175
|
yield runCommandAndLogToConsole("git", ["branch", "-D", currentBranch]);
|
|
176
176
|
} else {
|
|
177
177
|
try {
|
package/dist/index.js
CHANGED
|
@@ -143,6 +143,7 @@ function gitPostMergeCleanup(program2) {
|
|
|
143
143
|
}
|
|
144
144
|
yield runCommandAndLogToConsole("git", ["checkout", "main"]);
|
|
145
145
|
yield runCommandAndLogToConsole("git", ["pull", "origin", "main"]);
|
|
146
|
+
yield runCommandAndLogToConsole("git", ["fetch", "--prune"]);
|
|
146
147
|
if (rebase) {
|
|
147
148
|
const { stdout: changes } = yield execa2`git diff main..${currentBranch}`;
|
|
148
149
|
if (changes) {
|
|
@@ -150,7 +151,6 @@ function gitPostMergeCleanup(program2) {
|
|
|
150
151
|
yield execa2`git checkout ${currentBranch}`;
|
|
151
152
|
process.exit(1);
|
|
152
153
|
}
|
|
153
|
-
yield runCommandAndLogToConsole("git", ["fetch", "--prune"]);
|
|
154
154
|
yield runCommandAndLogToConsole("git", ["branch", "-D", currentBranch]);
|
|
155
155
|
} else {
|
|
156
156
|
try {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "alex-c-line",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.7",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -34,10 +34,10 @@
|
|
|
34
34
|
"execa": "^9.6.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@alextheman/eslint-plugin": "^1.
|
|
37
|
+
"@alextheman/eslint-plugin": "^1.6.8",
|
|
38
38
|
"@types/eslint": "^9.6.1",
|
|
39
|
-
"@types/node": "^24.
|
|
40
|
-
"eslint": "^9.
|
|
39
|
+
"@types/node": "^24.3.0",
|
|
40
|
+
"eslint": "^9.34.0",
|
|
41
41
|
"eslint-import-resolver-typescript": "^4.4.4",
|
|
42
42
|
"husky": "^9.1.7",
|
|
43
43
|
"prettier": "^3.6.2",
|