@kevinmarrec/create-app 0.10.0 → 0.11.0

package/dist/index.js

@@ -8,7 +8,7 @@ import { x } from "tinyexec";
 import fs from "node:fs/promises";
 
 //#region package.json
-var version = "0.10.0";
+var version = "0.11.0";
 
 //#endregion
 //#region src/utils/fs.ts

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@kevinmarrec/create-app",
   "type": "module",
-  "version": "0.10.0",
-  "packageManager": "bun@1.3.2",
+  "version": "0.11.0",
+  "packageManager": "bun@1.3.3",
   "description": "CLI that scaffolds an opinionated Bun & Vue fullstack application.",
   "author": "Kevin Marrec <kevin@marrec.io>",
   "license": "MIT",
@@ -53,18 +53,18 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^10.1.0",
-    "@kevinmarrec/eslint-config": "^1.5.6",
-    "@kevinmarrec/stylelint-config": "^1.5.6",
-    "@kevinmarrec/tsconfig": "^1.5.6",
-    "@types/bun": "^1.3.2",
-    "@vitest/coverage-v8": "^4.0.9",
+    "@kevinmarrec/eslint-config": "^1.5.7",
+    "@kevinmarrec/stylelint-config": "^1.5.7",
+    "@kevinmarrec/tsconfig": "^1.5.7",
+    "@types/bun": "^1.3.3",
+    "@vitest/coverage-v8": "^4.0.13",
     "bumpp": "^10.3.1",
     "eslint": "^9.39.1",
-    "knip": "^5.69.1",
-    "stylelint": "^16.25.0",
-    "tsdown": "^0.16.4",
+    "knip": "^5.70.1",
+    "stylelint": "^16.26.0",
+    "tsdown": "^0.16.6",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.9",
-    "vue-tsc": "^3.1.4"
+    "vitest": "^4.0.13",
+    "vue-tsc": "^3.1.5"
   }
 }

package/template/.docker/postgres/init.sql

@@ -0,0 +1,5 @@
+-- Main database
+CREATE DATABASE app;
+
+-- Analytics database
+CREATE DATABASE analytics;

package/template/.github/scripts/build-stats.md.ts

@@ -7,47 +7,23 @@ import { filesize } from 'filesize'
 import { x } from 'tinyexec'
 import { glob } from 'tinyglobby'
 
-interface FileStats {
-  file: string
-  size: number
-}
-
 async function getFileStats(directory: string) {
-  const fileStats: FileStats[] = []
-
-  for (const file of await glob(['**/*'], { cwd: directory })) {
-    const size = fs.statSync(path.join(directory, file)).size
-    fileStats.push({
+  const fileStats = await Promise.all(
+    (await glob(['**/*'], { cwd: directory })).map(async file => ({
       file,
-      size,
-    })
-  }
+      size: fs.statSync(path.join(directory, file)).size,
+    })),
+  )
 
   fileStats.sort((a, b) => {
-    // Sort so that files starting with 'assets/' come first
-    if (a.file.startsWith('assets/') && !b.file.startsWith('assets/')) return -1
-    if (!a.file.startsWith('assets/') && b.file.startsWith('assets/')) return 1
-
-    // Within that, files ending with '.js' come first
-    if (a.file.endsWith('.js') && !b.file.endsWith('.js')) return -1
-    if (!a.file.endsWith('.js') && b.file.endsWith('.js')) return 1
-
-    // Otherwise sort alphabetically
-    return a.file.localeCompare(b.file)
+    const scoreA = (a.file.startsWith('assets/') ? 2 : 0) + (a.file.endsWith('.js') ? 1 : 0)
+    const scoreB = (b.file.startsWith('assets/') ? 2 : 0) + (b.file.endsWith('.js') ? 1 : 0)
+    return scoreB - scoreA || a.file.localeCompare(b.file)
   })
 
   return fileStats
 }
 
