@kevinmarrec/create-app 0.5.0 → 0.6.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.5.0";
+var version = "0.6.0";
 
 //#endregion
 //#region src/utils/fs.ts

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@kevinmarrec/create-app",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.6.0",
+  "packageManager": "bun@1.2.22",
   "description": "CLI that scaffolds an opinionated Bun & Vue fullstack application.",
   "author": "Kevin Marrec <kevin@marrec.io>",
   "license": "MIT",
@@ -49,7 +50,7 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^10.0.0",
-    "@kevinmarrec/eslint-config": "^1.4.0",
+    "@kevinmarrec/eslint-config": "^1.5.0",
     "@kevinmarrec/stylelint-config": "^1.2.0",
     "@kevinmarrec/tsconfig": "^1.1.0",
     "@types/bun": "^1.2.22",
@@ -59,7 +60,7 @@
     "knip": "^5.63.1",
     "stylelint": "^16.24.0",
     "taze": "^19.7.0",
-    "tsdown": "^0.15.2",
+    "tsdown": "^0.15.4",
     "typescript": "^5.9.2",
     "vitest": "^3.2.4",
     "vue-tsc": "^3.0.7"

package/template/.vscode/extensions.json

@@ -6,13 +6,14 @@
     "antfu.unocss",
     "dbaeumer.vscode-eslint",
     "eamodio.gitlens",
-    "github.copilot",
+    "github.vscode-github-actions",
     "lokalise.i18n-ally",
     "mikestead.dotenv",
     "ms-azuretools.vscode-docker",
     "pkief.material-icon-theme",
     "redhat.vscode-yaml",
     "stylelint.vscode-stylelint",
+    "vitest.explorer",
     "vue.volar",
     "yoavbls.pretty-ts-errors"
   ]

package/template/.vscode/settings.json

@@ -51,6 +51,10 @@
     "vue"
   ],
 
+  "material-icon-theme.folders.associations": {
+    "orpc": "context"
+  },
+
   "javascript.format.semicolons": "remove",
   "javascript.preferences.quoteStyle": "single",
   "typescript.format.semicolons": "remove",

package/template/backend/package.json

@@ -5,14 +5,14 @@
   "scripts": {
     "dev": "bun --watch --no-clear-screen src/main.ts",
     "build": "bun build src/main.ts --compile --minify --sourcemap --outfile dist/server",
-    "db:generate": "bun --bun run drizzle-kit generate --config src/database/drizzle.config.ts",
-    "db:migrate": "bun --bun run drizzle-kit migrate --config src/database/drizzle.config.ts"
+    "db:generate": "bun --bun run drizzle-kit generate --config src/database/drizzle/config.ts",
+    "db:migrate": "bun --bun run drizzle-kit migrate --config src/database/drizzle/config.ts"
   },
   "dependencies": {
     "@orpc/server": "^1.8.9",
-    "better-auth": "^1.3.12",
+    "better-auth": "^1.3.13",
     "drizzle-orm": "^0.44.5",
-    "pino": "^9.10.0",
+    "pino": "^9.11.0",
     "valibot": "^1.1.0"
   },
   "devDependencies": {

package/template/backend/src/auth/index.ts

@@ -10,6 +10,7 @@ export function createBetterAuth({ db, logger }: { db: DB, logger: BaseLogger })
     }),
     logger: {
       log: (level, message) => {
+        if (level === 'error') return
         logger[level](message)
       },
     },
@@ -20,4 +21,3 @@ export function createBetterAuth({ db, logger }: { db: DB, logger: BaseLogger })
 }
 
 export type Auth = ReturnType<typeof createBetterAuth>
-export type Session = Auth['$Infer']['Session']

package/template/backend/src/main.ts

@@ -1,11 +1,13 @@
 import process from 'node:process'
 
-import { createBetterAuth } from './auth'
-import { rpcHandler } from './core'
-import { db } from './database'
-import { logger } from './utils/logger'
+import { createBetterAuth } from '@backend/auth'
+import { db } from '@backend/database'
+import { createRpcHandler } from '@backend/orpc'
+import { router } from '@backend/orpc/router'
+import { logger } from '@backend/utils/logger'
 
 const auth = createBetterAuth({ db, logger })
