feat: update cli

Author: tiesen243

.changeset/goofy-banks-hear.md

@@ -0,0 +1,5 @@
+---
+'create-yuki-stack': minor
+---
+
+update cli

bun.lock

@@ -1,4 +1,5 @@
 import { defineConfig } from 'eslint/config'
+
 import baseConfig from '@yuki/eslint-config/base'
 import reactConfig from '@yuki/eslint-config/react'
 

cli/eslint.config.js

@@ -42,6 +42,7 @@
     "lint": "eslint",
     "typecheck": "tsc --noEmit"
   },
+  "prettier": "@yuki/prettier-config",
   "dependencies": {
     "@clack/prompts": "^0.11.0",
     "@trpc/server": "^11.7.2",
@@ -53,6 +54,7 @@
   "devDependencies": {
     "@types/node": "catalog:",
     "@yuki/eslint-config": "workspace:*",
+    "@yuki/prettier-config": "workspace:*",
     "@yuki/tsconfig": "workspace:*",
     "eslint": "catalog:",
     "prettier": "catalog:",

cli/package.json

@@ -28,7 +28,7 @@ export async function addEmailMonorepo(spinner?: ReturnType<typeof p.spinner>) {
 
   await fs.cp(templatePath, destPath, { recursive: true })
 
-  await addEnv('server', 'RESEND_TOKEN', 'z.string()')
+  await addEnv('RESEND_TOKEN', 'z.string()')
 
   const { name, packageManager } = await getProjectMetadata()
 

cli/src/commands/add-email/index.ts

@@ -38,4 +38,4 @@ export const APP_TITLE = `
  ╚════██║    ██║    ██╔══██║ ██║      ██╔═██╗ 
  ███████║    ██║    ██║  ██║ ╚██████╗ ██║  ██╗
  ╚══════╝    ╚═╝    ╚═╝  ╚═╝  ╚═════╝ ╚═╝  ╚═╝`
-export const APP_COLORS = ['#c3c0ff', '#c7c4dd', '#eab9d2']
+export const APP_COLORS = ['#5a7de4', '#9ab0e5', '#dbe6f6']

cli/src/commands/init/constants.ts

@@ -30,7 +30,7 @@ export async function addApi(opts: ProjectOptions): Promise<void> {
     ])
   }
 
-  const [packageJson] = await Promise.all([
+  const [packageJson, libPackageJson] = await Promise.all([
     fs
       .readFile(
         opts.backend === 'none'
@@ -39,6 +39,9 @@ export async function addApi(opts: ProjectOptions): Promise<void> {
         'utf-8',
       )
       .then((data) => JSON.parse(data) as PackageJson),
+    fs
+      .readFile('packages/lib/package.json', 'utf-8')
+      .then((data) => JSON.parse(data) as PackageJson),
     fs.copyFile(
       new URL(
         `src/${opts.api}/${opts.database !== 'none' ? 'db' : 'none'}.${opts.auth}.ts`,
@@ -60,10 +63,15 @@ export async function addApi(opts: ProjectOptions): Promise<void> {
   ])
 
   packageJson.dependencies = packageJson.dependencies ?? {}
+  libPackageJson.dependencies = libPackageJson.dependencies ?? {}
   if (opts.api === 'trpc') {
     packageJson.dependencies['@trpc/server'] = 'catalog:trpc'
     packageJson.dependencies.superjson = 'catalog:trpc'
-  } else packageJson.dependencies['@orpc/server'] = 'catalog:orpc'
+    libPackageJson.dependencies.superjson = 'catalog:trpc'
+  } else {
+    packageJson.dependencies['@orpc/server'] = 'catalog:orpc'
+    libPackageJson.dependencies['@orpc/client'] = 'catalog:orpc'
+  }
 
   if (opts.backend === 'none') {
     if (opts.database !== 'none')
@@ -76,4 +84,9 @@ export async function addApi(opts: ProjectOptions): Promise<void> {
     `${destPath}/package.json`,
     JSON.stringify(packageJson, null, 2),
   )
+
+  await fs.writeFile(
+    'packages/lib/package.json',
+    JSON.stringify(libPackageJson, null, 2),
+  )
 }

cli/src/commands/init/create/api.ts

@@ -54,7 +54,7 @@ export async function addAuth(opts: ProjectOptions): Promise<void> {
     packageJson.dependencies['better-auth'] = versions['better-auth']
     if (opts.database === 'mongoose')
       packageJson.dependencies.mongodb = versions.mongodb
-  } else {
+  } else if (opts.auth === 'next-auth') {
     packageJson.dependencies['next-auth'] = versions['next-auth@beta']
     if (opts.database === 'drizzle')
       packageJson.dependencies['@auth/drizzle-adapter'] =
@@ -73,6 +73,7 @@ export async function addAuth(opts: ProjectOptions): Promise<void> {
     JSON.stringify(packageJson, null, 2),
   )
 
-  await addEnv('server', 'AUTH_DISCORD_ID', 'z.string()')
-  await addEnv('server', 'AUTH_DISCORD_SECRET', 'z.string()')
+  await addEnv('AUTH_SECRET', 'z.optional(z.string())')
+  await addEnv('AUTH_DISCORD_ID', 'z.string()')
+  await addEnv('AUTH_DISCORD_SECRET', 'z.string()')
 }

cli/src/commands/init/create/auth.ts

@@ -1,7 +1,6 @@
 import fs from 'node:fs/promises'
 
 import type { ProjectOptions } from '@/commands/init/types'
-import { addEnv } from '@/utils/add-env'
 import {
   getPackageVersion,
   getPackageVersions,
@@ -19,7 +18,6 @@ export async function addBackend(opts: ProjectOptions): Promise<void> {
       'apps/api',
       { recursive: true, force: true },
     )
-    await addEnv('client', 'NEXT_PUBLIC_API_URL', 'z.optional(z.string())')
     return
   }
 
@@ -114,8 +112,6 @@ export async function addBackend(opts: ProjectOptions): Promise<void> {
     if (modifiedContent !== serverContent)
       await fs.writeFile(`${srcDir}/server.ts`, modifiedContent)
   }
-
-  await addEnv('client', 'API_URL', 'z.optional(z.string())')
 }
 
 async function configureBackendDependencies(

cli/src/commands/init/create/backend.ts

@@ -3,7 +3,7 @@ import fs from 'node:fs/promises'
 import type { ProjectOptions } from '@/commands/init/types'
 
 const versionMap = new Map<string, string>([
-  ['node', '22.0.0'],
+  ['node', '24.0.0'],
   ['npm', '11.6.0'],
   ['yarn', '1.22.22'],
   ['pnpm', '10.20.0'],
@@ -16,25 +16,21 @@ export async function addBase(opts: ProjectOptions): Promise<void> {
 
   await Promise.all([
     fs.copyFile(new URL('_gitignore', templatePath), '.gitignore'),
-    fs.copyFile(new URL('tsconfig.json', templatePath), 'tsconfig.json'),
     fs.copyFile(new URL('turbo.json', templatePath), 'turbo.json'),
     fs.cp(new URL('tools', templatePath), 'tools', copyOptions),
     fs.mkdir('apps', { recursive: true }),
-    fs.mkdir('packages', { recursive: true }),
-    fs.writeFile('.env.example', '# Example environment variables\n'),
-    fs.writeFile('.nvmrc', `v${versionMap.get('node')}`),
-  ])
-
-  await setupPackageManager(opts, templatePath)
-
-  await Promise.all([
+    fs.cp(new URL('packages/lib', templatePath), 'packages/lib', copyOptions),
     fs.cp(new URL('packages/ui', templatePath), 'packages/ui', copyOptions),
     fs.cp(
       new URL('packages/validators', templatePath),
       'packages/validators',
       copyOptions,
     ),
+    fs.writeFile('.env.example', '# Example environment variables\n'),
+    fs.writeFile('.nvmrc', `v${versionMap.get('node')}`),
   ])
+
+  await setupPackageManager(opts, templatePath)
 }
 
 async function setupPackageManager(opts: ProjectOptions, templatePath: URL) {