@jant/core 0.2.11 → 0.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jant/core",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "A modern, open-source microblogging platform built on Cloudflare Workers",
   "type": "module",
   "bin": {
@@ -15,9 +15,12 @@
       "types": "./dist/theme/index.d.ts",
       "default": "./dist/theme/index.js"
     },
+    "./i18n": {
+      "types": "./dist/i18n/index.d.ts",
+      "default": "./dist/i18n/index.js"
+    },
     "./preset.css": "./src/preset.css",
-    "./client": "./dist/client.js",
-    "./*": "./*"
+    "./client": "./dist/client.js"
   },
   "files": [
     "bin",
@@ -30,7 +33,6 @@
   },
   "dependencies": {
     "@lingui/core": "^5.9.0",
-    "@sudodevnull/datastar": "^0.19.9",
     "better-auth": "^1.4.18",
     "drizzle-orm": "^0.45.1",
     "hono": "^4.11.7",
@@ -45,23 +47,15 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20260131.0",
-    "@eslint/js": "^9.39.2",
     "@lingui/cli": "^5.9.0",
     "@lingui/format-po": "^5.9.0",
     "@lingui/swc-plugin": "^5.10.1",
     "@swc/cli": "^0.6.0",
     "@swc/core": "^1.15.11",
     "@types/node": "^25.1.0",
-    "@typescript-eslint/eslint-plugin": "^8.54.0",
-    "@typescript-eslint/parser": "^8.54.0",
     "basecoat-css": "^0.3.10",
     "drizzle-kit": "^0.31.8",
-    "eslint": "^9.39.2",
-    "eslint-plugin-react": "^7.37.5",
     "glob": "^13.0.0",
-    "husky": "^9.1.7",
-    "lint-staged": "^16.2.7",
-    "prettier": "^3.8.1",
     "tailwindcss": "^4.1.18",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
@@ -90,12 +84,10 @@
     "node": ">=24.0.0"
   },
   "scripts": {
+    "build": "pnpm build:lib",
     "build:lib": "swc src -d dist --strip-leading-paths && pnpm build:types",
     "build:types": "tsc -p tsconfig.build.json",
     "typecheck": "tsc --noEmit && tsc -p tsconfig.client.json",
-    "lint": "eslint src/",
-    "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,css,md}\"",
-    "format:check": "prettier --check \"src/**/*.{ts,tsx,js,jsx,json,css,md}\"",
     "db:generate": "drizzle-kit generate",
     "i18n:extract": "lingui extract",
     "i18n:compile": "lingui compile --typescript",

package/src/app.tsx

@@ -7,7 +7,8 @@ import type { FC } from "hono/jsx";
 import { createDatabase } from "./db/index.js";
 import { createServices, type Services } from "./services/index.js";
 import { createAuth, type Auth } from "./auth.js";
-import { i18nMiddleware, useLingui } from "./i18n/index.js";
+import { i18nMiddleware } from "./i18n/index.js";
+import { useLingui } from "@lingui/react/macro";
 import type { Bindings, JantConfig } from "./types.js";
 
 // Routes - Pages
@@ -41,6 +42,7 @@ import { requireAuth } from "./middleware/auth.js";
 
 // Layouts for auth pages
 import { BaseLayout } from "./theme/layouts/index.js";
+import { sse } from "./lib/sse.js";
 
 // Extend Hono's context variables
 export interface AppVariables {
@@ -123,7 +125,7 @@ export function createApp(config: JantConfig = {}): App {
       status: "ok",
       auth: c.env.AUTH_SECRET ? "configured" : "missing",
       authSecretLength: c.env.AUTH_SECRET?.length ?? 0,
-    })
+    }),
   );
 
   // better-auth handler