+const rpcHandler = createRpcHandler(router)
 
 const server = Bun.serve({
   hostname: import.meta.env.HOST ?? '0.0.0.0',

package/template/backend/src/orpc/index.ts

@@ -0,0 +1,65 @@
+import type { Auth } from '@backend/auth'
+import type { Database } from '@backend/database'
+import { requiredAuthMiddleware } from '@backend/orpc/middlewares'
+import type { Logger } from '@backend/utils/logger'
+import { onError, ORPCError, os, type Router } from '@orpc/server'
+import { RPCHandler } from '@orpc/server/fetch'
+import {
+  CORSPlugin,
+  RequestHeadersPlugin,
+  type RequestHeadersPluginContext,
+  ResponseHeadersPlugin,
+  type ResponseHeadersPluginContext,
+} from '@orpc/server/plugins'
+import { APIError } from 'better-auth/api'
+
+/* Context */
+
+export interface Context extends RequestHeadersPluginContext, ResponseHeadersPluginContext {
+  auth: Auth
+  db: Database
+  logger: Logger
+}
+
+/* RPC Handler */
+
+export function createRpcHandler<T extends Context>(router: Router<any, T>) {
+  return new RPCHandler<T>(router, {
+    plugins: [
+      new CORSPlugin({
+        credentials: true,
+        maxAge: 7200, // 2 hours https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Access-Control-Max-Age
+      }),
+      new RequestHeadersPlugin(),
+      new ResponseHeadersPlugin(),
+    ],
+    clientInterceptors: [
+      onError((error, { context }) => {
+        if (error instanceof APIError) {
+          throw new ORPCError(error.body?.code ?? 'INTERNAL_SERVER_ERROR', {
+            status: error.statusCode,
+            message: error.body?.message,
+          })
+        }
+
+        if (error instanceof ORPCError) {
+          throw error
+        }
+
+        context.logger.error(error)
+      }),
+    ],
+  })
+}
+
+/* Builder */
+
+export const pub = os
+  .$context<Context>()
+  .errors({
+    UNAUTHORIZED: { status: 401 },
+  })
+
+/** @beta */
+export const authed = pub
+  .use(requiredAuthMiddleware)

package/template/backend/src/{core → orpc}/middlewares/auth.ts

@@ -1,19 +1,15 @@
-import type { Session } from '@backend/auth'
-import type { Context } from '@backend/core/context'
-import { copyHeaders } from '@backend/utils/headers'
+import type { Context } from '@backend/orpc'
 import { ORPCError, os } from '@orpc/server'
 
 export const authMiddleware = os
   .$context<Context>()
   .middleware(async ({ context, next }) => {
-    const response = await context.auth.api.getSession({
+    const { headers, response: session } = await context.auth.api.getSession({
       headers: context.reqHeaders ?? new Headers(),
-      asResponse: true,
+      returnHeaders: true,
     })
 
-    const session = await response.json() as Session | null
-
-    copyHeaders(response.headers, context.resHeaders)
+    headers.forEach((v, k) => context.resHeaders?.append(k, v))
 
     return next({
       context: {

package/template/backend/src/orpc/middlewares/index.ts

@@ -0,0 +1 @@
+export * from './auth'

package/template/backend/src/{core → orpc}/router/auth.ts

@@ -1,6 +1,5 @@
-import { pub } from '@backend/core/builder'
-import { authMiddleware } from '@backend/core/middlewares/auth'
-import { copyHeaders } from '@backend/utils/headers'
+import { pub } from '@backend/orpc'
+import { authMiddleware } from '@backend/orpc/middlewares'
 import * as v from 'valibot'
 
 export const getCurrentUser = pub
@@ -20,7 +19,7 @@ export const signUp = pub
       returnHeaders: true,
     })
 
-    copyHeaders(headers, resHeaders)
+    headers.forEach((v, k) => resHeaders?.append(k, v))
 
     return response.user
   })
@@ -37,7 +36,7 @@ export const signIn = pub
       returnHeaders: true,
     })
 
-    copyHeaders(headers, resHeaders)
+    headers.forEach((v, k) => resHeaders?.append(k, v))
 
     return response.user
   })
@@ -49,7 +48,7 @@ export const signOut = pub
       returnHeaders: true,
     })
 
