@wzyjs/cli 0.0.27 → 0.0.30

package/dist/commands/build/index.js

@@ -7,7 +7,7 @@ const umi_1 = require("umi");
 const internal_1 = require("@midwayjs/hooks/internal");
 const utils_1 = require("@wzyjs/utils");
 const utils_2 = require("./utils");
-const consola = require('consola');
+const { consola } = require('@wzyjs/utils');
 exports.default = (cli) => {
     cli.command('build', 'cli工具')
         .option('--outDir [dir]', `[string] output directory (default: dist)`, {

package/dist/commands/dev/index.js

@@ -1,16 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const umi_1 = require("umi");
-const internal_1 = require("@midwayjs/hooks/internal");
 exports.default = (cli) => {
     cli.command('dev', 'cli工具')
         .action(() => {
         // 设置 midway 接口服务端口为 7001
         process.env.MIDWAY_HTTP_PORT = '7001';
-        // 给 @midwayjs/hooks-bundler里的 vite() 插件，设置 midway.config.ts 的配置
-        // 加这一行，该插件就不会去使用根目录下的 midway.config.ts 文件了
-        // 就可把 midway.config.ts 文件删了，也没啥用
-        (0, internal_1.setConfig)({});
         (0, umi_1.run)({
             presets: [require.resolve('../../plugins/preset')],
         }).catch((e) => {

package/dist/commands/merge/script.js

@@ -37,8 +37,14 @@ function execGitCommand(command) {
     });
 }
 exports.default = async (options) => {
-    if (options?.commit) {
-        console.log('commit success', await execGitCommand(`git commit -a -m "${(await getLatestCommitMsg()).trim()}"`));
+    const hasChange = await execGitCommand('git status -s');
+    if (hasChange) {
+        if (options?.commit) {
+            console.log('commit success', await execGitCommand(`git commit -a -m "${(await getLatestCommitMsg()).trim()}"`));
+        }
+        else {
+            console.log('stash success', await execGitCommand('git stash'));
+        }
     }
     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}`;
@@ -46,4 +52,7 @@ exports.default = async (options) => {
     if (options?.push) {
         console.log('push success', await execGitCommand('git push origin HEAD --force'));
     }
+    if (hasChange && !options?.commit) {
+        await execGitCommand('git stash pop');
+    }
 };

package/dist/commands/start/index.js

@@ -5,7 +5,7 @@ const path_1 = require("path");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const bootstrap_1 = require("@midwayjs/bootstrap");
 const internal_1 = require("@midwayjs/hooks/internal");
-const consola = require('consola');
+const { consola } = require('@wzyjs/utils');
 exports.default = (cli) => {
     cli.command('start', 'start')
         .option('-p, --port <port>', '[number] specify port', { default: 3000 })

package/dist/index.js

@@ -5,13 +5,11 @@ const cac_1 = tslib_1.__importDefault(require("cac"));
 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');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/cli",
-  "version": "0.0.27",
+  "version": "0.0.30",
   "description": "description",
   "author": "wzy",
   "license": "ISC",
@@ -21,11 +21,10 @@
     "@midwayjs/command-core": "^1.3.14",
     "@midwayjs/hooks": "^3.0.1",
     "@umijs/plugins": "^4.0.28",
-    "@wzyjs/utils": "^0.0.27",
+    "@wzyjs/utils": "^0.0.30",
     "cac": "^6.7.14",
-    "consola": "^2.15.3",
     "fs-extra": "^10.1.0",
-    "rc-field-form": "^1.27.3",
+    "rc-field-form": "^1.32.2",
     "umi": "^4.0.30",
     "vite": "^2.7.9"
   },
@@ -43,5 +42,5 @@
     "type": "git",
     "url": "https://gitee.com/wang-zhenyu/app.git"
   },
-  "gitHead": "df22fdc32eef4bfe3a8920a1c3d048f5713bda8e"
+  "gitHead": "c8e042a5bb184b3842ec4f04d2edd671a0ac2802"
 }

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

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

package/dist/commands/create/index.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const fs = tslib_1.__importStar(require("fs-extra"));
-const path_1 = require("path");
-exports.default = (cli) => {
-    cli.command('create <name> [outDir]', 'cli工具')
-        .action((name, outDir) => {
-        const sourceDir = (0, path_1.resolve)('libs/cli/examples/empty');
-        const targetDir = (0, path_1.resolve)(outDir || '.', name);
-        fs.copySync(sourceDir, targetDir);
-    });
-};

package/dist/examples/empty/src/index.js

@@ -1 +0,0 @@
-"use strict";

package/dist/examples/fe/src/app.d.ts

@@ -1,9 +0,0 @@
-export declare function getInitialState(): Promise<{
-    name: string;
-}>;
-export declare const layout: () => {
-    logo: string;
-    menu: {
-        locale: boolean;
-    };
-};

package/dist/examples/fe/src/app.js

@@ -1,19 +0,0 @@
-"use strict";
-// 运行时配置
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.layout = exports.getInitialState = void 0;
-// 全局初始化数据配置，用于 Layout 用户信息和权限初始化
-// 更多信息见文档：https://next.umijs.org/docs/api/runtime-config#getinitialstate
-async function getInitialState() {
-    return { name: '@umijs/max' };
-}
-exports.getInitialState = getInitialState;
-const layout = () => {
-    return {
-        logo: 'https://img.alicdn.com/tfs/TB1YHEpwUT1gK0jSZFhXXaAtVXa-28-27.svg',
-        menu: {
-            locale: false,
-        },
-    };
-};
-exports.layout = layout;