@wzyjs/cli 0.0.16 → 0.0.18

package/dist/commands/build/index.js

@@ -40,7 +40,7 @@ exports.default = (cli) => {
         // 写 midway.config.js 到 dist 目录
         (0, utils_2.writeConfig)(outDir, productionConfig);
         // 写 package.json 到 dist 目录
-        fs.cpSync((0, path_1.join)(root, 'package.json'), (0, path_1.join)(outDir, 'package.json'));
+        // fs.cpSync(join(root, 'package.json'), join(outDir, 'package.json'))
         consola.info('正在打包后端代码...', root);
         const rdBuild = await (0, utils_1.executePromise)((0, utils_2.buildServer)(root, outDir));
         // 删除 midway.config.js

package/dist/commands/merge/index.d.ts

@@ -0,0 +1,3 @@
+import { CAC } from 'cac';
+declare const _default: (cli: CAC) => void;
+export default _default;

package/dist/commands/merge/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const script_1 = tslib_1.__importDefault(require("./script"));
+exports.default = (cli) => {
+    cli.command('m', 'cli工具')
+        .option('--commit', '[boolean] 是否在合并前提交代码')
+        .action(script_1.default);
+};

package/dist/commands/merge/script.d.ts

@@ -0,0 +1,4 @@
+declare const _default: (options: {
+    commit: boolean;
+}) => Promise<void>;
+export default _default;

package/dist/commands/merge/script.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const { exec } = require('child_process');
+// 获取最新的msg
+async function getLatestCommitMsg() {
+    return execGitCommand(`git log -1 --pretty=%B`);
+}
+function getContinuousCommitCount() {
+    return new Promise((resolve, reject) => {
+        exec(`git log --oneline --format=%s`, (err, stdout) => {
+            if (err) {
+                reject(err);
+                return;
+            }
+            const messages = stdout.split('\n');
+            const msg = messages[0];
+            let count = 0;
+            for (const item of messages) {
+                if (item !== msg) {
+                    break;
+                }
+                count++;
+            }
+            resolve(count);
+        });
+    });
+}
+function execGitCommand(command) {
+    return new Promise((resolve, reject) => {
+        exec(command, (err, stdout) => {
+            if (err) {
+                reject(err);
+                return;
+            }
+            resolve(stdout);
+        });
+    });
+}
+exports.default = async (options) => {
+    if (options.commit) {
+        await execGitCommand(`git commit -a -m "${(await getLatestCommitMsg()).trim()}"`);
+    }
+    const count = await getContinuousCommitCount();
+    const command = `GIT_EDITOR=true GIT_SEQUENCE_EDITOR="sed -i -e '2,\\$s/^pick/squash/'" git rebase -i HEAD~${count}`;
+    console.log(666, await execGitCommand(command));
+};

package/dist/index.js

@@ -6,11 +6,13 @@ const dev_1 = tslib_1.__importDefault(require("./commands/dev"));
 const build_1 = tslib_1.__importDefault(require("./commands/build"));
 const start_1 = tslib_1.__importDefault(require("./commands/start"));
 const create_1 = tslib_1.__importDefault(require("./commands/create"));
+const merge_1 = tslib_1.__importDefault(require("./commands/merge"));
 const cli = (0, cac_1.default)();
 (0, dev_1.default)(cli);
 (0, build_1.default)(cli);
 (0, start_1.default)(cli);
 (0, create_1.default)(cli);
+(0, merge_1.default)(cli);
 cli.help();
 cli.version('0.0.1');
 cli.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/cli",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "description",
   "author": "wzy",
   "license": "ISC",
@@ -9,6 +9,7 @@
     "build": "tsc"
   },
   "files": [
+    "bin",
     "dist"
   ],
   "bin": {
@@ -20,7 +21,7 @@
     "@midwayjs/command-core": "^1.3.14",
     "@midwayjs/hooks": "^3.0.1",
     "@umijs/plugins": "^4.0.28",
-    "@wzyjs/utils": "^0.0.16",
+    "@wzyjs/utils": "^0.0.18",
     "cac": "^6.7.14",
     "consola": "^2.15.3",
     "fs-extra": "^10.1.0",
@@ -42,5 +43,5 @@
     "type": "git",
     "url": "https://gitee.com/wang-zhenyu/app.git"
   },
-  "gitHead": "06ef413d0febd5cf016833ca123e1ac31f52f3cc"
+  "gitHead": "7ebb80ef50a4df3d262a1da82d7967e628698b10"
 }