create-kofi-stack 1.2.12 → 1.2.14

package/dist/index.js

@@ -1877,47 +1877,74 @@ export default defineSchema({
   await writeFile(path6.join(convexDir, "schema.ts"), content);
 }
 async function generateAuthTs(config, convexDir) {
-  let content = `import { BetterAuth } from '@convex-dev/better-auth'
+  let content = `import { createClient, type GenericCtx } from '@convex-dev/better-auth'
+import { convex } from '@convex-dev/better-auth/plugins'
+import { betterAuth } from 'better-auth'
 import { components } from './_generated/api'
 import type { DataModel } from './_generated/dataModel'
+import { query } from './_generated/server'
+import authConfig from './auth.config'
 
-export const { auth, createAuth } = new BetterAuth<DataModel>(components.betterAuth, {
-  emailAndPassword: {
-    enabled: true,
-  },
-  socialProviders: {
-    google: {
-      clientId: process.env.GOOGLE_CLIENT_ID!,
-      clientSecret: process.env.GOOGLE_CLIENT_SECRET!,
-    },`;
+const siteUrl = process.env.SITE_URL || process.env.NEXT_PUBLIC_APP_URL || 'http://localhost:3000'
+
+// The component client has methods for integrating Convex with Better Auth
+export const authComponent = createClient<DataModel>(components.betterAuth)
+
+// Create the Better Auth instance with Convex adapter
+export const createAuth = (ctx: GenericCtx<DataModel>) => {
+  return betterAuth({
+    baseURL: siteUrl,
+    database: authComponent.adapter(ctx),
+    emailAndPassword: {
+      enabled: true,
+      requireEmailVerification: false,
+    },
+    socialProviders: {
+      google: {
+        clientId: process.env.GOOGLE_CLIENT_ID!,
+        clientSecret: process.env.GOOGLE_CLIENT_SECRET!,
+      },`;
   for (const provider of config.auth.providers) {
     const envPrefix = provider.toUpperCase();
     content += `
-    ${provider}: {
-      clientId: process.env.${envPrefix}_CLIENT_ID!,
-      clientSecret: process.env.${envPrefix}_CLIENT_SECRET!,
-    },`;
+      ${provider}: {
+        clientId: process.env.${envPrefix}_CLIENT_ID!,
+        clientSecret: process.env.${envPrefix}_CLIENT_SECRET!,
+      },`;
   }
   content += `
-  },`;
+    },`;
   if (config.auth.organizations) {
     content += `
-  organization: {
-    enabled: true,
-  },`;
+    organization: {
+      enabled: true,
+    },`;
   }
   content += `
+    plugins: [
+      convex({ authConfig }),
+    ],
+  })
+}
+
+// Get the current authenticated user
+export const getCurrentUser = query({
+  args: {},
+  handler: async (ctx) => {
+    return authComponent.getAuthUser(ctx)
+  },
 })
 `;
   await writeFile(path6.join(convexDir, "auth.ts"), content);
 }
 async function generateHttp(convexDir) {
   const content = `import { httpRouter } from 'convex/server'
-import { auth } from './auth'
+import { authComponent } from './auth'
 
 const http = httpRouter()
 
-auth.addHttpRoutes(http)
+// Add Better Auth HTTP routes
+authComponent.addHttpRoutes(http)
 
 export default http
 `;
@@ -1990,7 +2017,8 @@ async function generateConvexPackageJson(convexDir) {
     types: "./convex/index.ts",
     dependencies: {
       convex: "^1.25.0",
-      "@convex-dev/better-auth": "^0.10.10"
+      "@convex-dev/better-auth": "^0.10.10",
+      "better-auth": "^1.4.9"
     },
     devDependencies: {
       typescript: "^5.0.0"
@@ -3172,14 +3200,26 @@ async function generateUIPackage(config, targetDir) {
   };
   await writeJSON(path14.join(uiDir, "package.json"), packageJson2);
   const tsConfig = {
-    extends: "@repo/config-typescript/base.json",
     compilerOptions: {
+      target: "ES2020",
+      lib: ["dom", "dom.iterable", "esnext"],
+      allowJs: true,
+      skipLibCheck: true,
+      strict: true,
+      noEmit: true,
+      esModuleInterop: true,
+      module: "esnext",
+      moduleResolution: "bundler",
+      resolveJsonModule: true,
+      isolatedModules: true,
       jsx: "react-jsx",
+      incremental: true,
       paths: {
         "@/*": ["./src/*"]
       }
     },
-    include: ["src/**/*"]
+    include: ["src/**/*"],
+    exclude: ["node_modules"]
   };
   await writeJSON(path14.join(uiDir, "tsconfig.json"), tsConfig);
   const style = `${config.shadcn.componentLibrary}-${config.shadcn.styleVariant}`;
@@ -4171,8 +4211,21 @@ export default withPayload(nextConfig)
 }
 async function generatePayloadTsConfig(marketingDir) {
   const tsConfig = {
-    extends: "@repo/config-typescript/nextjs.json",
     compilerOptions: {
+      target: "ES2017",
+      lib: ["dom", "dom.iterable", "esnext"],
+      allowJs: true,
+      skipLibCheck: true,
+      strict: true,
+      noEmit: true,
+      esModuleInterop: true,
+      module: "esnext",
+      moduleResolution: "bundler",
+      resolveJsonModule: true,
+      isolatedModules: true,
+      jsx: "preserve",
+      incremental: true,
+      plugins: [{ name: "next" }],
       paths: {
         "@/*": ["./src/*"]
       }
@@ -4272,10 +4325,24 @@ export default withMDX(config)
 }
 async function generateFumadocsTsConfig(docsDir) {
   const tsConfig = {
-    extends: "@repo/config-typescript/nextjs.json",
     compilerOptions: {
+      target: "ES2020",
+      lib: ["dom", "dom.iterable", "esnext"],
+      allowJs: true,
+      skipLibCheck: true,
+      strict: true,
+      noEmit: true,
+      esModuleInterop: true,
+      module: "esnext",
+      moduleResolution: "bundler",
+      resolveJsonModule: true,
+      isolatedModules: true,
+      jsx: "preserve",
+      incremental: true,
+      plugins: [{ name: "next" }],
       paths: {
-        "@/*": ["./src/*"]
+        "@/*": ["./src/*"],
+        "@/.source": ["./.source/index.ts"]
       }
     },
     include: [
@@ -4291,12 +4358,13 @@ async function generateFumadocsTsConfig(docsDir) {
   await writeJSON(path16.join(docsDir, "tsconfig.json"), tsConfig);
 }
 async function generateFumadocsSource(docsDir) {
-  const content = `import { docs } from 'fumadocs-mdx:collections/server'
+  const content = `import { docs, meta } from '@/.source'
 import { loader } from 'fumadocs-core/source'
+import { createMDXSource } from 'fumadocs-mdx'
 
 export const source = loader({
   baseUrl: '/docs',
-  source: docs.toFumadocsSource(),
+  source: createMDXSource(docs, meta),
 })
 `;
   await writeFile(path16.join(docsDir, "src/lib/source.ts"), content);
@@ -4419,7 +4487,7 @@ export default function HomePage() {
   await writeFile(path16.join(docsDir, "src/app/global.css"), globalCssContent);
   const sourceConfigContent = `import { defineDocs, defineConfig } from 'fumadocs-mdx/config'
 
-export const docs = defineDocs({
+export const { docs, meta } = defineDocs({
   dir: 'content/docs',
 })
 
@@ -4837,9 +4905,21 @@ async function generatePackageJson2(config, appDir) {
 }
 async function generateTsConfig2(appDir) {
   const tsConfig = {
-    extends: "@repo/config-typescript/nextjs.json",
     compilerOptions: {
+      target: "ES2017",
+      lib: ["dom", "dom.iterable", "esnext"],
+      allowJs: true,
+      skipLibCheck: true,
+      strict: true,
+      noEmit: true,
+      esModuleInterop: true,
+      module: "esnext",
+      moduleResolution: "bundler",
+      resolveJsonModule: true,
+      isolatedModules: true,
       jsx: "preserve",
+      incremental: true,
+      plugins: [{ name: "next" }],
       paths: {
         "@/*": ["./src/*"],
         "@repo/ui": ["../../packages/ui/src"],
@@ -7023,8 +7103,21 @@ async function generateHuskyHooks(targetDir) {
 }
 async function updateWebTsConfig(webDir) {
   const tsConfig = {
-    extends: "@repo/config-typescript/nextjs.json",
     compilerOptions: {
+      target: "ES2017",
+      lib: ["dom", "dom.iterable", "esnext"],
+      allowJs: true,
+      skipLibCheck: true,
+      strict: true,
+      noEmit: true,
+      esModuleInterop: true,
+      module: "esnext",
+      moduleResolution: "bundler",
+      resolveJsonModule: true,
+      isolatedModules: true,
+      jsx: "preserve",
+      incremental: true,
+      plugins: [{ name: "next" }],
       paths: {
         "@/*": ["./src/*"]
       }
@@ -7134,8 +7227,21 @@ export default function RootLayout({
     globalsCss
   );
   const tsConfig = {
-    extends: "@repo/config-typescript/nextjs.json",
     compilerOptions: {
+      target: "ES2017",
+      lib: ["dom", "dom.iterable", "esnext"],
+      allowJs: true,
+      skipLibCheck: true,
+      strict: true,
+      noEmit: true,
+      esModuleInterop: true,
+      module: "esnext",
+      moduleResolution: "bundler",
+      resolveJsonModule: true,
+      isolatedModules: true,
+      jsx: "preserve",
+      incremental: true,
+      plugins: [{ name: "next" }],
       paths: {
         "@/*": ["./src/*"]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-kofi-stack",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "description": "Scaffold opinionated full-stack projects with Next.js, Convex, Better-Auth, and more",
   "type": "module",
   "bin": {