@wzyjs/cli 0.0.31 → 0.0.32

package/dist/commands/build/index.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path_1 = require("path");
 const fs = tslib_1.__importStar(require("fs-extra"));
-const umi_1 = require("umi");
+// import { run } from 'umi'
+// @ts-ignore
 const internal_1 = require("@midwayjs/hooks/internal");
-const utils_1 = require("@wzyjs/utils");
-const utils_2 = require("./utils");
-const { consola } = require('@wzyjs/utils');
+const utils_1 = require("./utils");
 exports.default = (cli) => {
     cli.command('build', 'cli工具')
         .option('--outDir [dir]', `[string] output directory (default: dist)`, {
@@ -20,31 +19,39 @@ exports.default = (cli) => {
         const { outDir, clean } = options;
         const root = (0, internal_1.getProjectRoot)();
         if (clean && fs.existsSync(outDir)) {
-            consola.info('正在清理之前的 build 产物...');
+            console.info('正在清理之前的 build 产物...');
             await fs.promises.rm(outDir, { recursive: true });
         }
         // 项目根目录写个空的 midway.config.js 之后会删除
-        const removeConfig = (0, utils_2.writeConfig)(root, {});
+        // const removeConfig = writeConfig(root, {})
         // 合并用户配置
-        const productionConfig = (0, utils_2.getProductionConfig)(root);
-        consola.info('正在打包前端代码...');
-        const feBuild = await (0, utils_1.executePromise)((0, umi_1.run)({
-            presets: [require.resolve('../../plugins/preset')],
-        }).catch((e) => {
-            console.error(e);
-            process.exit(1);
-        }));
-        consola.success('打包前端代码成功~ 耗时：' + feBuild.time / 1000 + 's');
+        const productionConfig = (0, utils_1.getProductionConfig)(root);
+        // console.info('正在打包前端代码...')
+        // const feBuild = await executePromise(run({
+        //   presets: [require.resolve('../../plugins/preset')],
+        // }).catch((e: any) => {
+        //   console.error(e)
+        //   process.exit(1)
+        // }))
+        // console.info('打包前端代码成功~ 耗时：' + feBuild.time / 1000 + 's')
         // 创建服务端渲染前端页面的 render 函数
-        (0, utils_2.createRender)((0, path_1.join)(root, outDir));
+        (0, utils_1.createRender)((0, path_1.join)(root, outDir));
         // 写 midway.config.js 到 dist 目录
-        (0, utils_2.writeConfig)(outDir, productionConfig);
+        (0, utils_1.writeConfig)(outDir, productionConfig);
         // 写 package.json 到 dist 目录
         // 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
-        removeConfig();
-        consola.success(`打包后端代码成功~ 耗时：` + rdBuild.time / 1000 + 's');
+        console.info('正在打包后端代码...', root);
+        // let rdBuild
+        try {
+            console.log(666, root, outDir);
+            await (0, utils_1.buildServer)(root, outDir);
+            // 删除 midway.config.js
+            // removeConfig()
+            // console.info(`打包后端代码成功~ 耗时：` + rdBuild.time / 1000 + 's')
+        }
+        catch (err) {
+            console.error('打包后端代码失败', err);
+            process.exit(1);
+        }
     });
 };

package/dist/commands/build/utils.d.ts

@@ -2,5 +2,9 @@ export declare const createRender: (dist: string) => void;
 export declare const buildServer: (cwd: string, outDir: string) => Promise<void>;
 export declare const writeConfig: (outDir: string, productionConfig: any) => () => void;
 export declare const getProductionConfig: (root: string) => {
-    routes: import("@midwayjs/hooks/internal").MidwayRoute[] | undefined;
+    routes: any;
 };
+export declare const executePromise: (promise: Promise<any>) => Promise<{
+    result: any;
+    time: number;
+}>;

package/dist/commands/build/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProductionConfig = exports.writeConfig = exports.buildServer = exports.createRender = void 0;
+exports.executePromise = exports.getProductionConfig = exports.writeConfig = exports.buildServer = exports.createRender = void 0;
 const tslib_1 = require("tslib");
 const path_1 = require("path");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const command_core_1 = require("@midwayjs/command-core");
 const cli_plugin_build_1 = require("@midwayjs/cli-plugin-build");
+// @ts-ignore
 const internal_1 = require("@midwayjs/hooks/internal");
 const createRender = (dist) => {
     const code = `exports.default = require('@midwayjs/serve').Serve('/*', { dir: '_client', isKit: true });`;
@@ -27,8 +28,13 @@ const buildServer = async (cwd, outDir) => {
         },
     });
     core.addPlugin(cli_plugin_build_1.BuildPlugin);
-    await core.ready();
-    await core.invoke();
+    try {
+        await core.ready();
+        await core.invoke();
+    }
+    catch (err) {
+        console.log(666, 'err', err);
+    }
 };
 exports.buildServer = buildServer;
 const writeConfig = (outDir, productionConfig) => {
@@ -51,3 +57,13 @@ const getProductionConfig = (root) => {
     };
 };
 exports.getProductionConfig = getProductionConfig;
