create-jant 0.3.11 → 0.3.13

package/README.md

@@ -73,7 +73,7 @@ my-site/
 ```bash
 pnpm dev           # Start dev server (http://localhost:9019)
 pnpm build         # Build for production
-pnpm deploy        # Build + deploy to Cloudflare Workers
+pnpm cf:deploy        # Build + deploy to Cloudflare Workers
 pnpm typecheck     # Run TypeScript checks
 pnpm lint          # Run ESLint
 pnpm format        # Format code with Prettier

package/dist/index.js

@@ -9,7 +9,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
-var CORE_VERSION = "0.3.11";
+var CORE_VERSION = "0.3.13";
 var TEMPLATE_DIR = fs.existsSync(path.resolve(__dirname, "../template")) ? path.resolve(__dirname, "../template") : path.resolve(__dirname, "../../../templates/jant-site");
 function isValidProjectName(name) {
   return /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/.test(name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-jant",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "description": "Create a new Jant project",
   "type": "module",
   "bin": {

package/template/README.md

@@ -1,18 +1,10 @@
 # Jant Site
 
-A personal website/blog powered by [Jant](https://github.com/nicepkg/jant).
+A personal website/blog powered by [Jant](https://github.com/jant-me/jant).
 
 ## Getting Started
 
 ```bash
-# Install dependencies
-pnpm install
-
-# Set up environment variables
-cp .dev.vars.example .dev.vars
-# Edit .dev.vars and set AUTH_SECRET (32+ random characters)
-
-# Start development server
 pnpm dev
 ```
 
@@ -20,84 +12,92 @@ Visit http://localhost:9019 to see your site.
 
 ## Deploy to Cloudflare
 
-### 1. Create Cloudflare Resources
+### 1. Prerequisites
 
-First, make sure you have [Wrangler CLI](https://developers.cloudflare.com/workers/wrangler/install-and-update/) installed and logged in:
+Install [Wrangler CLI](https://developers.cloudflare.com/workers/wrangler/install-and-update/) and log in:
 
 ```bash
-# Install wrangler if not already installed
-npm install -g wrangler
-
-# Login to Cloudflare
 wrangler login
 ```
 
-Create the required resources:
+### 2. Create D1 Database
 
-```bash
-# Create D1 database
-wrangler d1 create my-blog-db
-# Note the database_id from the output!
+Check the `database_name` in your `wrangler.toml` (defaults to `<your-project>-db`), then create it:
 
-# Create R2 bucket for media storage
-wrangler r2 bucket create my-blog-media
+```bash
+wrangler d1 create <your-project>-db
+# Copy the database_id from the output!
 ```
 
-### 2. Update Configuration
+### 3. Update Configuration
 
-Edit `wrangler.toml` with your resource IDs:
+Edit `wrangler.toml`:
 
-```toml
-name = "my-blog"  # Your worker name
+- Replace `database_id = "local"` with the ID from step 2
+- Set `SITE_URL` to your production URL
 
-[[d1_databases]]
-binding = "DB"
-database_name = "my-blog-db"
-database_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"  # From step 1
+> R2 bucket is automatically created on first deploy — no manual setup needed.
+>
+> **Note:** Changing `database_id` resets your local development database (local data is stored per database ID). This is why we recommend setting up deployment before starting local development.
 
-[[r2_buckets]]
-binding = "R2"
-bucket_name = "my-blog-media"
-```
+### 4. Set Production Secrets
 