@@ -138,36 +140,102 @@ export function createApp(config: JantConfig = {}): App {
   app.route("/api/posts", postsApiRoutes);
 
   // Setup page component
-  const SetupContent: FC<{ error?: string }> = ({ error }) => {
+  const SetupContent: FC = () => {
     const { t } = useLingui();
 
     return (
       <div class="min-h-screen flex items-center justify-center">
         <div class="card max-w-md w-full">
           <header>
-            <h2>{t({ message: "Welcome to Jant", comment: "@context: Setup page welcome heading" })}</h2>
-            <p>{t({ message: "Let's set up your site.", comment: "@context: Setup page description" })}</p>
+            <h2>
+              {t({
+                message: "Welcome to Jant",
+                comment: "@context: Setup page welcome heading",
+              })}
+            </h2>
+            <p>
+              {t({
+                message: "Let's set up your site.",
+                comment: "@context: Setup page description",
+              })}
+            </p>
           </header>
           <section>
-            {error && <p class="text-destructive text-sm mb-4">{error}</p>}
-            <form method="post" action="/setup" class="flex flex-col gap-4">
+            <div id="setup-message"></div>
+            <form
+              data-signals="{siteName: '', name: '', email: '', password: ''}"
+              data-on:submit__prevent="@post('/setup')"
+              class="flex flex-col gap-4"
+            >
               <div class="field">
-                <label class="label">{t({ message: "Site Name", comment: "@context: Setup form field - site name" })}</label>
-                <input type="text" name="siteName" class="input" required placeholder={t({ message: "My Blog", comment: "@context: Setup site name placeholder" })} />
+                <label class="label">
+                  {t({
+                    message: "Site Name",
+                    comment: "@context: Setup form field - site name",
+                  })}
+                </label>
+                <input
+                  type="text"
+                  data-bind="siteName"
+                  class="input"
+                  required
+                  placeholder={t({
+                    message: "My Blog",
+                    comment: "@context: Setup site name placeholder",
+                  })}
+                />
               </div>
               <div class="field">
-                <label class="label">{t({ message: "Your Name", comment: "@context: Setup form field - user name" })}</label>
-                <input type="text" name="name" class="input" required placeholder="John Doe" />
+                <label class="label">
+                  {t({
+                    message: "Your Name",
+                    comment: "@context: Setup form field - user name",
+                  })}
+                </label>
+                <input
+                  type="text"
+                  data-bind="name"
+                  class="input"
+                  required
+                  placeholder="John Doe"
+                />
               </div>
               <div class="field">
-                <label class="label">{t({ message: "Email", comment: "@context: Setup/signin form field - email" })}</label>
-                <input type="email" name="email" class="input" required placeholder="you@example.com" />
+                <label class="label">
+                  {t({
+                    message: "Email",
+                    comment: "@context: Setup/signin form field - email",
+                  })}
+                </label>
+                <input
+                  type="email"
+                  data-bind="email"
+                  class="input"
+                  required
+                  placeholder="you@example.com"
+                />
               </div>
               <div class="field">
-                <label class="label">{t({ message: "Password", comment: "@context: Setup/signin form field - password" })}</label>
-                <input type="password" name="password" class="input" required minLength={8} />
+                <label class="label">
+                  {t({
+                    message: "Password",
+                    comment: "@context: Setup/signin form field - password",
+                  })}
+                </label>
+                <input
+                  type="password"
+                  data-bind="password"
+                  class="input"
+                  required
+                  minLength={8}
+                />
               </div>
-              <button type="submit" class="btn">{t({ message: "Complete Setup", comment: "@context: Setup form submit button" })}</button>
+              <button type="submit" class="btn">
+                {t({
+                  message: "Complete Setup",
+                  comment: "@context: Setup form submit button",
+                })}
+              </button>
             </form>
           </section>
         </div>
@@ -180,12 +248,10 @@ export function createApp(config: JantConfig = {}): App {
     const isComplete = await c.var.services.settings.isOnboardingComplete();
     if (isComplete) return c.redirect("/");
 
-    const error = c.req.query("error");
-
     return c.html(
       <BaseLayout title="Setup - Jant" c={c}>
-        <SetupContent error={error} />
-      </BaseLayout>
+        <SetupContent />
+      </BaseLayout>,
     );
   });
 
@@ -193,22 +259,36 @@ export function createApp(config: JantConfig = {}): App {
     const isComplete = await c.var.services.settings.isOnboardingComplete();
     if (isComplete) return c.redirect("/");
 
-    const formData = await c.req.formData();
-    const siteName = formData.get("siteName") as string;
-    const name = formData.get("name") as string;
-    const email = formData.get("email") as string;
-    const password = formData.get("password") as string;
+    const body = await c.req.json<{
+      siteName: string;
+      name: string;
+      email: string;
+      password: string;
+    }>();
+    const { siteName, name, email, password } = body;
 
     if (!siteName || !name || !email || !password) {
-      return c.redirect("/setup?error=All fields are required");
+      return sse(c, async (stream) => {
+        await stream.patchElements(
+          '<div id="setup-message"><p class="text-destructive text-sm mb-4">All fields are required</p></div>',
+        );
+      });
     }
 
     if (password.length < 8) {
-      return c.redirect("/setup?error=Password must be at least 8 characters");
+      return sse(c, async (stream) => {
+        await stream.patchElements(
+          '<div id="setup-message"><p class="text-destructive text-sm mb-4">Password must be at least 8 characters</p></div>',
+        );
+      });
     }
 
     if (!c.var.auth) {
-      return c.redirect("/setup?error=AUTH_SECRET not configured");
+      return sse(c, async (stream) => {
+        await stream.patchElements(
+          '<div id="setup-message"><p class="text-destructive text-sm mb-4">AUTH_SECRET not configured</p></div>',
+        );
+      });
     }
 
     try {
@@ -217,7 +297,11 @@ export function createApp(config: JantConfig = {}): App {
       });
 
       if (!signUpResponse || "error" in signUpResponse) {
-        return c.redirect("/setup?error=Failed to create account");
+        return sse(c, async (stream) => {
+          await stream.patchElements(
+            '<div id="setup-message"><p class="text-destructive text-sm mb-4">Failed to create account</p></div>',
+          );
+        });
       }
 
       await c.var.services.settings.setMany({
@@ -226,36 +310,87 @@ export function createApp(config: JantConfig = {}): App {
       });
       await c.var.services.settings.completeOnboarding();
 
-      return c.redirect("/signin");
+      return sse(c, async (stream) => {
+        await stream.redirect("/signin");
+      });
     } catch (err) {
       // eslint-disable-next-line no-console -- Error logging is intentional
       console.error("Setup error:", err);
-      return c.redirect("/setup?error=Failed to create account");
+      return sse(c, async (stream) => {
+        await stream.patchElements(
+          '<div id="setup-message"><p class="text-destructive text-sm mb-4">Failed to create account</p></div>',
+        );
+      });
     }
   });
 
   // Signin page component
-  const SigninContent: FC<{ error?: string }> = ({ error }) => {
+  const SigninContent: FC<{
+    demoEmail?: string;
+    demoPassword?: string;
+  }> = ({ demoEmail, demoPassword }) => {
     const { t } = useLingui();
+    const signals = JSON.stringify({
+      email: demoEmail || "",
+      password: demoPassword || "",
+    }).replace(/</g, "\\u003c");
 
     return (
       <div class="min-h-screen flex items-center justify-center">
         <div class="card max-w-md w-full">
           <header>
-            <h2>{t({ message: "Sign In", comment: "@context: Sign in page heading" })}</h2>
+            <h2>
+              {t({
+                message: "Sign In",
+                comment: "@context: Sign in page heading",
+              })}
+            </h2>
           </header>
           <section>
-            {error && <p class="text-destructive text-sm mb-4">{error}</p>}
-            <form method="post" action="/signin" class="flex flex-col gap-4">
+            <div id="signin-message"></div>
+            {demoEmail && demoPassword && (
+              <p class="text-muted-foreground text-sm mb-4">
+                {t({
+                  message: "Demo account pre-filled. Just click Sign In.",
+                  comment:
+                    "@context: Hint shown on signin page when demo credentials are pre-filled",
+                })}
+              </p>
+            )}
+            <form
+              data-signals={signals}
+              data-on:submit__prevent="@post('/signin')"
+              class="flex flex-col gap-4"
+            >
               <div class="field">
-                <label class="label">{t({ message: "Email", comment: "@context: Setup/signin form field - email" })}</label>
-                <input type="email" name="email" class="input" required />
+                <label class="label">
+                  {t({
+                    message: "Email",
+                    comment: "@context: Setup/signin form field - email",
+                  })}
+                </label>
+                <input type="email" data-bind="email" class="input" required />
               </div>
               <div class="field">
-                <label class="label">{t({ message: "Password", comment: "@context: Setup/signin form field - password" })}</label>
-                <input type="password" name="password" class="input" required />
+                <label class="label">
+                  {t({
+                    message: "Password",
+                    comment: "@context: Setup/signin form field - password",
+                  })}
+                </label>
+                <input
+                  type="password"
+                  data-bind="password"
+                  class="input"
+                  required
+                />
               </div>
-              <button type="submit" class="btn">{t({ message: "Sign In", comment: "@context: Sign in form submit button" })}</button>
+              <button type="submit" class="btn">
+                {t({
+                  message: "Sign In",
+                  comment: "@context: Sign in form submit button",
+                })}
+              </button>
             </form>
           </section>
         </div>
@@ -265,45 +400,70 @@ export function createApp(config: JantConfig = {}): App {
 
   // Signin page
   app.get("/signin", async (c) => {
-    const error = c.req.query("error");
-
     return c.html(
       <BaseLayout title="Sign In - Jant" c={c}>
-        <SigninContent error={error} />
-      </BaseLayout>
+        <SigninContent
+          demoEmail={c.env.DEMO_EMAIL}
+          demoPassword={c.env.DEMO_PASSWORD}
+        />
+      </BaseLayout>,
     );
   });
 
   app.post("/signin", async (c) => {
     if (!c.var.auth) {
-      return c.redirect("/signin?error=Auth not configured");
+      return sse(c, async (stream) => {
+        await stream.patchElements(
+          '<div id="signin-message"><p class="text-destructive text-sm mb-4">Auth not configured</p></div>',
+        );
+      });
     }
 
-    const formData = await c.req.formData();
-    const email = formData.get("email") as string;
-    const password = formData.get("password") as string;
+    const body = await c.req.json<{ email: string; password: string }>();
+    const { email, password } = body;
 
     try {
-      const signInRequest = new Request(`${c.env.SITE_URL}/api/auth/sign-in/email`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ email, password }),
-      });
+      const signInRequest = new Request(
+        `${c.env.SITE_URL}/api/auth/sign-in/email`,
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ email, password }),
+        },
+      );
 
       const response = await c.var.auth.handler(signInRequest);
 
       if (!response.ok) {
-        return c.redirect("/signin?error=Invalid email or password");
+        return sse(c, async (stream) => {
+          await stream.patchElements(
+            '<div id="signin-message"><p class="text-destructive text-sm mb-4">Invalid email or password</p></div>',
+          );
+        });
       }
 
-      const headers = new Headers(response.headers);
-      headers.set("Location", "/dash");
+      // Forward Set-Cookie headers from auth response
+      const cookieHeaders: Record<string, string> = {};
+      const setCookie = response.headers.get("set-cookie");
+      if (setCookie) {
+        cookieHeaders["Set-Cookie"] = setCookie;
+      }
 
-      return new Response(null, { status: 302, headers });
+      return sse(
+        c,
+        async (stream) => {
+          await stream.redirect("/dash");
+        },
+        { headers: cookieHeaders },
+      );
     } catch (err) {
       // eslint-disable-next-line no-console -- Error logging is intentional
       console.error("Signin error:", err);
-      return c.redirect("/signin?error=Invalid email or password");
+      return sse(c, async (stream) => {
+        await stream.patchElements(
+          '<div id="signin-message"><p class="text-destructive text-sm mb-4">Invalid email or password</p></div>',
+        );
+      });
     }
   });
 
