@chatbi-v/cli 1.0.14 → 2.0.1

package/dist/index.js

@@ -6303,14 +6303,6 @@ var init_sandbox = __esm({
             if (version) return version;
           }
         }
-        const currentLinkPath = import_path2.default.join(this.BASE_DIR, "versions", "current");
-        if (import_fs_extra2.default.existsSync(currentLinkPath)) {
-          try {
-            const realPath = await import_fs_extra2.default.realpath(currentLinkPath);
-            return import_path2.default.basename(realPath);
-          } catch (e) {
-          }
-        }
         try {
           const cliRoot = await getCliRoot();
           const cliVersionFile = import_path2.default.join(cliRoot, ".chatbi-version");
@@ -6320,6 +6312,14 @@ var init_sandbox = __esm({
           }
         } catch (e) {
         }
+        const currentLinkPath = import_path2.default.join(this.BASE_DIR, "versions", "current");
+        if (import_fs_extra2.default.existsSync(currentLinkPath)) {
+          try {
+            const realPath = await import_fs_extra2.default.realpath(currentLinkPath);
+            return import_path2.default.basename(realPath);
+          } catch (e) {
+          }
+        }
         const versions = await this.listVersions();
         if (versions.length > 0) {
           return versions[0];
@@ -6448,12 +6448,11 @@ var init_sandbox = __esm({
         try {
           const cliRoot = await getCliRoot();
           const projectRoot = import_path2.default.resolve(cliRoot, "../../..");
-          const packagesDir = import_path2.default.join(projectRoot, "packages");
-          console.log(import_picocolors.default.gray(`  \u{1F50D} \u68C0\u67E5\u672C\u5730\u5F00\u53D1\u73AF\u5883: ${packagesDir}`));
-          if (!import_fs_extra2.default.existsSync(packagesDir)) {
-            console.log(import_picocolors.default.gray(`  \u274C \u672A\u627E\u5230 packages \u76EE\u5F55`));
-            return false;
-          }
+          const possiblePackagesDirs = [
+            import_path2.default.join(projectRoot, "packages"),
+            import_path2.default.resolve(projectRoot, "../chatbi-v/packages")
+          ];
+          console.log(import_picocolors.default.gray(`  \u{1F50D} \u68C0\u67E5\u672C\u5730\u5F00\u53D1\u73AF\u5883...`));
           const localPackages = {};
           const scanDir = async (currentDir) => {
             if (!import_fs_extra2.default.existsSync(currentDir)) return;
@@ -6472,14 +6471,20 @@ var init_sandbox = __esm({
                   } catch (e) {
                   }
                 }
-                const relative = import_path2.default.relative(projectRoot, fullPath);
-                if (relative.split(import_path2.default.sep).length < 4) {
+                const relativeToProject = import_path2.default.relative(projectRoot, fullPath);
+                const depth = relativeToProject.split(import_path2.default.sep).filter((p) => p !== "..").length;
+                if (depth < 5) {
                   await scanDir(fullPath);
                 }
               }
             }
           };
-          await scanDir(projectRoot);
+          for (const dir of possiblePackagesDirs) {
+            if (import_fs_extra2.default.existsSync(dir)) {
+              console.log(import_picocolors.default.gray(`     - \u626B\u63CF\u76EE\u5F55: ${dir}`));
+              await scanDir(dir);
+            }
+          }
           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;
@@ -6572,7 +6577,7 @@ var init_sandbox = __esm({
         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");
         const projectChatbiDir = import_path2.default.join(projectNodeModules, "@chatbi-v");
-        if (import_fs_extra2.default.existsSync(projectNodeModules)) {
+        try {
           await import_fs_extra2.default.ensureDir(projectChatbiDir);
           for (const pkgName of _Sandbox.CORE_PACKAGES) {
             const shortName = pkgName.replace("@chatbi-v/", "");
@@ -6587,6 +6592,8 @@ var init_sandbox = __esm({
             } catch (e) {
             }
           }
+        } catch (err) {
+          console.warn(import_picocolors.default.yellow(`  \u26A0\uFE0F  \u65E0\u6CD5\u5728 ${projectNodeModules} \u521B\u5EFA\u6838\u5FC3\u5305\u8F6F\u94FE\u63A5: ${err.message}`));
         }
         const dtsContent = _Sandbox.CORE_PACKAGES.map((pkg) => `/// <reference types="${import_path2.default.join(sandboxNodeModules, pkg)}" />`).join("\n");
         await import_fs_extra2.default.writeFile(import_path2.default.join(chatbiDir, "env.d.ts"), dtsContent);
@@ -6656,7 +6663,27 @@ async function build(options) {
 \u{1F4E6} \u6B63\u5728\u6784\u5EFA\u9879\u76EE (\u5185\u6838\u7248\u672C: ${version})...`));
   await Sandbox.ensureDir();
   await Sandbox.prepareSandbox(version);
-  await Sandbox.ensureVirtualContext(cwd, version);
+  if (pkg.workspaces || import_fs_extra3.default.existsSync(import_path3.default.join(cwd, "pnpm-workspace.yaml"))) {
+    console.log(import_picocolors2.default.gray("  \u{1F50D} \u68C0\u6D4B\u5230 Monorepo\uFF0C\u6B63\u5728\u4E3A\u5B50\u5305\u540C\u6B65\u865A\u62DF\u4E0A\u4E0B\u6587..."));
+    await Sandbox.ensureVirtualContext(cwd, version);
+    const subDirs = ["apps", "plugins"];
+    for (const dir of subDirs) {
+      const dirPath = import_path3.default.join(cwd, dir);
+      if (import_fs_extra3.default.existsSync(dirPath)) {
+        const entries = await import_fs_extra3.default.readdir(dirPath, { withFileTypes: true });
+        for (const entry2 of entries) {
+          if (entry2.isDirectory()) {
+            const subPkgPath = import_path3.default.join(dirPath, entry2.name);
+            if (import_fs_extra3.default.existsSync(import_path3.default.join(subPkgPath, "package.json"))) {
+              await Sandbox.ensureVirtualContext(subPkgPath, version);
+            }
+          }
+        }
+      }
+    }
+  } else {
+    await Sandbox.ensureVirtualContext(cwd, version);
+  }
   if (pkg.scripts && pkg.scripts.build && !process.env.CHATBI_CLI_INTERNAL) {
     console.log(import_picocolors2.default.cyan(`Running "npm run build" for ${pkg.name}...`));
     try {
@@ -17706,7 +17733,12 @@ async function init(options) {
   try {
     const myCliRoot = await getCliRoot();
     const cliPkg = await import_fs_extra7.default.readJson(import_path7.default.join(myCliRoot, "package.json"));
-    const version = cliPkg.version;
+    const cliVersion = cliPkg.version;
+    let kernelVersion = cliVersion;
+    const kernelVersionFile = import_path7.default.join(myCliRoot, ".chatbi-version");
+    if (import_fs_extra7.default.existsSync(kernelVersionFile)) {
+      kernelVersion = (await import_fs_extra7.default.readFile(kernelVersionFile, "utf-8")).trim();
+    }
     const renderTemplate = async (templateName, destDir, extraData = {}) => {
       const srcDir = import_path7.default.join(myCliRoot, "templates", templateName);
       if (!import_fs_extra7.default.existsSync(srcDir)) {
@@ -17717,8 +17749,10 @@ 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
+        version: kernelVersion,
+        // 使用内核版本作为依赖版本
+        cliVersion,
+        // CLI 自身版本
         pluginType,
         theme,
         isNebula: theme === "nebula",
@@ -17808,7 +17842,7 @@ async function init(options) {
     }
     console.log(import_picocolors6.default.blue("\u2699\uFE0F  \u751F\u6210\u9879\u76EE\u914D\u7F6E..."));
     const cliConfig = {
-      coreVersion: version
+      coreVersion: kernelVersion
     };
     await import_fs_extra7.default.writeJson(import_path7.default.join(targetDir, "chatbi.config.json"), cliConfig, { spaces: 2 });
     console.log(import_picocolors6.default.green(`
@@ -23090,7 +23124,27 @@ async function dev(options = {}) {
 \u{1F680} \u542F\u52A8\u5F00\u53D1\u670D\u52A1\u5668 (\u5185\u6838\u7248\u672C: ${version})...`));
   await Sandbox.ensureDir();
   await Sandbox.prepareSandbox(version);
-  await Sandbox.ensureVirtualContext(cwd, version);
+  if (pkg.workspaces || import_fs_extra5.default.existsSync(import_path5.default.join(cwd, "pnpm-workspace.yaml"))) {
+    console.log(import_picocolors4.default.gray("  \u{1F50D} \u68C0\u6D4B\u5230 Monorepo\uFF0C\u6B63\u5728\u4E3A\u5B50\u5305\u540C\u6B65\u865A\u62DF\u4E0A\u4E0B\u6587..."));
+    await Sandbox.ensureVirtualContext(cwd, version);
+    const subDirs = ["apps", "plugins"];
+    for (const dir of subDirs) {
+      const dirPath = import_path5.default.join(cwd, dir);
+      if (import_fs_extra5.default.existsSync(dirPath)) {
+        const entries = await import_fs_extra5.default.readdir(dirPath, { withFileTypes: true });
+        for (const entry of entries) {
+          if (entry.isDirectory()) {
+            const subPkgPath = import_path5.default.join(dirPath, entry.name);
+            if (import_fs_extra5.default.existsSync(import_path5.default.join(subPkgPath, "package.json"))) {
+              await Sandbox.ensureVirtualContext(subPkgPath, version);
+            }
+          }
+        }
+      }
+    }
+  } else {
+    await Sandbox.ensureVirtualContext(cwd, version);
+  }
   if (pkg.scripts && pkg.scripts.dev && !process.env.CHATBI_CLI_INTERNAL) {
     try {
       await execa("npm", ["run", "dev"], {
@@ -23732,7 +23786,7 @@ async function use(version, options = {}) {
 // package.json
 var package_default = {
   name: "@chatbi-v/cli",
-  version: "1.0.14",
+  version: "2.0.1",
   description: "Standardized CLI tooling for ChatBI Monorepo",
   main: "dist/index.js",
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatbi-v/cli",
-  "version": "1.0.14",
+  "version": "2.0.1",
   "description": "Standardized CLI tooling for ChatBI Monorepo",
   "main": "dist/index.js",
   "bin": {
@@ -14,11 +14,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
-    "test": "vitest"
-  },
   "dependencies": {
     "boxen": "^8.0.1",
     "cac": "^6.7.14",
@@ -45,5 +40,10 @@
     "@types/prompts": "^2.4.9",
     "tsup": "^8.5.1",
     "vitest": "^1.0.0"
+  },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "test": "vitest"
   }
-}
+}

package/templates/app/package.json.hbs

@@ -3,8 +3,8 @@
   "version": "0.0.1",
   "type": "module",
   "scripts": {
-    "dev": "vite",
-    "build": "tsc && vite build",
+    "dev": "chatbi-cli dev",
+    "build": "chatbi-cli build",
     "preview": "vite preview",
     "test": "vitest",
     "sync": "chatbi-cli sync"

package/templates/monorepo/package.json.hbs

@@ -5,8 +5,8 @@
   "description": "ChatBI-V {{#if isBusiness}}Business{{else}}System{{/if}} Plugin Project",
   "type": "module",
   "scripts": {
-    "dev": "pnpm --filter @chatbi-v/main dev",
-    "build": "pnpm -r build",
+    "dev": "chatbi-cli dev",
+    "build": "chatbi-cli build",
     "create:plugin": "node scripts/create-plugin.js"
   },
   "workspaces": [

package/dist/app/.env

@@ -1,8 +0,0 @@
-# API Base URL
-VITE_API_BASE_URL=/bron-chat-bi
-
-# 是否开启 Mock 模式 (能力开关，需配合 url mock=true 使用)
-VITE_USE_MOCK=true
-
-# API Timeout (ms)
-VITE_API_TIMEOUT=10000

package/dist/app/.env.hbs

@@ -1,8 +0,0 @@
-# API Base URL
-VITE_API_BASE_URL=/api
-
-# 是否开启 Mock 模式 (能力开关，需配合 url mock=true 使用)
-VITE_USE_MOCK=true
-
-# API Timeout (ms)
-VITE_API_TIMEOUT=10000

package/dist/default/.gitignore.hbs

@@ -1,3 +0,0 @@
-.chatbi/
-node_modules/
-dist/

package/dist/monorepo/.gitignore.hbs

@@ -1,3 +0,0 @@
-.chatbi/
-node_modules/
-dist/