create-jant 0.3.10 → 0.3.12

package/dist/index.js

@@ -2,13 +2,14 @@
 import { program } from "commander";
 import * as p from "@clack/prompts";
 import chalk from "chalk";
+import { execSync } from "child_process";
 import crypto from "crypto";
 import fs from "fs-extra";
 import path from "path";
 import { fileURLToPath } from "url";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
-var CORE_VERSION = "0.3.10";
+var CORE_VERSION = "0.3.12";
 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);
@@ -19,6 +20,34 @@ function toValidProjectName(name) {
 function generateAuthSecret() {
   return crypto.randomBytes(32).toString("base64");
 }
+function detectPackageManager() {
+  const userAgent = process.env.npm_config_user_agent;
+  if (userAgent) {
+    const name = userAgent.split("/")[0];
+    if (name === "pnpm" || name === "yarn" || name === "npm") {
+      return name;
+    }
+  }
+  for (const pm of ["pnpm", "yarn", "npm"]) {
+    try {
+      execSync(`${pm} --version`, { stdio: "ignore" });
+      return pm;
+    } catch {
+    }
+  }
+  return "npm";
+}
+function formatRunCmd(pm, script) {
+  return pm === "npm" ? `npm run ${script}` : `${pm} ${script}`;
+}
+function runCommand(cmd, cwd) {
+  try {
+    execSync(cmd, { stdio: "ignore", cwd });
+    return true;
+  } catch {
+    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,
@@ -41,7 +70,7 @@ function processMarkers(content, vars) {
   return content;
 }
 async function copyTemplate(config) {
-  const { projectName, targetDir } = config;
+  const { projectName, targetDir, packageManager } = config;
   await fs.copy(TEMPLATE_DIR, targetDir, {
     filter: (src) => {
       const basename = path.basename(src);
@@ -51,6 +80,10 @@ async function copyTemplate(config) {
       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;
@@ -82,6 +115,19 @@ async function copyTemplate(config) {
     if (pkg.dependencies?.["@jant/core"] === "workspace:*") {
       pkg.dependencies["@jant/core"] = `^${CORE_VERSION}`;
     }
+    if (packageManager !== "pnpm") {
+      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 (\S+)/g,
+              (_, script) => formatRunCmd(packageManager, script)
+            );
+          }
+        }
+      }
+    }
     await fs.writeJson(pkgPath, pkg, { spaces: 2 });
   }
   const wranglerPath = path.join(targetDir, "wrangler.toml");
@@ -126,11 +172,17 @@ S3_SECRET_ACCESS_KEY=
     content = processMarkers(content, {});
     await fs.writeFile(viteConfigPath, content, "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();
   p.intro(chalk.bgCyan.black(" create-jant "));
-  program.name("create-jant").description("Create a new Jant project").argument("[project-name]", "Name of the project").option("-y, --yes", "Skip prompts and use defaults").option("--s3", "Use S3-compatible storage instead of Cloudflare R2").parse();
+  program.name("create-jant").description("Create a new Jant project").argument("[project-name]", "Name of the project").option("-y, --yes", "Skip prompts and use defaults").option("--s3", "Use S3-compatible storage instead of Cloudflare R2").option("--no-install", "Skip dependency installation").option("--no-git", "Skip git initialization").parse();
   const args = program.args;
   const opts = program.opts();
   let projectName;
@@ -186,9 +238,13 @@ async function main() {
       await fs.emptyDir(targetDir);
     }
   }
+  const packageManager = detectPackageManager();
   const config = {
     projectName,
     targetDir,
+    packageManager,
+    install: opts.install,
+    git: opts.git,
     s3: opts.s3
   };
   const spinner2 = p.spinner();
@@ -201,11 +257,36 @@ async function main() {
     p.log.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
+  let installOk = false;
+  if (config.install) {
+    spinner2.start("Installing dependencies...");
+    installOk = runCommand(`${packageManager} install`, targetDir);
+    if (installOk) {
+      spinner2.stop("Dependencies installed.");
+    } else {
+      spinner2.stop(
+        chalk.yellow(
+          `Failed to install dependencies. Run ${chalk.bold(`${packageManager} install`)} manually.`
+        )
+      );
+    }
+  }
+  if (config.git) {
+    spinner2.start("Initializing git repository...");
+    const gitOk = runCommand("git init", targetDir) && runCommand("git add -A", targetDir) && runCommand('git commit -m "Initial commit"', targetDir);
+    if (gitOk) {
+      spinner2.stop("Git repository initialized.");
+    } else {
+      spinner2.stop("Skipped git initialization.");
+    }
+  }
+  const steps = [`cd ${projectName}`];
+  if (!config.install || !installOk) {
+    steps.push(`${packageManager} install`);
+  }
+  steps.push(formatRunCmd(packageManager, "dev"));
   console.log();
-  p.note(
-    [`cd ${projectName}`, "pnpm install", "pnpm dev"].join("\n"),
-    "Next steps"
-  );
+  p.note(steps.join("\n"), "Next steps");
   p.outro(chalk.green("Happy coding!"));
 }
 main().catch((error) => {

package/package.json

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

package/template/README.md

@@ -1,103 +1,77 @@
 # 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
 ```
 
 Visit http://localhost:9019 to see your site.
 
+> Your `.dev.vars` file was automatically generated with a secure `AUTH_SECRET`. See `.dev.vars.example` for all available secret variables.
+
 ## 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!
-
-# Create R2 bucket for media storage
-wrangler r2 bucket create my-blog-media
+wrangler d1 create <your-project>-db
+# Copy the database_id from the output!
 ```
 
-### 2. Update Configuration
+Replace `<your-project>` with your project name (must match `database_name` in `wrangler.toml`).
 
-Edit `wrangler.toml` with your resource IDs:
+### 3. Update Configuration
 
-```toml
-name = "my-blog"  # Your worker name
+Edit `wrangler.toml`:
 
-[[d1_databases]]
-binding = "DB"
-database_name = "my-blog-db"
-database_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"  # From step 1
+- Replace `database_id = "local"` with the ID from step 2
+- Set `SITE_URL` to your production URL
 
-[[r2_buckets]]
-binding = "R2"
-bucket_name = "my-blog-media"
-```
+> R2 bucket is automatically created on first deploy — no manual setup needed.
 
-### 3. Set Secrets
+### 4. Set Production Secrets
 
 ```bash
-# Set authentication secret (use a random 32+ character string)
 wrangler secret put AUTH_SECRET
-# Enter your secret when prompted
-```
-
-### 4. Run Migrations
-
-```bash
-# Apply database migrations
-wrangler d1 migrations apply my-blog-db --remote
+# Enter a random 32+ character string when prompted
+# Generate one with: openssl rand -base64 32
 ```
 
 ### 5. Deploy
 
 ```bash
+# Apply database migrations to production
+pnpm db:migrate:remote
+
 # Build and deploy
 pnpm 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. 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`. You just need to configure secrets.
 
 #### 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,41 +80,30 @@ 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
-
-7. **Zone Resources**:
-   - Select **Include** → **All zones from an account** → Choose your account
-
-8. Click **Continue to summary** → **Create Token**
-9. Copy the token (you won't see it again!)
+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
 
 #### Add GitHub Secrets
 
-Go to your GitHub repo → **Settings** → **Secrets and variables** → **Actions** → **New repository secret**:
+Go to your repo → **Settings** → **Secrets and variables** → **Actions**:
 
-| 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**)      |
+| Secret Name     | Value                                                                    |
+| --------------- | ------------------------------------------------------------------------ |
+| `CF_API_TOKEN`  | API token from above                                                     |
+| `CF_ACCOUNT_ID` | Your Cloudflare Account ID (found in dashboard URL or `wrangler whoami`) |
+| `AUTH_SECRET`   | Random 32+ character string (`openssl rand -base64 32`)                  |
 
-> **Important**: `AUTH_SECRET` must be at least 32 characters long. You can generate one with:
->
-> ```bash
-> openssl rand -base64 32
-> ```
-
-That's it! Push to `main` branch to trigger deployment.
+Push to `main` to trigger deployment.
 
 #### 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@v1
     with:
       environment: production # Uses [env.production] in wrangler.toml
     secrets:
@@ -151,35 +114,29 @@ jobs:
 
 ### 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`)
+1. Go to [Cloudflare Dashboard](https://dash.cloudflare.com) → Workers & Pages
+2. Select your worker → Settings → Triggers
+3. Click **Add Custom Domain** and enter your domain
 
 ## 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 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 +204,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
+# Deploy
 pnpm 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

@@ -16,7 +16,7 @@ on:
 
 jobs:
   deploy:
-    uses: nicepkg/jant/.github/workflows/deploy.yml@v1
+    uses: jant-me/jant/.github/workflows/deploy.yml@v1
     secrets:
       CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
       CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}

package/template/_gitignore

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

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);

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"