lzx-test-cli 1.0.2 → 1.0.3

package/bin/index.js

@@ -10,8 +10,6 @@ import ora from 'ora';
 import compressing from 'compressing'; //支持- tar - gzip - tgz - zip
 import { spawn } from 'child_process';
 import fetch from 'node-fetch';
-import cliProgress from 'cli-progress';
-import { log } from 'console';
 // import download from 'download-git-repo';
 console.log(
     chalk.green('开始创建项目!')
@@ -59,7 +57,7 @@ function runCommand(cwd) {
           cwd: safeCwd,
           stdio: 'inherit'
         });
-    console.log(chalk.green("\n依赖安装中..."));
+    console.log(chalk.green("\n开始安装依赖,请耐心等待..."));
     child.on('error', reject);
     child.on('close', code => {
       if (code !== 0) {
@@ -72,41 +70,43 @@ function runCommand(cwd) {
   });
 }
 
+function showPercent(downloaded, total) {
+  const percent = total > 0
+    ? Math.floor((downloaded / total) * 100)
+    : 0;
+
+  // \r 回到当前行起始位置，不换行
+  process.stdout.write(`\r下载进度： ${percent}%`);
+}
+
+
 /**
   * @param {string} url 下载链接
   * @param {string} targetDir 目标文件夹
   * @param {string} fileName 保存的文件名
   * @description: 下载文件并显示进度条
  */
-export async function downloadFileToFolder(url, targetDir, fileName) {
+export async function downloadFileToFolder(url, targetDir, fileName, headers = {}) {
   // 目标文件夹确保存在
   await fs.promises.mkdir(targetDir, { recursive: true });
 
   const dest = path.join(targetDir, fileName);
 
   const res = await fetch(url, {
-    headers: {
-      'User-Agent': 'node.js',  
-      'Accept': 'application/octet-stream'
-      // 'Authorization': `token ${YOUR_TOKEN}`
-    },
+    headers,
     redirect: 'follow', // 跟随重定向
   });
   if (!res.ok) throw new Error(`下载失败: ${res.status} ${res.statusText}`);
 
   // 获取 content-length 用于进度条（如果服务器提供）
   const total = +res.headers.get('content-length') || 0;
-  const progressBar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
-  if (total > 0) progressBar.start(total, 0);
-
   const fileStream = fs.createWriteStream(dest);
-
-
   let downloaded = 0;
+
   // 监听 data 更新进度
   res.body.on('data', chunk => {
     downloaded += chunk.length;
-    if (total > 0) progressBar.update(downloaded);
+    if (total > 0) showPercent(downloaded, total);
   });
 
   await new Promise((resolve, reject) => {
@@ -194,7 +194,7 @@ program
                         { name: "本地", value: "local" },
                         { name: "远程", value: "remote" }
                     ],
-                    default: 'local',
+                    default: 'remote',
                 },
             ]);
             let { templateChosen } = await inquirer.prompt([
@@ -220,7 +220,9 @@ program
                     message: '是否强制覆盖',
                 },
             ]);
-            const syncTemplate = ora('项目创建中...')
+            const syncTemplate = ora({
+                text: chalk.yellow('项目创建中...'),
+            })
             syncTemplate.start()
             const cwd = process.cwd();
             const targetDir = path.resolve(cwd, projectName);
@@ -241,26 +243,21 @@ program
                 const headers = {
                   'User-Agent': 'node.js',
                   'Accept': 'application/octet-stream',
+                  // 'Authorization': `token ${YOUR_TOKEN}`
                 }
                 const fileName  = getFileNameFromUrl(repoUrl);
                 await downloadFileToFolder(repoUrl, targetDir, fileName, headers);
               }
             } else{
-              // const templatePath = path.resolve("templates", templateChosen);  //不能这样使用，这是当前cli工具执行时的工作目录
-              const __filename = fileURLToPath(import.meta.url);
+              // const templatePath = path.resolve("templates", templateChosen);  //不能这样使用，这是当前cli工具执行时的工作目录              
+              const __filename = fileURLToPath(import.meta.url); //由于使用esm, 需要使用__dirname读取模块相关的文件（不受执行位置影响）
               const __dirname = path.dirname(__filename);
-              console.log("🚀 ~ :252 ~ __dirname:", __dirname)
               const templatesDir = path.join(__dirname, '../', templateChosen);
-              console.log("🚀 ~ :254 ~ templatesDir:", templatesDir)
-
               await fs.copySync(templatesDir, targetDir)
             }
             console.log(chalk.green("\n同步模版成功,开始解压并安装依赖..."));
             await unCompressFileAndInstall(targetDir);
             syncTemplate.succeed(chalk.green(chalk.blue.underline.bold(projectName) + ' 项目创建成功!'))  
-            // console.log(
-              
-            // );
             // 退出
             process.stdin.pause();
             process.exit(0); // 完成后正常退出

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lzx-test-cli",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "bin": {
     "lzx-test-cli": "bin/index.js"
   },
@@ -22,7 +22,6 @@
   "dependencies": {
     "@types/fs-extra": "^11.0.4",
     "chalk": "^5.6.2",
-    "cli-progress": "^3.12.0",
     "commander": "^14.0.2",
     "compressing": "^2.0.0",
     "download-git-repo": "^3.0.2",

package/bin/test.js

@@ -1,8 +0,0 @@
-import path from 'path';
-
-const absolute = path.resolve('templates', "template-main");
-
-console.log("🚀 ~ :2 ~ absolute:", absolute)
-const rel = path.relative(process.cwd(), absolute);
-
-console.log(rel); // "templates/vue3"