-async function generateFileStatsMarkdown(directory: string) {
-  const fileStats = await getFileStats(directory)
-  return [
-    '| File | Size |',
-    '| :--- | ---: |',
-    ...fileStats.map(file => `| ${file.file} | ${filesize(file.size)} |`),
-  ].join('\n')
-}
-
 async function main() {
   const { positionals: [directory] } = parseArgs({
     args: process.argv.slice(2),
@@ -61,7 +37,12 @@ async function main() {
 
   await x('bun', ['run', 'build'], { nodeOptions: { cwd: directory } })
 
-  const markdownTable = await generateFileStatsMarkdown(path.join(directory, 'dist'))
+  const fileStats = await getFileStats(path.join(directory, 'dist'))
+  const markdownTable = [
+    '| File | Size |',
+    '| :--- | ---: |',
+    ...fileStats.map(file => `| ${file.file} | ${filesize(file.size)} |`),
+  ].join('\n')
   process.stdout.write(`${markdownTable}\n`)
 }
 

package/template/README.md

@@ -199,6 +199,7 @@ bun run db:migrate
 
 ### Root Level Scripts
 
+- `bun run dev` - Alias for `docker compose`
 - `bun run check` - Run all checks (ESLint, Stylelint, unused dependencies, TypeScript)
 - `bun run lint` - Run linting (ESLint and Stylelint)
 - `bun run lint:inspect` - Open ESLint config inspector

package/template/api/package.json

@@ -10,14 +10,14 @@
   },
   "dependencies": {
     "@libsql/client": "^0.15.15",
-    "@orpc/server": "^1.11.2",
-    "better-auth": "^1.3.34",
+    "@orpc/server": "^1.11.3",
+    "better-auth": "^1.4.1",
     "drizzle-orm": "^0.44.7",
     "pino": "^10.1.0",
     "valibot": "^1.1.0"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.2",
+    "@types/bun": "^1.3.3",
     "drizzle-kit": "^0.31.7",
     "pg": "^8.16.3",
     "pino-pretty": "^13.1.2"

package/template/api/src/utils/cors.ts

@@ -13,7 +13,7 @@ export function cors(handler: (req: Request) => Promise<Response>) {
       : await handler(req)
 
     if (req.method === 'OPTIONS') {
-      response.headers.append('Access-Control-Allow-Headers', 'Content-Type')
+      response.headers.append('Access-Control-Allow-Headers', 'Content-Type, Authorization, User-Agent')
       response.headers.append('Access-Control-Allow-Methods', 'GET, HEAD, PUT, POST, DELETE, PATCH')
       response.headers.append('Access-Control-Max-Age', '7200') // 2 hours https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Access-Control-Max-Age
     }

package/template/app/.env

@@ -1 +1,3 @@
 VITE_API_URL=https://api.dev.localhost
+VITE_ANALYTICS_URL=https://analytics.dev.localhost
+VITE_ANALYTICS_WEBSITE_ID=bcb4bcfc-9f60-4dc1-8fd3-e522e3089c6f

package/template/app/index.html

@@ -6,6 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="color-scheme" content="dark light" />
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <link rel="preconnect" href="%VITE_API_URL%" crossorigin />
+    <link rel="dns-prefetch" href="%VITE_ANALYTICS_URL%" />
+    <script defer src="%VITE_ANALYTICS_URL%/script.js" data-website-id="%VITE_ANALYTICS_WEBSITE_ID%"></script>
     <title>Title</title>
   </head>
   <body class="font-sans">

package/template/app/package.json

@@ -10,26 +10,26 @@
   },
   "dependencies": {
     "@kevinmarrec/vue-i18n": "^1.1.3",
-    "@orpc/client": "^1.11.2",
-    "@orpc/tanstack-query": "1.11.2",
+    "@orpc/client": "^1.11.3",
+    "@orpc/tanstack-query": "^1.11.3",
     "@tanstack/query-core": "^5.90.10",
     "@tanstack/vue-query": "^5.91.2",
     "@unhead/vue": "^2.0.19",
     "@vueuse/core": "^14.0.0",
-    "better-auth": "^1.3.34",
-    "unocss": "^66.5.6",
+    "better-auth": "^1.4.1",
+    "unocss": "^66.5.9",
     "vue": "^3.5.24"
   },
   "devDependencies": {
-    "@kevinmarrec/unocss-config": "^1.5.6",
+    "@kevinmarrec/unocss-config": "^1.5.7",
     "@kevinmarrec/vite-plugin-dark-mode": "^1.1.2",
     "@modyfi/vite-plugin-yaml": "^1.1.1",
     "@unhead/addons": "^2.0.19",
-    "@vitejs/plugin-vue": "^6.0.1",
+    "@vitejs/plugin-vue": "^6.0.2",
     "beasties": "^0.3.5",
     "rollup-plugin-visualizer": "^6.0.5",
-    "vite": "^7.2.2",
-    "vite-plugin-vue-devtools": "^8.0.3",
+    "vite": "^7.2.4",
+    "vite-plugin-vue-devtools": "^8.0.5",
     "vite-ssg": "^28.2.2",
     "vite-tsconfig-paths": "^5.1.4"
   }

package/template/app/src/App.vue

@@ -6,11 +6,6 @@ import { useAuth, useContent, useHead, useI18n } from '~/app/composables'
 const { t } = useI18n()
 useHead({
   title: () => t('title'),
-  link: [{
-    rel: 'preconnect',
-    href: new URL(import.meta.env.VITE_API_URL).origin,
-    crossorigin: '',
-  }],
 })
 
 const { user, signIn, signUp, signOut } = useAuth()

package/template/app/src/env.d.ts

@@ -2,6 +2,8 @@
 
 interface ImportMetaEnv {
   readonly VITE_API_URL: string
+  readonly VITE_ANALYTICS_URL: string
+  readonly VITE_ANALYTICS_WEBSITE_ID: string
 }
 
 interface ImportMeta {

package/template/compose.yaml

@@ -38,7 +38,7 @@ services:
       test: [CMD-SHELL, traefik healthcheck --ping]
       interval: 1s
       timeout: 1s
-      retries: 10
+      retries: 20
     labels:
       traefik.enable: 'true'
       traefik.http.routers.traefik.rule: Host(`traefik.dev.localhost`)
@@ -52,16 +52,16 @@ services:
     environment:
       - POSTGRES_USER=user
       - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=app
     ports:
       - 5432:5432
     volumes:
       - postgres_data:/var/lib/postgresql/data
+      - ./.docker/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
     healthcheck:
       test: [CMD-SHELL, "psql postgresql://user:password@postgres:5432/app -c 'SELECT 1' 2> /dev/null"]
       interval: 1s
       timeout: 1s
-      retries: 10
+      retries: 20
 
   metabase:
     image: metabase/metabase:v0.57.x
@@ -121,6 +121,47 @@ services:
       traefik.http.routers.app.tls: 'true'
       traefik.http.services.app.loadbalancer.server.port: '5173'
 
+  studio:
+    depends_on:
+      traefik:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+    container_name: studio
+    image: ghcr.io/drizzle-team/gateway:latest
+    environment:
+      - MASTERPASS=foobar
+    volumes:
+      - studio_data:/app
+    labels:
+      traefik.enable: 'true'
+      traefik.http.routers.studio.rule: Host(`studio.dev.localhost`)
+      traefik.http.routers.studio.entrypoints: websecure
+      traefik.http.routers.studio.tls: 'true'
+      traefik.http.services.studio.loadbalancer.server.port: '4983'
+
+  analytics:
+    depends_on:
+      traefik:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+    container_name: analytics
+    image: umamisoftware/umami:3
+    environment:
+      - DATABASE_URL=postgresql://user:password@postgres:5432/analytics
+    healthcheck:
+      test: [CMD-SHELL, curl -f http://localhost:3000]
+      interval: 1s
+      timeout: 1s
+      retries: 20
+    labels:
+      traefik.enable: 'true'
+      traefik.http.routers.analytics.rule: Host(`analytics.dev.localhost`)
+      traefik.http.routers.analytics.entrypoints: websecure
+      traefik.http.routers.analytics.tls: 'true'
+      traefik.http.services.analytics.loadbalancer.server.port: '3000'
+
 networks:
   default:
     name: dev
@@ -128,3 +169,4 @@ networks:
 volumes:
   postgres_data:
   metabase_data:
+  studio_data:

package/template/package.json

@@ -2,7 +2,7 @@
   "name": "project",
   "type": "module",
   "private": true,
-  "packageManager": "bun@1.3.2",
+  "packageManager": "bun@1.3.3",
   "engines": {
     "node": "lts/*"
   },
@@ -16,21 +16,22 @@
     "check:stylelint": "stylelint '**/*.{css,scss,vue}' --ignorePath .gitignore --cache",
     "check:types": "vue-tsc --noEmit",
     "check:unused": "knip -n",
+    "dev": "docker compose",
     "lint": "bun run check:eslint && bun run check:stylelint",
     "lint:inspect": "bunx @eslint/config-inspector",
     "update": "bunx taze -I -rwi"
   },
   "devDependencies": {
-    "@kevinmarrec/eslint-config": "^1.5.6",
-    "@kevinmarrec/stylelint-config": "^1.5.6",
-    "@kevinmarrec/tsconfig": "^1.5.6",
+    "@kevinmarrec/eslint-config": "^1.5.7",
+    "@kevinmarrec/stylelint-config": "^1.5.7",
+    "@kevinmarrec/tsconfig": "^1.5.7",
     "eslint": "^9.39.1",
     "filesize": "^11.0.13",
-    "knip": "^5.69.1",
-    "stylelint": "^16.25.0",
+    "knip": "^5.70.1",
+    "stylelint": "^16.26.0",
     "tinyexec": "^1.0.2",
     "tinyglobby": "^0.2.15",
     "typescript": "~5.9.3",
-    "vue-tsc": "^3.1.4"
+    "vue-tsc": "^3.1.5"
   }
 }