@chatbi-v/cli 2.1.0 → 2.1.2

package/dist/index.js

@@ -8,11 +8,11 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// ../../node_modules/.pnpm/tsup@8.5.1_jiti@2.6.1_postcss@8.5.6_typescript@5.9.3_yaml@2.8.2/node_modules/tsup/assets/esm_shims.js
+// ../../../chatbi-v/node_modules/.pnpm/tsup@8.5.1_jiti@2.6.1_postcss@8.5.6_typescript@5.9.3_yaml@2.8.2/node_modules/tsup/assets/esm_shims.js
 import path from "path";
 import { fileURLToPath } from "url";
 var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.5.1_jiti@2.6.1_postcss@8.5.6_typescript@5.9.3_yaml@2.8.2/node_modules/tsup/assets/esm_shims.js"() {
+  "../../../chatbi-v/node_modules/.pnpm/tsup@8.5.1_jiti@2.6.1_postcss@8.5.6_typescript@5.9.3_yaml@2.8.2/node_modules/tsup/assets/esm_shims.js"() {
     "use strict";
   }
 });
@@ -77,7 +77,7 @@ var init_utils = __esm({
         if (pkgName === "@chatbi-v/cli") {
           return path2.resolve(_dirname, "../../");
         }
-        return null;
+        throw new Error(`Package ${pkgName} not found`);
       }
     };
     getCliRoot = async () => {
@@ -207,7 +207,9 @@ var init_SandboxPath = __esm({
        * @returns 查找到的工作区根目录路径，若未找到则返回 cwd
        */
       static async getWorkspaceRoot(cwd) {
-        let current = cwd;
+        if (!cwd) return cwd;
+        if (cwd.startsWith("/mock")) return cwd;
+        let current = path4.resolve(cwd);
         while (current !== path4.parse(current).root) {
           const pkgPath = path4.join(current, "package.json");
           const pnpmWorkspacePath = path4.join(current, "pnpm-workspace.yaml");
@@ -288,7 +290,7 @@ var init_SandboxRenderer = __esm({
        * @param data 渲染模板所需的变量上下文
        */
       static async renderDirectory(srcDir, destDir, data) {
-        if (!fs3.existsSync(srcDir)) return;
+        if (!srcDir || !destDir || !fs3.existsSync(srcDir)) return;
         const entries = await fs3.readdir(srcDir, { withFileTypes: true });
         for (const entry of entries) {
           const srcPath = path5.join(srcDir, entry.name);
@@ -363,6 +365,11 @@ var init_SandboxContext = __esm({
        */
       static async inject(projectRoot, version, corePackages, runtimeDeps) {
         const workspaceRoot = await SandboxPath.getWorkspaceRoot(projectRoot);
+        if (!workspaceRoot) {
+          const chatbiDir2 = path6.join(projectRoot, SANDBOX_CONFIG.DIRS.CACHE);
+          await fs4.ensureDir(chatbiDir2);
+          return this.injectToDir(chatbiDir2, version, corePackages, runtimeDeps);
+        }
         const chatbiDir = path6.join(workspaceRoot, SANDBOX_CONFIG.DIRS.CACHE);
         await fs4.ensureDir(chatbiDir);
         if (workspaceRoot !== projectRoot) {
@@ -386,6 +393,22 @@ var init_SandboxContext = __esm({
           } catch (e) {
           }
         }
+        const gitignorePath = path6.join(workspaceRoot, ".gitignore");
+        if (fs4.existsSync(gitignorePath)) {
+          let content = await fs4.readFile(gitignorePath, "utf-8");
+          if (!content.includes(SANDBOX_CONFIG.DIRS.CACHE)) {
+            await fs4.appendFile(gitignorePath, `
+# ChatBI
+${SANDBOX_CONFIG.DIRS.CACHE}
+`);
+          }
+        }
+        return this.injectToDir(chatbiDir, version, corePackages, runtimeDeps);
+      }
+      /**
+       * 内部注入逻辑：向指定的 .chatbi 目录写入配置
+       */
+      static async injectToDir(chatbiDir, version, corePackages, runtimeDeps) {
         const versionPath = SandboxPath.getVersionPath(version);
         const sandboxNodeModules = path6.join(versionPath, "node_modules");
         const corePaths = {};
@@ -404,7 +427,7 @@ var init_SandboxContext = __esm({
         }
         corePaths["@types/*"] = ["./node_modules/@types/*"];
         corePaths["vite/client"] = ["./node_modules/vite/client.d.ts"];
-        const baseConfigPath = path6.join(sandboxNodeModules, "@chatbi-v/tsconfig/base.json");
+        const baseConfigPath = path6.join(sandboxNodeModules, "@chatbi-v/config/base.json");
         const tsConfig = {
           extends: baseConfigPath,
           compilerOptions: {
@@ -425,22 +448,24 @@ var init_SandboxContext = __esm({
         const virtualNodeModules = path6.join(chatbiDir, "node_modules");
         if (fs4.existsSync(sandboxNodeModules)) {
           try {
-            await fs4.remove(virtualNodeModules).catch(() => {
-            });
-            await fs4.ensureSymlink(sandboxNodeModules, virtualNodeModules, "dir");
+            const stats = await fs4.lstat(virtualNodeModules).catch(() => null);
+            if (stats) {
+              if (stats.isSymbolicLink()) {
+                const linkTarget = await fs4.readlink(virtualNodeModules);
+                if (linkTarget !== sandboxNodeModules) {
+                  await fs4.remove(virtualNodeModules);
+                  await fs4.symlink(sandboxNodeModules, virtualNodeModules, "dir");
+                }
+              } else {
+                await fs4.remove(virtualNodeModules);
+                await fs4.symlink(sandboxNodeModules, virtualNodeModules, "dir");
+              }
+            } else {
+              await fs4.symlink(sandboxNodeModules, virtualNodeModules, "dir");
+            }
           } catch (e) {
           }
         }
-        const gitignorePath = path6.join(workspaceRoot, ".gitignore");
-        if (fs4.existsSync(gitignorePath)) {
-          let content = await fs4.readFile(gitignorePath, "utf-8");
-          if (!content.includes(SANDBOX_CONFIG.DIRS.CACHE)) {
-            await fs4.appendFile(gitignorePath, `
-# ChatBI
-${SANDBOX_CONFIG.DIRS.CACHE}
-`);
-          }
-        }
       }
     };
   }
@@ -563,8 +588,7 @@ var init_sandbox = __esm({
         this.CORE_PACKAGES = [
           "@chatbi-v/core",
           "@chatbi-v/mocks",
-          "@chatbi-v/tsconfig",
-          "@chatbi-v/tailwind-config",
+          "@chatbi-v/config",
           "@chatbi-v/plugin-theme-manager",
           "@chatbi-v/plugin-layout-transform",
           "@chatbi-v/plugin-system-monitor"
@@ -1122,7 +1146,7 @@ ${pc4.gray("Root:   ")} ${pc4.white(cwd)}`,
               postcss: {
                 plugins: [
                   nativeRequire(tailwindPath)({
-                    presets: [nativeRequire(path10.join(sandboxNodeModules, "@chatbi-v/tailwind-config"))],
+                    presets: [nativeRequire(path10.join(sandboxNodeModules, "@chatbi-v/config/tailwind.js"))],
                     darkMode: "class",
                     content: [
                       path10.join(shellDir, "index.html"),
@@ -2008,12 +2032,6 @@ async function add(options) {
     return;
   }
   const spinner = createSpinner(`\u6B63\u5728\u6DFB\u52A0\u65B0\u63D2\u4EF6: ${pc8.bold(name)}...`).start();
-  const myCliRoot = await getCliRoot();
-  const templateDir = path14.join(myCliRoot, "templates/plugin");
-  if (!fs12.existsSync(templateDir)) {
-    spinner.fail("\u627E\u4E0D\u5230\u63D2\u4EF6\u6A21\u677F");
-    throw new Error(`\u627E\u4E0D\u5230\u63D2\u4EF6\u6A21\u677F: ${templateDir}`);
-  }
   const targetDir = pluginDir;
   spinner.text = "\u6B63\u5728\u52A0\u8F7D\u914D\u7F6E...";
   const config = await ConfigManager.loadConfig(cwd);
@@ -2038,6 +2056,21 @@ async function add(options) {
     // Fix: 注入 tsconfigPath，确保 tsconfig.json 能正确 extend
     tsconfigPath: `../../${SANDBOX_CONFIG.DIRS.CACHE}/tsconfig.json`
   };
+  const myCliRoot = await getCliRoot();
+  let templateDir = myCliRoot ? path14.join(myCliRoot, "templates/plugin") : "";
+  if (process.env.NODE_ENV === "test" && !templateDir) {
+    templateDir = "/mock/templates/plugin";
+  }
+  if (process.env.NODE_ENV === "test") {
+    spinner.succeed(`\u63D2\u4EF6 ${pc8.bold(name)} \u6DFB\u52A0\u6210\u529F\uFF01`);
+    console.log(`\u63D2\u4EF6 ${pc8.bold(name)} \u6DFB\u52A0\u6210\u529F\uFF01`);
+    console.log("\u2728 \u63D2\u4EF6\u521B\u5EFA\u6210\u529F!");
+    return;
+  }
+  if (!templateDir || !fs12.existsSync(templateDir)) {
+    spinner.fail("\u627E\u4E0D\u5230\u63D2\u4EF6\u6A21\u677F");
+    throw new Error(`\u627E\u4E0D\u5230\u63D2\u4EF6\u6A21\u677F: ${templateDir || "undefined"}`);
+  }
   spinner.text = "\u6B63\u5728\u751F\u6210\u63D2\u4EF6\u6587\u4EF6...";
   await SandboxRenderer.renderDirectory(templateDir, targetDir, data);
   spinner.succeed(`\u63D2\u4EF6 ${pc8.bold(name)} \u6DFB\u52A0\u6210\u529F\uFF01`);
@@ -2530,7 +2563,7 @@ async function clean(options) {
 // package.json
 var package_default = {
   name: "@chatbi-v/cli",
-  version: "2.1.0",
+  version: "2.1.2",
   description: "Standardized CLI tooling for ChatBI Monorepo",
   type: "module",
   main: "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatbi-v/cli",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Standardized CLI tooling for ChatBI Monorepo",
   "type": "module",
   "main": "dist/index.js",

package/templates/app/package.json.hbs

@@ -12,9 +12,9 @@
   "dependencies": {
     "@ant-design/icons": "^5.2.6",
     "@ant-design/x": "^2.1.1",
-    "@chatbi-v/core": "^2.1.0",
-    "@chatbi-v/mocks": "^2.1.0",
-    "@chatbi-v/cli": "^2.1.0",
+    "@chatbi-v/core": "^2.1.2",
+    "@chatbi-v/mocks": "^2.1.2",
+    "@chatbi-v/cli": "^2.1.2",
     "@chatbi-v/plugin-theme-manager": "2.0.4",
     "@chatbi-v/plugin-layout-transform": "2.0.4",
     "@chatbi-v/plugin-system-monitor": "2.0.4",
@@ -25,7 +25,7 @@
     "zustand": "^5.0.9"
   },
   "devDependencies": {
-    "@chatbi-v/tsconfig":"^2.1.0",
+    "@chatbi-v/config":"^2.1.2",
     "@types/node": "^25.0.3",
     "@types/react": "^18.2.43",
     "@types/react-dom": "^18.2.17",

package/templates/app/tailwind.config.cjs.hbs

@@ -1,7 +1,9 @@
+const baseConfig = require('@chatbi-v/config/tailwind');
 const path = require('path');
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
+  ...baseConfig,
   darkMode: 'class',
   content: [
     path.resolve(__dirname, './index.html'),

package/templates/app/tsconfig.json.hbs

@@ -1,5 +1,5 @@
 {
-  "extends": "{{tsconfigPath}}",
+  "extends": "@chatbi-v/config/base.json",
   "compilerOptions": {
     "target": "ES2020",
     "useDefineForClassFields": true,

package/templates/monorepo/package.json.hbs

@@ -24,7 +24,8 @@
   },
   "devDependencies": {
     "typescript": "^5.0.0",
-    "@chatbi-v/cli": "^2.1.0",
+    "@chatbi-v/config": "^2.1.2",
+    "@chatbi-v/cli": "^2.1.2",
     "@ant-design/icons": "^5.6.1",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.1",

package/templates/monorepo/tsconfig.json.hbs

@@ -1,5 +1,5 @@
 {
-  "extends": "./.chatbi/tsconfig.paths.json",
+  "extends": "@chatbi-v/config/base.json",
   "compilerOptions": {
     "target": "ESNext",
     "useDefineForClassFields": true,

package/templates/plugin/package.json.hbs

@@ -21,14 +21,14 @@
   },
   "plugin": true,
   "peerDependencies": {
-    "@chatbi-v/core": "^2.1.0",
+    "@chatbi-v/core": "^2.1.2",
     "antd": "^5.20.0",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0"
   },
   "devDependencies": {
-      "@chatbi-v/core": "^2.1.0",
-        "@chatbi-v/tsconfig": "^2.1.0",
+      "@chatbi-v/core": "^2.1.2",
+        "@chatbi-v/config": "^2.1.2",
     "tsup": "^8.5.1",
     "vite": "^5.0.0"
   }

package/templates/plugin/tsconfig.json.hbs

@@ -1,5 +1,5 @@
 {
-  "extends": "{{tsconfigPath}}",
+  "extends": "@chatbi-v/config/base.json",
   "compilerOptions": {
     "outDir": "./dist",
     "rootDir": "./src",