@wzyjs/cli 0.1.6 → 0.1.8

package/dist/commands/build/index.js

@@ -21,10 +21,10 @@ exports.default = (cli) => {
             console.info('正在清理之前的 build 产物...');
             await fs.promises.rm(outDir, { recursive: true });
         }
+        await (0, utils_1.replaceContentInFile)(process.cwd() + '/tsconfig.json', '"extends": "./src/.umi/tsconfig.json",', '');
+        await (0, utils_1.replaceContentInFile)(process.cwd() + '/tsconfig.json', '"./src/.umi/typings"', '');
         // 合并用户配置
         const productionConfig = (0, utils_1.getProductionConfig)(root);
-        (0, utils_1.replaceContentInFile)(process.cwd() + '/tsconfig.json', '"extends": "./src/.umi/tsconfig.json",', '');
-        (0, utils_1.replaceContentInFile)(process.cwd() + '/tsconfig.json', '"./src/.umi/typings"', '');
         console.info('正在打包前端代码...');
         const feBuild = await (0, utils_1.executePromise)((0, umi_1.run)({
             presets: [require.resolve('../../plugins/preset')],

package/dist/utils/index.d.ts

@@ -8,4 +8,4 @@ export declare const executePromise: (promise: Promise<any>) => Promise<{
     result: any;
     time: number;
 }>;
-export declare const replaceContentInFile: (filePath: string, targetContent: string, replacement: string) => void;
+export declare const replaceContentInFile: (filePath: string, targetContent: string, replacement: string) => Promise<void>;

package/dist/utils/index.js

@@ -8,7 +8,7 @@ const command_core_1 = require("@midwayjs/command-core");
 const cli_plugin_build_1 = require("@midwayjs/cli-plugin-build");
 const hooks_internal_1 = require("@midwayjs/hooks-internal");
 const createRender = (dist) => {
-    const code = `exports.default = require('@midwayjs/serve').Serve('/*', { dir: '_client', isKit: true });`;
+    const code = `exports.default = require('@midwayjs/serve').Serve('/*', { dir: '_client', isKit: true })`;
     const file = (0, path_1.join)(dist, '_serve/index.js');
     fs.ensureFileSync(file);
     fs.writeFileSync(file, code, 'utf-8');
@@ -62,27 +62,34 @@ const executePromise = async (promise) => {
 };
 exports.executePromise = executePromise;
 const replaceContentInFile = (filePath, targetContent, replacement) => {
-    fs.readFile(filePath, 'utf8', (err, data) => {
-        if (err) {
-            console.error(`读取文件时发生错误：${err}`);
-            return;
-        }
-        if (data.includes(replacement)) {
-            console.error(`已替换过：${filePath}`);
-            return;
-        }
-        if (!data.includes(targetContent)) {
-            console.error(`不包含目标内容：${targetContent}`);
-            return;
-        }
-        const updatedData = data.replaceAll(targetContent, replacement);
-        fs.writeFile(filePath, updatedData, 'utf8', (err) => {
+    return new Promise((resolve, reject) => {
+        fs.readFile(filePath, 'utf8', (err, data) => {
             if (err) {
-                console.error(`写入文件时发生错误：${err}`);
+                console.error(`读取文件时发生错误：${err}`);
+                reject(err);
+                return;
             }
-            else {
-                console.log(`成功替换文件中的内容！`);
+            if (replacement && data.includes(replacement)) {
+                console.error(`已替换过：${filePath}`);
+                resolve();
+                return;
             }
+            if (!data.includes(targetContent)) {
+                console.error(`不包含目标内容：${targetContent}`);
+                reject(`不包含目标内容：${targetContent}`);
+                return;
+            }
+            const updatedData = data.replaceAll(targetContent, replacement);
+            fs.writeFile(filePath, updatedData, 'utf8', (err) => {
+                if (err) {
+                    console.error(`写入文件时发生错误：${err}`);
+                    reject(err);
+                }
+                else {
+                    console.log(`成功替换文件中的内容！`);
+                    resolve();
+                }
+            });
         });
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "description",
   "author": "wzy",
   "license": "ISC",