anhedral 0.1.4 → 0.1.5

package/README.md

@@ -51,7 +51,7 @@ anhedral init
 - RevenueCat + Stripe
 - Vercel deploy
 
-The scaffold is a pnpm workspace with `apps/*` and `packages/*`. Shared code such as the Drizzle schema lives under `packages/db` so apps do not need separate database schemas.
+The scaffold is a pnpm workspace with top-level `Frontend`, `Backend`, `Extension`, and `packages/*` folders. Shared code such as the Drizzle schema lives under `packages/db` so apps do not need separate database schemas.
 
 Each scaffold writes a `stack.json` file with the selected architecture, generated outputs, and the verified dependency manifest used for that run.
 
@@ -59,26 +59,36 @@ Each scaffold writes a `stack.json` file with the selected architecture, generat
 
 The generated workspace is one Git repository with two Vercel projects:
 
-- `apps/frontend`: Expo web build. Build command: `pnpm build:web`. Output directory: `dist`.
-- `apps/api`: Fastify API. Build command: `pnpm build`. Requests rewrite to `api/index.ts`.
+- `Frontend`: Expo web build. Build command: `pnpm build:web`. Output directory: `dist`.
+- `Backend`: Fastify API. Build command: `pnpm build`. Vercel detects `src/index.ts` as the Fastify entrypoint.
 
-The `apps/frontend` source is also the EAS source for iOS and Android builds; Vercel only deploys its web export.
+The `Frontend` source is also the EAS source for iOS and Android builds; Vercel only deploys its web export.
 
 Import the same repository twice in Vercel and set each project Root Directory to the app path above. Enable source access outside the app root so `packages/*` workspace dependencies are available during builds.
 
 Vercel deployments are Git-driven. After both projects are connected, pushes and pull requests deploy the Expo web app and Fastify API automatically from GitHub commits.
 
+Generated projects also include `PRODUCTION.md` with the provider checklist and these root verification scripts:
+
+```sh
+pnpm verify
+pnpm verify:frontend
+pnpm verify:backend
+pnpm verify:extension
+```
+
 ## Native App Deployment
 
-Use `apps/frontend` as the Expo project root for iOS and Android. Vercel only deploys the web export from this app; native builds go through EAS.
+Use `Frontend` as the Expo project root for iOS and Android. Vercel only deploys the web export from this app; native builds go through EAS.
 
 ```sh
-cd apps/frontend
+cd Frontend
 pnpm dlx eas-cli@latest login
 pnpm dlx eas-cli@latest init
-pnpm dlx eas-cli@latest build:configure
 ```
 
+The scaffold generates `Frontend/eas.json` with `development`, `preview`, and `production` profiles.
+
 Build commands:
 
 ```sh
@@ -123,10 +133,10 @@ pnpm dlx eas-cli@latest credentials
 
 ## Extension Release
 
-The WXT extension is built from `apps/extension`. It is not deployed by Vercel.
+The WXT extension is built from `Extension`. It is not deployed by Vercel.
 
 ```sh
