webnek 0.1.3 → 0.1.4

package/bin/cli.mjs

@@ -101,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webnek",
-  "version": "0.1.3",
+  "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",

package/template/build.rs

@@ -1,53 +1,111 @@
 //! 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) {
-    let out = dest.to_str().unwrap_or("styles.css");
-    if run(
-        "bunx",
-        &[
-            "@tailwindcss/cli@4.3.3",
-            "-i",
-            "src/styles.css",
-            "-o",
-            out,
-            "--minify",
-        ],
+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}");
+    }
+    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(
-        "npx",
-        &[
-            "--yes",
-            "@tailwindcss/cli@4.3.3",
-            "-i",
-            "src/styles.css",
-            "-o",
-            out,
-            "--minify",
-        ],
-    ) {
+        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",
+        &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: install bun or npx to compile Tailwind */\n".into());
-    let _ = fs::write(dest, fallback);
+    fail();
 }
 
-fn write_js(dest: &Path) {
-    let out = dest.to_str().unwrap_or("client.js");
+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;
+    }
+    let out = dest.to_string_lossy().into_owned();
     if run(
+        manifest,
         "bunx",
         &[
             "esbuild",
@@ -55,9 +113,11 @@ fn write_js(dest: &Path) {
             "--bundle",
             "--format=esm",
             "--outfile",
-            out,
+            &out,
         ],
+        None,
     ) || run(
+        manifest,
         "npx",
         &[
             "--yes",
@@ -66,19 +126,36 @@ fn write_js(dest: &Path) {
             "--bundle",
             "--format=esm",
             "--outfile",
-            out,
+            &out,
         ],
+        None,
     ) {
         return;
     }
-    let fallback = fs::read_to_string("src/client/index.ts").unwrap_or_else(|_| "// client\n".into());
-    let _ = fs::write(dest, fallback);
+    let _ = fs::write(dest, "// client\n");
+}
+
+fn compiled(css: &str) -> bool {
+    let t = css.trim_start();
+    !t.is_empty()
+        && !t.starts_with("@import \"tailwindcss\"")
+        && !t.starts_with("@import 'tailwindcss'")
+}
+
+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 run(bin: &str, args: &[&str]) -> bool {
-    Command::new(bin)
-        .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)}
                             >
                                 "+"