update to prisma v6, prisma config, and rust-less prisma

Author: kentcdodds

.dockerignore

@@ -1,2 +1,3 @@
 node_modules
-Dockerfile
+Dockerfile
+app/utils/prisma-generated.server

.env.example

@@ -1,10 +1,13 @@
 # We try to mock as much as possible so you don't have to have these set to anything real to contribute
+
 # We also only use these variables when you're trying to use the APIs that need them (lazy initialization)
+
 # If you need to work on the feature that uses the API, it must be set.
 # If it's mocked in development, then you can set its value to nonsense.
 # We'll label them by what feature you need them for and whether it's mocked.
 
 SENTRY_DSN="https://[email protected]/5878963"
+
 SENTRY_AUTH_TOKEN=some_token
 SENTRY_ORG=some_org
 SENTRY_PROJECT=some_project
@@ -13,6 +16,7 @@ SENTRY_PROJECT_ID=5878963
 # Feature: /contact and /login
 # Mocked: yes
 # Check the logs which print out the content of every "email" sent for any manual verification you need to do or links you need to open
+
 MAILGUN_SENDING_KEY=key-some-mailgun-key
 MAILGUN_DOMAIN=some.domain.com
 
@@ -27,13 +31,14 @@ TITO_API_SECRET=secret_live_some_long_thing
 # Feature: authentication
 # Mocked: Unnecessary (any value can be used)
 # Technically we have a fallback in development so this doesn't even need to be set
+
 SESSION_SECRET=anything_works_here
 MAGIC_LINK_SECRET=whatever_stuff
 
 # Feature: basically everything
 # Mocked: No, must run sqlite locally
 DATABASE_FILENAME="sqlite.db"
-DATABASE_URL="file:./sqlite.db?connection_limit=1"
+DATABASE_URL="file:./prisma/sqlite.db"
 CACHE_DATABASE_PATH="other/cache.db"
 LITEFS_DIR="./prisma"
 
@@ -91,4 +96,4 @@ REFRESH_CACHE_SECRET=really_whatever
 VERIFIER_API_KEY=some_api_key
 
 # Feature: Cloudflare OAuth
-CF_INTERNAL_SECRET=some_long_random_string
+CF_INTERNAL_SECRET=some_long_random_string

.gitignore

@@ -10,6 +10,7 @@ node_modules/
 tsconfig.tsbuildinfo
 /prisma/sqlite.db
 /prisma/sqlite.db-journal
+/app/utils/prisma-generated.server
 
 other/postcss.ignored
 

Dockerfile

@@ -16,6 +16,8 @@ WORKDIR /app/
 
 ADD package.json .npmrc package-lock.json ./
 ADD other/patches ./other/patches
+ADD prisma /app/prisma
+ADD prisma.config.ts /app/prisma.config.ts
 RUN npm install
 
 # setup production node_modules
@@ -27,6 +29,7 @@ WORKDIR /app/
 COPY --from=deps /app/node_modules /app/node_modules
 ADD package.json .npmrc package-lock.json /app/
 RUN npm prune --omit=dev
+RUN npm rebuild better-sqlite3
 
 # build app
 FROM base as build
@@ -44,6 +47,7 @@ ADD other/runfile.js /app/other/runfile.js
 
 # schema doesn't change much so these will stay cached
 ADD prisma /app/prisma
+ADD prisma.config.ts /app/prisma.config.ts
 
 RUN npx prisma generate
 
@@ -81,14 +85,14 @@ RUN echo "#!/bin/sh\nset -x\nsqlite3 \$CACHE_DATABASE_PATH" > /usr/local/bin/cac
 RUN mkdir /app/
 WORKDIR /app/
 
+ADD . .
+
 COPY --from=production-deps /app/node_modules /app/node_modules
-COPY --from=build /app/node_modules/.prisma /app/node_modules/.prisma
+COPY --from=build /app/app/utils/prisma-generated.server /app/app/utils/prisma-generated.server
 COPY --from=build /app/build /app/build
 COPY --from=build /app/public /app/public
 COPY --from=build /app/server-build /app/server-build
 
-ADD . .
-
 # prepare for litefs
 COPY --from=flyio/litefs:0.5.11 /usr/local/bin/litefs /usr/local/bin/litefs
 ADD other/litefs.yml /etc/litefs.yml

app/routes/resources+/webauthn+/verify-registration.ts

@@ -89,7 +89,7 @@ export async function action({ request }: ActionFunctionArgs) {
 		data: {
 			id: credential.id,
 			aaguid,
-			publicKey: Buffer.from(credential.publicKey),
+			publicKey: new Uint8Array(credential.publicKey),
 			userId: user.id,
 			webauthnUserId,
 			counter: credential.counter,

app/utils/prisma.server.ts

@@ -1,10 +1,11 @@
 import { remember } from '@epic-web/remember'
-import { PrismaClient } from '@prisma/client'
+import { PrismaBetterSQLite3 } from '@prisma/adapter-better-sqlite3'
 import chalk from 'chalk'
 import pProps from 'p-props'
 import { type Session } from '#app/types.ts'
 import { ensurePrimary } from '#app/utils/litefs-js.server.ts'
 import { decrypt, encrypt } from './encryption.server.ts'
+import { PrismaClient } from './prisma-generated.server/client.ts'
 import { time, type Timings } from './timing.server.ts'
 
 const logThreshold = 500
@@ -15,7 +16,14 @@ function getClient(): PrismaClient {
 	// NOTE: during development if you change anything in this function, remember
 	// that this only runs once per server restart and won't automatically be
 	// re-run per request like everything else is.
+	const url = process.env.DATABASE_URL
+	if (!url) {
+		throw new Error(
+			'DATABASE_URL is required (expected a file: URL for SQLite).',
+		)
+	}
 	const client = new PrismaClient({
+		adapter: new PrismaBetterSQLite3({ url }),
 		log: [
 			{ level: 'query', emit: 'event' },
 			{ level: 'error', emit: 'stdout' },

app/utils/session.server.ts

@@ -1,7 +1,7 @@
-import { type User } from '@prisma/client'
 import { createCookieSessionStorage, redirect } from '@remix-run/node'
 import { z } from 'zod'
 import { ensurePrimary } from '#app/utils/litefs-js.server.ts'
+import { type User } from '#app/utils/prisma-generated.server/client.ts'
 import { getLoginInfoSession } from './login.server.ts'
 import { getRequiredServerEnvVar } from './misc.tsx'
 import {

e2e/utils.ts

@@ -1,9 +1,12 @@
 import path from 'path'
 import { test as base } from '@playwright/test'
-import { PrismaClient, type User } from '@prisma/client'
 import { parse } from 'cookie'
 import fsExtra from 'fs-extra'
 import invariant from 'tiny-invariant'
+import {
+	PrismaClient,
+	type User,
+} from '#app/utils/prisma-generated.server/client.ts'
 import '../app/entry.server.tsx'
 import { getSession } from '../app/utils/session.server.ts'
 import { createUser } from '../prisma/seed-utils.ts'

eslint.config.js

@@ -3,7 +3,7 @@ import { config as defaultConfig } from '@epic-web/config/eslint'
 /** @type {import("eslint").Linter.Config[]} */
 export default [
 	{
-		ignores: ['./oauth'],
+		ignores: ['./oauth', './app/utils/prisma-generated.server'],
 	},
 	...defaultConfig,
 ]