-cd apps/extension
+cd Extension
 pnpm build
 pnpm zip
 ```

package/dist/dependencies.js

@@ -91,8 +91,6 @@ export const BACKEND_DEPENDENCIES = {
         vitest: '4.0.16',
         // renovate: datasource=npm depName=@vitest/coverage-v8
         '@vitest/coverage-v8': '4.0.16',
-        // renovate: datasource=npm depName=@vercel/node
-        '@vercel/node': '5.5.13',
         // renovate: datasource=npm depName=eslint
         eslint: '9.39.2',
         // renovate: datasource=npm depName=@eslint/js
@@ -144,8 +142,8 @@ export const EXTENSION_DEPENDENCIES = {
 };
 export const FRONTEND_ADDON_DEPENDENCIES = {
     '@anhedral/api-client': 'workspace:*',
-    // renovate: datasource=npm depName=@clerk/clerk-expo
-    '@clerk/clerk-expo': '2.19.31',
+    // renovate: datasource=npm depName=@clerk/expo
+    '@clerk/expo': '3.2.11',
     // renovate: datasource=npm depName=react-native-purchases
     'react-native-purchases': '10.1.1',
     // renovate: datasource=npm depName=react-native-purchases-ui

package/dist/scaffold.js

@@ -147,16 +147,17 @@ ${generatedPaths}
 \`\`\`bash
 pnpm install
 cp .env.example .env
-# apps/frontend/.env is generated for local Expo development
-cp apps/extension/.env.example apps/extension/.env
+# Frontend/.env is generated for local Expo development
+cp Extension/.env.example Extension/.env
 pnpm db:generate
 pnpm db:migrate
-pnpm dev:api
+pnpm verify
+pnpm dev:backend
 pnpm dev:frontend
 pnpm dev:extension
 \`\`\`
 
-For a provider-free smoke test, keep \`ANHEDRAL_DEMO=true\` in \`apps/api/.env\`. Demo mode returns a signed-in sample user and active subscription responses without Clerk, RevenueCat, or Stripe credentials. It is for local development only.
+For a provider-free smoke test, keep \`ANHEDRAL_DEMO=true\` in \`Backend/.env\`. Demo mode returns a signed-in sample user and active subscription responses without Clerk, RevenueCat, or Stripe credentials. It is for local development only.
 
 ## Provider Setup
 
@@ -164,8 +165,8 @@ For a provider-free smoke test, keep \`ANHEDRAL_DEMO=true\` in \`apps/api/.env\`
 - Clerk: create an application, configure allowed origins, and set \`CLERK_PUBLISHABLE_KEY\`, \`CLERK_SECRET_KEY\`, plus the Expo and extension publishable keys.
 - RevenueCat + Stripe: create an entitlement named \`pro\`, configure Stripe as a RevenueCat web billing source, configure app keys, then set \`RC_SECRET_API_KEY\`, \`RC_WEBHOOK_SECRET\`, and the \`EXPO_PUBLIC_RC_*\` values.
 - Cloudflare R2: create a bucket and API token, then set \`R2_ACCOUNT_ID\`, \`R2_ACCESS_KEY_ID\`, \`R2_SECRET_ACCESS_KEY\`, and \`R2_BUCKET\`.
-- Vercel: import this same Git repository twice. Use \`apps/frontend\` as the root directory for the Expo web project, and \`apps/api\` as the root directory for the Fastify API project. Enable access to source files outside each root directory so workspace packages under \`packages/*\` are available during builds.
-- EAS: use \`apps/frontend\` as the Expo project root for iOS and Android builds. Vercel deploys the web export from the same source.
+- Vercel: import this same Git repository twice. Use \`Frontend\` as the root directory for the Expo web project, and \`Backend\` as the root directory for the Fastify API project. Enable access to source files outside each root directory so workspace packages under \`packages/*\` are available during builds. The Backend project uses Vercel Fastify entrypoint detection from \`Backend/src/index.ts\`.
+- EAS: use \`Frontend\` as the Expo project root for iOS and Android builds. Vercel deploys the web export from the same source.
 
 ## Setup Notes
 
@@ -173,19 +174,184 @@ For a provider-free smoke test, keep \`ANHEDRAL_DEMO=true\` in \`apps/api/.env\`
 2. Review \`install-skills.sh\` and run the listed skill commands manually so you can choose scope and agent targets.
 3. Add the real provider configuration for Clerk, RevenueCat, Stripe web billing, Neon, and R2 where the scaffolded helper files indicate.
 4. Use \`stack.json\` when debugging generated projects; it records the verified dependency manifest used by this init run.
-5. Run database generation and migrations from the shared DB package:
+5. Review \`PRODUCTION.md\` before connecting live provider projects.
+6. Run database generation and migrations from the shared DB package:
 
 \`\`\`bash
 pnpm db:generate
 pnpm db:migrate
 \`\`\`
 
-6. Build or run the extension separately. It is not deployed by Vercel:
+Run deployment readiness checks before pushing:
 
 \`\`\`bash
+pnpm verify
+pnpm verify:frontend
+pnpm verify:backend
+pnpm verify:extension
+\`\`\`
+
+7. Build or run the extension separately. It is not deployed by Vercel:
+
+\`\`\`bash
+pnpm dev:extension
+pnpm extension:zip
+\`\`\`
+`);
+}
+function writeProductionGuide(root, options) {
+    writeFile(path.join(root, 'PRODUCTION.md'), `# ${options.displayName} Production Guide
+
+## Project Structure
+
+The generated app is one pnpm monorepo:
+
+\`\`\`txt
+.
+├─ Frontend/        Expo + React Native Reusables app
+├─ Backend/         Fastify API
+├─ Extension/       WXT Chrome extension
+├─ packages/
+│  ├─ api-client/   shared typed API client
+│  ├─ config/       shared config constants/helpers
+│  ├─ db/           Drizzle schema, Neon client, migrations
+│  └─ types/        shared TypeScript types
+├─ PRODUCTION.md    development and deployment guide
+├─ turbo.json       workspace build graph
+└─ package.json     root scripts
+\`\`\`
+
+## Frontend
+
+\`Frontend\` is the single Expo source for:
+
+- Web on Vercel
+- iOS through EAS
+- Android through EAS
+
+Important files:
+
+- \`Frontend/package.json\`: Expo scripts
+- \`Frontend/vercel.json\`: Vercel web export config
+- \`Frontend/eas.json\`: native build profiles
+- \`Frontend/app\`: Expo Router screens
+
+Build output goes to \`Frontend/dist\`.
+
+## Backend
+
+\`Backend\` is the Fastify API.
+
+Important files:
+
+- \`Backend/src/index.ts\`: Vercel Fastify entrypoint
+- \`Backend/src/app.ts\`: Fastify app construction
+- \`Backend/vercel.json\`: minimal Vercel config
+- \`Backend/src/routes\`: health/auth/subscription routes
+
+## Extension
+
+\`Extension\` is the WXT Chrome extension using the Side Panel API.
+
+Important files:
+
+- \`Extension/wxt.config.ts\`: manifest, side panel, permissions
+- \`Extension/src/entrypoints/sidepanel\`: side panel UI
+- \`Extension/src/entrypoints/background.ts\`: side panel behavior
+
+ZIP output goes to \`Extension/.output\`.
+
+## Develop
+
+From the repository root:
+
+\`\`\`sh
+pnpm install
+pnpm dev
+\`\`\`
+
+Or run one surface at a time:
+
+\`\`\`sh
+pnpm dev:frontend
+pnpm dev:backend
 pnpm dev:extension
+\`\`\`
+
+Use these before deploy:
+
+\`\`\`sh
+pnpm verify
+pnpm verify:frontend
+pnpm verify:backend
+pnpm verify:extension
+\`\`\`
+
+Database workflow:
+
+\`\`\`sh
+pnpm db:generate
+pnpm db:migrate
+\`\`\`
+
+Local demo mode is enabled through generated \`.env\` files. Real provider behavior needs Clerk, RevenueCat/Stripe, Neon, and R2 credentials.
+
+## Environment Variables
+
+- Root/local: \`DATABASE_URL\` for shared Drizzle commands.
+- Frontend/Vercel Frontend: only \`EXPO_PUBLIC_*\` values.
+- Backend/Vercel Backend: server secrets such as \`DATABASE_URL\`, \`CLERK_SECRET_KEY\`, \`RC_SECRET_API_KEY\`, \`RC_WEBHOOK_SECRET\`, and R2 credentials.
+- Extension: \`VITE_API_URL\`, \`VITE_CLERK_PUBLISHABLE_KEY\`, and optionally \`VITE_CRX_PUBLIC_KEY\`.
+- EAS: add native app public keys with \`eas secret:create\` or the EAS dashboard.
+
+## Deploy
+
+Vercel deployment is two Vercel projects from the same Git repo:
+
+1. Frontend Vercel project
+   - Root Directory: \`Frontend\`
+   - Build command: \`pnpm build:web\`
+   - Output directory: \`dist\`
+
+2. Backend Vercel project
+   - Root Directory: \`Backend\`
+   - Build command: \`pnpm build\`
+   - Fastify entrypoint: \`src/index.ts\`
+
+Enable Vercel access to source files outside each project root so \`packages/*\` workspace packages resolve.
+
+Native app deployment:
+
+\`\`\`sh
+cd Frontend
+pnpm dlx eas-cli@latest login
+pnpm dlx eas-cli@latest init
+pnpm dlx eas-cli@latest build --platform all --profile production
+pnpm dlx eas-cli@latest submit --platform all --latest --profile production
+\`\`\`
+
+Chrome extension deployment:
+
+\`\`\`sh
 pnpm extension:zip
 \`\`\`
+
+Upload \`Extension/.output/*-chrome.zip\` to the Chrome Web Store Developer Dashboard.
+
+## Provider Checklist
+
+- Clerk: configure allowed origins for the Expo web Vercel domain, native redirect/deep-link settings for the Expo scheme in \`Frontend/app.json\`, and the Chrome extension origin after publishing or after assigning a stable extension key.
+- RevenueCat + Stripe: create a \`pro\` entitlement, configure iOS/Android/Web app API keys separately, connect Stripe as the web billing source, set the RevenueCat webhook URL to \`https://<backend-domain>/webhooks/revenuecat\`, and keep \`RC_WEBHOOK_SECRET\` only in Backend.
+- Neon + Drizzle: create the Neon database, set \`DATABASE_URL\` locally and in the Backend Vercel project, then run \`pnpm db:generate\` and \`pnpm db:migrate\` before production traffic.
+- Cloudflare R2: create an R2 bucket and least-privilege API token, then set \`R2_ACCOUNT_ID\`, \`R2_ACCESS_KEY_ID\`, \`R2_SECRET_ACCESS_KEY\`, and \`R2_BUCKET\` in Backend only.
+
+## Relevant Docs
+
+- [Vercel monorepos](https://vercel.com/docs/monorepos)
+- [Expo web publishing](https://docs.expo.dev/guides/publishing-websites/)
+- [Expo EAS](https://docs.expo.dev/eas/)
+- [WXT publishing](https://wxt.dev/guide/essentials/publishing.html)
+- [Chrome Web Store publishing](https://developer.chrome.com/docs/webstore/publish)
 `);
 }
 function writeStackFile(root, stack) {
@@ -755,9 +921,9 @@ R2_BUCKET=
 ${paymentsEnv}`);
 }
 function writeRootVercelFiles(root) {
-    writeFile(path.join(root, '.vercelignore'), `apps/extension/.output
-apps/extension/.wxt
-apps/extension/dist
+    writeFile(path.join(root, '.vercelignore'), `Extension/.output
+Extension/.wxt
+Extension/dist
 `);
 }
 function writeGeneratedCiWorkflow(root) {
@@ -799,22 +965,22 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Check Expo dependency alignment
-        run: pnpm --filter ./apps/frontend exec expo install --check
+        run: pnpm --filter ./Frontend exec expo install --check
 
       - name: Build Expo web
-        run: pnpm --filter ./apps/frontend build:web
+        run: pnpm --filter ./Frontend build:web
 
       - name: Test API
-        run: pnpm --filter ./apps/api test
+        run: pnpm --filter ./Backend test
 
       - name: Build API
-        run: pnpm --filter ./apps/api build
+        run: pnpm --filter ./Backend build
 
       - name: Build extension
-        run: pnpm --filter ./apps/extension build
+        run: pnpm --filter ./Extension build
 
       - name: Zip extension
-        run: pnpm --filter ./apps/extension zip
+        run: pnpm --filter ./Extension zip
 
       - name: Build workspace
         run: pnpm build
@@ -822,32 +988,36 @@ jobs:
 }
 function writeFullstackRootFiles(root, options) {
     const appFilters = [
-        './apps/frontend',
-        './apps/api',
-        './apps/extension',
+        './Frontend',
+        './Backend',
+        './Extension',
     ];
     const parallelFilters = appFilters.map((entry) => `--filter=${entry}`).join(' ');
     const scripts = {
         dev: `turbo dev --parallel ${parallelFilters}`,
-        'dev:api': 'pnpm --filter ./apps/api dev',
+        'dev:backend': 'pnpm --filter ./Backend dev',
         build: 'turbo build',
         typecheck: 'turbo typecheck',
+        verify: 'pnpm verify:frontend && pnpm verify:backend && pnpm verify:extension',
+        'verify:frontend': 'pnpm --filter ./Frontend exec expo install --check && pnpm --filter ./Frontend build:web',
+        'verify:backend': 'pnpm --filter ./Backend test && pnpm --filter ./Backend build',
+        'verify:extension': 'pnpm --filter ./Extension typecheck && pnpm --filter ./Extension zip',
         'db:generate': 'pnpm --filter @anhedral/db db:generate',
         'db:migrate': 'pnpm --filter @anhedral/db db:migrate',
     };
-    scripts['dev:frontend'] = 'pnpm --filter ./apps/frontend dev';
-    scripts['dev:extension'] = 'pnpm --filter ./apps/extension dev';
-    scripts['extension:zip'] = 'pnpm --filter ./apps/extension zip';
-    writeRootPackageJson(root, options.projectName, scripts, ['apps/*', 'packages/*'], {
+    scripts['dev:frontend'] = 'pnpm --filter ./Frontend dev';
+    scripts['dev:extension'] = 'pnpm --filter ./Extension dev';
+    scripts['extension:zip'] = 'pnpm --filter ./Extension zip';
+    writeRootPackageJson(root, options.projectName, scripts, ['Frontend', 'Backend', 'Extension', 'packages/*'], {
         devDependencies: ROOT_DEPENDENCIES.devDependencies,
     });
-    writePnpmWorkspace(root, ['apps/*', 'packages/*']);
+    writePnpmWorkspace(root, ['Frontend', 'Backend', 'Extension', 'packages/*']);
     writeFile(path.join(root, 'turbo.json'), JSON.stringify({
         $schema: 'https://turborepo.dev/schema.json',
         tasks: {
             build: {
                 dependsOn: ['^build'],
-                outputs: ['dist/**', '.output/**'],
+                outputs: [],
             },
             typecheck: {
                 dependsOn: ['^build'],
@@ -861,7 +1031,9 @@ function writeFullstackRootFiles(root, options) {
     appendGitignore(root, [
         'node_modules',
         '.turbo',
-        'apps/*/node_modules',
+        'Frontend/node_modules',
+        'Backend/node_modules',
+        'Extension/node_modules',
         'packages/*/node_modules',
         ...SHARED_ENV_GITIGNORE_LINES,
         ...SHARED_TYPESCRIPT_GITIGNORE_LINES,
@@ -903,9 +1075,10 @@ async function scaffoldFullstack(root, options) {
     });
     return [
         '.github/workflows/ci.yml',
-        'apps/frontend',
-        'apps/api',
-        'apps/extension',
+        'PRODUCTION.md',
+        'Frontend',
+        'Backend',
+        'Extension',
         'packages/db',
         'packages/types',
         'packages/config',
@@ -927,6 +1100,7 @@ export async function scaffoldProject(options) {
         writeSkillsGuide(root, skillCommands);
         const stack = normalizeStack(options, generatedPaths);
         writeRootDocs(root, options, stack);
+        writeProductionGuide(root, options);
         writeStackFile(root, stack);
         anhedralPrint.done('Project metadata written');
         console.log('');
@@ -938,9 +1112,10 @@ export async function scaffoldProject(options) {
         anhedralPrint.info('Next commands:');
         console.log('  pnpm install');
         console.log('  cp .env.example .env');
-        console.log('  cp apps/extension/.env.example apps/extension/.env');
+        console.log('  cp Extension/.env.example Extension/.env');
         console.log('  pnpm db:generate && pnpm db:migrate');
-        console.log('  pnpm dev:api');
+        console.log('  pnpm verify');
+        console.log('  pnpm dev:backend');
         console.log('  pnpm dev:frontend');
         console.log('  pnpm dev:extension');
         console.log('');

package/dist/templates/backend.js

@@ -4,7 +4,7 @@ import { anhedralPrint } from '../print.js';
 import { getBackendInstallCommands } from '../commands.js';
 import { BACKEND_DEPENDENCIES } from '../dependencies.js';
 export async function scaffoldBackend(root, { projectName, displayName, frontendUrl, skipInstall }) {
-    const dir = path.join(root, 'apps/api');
+    const dir = path.join(root, 'Backend');
     anhedralPrint.section('Backend (Fastify)');
     anhedralPrint.step('Writing backend source files');
     writePackageJson(dir, projectName);
@@ -24,7 +24,6 @@ export async function scaffoldBackend(root, { projectName, displayName, frontend
     writeRepositories(dir);
     writeRoutes(dir, displayName);
     writeAppAndIndex(dir, displayName);
-    writeVercelEntry(dir);
     writeVercelConfig(dir);
     writeTestFiles(dir);
     anhedralPrint.done('Backend source files written');
@@ -2174,55 +2173,11 @@ main().catch((err) => {
 });
 `);
 }
-function writeVercelEntry(dir) {
-    writeFile(path.join(dir, 'api/index.ts'), `import type { VercelRequest, VercelResponse } from '@vercel/node';
-import type { FastifyInstance } from 'fastify';
-import { buildApp } from '../src/app.js';
-
-let appReadyPromise: Promise<FastifyInstance> | undefined;
-
-async function getApp(): Promise<FastifyInstance> {
-  if (!appReadyPromise) {
-    appReadyPromise = (async () => {
-      const app = await buildApp();
-      await app.ready();
-      return app;
-    })().catch((err) => {
-      appReadyPromise = undefined;
-      throw err;
-    });
-  }
-  return appReadyPromise;
-}
-
-export default async function handler(req: VercelRequest, res: VercelResponse) {
-  const app = await getApp();
-  if (req.url === '/api' || req.url === '/backend') {
-    req.url = '/';
-  } else if (req.url?.startsWith('/api/')) {
-    req.url = req.url.slice('/api'.length);
-  } else if (req.url?.startsWith('/backend/')) {
-    req.url = req.url.slice('/backend'.length);
-  }
-  app.server.emit('request', req, res);
-}
-`);
-}
 function writeVercelConfig(dir) {
     writeFile(path.join(dir, 'vercel.json'), JSON.stringify({
-        version: 2,
-        builds: [
-            {
-                src: 'api/index.ts',
-                use: '@vercel/node',
-            },
-        ],
-        routes: [
-            {
-                src: '/(.*)',
-                dest: 'api/index.ts',
-            },
-        ],
+        $schema: 'https://openapi.vercel.sh/vercel.json',
+        buildCommand: 'pnpm build',
+        devCommand: 'vercel dev',
     }, null, 2) + '\n');
 }
 // ═══════════════════════════════════════════════════════════════════════════

package/dist/templates/extension.js

@@ -5,13 +5,11 @@ import { anhedralPrint } from '../print.js';
 import { EXTENSION_DEPENDENCIES } from '../dependencies.js';
 import { resolveToolchainChannel, resolveToolchain, toolPackageRef } from '../toolchain.js';
 export async function scaffoldExtension(root, { projectName, displayName, skipInstall }) {
-    const appsRoot = path.join(root, 'apps');
-    const dir = path.join(appsRoot, 'extension');
+    const dir = path.join(root, 'Extension');
     const toolchain = resolveToolchain(resolveToolchainChannel(process.env.ANHEDRAL_TOOLCHAIN));
     anhedralPrint.section('Chrome extension (WXT)');
     anhedralPrint.step('Scaffolding WXT extension');
-    writeFile(path.join(appsRoot, '.gitkeep'), '');
-    exec(`pnpm dlx ${toolPackageRef('wxt', toolchain.wxt)} init extension -t react --pm pnpm`, appsRoot);
+    exec(`pnpm dlx --allow-build=esbuild --allow-build=spawn-sync ${toolPackageRef('wxt', toolchain.wxt)} init Extension -t react --pm pnpm`, root);
     writePackageJson(dir, projectName);
     anhedralPrint.done('WXT extension scaffolded');
     anhedralPrint.step('Installing Clerk + React + Tailwind dependencies');
@@ -98,6 +96,11 @@ export default defineConfig({
     };
   },
   modules: ['@wxt-dev/module-react'],
+  vite: () => ({
+    build: {
+      chunkSizeWarningLimit: 3000,
+    },
+  }),
 });
 `);
 }

package/dist/templates/frontend.js

@@ -6,7 +6,7 @@ import { appendGitignore, writeFile, exec, execExpect, liftNestedProject } from
 import { FRONTEND_ADDON_DEPENDENCIES, withVersions } from '../dependencies.js';
 import { resolveToolchainChannel, resolveToolchain, toolPackageRef } from '../toolchain.js';
 export async function scaffoldFrontend(root, { projectName, displayName, skipInstall }) {
-    const dir = path.join(root, 'apps/frontend');
+    const dir = path.join(root, 'Frontend');
     const toolchain = resolveToolchain(resolveToolchainChannel(process.env.ANHEDRAL_TOOLCHAIN));
     anhedralPrint.section('Frontend (Expo)');
     anhedralPrint.step('Scaffolding Expo app with react-native-reusables');
@@ -21,6 +21,7 @@ export async function scaffoldFrontend(root, { projectName, displayName, skipIns
     anhedralPrint.step('Installing frontend dependencies');
     patchFrontendPackageJson(dir);
     patchExpoAppConfig(dir);
+    patchFrontendTsConfig(dir);
     if (!skipInstall) {
         exec('pnpm install --no-frozen-lockfile', dir);
         exec('pnpm exec expo install --fix --pnpm', dir);
@@ -36,13 +37,14 @@ export async function scaffoldFrontend(root, { projectName, displayName, skipIns
     writeEnvExample(dir);
     writeEnvFile(dir);
     writeVercelConfig(dir);
+    writeEasConfig(dir);
     writeAnhedralLogo(dir);
     writeSubscriptionProvider(dir);
     writeUseSubscription(dir);
     anhedralPrint.step('Installing Expo native packages');
     if (skipInstall) {
         anhedralPrint.info('Skipping Expo native package install (--skip-install)');
-        anhedralPrint.info('Run after init: pnpm --filter ./apps/frontend exec expo install --pnpm expo-image-picker');
+        anhedralPrint.info('Run after init: pnpm --filter ./Frontend exec expo install --pnpm expo-image-picker');
     }
     else {
         exec('pnpm exec expo install --pnpm expo-image-picker', dir);
@@ -56,7 +58,7 @@ export async function scaffoldFrontend(root, { projectName, displayName, skipIns
         '@revenuecat/purchases-js': FRONTEND_ADDON_DEPENDENCIES['@revenuecat/purchases-js'],
     });
     if (skipInstall) {
-        anhedralPrint.info(`Skipping RevenueCat SDK install (--skip-install). Run after init: pnpm --filter ./apps/frontend add ${revenueCatDependencies.join(' ')}`);
+        anhedralPrint.info(`Skipping RevenueCat SDK install (--skip-install). Run after init: pnpm --filter ./Frontend add ${revenueCatDependencies.join(' ')}`);
     }
     else {
         exec(`pnpm add ${revenueCatDependencies.join(' ')}`, dir);
@@ -69,7 +71,7 @@ function patchFrontendPackageJson(dir) {
     packageJson.dependencies = {
         ...(packageJson.dependencies ?? {}),
         '@anhedral/api-client': FRONTEND_ADDON_DEPENDENCIES['@anhedral/api-client'],
-        '@clerk/clerk-expo': FRONTEND_ADDON_DEPENDENCIES['@clerk/clerk-expo'],
+        '@clerk/expo': FRONTEND_ADDON_DEPENDENCIES['@clerk/expo'],
         'react-native-purchases': FRONTEND_ADDON_DEPENDENCIES['react-native-purchases'],
         'react-native-purchases-ui': FRONTEND_ADDON_DEPENDENCIES['react-native-purchases-ui'],
         '@revenuecat/purchases-js': FRONTEND_ADDON_DEPENDENCIES['@revenuecat/purchases-js'],
@@ -82,6 +84,17 @@ function patchFrontendPackageJson(dir) {
     };
     writeFile(filePath, JSON.stringify(packageJson, null, 2) + '\n');
 }
+function patchFrontendTsConfig(dir) {
+    const filePath = path.join(dir, 'tsconfig.json');
+    if (!fs.existsSync(filePath)) {
+        return;
+    }
+    const tsConfig = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    if (tsConfig.extends === 'expo/tsconfig.base') {
+        tsConfig.extends = 'expo/tsconfig.base.json';
+    }
+    writeFile(filePath, JSON.stringify(tsConfig, null, 2) + '\n');
+}
 function patchExpoAppConfig(dir) {
     const filePath = path.join(dir, 'app.json');
     if (!fs.existsSync(filePath)) {
@@ -94,6 +107,10 @@ function patchExpoAppConfig(dir) {
         bundler: 'metro',
         output: 'static',
     };
+    appJson.expo.plugins = Array.from(new Set([
+        ...(Array.isArray(appJson.expo.plugins) ? appJson.expo.plugins : []),
+        '@clerk/expo',
+    ]));
     writeFile(filePath, JSON.stringify(appJson, null, 2) + '\n');
 }
 function writeApiClient(dir) {
@@ -169,7 +186,7 @@ export function getPlatformRevenueCatApiKey(): string {
 `);
 }
 function writeApiHook(dir) {
-    writeFile(path.join(dir, 'hooks/useAPI.ts'), `import { useAuth } from '@clerk/clerk-expo';
+    writeFile(path.join(dir, 'hooks/useAPI.ts'), `import { useAuth } from '@clerk/expo';
 import { useMemo } from 'react';
 import { APIClient } from '@/api/client';
 import { apiBaseUrl } from '@/lib/config';
@@ -191,13 +208,39 @@ function writeVercelConfig(dir) {
         rewrites: [
             {
                 source: '/:path*',
-                destination: '/index.html',
+                destination: '/',
             },
         ],
     }, null, 2) + '\n');
 }
+function writeEasConfig(dir) {
+    writeFile(path.join(dir, 'eas.json'), JSON.stringify({
+        cli: {
+            version: '>= 16.24.0',
+            appVersionSource: 'remote',
+        },
+        build: {
+            development: {
+                developmentClient: true,
+                distribution: 'internal',
+                android: {
+                    buildType: 'apk',
+                },
+            },
+            preview: {
+                distribution: 'internal',
+            },
+            production: {
+                autoIncrement: true,
+            },
+        },
+        submit: {
+            production: {},
+        },
+    }, null, 2) + '\n');
+}
 function writeAccountHook(dir) {
-    writeFile(path.join(dir, 'hooks/useAccount.ts'), `import { useAuth } from '@clerk/clerk-expo';
+    writeFile(path.join(dir, 'hooks/useAccount.ts'), `import { useAuth } from '@clerk/expo';
 import * as React from 'react';
 import { useAPI } from '@/hooks/useAPI';
 
@@ -295,7 +338,7 @@ import Purchases, { type CustomerInfo, type PurchasesOfferings } from 'react-nat
 import { Purchases as PurchasesWeb } from '@revenuecat/purchases-js';
 import { AppState, Platform } from 'react-native';
 import { subscriptionConfig, getPlatformRevenueCatApiKey } from '@/lib/config';
-import { useAuth, useUser } from '@clerk/clerk-expo';
+import { useAuth, useUser } from '@clerk/expo';
 import { useAPI } from '@/hooks/useAPI';
 import RevenueCatUI, { PAYWALL_RESULT } from 'react-native-purchases-ui';
 
@@ -697,9 +740,10 @@ function writeAppShellFiles(dir, displayName) {
     writeFile(path.join(dir, 'app/_layout.tsx'), `import '@/global.css';
 
 import { SubscriptionProvider } from '@/contexts/SubscriptionProvider';
+import { clerkPublishableKey } from '@/lib/config';
 import { NAV_THEME } from '@/lib/theme';
-import { ClerkProvider, useAuth } from '@clerk/clerk-expo';
-import { tokenCache } from '@clerk/clerk-expo/token-cache';
+import { ClerkProvider, useAuth } from '@clerk/expo';
+import { tokenCache } from '@clerk/expo/token-cache';
 import { ThemeProvider } from '@react-navigation/native';
 import { PortalHost } from '@rn-primitives/portal';
 import { Stack } from 'expo-router';
@@ -714,7 +758,7 @@ export default function RootLayout() {
   const { colorScheme } = useColorScheme();
 
   return (
-    <ClerkProvider tokenCache={tokenCache}>
+    <ClerkProvider publishableKey={clerkPublishableKey} tokenCache={tokenCache}>
       <ThemeProvider value={NAV_THEME[colorScheme ?? 'light']}>
         <SubscriptionProvider>
           <StatusBar style={colorScheme === 'dark' ? 'light' : 'dark'} />
@@ -763,7 +807,7 @@ function Routes() {
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Text } from '@/components/ui/text';
-import { useAuth } from '@clerk/clerk-expo';
+import { useAuth } from '@clerk/expo';
 import { Link } from 'expo-router';
 import { CloudIcon, CreditCardIcon, ShieldCheckIcon, DatabaseIcon } from 'lucide-react-native';
 import { ScrollView, View } from 'react-native';
@@ -1103,7 +1147,7 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Separator } from '@/components/ui/separator';
 import { Text } from '@/components/ui/text';
-import { useSignIn } from '@clerk/clerk-expo';
+import { useSignIn } from '@clerk/expo/legacy';
 import { Link } from 'expo-router';
 import * as React from 'react';
 import { type TextInput, View } from 'react-native';
@@ -1217,7 +1261,7 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Separator } from '@/components/ui/separator';
 import { Text } from '@/components/ui/text';
-import { useSignUp } from '@clerk/clerk-expo';
+import { useSignUp } from '@clerk/expo/legacy';
 import { Link, router } from 'expo-router';
 import * as React from 'react';
 import { TextInput, View } from 'react-native';
@@ -1321,7 +1365,7 @@ import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover
 import { Text } from '@/components/ui/text';
 import { useAccount } from '@/hooks/useAccount';
 import { useSubscription } from '@/hooks/useSubscription';
-import { useAuth } from '@clerk/clerk-expo';
+import { useAuth } from '@clerk/expo';
 import type { TriggerRef } from '@rn-primitives/popover';
 import { CameraIcon, CreditCardIcon, CoinsIcon, LoaderCircleIcon, LogOutIcon } from 'lucide-react-native';
 import * as React from 'react';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anhedral",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Opinionated init CLI for Expo, Fastify, WXT, shared packages, Neon, Drizzle, Clerk, RevenueCat, Stripe, R2, and Vercel.",
   "type": "module",
   "bin": {