webnek 0.1.2 → 0.1.3

package/README.md

@@ -1,23 +1,15 @@
 # webnek
 
 ```bash
-bunx webnek@latest my-app
+bun create webnek@latest my-app
 cd my-app
-bunx webnek@latest dev
+cargo dev
 ```
 
-That last command installs the Rust CLI the first time, then starts the app.
+Create compiles the app (first time on a machine can take a minute). After that `cargo dev` starts the server.
 
-Generated apps have **no** `package.json`, **no** lockfile, **no** `node_modules`. `Cargo.toml` is the only manifest (`[package.metadata.npm]` for JS packages, cached in `~/.cargo/webnek/cache/`).
+Same create command: `npm create webnek@latest my-app` or `pnpm create webnek@latest my-app`.
 
-Do not `bun add webnek` inside the app.
-
-## Commands
-
-| Command | What it does |
-|---|---|
-| `bunx webnek@latest [dir]` | Scaffold a project |
-| `bunx webnek@latest dev` | Start the app |
-| `bunx webnek@latest add <pkg>` | Add a crate or npm package |
+Generated apps have no `package.json` and no `node_modules`. `cargo build` and `cargo test` work as usual.
 
 Requires [Rust](https://rustup.rs/).

package/bin/cli.mjs

@@ -15,7 +15,6 @@ import { fileURLToPath } from "node:url";
 const here = dirname(fileURLToPath(import.meta.url));
 const pkgRoot = resolve(here, "..");
 const templateRoot = join(pkgRoot, "template");
-const GIT = "https://github.com/Grenish/webnek";
 const VERSION = JSON.parse(readFileSync(join(pkgRoot, "package.json"), "utf8")).version;
 
 const args = process.argv.slice(2);
@@ -41,16 +40,15 @@ const IGNORE_WHEN_EMPTY = new Set([
 ]);
 
 function help() {
-  const run = invokeCmd();
   console.log(`
   webnek  ${VERSION}
 
-  ${run} [dir]             Scaffold a new app
-  ${run} new [dir]         Same as above
-  ${run} init              Scaffold into the current directory
-  ${run} dev               Start the app
-  ${run} build             Production build
-  ${run} add <pkg>         Add a crate or npm package
+  bun create webnek@latest [dir]
+  npm create webnek@latest [dir]
+  pnpm create webnek@latest [dir]
+
+  Then:
+    cargo dev
 `);
 }
 
@@ -86,7 +84,6 @@ function frameworkDep(appDir) {
     const fw = resolve(root, "crates/framework");
     let rel = relative(appDir, fw);
     if (!rel.startsWith(".") && !rel.startsWith("/")) rel = `./${rel}`;
-    // Cargo.toml paths work with forward slashes on all platforms.
     rel = rel.replaceAll("\\", "/");
     return `webnek = { path = "${rel}", features = ["ssr"] }`;
   }
@@ -138,10 +135,35 @@ function stripNodeManifests(appDir) {
   if (existsSync(nm)) rmSync(nm, { recursive: true, force: true });
 }
 
+function which(bin) {
+  const r = spawnSync("sh", ["-c", `command -v ${bin}`], { encoding: "utf8" });
+  return r.status === 0 ? r.stdout.trim() : "";
+}
+
+function cargoBuild(appDir) {
+  if (!which("cargo")) {
+    console.error(`
+  ✖ cargo is not installed. Install Rust first:
+
+    https://rustup.rs/
+`);
+    return false;
+  }
+  console.log("  webnek  compiling (first time on this computer can take a minute) …\n");
+  const r = spawnSync("cargo", ["build"], {
+    cwd: appDir,
+    stdio: "inherit",
+    env: { ...process.env, CARGO_TERM_COLOR: process.env.CARGO_TERM_COLOR || "always" },
+  });
+  return r.status === 0;
+}
+
 function scaffold(targetArg) {
   const appDir = resolve(process.cwd(), targetArg || ".");
   const pkgName = rustPackageName(
-    appDir === process.cwd() ? (process.cwd().split(/[/\\]/).pop() || "app") : targetArg.replace(/\/+$/, "").split(/[/\\]/).pop()
+    appDir === process.cwd()
+      ? process.cwd().split(/[/\\]/).pop() || "app"
+      : targetArg.replace(/\/+$/, "").split(/[/\\]/).pop()
   );
 
   if (existsSync(join(appDir, "Cargo.toml"))) {
@@ -157,101 +179,32 @@ function scaffold(targetArg) {
 
   mkdirSync(appDir, { recursive: true });
   stripNodeManifests(appDir);
-  const vars = {
+  copyTemplate(templateRoot, appDir, {
     PACKAGE_NAME: pkgName,
     FRAMEWORK_DEP: frameworkDep(appDir),
     PROJECT_NAME: pkgName,
-    START_CMD: invokeCmd(),
-  };
-  copyTemplate(templateRoot, appDir, vars);
+  });
   stripNodeManifests(appDir);
 
   const rel = relative(process.cwd(), appDir) || ".";
-  const run = invokeCmd();
-  const lines = [`  webnek  ${VERSION}  created  ${rel}`, ``, `  Next:`];
-  if (rel !== ".") {
-    lines.push(`    cd ${rel}`);
-  }
-  lines.push(`    ${run} dev`);
-  console.log(`\n${lines.join("\n")}\n`);
-}
+  const built = cargoBuild(appDir);
 
-function which(bin) {
-  const r = spawnSync("sh", ["-c", `command -v ${bin}`], { encoding: "utf8" });
-  return r.status === 0 ? r.stdout.trim() : "";
-}
-
-function invokeCmd() {
-  const ua = process.env.npm_config_user_agent || "";
-  const argv0 = process.argv[0] || "";
-  const argv1 = process.argv[1] || "";
-  if (ua.includes("bun") || argv0.includes("bun") || argv1.includes("bun")) {
-    return "bunx webnek@latest";
-  }
-  if (ua.includes("npx") || argv1.includes("npx") || argv1.includes("/npm/")) {
-    return "npx webnek@latest";
+  const lines = [`  webnek  ${VERSION}  ${built ? "ready" : "created"}  ${rel}`, ``, `  Next:`];
+  if (rel !== ".") lines.push(`    cd ${rel}`);
+  lines.push(`    cargo dev`);
+  if (!built) {
+    lines.push(``, `  cargo build failed. Fix that, then cargo dev.`);
   }
-  if (which("webnek")) return "webnek";
-  return "bunx webnek@latest";
-}
-
-function cargoWebnekOk() {
-  const probe = spawnSync("cargo", ["webnek", "--help"], {
-    encoding: "utf8",
-    stdio: "pipe",
-  });
-  return probe.status === 0 || Boolean(which("cargo-webnek"));
-}
-
-function installCargoWebnek() {
-  const root = findFrameworkRoot();
-  if (root && existsSync(join(root, "crates/cli/Cargo.toml"))) {
-    console.log("  webnek  installing cargo-webnek …");
-    const ins = spawnSync(
-      "cargo",
-      ["install", "--path", join(root, "crates/cli"), "--force"],
-      { stdio: "inherit" }
-    );
-    return ins.status === 0;
-  }
-  console.log("  webnek  installing cargo-webnek (once) …");
-  const ins = spawnSync(
-    "cargo",
-    ["install", "webnek-cli"],
-    { stdio: "inherit" }
-  );
-  return ins.status === 0;
+  console.log(`\n${lines.join("\n")}\n`);
 }
 
-function ensureCargoWeb() {
-  if (cargoWebnekOk()) return;
-
+function cargo(args) {
   if (!which("cargo")) {
-    console.error(`
-  ✖ cargo is not installed. Install Rust first:
-
-    https://rustup.rs/
-`);
+    console.error("  ✖ cargo is not installed. https://rustup.rs/");
     process.exit(1);
   }
-
-  if (!installCargoWebnek()) {
-    console.error(`
-  ✖ could not install cargo-webnek.
-
-    cargo install webnek-cli
-`);
-    process.exit(1);
-  }
-}
-
-function proxyCargoWeb(forward) {
-  ensureCargoWeb();
-  const result = spawnSync("cargo", ["webnek", ...forward], {
-    stdio: "inherit",
-    cwd: process.cwd(),
-  });
-  process.exit(result.status ?? 1);
+  const r = spawnSync("cargo", args, { stdio: "inherit", cwd: process.cwd() });
+  process.exit(r.status ?? 1);
 }
 
 const createInvoked =
@@ -269,12 +222,15 @@ if (args.length === 0 && createInvoked) {
   help();
 } else if (cmd === "new" || cmd === "create" || cmd === "init") {
   scaffold(cmd === "init" ? args[1] || "." : args[1] || ".");
-} else if (["dev", "build", "add", "export"].includes(cmd)) {
-  proxyCargoWeb(args);
+} else if (cmd === "dev") {
+  cargo(["run", ...args.slice(1)]);
+} else if (cmd === "build") {
+  cargo(["build", "--release", ...args.slice(1)]);
+} else if (cmd === "test") {
+  cargo(["test", ...args.slice(1)]);
 } else if (cmd.startsWith("-")) {
   help();
   process.exit(1);
 } else {
-  // `webnek my-app`
   scaffold(cmd);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webnek",
-  "version": "0.1.2",
-  "description": "Webnek app installer. bunx webnek@latest my-app && bunx webnek@latest dev",
+  "version": "0.1.3",
+  "description": "Create a Webnek app. bun create webnek@latest my-app && cargo dev",
   "type": "module",
   "license": "MIT OR Apache-2.0",
   "author": "Grenish Rai <mrcoder2033d@gmail.com>",
@@ -22,6 +22,9 @@
     "framework",
     "create-webnek"
   ],
+  "exports": {
+    "./bin/cli.mjs": "./bin/cli.mjs"
+  },
   "engines": {
     "node": ">=18"
   },

package/template/.cargo/config.toml

@@ -0,0 +1,2 @@
+[alias]
+dev = "run"

package/template/Cargo.toml

@@ -2,6 +2,7 @@
 name = "{{PACKAGE_NAME}}"
 version = "0.1.0"
 edition = "2021"
+default-run = "{{PACKAGE_NAME}}"
 
 [workspace]
 
@@ -15,4 +16,4 @@ path = "api/index.rs"
 
 [package.metadata.npm]
 # Frontend NPM packages installed to ~/.cargo/webnek/cache/
-# Add new packages with: cargo webnek add <package> --npm
+# JS packages: bunx <pkg> is not required. Add crates with cargo add.

package/template/README.md

@@ -1,12 +1,12 @@
 # {{PROJECT_NAME}}
 
 ```bash
-{{START_CMD}} dev
+cargo dev
 ```
 
-- Edit `src/styles.css` (Tailwind v4). Compiled CSS goes to `target/web/`.
+- Edit `src/styles.css` (Tailwind v4).
 - `public/` is for files you add (favicon, images).
-- JS packages: `{{START_CMD}} add <pkg> --npm`
+- `cargo build`, `cargo test`, and `cargo run` work as usual.
 
 ## Deploy
 

package/template/build.rs

@@ -1,7 +1,4 @@
-//! Compile CSS and client JS into OUT_DIR so the Vercel function can embed them.
-//!
-//! Local `cargo webnek dev` still serves from `target/web/` (hot reload).
-//! On Vercel, `npx` compiles Tailwind and esbuild.
+//! Compile CSS and client JS into OUT_DIR on every `cargo build`.
 
 use std::env;
 use std::fs;
@@ -18,88 +15,68 @@ fn main() {
 }
 
 fn write_css(dest: &Path) {
-    if copy_generated("styles.css", dest) {
-        return;
-    }
-    if on_vercel() && npx_ok(&[
-        "--yes",
-        "@tailwindcss/cli@4.3.3",
-        "-i",
-        "src/styles.css",
-        "-o",
-        dest.to_str().unwrap_or("styles.css"),
-        "--minify",
-    ]) {
+    let out = dest.to_str().unwrap_or("styles.css");
+    if run(
+        "bunx",
+        &[
+            "@tailwindcss/cli@4.3.3",
+            "-i",
+            "src/styles.css",
+            "-o",
+            out,
+            "--minify",
+        ],
+    ) || run(
+        "npx",
+        &[
+            "--yes",
+            "@tailwindcss/cli@4.3.3",
+            "-i",
+            "src/styles.css",
+            "-o",
+            out,
+            "--minify",
+        ],
+    ) {
         return;
     }
-    let fallback = fs::read_to_string("src/styles.css").unwrap_or_else(|_| {
-        "/* styles.css missing — run cargo webnek dev */\n".to_string()
-    });
+    let fallback = fs::read_to_string("src/styles.css")
+        .unwrap_or_else(|_| "/* styles.css: install bun or npx to compile Tailwind */\n".into());
     let _ = fs::write(dest, fallback);
 }
 
 fn write_js(dest: &Path) {
-    if copy_generated("pkg/client.js", dest) {
-        return;
-    }
-    if on_vercel()
-        && npx_ok(&[
-            "--yes",
+    let out = dest.to_str().unwrap_or("client.js");
+    if run(
+        "bunx",
+        &[
             "esbuild",
             "src/client/index.ts",
             "--bundle",
             "--format=esm",
             "--outfile",
-            dest.to_str().unwrap_or("client.js"),
-        ])
-    {
-        return;
-    }
-    if on_vercel()
-        && npx_ok(&[
+            out,
+        ],
+    ) || run(
+        "npx",
+        &[
             "--yes",
             "esbuild",
             "src/client/index.ts",
+            "--bundle",
             "--format=esm",
             "--outfile",
-            dest.to_str().unwrap_or("client.js"),
-        ])
-    {
+            out,
+        ],
+    ) {
         return;
     }
-    let fallback = fs::read_to_string("src/client/index.ts")
-        .unwrap_or_else(|_| "// client\n".to_string());
+    let fallback = fs::read_to_string("src/client/index.ts").unwrap_or_else(|_| "// client\n".into());
     let _ = fs::write(dest, fallback);
 }
 
-fn copy_generated(relative: &str, dest: &Path) -> bool {
-    let pkg = match env::var("CARGO_PKG_NAME") {
-        Ok(p) => p,
-        Err(_) => return false,
-    };
-    let manifest = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| ".".into()));
-    let mut candidates = Vec::new();
-    if let Ok(td) = env::var("CARGO_TARGET_DIR") {
-        candidates.push(PathBuf::from(td).join("web").join(&pkg).join(relative));
-    }
-    candidates.push(manifest.join("target/web").join(&pkg).join(relative));
-    if let Some(parent) = manifest.parent() {
-        candidates.push(parent.join("target/web").join(&pkg).join(relative));
-    }
-    for src in candidates {
-        if src.is_file() && fs::copy(&src, dest).is_ok() {
-            return true;
-        }
-    }
-    false
-}
-
-fn on_vercel() -> bool {
-    env::var_os("VERCEL").is_some()
-}
-
-fn npx_ok(args: &[&str]) -> bool {
-    Command::new("npx")
+fn run(bin: &str, args: &[&str]) -> bool {
+    Command::new(bin)
         .args(args)
         .status()
         .map(|s| s.success())