@weirdfingers/baseboards 0.9.11 → 0.9.12

package/dist/index.js

@@ -3218,8 +3218,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path19) {
-      let input = path19;
+    function removeDotSegments(path20) {
+      let input = path20;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -3418,8 +3418,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path19, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path19 && path19 !== "/" ? path19 : void 0;
+        const [path20, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path20 && path20 !== "/" ? path20 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -6723,10 +6723,10 @@ function createRootPackageJsonContent(projectName, cliVersion) {
       dev: "baseboards dev",
       up: "baseboards up",
       "up:attach": "baseboards up --attach",
-      down: "baseboards down",
-      logs: "baseboards logs -f",
-      status: "baseboards status",
-      clean: "baseboards clean"
+      down: "baseboards down .",
+      logs: "baseboards logs . -f",
+      status: "baseboards status .",
+      clean: "baseboards clean ."
     },
     devDependencies: {
       "@weirdfingers/baseboards": `^${cliVersion}`
@@ -8381,18 +8381,39 @@ async function cleanupDockerVolumes(ctx) {
 
 // src/commands/down.ts
 import { execa as execa4 } from "execa";
-import path7 from "path";
+import path8 from "path";
 import chalk4 from "chalk";
 import ora3 from "ora";
+
+// src/utils/compose.ts
+import fs7 from "fs-extra";
+import path7 from "path";
+function getComposeFiles2(dir) {
+  const files = ["compose.yaml"];
+  if (fs7.existsSync(path7.join(dir, "compose.web.yaml"))) {
+    files.push("compose.web.yaml");
+  }
+  return files;
+}
+function getComposeBaseArgs2(dir) {
+  return [
+    "compose",
+    "--env-file",
+    "docker/.env",
+    ...getComposeFiles2(dir).flatMap((f) => ["-f", f])
+  ];
+}
+
+// src/commands/down.ts
 async function down(directory, options) {
-  const dir = path7.resolve(process.cwd(), directory);
+  const dir = path8.resolve(process.cwd(), directory);
   if (!isScaffolded(dir)) {
     console.error(chalk4.red("\n\u274C Error: Not a Baseboards project"));
     console.log(chalk4.gray("   Run"), chalk4.cyan("baseboards up"), chalk4.gray("to scaffold a project first."));
     process.exit(1);
   }
   const spinner = ora3("Stopping services...").start();
-  const args = ["compose", "down"];
+  const args = [...getComposeBaseArgs2(dir), "down"];
   if (options.volumes) {
     args.push("--volumes");
   }
@@ -8412,15 +8433,15 @@ async function down(directory, options) {
 
 // src/commands/dev.ts
 import { execa as execa5 } from "execa";
-import path9 from "path";
+import path10 from "path";
 import chalk5 from "chalk";
-import fs8 from "fs-extra";
+import fs9 from "fs-extra";
 
 // src/utils/mode-detection.ts
 import { exec } from "child_process";
 import { promisify } from "util";
-import path8 from "path";
-import fs7 from "fs-extra";
+import path9 from "path";
+import fs8 from "fs-extra";
 var execAsync2 = promisify(exec);
 async function detectProjectMode(projectDir) {
   try {
@@ -8431,15 +8452,15 @@ async function detectProjectMode(projectDir) {
     }
   } catch {
   }
-  const modeFile = path8.join(projectDir, ".baseboards-mode");
-  if (await fs7.pathExists(modeFile)) {
-    const mode = (await fs7.readFile(modeFile, "utf-8")).trim();
+  const modeFile = path9.join(projectDir, ".baseboards-mode");
+  if (await fs8.pathExists(modeFile)) {
+    const mode = (await fs8.readFile(modeFile, "utf-8")).trim();
     if (mode === "default" || mode === "app-dev") {
       return mode;
     }
   }
-  const webNodeModules = path8.join(projectDir, "web", "node_modules");
-  if (await fs7.pathExists(webNodeModules)) {
+  const webNodeModules = path9.join(projectDir, "web", "node_modules");
+  if (await fs8.pathExists(webNodeModules)) {
     return "app-dev";
   }
   return "default";
@@ -8460,8 +8481,8 @@ function getDevCommand(pm) {
   }
 }
 async function dev(directory) {
-  const dir = path9.resolve(process.cwd(), directory);
-  const webDir = path9.join(dir, "web");
+  const dir = path10.resolve(process.cwd(), directory);
+  const webDir = path10.join(dir, "web");
   if (!isScaffolded(dir)) {
     console.error(chalk5.red("\n\u274C Error: Not a Baseboards project"));
     console.log(
@@ -8471,7 +8492,7 @@ async function dev(directory) {
     );
     process.exit(1);
   }
-  if (!await fs8.pathExists(webDir)) {
+  if (!await fs9.pathExists(webDir)) {
     console.error(chalk5.red("\n\u274C Error: No web/ directory found"));
     console.log(
       chalk5.gray("   This project may not have a frontend component.")
@@ -8500,8 +8521,8 @@ async function dev(directory) {
     );
     process.exit(1);
   }
-  const nodeModulesDir = path9.join(webDir, "node_modules");
-  if (!await fs8.pathExists(nodeModulesDir)) {
+  const nodeModulesDir = path10.join(webDir, "node_modules");
+  if (!await fs9.pathExists(nodeModulesDir)) {
     console.error(chalk5.yellow("\n\u26A0\uFE0F  Dependencies not installed"));
     console.log(
       chalk5.gray("   Run the following to install dependencies:")
@@ -8564,16 +8585,16 @@ async function dev(directory) {
 
 // src/commands/logs.ts
 import { execa as execa6 } from "execa";
-import path10 from "path";
+import path11 from "path";
 import chalk6 from "chalk";
 async function logs(directory, services, options) {
-  const dir = path10.resolve(process.cwd(), directory);
+  const dir = path11.resolve(process.cwd(), directory);
   if (!isScaffolded(dir)) {
     console.error(chalk6.red("\n\u274C Error: Not a Baseboards project"));
     console.log(chalk6.gray("   Run"), chalk6.cyan("baseboards up"), chalk6.gray("to scaffold a project first."));
     process.exit(1);
   }
-  const args = ["compose", "logs"];
+  const args = [...getComposeBaseArgs2(dir), "logs"];
   if (options.follow) {
     args.push("--follow");
   }
@@ -8600,10 +8621,10 @@ async function logs(directory, services, options) {
 
 // src/commands/status.ts
 import { execa as execa7 } from "execa";
-import path11 from "path";
+import path12 from "path";
 import chalk7 from "chalk";
 async function status(directory) {
-  const dir = path11.resolve(process.cwd(), directory);
+  const dir = path12.resolve(process.cwd(), directory);
   if (!isScaffolded(dir)) {
     console.error(chalk7.red("\n\u274C Error: Not a Baseboards project"));
     console.log(chalk7.gray("   Run"), chalk7.cyan("baseboards up"), chalk7.gray("to scaffold a project first."));
@@ -8611,7 +8632,7 @@ async function status(directory) {
   }
   console.log(chalk7.blue.bold("\n\u{1F4CA} Service Status\n"));
   try {
-    await execa7("docker", ["compose", "ps"], {
+    await execa7("docker", [...getComposeBaseArgs2(dir), "ps"], {
       cwd: dir,
       stdio: "inherit"
     });
@@ -8623,12 +8644,12 @@ async function status(directory) {
 
 // src/commands/clean.ts
 import { execa as execa8 } from "execa";
-import path12 from "path";
+import path13 from "path";
 import chalk8 from "chalk";
 import ora4 from "ora";
 import prompts3 from "prompts";
 async function clean(directory, options) {
-  const dir = path12.resolve(process.cwd(), directory);
+  const dir = path13.resolve(process.cwd(), directory);
   if (!isScaffolded(dir)) {
     console.error(chalk8.red("\n\u274C Error: Not a Baseboards project"));
     console.log(chalk8.gray("   Run"), chalk8.cyan("baseboards up"), chalk8.gray("to scaffold a project first."));
@@ -8652,12 +8673,12 @@ async function clean(directory, options) {
   }
   const spinner = ora4("Cleaning up...").start();
   try {
-    await execa8("docker", ["compose", "down", "--volumes", "--remove-orphans"], {
+    await execa8("docker", [...getComposeBaseArgs2(dir), "down", "--volumes", "--remove-orphans"], {
       cwd: dir
     });
     if (options.hard) {
       try {
-        const { stdout } = await execa8("docker", ["compose", "images", "-q"], {
+        const { stdout } = await execa8("docker", [...getComposeBaseArgs2(dir), "images", "-q"], {
           cwd: dir
         });
         const imageIds = stdout.split("\n").filter(Boolean);
@@ -8681,10 +8702,10 @@ async function clean(directory, options) {
 }
 
 // src/commands/update.ts
-import path13 from "path";
+import path14 from "path";
 import chalk9 from "chalk";
 async function update(directory, options) {
-  const dir = path13.resolve(process.cwd(), directory);
+  const dir = path14.resolve(process.cwd(), directory);
   if (!isScaffolded(dir)) {
     console.error(chalk9.red("\n\u274C Error: Not a Baseboards project"));
     console.log(chalk9.gray("   Run"), chalk9.cyan("baseboards up"), chalk9.gray("to scaffold a project first."));
@@ -8700,7 +8721,7 @@ async function update(directory, options) {
 }
 
 // src/commands/upgrade.ts
-import path17 from "path";
+import path18 from "path";
 import chalk12 from "chalk";
 import prompts4 from "prompts";
 
@@ -8709,8 +8730,8 @@ import semver from "semver";
 
 // src/utils/compatibility-fetcher.ts
 var import_ajv = __toESM(require_ajv(), 1);
-import fs9 from "fs-extra";
-import path14 from "path";
+import fs10 from "fs-extra";
+import path15 from "path";
 import os from "os";
 import addFormats from "ajv-formats";
 
@@ -8773,7 +8794,7 @@ var compatibility_manifest_schema_default = {
 
 // src/utils/compatibility-fetcher.ts
 var GITHUB_REPO = "weirdfingers/boards";
-var CACHE_DIR = path14.join(os.homedir(), ".baseboards", "compatibility");
+var CACHE_DIR = path15.join(os.homedir(), ".baseboards", "compatibility");
 var ajv = new import_ajv.default({ strict: false });
 addFormats(ajv);
 var validateManifest = ajv.compile(compatibility_manifest_schema_default);
@@ -8821,31 +8842,31 @@ function getManifestUrl(version) {
 }
 async function loadFromCache(version) {
   const cachePath = getCachePath(version);
-  if (!await fs9.pathExists(cachePath)) {
+  if (!await fs10.pathExists(cachePath)) {
     return null;
   }
   try {
-    const content = await fs9.readFile(cachePath, "utf-8");
+    const content = await fs10.readFile(cachePath, "utf-8");
     const manifest = JSON.parse(content);
     if (!validateManifest(manifest)) {
-      await fs9.remove(cachePath);
+      await fs10.remove(cachePath);
       return null;
     }
     return manifest;
   } catch (error) {
-    await fs9.remove(cachePath).catch(() => {
+    await fs10.remove(cachePath).catch(() => {
     });
     return null;
   }
 }
 async function saveToCache(version, manifest) {
   const cachePath = getCachePath(version);
-  await fs9.ensureDir(CACHE_DIR);
-  await fs9.writeFile(cachePath, JSON.stringify(manifest, null, 2), "utf-8");
+  await fs10.ensureDir(CACHE_DIR);
+  await fs10.writeFile(cachePath, JSON.stringify(manifest, null, 2), "utf-8");
 }
 function getCachePath(version) {
   const cleanVersion = version.replace(/^v/, "");
-  return path14.join(CACHE_DIR, `compatibility-${cleanVersion}.json`);
+  return path15.join(CACHE_DIR, `compatibility-${cleanVersion}.json`);
 }
 
 // src/utils/compatibility-checker.ts
@@ -8897,8 +8918,8 @@ function isVersionAffected(version, affectedRange) {
 }
 
 // src/commands/upgrade-default.ts
-import path15 from "path";
-import fs10 from "fs-extra";
+import path16 from "path";
+import fs11 from "fs-extra";
 import chalk10 from "chalk";
 import { execa as execa9 } from "execa";
 import ora5 from "ora";
@@ -8939,21 +8960,21 @@ async function upgradeDefaultMode(projectDir, currentVersion, targetVersion) {
   }
 }
 async function updateWebPackageJson(projectDir, version) {
-  const packageJsonPath = path15.join(projectDir, "web", "package.json");
-  const packageJson2 = await fs10.readJson(packageJsonPath);
+  const packageJsonPath = path16.join(projectDir, "web", "package.json");
+  const packageJson2 = await fs11.readJson(packageJsonPath);
   if (packageJson2.dependencies && packageJson2.dependencies["@weirdfingers/boards"]) {
     packageJson2.dependencies["@weirdfingers/boards"] = version;
   }
-  await fs10.writeJson(packageJsonPath, packageJson2, { spaces: 2 });
+  await fs11.writeJson(packageJsonPath, packageJson2, { spaces: 2 });
 }
 async function updateEnvVersion(projectDir, version) {
-  const envPath = path15.join(projectDir, "docker", ".env");
-  let content = await fs10.readFile(envPath, "utf-8");
+  const envPath = path16.join(projectDir, "docker", ".env");
+  let content = await fs11.readFile(envPath, "utf-8");
   content = content.replace(
     /^BACKEND_VERSION=.*/m,
     `BACKEND_VERSION=${version}`
   );
-  await fs10.writeFile(envPath, content, "utf-8");
+  await fs11.writeFile(envPath, content, "utf-8");
 }
 async function waitForHealth(projectDir, services) {
   const spinner = ora5("Waiting for services to be healthy...").start();
@@ -9006,8 +9027,8 @@ function printUpgradeSuccess(projectDir, version) {
   console.log(chalk10.gray("   All services are running and healthy.\n"));
   console.log(chalk10.gray("Next steps:"));
   console.log(chalk10.gray(`  \u2022 Check release notes: https://github.com/weirdfingers/boards/releases/tag/v${version}`));
-  console.log(chalk10.gray(`  \u2022 View logs: baseboards logs ${path15.basename(projectDir)}`));
-  console.log(chalk10.gray(`  \u2022 Check status: baseboards status ${path15.basename(projectDir)}
+  console.log(chalk10.gray(`  \u2022 View logs: baseboards logs ${path16.basename(projectDir)}`));
+  console.log(chalk10.gray(`  \u2022 Check status: baseboards status ${path16.basename(projectDir)}
 `));
 }
 async function execAsync3(command, options) {
@@ -9016,8 +9037,8 @@ async function execAsync3(command, options) {
 }
 
 // src/commands/upgrade-app-dev.ts
-import path16 from "path";
-import fs11 from "fs-extra";
+import path17 from "path";
+import fs12 from "fs-extra";
 import chalk11 from "chalk";
 import { execa as execa10 } from "execa";
 import ora6 from "ora";
@@ -9053,22 +9074,22 @@ async function upgradeAppDevMode(projectDir, currentVersion, targetVersion) {
   }
 }
 async function updateEnvVersion2(projectDir, version) {
-  const envPath = path16.join(projectDir, "docker", ".env");
-  let content = await fs11.readFile(envPath, "utf-8");
+  const envPath = path17.join(projectDir, "docker", ".env");
+  let content = await fs12.readFile(envPath, "utf-8");
   content = content.replace(
     /^BACKEND_VERSION=.*/m,
     `BACKEND_VERSION=${version}`
   );
-  await fs11.writeFile(envPath, content, "utf-8");
+  await fs12.writeFile(envPath, content, "utf-8");
 }
 async function printAppDevUpgradeInstructions(projectDir, oldVersion, newVersion) {
-  const webDir = path16.join(projectDir, "web");
+  const webDir = path17.join(projectDir, "web");
   const packageManager = await detectPackageManager(webDir);
   const updateCommand = packageManager === "npm" ? `npm install @weirdfingers/boards@${newVersion}` : packageManager === "yarn" ? `yarn upgrade @weirdfingers/boards@${newVersion}` : packageManager === "bun" ? `bun update @weirdfingers/boards@${newVersion}` : `pnpm update @weirdfingers/boards@${newVersion}`;
   console.log(chalk11.yellow("\u26A0\uFE0F  Frontend requires manual upgrade:\n"));
   console.log(chalk11.gray("   1. Stop your dev server (Ctrl+C if running)\n"));
   console.log(chalk11.gray("   2. Update the frontend package:\n"));
-  console.log(chalk11.cyan(`      cd ${path16.basename(projectDir)}/web`));
+  console.log(chalk11.cyan(`      cd ${path17.basename(projectDir)}/web`));
   console.log(chalk11.cyan(`      ${updateCommand}
 `));
   console.log(chalk11.gray("   3. Check for breaking changes:\n"));
@@ -9084,8 +9105,8 @@ async function printAppDevUpgradeInstructions(projectDir, oldVersion, newVersion
       console.log(chalk11.gray("   Consider committing before updating dependencies.\n"));
     }
   } catch (error) {
-    const gitDir = path16.join(webDir, ".git");
-    if (!fs11.existsSync(gitDir)) {
+    const gitDir = path17.join(webDir, ".git");
+    if (!fs12.existsSync(gitDir)) {
       console.log(chalk11.gray("   Skipping git status check: web/ is not a git repository."));
     } else {
       console.log(
@@ -9145,7 +9166,7 @@ async function waitForHealth2(projectDir, services) {
 
 // src/commands/upgrade.ts
 async function upgrade(directory, options) {
-  const dir = path17.resolve(process.cwd(), directory);
+  const dir = path18.resolve(process.cwd(), directory);
   if (!isScaffolded(dir)) {
     console.error(chalk12.red("\n\u274C Error: Not a Baseboards project"));
     console.log(chalk12.gray("   Run"), chalk12.cyan("baseboards up"), chalk12.gray("to scaffold a project first."));
@@ -9234,11 +9255,11 @@ async function getLatestVersion() {
 }
 
 // src/commands/doctor.ts
-import path18 from "path";
-import fs12 from "fs-extra";
+import path19 from "path";
+import fs13 from "fs-extra";
 import chalk13 from "chalk";
 async function doctor(directory) {
-  const dir = path18.resolve(process.cwd(), directory);
+  const dir = path19.resolve(process.cwd(), directory);
   console.log(chalk13.blue.bold("\n\u{1FA7A} Baseboards Diagnostics\n"));
   console.log(chalk13.cyan("CLI Version:"), getCliVersion());
   console.log(chalk13.cyan("\n\u{1F4CB} Prerequisites:"));
@@ -9271,38 +9292,38 @@ async function doctor(directory) {
   );
   if (scaffolded) {
     console.log(chalk13.gray("  Directory:"), dir);
-    const webPkg = path18.join(dir, "web/package.json");
-    const apiPkg = path18.join(dir, "api/pyproject.toml");
-    const composeFile = path18.join(dir, "compose.yaml");
+    const webPkg = path19.join(dir, "web/package.json");
+    const apiPkg = path19.join(dir, "api/pyproject.toml");
+    const composeFile = path19.join(dir, "compose.yaml");
     console.log(
       chalk13.gray("  Web package:"),
-      fs12.existsSync(webPkg) ? chalk13.green("\u2713") : chalk13.red("\u2717")
+      fs13.existsSync(webPkg) ? chalk13.green("\u2713") : chalk13.red("\u2717")
     );
     console.log(
       chalk13.gray("  API package:"),
-      fs12.existsSync(apiPkg) ? chalk13.green("\u2713") : chalk13.red("\u2717")
+      fs13.existsSync(apiPkg) ? chalk13.green("\u2713") : chalk13.red("\u2717")
     );
     console.log(
       chalk13.gray("  Compose file:"),
-      fs12.existsSync(composeFile) ? chalk13.green("\u2713") : chalk13.red("\u2717")
+      fs13.existsSync(composeFile) ? chalk13.green("\u2713") : chalk13.red("\u2717")
     );
     console.log(chalk13.cyan("\n\u{1F510} Environment:"));
-    const webEnv = path18.join(dir, "web/.env");
-    const apiEnv = path18.join(dir, "api/.env");
-    const dockerEnv = path18.join(dir, "docker/.env");
+    const webEnv = path19.join(dir, "web/.env");
+    const apiEnv = path19.join(dir, "api/.env");
+    const dockerEnv = path19.join(dir, "docker/.env");
     console.log(
       chalk13.gray("  Web .env:"),
-      fs12.existsSync(webEnv) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
+      fs13.existsSync(webEnv) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
     );
     console.log(
       chalk13.gray("  API .env:"),
-      fs12.existsSync(apiEnv) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
+      fs13.existsSync(apiEnv) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
     );
     console.log(
       chalk13.gray("  Docker .env:"),
-      fs12.existsSync(dockerEnv) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
+      fs13.existsSync(dockerEnv) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
     );
-    if (fs12.existsSync(apiEnv)) {
+    if (fs13.existsSync(apiEnv)) {
       const missingKeys = detectMissingProviderKeys(apiEnv);
       if (missingKeys.length > 0) {
         console.log(
@@ -9315,20 +9336,20 @@ async function doctor(directory) {
       }
     }
     console.log(chalk13.cyan("\n\u2699\uFE0F  Configuration:"));
-    const generatorsYaml = path18.join(dir, "api/config/generators.yaml");
-    const storageYaml = path18.join(dir, "api/config/storage_config.yaml");
+    const generatorsYaml = path19.join(dir, "api/config/generators.yaml");
+    const storageYaml = path19.join(dir, "api/config/storage_config.yaml");
     console.log(
       chalk13.gray("  generators.yaml:"),
-      fs12.existsSync(generatorsYaml) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
+      fs13.existsSync(generatorsYaml) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
     );
     console.log(
       chalk13.gray("  storage_config.yaml:"),
-      fs12.existsSync(storageYaml) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
+      fs13.existsSync(storageYaml) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
     );
-    const storageDir = path18.join(dir, "data/storage");
+    const storageDir = path19.join(dir, "data/storage");
     console.log(
       chalk13.gray("  Storage directory:"),
-      fs12.existsSync(storageDir) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
+      fs13.existsSync(storageDir) ? chalk13.green("\u2713") : chalk13.yellow("\u2717 Missing")
     );
   }
   console.log(chalk13.cyan("\n\u{1F4A1} Recommendations:"));