@wzyjs/cli 0.0.8 → 0.0.11

package/dist/commands/build/index.js

@@ -5,7 +5,8 @@ const path_1 = require("path");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const umi_1 = require("umi");
 const internal_1 = require("@midwayjs/hooks/internal");
-const utils_1 = require("./utils");
+const utils_1 = require("@wzyjs/utils");
+const utils_2 = require("./utils");
 const consola = require('consola');
 exports.default = (cli) => {
     cli.command('build', 'cli工具')
@@ -22,35 +23,28 @@ exports.default = (cli) => {
             consola.info('正在清理之前的 build 产物...');
             await fs.promises.rm(outDir, { recursive: true });
         }
-        // 给 @midwayjs/hooks-bundler里的 vite() 插件，设置 midway.config.ts 的配置
-        // 加这一行，该插件就不会去使用根目录下的 midway.config.ts 文件了
-        // 就可把 midway.config.ts 文件删了，也没啥用
-        (0, internal_1.setConfig)({});
+        // 项目根目录写个空的 midway.config.js 之后会删除
+        const removeConfig = (0, utils_2.writeConfig)(root, {});
+        // 合并用户配置
+        const productionConfig = (0, utils_2.getProductionConfig)(root);
         consola.info('正在打包前端代码...');
-        await (0, umi_1.run)({
+        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('打包前端代码成功');
-        (0, utils_1.createRender)((0, path_1.join)(root, outDir));
-        const userConfig = Object.assign({ static: true }, (0, internal_1.getConfig)(root));
-        if (Array.isArray(userConfig.routes)) {
-            userConfig.routes.push({
-                baseDir: '_serve',
-                basePath: '/',
-            });
-        }
-        const productionConfig = {
-            routes: userConfig.routes,
-        };
-        fs.writeFileSync((0, path_1.join)(outDir, 'midway.config.js'), `module.exports = ${JSON.stringify(productionConfig, null, 2)}`, 'utf-8');
-        fs.cpSync((0, path_1.join)(root, 'package.json'), (0, path_1.join)(outDir, 'package.json.bak'));
+        }));
+        consola.success('打包前端代码成功~ 耗时：' + feBuild.time / 1000 + 's');
+        // 创建服务端渲染前端页面的 render 函数
+        (0, utils_2.createRender)((0, path_1.join)(root, outDir));
+        // 写 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'));
         consola.info('正在打包后端代码...', root);
-        fs.writeFileSync((0, path_1.join)(root, 'midway.config.js'), `module.exports = ${JSON.stringify(productionConfig, null, 2)}`, 'utf-8');
-        await (0, utils_1.executePromise)((0, utils_1.buildServer)(root, outDir));
-        fs.removeSync((0, path_1.join)(root, 'midway.config.js'));
-        consola.success(`打包后端代码成功.`);
+        const rdBuild = await (0, utils_1.executePromise)((0, utils_2.buildServer)(root, outDir));
+        // 删除 midway.config.js
+        removeConfig();
+        consola.success(`打包后端代码成功~ 耗时：` + rdBuild.time / 1000 + 's');
     });
 };

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

@@ -1,6 +1,6 @@
 export declare const createRender: (dist: string) => void;
-export declare const executePromise: (promise: Promise<any>) => Promise<{
-    result: any;
-    time: number;
-}>;
 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;
+};

package/dist/commands/build/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildServer = exports.executePromise = exports.createRender = void 0;
+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");
+const 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');
@@ -13,16 +14,6 @@ const createRender = (dist) => {
     fs.writeFileSync(file, code, 'utf-8');
 };
 exports.createRender = createRender;
-const executePromise = async (promise) => {
-    const start = Date.now();
-    const result = await promise;
-    const time = Date.now() - start;
-    return {
-        result,
-        time,
-    };
-};
-exports.executePromise = executePromise;
 const buildServer = async (cwd, outDir) => {
     const core = new command_core_1.CommandCore({
         commands: ['build'],
@@ -40,3 +31,23 @@ const buildServer = async (cwd, outDir) => {
     await core.invoke();
 };
 exports.buildServer = buildServer;
+const writeConfig = (outDir, productionConfig) => {
+    fs.writeFileSync((0, path_1.join)(outDir, 'midway.config.js'), `module.exports = ${JSON.stringify(productionConfig, null, 2)}`, 'utf-8');
+    return () => {
+        fs.removeSync((0, path_1.join)(outDir, 'midway.config.js'));
+    };
+};
+exports.writeConfig = writeConfig;
+const getProductionConfig = (root) => {
+    const userConfig = Object.assign({ static: true }, (0, internal_1.getConfig)(root));
+    if (Array.isArray(userConfig.routes)) {
+        userConfig.routes.push({
+            baseDir: '_serve',
+            basePath: '/',
+        });
+    }
+    return {
+        routes: userConfig.routes,
+    };
+};
+exports.getProductionConfig = getProductionConfig;

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

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

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

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

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

@@ -0,0 +1,19 @@
+"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;

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@wzyjs/cli",
-  "version": "0.0.8",
+  "version": "0.0.11",
   "description": "description",
   "author": "wzy",
   "license": "ISC",
-  "type": "commonjs",
   "scripts": {
     "dev": "tsc -w",
     "build": "tsc"
@@ -21,6 +20,7 @@
     "@midwayjs/command-core": "^1.3.14",
     "@midwayjs/hooks": "^3.0.1",
     "@umijs/plugins": "^4.0.28",
+    "@wzyjs/utils": "^0.0.11",
     "cac": "^6.7.14",
     "consola": "^2.15.3",
     "fs-extra": "^10.1.0",
@@ -38,5 +38,9 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "251c12acffc31f5a25b6cbb0ff132342196d99a1"
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/wang-zhenyu/app.git"
+  },
+  "gitHead": "00865dfbf006e37041dc48b3f8d6e4191d3bf75f"
 }