From 09d0300b3b6ac6bad56e766b7d6dee24b7887c7f Mon Sep 17 00:00:00 2001 From: Tlntin Date: Thu, 29 Dec 2022 13:59:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=92=E5=BD=92=E6=8B=B7?= =?UTF-8?q?=E8=B4=9D=E5=8A=9F=E8=83=BD=E6=8A=A5=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/builders/common.ts | 9 +++++---- dist/cli.js | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bin/builders/common.ts b/bin/builders/common.ts index bfe58fb..6f60eb6 100644 --- a/bin/builders/common.ts +++ b/bin/builders/common.ts @@ -1,5 +1,5 @@ import { PakeAppOptions } from '@/types.js'; -import prompts from 'prompts'; +import prompts, { override } from 'prompts'; import path from 'path'; import fs from 'fs/promises'; import fs2 from 'fs-extra'; @@ -83,13 +83,14 @@ export async function mergeTauriConfig( } else { const old_dir = path.join(npmDirectory,"dist/"); const new_dir = path.join(npmDirectory,"dist_bak/"); - fs.rename(old_dir, new_dir); - fs2.copy(dir_name, old_dir); + fs2.moveSync(old_dir, new_dir, {"overwrite": true}); + fs2.copySync(dir_name, old_dir, {"overwrite": true}); + // logger.warn("dir name", dir_name); // 将dist_bak里面的cli.js和about_pake.html拷贝回去 const cli_path = path.join(new_dir, "cli.js") const cli_path_target = path.join(old_dir, "cli.js") const about_pake_path = path.join(new_dir, "about_pake.html"); - const about_patk_path_target = path.join(new_dir, "about_pake.html") + const about_patk_path_target = path.join(old_dir, "about_pake.html") fs.copyFile(cli_path, cli_path_target); fs.copyFile(about_pake_path, about_patk_path_target); } diff --git a/dist/cli.js b/dist/cli.js index 54d8e72..372bae8 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -1682,13 +1682,14 @@ function mergeTauriConfig(url, options, tauriConf) { else { const old_dir = path.join(npmDirectory, "dist/"); const new_dir = path.join(npmDirectory, "dist_bak/"); - fs$1.rename(old_dir, new_dir); - fs2.copy(dir_name, old_dir); + fs2.moveSync(old_dir, new_dir, { "overwrite": true }); + fs2.copySync(dir_name, old_dir, { "overwrite": true }); + // logger.warn("dir name", dir_name); // 将dist_bak里面的cli.js和about_pake.html拷贝回去 const cli_path = path.join(new_dir, "cli.js"); const cli_path_target = path.join(old_dir, "cli.js"); const about_pake_path = path.join(new_dir, "about_pake.html"); - const about_patk_path_target = path.join(new_dir, "about_pake.html"); + const about_patk_path_target = path.join(old_dir, "about_pake.html"); fs$1.copyFile(cli_path, cli_path_target); fs$1.copyFile(about_pake_path, about_patk_path_target); }