@wzyjs/cli 0.0.17 → 0.0.21

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.js

@@ -4,6 +4,8 @@ const tslib_1 = require("tslib");
 const script_1 = tslib_1.__importDefault(require("./script"));
 exports.default = (cli) => {
     cli.command('m', 'cli工具')
+        .option('--count', '[number] 合并几个commit，不填会自动计算与最新commit相同名称的数量')
         .option('--commit', '[boolean] 是否在合并前提交代码')
+        .option('--push', '[boolean] 是否在合并后推送代码')
         .action(script_1.default);
 };

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

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

package/dist/commands/merge/script.js

@@ -37,10 +37,13 @@ function execGitCommand(command) {
     });
 }
 exports.default = async (options) => {
-    if (options.commit) {
-        await execGitCommand(`git commit -a -m "${(await getLatestCommitMsg()).trim()}"`);
+    if (options?.commit) {
+        console.log('commit success', await execGitCommand(`git commit -a -m "${(await getLatestCommitMsg()).trim()}"`));
     }
-    const count = await getContinuousCommitCount();
+    const count = options?.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));
+    console.log('rebase success', await execGitCommand(command));
+    if (options?.push) {
+        console.log('push success', await execGitCommand('git push origin HEAD --force'));
+    }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/cli",
-  "version": "0.0.17",
+  "version": "0.0.21",
   "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.17",
+    "@wzyjs/utils": "^0.0.21",
     "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": "f07be747da894f607f30c2be97c23abac5712bc2"
+  "gitHead": "e9f0222770f1a8a3b3365e9fadd8f65a069a3ef5"
 }