Merge pull request #46 from CarboxyDev/development

Update create-blitzpack CLI UX + Update local testing infra

Author: CarboxyDev

.husky/pre-push

@@ -1 +1 @@
-pnpm typecheck && pnpm test
+pnpm typecheck && pnpm test:unit

apps/api/package.json

@@ -12,7 +12,7 @@
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
     "test": "vitest run",
-    "test:unit": "vitest run src/",
+    "test:unit": "vitest run --config vitest.unit.config.ts",
     "test:integration": "vitest run test/integration/",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",

apps/api/src/plugins/auth.ts

@@ -1,13 +1,25 @@
 import { betterAuth } from 'better-auth';
 import { prismaAdapter } from 'better-auth/adapters/prisma';
 import { admin } from 'better-auth/plugins';
+import { createAccessControl } from 'better-auth/plugins/access';
+import { adminAc, defaultStatements } from 'better-auth/plugins/admin/access';
 import type { FastifyPluginAsync, FastifyRequest } from 'fastify';
 import fp from 'fastify-plugin';
 
 import { loadEnv } from '@/config/env.js';
 import { RATE_LIMIT_CONFIG } from '@/config/rate-limit.js';
 import { type PrismaClient } from '@/generated/client/client.js';
 
+const ac = createAccessControl(defaultStatements);
+
+const adminRole = ac.newRole({
+  ...adminAc.statements,
+});
+
+const superAdminRole = ac.newRole({
+  ...adminAc.statements,
+});
+
 declare module 'fastify' {
   interface FastifyInstance {
     auth: ReturnType<typeof betterAuth>;
@@ -91,8 +103,12 @@ const authPlugin: FastifyPluginAsync = async (app) => {
     socialProviders,
     plugins: [
       admin({
+        ac,
+        roles: {
+          admin: adminRole,
+          super_admin: superAdminRole,
+        },
         defaultRole: 'user',
-        adminRoles: ['admin', 'super_admin'],
       }),
     ],
   });

apps/api/vitest.unit.config.ts

@@ -0,0 +1,17 @@
+import tsconfigPaths from 'vite-tsconfig-paths';
+import { defineConfig, mergeConfig } from 'vitest/config';
+
+import { sharedConfig } from '../../vitest.shared';
+
+export default mergeConfig(
+  sharedConfig,
+  defineConfig({
+    test: {
+      name: '@repo/api-unit',
+      include: ['src/**/*.spec.ts'],
+      globals: true,
+      root: './',
+    },
+    plugins: [tsconfigPaths()],
+  })
+);

create-blitzpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-blitzpack",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Create a new Blitzpack project - full-stack TypeScript monorepo with Next.js and Fastify",
   "type": "module",
   "bin": {

create-blitzpack/src/prompts.ts

@@ -87,18 +87,59 @@ export async function getProjectOptions(
 }
 
 async function promptFeatureSelection(): Promise<FeatureOptions | null> {
+  let cancelled = false;
+
+  const { setupType } = await prompts(
+    {
+      type: 'select',
+      name: 'setupType',
+      message: 'Setup type:',
+      choices: [
+        {
+          title: 'Recommended',
+          description: 'all features included',
+          value: 'recommended',
+        },
+        {
+          title: 'Customize',
+          description: 'choose features',
+          value: 'customize',
+        },
+      ],
+      initial: 0,
+      hint: '- Use arrow-keys, Enter to submit',
+    },
+    {
+      onCancel: () => {
+        cancelled = true;
+      },
+    }
+  );
+
+  if (cancelled) {
+    return null;
+  }
+
+  if (setupType === 'recommended') {
+    return {
+      testing: true,
+      admin: true,
+      uploads: true,
+    };
+  }
+
   const featureChoices = OPTIONAL_FEATURES.map((feature) => ({
-    title: `${feature.name} ${chalk.dim(`(${feature.description})`)}`,
+    title: feature.name,
+    description: feature.description,
     value: feature.key,
-    selected: true,
+    selected: false,
   }));
 
-  let cancelled = false;
   const { selectedFeatures } = await prompts(
     {
       type: 'multiselect',
       name: 'selectedFeatures',
-      message: 'Include optional features:',
+      message: 'Select features to include:',
       choices: featureChoices,
       hint: '- Space to toggle, Enter to confirm',
       instructions: false,