webnek 0.1.2 → 0.1.4

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"] }`;
   }
@@ -104,7 +101,8 @@ function copyTemplate(from, to, vars) {
   for (const name of readdirSync(from)) {
     if (name === ".gitkeep" && existsSync(join(to, name))) continue;
     const src = join(from, name);
-    const destName = name.endsWith(".tmpl") ? name.slice(0, -5) : name;
+    let destName = name.endsWith(".tmpl") ? name.slice(0, -5) : name;
+    if (name === "gitignore") destName = ".gitignore";
     const dest = join(to, destName);
     if (statSync(src).isDirectory()) {
       copyTemplate(src, dest, vars);
@@ -138,10 +136,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 +180,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 +223,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.4",
+  "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,107 +1,161 @@
-//! 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`.
+//! Tailwind lives in ~/.cargo/webnek/cache (no project node_modules).
 
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
-use std::process::Command;
+use std::process::{Command, Stdio};
+
+const TW: &str = "4.3.3";
 
 fn main() {
     println!("cargo:rerun-if-changed=src/styles.css");
+    println!("cargo:rerun-if-changed=src/client/index.js");
     println!("cargo:rerun-if-changed=src/client/index.ts");
 
+    let manifest = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| ".".into()));
     let out = PathBuf::from(env::var("OUT_DIR").unwrap());
-    write_css(&out.join("styles.css"));
-    write_js(&out.join("client.js"));
+    write_css(&manifest, &out.join("styles.css"));
+    write_js(&manifest, &out.join("client.js"));
 }
 
-fn write_css(dest: &Path) {
-    if copy_generated("styles.css", dest) {
-        return;
+fn cache_dir() -> PathBuf {
+    if let Ok(h) = env::var("CARGO_HOME") {
+        PathBuf::from(h).join("webnek").join("cache")
+    } else if let Ok(h) = env::var("HOME") {
+        PathBuf::from(h).join(".cargo").join("webnek").join("cache")
+    } else {
+        PathBuf::from(".webnek-cache")
+    }
+}
+
+fn ensure_tailwind(cache: &Path) -> bool {
+    let _ = fs::create_dir_all(cache);
+    let pkg = cache.join("package.json");
+    if !pkg.exists() {
+        let _ = fs::write(&pkg, "{\"name\":\"webnek-cache\",\"private\":true}");
     }
-    if on_vercel() && npx_ok(&[
-        "--yes",
-        "@tailwindcss/cli@4.3.3",
+    let cli = cache.join("node_modules/@tailwindcss/cli/dist/index.mjs");
+    let tw = cache.join("node_modules/tailwindcss");
+    if cli.exists() && tw.exists() {
+        return true;
+    }
+    let spec_tw = format!("tailwindcss@{TW}");
+    let spec_cli = format!("@tailwindcss/cli@{TW}");
+    run(
+        cache,
+        "bun",
+        &["add", &spec_tw, &spec_cli],
+        None,
+    ) || run(
+        cache,
+        "npm",
+        &["install", &spec_tw, &spec_cli],
+        None,
+    )
+}
+
+fn link_node_modules(manifest: &Path, cache: &Path) -> bool {
+    let dest = manifest.join("node_modules");
+    let src = cache.join("node_modules");
+    if dest.exists() || !src.exists() {
+        return dest.exists();
+    }
+    #[cfg(unix)]
+    {
+        std::os::unix::fs::symlink(&src, &dest).is_ok()
+    }
+    #[cfg(not(unix))]
+    {
+        std::os::windows::fs::symlink_dir(&src, &dest).is_ok()
+    }
+}
+
+fn write_css(manifest: &Path, dest: &Path) {
+    let cache = cache_dir();
+    if !ensure_tailwind(&cache) {
+        fail();
+    }
+    let _ = link_node_modules(manifest, &cache);
+    let entry = cache.join("node_modules/@tailwindcss/cli/dist/index.mjs");
+    let node_modules = cache.join("node_modules");
+    let out = dest.to_string_lossy().into_owned();
+    let args = [
+        entry.to_str().unwrap_or(""),
         "-i",
         "src/styles.css",
         "-o",
-        dest.to_str().unwrap_or("styles.css"),
+        &out,
         "--minify",
-    ]) {
+    ];
+    let ok = run(manifest, "bun", &args, Some(&node_modules))
+        || run(manifest, "node", &args, Some(&node_modules));
+
+    let css = fs::read_to_string(dest).unwrap_or_default();
+    if ok && compiled(&css) {
         return;
     }
-    let fallback = fs::read_to_string("src/styles.css").unwrap_or_else(|_| {
-        "/* styles.css missing — run cargo webnek dev */\n".to_string()
-    });
-    let _ = fs::write(dest, fallback);
+    fail();
 }
 
-fn write_js(dest: &Path) {
-    if copy_generated("pkg/client.js", dest) {
+fn write_js(manifest: &Path, dest: &Path) {
+    let js = manifest.join("src/client/index.js");
+    if js.exists() && fs::copy(&js, dest).is_ok() {
         return;
     }
-    if on_vercel()
-        && npx_ok(&[
-            "--yes",
+    let out = dest.to_string_lossy().into_owned();
+    if run(
+        manifest,
+        "bunx",
+        &[
             "esbuild",
             "src/client/index.ts",
             "--bundle",
             "--format=esm",
             "--outfile",
-            dest.to_str().unwrap_or("client.js"),
-        ])
-    {
-        return;
-    }
-    if on_vercel()
-        && npx_ok(&[
+            &out,
+        ],
+        None,
+    ) || run(
+        manifest,
+        "npx",
+        &[
             "--yes",
             "esbuild",
             "src/client/index.ts",
+            "--bundle",
             "--format=esm",
             "--outfile",
-            dest.to_str().unwrap_or("client.js"),
-        ])
-    {
+            &out,
+        ],
+        None,
+    ) {
         return;
     }
-    let fallback = fs::read_to_string("src/client/index.ts")
-        .unwrap_or_else(|_| "// client\n".to_string());
-    let _ = fs::write(dest, fallback);
+    let _ = fs::write(dest, "// client\n");
 }
 
-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 compiled(css: &str) -> bool {
+    let t = css.trim_start();
+    !t.is_empty()
+        && !t.starts_with("@import \"tailwindcss\"")
+        && !t.starts_with("@import 'tailwindcss'")
 }
 
-fn on_vercel() -> bool {
-    env::var_os("VERCEL").is_some()
+fn run(dir: &Path, bin: &str, args: &[&str], node_path: Option<&Path>) -> bool {
+    let mut cmd = Command::new(bin);
+    cmd.args(args)
+        .current_dir(dir)
+        .stdin(Stdio::null());
+    if let Some(p) = node_path {
+        cmd.env("NODE_PATH", p);
+    }
+    cmd.status().map(|s| s.success()).unwrap_or(false)
 }
 
-fn npx_ok(args: &[&str]) -> bool {
-    Command::new("npx")
-        .args(args)
-        .status()
-        .map(|s| s.success())
-        .unwrap_or(false)
+fn fail() -> ! {
+    panic!(
+        "webnek: could not compile src/styles.css.\n\
+         Install bun or npm, then run `cargo build` again."
+    );
 }

package/template/gitignore

@@ -0,0 +1,8 @@
+/target
+/node_modules
+/.vercel
+.env
+.env.*
+!.env.example
+.DS_Store
+*.rs.bk

package/template/src/client/{index.ts → index.js}

@@ -1,7 +1,7 @@
-console.log("⚡ [webnek] Client island initialized");
-
 document.addEventListener("click", (e) => {
-  const target = (e.target as HTMLElement).closest("[data-action]");
+  const el = e.target;
+  if (!(el instanceof Element)) return;
+  const target = el.closest("[data-action]");
   if (!target) return;
 
   const action = target.getAttribute("data-action");
@@ -14,6 +14,6 @@ document.addEventListener("click", (e) => {
   if (action === "dec") val -= 1;
   if (action === "reset") val = 0;
 
-  counterEl.textContent = val.toString();
-  if (doubleEl) doubleEl.textContent = (val * 2).toString();
+  counterEl.textContent = String(val);
+  if (doubleEl) doubleEl.textContent = String(val * 2);
 });

package/template/src/routes/page.rs

@@ -44,14 +44,14 @@ pub fn home_page() -> View {
                         <div className="flex gap-2 pb-1">
                             <button
                                 data-action="dec"
-                                className="w-10 h-10 border border-line bg-paper text-ink text-lg leading-none hover:bg-white transition-colors"
+                                className="w-10 h-10 border border-line bg-paper text-ink text-lg leading-none cursor-pointer hover:bg-white transition-colors"
                                 onClick={move || set_count.update(|c| *c -= 1)}
                             >
                                 "−"
                             </button>
                             <button
                                 data-action="inc"
-                                className="w-10 h-10 bg-ink text-paper text-lg leading-none hover:bg-patina transition-colors"
+                                className="w-10 h-10 bg-ink text-paper text-lg leading-none cursor-pointer hover:bg-patina transition-colors"
                                 onClick={move || set_count.update(|c| *c += 1)}
                             >
                                 "+"