@widget-js/cli 24.1.1-beta.62 → 24.1.1-beta.63

package/dist/index.js

@@ -35,7 +35,7 @@ program.command("publish").description("Publish widget package with developer ke
 var typeOption = new Option("-t, --type <type>").choices(["ftp", "oss"]);
 var fileOption = new Option("-f, --file <file>");
 program.command("release").description("\u901A\u8FC7FTP/OSS\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").addOption(typeOption).addOption(fileOption).action(async (options) => {
-  const release = await import("./release-MBNSS6M2.js");
+  const release = await import("./release-3DQATEM5.js");
   await release.default(options);
 });
 program.parse(process.argv);

package/dist/{release-MBNSS6M2.js → release-3DQATEM5.js}

@@ -88,6 +88,8 @@ import consola2 from "consola";
 import inquirer from "inquirer";
 import ora from "ora";
 import { minimatch } from "minimatch";
+import fg from "fast-glob";
+var { globSync } = fg;
 async function checkParentDir(ftpClient, file, onMkdir) {
   const dir = path.dirname(file);
   const dirExists = await ftpClient.exists(dir);
@@ -116,49 +118,64 @@ async function runSSH(sshConfig, releaseConfig) {
     });
     releaseConfig.fileMap.sort((it1, it2) => (it1.order ?? 0) - (it2.order ?? 0));
     for (const item of releaseConfig.fileMap) {
-      if (typeof item.src == "string") {
-        if (item.remoteCopy) {
-          await checkParentDir(ftpClient, item.dest, (dir) => {
-            spinner.warn(`Create Dir: ${dir}`);
-          });
-          const destExists = await ftpClient.exists(item.dest);
-          if (destExists) {
-            spinner.warn(`Delete exists file:${item.dest}`);
-            await ftpClient.delete(item.dest);
-          }
-          spinner.info(`Copying File: ${item.src} -> ${item.dest}`);
-          await ftpClient.rcopy(item.src, item.dest);
-        } else {
-          const localFile = path.resolve(process.cwd(), item.src);
-          if (!item.remoteCopy && !fs3.existsSync(localFile)) {
-            spinner.warn(`Skip not exists file:${localFile}`);
-            continue;
-          }
-          if (fs3.lstatSync(localFile).isDirectory()) {
-            spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`);
-            await ftpClient.uploadDir(localFile, item.dest, {
-              filter: (filePath, isDirectory) => {
-                if (item.ignorePattern && !isDirectory) {
-                  const fileName = path.basename(filePath);
-                  if (minimatch(fileName, item.ignorePattern)) {
-                    spinner.warn(`Skip file:${filePath}`);
-                    return false;
-                  }
-                }
-                return true;
-              }
-            });
-          } else {
+      if (item.pattern) {
+        await checkParentDir(ftpClient, item.dest, (dir) => {
+          spinner.succeed(`Create Dir: ${dir}`);
+        });
+        const files = globSync(item.pattern, { absolute: true, ignore: item.ignore, cwd: process.cwd() });
+        for (const file of files) {
+          spinner.info(`Uploading File: ${file} -> ${item.dest}`);
+          await ftpClient.put(file, item.dest);
+        }
+        continue;
+      }
+      if (item.src) {
+        if (typeof item.src == "string") {
+          if (item.remoteCopy) {
             await checkParentDir(ftpClient, item.dest, (dir) => {
-              spinner.succeed(`Create Dir: ${dir}`);
+              spinner.warn(`Create Dir: ${dir}`);
             });
-            spinner.info(`Uploading File: ${localFile} -> ${item.dest}`);
-            await ftpClient.put(localFile, item.dest);
+            const destExists = await ftpClient.exists(item.dest);
+            if (destExists) {
+              spinner.warn(`Delete exists file:${item.dest}`);
+              await ftpClient.delete(item.dest);
+            }
+            spinner.info(`Copying File: ${item.src} -> ${item.dest}`);
+            await ftpClient.rcopy(item.src, item.dest);
+          } else {
+            const localFile = path.resolve(process.cwd(), item.src);
+            if (!item.remoteCopy && !fs3.existsSync(localFile)) {
+              spinner.warn(`Skip not exists file:${localFile}`);
+              continue;
+            }
+            if (fs3.lstatSync(localFile).isDirectory()) {
+              spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`);
+              await ftpClient.uploadDir(localFile, item.dest, {
+                filter: (filePath, isDirectory) => {
+                  if (item.ignore && !isDirectory) {
+                    const fileName = path.basename(filePath);
+                    if (item.ignore.some((ignorePattern) => minimatch(fileName, ignorePattern))) {
+                      spinner.warn(`Skip file:${filePath}`);
+                      return false;
+                    }
+                  }
+                  return true;
+                }
+              });
+            } else {
+              await checkParentDir(ftpClient, item.dest, (dir) => {
+                spinner.succeed(`Create Dir: ${dir}`);
+              });
+              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);
         }
-      } else {
-        await ftpClient.put(Buffer.from(JSON.stringify(item.src), "utf-8"), item.dest);
+        continue;
       }
+      throw new Error("pattern or src is required in fileMap item");
     }
     spinner.succeed("Files uploaded!");
     await ftpClient.end();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@widget-js/cli",
   "type": "module",
-  "version": "24.1.1-beta.62",
+  "version": "24.1.1-beta.63",
   "private": false,
   "author": "Neo Fu",
   "license": "MIT",
@@ -44,9 +44,9 @@
     "shelljs": "^0.8.5",
     "ssh2-sftp-client": "^9.1.0",
     "ws": "^8.11.0",
-    "@widget-js/core": "24.1.1-beta.62",
     "@widget-js/utils": "24.1.1-beta.62",
-    "@widget-js/vue3": "24.1.1-beta.62"
+    "@widget-js/vue3": "24.1.1-beta.65",
+    "@widget-js/core": "24.1.1-beta.63"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^2.21.1",
@@ -55,26 +55,23 @@
     "@types/figlet": "^1.5.5",
     "@types/gradient-string": "^1.1.2",
     "@types/inquirer": "latest",
-    "@types/jest": "^29.2.3",
     "@types/minimist": "^1.2.5",
     "@types/node": "^18.11.13",
     "@types/semver": "^7.5.0",
     "@types/shelljs": "latest",
     "@types/ssh2-sftp-client": "^9.0.1",
     "eslint": "8.48.0",
-    "jest": "^29.5.0",
-    "pinst": "^3.0.0",
     "rimraf": "^4.4.1",
-    "ts-jest": "^29.0.3",
     "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",
     "tsup": "^6.5.0",
     "typescript": "^5.2.2",
-    "vitest": "^0.34.6",
+    "vite": "^5.0.5",
+    "vitest": "^3.2.4",
     "vue-router": "^4.2.5",
-    "@widget-js/vite-plugin-widget": "24.1.1-beta.62",
-    "@widget-js/core": "24.1.1-beta.62",
-    "@widget-js/vue3": "24.1.1-beta.62"
+    "@widget-js/vite-plugin-widget": "24.1.1-beta.63",
+    "@widget-js/core": "24.1.1-beta.63",
+    "@widget-js/vue3": "24.1.1-beta.65"
   },
   "scripts": {
     "build": "tsup-node src/index.ts",