@chatbi-v/cli 1.0.13 → 1.0.14

package/dist/index.js

@@ -6250,7 +6250,7 @@ var init_sandbox = __esm({
     Sandbox = class _Sandbox {
       static BASE_DIR = import_path2.default.join(import_os.default.homedir(), ".chatbi-v-core");
       /**
-       * 核心依赖清单
+       * 核心依赖清单 (由 CLI 统一管控，项目中零显式依赖)
        */
       static CORE_PACKAGES = [
         "@chatbi-v/core",
@@ -6261,6 +6261,21 @@ var init_sandbox = __esm({
         "@chatbi-v/plugin-layout-transform",
         "@chatbi-v/plugin-system-monitor"
       ];
+      /**
+       * 沙箱运行时必要的公共依赖 (安装在沙箱中供 Shell 运行或提供类型)
+       */
+      static RUNTIME_DEPS = [
+        "@ant-design/x",
+        "@ant-design/icons",
+        "antd",
+        "react",
+        "react-dom",
+        "lucide-react",
+        "framer-motion",
+        "clsx",
+        "tailwind-merge",
+        "vite"
+      ];
       /**
        * 获取沙箱根目录
        */
@@ -6296,6 +6311,15 @@ var init_sandbox = __esm({
           } catch (e) {
           }
         }
+        try {
+          const cliRoot = await getCliRoot();
+          const cliVersionFile = import_path2.default.join(cliRoot, ".chatbi-version");
+          if (import_fs_extra2.default.existsSync(cliVersionFile)) {
+            const version = (await import_fs_extra2.default.readFile(cliVersionFile, "utf-8")).trim();
+            if (version) return version;
+          }
+        } catch (e) {
+        }
         const versions = await this.listVersions();
         if (versions.length > 0) {
           return versions[0];
@@ -6380,25 +6404,33 @@ var init_sandbox = __esm({
         for (const pkgName of _Sandbox.CORE_PACKAGES) {
           rootPkgJson.dependencies[pkgName] = version;
         }
+        for (const pkgName of _Sandbox.RUNTIME_DEPS) {
+          if (!rootPkgJson.dependencies[pkgName]) {
+            rootPkgJson.dependencies[pkgName] = "latest";
+          }
+        }
+        rootPkgJson.dependencies["react"] = "^18.3.1";
+        rootPkgJson.dependencies["react-dom"] = "^18.3.1";
+        rootPkgJson.dependencies["antd"] = "^5.20.0";
+        rootPkgJson.dependencies["@ant-design/x"] = "^2.1.0";
         await import_fs_extra2.default.writeJson(import_path2.default.join(versionPath, "package.json"), rootPkgJson, { spaces: 2 });
         await import_fs_extra2.default.writeFile(import_path2.default.join(versionPath, ".npmrc"), "shamefully-hoist=true\nauto-install-peers=true\n");
         const isLocalDev = await this.tryLinkLocalPackages(versionPath);
         try {
-          if (!isLocalDev) {
-            console.log(import_picocolors.default.gray(`  \u23F3 \u6267\u884C pnpm install...`));
-            await execa("pnpm", ["install"], {
-              cwd: versionPath,
-              stdio: "inherit"
-            });
-          } else {
-            console.log(import_picocolors.default.green(`  \u{1F517} \u5DF2\u901A\u8FC7\u672C\u5730 Link \u6A21\u5F0F\u914D\u7F6E\u5185\u6838\u4F9D\u8D56`));
-            await execa("pnpm", ["install", "--no-frozen-lockfile"], {
-              cwd: versionPath,
-              stdio: "inherit"
-            });
+          const installArgs = ["install"];
+          if (isLocalDev) {
+            installArgs.push("--no-frozen-lockfile");
+          }
+          console.log(import_picocolors.default.gray(`  \u23F3 \u6267\u884C pnpm ${installArgs.join(" ")}...`));
+          const result = await execa("pnpm", installArgs, {
+            cwd: versionPath,
+            stdio: "inherit"
+          });
+          if (result.exitCode !== 0) {
+            throw new Error(`pnpm install \u9000\u51FA\u7801\u4E3A ${result.exitCode}`);
           }
         } catch (e) {
-          console.warn(import_picocolors.default.yellow(`  \u26A0\uFE0F  \u4F9D\u8D56\u5B89\u88C5\u5931\u8D25\uFF0C\u53EF\u80FD\u662F\u56E0\u4E3A\u5305\u5C1A\u672A\u53D1\u5E03\u5230 NPM \u4E14\u672A\u627E\u5230\u672C\u5730\u6E90\u7801\u3002`));
+          console.warn(import_picocolors.default.yellow(`  \u26A0\uFE0F  \u4F9D\u8D56\u5B89\u88C5\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u6216 pnpm \u73AF\u5883\u3002`));
           console.warn(import_picocolors.default.gray(`  \u9519\u8BEF\u4FE1\u606F: ${e.message}`));
         }
         await this.syncShellToSandbox(version, force);
@@ -6422,24 +6454,49 @@ var init_sandbox = __esm({
             console.log(import_picocolors.default.gray(`  \u274C \u672A\u627E\u5230 packages \u76EE\u5F55`));
             return false;
           }
-          const categories = ["", "tooling", "plugins", "libs"];
           const localPackages = {};
-          for (const cat of categories) {
-            const catDir = import_path2.default.join(packagesDir, cat);
-            if (!import_fs_extra2.default.existsSync(catDir)) continue;
-            const dirs = await import_fs_extra2.default.readdir(catDir);
-            for (const dir of dirs) {
-              const pkgPath = import_path2.default.join(catDir, dir);
-              const pkgJsonPath = import_path2.default.join(pkgPath, "package.json");
-              if (import_fs_extra2.default.existsSync(pkgJsonPath)) {
-                const pkgJson = await import_fs_extra2.default.readJson(pkgJsonPath);
-                if (this.CORE_PACKAGES.includes(pkgJson.name)) {
-                  localPackages[pkgJson.name] = pkgPath;
+          const scanDir = async (currentDir) => {
+            if (!import_fs_extra2.default.existsSync(currentDir)) return;
+            const entries = await import_fs_extra2.default.readdir(currentDir, { withFileTypes: true });
+            for (const entry of entries) {
+              const fullPath = import_path2.default.join(currentDir, entry.name);
+              if (entry.isDirectory()) {
+                if (entry.name === "node_modules" || entry.name === ".git") continue;
+                const pkgJsonPath = import_path2.default.join(fullPath, "package.json");
+                if (import_fs_extra2.default.existsSync(pkgJsonPath)) {
+                  try {
+                    const pkgJson = await import_fs_extra2.default.readJson(pkgJsonPath);
+                    if (this.CORE_PACKAGES.includes(pkgJson.name)) {
+                      localPackages[pkgJson.name] = fullPath;
+                    }
+                  } catch (e) {
+                  }
+                }
+                const relative = import_path2.default.relative(projectRoot, fullPath);
+                if (relative.split(import_path2.default.sep).length < 4) {
+                  await scanDir(fullPath);
                 }
               }
             }
+          };
+          await scanDir(projectRoot);
+          if (Object.keys(localPackages).length === 0) {
+            console.log(import_picocolors.default.gray(`  \u2139\uFE0F  \u672A\u5728\u672C\u5730\u627E\u5230\u4EFB\u4F55\u6838\u5FC3\u5305\uFF0C\u5C06\u4ECE NPM \u4E0B\u8F7D`));
+            return false;
+          }
+          console.log(import_picocolors.default.gray(`  \u{1F517} \u5DF2\u627E\u5230\u672C\u5730\u6838\u5FC3\u5305: ${Object.keys(localPackages).join(", ")}`));
+          const sandboxNodeModules = import_path2.default.join(versionPath, "node_modules");
+          await import_fs_extra2.default.ensureDir(sandboxNodeModules);
+          for (const [name, pkgPath] of Object.entries(localPackages)) {
+            const targetLinkPath = import_path2.default.join(sandboxNodeModules, name);
+            await import_fs_extra2.default.ensureDir(import_path2.default.dirname(targetLinkPath));
+            try {
+              await import_fs_extra2.default.remove(targetLinkPath);
+            } catch (e) {
+            }
+            await import_fs_extra2.default.symlink(pkgPath, targetLinkPath, "dir");
+            console.log(import_picocolors.default.gray(`  \u{1F517} \u5DF2\u94FE\u63A5\u672C\u5730\u5305: ${name} -> ${pkgPath}`));
           }
-          if (Object.keys(localPackages).length === 0) return false;
           const sandboxPkgJsonPath = import_path2.default.join(versionPath, "package.json");
           const sandboxPkgJson = await import_fs_extra2.default.readJson(sandboxPkgJsonPath);
           const sections = ["dependencies", "devDependencies"];
@@ -6500,49 +6557,17 @@ var init_sandbox = __esm({
             ],
             paths: {
               ...corePaths,
-              ...projectPaths,
-              // 增加常用第三方依赖的映射，优先使用 @types
-              "react": [
-                import_path2.default.join(sandboxNodeModules, "@types/react"),
-                import_path2.default.join(sandboxNodeModules, "react")
-              ],
-              "react/*": [
-                import_path2.default.join(sandboxNodeModules, "@types/react/*"),
-                import_path2.default.join(sandboxNodeModules, "react/*")
-              ],
-              "react-dom": [
-                import_path2.default.join(sandboxNodeModules, "@types/react-dom"),
-                import_path2.default.join(sandboxNodeModules, "react-dom")
-              ],
-              "react-dom/*": [
-                import_path2.default.join(sandboxNodeModules, "@types/react-dom/*"),
-                import_path2.default.join(sandboxNodeModules, "react-dom/*")
-              ],
-              "antd": [
-                import_path2.default.join(sandboxNodeModules, "antd")
-              ],
-              "antd/*": [
-                import_path2.default.join(sandboxNodeModules, "antd/*")
-              ],
-              "@ant-design/icons": [import_path2.default.join(sandboxNodeModules, "@ant-design/icons")],
-              "@ant-design/icons/*": [import_path2.default.join(sandboxNodeModules, "@ant-design/icons/*")],
-              "@ant-design/x": [import_path2.default.join(sandboxNodeModules, "@ant-design/x")],
-              "@ant-design/x/*": [import_path2.default.join(sandboxNodeModules, "@ant-design/x/*")],
-              // 增加 Vite 客户端类型支持
-              "vite/client": [import_path2.default.join(sandboxNodeModules, "vite/client.d.ts")],
-              // 增加全局 @types 映射
-              "*": [
-                "./node_modules/*",
-                import_path2.default.join(sandboxNodeModules, "*"),
-                import_path2.default.join(sandboxNodeModules, "@types/*")
-              ]
+              ...projectPaths
             }
-          }
+          },
+          // 增加调试标识
+          _cli_sync_time: (/* @__PURE__ */ new Date()).toISOString()
         };
         await import_fs_extra2.default.writeJson(import_path2.default.join(chatbiDir, "tsconfig.paths.json"), tsConfigPaths, { spaces: 2 });
         const viteAlias = {};
         for (const pkgName of _Sandbox.CORE_PACKAGES) {
-          viteAlias[pkgName] = import_path2.default.join(sandboxNodeModules, pkgName);
+          const pkgDir = import_path2.default.join(sandboxNodeModules, pkgName);
+          viteAlias[pkgName] = pkgDir;
         }
         await import_fs_extra2.default.writeJson(import_path2.default.join(chatbiDir, "vite.alias.json"), viteAlias, { spaces: 2 });
         const projectNodeModules = import_path2.default.join(projectRoot, "node_modules");
@@ -6573,12 +6598,11 @@ var init_sandbox = __esm({
       static getCoreAlias(version) {
         const versionPath = this.getVersionPath(version);
         const sandboxNodeModules = import_path2.default.join(versionPath, "node_modules");
-        return {
-          "@chatbi-v/core": import_path2.default.join(sandboxNodeModules, "@chatbi-v/core"),
-          "@chatbi-v/mocks": import_path2.default.join(sandboxNodeModules, "@chatbi-v/mocks"),
-          "@chatbi-v/plugin-theme-manager": import_path2.default.join(sandboxNodeModules, "@chatbi-v/plugin-theme-manager"),
-          "@chatbi-v/plugin-system-monitor": import_path2.default.join(sandboxNodeModules, "@chatbi-v/plugin-system-monitor")
-        };
+        const aliases3 = {};
+        for (const pkg of this.CORE_PACKAGES) {
+          aliases3[pkg] = import_path2.default.join(sandboxNodeModules, pkg);
+        }
+        return aliases3;
       }
       /**
        * 清理特定版本的沙箱
@@ -6644,11 +6668,10 @@ async function build(options) {
         stdio: "inherit",
         env: { ...process.env, CHATBI_CLI_INTERNAL: "true" }
       });
-      return;
     } catch (e) {
-      console.error(import_picocolors2.default.red("\u274C Build script failed"));
       process.exit(1);
     }
+    return;
   }
   console.log(import_picocolors2.default.cyan(`Building ${pkg.name || "package"}...`));
   let entry = ["src/index.ts"];
@@ -6788,17 +6811,23 @@ async function build(options) {
       } else if (import_fs_extra3.default.existsSync(sandboxTsc)) {
         tscBin = sandboxTsc;
       } else {
-        if (import_fs_extra3.default.existsSync(import_path3.default.join(cwd, "pnpm-lock.yaml"))) {
-          await execa2("pnpm", ["exec", "tsc", "--build", "tsconfig.json"], { stdio: "inherit" });
+        try {
+          if (import_fs_extra3.default.existsSync(import_path3.default.join(cwd, "pnpm-lock.yaml"))) {
+            await execa2("pnpm", ["exec", "tsc", "--build", "tsconfig.json"], { stdio: "inherit" });
+            console.log(import_picocolors2.default.green("Type definitions generated."));
+            return;
+          }
+          await execa2("npx", ["-p", "typescript", "tsc", "--build", "tsconfig.json"], { stdio: "inherit" });
           console.log(import_picocolors2.default.green("Type definitions generated."));
           return;
+        } catch (e) {
+          console.warn(import_picocolors2.default.yellow("\u26A0\uFE0F  \u81EA\u52A8\u5C1D\u8BD5\u8FD0\u884C tsc \u5931\u8D25\uFF0C\u8BF7\u786E\u4FDD\u9879\u76EE\u4E2D\u5DF2\u5B89\u88C5 typescript"));
         }
       }
       await execa2(tscBin, ["--build", "tsconfig.json"], { stdio: "inherit" });
       console.log(import_picocolors2.default.green("Type definitions generated."));
     } catch (e) {
-      console.error(import_picocolors2.default.red("Failed to generate type definitions."));
-      throw e;
+      console.error(import_picocolors2.default.red("\u274C \u7C7B\u578B\u751F\u6210\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u9879\u76EE\u4E2D\u7684 tsconfig.json \u914D\u7F6E\u3002"));
     }
   }
 }
@@ -17688,6 +17717,8 @@ async function init(options) {
         name: import_path7.default.basename(destDir),
         projectName: name,
         // Original project name from CLI argument
+        version,
+        // CLI version to be used in package.json
         pluginType,
         theme,
         isNebula: theme === "nebula",
@@ -23701,7 +23732,7 @@ async function use(version, options = {}) {
 // package.json
 var package_default = {
   name: "@chatbi-v/cli",
-  version: "1.0.13",
+  version: "1.0.14",
   description: "Standardized CLI tooling for ChatBI Monorepo",
   main: "dist/index.js",
   bin: {
@@ -23821,7 +23852,6 @@ cli.command("update [targetVersion]", "\u66F4\u65B0\u5185\u6838\u7248\u672C").al
     console.log(import_picocolors15.default.green("\u2705 \u66F4\u65B0\u5B8C\u6210\uFF01"));
   } catch (e) {
     console.error(import_picocolors15.default.red("\u274C \u66F4\u65B0\u5931\u8D25"));
-    console.error(e);
     process.exit(1);
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatbi-v/cli",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Standardized CLI tooling for ChatBI Monorepo",
   "main": "dist/index.js",
   "bin": {

package/templates/app/package.json.hbs

@@ -12,6 +12,9 @@
   "dependencies": {
     "@ant-design/icons": "^5.2.6",
     "@ant-design/x": "^2.1.1",
+    "@chatbi-v/core": "^{{version}}",
+    "@chatbi-v/mocks": "^{{version}}",
+    "@chatbi-v/tailwind-config": "^{{version}}",
     "antd": "^5.29.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

package/templates/plugin/package.json.hbs

@@ -16,10 +16,13 @@
   "devDependencies": {
     "@ant-design/icons": "^5.2.6",
     "@types/react": "^18.3.1",
-    "@types/react-dom": "^18.3.1"
+    "@types/react-dom": "^18.3.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "antd": "^5.20.0",
+    "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@chatbi-v/core": "^1.0.4",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
     "antd": ">=5.0.0"