pangu-vis-cli 1.2.0 → 1.2.1

package/README.md

@@ -253,10 +253,10 @@ pv config
 
 **交互式配置项**：
 
-| 配置项         | 说明                           | 默认值       |
-| -------------- | ------------------------------ | ------------ |
-| `autoRemove`   | 打包后是否自动删除打包目录     | `yes` (true) |
-| `autoRemoveEs` | 打包后是否移除 es 目录         | `yes` (true) |
+| 配置项         | 说明                       | 默认值       |
+| -------------- | -------------------------- | ------------ |
+| `autoRemove`   | 打包后是否自动删除打包目录 | `yes` (true) |
+| `autoRemoveEs` | 打包后是否移除 es 目录     | `yes` (true) |
 
 **示例**：
 
@@ -337,11 +337,11 @@ CLI 配置信息存储在用户主目录：
 
 ### 配置项说明
 
-| 配置项            | 类型    | 说明                                                         | 默认值     |
-| ----------------- | ------- | ------------------------------------------------------------ | ---------- |
-| `autoRemove`      | boolean | 打包后是否自动删除打包目录                                   | `true`     |
-| `autoRemoveEs`    | boolean | 打包后是否自动删除 es 目录                                   | `true`     |
-| `lastUpdateCheck` | number  | 更新检查节流时间戳（可选）                                   | 无         |
+| 配置项            | 类型    | 说明                                                                           | 默认值     |
+| ----------------- | ------- | ------------------------------------------------------------------------------ | ---------- |
+| `autoRemove`      | boolean | 打包后是否自动删除打包目录                                                     | `true`     |
+| `autoRemoveEs`    | boolean | 打包后是否自动删除 es 目录                                                     | `true`     |
+| `lastUpdateCheck` | number  | 更新检查节流时间戳（可选）                                                     | 无         |
 | `privateRegistry` | string  | 私有 npm 源（可选，优先级：`PANGU_REGISTRY` 环境变量 > 配置文件 > 内网默认源） | 内网默认源 |
 
 ### 修改配置

package/dist/index.js

@@ -1,36 +1,13 @@
 #!/usr/bin/env node
-var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to4, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to4, key) && key !== except)
-        __defProp(to4, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to4;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 
 // src/types/cli.ts
 var DEFAULT_CLI_CONFIG;
@@ -148,84 +125,12 @@ var init_config = __esm({
   }
 });
 
-// node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js
-var require_picocolors = __commonJS({
-  "node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js"(exports, module) {
-    var p2 = process || {};
-    var argv = p2.argv || [];
-    var env = p2.env || {};
-    var isColorSupported = !(!!env.NO_COLOR || argv.includes("--no-color")) && (!!env.FORCE_COLOR || argv.includes("--color") || p2.platform === "win32" || (p2.stdout || {}).isTTY && env.TERM !== "dumb" || !!env.CI);
-    var formatter = (open, close, replace = open) => (input) => {
-      let string = "" + input, index = string.indexOf(close, open.length);
-      return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close;
-    };
-    var replaceClose = (string, close, replace, index) => {
-      let result = "", cursor = 0;
-      do {
-        result += string.substring(cursor, index) + replace;
-        cursor = index + close.length;
-        index = string.indexOf(close, cursor);
-      } while (~index);
-      return result + string.substring(cursor);
-    };
-    var createColors = (enabled = isColorSupported) => {
-      let f = enabled ? formatter : () => String;
-      return {
-        isColorSupported: enabled,
-        reset: f("\x1B[0m", "\x1B[0m"),
-        bold: f("\x1B[1m", "\x1B[22m", "\x1B[22m\x1B[1m"),
-        dim: f("\x1B[2m", "\x1B[22m", "\x1B[22m\x1B[2m"),
-        italic: f("\x1B[3m", "\x1B[23m"),
-        underline: f("\x1B[4m", "\x1B[24m"),
-        inverse: f("\x1B[7m", "\x1B[27m"),
-        hidden: f("\x1B[8m", "\x1B[28m"),
-        strikethrough: f("\x1B[9m", "\x1B[29m"),
-        black: f("\x1B[30m", "\x1B[39m"),
-        red: f("\x1B[31m", "\x1B[39m"),
-        green: f("\x1B[32m", "\x1B[39m"),
-        yellow: f("\x1B[33m", "\x1B[39m"),
-        blue: f("\x1B[34m", "\x1B[39m"),
-        magenta: f("\x1B[35m", "\x1B[39m"),
-        cyan: f("\x1B[36m", "\x1B[39m"),
-        white: f("\x1B[37m", "\x1B[39m"),
-        gray: f("\x1B[90m", "\x1B[39m"),
-        bgBlack: f("\x1B[40m", "\x1B[49m"),
-        bgRed: f("\x1B[41m", "\x1B[49m"),
-        bgGreen: f("\x1B[42m", "\x1B[49m"),
-        bgYellow: f("\x1B[43m", "\x1B[49m"),
-        bgBlue: f("\x1B[44m", "\x1B[49m"),
-        bgMagenta: f("\x1B[45m", "\x1B[49m"),
-        bgCyan: f("\x1B[46m", "\x1B[49m"),
-        bgWhite: f("\x1B[47m", "\x1B[49m"),
-        blackBright: f("\x1B[90m", "\x1B[39m"),
-        redBright: f("\x1B[91m", "\x1B[39m"),
-        greenBright: f("\x1B[92m", "\x1B[39m"),
-        yellowBright: f("\x1B[93m", "\x1B[39m"),
-        blueBright: f("\x1B[94m", "\x1B[39m"),
-        magentaBright: f("\x1B[95m", "\x1B[39m"),
-        cyanBright: f("\x1B[96m", "\x1B[39m"),
-        whiteBright: f("\x1B[97m", "\x1B[39m"),
-        bgBlackBright: f("\x1B[100m", "\x1B[49m"),
-        bgRedBright: f("\x1B[101m", "\x1B[49m"),
-        bgGreenBright: f("\x1B[102m", "\x1B[49m"),
-        bgYellowBright: f("\x1B[103m", "\x1B[49m"),
-        bgBlueBright: f("\x1B[104m", "\x1B[49m"),
-        bgMagentaBright: f("\x1B[105m", "\x1B[49m"),
-        bgCyanBright: f("\x1B[106m", "\x1B[49m"),
-        bgWhiteBright: f("\x1B[107m", "\x1B[49m")
-      };
-    };
-    module.exports = createColors();
-    module.exports.createColors = createColors;
-  }
-});
-
 // src/utils/log.ts
