create-nexora-next 0.3.7 → 0.4.7

package/src/index.js

@@ -1,267 +1,242 @@
-#!/usr/bin/env node
-import * as p from '@clack/prompts'
-import pc from 'picocolors'
-import path from 'path'
-import { existsSync } from 'fs'
-import { createRequire } from 'module'
-
-const require = createRequire(import.meta.url)
-const { version } = require('../package.json')
-
-import { stepCreateNextApp }  from './steps/01-create-next-app.js'
-import { stepSetupShadcn }    from './steps/02-shadcn.js'
-import { stepWriteBaseFiles } from './steps/03-base-files.js'
-import { stepWriteProviders } from './steps/04-providers.js'
-import { stepSetupI18n }      from './steps/05-i18n.js'
-import { stepSetupAuth }      from './steps/06-auth.js'
-import { stepWriteProxy }     from './steps/07-proxy.js'
-import { stepInstallDeps }    from './steps/08-install-deps.js'
-import { stepSetupHusky }     from './steps/09-husky.js'
-import { stepSetupAxios }     from './steps/10-axios.js'
-import { stepPatchPackageJson } from './steps/11-patch-pkg.js'
-
-// ─── Helpers ──────────────────────────────────────────────────────────────────
-
-function bail(msg) {
-  p.cancel(pc.red(msg))
-  process.exit(1)
-}
-
-function onCancel() {
-  bail('Setup cancelled.')
-}
-
-function section(title) {
-  p.log.step(pc.bold(pc.cyan(`\n  ${title}`)))
-}
-
-// ─── Banner ───────────────────────────────────────────────────────────────────
-
-function printBanner() {
-  const art = [
-    '  ███╗   ██╗███████╗██╗  ██╗ ██████╗ ██████╗  █████╗ ',
-    '  ████╗  ██║██╔════╝╚██╗██╔╝██╔═══██╗██╔══██╗██╔══██╗',
-    '  ██╔██╗ ██║█████╗   ╚███╔╝ ██║   ██║██████╔╝███████║',
-    '  ██║╚██╗██║██╔══╝   ██╔██╗ ██║   ██║██╔══██╗██╔══██║',
-    '  ██║ ╚████║███████╗██╔╝ ██╗╚██████╔╝██║  ██║██║  ██║',
-    '  ╚═╝  ╚═══╝╚══════╝╚═╝  ╚═╝ ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝',
-  ]
-  // Fade from cyan → blue top to bottom
-  const gradient = [pc.cyan, pc.cyan, pc.cyan, pc.blue, pc.blue, pc.blue]
-
-  console.log()
-  art.forEach((line, i) => console.log(pc.bold(gradient[i](line))))
-  console.log()
-  const W = 44
-  const centre = (str) => {
-    const pad = W - str.length
-    const l = Math.floor(pad / 2)
-    const r = pad - l
-    return ' '.repeat(l) + str + ' '.repeat(r)
-  }
-  const bar = '═'.repeat(W)
-  console.log(pc.bold(pc.cyan(
-    `  ╔${bar}╗\n` +
-    `  ║${centre(`create-nexora-next  v${version}`)}║\n` +
-    `  ║${centre('Next.js scaffold · by Rayan')}║\n` +
-    `  ╚${bar}╝`
-  )))
-  console.log()
-}
-
-// ─── Summary ──────────────────────────────────────────────────────────────────
-
-function printSummary(opts, projectName, pm) {
-  const yes  = pc.green('✓')
-  const skip = pc.dim('–')
-  const row  = (label, on) =>
-    `  ${on ? yes : skip}  ${on ? pc.white(label) : pc.dim(label)}`
-
-  console.log()
-  p.log.success(pc.bold(pc.green(`  🚀  ${projectName} is ready!`)))
-  console.log()
-  console.log(pc.bold('  What was set up:'))
-  console.log(row('Next.js 15 + TypeScript + Tailwind + ESLint', true))
-  console.log(row('shadcn/ui + custom globals.css utilities',    true))
-  console.log(row('Prettier + tailwind class sorting',           true))
-  console.log(row('Poppins font + path alias ~/',                true))
-  console.log(row('Localization via next-intl',                  opts.i18n))
-  console.log(row('TanStack Query + local persistence',          opts.query))
-  console.log(row('Theming with next-themes',                    opts.theming))
-  console.log(row('Animations — motion + gsap',                  opts.animations))
-  console.log(row('Auth proxy + zod validators',                 opts.auth))
-  console.log(row('Axios client + server instances',             opts.axios))
-  console.log(row('Husky pre-commit hooks',                      opts.husky))
-  console.log(row('React Compiler',                              opts.reactCompiler))
-  console.log()
-  console.log(pc.bold('  Next steps:'))
-  console.log(`  ${pc.cyan('cd')} ${projectName}`)
-  const devCmd = pm === 'npm' ? 'npm run dev' : `${pm} dev`
-  console.log(`  ${pc.cyan(devCmd)}`)
-  console.log()
-  console.log(pc.dim('  Happy shipping, Rayan. 🔥'))
-  console.log()
-}
-
-// ─── Main ─────────────────────────────────────────────────────────────────────
-
-async function main() {
-  printBanner()
-  p.intro(pc.bgCyan(pc.black(" create-nexora-next ")))
-
-  // ── Phase 1: Identity ──────────────────────────────────────────────────────
-  section('Phase 1 — Project identity')
-
-  const projectName = await p.text({
-    message: 'What is your project name?',
-    placeholder: 'my-app',
-    validate: (v) => {
-      if (!v || !v.trim()) return 'Project name is required.'
-      if (!/^[a-z0-9-_]+$/.test(v.trim()))
-        return 'Use lowercase letters, numbers, hyphens or underscores only.'
-    },
-  })
-  if (p.isCancel(projectName)) onCancel()
-  const name = projectName.trim()
-
-  const targetDir = path.resolve(process.cwd(), name)
-  if (existsSync(targetDir)) {
-    bail(`Directory "${name}" already exists. Choose a different name.`)
-  }
-
-  const pm = await p.select({
-    message: 'Which package manager?',
-    options: [
-      { value: 'pnpm', label: 'pnpm', hint: 'recommended' },
-      { value: 'bun',  label: 'bun',  hint: 'fastest'     },
-      { value: 'npm',  label: 'npm',  hint: 'classic'     },
-      { value: 'yarn', label: 'yarn', hint: 'classic alt'  },
-    ],
-  })
-  if (p.isCancel(pm)) onCancel()
-
-  // ── Phase 2: Feature flags ─────────────────────────────────────────────────
-  section('Phase 2 — Features')
-
-  const i18n = await p.confirm({
-    message: 'Set up localization? (next-intl)',
-    initialValue: false,
-  })
-  if (p.isCancel(i18n)) onCancel()
-
-  const query = await p.confirm({
-    message: 'Set up TanStack Query + local persistence?',
-    initialValue: false,
-  })
-  if (p.isCancel(query)) onCancel()
-
-  const theming = await p.confirm({
-    message: 'Set up theming? (next-themes dark/light)',
-    initialValue: true,
-  })
-  if (p.isCancel(theming)) onCancel()
-
-  const animations = await p.confirm({
-    message: 'Install animation libraries? (motion + gsap)',
-    initialValue: false,
-  })
-  if (p.isCancel(animations)) onCancel()
-
-  const auth = await p.confirm({
-    message: 'Set up auth proxy + zod validators?',
-    initialValue: false,
-  })
-  if (p.isCancel(auth)) onCancel()
-
-  const axios = await p.confirm({
-    message: 'Set up axios client/server instances?',
-    initialValue: false,
-  })
-  if (p.isCancel(axios)) onCancel()
-
-  const husky = await p.confirm({
-    message: 'Configure Husky pre-commit hooks?',
-    initialValue: true,
-  })
-  if (p.isCancel(husky)) onCancel()
-
-  const reactCompiler = await p.confirm({
-    message: 'Enable React Compiler? (babel-plugin-react-compiler)',
-    initialValue: true,
-  })
-  if (p.isCancel(reactCompiler)) onCancel()
-
-  // ── Confirm ────────────────────────────────────────────────────────────────
-  const features = [
-    i18n       && 'i18n',
-    query      && 'query',
-    theming    && 'theming',
-    animations && 'animations',
-    auth       && 'auth',
-    axios      && 'axios',
-    husky      && 'husky',
-    reactCompiler && 'react-compiler',
-  ].filter(Boolean)
-
-  console.log()
-  p.log.info(
-    pc.bold(`  ${pc.cyan(name)}`) +
-    pc.dim(` · ${pm}`) +
-    (features.length ? pc.dim(' · ' + features.join(' · ')) : '')
-  )
-  console.log()
-
-  const go = await p.confirm({
-    message: 'Ready to scaffold?',
-    initialValue: true,
-  })
-  if (p.isCancel(go) || !go) onCancel()
-
-  // ── Phase 3: Execution ─────────────────────────────────────────────────────
-  section('Phase 3 — Building your project')
-
-  const opts = {
-    i18n:       Boolean(i18n),
-    query:      Boolean(query),
-    theming:    Boolean(theming),
-    animations: Boolean(animations),
-    auth:       Boolean(auth),
-    axios:      Boolean(axios),
-    husky:      Boolean(husky),
-    reactCompiler: Boolean(reactCompiler),
-  }
-
-  await stepCreateNextApp(name, pm, targetDir)
-  await stepSetupShadcn(targetDir, pm)
-  await stepWriteBaseFiles(targetDir, opts)
-  await stepWriteProviders(targetDir, opts)
-
-  if (opts.i18n) {
-    await stepSetupI18n(targetDir, pm, opts)
-  }
-
-  if (opts.auth || opts.i18n) {
-    await stepSetupAuth(targetDir, opts)
-  }
-
-  await stepWriteProxy(targetDir, opts)
-
-  if (opts.axios) {
-    await stepSetupAxios(targetDir)
-  }
-
-  await stepInstallDeps(targetDir, pm, opts)
-  await stepPatchPackageJson(targetDir)
-
-  if (opts.husky) {
-    await stepSetupHusky(targetDir, pm)
-  }
-
-  printSummary(opts, name, pm)
-  p.outro(pc.bgGreen(pc.black(' Done! ')))
-}
-
-main().catch((err) => {
-  console.error(pc.red('\n  Unexpected error:'), err.message || err)
-  process.exit(1)
+#!/usr/bin/env node
+import * as p from '@clack/prompts'
+import pc from 'picocolors'
+import path from 'path'
+import { existsSync } from 'fs'
+import { createRequire } from 'module'
+import { parseArgs, hasAnyFlag, printHelp } from './utils/args.js'
+
+const require = createRequire(import.meta.url)
+const { version } = require('../package.json')
+
+import { stepCreateNextApp }   from './steps/01-create-next-app.js'
+import { stepSetupShadcn }     from './steps/02-shadcn.js'
+import { stepWriteBaseFiles }  from './steps/03-base-files.js'
+import { stepWriteProviders }  from './steps/04-providers.js'
+import { stepSetupI18n }       from './steps/05-i18n.js'
+import { stepSetupAuth }       from './steps/06-auth.js'
+import { stepWriteProxy }      from './steps/07-proxy.js'
+import { stepInstallDeps }     from './steps/08-install-deps.js'
+import { stepSetupHusky }      from './steps/09-husky.js'
+import { stepSetupAxios }      from './steps/10-axios.js'
+import { stepPatchPackageJson } from './steps/11-patch-pkg.js'
+
+function bail(msg) {
+  p.cancel(pc.red(msg))
+  process.exit(1)
+}
+
+function onCancel() {
+  bail('Setup cancelled.')
+}
+
+function section(title) {
+  p.log.step(pc.bold(pc.cyan(`\n  ${title}`)))
+}
+
+function printBanner() {
+  const art = [
+    '  ███╗   ██╗███████╗██╗  ██╗ ██████╗ ██████╗  █████╗ ',
+    '  ████╗  ██║██╔════╝╚██╗██╔╝██╔═══██╗██╔══██╗██╔══██╗',
+    '  ██╔██╗ ██║█████╗   ╚███╔╝ ██║   ██║██████╔╝███████║',
+    '  ██║╚██╗██║██╔══╝   ██╔██╗ ██║   ██║██╔══██╗██╔══██║',
+    '  ██║ ╚████║███████╗██╔╝ ██╗╚██████╔╝██║  ██║██║  ██║',
+    '  ╚═╝  ╚═══╝╚══════╝╚═╝  ╚═╝ ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝',
+  ]
+  const gradient = [pc.cyan, pc.cyan, pc.cyan, pc.blue, pc.blue, pc.blue]
+  console.log()
+  art.forEach((line, i) => console.log(pc.bold(gradient[i](line))))
+  console.log()
+  const W = 44
+  const centre = (str) => {
+    const pad = W - str.length
+    const l = Math.floor(pad / 2)
+    return ' '.repeat(l) + str + ' '.repeat(pad - l)
+  }
+  const bar = '═'.repeat(W)
+  console.log(pc.bold(pc.cyan(
+    `  ╔${bar}╗\n` +
+    `  ║${centre(`create-nexora-next  v${version}`)}║\n` +
+    `  ║${centre('Next.js scaffold · by Rayan')}║\n` +
+    `  ╚${bar}╝`
+  )))
+  console.log()
+}
+
+function printSummary(opts, projectName, pm) {
+  const yes  = pc.green('✓')
+  const skip = pc.dim('–')
+  const row  = (label, on) =>
+    `  ${on ? yes : skip}  ${on ? pc.white(label) : pc.dim(label)}`
+
+  console.log()
+  p.log.success(pc.bold(pc.green(`  🚀  ${projectName} is ready!`)))
+  console.log()
+  console.log(pc.bold('  What was set up:'))
+  console.log(row('Next.js 15 + TypeScript + Tailwind + ESLint', true))
+  console.log(row('shadcn/ui + custom globals.css utilities',    true))
+  console.log(row('Prettier + tailwind class sorting',           true))
+  console.log(row('Poppins font + path alias ~/',                true))
+  console.log(row('Localization via next-intl',                  opts.i18n))
+  console.log(row('TanStack Query + local persistence',          opts.query))
+  console.log(row('Theming with next-themes',                    opts.theming))
+  console.log(row('Animations — motion + gsap',                  opts.animations))
+  console.log(row('Auth proxy + zod validators',                 opts.auth))
+  console.log(row('Axios client + server instances',             opts.axios))
+  console.log(row('Husky pre-commit hooks',                      opts.husky))
+  console.log(row('React Compiler',                              opts.reactCompiler))
+  console.log()
+  console.log(pc.bold('  Next steps:'))
+  console.log(`  ${pc.cyan('cd')} ${projectName}`)
+  const devCmd = pm === 'npm' ? 'npm run dev' : `${pm} dev`
+  console.log(`  ${pc.cyan(devCmd)}`)
+  console.log()
+  console.log(pc.dim('  Happy shipping, Rayan. 🔥'))
+  console.log()
+}
+
+async function ask(condition, prompt) {
+  if (condition !== null) return condition
+  const val = await prompt()
+  if (p.isCancel(val)) onCancel()
+  return Boolean(val)
+}
+
+async function main() {
+  const parsed = parseArgs(process.argv)
+
+  printBanner()
+
+  if (parsed.version) {
+    console.log(`  v${version}`)
+    process.exit(0)
+  }
+
+  if (parsed.help) {
+    printHelp(version)
+    process.exit(0)
+  }
+
+  p.intro(pc.bgCyan(pc.black(' create-nexora-next ')))
+
+  const flagMode = hasAnyFlag(parsed)
+
+  if (flagMode) {
+    p.log.info(pc.dim('  Running in flag mode — skipping answered prompts'))
+    console.log()
+  }
+
+  section('Phase 1 — Project identity')
+
+  let name = parsed.name
+  if (!name) {
+    const res = await p.text({
+      message: 'What is your project name?',
+      placeholder: 'my-app',
+      validate: (v) => {
+        if (!v || !v.trim()) return 'Project name is required.'
+        if (!/^[a-z0-9-_]+$/.test(v.trim()))
+          return 'Use lowercase letters, numbers, hyphens or underscores only.'
+      },
+    })
+    if (p.isCancel(res)) onCancel()
+    name = res.trim()
+  } else {
+    p.log.step(`Project name: ${pc.cyan(name)}`)
+  }
+
+  const targetDir = path.resolve(process.cwd(), name)
+  if (existsSync(targetDir)) bail(`Directory "${name}" already exists.`)
+
+  let pm = parsed.pm
+  if (!pm) {
+    const res = await p.select({
+      message: 'Which package manager?',
+      options: [
+        { value: 'pnpm', label: 'pnpm', hint: 'recommended' },
+        { value: 'bun',  label: 'bun',  hint: 'fastest'     },
+        { value: 'npm',  label: 'npm',  hint: 'classic'     },
+        { value: 'yarn', label: 'yarn', hint: 'classic alt'  },
+      ],
+    })
+    if (p.isCancel(res)) onCancel()
+    pm = res
+  } else {
+    p.log.step(`Package manager: ${pc.cyan(pm)}`)
+  }
+
+  section('Phase 2 — Features')
+
+  const defaults = { theming: true, husky: true, reactCompiler: true }
+
+  const i18n          = await ask(parsed.i18n,          () => p.confirm({ message: 'Set up localization? (next-intl)',                     initialValue: false }))
+  const query         = await ask(parsed.query,         () => p.confirm({ message: 'Set up TanStack Query + local persistence?',           initialValue: false }))
+  const theming       = await ask(parsed.theming,       () => p.confirm({ message: 'Set up theming? (next-themes dark/light)',             initialValue: true  }))
+  const animations    = await ask(parsed.animations,    () => p.confirm({ message: 'Install animation libraries? (motion + gsap)',         initialValue: false }))
+  const auth          = await ask(parsed.auth,          () => p.confirm({ message: 'Set up auth proxy + zod validators?',                 initialValue: false }))
+  const axios         = await ask(parsed.axios,         () => p.confirm({ message: 'Set up axios client/server instances?',               initialValue: false }))
+  const husky         = await ask(parsed.husky,         () => p.confirm({ message: 'Configure Husky pre-commit hooks?',                   initialValue: true  }))
+  const reactCompiler = await ask(parsed.reactCompiler, () => p.confirm({ message: 'Enable React Compiler? (babel-plugin-react-compiler)', initialValue: true  }))
+
+  const features = [
+    i18n          && 'i18n',
+    query         && 'query',
+    theming       && 'theming',
+    animations    && 'animations',
+    auth          && 'auth',
+    axios         && 'axios',
+    husky         && 'husky',
+    reactCompiler && 'react-compiler',
+  ].filter(Boolean)
+
+  console.log()
+  p.log.info(
+    pc.bold(`  ${pc.cyan(name)}`) +
+    pc.dim(` · ${pm}`) +
+    (features.length ? pc.dim(' · ' + features.join(' · ')) : '')
+  )
+  console.log()
+
+  if (!parsed.yes && !flagMode) {
+    const go = await p.confirm({ message: 'Ready to scaffold?', initialValue: true })
+    if (p.isCancel(go) || !go) onCancel()
+  }
+
+  section('Phase 3 — Building your project')
+
+  const opts = {
+    i18n:          Boolean(i18n),
+    query:         Boolean(query),
+    theming:       Boolean(theming),
+    animations:    Boolean(animations),
+    auth:          Boolean(auth),
+    axios:         Boolean(axios),
+    husky:         Boolean(husky),
+    reactCompiler: Boolean(reactCompiler),
+  }
+
+  await stepCreateNextApp(name, pm, targetDir)
+  await stepSetupShadcn(targetDir, pm)
+  await stepWriteBaseFiles(targetDir, opts)
+  await stepWriteProviders(targetDir, opts)
+
+  if (opts.i18n)              await stepSetupI18n(targetDir, pm, opts)
+  if (opts.auth || opts.i18n) await stepSetupAuth(targetDir, opts)
+
+  await stepWriteProxy(targetDir, opts)
+
+  if (opts.axios) await stepSetupAxios(targetDir)
+
+  await stepInstallDeps(targetDir, pm, opts)
+  await stepPatchPackageJson(targetDir)
+
+  if (opts.husky) await stepSetupHusky(targetDir, pm)
+
+  printSummary(opts, name, pm)
+  p.outro(pc.bgGreen(pc.black(' Done! ')))
+}
+
+main().catch((err) => {
+  console.error(pc.red('\n  Unexpected error:'), err.message || err)
+  process.exit(1)
 })

package/src/steps/01-create-next-app.js

@@ -1,19 +1,19 @@
-import path from 'path'
-import { run, execCmd } from '../utils/runner.js'
-import { safeStep } from '../utils/safe-step.js'
-
-/**
- * @param {string} projectName
- * @param {'npm'|'pnpm'|'bun'|'yarn'} pm
- * @param {string} targetDir  Absolute path where the project will live
- */
-export async function stepCreateNextApp(projectName, pm, targetDir) {
-  await safeStep('Scaffolding Next.js app', () => {
-    const x = execCmd(pm)
-    // create-next-app flags: TypeScript, Tailwind, ESLint, App Router, src dir, no Turbopack prompt, import alias ~
-    run(
-      `${x} create-next-app@latest ${projectName} --typescript --tailwind --eslint --app --src-dir --no-turbopack --import-alias "~/*" --use-${pm === 'npm' ? 'npm' : pm}`,
-      path.dirname(targetDir),
-    )
-  })
+import path from 'path'
+import { run, execCmd } from '../utils/runner.js'
+import { safeStep } from '../utils/safe-step.js'
+
+/**
+ * @param {string} projectName
+ * @param {'npm'|'pnpm'|'bun'|'yarn'} pm
+ * @param {string} targetDir  Absolute path where the project will live
+ */
+export async function stepCreateNextApp(projectName, pm, targetDir) {
+  await safeStep('Scaffolding Next.js app', () => {
+    const x = execCmd(pm)
+    // create-next-app flags: TypeScript, Tailwind, ESLint, App Router, src dir, no Turbopack prompt, import alias ~
+    run(
+      `${x} create-next-app@latest ${projectName} --typescript --tailwind --eslint --app --src-dir --no-turbopack --import-alias "~/*" --use-${pm === 'npm' ? 'npm' : pm}`,
+      path.dirname(targetDir),
+    )
+  })
 }

package/src/steps/02-shadcn.js

@@ -1,39 +1,39 @@
-import path from 'path'
-import fs from 'fs'
-import { run, execCmd } from '../utils/runner.js'
-import { appendFile } from '../utils/writer.js'
-import { safeStep } from '../utils/safe-step.js'
-import { globalsCssAppend } from '../templates/files.js'
-
-/**
- * @param {string} targetDir
- * @param {'npm'|'pnpm'|'bun'|'yarn'} pm
- */
-export async function stepSetupShadcn(targetDir, pm) {
-  await safeStep('Initialising shadcn/ui', () => {
-    const x = execCmd(pm)
-    run(`${x} shadcn@latest init -y -d`, targetDir)
-  })
-
-  await safeStep('Patching shadcn config + cleaning up', () => {
-    // 1. Delete src/lib/utils.ts if shadcn created it (we use src/lib/utils/index.ts)
-    const shadcnUtils = path.join(targetDir, 'src', 'lib', 'utils.ts')
-    if (fs.existsSync(shadcnUtils)) fs.unlinkSync(shadcnUtils)
-
-    // 2. Update components.json utils path to point at our index.ts
-    const componentsJson = path.join(targetDir, 'components.json')
-    if (fs.existsSync(componentsJson)) {
-      const raw = fs.readFileSync(componentsJson, 'utf8')
-      const patched = raw.replace(
-        '"utils": "~/lib/utils"',
-        '"utils": "~/lib/utils/index.ts"',
-      )
-      fs.writeFileSync(componentsJson, patched, 'utf8')
-    }
-  })
-
-  await safeStep('Appending custom styles to globals.css', () => {
-    const globalsPath = path.join(targetDir, 'src', 'app', 'globals.css')
-    appendFile(globalsPath, globalsCssAppend)
-  })
+import path from 'path'
+import fs from 'fs'
+import { run, execCmd } from '../utils/runner.js'
+import { appendFile } from '../utils/writer.js'
+import { safeStep } from '../utils/safe-step.js'
+import { globalsCssAppend } from '../templates/files.js'
+
+/**
+ * @param {string} targetDir
+ * @param {'npm'|'pnpm'|'bun'|'yarn'} pm
+ */
+export async function stepSetupShadcn(targetDir, pm) {
+  await safeStep('Initialising shadcn/ui', () => {
+    const x = execCmd(pm)
+    run(`${x} shadcn@latest init -y -d`, targetDir)
+  })
+
+  await safeStep('Patching shadcn config + cleaning up', () => {
+    // 1. Delete src/lib/utils.ts if shadcn created it (we use src/lib/utils/index.ts)
+    const shadcnUtils = path.join(targetDir, 'src', 'lib', 'utils.ts')
+    if (fs.existsSync(shadcnUtils)) fs.unlinkSync(shadcnUtils)
+
+    // 2. Update components.json utils path to point at our index.ts
+    const componentsJson = path.join(targetDir, 'components.json')
+    if (fs.existsSync(componentsJson)) {
+      const raw = fs.readFileSync(componentsJson, 'utf8')
+      const patched = raw.replace(
+        '"utils": "~/lib/utils"',
+        '"utils": "~/lib/utils/index.ts"',
+      )
+      fs.writeFileSync(componentsJson, patched, 'utf8')
+    }
+  })
+
+  await safeStep('Appending custom styles to globals.css', () => {
+    const globalsPath = path.join(targetDir, 'src', 'app', 'globals.css')
+    appendFile(globalsPath, globalsCssAppend)
+  })
 }