+const executePromise = async (promise) => {
+    const start = Date.now();
+    const result = await promise;
+    const time = Date.now() - start;
+    return {
+        result,
+        time,
+    };
+};
+exports.executePromise = executePromise;

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

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

package/dist/commands/hack/index.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const fs = tslib_1.__importStar(require("fs"));
+const path = tslib_1.__importStar(require("path"));
+const replaceContentInFile = (filePath, targetContent, replacement) => {
+    fs.readFile(filePath, 'utf8', (err, data) => {
+        if (err) {
+            console.error(`读取文件时发生错误：${err}`);
+            return;
+        }
+        const updatedData = data.replace(targetContent, replacement);
+        fs.writeFile(filePath, updatedData, 'utf8', (err) => {
+            if (err) {
+                console.error(`写入文件时发生错误：${err}`);
+            }
+            else {
+                console.log(`成功替换文件中的内容！`);
+            }
+        });
+    });
+};
+exports.default = (cli) => {
+    cli.command('hack', 'cli工具')
+        .action(() => {
+        console.log(666, path.resolve(__dirname));
+        replaceContentInFile('/Users/wangzhenyu/Code/work/libs/cli/node_modules/@umijs/preset-umi/dist/libs/scan.js', 'exportsFields: []', `exportsFields: ['exports'],
+       conditionNames: ["import", "require"]`);
+        replaceContentInFile('/Users/wangzhenyu/Code/work/libs/cli/node_modules/enhanced-resolve/lib/ExportsFieldPlugin.js', 'paths = fieldProcessor(remainingRequest, this.conditionNames);', `paths = fieldProcessor(remainingRequest, this.conditionNames);
+        if (paths.length === 0 && remainingRequest === '.' && request.descriptionFileData.name === 'typeorm') {
+              paths = ['./index.mjs']
+            }
+      `);
+    });
+};

package/dist/commands/start/index.js

@@ -4,8 +4,8 @@ const tslib_1 = require("tslib");
 const path_1 = require("path");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const bootstrap_1 = require("@midwayjs/bootstrap");
+// @ts-ignore
 const internal_1 = require("@midwayjs/hooks/internal");
-const { consola } = require('@wzyjs/utils');
 exports.default = (cli) => {
     cli.command('start', 'start')
         .option('-p, --port <port>', '[number] specify port', { default: 3000 })
@@ -13,7 +13,7 @@ exports.default = (cli) => {
         const root = (0, path_1.resolve)('dist');
         // 判断目录是否存在
         if (!fs.existsSync(root)) {
-            consola.error('dist 目录不存在，请先执行 build 命令');
+            console.error('dist 目录不存在，请先执行 build 命令');
             return;
         }
         const config = {
@@ -30,6 +30,6 @@ exports.default = (cli) => {
             ignore: ['**/_client/**'],
         });
         await server.run();
-        consola.success(`Your application is running at http://localhost:${options.port}`);
+        console.log(`Your application is running at http://localhost:${options.port}`);
     });
 };

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 merge_1 = tslib_1.__importDefault(require("./commands/merge"));
+const hack_1 = tslib_1.__importDefault(require("./commands/hack"));
 const cli = (0, cac_1.default)();
 (0, dev_1.default)(cli);
 (0, build_1.default)(cli);
 (0, start_1.default)(cli);
 (0, merge_1.default)(cli);
+(0, hack_1.default)(cli);
 cli.help();
-cli.version('0.0.1');
+cli.version('0.0.2');
 cli.parse();

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@wzyjs/cli",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "description",
   "author": "wzy",
   "license": "ISC",
   "scripts": {
     "dev": "tsc -w",
-    "build": "tsc"
+    "build": "tsc --noEmitOnError false",
+    "build-link": "npm run build && npm link"
   },
   "files": [
     "bin",
@@ -19,9 +20,7 @@
     "@midwayjs/bootstrap": "^3.7.1",
     "@midwayjs/cli-plugin-build": "^1.3.14",
     "@midwayjs/command-core": "^1.3.14",
-    "@midwayjs/hooks": "^3.0.1",
     "@umijs/plugins": "^4.0.28",
-    "@wzyjs/utils": "^0.0.31",
     "cac": "^6.7.14",
     "fs-extra": "^10.1.0",
     "rc-field-form": "^1.32.2",
@@ -35,6 +34,9 @@
     "@types/node": "^18.11.9",
     "@types/react-router-dom": "^4.3.1"
   },
+  "peerDependencies": {
+    "@midwayjs/hooks": "^3.1.6"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -42,5 +44,5 @@
     "type": "git",
     "url": "https://gitee.com/wang-zhenyu/app.git"
   },
-  "gitHead": "eb60e54549c1be64d94b0a4864dacd1f4ed97473"
+  "gitHead": "1b21293a5dceaf179fb8c038beca93e048bdec8c"
 }