-### 3. Set Secrets
+Generate a production secret and save it somewhere safe (you'll need it again for CI):
 
 ```bash
-# Set authentication secret (use a random 32+ character string)
+# Generate a secret
+openssl rand -base64 32
+
+# Set it in Cloudflare
 wrangler secret put AUTH_SECRET
-# Enter your secret when prompted
+# Paste the generated value when prompted
 ```
 
-### 4. Run Migrations
-
-```bash
-# Apply database migrations
-wrangler d1 migrations apply my-blog-db --remote
-```
+> **Important:** This is separate from the `AUTH_SECRET` in `.dev.vars` (which is for local development only). Do not change the production secret after your site is live — it will invalidate all sessions. If you get locked out, use `pnpm reset-password` to generate a password reset link.
 
 ### 5. Deploy
 
 ```bash
+# Apply database migrations to production
+pnpm db:migrate:remote
+
 # Build and deploy
-pnpm deploy
+pnpm cf:deploy
 ```
 
-Your site is now live at `https://my-blog.<your-subdomain>.workers.dev`!
+Your site is now live at `https://<your-project>.<your-subdomain>.workers.dev`!
+
+### 6. Custom Domain (Optional)
+
+1. Go to [Cloudflare Dashboard](https://dash.cloudflare.com) → Workers & Pages
+2. Select your worker → Settings → Domains & Routes
+3. Click **Add -> Custom domain** and enter your domain
 
-### 6. GitHub Actions (CI/CD)
+## GitHub Actions (CI/CD)
 
-A workflow file is already included at `.github/workflows/deploy.yml`. You just need to configure secrets.
+A workflow file is included at `.github/workflows/deploy.yml`. Complete the [manual deployment](#deploy-to-cloudflare) first, then set up CI for automatic deployments.
 
-#### Create API Token
+> Runtime secrets (`AUTH_SECRET`, S3 keys, etc.) are already stored in Cloudflare from the manual deployment step. CI only needs deployment credentials.
+
+### 1. Push to GitHub
+
+Create a new repository on [GitHub](https://github.com/new), then commit and push your project:
+
+```bash
+git add -A
+git commit -m "Initial setup"
+git remote add origin https://github.com/<your-username>/<your-repo>.git
+git push -u origin main
+```
+
+### 2. Create API Token
 
 1. Go to [Cloudflare API Tokens](https://dash.cloudflare.com/profile/api-tokens)
-2. Click **Create Token**
-3. Click **Use template** next to **Edit Cloudflare Workers**
-4. **IMPORTANT: Add D1 permission** (not included in template by default):
-   - Click **+ Add more**
-   - Select: **Account** → **D1** → **Edit**
+2. Click **Create Token** → **Use template** next to **Edit Cloudflare Workers**
+3. **Add D1 permission** (not in template by default):
+   - Click **+ Add more** → **Account** → **D1** → **Edit**
 
-5. Your permissions should include at minimum:
+Your permissions should include:
 
 | Scope   | Permission         | Access                        |
 | ------- | ------------------ | ----------------------------- |
@@ -106,80 +106,67 @@ A workflow file is already included at `.github/workflows/deploy.yml`. You just
 | Account | **D1**             | **Edit** ← Must add manually! |
 | Zone    | Workers Routes     | Edit                          |
 
-6. **Account Resources** (below permissions list):
-   - Select **Include** → **Specific account** → Choose your account
+4. Set **Account Resources** → **Include** → your account
+5. Set **Zone Resources** → **Include** → **All zones from an account** → your account
+6. **Create Token** and copy it
 
-7. **Zone Resources**:
-   - Select **Include** → **All zones from an account** → Choose your account
+### 3. Add GitHub Secrets
 
-8. Click **Continue to summary** → **Create Token**
-9. Copy the token (you won't see it again!)
+Go to your repo → **Settings** → **Secrets and variables** → **Actions**:
 
-#### Add GitHub Secrets
+| Secret Name     | Value                                                                    |
+| --------------- | ------------------------------------------------------------------------ |
+| `CF_API_TOKEN`  | API token from above                                                     |
+| `CF_ACCOUNT_ID` | Your Cloudflare Account ID (found in dashboard URL or `wrangler whoami`) |
 
-Go to your GitHub repo → **Settings** → **Secrets and variables** → **Actions** → **New repository secret**:
+### 4. Enable Auto-Deploy
 
-| Secret Name     | Value                                                                      |
-| --------------- | -------------------------------------------------------------------------- |
-| `CF_API_TOKEN`  | Your API token from above                                                  |
-| `CF_ACCOUNT_ID` | Your Cloudflare Account ID (find it in dashboard URL or `wrangler whoami`) |
-| `AUTH_SECRET`   | Random string for authentication (**must be at least 32 characters**)      |
+Uncomment the push trigger in `.github/workflows/deploy.yml`:
 
-> **Important**: `AUTH_SECRET` must be at least 32 characters long. You can generate one with:
->
-> ```bash
-> openssl rand -base64 32
-> ```
+```yaml
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+```
 
-That's it! Push to `main` branch to trigger deployment.
+Now every push to `main` will auto-deploy.
 
-#### Using Environments (Optional)
+### Using Environments (Optional)
 
-If you want separate staging/production environments, update `.github/workflows/deploy.yml`:
+For separate staging/production, update `.github/workflows/deploy.yml`:
 
 ```yaml
 jobs:
   deploy:
-    uses: nicepkg/jant/.github/workflows/deploy.yml@v1
+    uses: jant-me/jant/.github/workflows/deploy.yml@main
     with:
       environment: production # Uses [env.production] in wrangler.toml
     secrets:
       CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
       CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
-      AUTH_SECRET: ${{ secrets.AUTH_SECRET }}
 ```
 
-### 7. Custom Domain (Optional)
-
-To use your own domain:
-
-1. Go to [Cloudflare Dashboard](https://dash.cloudflare.com) > Workers & Pages
-2. Select your worker > Settings > Triggers
-3. Click "Add Custom Domain"
-4. Enter your domain (e.g., `blog.example.com`)
-
 ## Commands
 
-| Command          | Description                    |
-| ---------------- | ------------------------------ |
-| `pnpm dev`       | Start development server       |
-| `pnpm build`     | Build for production           |
-| `pnpm deploy`    | Build and deploy to Cloudflare |
-| `pnpm preview`   | Preview production build       |
-| `pnpm typecheck` | Run TypeScript checks          |
+| Command                  | Description                        |
+| ------------------------ | ---------------------------------- |
+| `pnpm dev`               | Start development server           |
+| `pnpm build`             | Build for production               |
+| `pnpm cf:deploy`         | Build and deploy to Cloudflare     |
+| `pnpm preview`           | Preview production build           |
+| `pnpm typecheck`         | Run TypeScript checks              |
+| `pnpm db:migrate:remote` | Apply database migrations (remote) |
 
 ## Environment Variables
 
-Core environment variables:
-
 | Variable      | Description                               | Location         |
 | ------------- | ----------------------------------------- | ---------------- |
 | `AUTH_SECRET` | Secret key for authentication (32+ chars) | `.dev.vars` file |
 | `SITE_URL`    | Your site's public URL                    | `wrangler.toml`  |
 
-For a complete list of all available environment variables (site configuration, R2 storage, image optimization, demo mode, etc.), see:
-
-**[📖 Full Configuration Guide](https://github.com/nicepkg/jant/blob/main/docs/configuration.md)**
+For all available variables (site name, language, R2 storage, image optimization, S3, demo mode, etc.), see the **[Configuration Guide](https://github.com/jant-me/jant/blob/main/docs/configuration.md)**.
 
 ## Customization
 
@@ -247,33 +234,23 @@ export default createApp({
 
 ## Updating
 
-1. Update the `@jant/core` package:
-
 ```bash
+# Update @jant/core
 pnpm update @jant/core
-```
-
-2. Apply database migrations locally (this happens automatically when you run `pnpm dev`):
 
-```bash
+# Start dev server (auto-applies migrations locally)
 pnpm dev
-```
-
-3. Before deploying to production, apply migrations to your remote D1 database:
 
-```bash
+# Before deploying: apply migrations to production
 pnpm db:migrate:remote
-```
 
-4. Deploy:
-
-```bash
-pnpm deploy
+# Deploy
+pnpm cf:deploy
 ```
 
-> **Note:** New versions of `@jant/core` may include database migrations. Always run `pnpm db:migrate:remote` before deploying after an update. Check the [release notes](https://github.com/nicepkg/jant/releases) for any breaking changes.
+> New versions of `@jant/core` may include database migrations. Always run `pnpm db:migrate:remote` before deploying after an update. Check the [release notes](https://github.com/jant-me/jant/releases) for any breaking changes.
 
 ## Documentation
 
 - [Jant Documentation](https://jant.me/docs)
-- [GitHub Repository](https://github.com/nicepkg/jant)
+- [GitHub Repository](https://github.com/jant-me/jant)

package/template/_github/workflows/deploy.yml

@@ -1,23 +1,25 @@
 # Deploy to Cloudflare Workers
 # Documentation: https://jant.me/docs/deployment
 #
-# Required secrets (set in GitHub repo settings):
-#   - CF_API_TOKEN: Cloudflare API token with Workers/D1/R2 permissions
-#   - CF_ACCOUNT_ID: Your Cloudflare account ID
-#   - AUTH_SECRET: Random 32+ character string for authentication
+# Prerequisites:
+#   1. Complete manual deployment first (see README.md → Deploy to Cloudflare)
+#   2. Set GitHub secrets: CF_API_TOKEN and CF_ACCOUNT_ID
+#
+# Runtime secrets (AUTH_SECRET, S3 keys, etc.) are managed via
+# `wrangler secret put` and persist across deployments.
 
 name: Deploy
 
 on:
-  push:
-    branches:
-      - main
+  # Uncomment to auto-deploy on push after configuring secrets:
+  # push:
+  #   branches:
+  #     - main
   workflow_dispatch:
 
 jobs:
   deploy:
-    uses: nicepkg/jant/.github/workflows/deploy.yml@v1
+    uses: jant-me/jant/.github/workflows/deploy.yml@main
     secrets:
       CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
       CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
-      AUTH_SECRET: ${{ secrets.AUTH_SECRET }}

package/template/_gitignore

@@ -3,6 +3,7 @@ node_modules/
 
 # Build outputs
 dist/
+.swc/
 
 # Cloudflare
 .wrangler/

package/template/package.json

@@ -8,7 +8,7 @@
     "dev": "pnpm db:migrate:local && vite dev",
     "dev:debug": "pnpm db:migrate:local && vite dev --port 19019",
     "build": "vite build",
-    "deploy": "pnpm build && wrangler deploy",
+    "cf:deploy": "pnpm build && wrangler deploy",
     "preview": "vite preview",
     "typecheck": "tsc --noEmit",
     "db:migrate:local": "yes | wrangler d1 migrations apply DB --local",

package/template/scripts/seed-demo.sql

@@ -44,7 +44,7 @@ pnpm dev
 </code></pre>
 <p>Visit the <a href="/dash">dashboard</a> to create your own posts!</p>',NULL,NULL,NULL,NULL,NULL,NULL,1770689095,1770689095,1770689095);
 INSERT INTO posts VALUES(2,'note','quiet',NULL,NULL,'This is a demo note. Notes are short posts without titles, perfect for quick thoughts and updates.','<p>This is a demo note. Notes are short posts without titles, perfect for quick thoughts and updates.</p>',NULL,NULL,NULL,NULL,NULL,NULL,1770685495,1770685495,1770685495);
-INSERT INTO posts VALUES(3,'link','quiet','Jant on GitHub',NULL,'Check out the source code and documentation for Jant.','<p>Check out the source code and documentation for Jant.</p>','https://github.com/nicepkg/jant','GitHub','github.com',NULL,NULL,NULL,1770681895,1770681895,1770681895);
+INSERT INTO posts VALUES(3,'link','quiet','Jant on GitHub',NULL,'Check out the source code and documentation for Jant.','<p>Check out the source code and documentation for Jant.</p>','https://github.com/jant-me/jant','GitHub','github.com',NULL,NULL,NULL,1770681895,1770681895,1770681895);
 INSERT INTO posts VALUES(4,'quote','quiet',NULL,NULL,'The best way to predict the future is to invent it.','<p>The best way to predict the future is to invent it.</p>',NULL,'Alan Kay',NULL,NULL,NULL,NULL,1770678295,1770678295,1770678295);
 INSERT INTO posts VALUES(5,'image','quiet',NULL,NULL,'Image 1','<p>Image 1</p>
 ',NULL,NULL,NULL,NULL,NULL,NULL,1770758516,1770758516,1770758516);
@@ -82,7 +82,7 @@ cd my-blog
 pnpm dev
 
 # Deploy to Cloudflare
-pnpm deploy
+pnpm cf:deploy
 ```
 
 ## Documentation
@@ -147,7 +147,7 @@ cd my-blog
 pnpm dev
 
 # Deploy to Cloudflare
-pnpm deploy
+pnpm cf:deploy
 </code></pre>
 <h2>Documentation</h2>
 <ul>

package/template/wrangler.toml

@@ -42,11 +42,18 @@ R2_PUBLIC_URL = "https://demo-media.jant.me" # @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.
+# 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"
+# @create-jant: @remove-start
 STORAGE_DRIVER = "s3"
 S3_ENDPOINT = "https://s3.us-east-005.backblazeb2.com"
 S3_BUCKET = "jant-media"
 S3_REGION = "us-east-005"
 S3_PUBLIC_URL = "https://files.owenyoung.com/file/jant-media"
+# @create-jant: @remove-end
 
 [[d1_databases]]
 binding = "DB"