-    copyHeaders(headers, resHeaders)
+    headers.forEach((v, k) => resHeaders?.append(k, v))
 
     return response
   })

package/template/frontend/src/App.vue

@@ -52,8 +52,8 @@ const password = ref('')
               >
             </div>
 
-            <div v-if="signIn.error" class="text-sm text-red-600 dark:text-red-400">
-              {{ signIn.error }}
+            <div v-if="signIn.error.value || signUp.error.value" class="text-sm text-red-600 dark:text-red-400">
+              {{ signIn.error.value || signUp.error.value }}
             </div>
 
             <div class="flex space-x-3">

package/template/frontend/src/lib/orpc.ts

@@ -1,4 +1,4 @@
-import type { Router, RouterClient } from '@backend/core/router'
+import type { Router, RouterClient } from '@backend/orpc/router'
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'
 import { createTanstackQueryUtils } from '@orpc/tanstack-query'

package/template/knip.config.ts

@@ -12,7 +12,7 @@ export default {
     },
     'backend': {
       drizzle: {
-        config: 'src/database/drizzle.config.ts',
+        config: 'src/database/drizzle/config.ts',
       },
       ignoreDependencies: ['pino-pretty'],
     },

package/template/package.json

@@ -21,7 +21,7 @@
     "lint:inspect": "bunx @eslint/config-inspector"
   },
   "devDependencies": {
-    "@kevinmarrec/eslint-config": "^1.4.0",
+    "@kevinmarrec/eslint-config": "^1.5.0",
     "@kevinmarrec/stylelint-config": "^1.2.0",
     "@kevinmarrec/tsconfig": "^1.1.0",
     "concurrently": "^9.2.1",

package/template/backend/src/core/builder.ts

@@ -1,14 +0,0 @@
-import { os } from '@orpc/server'
-
-import type { Context } from './context'
-import { requiredAuthMiddleware } from './middlewares/auth'
-
-export const pub = os
-  .$context<Context>()
-  .errors({
-    UNAUTHORIZED: { status: 401 },
-  })
-
-/** @beta */
-export const authed = pub
-  .use(requiredAuthMiddleware)

package/template/backend/src/core/context.ts

@@ -1,10 +0,0 @@
-import type { Auth } from '@backend/auth'
-import type { Database } from '@backend/database'
-import type { Logger } from '@backend/utils/logger'
-import type { RequestHeadersPluginContext, ResponseHeadersPluginContext } from '@orpc/server/plugins'
-
-export interface Context extends RequestHeadersPluginContext, ResponseHeadersPluginContext {
-  auth: Auth
-  db: Database
-  logger: Logger
-}

package/template/backend/src/core/index.ts

@@ -1,33 +0,0 @@
-import { onError, ORPCError } from '@orpc/server'
-import { RPCHandler } from '@orpc/server/fetch'
-import { CORSPlugin, RequestHeadersPlugin, ResponseHeadersPlugin } from '@orpc/server/plugins'
-import { APIError } from 'better-auth/api'
-
-import { router } from './router'
-
-export const rpcHandler = new RPCHandler(router, {
-  plugins: [
-    new CORSPlugin({
-      credentials: true,
-      maxAge: 7200, // 2 hours https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Access-Control-Max-Age
-    }),
-    new RequestHeadersPlugin(),
-    new ResponseHeadersPlugin(),
-  ],
-  clientInterceptors: [
-    onError((error, { context }) => {
-      if (error instanceof APIError) {
-        throw new ORPCError(error.body?.code ?? 'INTERNAL_SERVER_ERROR', {
-          status: error.statusCode,
-          message: error.body?.message,
-        })
-      }
-
-      if (error instanceof ORPCError) {
-        throw error
-      }
-
-      context.logger.error(error)
-    }),
-  ],
-})

package/template/backend/src/utils/headers.ts

@@ -1,7 +0,0 @@
-function copyHeaders(source: Headers, destination?: Headers) {
-  source.forEach((value, key) => {
-    destination?.append(key, value)
-  })
-}
-
-export { copyHeaders }