@wzyjs/cli 0.0.33 → 0.0.35

package/dist/commands/build/index.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path_1 = require("path");
 const fs = tslib_1.__importStar(require("fs-extra"));
-// import { run } from 'umi'
-// @ts-ignore
-const internal_1 = require("@midwayjs/hooks/internal");
+const umi_1 = require("umi");
+const hooks_internal_1 = require("@midwayjs/hooks-internal");
 const utils_1 = require("./utils");
 exports.default = (cli) => {
     cli.command('build', 'cli工具')
@@ -17,7 +16,7 @@ exports.default = (cli) => {
     })
         .action(async (options) => {
         const { outDir, clean } = options;
-        const root = (0, internal_1.getProjectRoot)();
+        const root = (0, hooks_internal_1.getProjectRoot)();
         if (clean && fs.existsSync(outDir)) {
             console.info('正在清理之前的 build 产物...');
             await fs.promises.rm(outDir, { recursive: true });
@@ -26,14 +25,14 @@ exports.default = (cli) => {
         // const removeConfig = writeConfig(root, {})
         // 合并用户配置
         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')
+        console.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);
+        }));
+        console.info('打包前端代码成功~ 耗时：' + feBuild.time / 1000 + 's');
         // 创建服务端渲染前端页面的 render 函数
         (0, utils_1.createRender)((0, path_1.join)(root, outDir));
         // 写 midway.config.js 到 dist 目录
@@ -41,13 +40,11 @@ exports.default = (cli) => {
         // 写 package.json 到 dist 目录
         // fs.cpSync(join(root, 'package.json'), join(outDir, 'package.json'))
         console.info('正在打包后端代码...', root);
-        // let rdBuild
         try {
-            console.log(666, root, outDir);
-            await (0, utils_1.buildServer)(root, outDir);
+            const rdBuild = await (0, utils_1.executePromise)((0, utils_1.buildServer)(root, outDir));
             // 删除 midway.config.js
             // removeConfig()
-            // console.info(`打包后端代码成功~ 耗时：` + rdBuild.time / 1000 + 's')
+            console.info(`打包后端代码成功~ 耗时：` + rdBuild.time / 1000 + 's');
         }
         catch (err) {
             console.error('打包后端代码失败', err);

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

@@ -2,7 +2,7 @@ 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: import("@midwayjs/hooks-internal").MidwayRoute[] | undefined;
 };
 export declare const executePromise: (promise: Promise<any>) => Promise<{
     result: any;

package/dist/commands/build/utils.js

@@ -6,8 +6,7 @@ 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 hooks_internal_1 = require("@midwayjs/hooks-internal");
 const createRender = (dist) => {
     const code = `exports.default = require('@midwayjs/serve').Serve('/*', { dir: '_client', isKit: true });`;
     const file = (0, path_1.join)(dist, '_serve/index.js');
@@ -40,7 +39,7 @@ const writeConfig = (outDir, productionConfig) => {
 };
 exports.writeConfig = writeConfig;
 const getProductionConfig = (root) => {
-    const userConfig = Object.assign({ static: true }, (0, internal_1.getConfig)(root));
+    const userConfig = Object.assign({ static: true }, (0, hooks_internal_1.getConfig)(root));
     if (Array.isArray(userConfig.routes)) {
         userConfig.routes.push({
             baseDir: '_serve',

package/dist/commands/hack/index.js

@@ -23,10 +23,11 @@ const replaceContentInFile = (filePath, targetContent, replacement) => {
 exports.default = (cli) => {
     cli.command('hack', 'cli工具')
         .action(() => {
-        console.log(666, path.resolve(__dirname), process.cwd());
-        replaceContentInFile('/Users/wangzhenyu/Code/work/libs/cli/node_modules/@umijs/preset-umi/dist/libs/scan.js', 'exportsFields: []', `exportsFields: ['exports'],
+        const pwd = process.cwd();
+        console.log(666, path.resolve(__dirname), pwd);
+        replaceContentInFile(`${pwd}/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);
+        replaceContentInFile(`${pwd}/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,7 @@ 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 hooks_internal_1 = require("@midwayjs/hooks-internal");
 exports.default = (cli) => {
     cli.command('start', 'start')
         .option('-p, --port <port>', '[number] specify port', { default: 3000 })
@@ -17,13 +16,13 @@ exports.default = (cli) => {
             return;
         }
         const config = {
-            ...Object.assign({ static: true }, (0, internal_1.getConfig)(root)),
+            ...Object.assign({ static: true }, (0, hooks_internal_1.getConfig)(root)),
             build: {
                 outDir: './',
             },
         };
-        (0, internal_1.setProjectRoot)(root);
-        (0, internal_1.setConfig)(config);
+        (0, hooks_internal_1.setProjectRoot)(root);
+        (0, hooks_internal_1.setConfig)(config);
         process.env.MIDWAY_HTTP_PORT = options.port.toString();
         const server = bootstrap_1.Bootstrap.configure({
             baseDir: root,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/cli",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "description",
   "author": "wzy",
   "license": "ISC",
@@ -20,7 +20,8 @@
     "@midwayjs/bootstrap": "^3.7.1",
     "@midwayjs/cli-plugin-build": "^1.3.14",
     "@midwayjs/command-core": "^1.3.14",
-    "@midwayjs/hooks": "^3.1.6",
+    "@midwayjs/core": "^3.12.3",
+    "@midwayjs/hooks-internal": "^3.1.6",
     "@midwayjs/rpc": "^3.1.6",
     "@umijs/plugins": "^4.0.28",
     "cac": "^6.7.14",
@@ -36,10 +37,6 @@
     "@types/node": "^18.11.9",
     "@types/react-router-dom": "^4.3.1"
   },
-  "peerDependencies": {
-    "@midwayjs/hooks": "^3.1.6",
-    "@midwayjs/rpc": "^3.1.6"
-  },
   "publishConfig": {
     "access": "public"
   },