@@ -353,7 +513,10 @@ export function createApp(config: JantConfig = {}): App {
     }
 
     const headers = new Headers();
-    headers.set("Content-Type", object.httpMetadata?.contentType || media.mimeType);
+    headers.set(
+      "Content-Type",
+      object.httpMetadata?.contentType || media.mimeType,
+    );
     headers.set("Cache-Control", "public, max-age=31536000, immutable");
 
     return new Response(object.body, { headers });

package/src/auth.ts

@@ -7,7 +7,10 @@ import { drizzleAdapter } from "better-auth/adapters/drizzle";
 import { drizzle } from "drizzle-orm/d1";
 import * as schema from "./db/schema.js";
 
-export function createAuth(d1: D1Database, options: { secret: string; baseURL: string }) {
+export function createAuth(
+  d1: D1Database,
+  options: { secret: string; baseURL: string },
+) {
   const db = drizzle(d1, { schema });
 
   return betterAuth({
@@ -25,6 +28,7 @@ export function createAuth(d1: D1Database, options: { secret: string; baseURL: s
     emailAndPassword: {
       enabled: true,
       autoSignIn: true,
+      minPasswordLength: 8,
     },
     session: {
       cookieCache: {

package/src/client.ts

@@ -7,6 +7,6 @@
  * - ImageProcessor (media uploads)
  */
 
-import "@sudodevnull/datastar";
+import "./vendor/datastar.js";
 import "basecoat-css/all";
 import "./lib/image-processor.js";

package/src/db/migrations/meta/0000_snapshot.json

@@ -105,12 +105,8 @@
           "name": "account_user_id_user_id_fk",
           "tableFrom": "account",
           "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -168,9 +164,7 @@
       "indexes": {
         "collections_slug_unique": {
           "name": "collections_slug_unique",
-          "columns": [
-            "slug"
-          ],
+          "columns": ["slug"],
           "isUnique": true
         }
       },
@@ -266,12 +260,8 @@
           "name": "media_post_id_posts_id_fk",
           "tableFrom": "media",
           "tableTo": "posts",
-          "columnsFrom": [
-            "post_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["post_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -311,12 +301,8 @@
           "name": "post_collections_post_id_posts_id_fk",
           "tableFrom": "post_collections",
           "tableTo": "posts",
-          "columnsFrom": [
-            "post_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["post_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         },
@@ -324,22 +310,15 @@
           "name": "post_collections_collection_id_collections_id_fk",
           "tableFrom": "post_collections",
           "tableTo": "collections",
-          "columnsFrom": [
-            "collection_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["collection_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
       },
       "compositePrimaryKeys": {
         "post_collections_post_id_collection_id_pk": {
-          "columns": [
-            "post_id",
-            "collection_id"
-          ],
+          "columns": ["post_id", "collection_id"],
           "name": "post_collections_post_id_collection_id_pk"
         }
       },
@@ -512,9 +491,7 @@
       "indexes": {
         "redirects_from_path_unique": {
           "name": "redirects_from_path_unique",
-          "columns": [
-            "from_path"
-          ],
+          "columns": ["from_path"],
           "isUnique": true
         }
       },
@@ -586,9 +563,7 @@
       "indexes": {
         "session_token_unique": {
           "name": "session_token_unique",
-          "columns": [
-            "token"
-          ],
+          "columns": ["token"],
           "isUnique": true
         }
       },
@@ -597,12 +572,8 @@
           "name": "session_user_id_user_id_fk",
           "tableFrom": "session",
           "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -707,9 +678,7 @@
       "indexes": {
         "user_email_unique": {
           "name": "user_email_unique",
-          "columns": [
-            "email"
-          ],
+          "columns": ["email"],
           "isUnique": true
         }
       },
@@ -781,4 +750,4 @@
   "internal": {
     "indexes": {}
   }
-}
+}

package/src/db/migrations/meta/_journal.json

@@ -38,4 +38,4 @@
       "breakpoints": true
     }
   ]
-}
+}