create-jant 0.3.26 → 0.3.28

package/dist/index.js

@@ -9,8 +9,8 @@ import path from "path";
 import { fileURLToPath } from "url";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
-var CORE_VERSION = "0.3.26";
-var TEMPLATE_DIR = fs.existsSync(path.resolve(__dirname, "../template")) ? path.resolve(__dirname, "../template") : path.resolve(__dirname, "../../../templates/jant-site");
+var CORE_VERSION = "0.3.28";
+var TEMPLATE_DIR = fs.existsSync(path.resolve(__dirname, "../template")) ? path.resolve(__dirname, "../template") : path.resolve(__dirname, "../../../sites/demo");
 function isValidProjectName(name) {
   return /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/.test(name);
 }
@@ -40,9 +40,6 @@ function detectPackageManager() {
 function formatRunCmd(pm, script) {
   return pm === "npm" ? `npm run ${script}` : `${pm} ${script}`;
 }
-function formatAddCmd(pm, pkg) {
-  return pm === "npm" ? `npm install ${pkg}` : `${pm} add ${pkg}`;
-}
 function runCommand(cmd, cwd) {
   try {
     execSync(cmd, { stdio: "ignore", cwd });
@@ -51,67 +48,54 @@ function runCommand(cmd, cwd) {
     return false;
   }
 }
-function processMarkers(content, vars) {
-  content = content.replace(
-    /\s*(?:\/\/|#)\s*@create-jant:\s*@remove-start[\s\S]*?(?:\/\/|#)\s*@create-jant:\s*@remove-end\n?/g,
-    ""
-  );
-  content = content.replace(
-    /^.*(?:\/\/|#)\s*@create-jant:\s*@remove\s*\n?/gm,
-    ""
-  );
-  content = content.replace(
-    /^(.+=\s*)"[^"]*"\s*(?:\/\/|#)\s*@create-jant:\s*"([^"]*)"/gm,
-    (_, prefix, template) => {
-      const value = template.replace(
+function processAnnotations(content, vars) {
+  const lines = content.split("\n");
+  const result = [];
+  let removing = false;
+  for (const line of lines) {
+    if (line.trim() === "# @create-jant: @remove-start") {
+      removing = true;
+      continue;
+    }
+    if (line.trim() === "# @create-jant: @remove-end") {
+      removing = false;
+      continue;
+    }
+    if (removing) continue;
+    if (line.includes("# @create-jant: @remove")) {
+      continue;
+    }
+    const replaceMatch = line.match(/^(.+?)\s*#\s*@create-jant:\s*"(.*)"$/);
+    if (replaceMatch) {
+      const prefix = replaceMatch[1];
+      const newValue = replaceMatch[2];
+      const interpolated = newValue.replace(
         /\$\{(\w+)\}/g,
-        (__, key) => vars[key] ?? ""
+        (_, key) => vars[key] ?? ""
       );
-      return `${prefix}"${value}"`;
+      const valueMatch = prefix.match(/^(\s*\S+\s*=\s*)"[^"]*"(.*)$/);
+      if (valueMatch) {
+        result.push(`${valueMatch[1]}"${interpolated}"${valueMatch[2]}`);
+      } else {
+        result.push(prefix);
+      }
+      continue;
     }
-  );
-  return content;
+    result.push(line);
+  }
+  return result.join("\n");
 }
 async function copyTemplate(config) {
   const { projectName, targetDir, packageManager } = config;
   await fs.copy(TEMPLATE_DIR, targetDir, {
     filter: (src) => {
       const basename = path.basename(src);
-      if (basename.startsWith(".DS_Store")) return false;
       if (basename === "node_modules") return false;
       if (basename === ".wrangler") return false;
-      if (basename === ".swc") return false;
       if (basename === ".dev.vars") return false;
-      if (basename === "pnpm-lock.yaml") return false;
-      if (basename === "yarn.lock") return false;
-      if (basename === "package-lock.json") return false;
-      if (basename === "bun.lockb") return false;
-      if (basename === "pnpm-workspace.yaml") return false;
-      if (basename === "dist") return false;
-      if (basename === "wrangler.demo.toml") return false;
-      if (basename === "reset-demo.sql") return false;
-      if (basename === "seed-demo.sql") return false;
-      if (basename === "reset-local.sql") return false;
-      if (basename === "seed-local.sql") return false;
-      if (basename === "export-demo.mjs") return false;
-      if (basename === "export-seed.mjs") return false;
       return true;
     }
   });
-  const secretsExampleFile = ".dev.vars.example";
-  const secretsFile = ".dev.vars";
-  const renames = [
-    ["_gitignore", ".gitignore"],
-    ["_env.example", secretsExampleFile],
-    ["_github", ".github"]
-  ];
-  for (const [from, to] of renames) {
-    const fromPath = path.join(targetDir, from);
-    const toPath = path.join(targetDir, to);
-    if (await fs.pathExists(fromPath)) {
-      await fs.rename(fromPath, toPath);
-    }
-  }
   const pkgPath = path.join(targetDir, "package.json");
   if (await fs.pathExists(pkgPath)) {
     const pkg = await fs.readJson(pkgPath);
@@ -119,17 +103,14 @@ async function copyTemplate(config) {
     if (pkg.dependencies?.["@jant/core"] === "workspace:*") {
       pkg.dependencies["@jant/core"] = `^${CORE_VERSION}`;
     }
-    delete pkg.scripts["dev:debug"];
-    if (packageManager !== "pnpm") {
+    if (packageManager !== "pnpm" && pkg.scripts) {
       delete pkg.packageManager;
-      if (pkg.scripts) {
-        for (const [key, value] of Object.entries(pkg.scripts)) {
-          if (typeof value === "string") {
-            pkg.scripts[key] = value.replace(
-              /pnpm run (\S+)/g,
-              (_, script) => formatRunCmd(packageManager, script)
-            );
-          }
+      for (const [key, value] of Object.entries(pkg.scripts)) {
+        if (typeof value === "string") {
+          pkg.scripts[key] = value.replace(
+            /pnpm run (\S+)/g,
+            (_, script) => formatRunCmd(packageManager, script)
+          );
         }
       }
     }
@@ -138,7 +119,10 @@ async function copyTemplate(config) {
   const wranglerPath = path.join(targetDir, "wrangler.toml");
   if (await fs.pathExists(wranglerPath)) {
     let content = await fs.readFile(wranglerPath, "utf-8");
-    content = processMarkers(content, { name: projectName });
+    content = processAnnotations(content, { name: projectName });
+    if (config.s3) {
+      content = content.replace(/\n\[\[r2_buckets\]\][^[]*/s, "\n");
+    }
     await fs.writeFile(wranglerPath, content, "utf-8");
   }
   const authSecret = generateAuthSecret();
@@ -147,19 +131,6 @@ async function copyTemplate(config) {
 AUTH_SECRET=${authSecret}
 `;
   if (config.s3) {
-    if (await fs.pathExists(wranglerPath)) {
-      let wContent = await fs.readFile(wranglerPath, "utf-8");
-      wContent = wContent.replace(
-        /^# STORAGE_DRIVER = "s3"/m,
-        'STORAGE_DRIVER = "s3"'
-      );
-      wContent = wContent.replace(/^# S3_ENDPOINT = /m, "S3_ENDPOINT = ");
-      wContent = wContent.replace(/^# S3_BUCKET = /m, "S3_BUCKET = ");
-      wContent = wContent.replace(/^# S3_REGION = /m, "S3_REGION = ");
-      wContent = wContent.replace(/^# S3_PUBLIC_URL = /m, "S3_PUBLIC_URL = ");
-      wContent = wContent.replace(/\n\[\[r2_buckets\]\][^[]*/s, "\n");
-      await fs.writeFile(wranglerPath, wContent, "utf-8");
-    }
     devVarsContent += `
 # S3-compatible storage credentials
 S3_ACCESS_KEY_ID=
@@ -167,37 +138,10 @@ S3_SECRET_ACCESS_KEY=
 `;
   }
   await fs.writeFile(
-    path.join(targetDir, secretsFile),
+    path.join(targetDir, ".dev.vars"),
     devVarsContent,
     "utf-8"
   );
-  const viteConfigPath = path.join(targetDir, "vite.config.ts");
-  if (await fs.pathExists(viteConfigPath)) {
-    let content = await fs.readFile(viteConfigPath, "utf-8");
-    content = processMarkers(content, {});
-    await fs.writeFile(viteConfigPath, content, "utf-8");
-  }
-  const readmePath = path.join(targetDir, "README.md");
-  if (packageManager !== "npm" && await fs.pathExists(readmePath)) {
-    let readme = await fs.readFile(readmePath, "utf-8");
-    readme = readme.replace(
-      /npm install (\S+)/g,
-      (_, pkg) => formatAddCmd(packageManager, pkg)
-    );
-    readme = readme.replace(/npm install/g, `${packageManager} install`);
-    readme = readme.replace(
-      /npm run (\S+)/g,
-      (_, script) => formatRunCmd(packageManager, script)
-    );
-    readme = readme.replace(/npm create/g, `${packageManager} create`);
-    await fs.writeFile(readmePath, readme, "utf-8");
-  }
-  if (packageManager === "pnpm") {
-    const wsSource = path.join(TEMPLATE_DIR, "pnpm-workspace.yaml");
-    if (await fs.pathExists(wsSource)) {
-      await fs.copy(wsSource, path.join(targetDir, "pnpm-workspace.yaml"));
-    }
-  }
 }
 async function main() {
   console.log();
@@ -209,12 +153,12 @@ async function main() {
   if (args[0]) {
     projectName = args[0];
   } else if (opts.yes) {
-    projectName = "jant-site";
+    projectName = "my-jant-site";
   } else {
     const result = await p.text({
       message: "What is your project name?",
-      placeholder: "jant-site",
-      defaultValue: "jant-site",
+      placeholder: "my-jant-site",
+      defaultValue: "my-jant-site",
       validate: (value) => {
         if (!value) return "Project name is required";
         const sanitized = toValidProjectName(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-jant",
-  "version": "0.3.26",
+  "version": "0.3.28",
   "description": "Create a new Jant project",
   "type": "module",
   "bin": {
@@ -53,8 +53,7 @@
     "build": "tsup src/index.ts --format esm --clean --outDir dist",
     "dev": "tsup src/index.ts --format esm --watch",
     "typecheck": "tsc --noEmit",
-    "copy-template": "rm -rf template && cp -r ../../templates/jant-site template",
-    "prepare-template": "node scripts/prepare-template.js",
+    "copy-template": "rm -rf template && rsync -a --exclude node_modules --exclude .wrangler --exclude .dev.vars ../../sites/demo/ template/",
     "inject-version": "node -e \"const fs=require('fs');const v=require('../core/package.json').version;const f='dist/index.js';fs.writeFileSync(f,fs.readFileSync(f,'utf8').replace('__JANT_CORE_VERSION__',v))\"",
     "test-template": "node scripts/test-template.js"
   }

package/template/index.js

@@ -0,0 +1,3 @@
+import { createApp } from "@jant/core";
+
+export default createApp();

package/template/package.json

@@ -1,36 +1,15 @@
 {
-  "name": "jant-site",
-  "version": "0.0.1",
+  "name": "jant-demo",
   "private": true,
   "type": "module",
-  "packageManager": "pnpm@10.28.2",
   "scripts": {
-    "dev": "pnpm run db:migrate:local && vite dev",
-    "dev:debug": "pnpm run db:migrate:local && vite dev --port 19019",
-    "build": "vite build",
-    "deploy": "pnpm run db:migrate:remote && pnpm run build && wrangler deploy",
-    "preview": "vite preview",
-    "typecheck": "tsc --noEmit",
-    "db:migrate:local": "yes | wrangler d1 migrations apply DB --local",
-    "db:migrate:remote": "wrangler d1 migrations apply DB --remote",
-    "jant": "jant",
-    "reset-password": "node scripts/reset-password.mjs"
+    "dev": "wrangler d1 migrations apply DB --local && wrangler dev",
+    "deploy": "wrangler d1 migrations apply DB --remote && wrangler deploy"
   },
   "dependencies": {
     "@jant/core": "workspace:*"
   },
   "devDependencies": {
-    "@cloudflare/vite-plugin": "^1.22.1",
-    "@cloudflare/workers-types": "^4.20260131.0",
-    "@lingui/swc-plugin": "^5.10.1",
-    "@swc/core": "^1.15.11",
-    "@tailwindcss/vite": "^4.1.18",
-    "@types/node": "^22.15.4",
-    "hono": "^4.11.9",
-    "tailwindcss": "^4.1.18",
-    "typescript": "^5.9.3",
-    "unplugin-swc": "^1.5.9",
-    "vite": "^7.3.1",
     "wrangler": "^4.61.1"
   }
 }

package/template/wrangler.toml

@@ -1,11 +1,16 @@
-name = "jant-site" # @create-jant: "${name}"
-main = "src/index.ts"
+name = "jant-demo" # @create-jant: "${name}"
+main = "index.js"
 compatibility_date = "2026-01-20"
 compatibility_flags = ["nodejs_compat"]
 account_id = "03e7294bdb3750ed5a0d6afef6d770e4" # @create-jant: @remove
 
+[assets]
+directory = "./node_modules/@jant/core/dist/client"
+
+# @create-jant: @remove-start
 [dev]
 port = 9019
+# @create-jant: @remove-end
 
 # ============================================
 # Environment Variables
@@ -14,54 +19,56 @@ port = 9019
 # Sensitive secrets (like AUTH_SECRET) should be:
 # - Local dev: .dev.vars file (not committed)
 # - Production: wrangler secret put AUTH_SECRET
-# See docs/configuration.md for full details
+# Full details: https://github.com/jant-me/jant/blob/main/docs/configuration.md
 
 [vars]
 # Required: Your site's public URL (e.g. https://my-blog.example.com)
-SITE_URL = ""
+# https://github.com/jant-me/jant/blob/main/docs/configuration.md#required
+SITE_URL = "https://demo.jant.me" # @create-jant: ""
 
 # Optional: Site configuration
-# These can be overridden in dashboard settings (/dash/settings)
-# If not set, values from database settings table are used
+# You can also set these in the dashboard UI at /dash/settings
+# https://github.com/jant-me/jant/blob/main/docs/configuration.md#dashboard-settings
 # SITE_NAME = "My Blog"
 # SITE_DESCRIPTION = "A personal blog powered by Jant"
 # SITE_LANGUAGE = "en"
 
 # Optional: Timeline page size (default: 20)
-# PAGE_SIZE = "5"
+# PAGE_SIZE = "20"
 
-# Recommended: R2 public URL for media access
-# Without this, media files are proxied through your Worker (slower, uses more CPU).
-# With this, media is served directly from Cloudflare's CDN (faster, lower cost).
-# Set up: Cloudflare Dashboard → R2 → Your Bucket → Settings → Public access
+# Optional: R2 Storage (for media uploads)
+# https://github.com/jant-me/jant/blob/main/docs/configuration.md#r2-default
 # R2_PUBLIC_URL = "https://cdn.example.com"
 R2_PUBLIC_URL = "https://demo-media.jant.me" # @create-jant: @remove
 
 # Optional: Cloudflare Image Transformations
 # For automatic thumbnail generation and image optimization
-# Use the same domain as R2_PUBLIC_URL (or SITE_URL if R2_PUBLIC_URL is not set)
-# IMAGE_TRANSFORM_URL = "https://media.yourdomain.com/cdn-cgi/image"
+# https://github.com/jant-me/jant/blob/main/docs/configuration.md#image-transformations-optional
+# IMAGE_TRANSFORM_URL = "https://example.com/cdn-cgi/image"
+IMAGE_TRANSFORM_URL = "https://demo-media.jant.me/cdn-cgi/image" # @create-jant: @remove
+
+# @create-jant: @remove-start
+DEMO_EMAIL = "demo@jant.me"
+DEMO_PASSWORD = "demodemo"
+# @create-jant: @remove-end
+
+[[d1_databases]]
+binding = "DB"
+database_name = "jant-demo-db" # @create-jant: "${name}-db"
+database_id = "76329154-291d-4580-af73-aa77397649f1" # @create-jant: "local"
+migrations_dir = "node_modules/@jant/core/src/db/migrations"
 
-# Optional: Demo mode (pre-fill sign-in credentials)
-# DEMO_EMAIL = "demo@example.com"
-# DEMO_PASSWORD = "demo123"
+[[r2_buckets]]
+binding = "R2"
+bucket_name = "jant-demo-media" # @create-jant: "${name}-media"
+remote = true # @create-jant: @remove
 
 # Optional: S3-compatible storage (alternative to R2)
 # Set STORAGE_DRIVER = "s3" and configure the options below.
 # When using S3, the [[r2_buckets]] section can be removed.
+# https://github.com/jant-me/jant/blob/main/docs/configuration.md#s3-compatible-storage
 # STORAGE_DRIVER = "s3"
 # S3_ENDPOINT = "https://s3.example.com"
 # S3_BUCKET = "my-bucket"
 # S3_REGION = "us-east-1"
 # S3_PUBLIC_URL = "https://cdn.example.com"
-
-[[d1_databases]]
-binding = "DB"
-database_name = "jant-site-db" # @create-jant: "${name}-db"
-database_id = "local"
-migrations_dir = "../../packages/core/src/db/migrations" # @create-jant: "node_modules/@jant/core/src/db/migrations"
-
-[[r2_buckets]]
-binding = "R2"
-bucket_name = "jant-demo-media" # @create-jant: "${name}-media"
-remote = true # @create-jant: @remove

package/template/.prettierrc

@@ -1 +0,0 @@
-{}