@evjs/cli 0.0.1-rc.18 → 0.0.1-rc.28

package/README.md

@@ -22,14 +22,10 @@ No configuration file is needed. `ev dev` and `ev build` work out of the box wit
 
 | Command | Description |
 |---------|-------------|
-| `ev init [name]` | Scaffold a new project from a template |
 | `ev dev` | Start dev server (client HMR + API watch) |
 | `ev build` | Production build (client + server) |
 
-### `ev init [name]`
-
-Templates: `basic-csr`, `basic-server-fns`, `configured-server-fns`, `complex-routing`, `with-tailwind`.
-Option: `-t, --template <template>` to skip interactive selection.
+> **Scaffolding:** Use `npx @evjs/create-app` to scaffold a new project.
 
 ### `ev dev`
 
@@ -59,7 +55,7 @@ export default defineConfig({
   },
   server: {
     endpoint: "/api/fn",
-    middleware: [],
+
     dev: { port: 3001 },
   },
 });
@@ -81,7 +77,7 @@ my-app/
     ├── api/               # server functions
     │   ├── users.server.ts
     │   └── posts.server.ts
-    └── middleware/         # server middleware (optional)
+
         └── auth.ts
 ```
 
@@ -90,7 +86,7 @@ my-app/
 1. **Don't create `webpack.config.cjs`** — use `ev.config.ts` instead
 2. **Don't install webpack manually** — it's a dependency of `@evjs/cli`
 3. **Config file must be `ev.config.ts`** — not `evjs.config.ts`
-4. **Import `defineConfig` from `@evjs/cli`** — not from `@evjs/runtime`
+4. **Import `defineConfig` from `@evjs/cli`** — not from `@evjs/server`
 
 ## Bundled Dependencies
 

package/dist/create-webpack-config.js

@@ -19,8 +19,8 @@ export function createWebpackConfig(config, cwd) {
     const isProduction = process.env.NODE_ENV === "production";
     const HtmlWebpackPlugin = esmRequire("html-webpack-plugin");
     const { EvWebpackPlugin } = esmRequire("@evjs/webpack-plugin");
-    const pluginOptions = server?.middleware?.length
-        ? { server: { middleware: server.middleware } }
+    const pluginOptions = server
+        ? { server: { entry: server.entry } }
         : undefined;
     // Resolve loader paths from evjs's dependency tree so they work
     // even when the user's project doesn't list them as direct deps.
@@ -93,6 +93,9 @@ export function createWebpackConfig(config, cwd) {
         plugins: [
             new HtmlWebpackPlugin({ template: html }),
             new EvWebpackPlugin(pluginOptions),
+            ...(!isProduction
+                ? [new (esmRequire("webpack").HotModuleReplacementPlugin)()]
+                : []),
         ],
         optimization: isProduction
             ? { splitChunks: { chunks: "all" } }

package/dist/index.js

@@ -6,7 +6,6 @@ import { configure, getConsoleSink, getLogger } from "@logtape/logtape";
 import { Command } from "commander";
 import { execa } from "execa";
 import fs from "fs-extra";
-import prompts from "prompts";
 import { CONFIG_DEFAULTS } from "./config.js";
 const esmRequire = createRequire(import.meta.url);
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -24,92 +23,6 @@ program
     .name("ev")
     .description("CLI for the evjs framework")
     .version(pkg.version);
-program
-    .command("init")
-    .description("Initialize a new evjs project")
-    .argument("[name]", "Project name")
-    .option("-t, --template <template>", "Template to use")
-    .action(async (name, options) => {
-    const response = await prompts([
-        {
-            type: name ? null : "text",
-            name: "projectName",
-            message: "Project name:",
-            initial: name || "my-evjs-app",
-        },
-        {
-            type: options.template ? null : "select",
-            name: "template",
-            message: "Select a template:",
-            choices: [
-                { title: "Basic CSR (Client-Side Rendering)", value: "basic-csr" },
-                { title: "Basic Server Functions", value: "basic-server-fns" },
-                {
-                    title: "Configured Server Functions (ev.config.ts + Query)",
-                    value: "configured-server-fns",
-                },
-                {
-                    title: "Complex Routing (params, search, layouts, loaders)",
-                    value: "complex-routing",
-                },
-                {
-                    title: "With Tailwind CSS (plugin loaders example)",
-                    value: "with-tailwind",
-                },
-            ],
-        },
-    ], {
-        onCancel: () => {
-            process.exit(1);
-        },
-    });
-    const projectName = response.projectName || name;
-    const template = response.template || options.template;
-    const targetDir = path.resolve(process.cwd(), projectName);
-    if (fs.existsSync(targetDir)) {
-        logger.error `Directory ${projectName} already exists!`;
-        process.exit(1);
-    }
-    const templateDir = path.resolve(__dirname, "../templates", template);
-    if (!fs.existsSync(templateDir)) {
-        logger.error `Template ${template} not found!`;
-        process.exit(1);
-    }
-    logger.info `Scaffolding project in ${targetDir}...`;
-    await fs.copy(templateDir, targetDir, {
-        dereference: true,
-        filter: (src) => {
-            const basename = path.basename(src);
-            return !["node_modules", "dist", ".turbo"].includes(basename);
-        },
-    });
-    // Post-process package.json: sync @evjs/* versions and set project name
-    const pkgPath = path.join(targetDir, "package.json");
-    if (fs.existsSync(pkgPath)) {
-        const pkg = await fs.readJson(pkgPath);
-        pkg.name = projectName;
-        delete pkg.private; // Templates shouldn't be private by default
-        const updateDeps = (deps) => {
-            if (!deps)
-                return;
-            for (const [name, val] of Object.entries(deps)) {
-                // Sync all @evjs/* packages to current CLI version
-                if (name.startsWith("@evjs/") &&
-                    (val === "*" ||
-                        (typeof val === "string" && val.includes("workspace")))) {
-                    deps[name] = `^${pkg.version}`;
-                }
-            }
-        };
-        updateDeps(pkg.dependencies);
-        updateDeps(pkg.devDependencies);
-        await fs.writeJson(pkgPath, pkg, { spaces: 2 });
-    }
-    logger.info `Done! Now run:`;
-    logger.info `  cd ${projectName}`;
-    logger.info `  npm install`;
-    logger.info `  npm run dev`;
-});
 /**
  * Load config and create webpack configuration object.
  *
@@ -149,8 +62,8 @@ program
             const bootstrapPath = path.resolve(cwd, "dist/server/_dev_start.cjs");
             if (fs.existsSync(manifestPath)) {
                 const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
-                // Only start API server if there are actual server functions
-                if (Object.keys(manifest.server?.fns ?? {}).length === 0)
+                // Start API server if there's a server entry
+                if (!manifest.server?.entry)
                     return;
                 apiStarted = true;
                 const backendConfig = evjsConfig?.server?.backend ?? "node";
@@ -158,10 +71,11 @@ program
                 logger.info `Server bundle detected, starting ${backend} API...`;
                 try {
                     const serverBundlePath = path.resolve(cwd, "dist/server", manifest.server.entry);
+                    fs.ensureDirSync(path.dirname(bootstrapPath));
                     fs.writeFileSync(bootstrapPath, [
                         `const bundle = require(${JSON.stringify(serverBundlePath)});`,
-                        `const app = bundle.createApp({ endpoint: ${JSON.stringify(evjsConfig?.server?.endpoint ?? CONFIG_DEFAULTS.endpoint)} });`,
-                        `const { serve } = require("@evjs/runtime/server/node");`,
+                        `const app = bundle.app || bundle.createApp({ endpoint: ${JSON.stringify(evjsConfig?.server?.endpoint ?? CONFIG_DEFAULTS.endpoint)} });`,
+                        `const { serve } = require("@evjs/server/node");`,
                         `serve(app, { port: ${serverPort} });`,
                     ].join("\n"));
                     // node gets --watch flags; other runtimes use their own args as-is

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evjs/cli",
-  "version": "0.0.1-rc.18",
+  "version": "0.0.1-rc.28",
   "description": "CLI and configuration layer for the evjs framework",
   "type": "module",
   "main": "./dist/config.js",
@@ -18,8 +18,7 @@
     "ev": "dist/index.js"
   },
   "files": [
-    "dist",
-    "templates"
+    "dist"
   ],
   "scripts": {
     "build": "tsc",
@@ -31,14 +30,13 @@
   "dependencies": {
     "@evjs/webpack-plugin": "*",
     "@logtape/logtape": "^2.0.4",
-    "@swc/core": "^1.15.18",
+    "@swc/core": "^1.15.21",
     "commander": "^12.1.0",
-    "execa": "^9.5.2",
-    "fs-extra": "^11.3.0",
+    "execa": "^9.6.1",
+    "fs-extra": "^11.3.4",
     "glob": "^13.0.6",
     "html-webpack-plugin": "^5.6.6",
     "picocolors": "^1.1.1",
-    "prompts": "^2.4.2",
     "swc-loader": "^0.2.7",
     "webpack": "^5.105.4",
     "webpack-cli": "^6.0.1",
@@ -46,9 +44,8 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.13.5",
-    "@types/prompts": "^2.4.9",
-    "typescript": "^5.7.3"
+    "@types/node": "^22.19.15",
+    "typescript": "^6.0.2"
   },
   "homepage": "https://github.com/evaijs/evjs#readme",
   "bugs": {

package/templates/basic-csr/README.md

@@ -1,23 +0,0 @@
-# basic-csr
-
-Minimal client-side rendering example — no server functions, just routing.
-
-## Run
-
-```bash
-npm run dev -w example-basic-csr
-```
-
-## Key Files
-
-| File | Purpose |
-|------|---------|
-| `src/main.tsx` | App bootstrap with `createApp` |
-| `src/pages/` | Route components (Home, Posts) |
-
-## What It Demonstrates
-
-- `createApp` + `createRoute` from `@evjs/runtime`
-- Client-side routing with TanStack Router
-- Dynamic route params (`$postId`)
-- No server functions — pure CSR

package/templates/basic-csr/index.html

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>ev — Basic CSR Example</title>
-  </head>
-  <body>
-    <div id="app"></div>
-  </body>
-</html>

package/templates/basic-csr/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "example-basic-csr",
-  "version": "0.0.1-rc.18",
-  "private": true,
-  "scripts": {
-    "dev": "ev dev",
-    "build": "ev build",
-    "check-types": "tsc --noEmit"
-  },
-  "dependencies": {
-    "@evjs/runtime": "*",
-    "react": "^19.2.4",
-    "react-dom": "^19.2.4"
-  },
-  "devDependencies": {
-    "@evjs/cli": "*",
-    "@types/react": "^19.0.8",
-    "@types/react-dom": "^19.0.3",
-    "typescript": "^5.7.3"
-  }
-}

package/templates/basic-csr/src/main.tsx

@@ -1,22 +0,0 @@
-import { createApp } from "@evjs/runtime/client";
-import { rootRoute } from "./pages/__root";
-import { aboutRoute } from "./pages/about";
-import { homeRoute } from "./pages/home";
-import { postDetailRoute, postsIndexRoute, postsRoute } from "./pages/posts";
-
-const routeTree = rootRoute.addChildren([
-  homeRoute,
-  aboutRoute,
-  postsRoute.addChildren([postsIndexRoute, postDetailRoute]),
-]);
-
-const app = createApp({ routeTree });
-
-// Register router type for full IDE type-safety on useParams, useSearch, Link, etc.
-declare module "@tanstack/react-router" {
-  interface Register {
-    router: typeof app.router;
-  }
-}
-
-app.render("#app");

package/templates/basic-csr/src/pages/__root.tsx

@@ -1,28 +0,0 @@
-import { createRootRoute, Link, Outlet } from "@evjs/runtime/client";
-
-function Root() {
-  return (
-    <div style={{ fontFamily: "system-ui, sans-serif", padding: "1rem" }}>
-      <nav
-        style={{
-          display: "flex",
-          gap: "1rem",
-          borderBottom: "1px solid #e5e7eb",
-          paddingBottom: "0.5rem",
-          marginBottom: "1rem",
-        }}
-      >
-        <Link to="/" style={{ fontWeight: "bold" }}>
-          Home
-        </Link>
-        <Link to="/about">About</Link>
-        <Link to="/posts">Posts</Link>
-      </nav>
-      <Outlet />
-    </div>
-  );
-}
-
-export const rootRoute = createRootRoute({
-  component: Root,
-});

package/templates/basic-csr/src/pages/about.tsx

@@ -1,19 +0,0 @@
-import { createRoute } from "@evjs/runtime/client";
-import { rootRoute } from "./__root";
-
-function About() {
-  return (
-    <div>
-      <h1>About</h1>
-      <p>
-        Code-based routing with TanStack Router via <code>createApp</code>.
-      </p>
-    </div>
-  );
-}
-
-export const aboutRoute = createRoute({
-  getParentRoute: () => rootRoute,
-  path: "/about",
-  component: About,
-});

package/templates/basic-csr/src/pages/home.tsx

@@ -1,19 +0,0 @@
-import { createRoute } from "@evjs/runtime/client";
-import { rootRoute } from "./__root";
-
-function Home() {
-  return (
-    <div>
-      <h1>Welcome Home!</h1>
-      <p>
-        A basic client-side rendered app built with <code>@evjs/runtime</code>.
-      </p>
-    </div>
-  );
-}
-
-export const homeRoute = createRoute({
-  getParentRoute: () => rootRoute,
-  path: "/",
-  component: Home,
-});

package/templates/basic-csr/src/pages/posts/index.tsx

@@ -1,63 +0,0 @@
-import { createRoute, Link, Outlet } from "@evjs/runtime/client";
-import { rootRoute } from "../__root";
-
-const posts = [
-  { id: "1", title: "First Post", body: "Hello world!" },
-  { id: "2", title: "Second Post", body: "Another day, another post." },
-  { id: "3", title: "Third Post", body: "Three's a charm." },
-];
-
-function Posts() {
-  return (
-    <div style={{ display: "flex", gap: "1rem" }}>
-      <ul style={{ listStyle: "none", padding: 0, minWidth: 160 }}>
-        {posts.map((p) => (
-          <li key={p.id} style={{ marginBottom: "0.25rem" }}>
-            <Link
-              to="/posts/$postId"
-              params={{ postId: p.id }}
-              activeProps={{ style: { fontWeight: "bold" } }}
-            >
-              {p.title}
-            </Link>
-          </li>
-        ))}
-      </ul>
-      <Outlet />
-    </div>
-  );
-}
-
-export const postsRoute = createRoute({
-  getParentRoute: () => rootRoute,
-  path: "/posts",
-  component: Posts,
-});
-
-function PostsIndex() {
-  return <p style={{ color: "#6b7280" }}>Select a post.</p>;
-}
-
-export const postsIndexRoute = createRoute({
-  getParentRoute: () => postsRoute,
-  path: "/",
-  component: PostsIndex,
-});
-
-function PostDetail() {
-  const { postId } = postDetailRoute.useParams();
-  const post = posts.find((p) => p.id === postId);
-  if (!post) return <p>Post not found.</p>;
-  return (
-    <div>
-      <h2>{post.title}</h2>
-      <p>{post.body}</p>
-    </div>
-  );
-}
-
-export const postDetailRoute = createRoute({
-  getParentRoute: () => postsRoute,
-  path: "$postId",
-  component: PostDetail,
-});

package/templates/basic-csr/tsconfig.json

@@ -1,17 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "jsx": "react-jsx",
-    "module": "ESNext",
-    "lib": ["ESNext", "DOM", "DOM.Iterable"],
-    "moduleResolution": "Bundler",
-    "verbatimModuleSyntax": true,
-    "noEmit": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "include": ["src"]
-}

package/templates/basic-server-fns/README.md

@@ -1,24 +0,0 @@
-# basic-server-fns
-
-Basic server functions with `query()` / `mutation()` wrappers.
-
-## Run
-
-```bash
-npm run dev -w example-basic-server-fns
-```
-
-## Key Files
-
-| File | Purpose |
-|------|---------|
-| `src/main.tsx` | App bootstrap |
-| `src/routes.tsx` | Routes + components |
-| `src/api/users.server.ts` | `"use server"` CRUD functions |
-
-## What It Demonstrates
-
-- `"use server"` directive for auto-discovered server functions
-- `query(fn).useQuery()` for data fetching
-- `mutation(fn).useMutation()` for mutations
-- `invalidates` for auto cache invalidation on mutation success

package/templates/basic-server-fns/index.html

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Server Functions Example</title>
-  </head>
-  <body>
-    <div id="app"></div>
-  </body>
-</html>

package/templates/basic-server-fns/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "example-basic-server-fns",
-  "version": "0.0.1-rc.18",
-  "private": true,
-  "scripts": {
-    "dev": "ev dev",
-    "build": "ev build",
-    "check-types": "tsc --noEmit"
-  },
-  "dependencies": {
-    "@evjs/runtime": "*",
-    "react": "^19.2.4",
-    "react-dom": "^19.2.4"
-  },
-  "devDependencies": {
-    "@evjs/cli": "*",
-    "@types/react": "^19.1.8",
-    "@types/react-dom": "^19.1.8",
-    "typescript": "^5.7.3"
-  }
-}

package/templates/basic-server-fns/src/api/users.server.ts

@@ -1,31 +0,0 @@
-"use server";
-
-/** Simulated user database. */
-const users = [
-  { id: "1", name: "Alice", email: "alice@example.com" },
-  { id: "2", name: "Bob", email: "bob@example.com" },
-  { id: "3", name: "Charlie", email: "charlie@example.com" },
-];
-
-/** Get all users. */
-export async function getUsers() {
-  // Simulate server latency
-  await new Promise((r) => setTimeout(r, 100));
-  return users;
-}
-
-/** Get a single user by ID. */
-export async function getUser(id: string) {
-  await new Promise((r) => setTimeout(r, 50));
-  const user = users.find((u) => u.id === id);
-  if (!user) throw new Error(`User ${id} not found`);
-  return user;
-}
-
-/** Create a new user. */
-export async function createUser(data: { name: string; email: string }) {
-  await new Promise((r) => setTimeout(r, 50));
-  const newUser = { id: String(users.length + 1), ...data };
-  users.push(newUser);
-  return newUser;
-}

package/templates/basic-server-fns/src/main.tsx

@@ -1,12 +0,0 @@
-import { createApp } from "@evjs/runtime/client";
-import { routeTree } from "./routes";
-
-const app = createApp({ routeTree });
-
-declare module "@tanstack/react-router" {
-  interface Register {
-    router: typeof app.router;
-  }
-}
-
-app.render("#app");