alex-c-line 1.2.2 → 1.2.3
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 +4 -13
- package/dist/index.js +4 -13
- package/package.json +3 -3
package/dist/index.cjs
CHANGED
|
@@ -64,12 +64,8 @@ var import_commander = require("commander");
|
|
|
64
64
|
var import_fs = require("fs");
|
|
65
65
|
var import_path = __toESM(require("path"), 1);
|
|
66
66
|
function checkLockfileVersionDiscrepancy(program2) {
|
|
67
|
-
program2.command("check-lockfile-version-discrepancy").description(
|
|
68
|
-
"
|
|
69
|
-
).action(() => {
|
|
70
|
-
console.log(
|
|
71
|
-
"Checking for package.json and package-lock.json discrepancies..."
|
|
72
|
-
);
|
|
67
|
+
program2.command("check-lockfile-version-discrepancy").description("Check that version numbers in package.json and package-lock.json match").action(() => {
|
|
68
|
+
console.log("Checking for package.json and package-lock.json discrepancies...");
|
|
73
69
|
const { version: packageVersion } = JSON.parse(
|
|
74
70
|
(0, import_fs.readFileSync)(import_path.default.resolve(process.cwd(), "package.json"), "utf-8")
|
|
75
71
|
);
|
|
@@ -109,10 +105,7 @@ function gitPostMergeCleanup(program2) {
|
|
|
109
105
|
let alexCLineConfigJSON;
|
|
110
106
|
try {
|
|
111
107
|
alexCLineConfigJSON = yield (0, import_promises.readFile)(
|
|
112
|
-
import_path2.default.join(
|
|
113
|
-
(_a = process.env.HOME) != null ? _a : import_os.default.homedir(),
|
|
114
|
-
"alex-c-line-config.json"
|
|
115
|
-
),
|
|
108
|
+
import_path2.default.join((_a = process.env.HOME) != null ? _a : import_os.default.homedir(), "alex-c-line-config.json"),
|
|
116
109
|
"utf-8"
|
|
117
110
|
);
|
|
118
111
|
} catch (e) {
|
|
@@ -122,9 +115,7 @@ function gitPostMergeCleanup(program2) {
|
|
|
122
115
|
}
|
|
123
116
|
const alexCLineConfig = JSON.parse(alexCLineConfigJSON);
|
|
124
117
|
const rebase = (_c = (_b = alexCLineConfig["git-post-merge-cleanup"]) == null ? void 0 : _b.rebase) != null ? _c : rebaseOption;
|
|
125
|
-
console.log(
|
|
126
|
-
`Running git-post-merge-cleanup in ${rebase ? "rebase" : "merge"} mode...`
|
|
127
|
-
);
|
|
118
|
+
console.log(`Running git-post-merge-cleanup in ${rebase ? "rebase" : "merge"} mode...`);
|
|
128
119
|
const { stdout: currentBranch } = yield import_execa2.execa`git branch --show-current`;
|
|
129
120
|
if (currentBranch === "main") {
|
|
130
121
|
console.error("\u274C ERROR: Cannot run cleanup on main branch!");
|
package/dist/index.js
CHANGED
|
@@ -43,12 +43,8 @@ import { Command } from "commander";
|
|
|
43
43
|
import { readFileSync } from "fs";
|
|
44
44
|
import path from "path";
|
|
45
45
|
function checkLockfileVersionDiscrepancy(program2) {
|
|
46
|
-
program2.command("check-lockfile-version-discrepancy").description(
|
|
47
|
-
"
|
|
48
|
-
).action(() => {
|
|
49
|
-
console.log(
|
|
50
|
-
"Checking for package.json and package-lock.json discrepancies..."
|
|
51
|
-
);
|
|
46
|
+
program2.command("check-lockfile-version-discrepancy").description("Check that version numbers in package.json and package-lock.json match").action(() => {
|
|
47
|
+
console.log("Checking for package.json and package-lock.json discrepancies...");
|
|
52
48
|
const { version: packageVersion } = JSON.parse(
|
|
53
49
|
readFileSync(path.resolve(process.cwd(), "package.json"), "utf-8")
|
|
54
50
|
);
|
|
@@ -88,10 +84,7 @@ function gitPostMergeCleanup(program2) {
|
|
|
88
84
|
let alexCLineConfigJSON;
|
|
89
85
|
try {
|
|
90
86
|
alexCLineConfigJSON = yield readFile(
|
|
91
|
-
path2.join(
|
|
92
|
-
(_a = process.env.HOME) != null ? _a : os.homedir(),
|
|
93
|
-
"alex-c-line-config.json"
|
|
94
|
-
),
|
|
87
|
+
path2.join((_a = process.env.HOME) != null ? _a : os.homedir(), "alex-c-line-config.json"),
|
|
95
88
|
"utf-8"
|
|
96
89
|
);
|
|
97
90
|
} catch (e) {
|
|
@@ -101,9 +94,7 @@ function gitPostMergeCleanup(program2) {
|
|
|
101
94
|
}
|
|
102
95
|
const alexCLineConfig = JSON.parse(alexCLineConfigJSON);
|
|
103
96
|
const rebase = (_c = (_b = alexCLineConfig["git-post-merge-cleanup"]) == null ? void 0 : _b.rebase) != null ? _c : rebaseOption;
|
|
104
|
-
console.log(
|
|
105
|
-
`Running git-post-merge-cleanup in ${rebase ? "rebase" : "merge"} mode...`
|
|
106
|
-
);
|
|
97
|
+
console.log(`Running git-post-merge-cleanup in ${rebase ? "rebase" : "merge"} mode...`);
|
|
107
98
|
const { stdout: currentBranch } = yield execa2`git branch --show-current`;
|
|
108
99
|
if (currentBranch === "main") {
|
|
109
100
|
console.error("\u274C ERROR: Cannot run cleanup on main branch!");
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "alex-c-line",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -32,10 +32,10 @@
|
|
|
32
32
|
"execa": "^9.6.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@alextheman/eslint-plugin": "^1.2.
|
|
35
|
+
"@alextheman/eslint-plugin": "^1.2.8",
|
|
36
36
|
"@types/eslint": "^9.6.1",
|
|
37
37
|
"@types/node": "^24.1.0",
|
|
38
|
-
"eslint": "^9.
|
|
38
|
+
"eslint": "^9.32.0",
|
|
39
39
|
"eslint-import-resolver-typescript": "^4.4.4",
|
|
40
40
|
"husky": "^9.1.7",
|
|
41
41
|
"prettier": "^3.6.2",
|