@widget-js/cli 1.0.11 → 1.0.12

package/lib/index.cjs

@@ -345,7 +345,7 @@ var import_os = __toESM(require("os"), 1);
 var import_ssh2_sftp_client = __toESM(require("ssh2-sftp-client"), 1);
 var import_consola2 = __toESM(require("consola"), 1);
 var import_inquirer3 = __toESM(require("inquirer"), 1);
-var import_nanospinner = require("nanospinner");
+var import_ora = __toESM(require("ora"), 1);
 var process2 = __toESM(require("process"), 1);
 var console2 = __toESM(require("console"), 1);
 function ftpUpload() {
@@ -364,7 +364,7 @@ function ftpUpload() {
     let ftpClient = new import_ssh2_sftp_client.default();
     const port = sshConfig["Port"];
     const key = import_fs5.default.readFileSync(import_path3.default.resolve(import_os.default.homedir(), ".ssh/id_rsa"));
-    const spinner = (0, import_nanospinner.createSpinner)("Connecting");
+    const spinner = (0, import_ora.default)("Connecting");
     try {
       spinner.start();
       await ftpClient.connect({
@@ -374,31 +374,28 @@ function ftpUpload() {
         passphrase: answer.password,
         privateKey: key
       });
-      ftpClient.on("upload", (info) => {
-        spinner.update({ text: `Uploading: ${info.source}` });
-      });
       for (let item of releaseConfig.fileMap) {
         if (typeof item.src == "string") {
           const localFile = import_path3.default.resolve(process2.cwd(), item.src);
           if (!import_fs5.default.existsSync(localFile)) {
-            spinner.warn({ text: `Skip not exists file:${localFile}` });
+            spinner.warn(`Skip not exists file:${localFile}`);
             continue;
           }
           if (import_fs5.default.lstatSync(localFile).isDirectory()) {
-            spinner.update({ text: `Uploading Dir: ${localFile} -> ${item.dest}` });
+            spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`);
             await ftpClient.uploadDir(localFile, item.dest);
           } else {
-            spinner.update({ text: `Uploading File: ${localFile} -> ${item.dest}` });
+            spinner.info(`Uploading File: ${localFile} -> ${item.dest}`);
             await ftpClient.put(localFile, item.dest);
           }
         } else {
           await ftpClient.put(Buffer.from(JSON.stringify(item.src), "utf-8"), item.dest);
         }
       }
-      spinner.success({ text: "Files uploaded!" });
+      spinner.succeed("Files uploaded!");
       await ftpClient.end();
     } catch (e) {
-      spinner.error({ text: `Connection error:${e}` });
+      spinner.fail(`Connection error:${e}`);
       await ftpClient.end();
     }
   });

package/lib/index.js

@@ -324,7 +324,7 @@ import os from "os";
 import Client from "ssh2-sftp-client";
 import consola2 from "consola";
 import inquirer3 from "inquirer";
-import { createSpinner } from "nanospinner";
+import ora from "ora";
 import * as process2 from "process";
 import * as console2 from "console";
 function ftpUpload() {
@@ -343,7 +343,7 @@ function ftpUpload() {
     let ftpClient = new Client();
     const port = sshConfig["Port"];
     const key = fs5.readFileSync(path3.resolve(os.homedir(), ".ssh/id_rsa"));
-    const spinner = createSpinner("Connecting");
+    const spinner = ora("Connecting");
     try {
       spinner.start();
       await ftpClient.connect({
@@ -353,31 +353,28 @@ function ftpUpload() {
         passphrase: answer.password,
         privateKey: key
       });
-      ftpClient.on("upload", (info) => {
-        spinner.update({ text: `Uploading: ${info.source}` });
-      });
       for (let item of releaseConfig.fileMap) {
         if (typeof item.src == "string") {
           const localFile = path3.resolve(process2.cwd(), item.src);
           if (!fs5.existsSync(localFile)) {
-            spinner.warn({ text: `Skip not exists file:${localFile}` });
+            spinner.warn(`Skip not exists file:${localFile}`);
             continue;
           }
           if (fs5.lstatSync(localFile).isDirectory()) {
-            spinner.update({ text: `Uploading Dir: ${localFile} -> ${item.dest}` });
+            spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`);
             await ftpClient.uploadDir(localFile, item.dest);
           } else {
-            spinner.update({ text: `Uploading File: ${localFile} -> ${item.dest}` });
+            spinner.info(`Uploading File: ${localFile} -> ${item.dest}`);
             await ftpClient.put(localFile, item.dest);
           }
         } else {
           await ftpClient.put(Buffer.from(JSON.stringify(item.src), "utf-8"), item.dest);
         }
       }
-      spinner.success({ text: "Files uploaded!" });
+      spinner.succeed("Files uploaded!");
       await ftpClient.end();
     } catch (e) {
-      spinner.error({ text: `Connection error:${e}` });
+      spinner.fail(`Connection error:${e}`);
       await ftpClient.end();
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "main": "lib/index.js",
   "author": "Neo Fu",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "figlet": "^1.5.2",
     "gradient-string": "^2.0.2",
     "inquirer": "^9.1.4",
-    "nanospinner": "^1.1.0",
+    "ora": "^6.2.0",
     "shelljs": "^0.8.5",
     "ssh-config": "file://D:\\workspace\\ssh-config",
     "ssh2-sftp-client": "^9.0.4",
@@ -55,6 +55,7 @@
     "@types/node": "^18.11.13",
     "@types/shelljs": "latest",
     "@types/ssh2-sftp-client": "^9.0.0",
+    "jest": "^29.5.0",
     "pinst": "^3.0.0",
     "prettier": "^2.8.4",
     "ts-jest": "^29.0.3",

package/src/ftp/ftp.ts

@@ -5,7 +5,7 @@ import os from 'os'
 import Client from 'ssh2-sftp-client'
 import consola from 'consola'
 import inquirer from 'inquirer'
-import {createSpinner} from 'nanospinner'
+import ora from 'ora'
 import * as process from 'process'
 import * as console from 'console'
 
@@ -31,7 +31,7 @@ export function ftpUpload() {
       let ftpClient = new Client()
       const port = sshConfig['Port']
       const key = fs.readFileSync(path.resolve(os.homedir(), '.ssh/id_rsa'))
-      const spinner = createSpinner('Connecting')
+      const spinner = ora('Connecting')
       try {
         spinner.start()
         await ftpClient.connect({
@@ -41,32 +41,29 @@ export function ftpUpload() {
           passphrase: answer.password,
           privateKey: key,
         })
-        ftpClient.on('upload', info => {
-          spinner.update({text: `Uploading: ${info.source}`})
-        })
         // upload files
         for (let item of releaseConfig.fileMap) {
           if (typeof item.src == 'string') {
             const localFile = path.resolve(process.cwd(), item.src as string)
             if (!fs.existsSync(localFile)) {
-              spinner.warn({text: `Skip not exists file:${localFile}`})
+              spinner.warn(`Skip not exists file:${localFile}`)
               continue
             }
             if (fs.lstatSync(localFile).isDirectory()) {
-              spinner.update({text: `Uploading Dir: ${localFile} -> ${item.dest}`})
+              spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`)
               await ftpClient.uploadDir(localFile, item.dest)
             } else {
-              spinner.update({text: `Uploading File: ${localFile} -> ${item.dest}`})
+              spinner.info(`Uploading File: ${localFile} -> ${item.dest}`)
               await ftpClient.put(localFile, item.dest)
             }
           } else {
             await ftpClient.put(Buffer.from(JSON.stringify(item.src), 'utf-8'), item.dest)
           }
         }
-        spinner.success({text: 'Files uploaded!'})
+        spinner.succeed('Files uploaded!')
         await ftpClient.end()
       } catch (e) {
-        spinner.error({text: `Connection error:${e}`})
+        spinner.fail(`Connection error:${e}`)
         await ftpClient.end()
       }
     })