🏗️ Add compatibility with different prisma clients

.dockerignore

@@ -1,6 +1,6 @@
 Dockerfile
 .dockerignore
-node_modules
+**/node_modules
 npm-debug.log
 README.md
 .next
@@ -10,5 +10,5 @@ README.md
 
 landing-page
 docs
-scripts
+packages/scripts
 wordpress

Dockerfile

@@ -4,12 +4,23 @@ ARG SCOPE
 ENV SCOPE=${SCOPE}
 RUN npm --global install pnpm
 
+FROM base AS pruner
+RUN npm --global install turbo
+WORKDIR /app
+COPY . .
+RUN turbo prune --scope=${SCOPE} --docker
+
 FROM base AS builder
 RUN apt-get -qy update && apt-get -qy --no-install-recommends install openssl git
-COPY pnpm-lock.yaml .npmrc pnpm-workspace.yaml ./
-RUN pnpm fetch
-ADD . ./
-RUN pnpm install -r --offline
+WORKDIR /app
+COPY .gitignore .gitignore
+COPY .npmrc .pnpmfile.cjs ./
+COPY --from=pruner /app/out/json/ .
+COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
+RUN pnpm install
+COPY --from=pruner /app/out/full/ .
+COPY turbo.json turbo.json
+
 RUN pnpm turbo run build:docker --filter=${SCOPE}...
 
 FROM base AS runner
@@ -21,7 +32,7 @@ RUN apt-get -qy update \
     && apt-get autoremove -yq \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
-COPY ./packages/db/prisma ./prisma
+COPY ./packages/db ./packages/db
 COPY ./apps/${SCOPE}/.env.docker ./apps/${SCOPE}/.env.production
 COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/apps/${SCOPE}/public ./apps/${SCOPE}/public

apps/viewer/src/features/blocks/integrations/sendEmail/sendEmail.spec.ts

@@ -6,15 +6,15 @@ import { importTypebotInDatabase } from 'utils/playwright/databaseActions'
 import { typebotViewer } from 'utils/playwright/testHelpers'
 import { getTestAsset } from '@/test/utils/playwright'
 
-const mockSmtpCredentials: SmtpCredentialsData = {
+export const mockSmtpCredentials: SmtpCredentialsData = {
   from: {
-    email: 'ted.kreiger@ethereal.email',
-    name: 'Ted Kreiger',
+    email: 'sunny.cremin66@ethereal.email',
+    name: 'Sunny Cremin',
   },
   host: 'smtp.ethereal.email',
   port: 587,
-  username: 'ted.kreiger@ethereal.email',
-  password: 'bFYFHfWjFxB9MK28zS',
+  username: 'sunny.cremin66@ethereal.email',
+  password: 'yJDHkf2bYbNydaRvTq',
 }
 
 test.beforeAll(async () => {

apps/viewer/src/features/blocks/integrations/sendEmail/sendEmailV2.spec.ts

@@ -7,13 +7,13 @@ import { getTestAsset } from '@/test/utils/playwright'
 
 const mockSmtpCredentials: SmtpCredentialsData = {
   from: {
-    email: 'ted.kreiger@ethereal.email',
-    name: 'Ted Kreiger',
+    email: 'sunny.cremin66@ethereal.email',
+    name: 'Sunny Cremin',
   },
   host: 'smtp.ethereal.email',
   port: 587,
-  username: 'ted.kreiger@ethereal.email',
-  password: 'bFYFHfWjFxB9MK28zS',
+  username: 'sunny.cremin66@ethereal.email',
+  password: 'yJDHkf2bYbNydaRvTq',
 }
 
 test.beforeAll(async () => {

builder-entrypoint.sh

@@ -2,11 +2,18 @@
 
 ENVSH_ENV=./apps/builder/.env.production ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh
 
-./node_modules/.bin/prisma generate;
+if [[ $DATABASE_URL == postgresql://* ]]; then
+  ./node_modules/.bin/prisma generate --schema=packages/db/postgresql/schema.prisma;
+else
+  ./node_modules/.bin/prisma generate --schema=packages/db/mysql/schema.prisma;
+fi
 
 echo 'Waiting 5s for db to be ready...';
 sleep 5;
 
-./node_modules/.bin/prisma migrate deploy;
+if [[ $DATABASE_URL == postgresql://* ]]; then
+  ./node_modules/.bin/prisma migrate deploy --schema=packages/db/postgresql/schema.prisma;
+fi
+
 
 node apps/builder/server.js;

packages/db/index.ts

@@ -1,9 +1 @@
 export * from '@prisma/client'
-
-// Named export for enums to avoid vite barrel export bug (https://github.com/nrwl/nx/issues/13704)
-export {
-  Plan,
-  WorkspaceRole,
-  GraphNavigation,
-  CollaborationType,
-} from '@prisma/client'