webnek 0.1.0 → 0.1.1

package/README.md

@@ -1,44 +1,23 @@
 # webnek
 
-Installer for the Rust web framework. Run it with `bunx` / `npx` — it is **not** a dependency of your app.
-
-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/`).
-
-## Create an app
-
 ```bash
 bunx webnek my-app
-# or
-npx webnek my-app
-```
-
-```
-my-app/
-  Cargo.toml      # only manifest (Rust crates + [package.metadata.npm])
-  Cargo.lock
-  public/
-  src/
+cd my-app
+bunx webnek dev
 ```
 
-Then:
+That last command installs the Rust CLI the first time, then starts the app.
 
-```bash
-cd my-app
-cargo webnek dev
-cargo webnek add canvas-confetti --npm
-vercel
-```
+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/`).
 
-Do not `bun add webnek` inside the app. That is the two-ecosystem split this installer exists to avoid.
+Do not `bun add webnek` inside the app.
 
 ## Commands
 
 | Command | What it does |
 |---|---|
-| `webnek [dir]` / `webnek new [dir]` | Scaffold a project |
-| `webnek init` | Scaffold into the current directory |
-| `webnek dev` | `cargo webnek dev` |
-| `webnek build` | `cargo webnek build` |
-| `webnek add <pkg>` | `cargo webnek add` |
+| `bunx webnek [dir]` | Scaffold a project |
+| `bunx webnek dev` | Start the app |
+| `bunx webnek add <pkg>` | Add a crate or npm package |
 
-Requires [Rust](https://rustup.rs/). `cargo webnek` is the `cargo-webnek` binary (`cargo install --path crates/cli` from this repo).
+Requires [Rust](https://rustup.rs/).

package/bin/cli.mjs

@@ -15,6 +15,7 @@ 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 args = process.argv.slice(2);
 const cmd = args[0];
@@ -39,16 +40,16 @@ const IGNORE_WHEN_EMPTY = new Set([
 ]);
 
 function help() {
+  const run = invokeCmd();
   console.log(`
-  webnek  0.1.0
-
-  webnek [dir]             Scaffold a new app
-  webnek new [dir]         Same as above
-  webnek init              Scaffold into the current directory
-  webnek dev [...args]     cargo webnek dev
-  webnek build [...args]   cargo webnek build
-  webnek add [...args]     cargo webnek add
-  webnek export [...args]  cargo webnek export
+  webnek  0.1.1
+
+  ${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
 `);
 }
 
@@ -88,7 +89,7 @@ function frameworkDep(appDir) {
     rel = rel.replaceAll("\\", "/");
     return `webnek = { path = "${rel}", features = ["ssr"] }`;
   }
-  return `webnek = { version = "0.1.0", features = ["ssr"] }`;
+  return `webnek = { git = "${GIT}", features = ["ssr"] }`;
 }
 
 function isEffectivelyEmpty(dir) {
@@ -159,22 +160,19 @@ function scaffold(targetArg) {
     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) || ".";
-  console.log(`
-  webnek  created  ${rel}
-
-  src/          source (Rust, TS islands, styles.css)
-  public/       static files you add
-  target/web/   generated CSS/JS (gitignored)
-
-  Next:
-    cd ${rel === "." ? "." : rel}
-    cargo webnek dev
-`);
+  const run = invokeCmd();
+  const lines = [`  webnek  created  ${rel}`, ``, `  Next:`];
+  if (rel !== ".") {
+    lines.push(`    cd ${rel}`);
+  }
+  lines.push(`    ${run} dev`);
+  console.log(`\n${lines.join("\n")}\n`);
 }
 
 function which(bin) {
@@ -182,36 +180,68 @@ function which(bin) {
   return r.status === 0 ? r.stdout.trim() : "";
 }
 
-function ensureCargoWeb() {
+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";
+  }
+  if (ua.includes("npx") || argv1.includes("npx") || argv1.includes("/npm/")) {
+    return "npx webnek";
+  }
+  if (which("webnek")) return "webnek";
+  return "bunx webnek";
+}
+
+function cargoWebnekOk() {
   const probe = spawnSync("cargo", ["webnek", "--help"], {
     encoding: "utf8",
     stdio: "pipe",
   });
-  if (probe.status === 0) return "cargo";
-
-  if (which("cargo-webnek")) {
-    return "cargo-webnek";
-  }
+  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 from local crates/cli …");
+    console.log("  webnek  installing cargo-webnek …");
     const ins = spawnSync(
       "cargo",
       ["install", "--path", join(root, "crates/cli"), "--force"],
       { stdio: "inherit" }
     );
-    if (ins.status === 0) return "cargo";
+    return ins.status === 0;
   }
+  console.log("  webnek  installing cargo-webnek (once, from git) …");
+  const ins = spawnSync(
+    "cargo",
+    ["install", "--git", GIT, "webnek-cli"],
+    { stdio: "inherit" }
+  );
+  return ins.status === 0;
+}
 
-  console.error(`
-  ✖ cargo-webnek is not installed.
+function ensureCargoWeb() {
+  if (cargoWebnekOk()) return;
 
-    cargo install cargo-webnek
-    # or, from this repo:
-    cargo install --path crates/cli
+  if (!which("cargo")) {
+    console.error(`
+  ✖ cargo is not installed. Install Rust first:
+
+    https://rustup.rs/
 `);
-  process.exit(1);
+    process.exit(1);
+  }
+
+  if (!installCargoWebnek()) {
+    console.error(`
+  ✖ could not install cargo-webnek.
+
+    cargo install --git ${GIT} webnek-cli
+`);
+    process.exit(1);
+  }
 }
 
 function proxyCargoWeb(forward) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webnek",
-  "version": "0.1.0",
-  "description": "Next-gen fullstack Rust web framework with React ergonomics. Scaffold with bunx webnek, then cargo webnek dev.",
+  "version": "0.1.1",
+  "description": "Webnek app installer. bunx webnek my-app && bunx webnek dev",
   "type": "module",
   "license": "MIT OR Apache-2.0",
   "author": "Grenish Rai <mrcoder2033d@gmail.com>",

package/template/README.md

@@ -1,19 +1,15 @@
 # {{PROJECT_NAME}}
 
-Fullstack Rust with React ergonomics.
-
 ```bash
-cargo webnek dev
+{{START_CMD}} dev
 ```
 
 - Edit `src/styles.css` (Tailwind v4). Compiled CSS goes to `target/web/`.
 - `public/` is for files you add (favicon, images).
-- JS packages: `cargo webnek add <pkg> --npm` (global cache, no local node_modules).
+- JS packages: `{{START_CMD}} add <pkg> --npm`
 
-## Deploy to Vercel
+## Deploy
 
 ```bash
 vercel
 ```
-
-Same app, no `package.json`. Vercel compiles `api/index.rs`. CSS and client JS are built during that compile.