-var import_picocolors, log, exit;
+import pc from "picocolors";
+var log, exit;
 var init_log = __esm({
   "src/utils/log.ts"() {
     "use strict";
-    import_picocolors = __toESM(require_picocolors(), 1);
     log = {
       /**
        * 输出成功消息（绿色）
@@ -233,7 +138,7 @@ var init_log = __esm({
        * @returns 无返回值
        */
       success(message) {
-        process.stdout.write(`${import_picocolors.default.green(message)}
+        process.stdout.write(`${pc.green(message)}
 `);
       },
       /**
@@ -242,7 +147,7 @@ var init_log = __esm({
        * @returns 无返回值
        */
       err(message) {
-        process.stderr.write(`${import_picocolors.default.bold(import_picocolors.default.red(message))}
+        process.stderr.write(`${pc.bold(pc.red(message))}
 `);
       },
       /**
@@ -251,7 +156,7 @@ var init_log = __esm({
        * @returns 无返回值
        */
       info(message) {
-        process.stdout.write(`${import_picocolors.default.blue(message)}
+        process.stdout.write(`${pc.blue(message)}
 `);
       },
       /**
@@ -260,7 +165,7 @@ var init_log = __esm({
        * @returns 无返回值
        */
       warn(message) {
-        process.stdout.write(`${import_picocolors.default.yellow(message)}
+        process.stdout.write(`${pc.yellow(message)}
 `);
       },
       /**
@@ -300,8 +205,6 @@ __export(process_exports, {
   getCdRelativePath: () => getCdRelativePath,
   getGitUser: () => getGitUser,
   getPackageName: () => getPackageName,
-  get_plugin_latest_version: () => get_plugin_latest_version,
-  get_plugin_version: () => get_plugin_version,
   runAsyncCmd: () => runAsyncCmd,
   userInfo: () => userInfo,
   wait: () => wait,
@@ -312,7 +215,7 @@ import { promisify } from "node:util";
 import { $ } from "execa";
 import figlet from "figlet";
 import _ from "lodash";
-var camelCase, upperFirst, detectPackageManager, userInfo, getPackageName, wait, welcomeCli, compareVersion, getCdRelativePath, runAsyncCmd, getGitUser, get_plugin_version, get_plugin_latest_version;
+var camelCase, upperFirst, detectPackageManager, userInfo, getPackageName, wait, welcomeCli, compareVersion, getCdRelativePath, runAsyncCmd, getGitUser;
 var init_process = __esm({
   "src/utils/process.ts"() {
     "use strict";
@@ -389,21 +292,6 @@ var init_process = __esm({
         return "";
       }
     };
-    get_plugin_version = async (pluginName) => {
-      if (!pluginName) return "";
-      try {
-        const args = ["view", pluginName, "version"];
-        const result = await $`npm ${args}`;
-        return result.stdout.trim();
-      } catch {
-        return "";
-      }
-    };
-    get_plugin_latest_version = async (pluginName, defaultVersion = "") => {
-      if (!pluginName) return {};
-      const version2 = await get_plugin_version(pluginName) || defaultVersion;
-      return { [pluginName]: `^${version2}` };
-    };
   }
 });
 
@@ -417,7 +305,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "pangu-vis-cli",
-      version: "1.2.0",
+      version: "1.2.1",
       description: "vis-cli",
       keywords: [
         "pangu-vis",
@@ -568,7 +456,6 @@ async function getLatestVersion(packageName, defaultValue) {
       signal: AbortSignal.timeout(5e3)
     });
     if (!response.ok) {
-      latestVersionCache.set(cacheKey, defaultValue);
       return defaultValue;
     }
     const data = await response.json();
@@ -577,13 +464,10 @@ async function getLatestVersion(packageName, defaultValue) {
     latestVersionCache.set(cacheKey, result);
     return result;
   } catch (_error) {
-    if (packageName) {
-      latestVersionCache.set(`${packageName}\0${defaultValue ?? ""}`, defaultValue);
-    }
     return defaultValue;
   }
 }
-async function get_plugin_latest_version2(packageName, defaultValue) {
+async function get_plugin_latest_version(packageName, defaultValue) {
   if (!packageName) {
     return {};
   }
@@ -884,7 +768,7 @@ import { to as to2 } from "await-to-js";
 import fs4 from "fs-extra";
 import _2 from "lodash";
 import tar from "tar";
-var mergeWith, isArray, getPath, buildTarHandler, filterFile, scanDirHandle, updatePackageJson, outputVueName, isChartModuleRoot, scanFileFindChart, cachedScanResult, cachedScanRoot, scanAllDirectories, clearScanCache;
+var mergeWith, isArray, getPath, buildTarHandler, filterFileWorker, filterFile, scanDirHandle, updatePackageJson, outputVueName, isChartModuleRoot, scanFileFindChart, cachedScanResult, cachedScanRoot, scanAllDirectories, clearScanCache;
 var init_fs = __esm({
   "src/utils/fs.ts"() {
     "use strict";
@@ -919,24 +803,36 @@ var init_fs = __esm({
         writeStream.on("error", reject);
       });
     };
+    filterFileWorker = async (dir, ignoreFiles) => {
+      const [err, resDir] = await to2(fs4.readdir(dir));
+      if (err) {
+        return exit(err.message);
+      }
+      await Promise.all(
+        resDir.map(async (v) => {
+          const itemPath = path4.resolve(dir, v);
+          if (ignoreFiles.includes(v)) {
+            await fs4.remove(itemPath);
+            return;
+          }
+          const itemStats = await fs4.stat(itemPath);
+          if (itemStats.isDirectory()) {
+            await filterFileWorker(itemPath, ignoreFiles);
+          }
+        })
+      );
+    };
     filterFile = async (dirPath, ignoreFiles = [".git", ".vscode", ".DS_Store", ".idea"]) => {
       const dir = dirPath || process.cwd();
       const res = await fs4.pathExists(dir);
       if (res) {
+        const rootSegments = dir.split(path4.sep);
+        if (ignoreFiles.some((ignoreFile) => rootSegments.includes(ignoreFile))) {
+          return;
+        }
         const isDir = await fs4.stat(dir);
         if (isDir.isDirectory()) {
-          const [err, resDir] = await to2(fs4.readdir(dir));
-          if (err) {
-            return exit(err.message);
-          }
-          await Promise.all(resDir.map((v) => filterFile(path4.resolve(dir, v), ignoreFiles)));
-        } else {
-          for (const ignoreFile of ignoreFiles) {
-            if (dir.includes(ignoreFile)) {
-              await fs4.remove(dir);
-              return;
-            }
-          }
+          await filterFileWorker(dir, ignoreFiles);
         }
       }
     };
@@ -1098,7 +994,7 @@ __export(utils_exports, {
   getPath: () => getPath,
   getPrivateSource: () => getPrivateSource,
   get_cli_config: () => get_cli_config,
-  get_plugin_latest_version: () => get_plugin_latest_version2,
+  get_plugin_latest_version: () => get_plugin_latest_version,
   get_update_log: () => get_update_log,
   groupPrompts: () => groupPrompts,
   handleCancel: () => handleCancel,
@@ -1132,6 +1028,7 @@ __export(utils_exports, {
   wrapAsyncOperation: () => wrapAsyncOperation
 });
 import * as p from "@clack/prompts";
+import pc2 from "picocolors";
 async function textPrompt(options) {
   return promptUntilValid("text", options);
 }
@@ -1221,7 +1118,7 @@ async function progress(items, handler, options) {
     }
   }
 }
-var import_picocolors2, spinner2, intro2, outro2, note2, handleCancel, normalizeValidationResult, validatePromptValue, promptUntilValid, promptHandlers, checkUpdate;
+var spinner2, intro2, outro2, note2, handleCancel, normalizeValidationResult, validatePromptValue, promptUntilValid, promptHandlers, checkUpdate;
 var init_utils = __esm({
   "src/utils/index.ts"() {
     "use strict";
@@ -1231,7 +1128,6 @@ var init_utils = __esm({
     init_error();
     init_fs();
     init_log();
-    import_picocolors2 = __toESM(require_picocolors(), 1);
     init_api();
     init_config();
     init_log();
@@ -1248,9 +1144,9 @@ var init_utils = __esm({
         message: (msg) => s.message(msg)
       };
     };
-    intro2 = (title) => p.intro(import_picocolors2.default.bgCyan(import_picocolors2.default.black(` ${title} `)));
+    intro2 = (title) => p.intro(pc2.bgCyan(pc2.black(` ${title} `)));
     outro2 = (message) => {
-      if (message) p.outro(import_picocolors2.default.green(message));
+      if (message) p.outro(pc2.green(message));
       else p.outro();
     };
     note2 = (message, title) => p.note(message, title);
@@ -1531,7 +1427,7 @@ async function getStandaloneDependencyVersion(packageName, defaultVersion, shoul
       [packageName]: `^${defaultVersion}`
     };
   }
-  return get_plugin_latest_version2(packageName, defaultVersion);
+  return get_plugin_latest_version(packageName, defaultVersion);
 }
 async function handleChartTemplate(options) {
   const { projectName, projectPath, chartModule, author, chartType, chartId, isTs } = options;
@@ -1707,6 +1603,7 @@ import { fileURLToPath } from "node:url";
 import clear from "clear";
 import { $ as $3 } from "execa";
 import fs6 from "fs-extra";
+import pc3 from "picocolors";
 async function resolveTemplatePath(templateName, baseDir = __dirname) {
   const candidates = Array.from(new Set(getTemplatePathCandidates(templateName, baseDir)));
   for (const candidate of candidates) {
@@ -1819,19 +1716,18 @@ async function create(commandList = []) {
   installSpinner.stop();
   clear();
   await welcomeCli();
-  log.message(import_picocolors3.default.cyan("\n\u5B8C\u6210. \u73B0\u5728\u53EF\u4EE5\u6267\u884C:\n"));
+  log.message(pc3.cyan("\n\u5B8C\u6210. \u73B0\u5728\u53EF\u4EE5\u6267\u884C:\n"));
   const cdPath = getCdRelativePath(process.cwd(), projectPath);
   log.success(`  cd ${cdPath}`);
   log.success(`  pnpm dev`);
   log.message("");
   clearScanCache();
-  outro2(import_picocolors3.default.green(`\u56FE\u8868 "${projectName}" \u521B\u5EFA\u6210\u529F!`));
+  outro2(pc3.green(`\u56FE\u8868 "${projectName}" \u521B\u5EFA\u6210\u529F!`));
 }
-var import_picocolors3, __filename, __dirname, getTemplatePathCandidates, CHART_TYPES;
+var __filename, __dirname, getTemplatePathCandidates, CHART_TYPES;
 var init_create = __esm({
   "src/create/index.ts"() {
     "use strict";
-    import_picocolors3 = __toESM(require_picocolors(), 1);
     init_schemas();
     init_utils();
     init_chart();
@@ -1876,7 +1772,6 @@ async function dev() {
   const packageJsonPath = join(cwd, "package.json");
   if (!await fs7.pathExists(packageJsonPath)) {
     exit("\u672A\u627E\u5230 package.json \u6587\u4EF6\uFF0C\u8BF7\u786E\u4FDD\u5728\u9879\u76EE\u6839\u76EE\u5F55\u6267\u884C\u6B64\u547D\u4EE4");
-    return;
   }
   let packageJson;
   try {
@@ -1888,7 +1783,6 @@ async function dev() {
   if (!packageJson.scripts?.dev) {
     log.info('\u793A\u4F8B\uFF1A{"scripts": {"dev": "vite"}}');
     exit("package.json \u4E2D\u672A\u5B9A\u4E49 dev \u811A\u672C\uFF0C\u8BF7\u5148\u6DFB\u52A0 dev \u811A\u672C");
-    return;
   }
   log.info(`\u6B63\u5728\u6267\u884C dev \u811A\u672C\uFF1A${packageJson.scripts.dev}`);
   let interrupted = false;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pangu-vis-cli",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"description": "vis-cli",
 	"keywords": [
 		"pangu-vis",