Merge branch 'main' into feature/1.5.1

apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx

@@ -66,7 +66,6 @@ export default async function SurveysPage({ params }) {
           user={session.user}
         />
       )}
-      {/* <SurveysList environmentId={params.environmentId} />   */}
       <WidgetStatusIndicator environmentId={params.environmentId} type="mini" />
     </ContentWrapper>
   );

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formbricks/web",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "private": true,
   "scripts": {
     "clean": "rimraf .turbo node_modules .next",
@@ -27,9 +27,9 @@
     "@radix-ui/react-collapsible": "^1.0.3",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@react-email/components": "^0.0.14",
-    "@sentry/nextjs": "^7.98.0",
+    "@sentry/nextjs": "^7.99.0",
     "@vercel/og": "^0.6.2",
-    "@vercel/speed-insights": "^1.0.8",
+    "@vercel/speed-insights": "^1.0.9",
     "bcryptjs": "^2.4.3",
     "dotenv": "^16.4.1",
     "encoding": "^0.1.13",
@@ -37,25 +37,25 @@
     "googleapis": "^131.0.0",
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
-    "lru-cache": "^10.1.0",
+    "lru-cache": "^10.2.0",
-    "lucide-react": "^0.315.0",
+    "lucide-react": "^0.321.0",
     "mime": "^4.0.1",
     "next": "14.1.0",
-    "nodemailer": "^6.9.8",
+    "nodemailer": "^6.9.9",
     "otplib": "^12.0.1",
-    "posthog-js": "^1.102.1",
+    "posthog-js": "^1.104.4",
     "prismjs": "^1.29.0",
     "qrcode": "^1.5.3",
     "react": "18.2.0",
     "react-beautiful-dnd": "^13.1.1",
     "react-dom": "18.2.0",
     "react-email": "^2.0.0",
-    "react-hook-form": "^7.49.3",
+    "react-hook-form": "^7.50.0",
     "react-hot-toast": "^2.4.1",
     "react-icons": "^5.0.1",
     "sharp": "^0.33.2",
     "ua-parser-js": "^1.0.37",
-    "webpack": "^5.90.0",
+    "webpack": "^5.90.1",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {

package.json

@@ -32,13 +32,13 @@
     "prepare": "husky install"
   },
   "devDependencies": {
-    "@playwright/test": "^1.41.1",
+    "@playwright/test": "^1.41.2",
     "eslint-config-formbricks": "workspace:*",
-    "husky": "^9.0.5",
+    "husky": "^9.0.10",
-    "lint-staged": "^15.2.0",
+    "lint-staged": "^15.2.1",
     "rimraf": "^5.0.5",
     "tsx": "^4.7.0",
-    "turbo": "^1.11.3"
+    "turbo": "^1.12.2"
   },
   "lint-staged": {
     "(apps|packages)/**/*.{js,ts,jsx,tsx}": [
@@ -64,6 +64,6 @@
   },
   "dependencies": {
     "@changesets/cli": "^2.27.1",
-    "playwright": "^1.41.1"
+    "playwright": "^1.41.2"
   }
 }

packages/database/package.json

@@ -25,15 +25,15 @@
     "predev": "pnpm generate"
   },
   "dependencies": {
-    "@prisma/client": "^5.8.1",
+    "@prisma/client": "^5.9.1",
-    "@prisma/extension-accelerate": "^0.6.2",
+    "@prisma/extension-accelerate": "^0.6.3",
     "dotenv-cli": "^7.3.0"
   },
   "devDependencies": {
     "@formbricks/tsconfig": "workspace:*",
     "@formbricks/types": "workspace:*",
     "eslint-config-formbricks": "workspace:*",
-    "prisma": "^5.8.1",
+    "prisma": "^5.9.1",
     "prisma-dbml-generator": "^0.10.0",
     "prisma-json-types-generator": "^3.0.3",
     "zod": "^3.22.4",

packages/ee/package.json

@@ -18,6 +18,6 @@
   },
   "dependencies": {
     "@formbricks/lib": "workspace:*",
-    "stripe": "^14.13.0"
+    "stripe": "^14.14.0"
   }
 }

packages/js/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formbricks/js",
   "license": "MIT",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Formbricks-js allows you to connect your app to Formbricks, display surveys and trigger events.",
   "homepage": "https://formbricks.com",
   "repository": {
@@ -40,17 +40,17 @@
   },
   "author": "Formbricks <hola@formbricks.com>",
   "devDependencies": {
-    "@babel/core": "^7.23.7",
+    "@babel/core": "^7.23.9",
-    "@babel/preset-env": "^7.23.8",
+    "@babel/preset-env": "^7.23.9",
     "@babel/preset-typescript": "^7.23.3",
     "@formbricks/api": "workspace:*",
     "@formbricks/lib": "workspace:*",
     "@formbricks/surveys": "workspace:*",
     "@formbricks/tsconfig": "workspace:*",
     "@formbricks/types": "workspace:*",
-    "@types/jest": "^29.5.11",
+    "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^6.19.1",
+    "@typescript-eslint/eslint-plugin": "^6.20.0",
-    "@typescript-eslint/parser": "^6.19.1",
+    "@typescript-eslint/parser": "^6.20.0",
     "babel-jest": "^29.7.0",
     "cross-env": "^7.0.3",
     "isomorphic-fetch": "^3.0.0",

packages/lib/package.json

@@ -14,9 +14,9 @@
     "test": "jest -ci --coverage --no-cache"
   },
   "dependencies": {
-    "@aws-sdk/s3-presigned-post": "3.499.0",
+    "@aws-sdk/s3-presigned-post": "3.504.0",
-    "@aws-sdk/client-s3": "3.499.0",
+    "@aws-sdk/client-s3": "3.504.0",
-    "@aws-sdk/s3-request-presigner": "3.499.0",
+    "@aws-sdk/s3-request-presigner": "3.504.0",
     "@t3-oss/env-nextjs": "^0.8.0",
     "@formbricks/api": "*",
     "@formbricks/database": "*",
@@ -27,10 +27,10 @@
     "jsonwebtoken": "^9.0.2",
     "markdown-it": "^14.0.0",
     "mime-types": "^2.1.35",
-    "nanoid": "^5.0.4",
+    "nanoid": "^5.0.5",
     "next-auth": "^4.24.5",
-    "nodemailer": "^6.9.8",
+    "nodemailer": "^6.9.9",
-    "posthog-node": "^3.6.0",
+    "posthog-node": "^3.6.1",
     "server-only": "^0.0.1",
     "tailwind-merge": "^2.2.1"
   },

