v3.1.0

.env.example

@@ -6,6 +6,7 @@
 #SANDBOX_MODE=false # true or false - if true, the app will use the sandbox mode, which disables resetting the database and other features
 #PUBLIC_URL="http://yourdomain.com" # When using advanced deployment, this is required. Set to the domain name of your app
 #INSTALLATION_ID="your-app-name" # A unique identifier for your app, used for analytics. Generated automatically if not set.
+#USE_NEON_POSTGRES_ADAPTER=false # true or false - If true, uses Neon serverless PostgreSQL adapter instead of standard pg adapter. Required for Vercel/Netlify deployments with Neon. Defaults to false.
 
 # -------------------
 # Required environment variables

.eslintrc.cjs

@@ -19,13 +19,22 @@ const config = {
     project: path.join(__dirname, 'tsconfig.json'),
   },
   plugins: ['@typescript-eslint'],
-  extends: ['eslint:recommended', 'plugin:@typescript-eslint/stylistic', 'plugin:@typescript-eslint/recommended', 'next/core-web-vitals', 'prettier', 'plugin:storybook/recommended'],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/stylistic',
+    'plugin:@typescript-eslint/recommended',
+    'next/core-web-vitals',
+    'prettier',
+    'plugin:storybook/recommended',
+  ],
   ignorePatterns: [
     'node_modules',
     '*.stories.*',
     '*.test.*',
     'public',
     '.eslintrc.cjs',
+    'lib/gb/generated',
+    'storybook-static',
   ],
   rules: {
     '@next/next/no-img-element': 'off',

.github/workflows/deploy-storybook.yaml

@@ -0,0 +1,64 @@
+name: Deploy Storybook
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+      - 'v*'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build Storybook
+        run: pnpm build-storybook
+
+      - name: Deploy to Netlify
+        uses: nwtgck/actions-netlify@v3
+        with:
+          publish-dir: './storybook-static'
+          production-branch: main
+          production-deploy: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          deploy-message: "Deploy from GitHub Actions - ${{ github.event.head_commit.message || github.event.pull_request.title }}"
+          enable-pull-request-comment: true
+          enable-commit-comment: false
+          overwrites-pull-request-comment: true
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_STORYBOOK_SITE_ID }}
+        timeout-minutes: 5

.github/workflows/docker-build-pr.yml

@@ -16,31 +16,6 @@ on:
     branches:
       - main
       - 'v*'
-    # Only build when relevant files change
-    paths:
-      - 'Dockerfile'
-      - 'package.json'
-      - 'pnpm-lock.yaml'
-      - 'prisma/**'
-      - 'app/**'
-      - 'components/**'
-      - 'lib/**'
-      - 'actions/**'
-      - 'hooks/**'
-      - 'utils/**'
-      - 'schemas/**'
-      - 'types/**'
-      - 'public/**'
-      - 'styles/**'
-      - 'next.config.js'
-      - 'tailwind.config.ts'
-      - 'postcss.config.js'
-      - 'tsconfig.json'
-      - '.github/workflows/docker-build-pr.yml'
-      - 'postinstall.js'
-      - 'migrate-and-start.sh'
-      - 'setup-database.js'
-      - 'initialize.js'
 
 permissions:
   contents: read
@@ -86,4 +61,4 @@ jobs:
           name: ${{ steps.artifact-info.outputs.name }}
           path: /tmp/image.tar
           retention-days: 7
-          compression-level: 1  # Minimal compression for faster upload/download
+          compression-level: 1 # Minimal compression for faster upload/download

.gitignore

@@ -13,6 +13,9 @@
 /prisma/db.sqlite
 /prisma/db.sqlite-journal
 
+# prisma generated client
+/lib/db/generated
+
 # next.js
 /.next/
 /out/

Dockerfile

@@ -11,18 +11,15 @@ WORKDIR /app
 # Enable corepack early for better caching
 RUN corepack enable
 
-# Copy dependency files, Prisma schema, and postinstall script
-COPY package.json pnpm-lock.yaml* postinstall.js ./
-COPY prisma ./prisma
+# Copy dependency files
+COPY package.json pnpm-lock.yaml* prisma.config.ts env.js ./
+COPY lib/db/schema.prisma ./lib/db/schema.prisma
 
 # Install pnpm and dependencies with cache mount for faster builds
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store \
     --mount=type=cache,target=/root/.cache/pnpm \
     corepack enable pnpm && pnpm i --frozen-lockfile --prefer-offline
 
-# Copy remaining setup scripts
-COPY migrate-and-start.sh setup-database.js initialize.js ./
-
 # ---------
 
 # Rebuild the source code only when needed
@@ -32,9 +29,8 @@ WORKDIR /app
 # Install git for version info
 RUN apk add --no-cache git
 
-# Copy node_modules and Prisma files from deps stage
+# Copy node_modules from deps stage
 COPY --from=deps /app/node_modules ./node_modules
