@cloudwerk/cli 0.8.0 → 0.10.0

package/dist/index.js

@@ -323,7 +323,9 @@ async function build(pathArg, options) {
       verbose,
       hydrationEndpoint: "/__cloudwerk",
       renderer,
-      root: cwd
+      publicDir: cloudwerkConfig.publicDir ?? "public",
+      root: cwd,
+      isProduction: true
     });
     const tempEntryPath = path2.join(tempDir, "_server-entry.ts");
     fs2.writeFileSync(tempEntryPath, serverEntryCode);
@@ -364,6 +366,8 @@ async function build(pathArg, options) {
       root: cwd,
       mode: "production",
       logLevel: verbose ? "info" : "warn",
+      // Disable publicDir for server build - static assets are already in dist/static/ from client build
+      publicDir: false,
       plugins: [
         cloudwerk2({ verbose })
       ],
@@ -465,13 +469,102 @@ function formatSize(bytes) {
   return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
 }
 
+// src/commands/deploy.ts
+import * as path3 from "path";
+import * as fs3 from "fs";
+import { spawn } from "child_process";
+async function deploy(pathArg, options) {
+  const verbose = options.verbose ?? false;
+  const logger = createLogger(verbose);
+  try {
+    const cwd = pathArg ? path3.resolve(process.cwd(), pathArg) : process.cwd();
+    if (!fs3.existsSync(cwd)) {
+      throw new CliError(
+        `Directory does not exist: ${cwd}`,
+        "ENOENT",
+        `Make sure the path exists and try again.`
+      );
+    }
+    logger.debug(`Working directory: ${cwd}`);
+    const wranglerPath = path3.join(cwd, "wrangler.toml");
+    if (!fs3.existsSync(wranglerPath)) {
+      throw new CliError(
+        `wrangler.toml not found in ${cwd}`,
+        "ENOENT",
+        `Create a wrangler.toml file or run this command from a directory containing one.`
+      );
+    }
+    logger.debug(`Found wrangler.toml: ${wranglerPath}`);
+    if (!options.skipBuild) {
+      logger.info("Building project...");
+      await build(pathArg, {
+        config: options.config,
+        verbose: options.verbose
+      });
+      console.log();
+    }
+    const args = ["wrangler", "deploy"];
+    if (options.env) {
+      args.push("--env", options.env);
+    }
+    if (options.dryRun) {
+      args.push("--dry-run");
+    }
+    const envLabel = options.env ? ` to ${options.env}` : "";
+    const dryRunLabel = options.dryRun ? " (dry run)" : "";
+    logger.info(`Deploying${envLabel}${dryRunLabel}...`);
+    logger.debug(`Running: npx ${args.join(" ")}`);
+    const exitCode = await runCommand(args, cwd);
+    if (exitCode !== 0) {
+      throw new CliError(
+        `Deployment failed with exit code ${exitCode}`,
+        "EDEPLOY",
+        `Check the wrangler output above for details.`
+      );
+    }
+    if (!options.dryRun) {
+      logger.success("Deployment complete!");
+    } else {
+      logger.success("Dry run complete!");
+    }
+  } catch (error) {
+    if (error instanceof CliError) {
+      printError(error.message, error.suggestion);
+      process.exit(1);
+    }
+    if (error instanceof Error) {
+      printError(error.message);
+      if (verbose && error.stack) {
+        console.log(error.stack);
+      }
+      process.exit(1);
+    }
+    printError(String(error));
+    process.exit(1);
+  }
+}
+function runCommand(args, cwd) {
+  return new Promise((resolve4, reject) => {
+    const child = spawn("npx", args, {
+      cwd,
+      stdio: "inherit"
+    });
+    child.on("error", (error) => {
+      reject(error);
+    });
+    child.on("close", (code) => {
+      resolve4(code ?? 0);
+    });
+  });
+}
+
 // src/commands/config.ts
 import * as readline from "readline";
 import pc2 from "picocolors";
 
 // src/utils/configWriter.ts
-import * as fs3 from "fs";
-import * as path3 from "path";
+import * as fs4 from "fs";
+import * as path4 from "path";
 import { loadConfig as loadConfig2 } from "@cloudwerk/core/build";
 var CONFIG_FILE_NAMES = [
   "cloudwerk.config.ts",
@@ -480,8 +573,8 @@ var CONFIG_FILE_NAMES = [
 ];
 function findConfigFile(cwd) {
   for (const filename of CONFIG_FILE_NAMES) {
-    const configPath = path3.join(cwd, filename);
-    if (fs3.existsSync(configPath)) {
+    const configPath = path4.join(cwd, filename);
+    if (fs4.existsSync(configPath)) {
       return configPath;
     }
   }
@@ -492,7 +585,7 @@ function readCloudwerkConfig(cwd) {
   if (!configPath) {
     return {};
   }
-  const content = fs3.readFileSync(configPath, "utf-8");
+  const content = fs4.readFileSync(configPath, "utf-8");
   return parseConfigContent(content);
 }
 function parseConfigContent(content) {
@@ -513,16 +606,16 @@ function parseConfigContent(content) {
 function writeCloudwerkConfig(cwd, updates) {
   const configPath = findConfigFile(cwd);
   if (!configPath) {
-    const newConfigPath = path3.join(cwd, "cloudwerk.config.ts");
+    const newConfigPath = path4.join(cwd, "cloudwerk.config.ts");
     const content2 = generateMinimalConfig(updates);
-    fs3.writeFileSync(newConfigPath, content2, "utf-8");
+    fs4.writeFileSync(newConfigPath, content2, "utf-8");
     return true;
   }
-  let content = fs3.readFileSync(configPath, "utf-8");
+  let content = fs4.readFileSync(configPath, "utf-8");
   if (updates.renderer !== void 0) {
     content = updateRenderer(content, updates.renderer);
   }
-  fs3.writeFileSync(configPath, content, "utf-8");
+  fs4.writeFileSync(configPath, content, "utf-8");
   return true;
 }
 function updateRenderer(content, renderer) {
@@ -591,11 +684,11 @@ function generateMinimalConfig(updates) {
 }
 
 // src/utils/tsconfigWriter.ts
-import * as fs4 from "fs";
-import * as path4 from "path";
+import * as fs5 from "fs";
+import * as path5 from "path";
 function findTsConfig(cwd) {
-  const tsconfigPath = path4.join(cwd, "tsconfig.json");
-  if (fs4.existsSync(tsconfigPath)) {
+  const tsconfigPath = path5.join(cwd, "tsconfig.json");
+  if (fs5.existsSync(tsconfigPath)) {
     return tsconfigPath;
   }
   return null;
@@ -606,7 +699,7 @@ function readTsConfig(cwd) {
     return {};
   }
   try {
-    const content = fs4.readFileSync(tsconfigPath, "utf-8");
+    const content = fs5.readFileSync(tsconfigPath, "utf-8");
     const config = JSON.parse(content);
     return {
       jsxImportSource: config.compilerOptions?.jsxImportSource,
@@ -622,7 +715,7 @@ function updateTsConfig(cwd, updates) {
     return false;
   }
   try {
-    const content = fs4.readFileSync(tsconfigPath, "utf-8");
+    const content = fs5.readFileSync(tsconfigPath, "utf-8");
     const config = JSON.parse(content);
     if (!config.compilerOptions) {
       config.compilerOptions = {};
@@ -630,7 +723,7 @@ function updateTsConfig(cwd, updates) {
     if (updates.jsxImportSource !== void 0) {
       config.compilerOptions.jsxImportSource = updates.jsxImportSource;
     }
-    fs4.writeFileSync(tsconfigPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
+    fs5.writeFileSync(tsconfigPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
     return true;
   } catch {
     return false;
@@ -638,8 +731,8 @@ function updateTsConfig(cwd, updates) {
 }
 
 // src/utils/dependencyManager.ts
-import * as fs5 from "fs";
-import * as path5 from "path";
+import * as fs6 from "fs";
+import * as path6 from "path";
 import { execFileSync } from "child_process";
 var REACT_SPECIFIC_LIBRARIES = [
   "@tanstack/react-query",
@@ -680,22 +773,22 @@ var REACT_SPECIFIC_LIBRARIES = [
   "@use-gesture/react"
 ];
 function detectPackageManager(cwd) {
-  if (fs5.existsSync(path5.join(cwd, "pnpm-lock.yaml"))) {
+  if (fs6.existsSync(path6.join(cwd, "pnpm-lock.yaml"))) {
     return "pnpm";
   }
-  if (fs5.existsSync(path5.join(cwd, "yarn.lock"))) {
+  if (fs6.existsSync(path6.join(cwd, "yarn.lock"))) {
     return "yarn";
   }
-  if (fs5.existsSync(path5.join(cwd, "bun.lockb"))) {
+  if (fs6.existsSync(path6.join(cwd, "bun.lockb"))) {
     return "bun";
   }
-  if (fs5.existsSync(path5.join(cwd, "package-lock.json"))) {
+  if (fs6.existsSync(path6.join(cwd, "package-lock.json"))) {
     return "npm";
   }
-  const packageJsonPath = path5.join(cwd, "package.json");
-  if (fs5.existsSync(packageJsonPath)) {
+  const packageJsonPath = path6.join(cwd, "package.json");
+  if (fs6.existsSync(packageJsonPath)) {
     try {
-      const packageJson = JSON.parse(fs5.readFileSync(packageJsonPath, "utf-8"));
+      const packageJson = JSON.parse(fs6.readFileSync(packageJsonPath, "utf-8"));
       const pm = packageJson.packageManager;
       if (pm) {
         if (pm.startsWith("pnpm")) return "pnpm";
@@ -709,15 +802,15 @@ function detectPackageManager(cwd) {
   return "npm";
 }
 function getInstalledDependencies(cwd) {
-  const packageJsonPath = path5.join(cwd, "package.json");
-  if (!fs5.existsSync(packageJsonPath)) {
+  const packageJsonPath = path6.join(cwd, "package.json");
+  if (!fs6.existsSync(packageJsonPath)) {
     return {
       dependencies: {},
       devDependencies: {}
     };
   }
   try {
-    const content = fs5.readFileSync(packageJsonPath, "utf-8");
+    const content = fs6.readFileSync(packageJsonPath, "utf-8");
     const packageJson = JSON.parse(content);
     return {
       dependencies: packageJson.dependencies || {},
@@ -1040,16 +1133,16 @@ async function askConfirmation(question, defaultValue) {
     output: process.stdout
   });
   const hint = defaultValue ? "Y/n" : "y/N";
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     rl.question(pc2.cyan("? ") + question + pc2.dim(` (${hint}) `), (answer) => {
       rl.close();
       const normalized = answer.trim().toLowerCase();
       if (normalized === "") {
-        resolve3(defaultValue);
+        resolve4(defaultValue);
       } else if (normalized === "y" || normalized === "yes") {
-        resolve3(true);
+        resolve4(true);
       } else {
-        resolve3(false);
+        resolve4(false);
       }
     });
   });
@@ -1059,6 +1152,7 @@ async function askConfirmation(question, defaultValue) {
 program.name("cloudwerk").description("Cloudwerk CLI - Build and deploy full-stack apps to Cloudflare").version(VERSION);
 program.command("dev [path]").description("Start development server").option("-p, --port <number>", "Port to listen on", String(DEFAULT_PORT)).option("-H, --host <host>", "Host to bind", DEFAULT_HOST).option("-c, --config <path>", "Path to config file").option("--verbose", "Enable verbose logging").action(dev);
 program.command("build [path]").description("Build project for production deployment to Cloudflare Workers").option("-o, --output <dir>", "Output directory", "./dist").option("--ssg", "Generate static pages for routes with rendering: static").option("--minify", "Minify bundles (default: true)").option("--no-minify", "Disable minification").option("--sourcemap", "Generate source maps").option("-c, --config <path>", "Path to config file").option("--verbose", "Enable verbose logging").action(build);
+program.command("deploy [path]").description("Deploy to Cloudflare Workers").option("-e, --env <environment>", "Environment to deploy to").option("--dry-run", "Preview deployment without executing").option("--skip-build", "Skip the build step").option("-c, --config <path>", "Path to config file").option("--verbose", "Enable verbose logging").action(deploy);
 var configCmd = program.command("config").description("Manage Cloudwerk configuration");
 configCmd.command("get <key>").description("Get a configuration value").action(configGet);
 configCmd.command("set <key> <value>").description("Set a configuration value").action(configSet);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudwerk/cli",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Dev server, build, deploy commands for Cloudwerk",
   "repository": {
     "type": "git",
@@ -28,9 +28,9 @@
     "esbuild": "^0.25.0",
     "picocolors": "^1.1.0",
     "vite": "^6.0.0",
-    "@cloudwerk/core": "^0.8.0",
-    "@cloudwerk/ui": "^0.8.0",
-    "@cloudwerk/vite-plugin": "^0.2.0"
+    "@cloudwerk/ui": "^0.9.0",
+    "@cloudwerk/vite-plugin": "^0.4.0",
+    "@cloudwerk/core": "^0.9.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",