packages/prettier-config/package.json

@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
-    "prettier": "^3.2.4",
+    "prettier": "^3.2.5",
     "prettier-plugin-tailwindcss": "^0.5.11"
   }
 }

packages/surveys/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formbricks/surveys",
   "license": "MIT",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Formbricks-surveys is a helper library to embed surveys into your application",
   "homepage": "https://formbricks.com",
   "repository": {

packages/tsconfig/package.json

@@ -7,8 +7,8 @@
     "clean": "rimraf node_modules dist turbo"
   },
   "devDependencies": {
-    "@types/node": "20.11.6",
+    "@types/node": "20.11.16",
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.52",
     "@types/react-dom": "18.2.18",
     "typescript": "^5.3.3"
   }

packages/ui/SurveysList/actions.ts

@@ -1,6 +1,6 @@
 "use server";
 
-import { Prisma as prismaClient } from "@prisma/client/";
+import { Prisma } from "@prisma/client";
 import { getServerSession } from "next-auth";
 
 import { authOptions } from "@formbricks/lib/authOptions";
@@ -169,11 +169,11 @@ export async function copyToOtherEnvironmentAction(
           id: session.user.id,
         },
       },
-      surveyClosedMessage: existingSurvey.surveyClosedMessage ?? prismaClient.JsonNull,
+      surveyClosedMessage: existingSurvey.surveyClosedMessage ?? Prisma.JsonNull,
-      singleUse: existingSurvey.singleUse ?? prismaClient.JsonNull,
+      singleUse: existingSurvey.singleUse ?? Prisma.JsonNull,
-      productOverwrites: existingSurvey.productOverwrites ?? prismaClient.JsonNull,
+      productOverwrites: existingSurvey.productOverwrites ?? Prisma.JsonNull,
-      verifyEmail: existingSurvey.verifyEmail ?? prismaClient.JsonNull,
+      verifyEmail: existingSurvey.verifyEmail ?? Prisma.JsonNull,
-      styling: existingSurvey.styling ?? prismaClient.JsonNull,
+      styling: existingSurvey.styling ?? Prisma.JsonNull,
     },
   });
 

packages/ui/SurveysList/components/SurveyCard.tsx

@@ -1,3 +1,5 @@
+"use client";
+
 import { Code, Link2Icon } from "lucide-react";
 import Link from "next/link";
 import { useEffect, useMemo, useState } from "react";

packages/ui/SurveysList/components/SurveyFilters.tsx

@@ -1,3 +1,5 @@
+"use client";
+
 import { ChevronDownIcon, Equal, Grid2X2, Search, X } from "lucide-react";
 import { useEffect, useState } from "react";
 

packages/ui/package.json

@@ -19,13 +19,13 @@
     "@formbricks/surveys": "workspace:*",
     "@formbricks/lib": "workspace:*",
     "@heroicons/react": "^2.1.1",
-    "@lexical/code": "^0.13.0",
+    "@lexical/code": "^0.13.1",
-    "@lexical/link": "^0.13.0",
+    "@lexical/link": "^0.13.1",
-    "@lexical/list": "^0.13.0",
+    "@lexical/list": "^0.13.1",
-    "@lexical/markdown": "^0.13.0",
+    "@lexical/markdown": "^0.13.1",
-    "@lexical/react": "^0.13.0",
+    "@lexical/react": "^0.13.1",
-    "@lexical/rich-text": "^0.13.0",
+    "@lexical/rich-text": "^0.13.1",
-    "@lexical/table": "^0.13.0",
+    "@lexical/table": "^0.13.1",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.5",
@@ -39,9 +39,9 @@
     "boring-avatars": "^1.10.1",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
-    "cmdk": "^0.2.0",
+    "cmdk": "^0.2.1",
-    "lexical": "^0.13.0",
+    "lexical": "^0.13.1",
-    "lucide-react": "^0.315.0",
+    "lucide-react": "^0.321.0",
     "react-colorful": "^5.6.1",
     "react-confetti": "^6.1.0",
     "react-day-picker": "^8.10.0",

packages/ui/tsconfig.json

@@ -1,8 +1,8 @@
 {
   "extends": "@formbricks/tsconfig/react-library.json",
-  "include": ["."],
+  "include": [".", "../types/*.d.ts"],
   "exclude": ["build", "node_modules"],
   "compilerOptions": {
-    "lib": ["ES2021.String"],
+    "lib": ["ES2021.String"]
-  },
+  }
 }