-COPY --from=deps /app/prisma ./prisma
 
 # Copy source code
 COPY . .
@@ -44,8 +40,14 @@ ENV SKIP_ENV_VALIDATION=true
 ENV NODE_ENV=production
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
-# Enable pnpm and build
-RUN corepack enable pnpm && pnpm run build
+# Enable pnpm, generate Prisma client, and build
+# Note: prisma generate must run here because the generated client (lib/db/generated/)
+# is gitignored and not copied from deps stage (only node_modules is copied)
+# and without the client being present, the build will fail.
+#
+# The client is generated _again_ as part of migrate-and-start.sh in the final image
+# to ensure that it inherits the correct runtime environment variables.
+RUN corepack enable pnpm && pnpm exec prisma generate && pnpm run build
 
 # Production image, copy all the files and run next
 FROM base AS runner
@@ -70,16 +72,19 @@ RUN mkdir .next && chown nextjs:nodejs .next
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
-# Copy runtime scripts and database schema
-COPY --from=builder --chown=nextjs:nodejs /app/initialize.js ./
-COPY --from=builder --chown=nextjs:nodejs /app/setup-database.js ./
-COPY --from=builder --chown=nextjs:nodejs /app/migrate-and-start.sh ./
-COPY --from=builder --chown=nextjs:nodejs /app/prisma ./prisma
+# Copy runtime scripts, database files, and dependencies needed for tsx
+COPY --from=builder --chown=nextjs:nodejs /app/scripts ./scripts
+COPY --from=builder --chown=nextjs:nodejs /app/lib/db ./lib/db
+COPY --from=builder --chown=nextjs:nodejs /app/prisma.config.ts ./
+COPY --from=builder --chown=nextjs:nodejs /app/node_modules ./node_modules
+COPY --from=builder --chown=nextjs:nodejs /app/package.json ./
+COPY --from=builder --chown=nextjs:nodejs /app/env.js ./
+COPY --from=builder --chown=nextjs:nodejs /app/tsconfig.json ./
 
 # Switch to non-root user
 USER nextjs
 
 EXPOSE 3000
 
 # Use exec form for better signal handling
-CMD ["sh", "migrate-and-start.sh"]
+CMD ["sh", "scripts/migrate-and-start.sh"]

actions/activityFeed.ts

@@ -2,7 +2,7 @@
 
 import { safeRevalidateTag } from '~/lib/cache';
 import type { Activity, ActivityType } from '~/lib/data-table/types';
-import { prisma } from '~/utils/db';
+import { prisma } from '~/lib/db';
 
 export async function addEvent(
   type: ActivityType,

actions/appSettings.ts

@@ -5,7 +5,7 @@ import { type z } from 'zod';
 import { safeRevalidateTag } from '~/lib/cache';
 import { type AppSetting, appSettingsSchema } from '~/schemas/appSettings';
 import { requireApiAuth } from '~/utils/auth';
-import { prisma } from '~/utils/db';
+import { prisma } from '~/lib/db';
 import { ensureError } from '~/utils/ensureError';
 
 // Convert string | boolean | Date to string

actions/auth.ts

@@ -5,7 +5,7 @@ import { cookies } from 'next/headers';
 import { redirect } from 'next/navigation';
 import { createUserFormDataSchema, loginSchema } from '~/schemas/auth';
 import { auth, getServerSession } from '~/utils/auth';
-import { prisma } from '~/utils/db';
+import { prisma } from '~/lib/db';
 
 export async function signup(formData: unknown) {
   const parsedFormData = createUserFormDataSchema.safeParse(formData);

actions/interviews.ts

@@ -1,7 +1,7 @@
 'use server';
 
 import { createId } from '@paralleldrive/cuid2';
-import { Prisma, type Interview, type Protocol } from '@prisma/client';
+import { Prisma, type Interview, type Protocol } from '~/lib/db/generated/client';
 import { cookies } from 'next/headers';
 import trackEvent from '~/lib/analytics';
 import { safeRevalidateTag } from '~/lib/cache';
@@ -26,7 +26,7 @@ import type {
 } from '~/schemas/interviews';
 import { type NcNetwork } from '~/schemas/network-canvas';
 import { requireApiAuth } from '~/utils/auth';
-import { prisma } from '~/utils/db';
+import { prisma } from '~/lib/db';
 import { ensureError } from '~/utils/ensureError';
 import { addEvent } from './activityFeed';
 import { uploadZipToUploadThing } from './uploadThing';

actions/participants.ts

@@ -8,7 +8,7 @@ import {
   updateSchema,
 } from '~/schemas/participant';
 import { requireApiAuth } from '~/utils/auth';
-import { prisma } from '~/utils/db';
+import { prisma } from '~/lib/db';
 
 export async function deleteParticipants(participantIds: string[]) {
   await requireApiAuth();

actions/protocols.ts

@@ -1,14 +1,14 @@
 'use server';
 
 import { type Protocol } from '@codaco/shared-consts';
-import { Prisma } from '@prisma/client';
+import { Prisma } from '~/lib/db/generated/client';
 import { safeRevalidateTag } from 'lib/cache';
 import { hash } from 'ohash';
 import { type z } from 'zod';
 import { getUTApi } from '~/lib/uploadthing-server-helpers';
 import { protocolInsertSchema } from '~/schemas/protocol';
 import { requireApiAuth } from '~/utils/auth';
-import { prisma } from '~/utils/db';
+import { prisma } from '~/lib/db';
 import { addEvent } from './activityFeed';
 
 // When deleting protocols we must first delete the assets associated with them

actions/reset.ts

@@ -5,7 +5,7 @@ import { env } from 'process';
 import { safeRevalidateTag } from '~/lib/cache';
 import { getUTApi } from '~/lib/uploadthing-server-helpers';
 import { requireApiAuth } from '~/utils/auth';
-import { prisma } from '~/utils/db';
+import { prisma } from '~/lib/db';
 
 export const resetAppSettings = async () => {
   if (env.NODE_ENV !== 'development') {

app/(blobs)/(setup)/setup/page.tsx

@@ -6,7 +6,7 @@ import {
   requireAppNotExpired,
 } from '~/queries/appSettings';
 import { getServerSession } from '~/utils/auth';
-import { prisma } from '~/utils/db';
+import { prisma } from '~/lib/db';
 import Setup from './Setup';
 
 async function getSetupData() {

app/dashboard/_components/ActivityFeed/ActivityFeedTable.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import type { Events } from '@prisma/client';
+import type { Events } from '~/lib/db/generated/client';
 import type { ColumnDef } from '@tanstack/react-table';
 import { use, useMemo } from 'react';
 import { DataTable } from '~/components/data-table/data-table';

app/dashboard/_components/ActivityFeed/ColumnDefinition.tsx

@@ -9,7 +9,7 @@ import {
   type Activity,
   activityTypes,
 } from '~/lib/data-table/types';
-import type { Events } from '@prisma/client';
+import type { Events } from '~/lib/db/generated/client';
 import TimeAgo from '~/components/ui/TimeAgo';
 import { DataTableColumnHeader } from '~/components/DataTable/ColumnHeader';
 import { getBadgeColorsForActivityType } from './utils';

app/dashboard/_components/InterviewsTable/ActionsDropdown.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import type { Interview } from '@prisma/client';
+import type { Interview } from '~/lib/db/generated/client';
 import type { Row } from '@tanstack/react-table';
 import { MoreHorizontal } from 'lucide-react';
 import Link from 'next/link';

app/dashboard/_components/ParticipantsTable/ActionsDropdown.tsx

@@ -11,7 +11,7 @@ import type { Row } from '@tanstack/react-table';
 import { useState } from 'react';
 import ParticipantModal from '~/app/dashboard/participants/_components/ParticipantModal';
 import type { ParticipantWithInterviews } from '~/types/types';
-import type { Participant } from '@prisma/client';
+import type { Participant } from '~/lib/db/generated/client';
 
 export const ActionsDropdown = ({
   row,

app/dashboard/_components/ParticipantsTable/GenerateParticipantURLButton.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import type { Participant, Protocol } from '@prisma/client';
+import type { Participant, Protocol } from '~/lib/db/generated/client';
 import { useRef, useState } from 'react';
 import {
   Select,

app/dashboard/_components/RecruitmentTestSection.tsx

@@ -1,5 +1,5 @@
 'use client';
-import type { Participant, Protocol } from '@prisma/client';
+import type { Participant, Protocol } from '~/lib/db/generated/client';
 import { type Route } from 'next';
 import { useRouter } from 'next/navigation';
 import { use, useEffect, useState } from 'react';

app/dashboard/interviews/_components/DeleteInterviewsDialog.tsx

@@ -1,4 +1,4 @@
-import type { Interview } from '@prisma/client';
+import type { Interview } from '~/lib/db/generated/client';
 import { AlertCircle, Loader2, Trash2 } from 'lucide-react';
 import { type Dispatch, type SetStateAction, useEffect, useState } from 'react';
 import { deleteInterviews } from '~/actions/interviews';

app/dashboard/interviews/_components/ExportInterviewsDialog.tsx

@@ -1,4 +1,4 @@
-import type { Interview } from '@prisma/client';
+import type { Interview } from '~/lib/db/generated/client';
 import { DialogDescription } from '@radix-ui/react-dialog';
 import { FileWarning, Loader2, XCircle } from 'lucide-react';
 import { useState } from 'react';

app/dashboard/participants/_components/AddParticipantButton.tsx

@@ -1,6 +1,6 @@
 import { Button } from '~/components/ui/Button';
 
-import { type Participant } from '@prisma/client';
+import { type Participant } from '~/lib/db/generated/client';
 import { useState } from 'react';
 import ParticipantModal from '~/app/dashboard/participants/_components/ParticipantModal';
 import { Plus } from 'lucide-react';