Compare commits

...

10 Commits

Author SHA1 Message Date
Matti Nannt
219f9beb84 Merge branch 'main' into feature/upgrade-deps-09 2024-09-30 15:04:19 +02:00
Matthias Nannt
e2cacfc743 fix prisma type issues 2024-09-30 12:11:05 +02:00
Matthias Nannt
9b109bf4d3 remove accelerate extension from prisma client 2024-09-30 09:00:06 +02:00
Matthias Nannt
159390e411 update prisma types deps 2024-09-30 08:23:12 +02:00
Matthias Nannt
35837be21e update react-hook-form versions to match 2024-09-27 11:41:16 +02:00
Matti Nannt
b2f5e5fbe3 Merge branch 'main' into feature/upgrade-deps-09 2024-09-27 11:30:20 +02:00
Matthias Nannt
692e7e3f24 merge latest changes and update deps 2024-09-26 15:15:02 +02:00
Matthias Nannt
0aca213750 update demo deps 2024-09-26 15:01:52 +02:00
Matthias Nannt
0bac91a7ef update storybook deps 2024-09-26 14:48:41 +02:00
Matthias Nannt
d1b47c675c chore: update docs deps 2024-09-26 14:46:02 +02:00
12 changed files with 3233 additions and 2604 deletions

View File

@@ -13,8 +13,8 @@
"dependencies": {
"@formbricks/js": "workspace:*",
"@formbricks/ui": "workspace:*",
"lucide-react": "^0.418.0",
"next": "14.2.5",
"lucide-react": "^0.446.0",
"next": "14.2.13",
"react": "18.3.1",
"react-dom": "18.3.1"
},

View File

@@ -13,39 +13,39 @@
"browserslist": "defaults, not ie <= 11",
"dependencies": {
"@algolia/autocomplete-core": "^1.17.4",
"@calcom/embed-react": "^1.5.0",
"@calcom/embed-react": "^1.5.1",
"@docsearch/css": "3",
"@docsearch/react": "^3.6.1",
"@formbricks/lib": "workspace:*",
"@formbricks/types": "workspace:*",
"@formbricks/ui": "workspace:*",
"@headlessui/react": "^2.1.2",
"@headlessui/react": "^2.1.8",
"@headlessui/tailwindcss": "^0.2.1",
"@mapbox/rehype-prism": "^0.9.0",
"@mdx-js/loader": "^3.0.1",
"@mdx-js/react": "^3.0.1",
"@next/mdx": "14.2.5",
"@next/mdx": "14.2.13",
"@paralleldrive/cuid2": "^2.2.2",
"@sindresorhus/slugify": "^2.2.1",
"@tailwindcss/typography": "^0.5.13",
"@tailwindcss/typography": "^0.5.15",
"acorn": "^8.12.1",
"autoprefixer": "^10.4.19",
"autoprefixer": "^10.4.20",
"clsx": "^2.1.1",
"fast-glob": "^3.3.2",
"flexsearch": "^0.7.43",
"framer-motion": "11.3.20",
"framer-motion": "11.7.0",
"lottie-web": "^5.12.2",
"lucide": "^0.418.0",
"lucide-react": "^0.418.0",
"lucide": "^0.446.0",
"lucide-react": "^0.446.0",
"mdast-util-to-string": "^4.0.0",
"mdx-annotations": "^0.1.4",
"next": "14.2.5",
"next-plausible": "^3.12.0",
"next-seo": "^6.5.0",
"next": "14.2.13",
"next-plausible": "^3.12.2",
"next-seo": "^6.6.0",
"next-sitemap": "^4.2.3",
"next-themes": "^0.3.0",
"node-fetch": "^3.3.2",
"prism-react-renderer": "^2.3.1",
"prism-react-renderer": "^2.4.0",
"prismjs": "^1.29.0",
"react": "18.3.1",
"react-dom": "18.3.1",
@@ -56,13 +56,13 @@
"remark-gfm": "^4.0.0",
"remark-mdx": "^3.0.1",
"schema-dts": "^1.1.2",
"sharp": "^0.33.4",
"sharp": "^0.33.5",
"shiki": "^0.14.7",
"simple-functional-loader": "^1.2.1",
"tailwindcss": "^3.4.7",
"tailwindcss": "^3.4.13",
"unist-util-filter": "^5.0.1",
"unist-util-visit": "^5.0.0",
"zustand": "^4.5.4"
"zustand": "^4.5.5"
},
"devDependencies": {
"@formbricks/config-typescript": "workspace:*",

View File

@@ -12,30 +12,30 @@
},
"dependencies": {
"@formbricks/ui": "workspace:*",
"eslint-plugin-react-refresh": "^0.4.9",
"eslint-plugin-react-refresh": "^0.4.12",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@chromatic-com/storybook": "^1.6.1",
"@chromatic-com/storybook": "^2.0.2",
"@formbricks/config-typescript": "workspace:*",
"@storybook/addon-a11y": "^8.2.9",
"@storybook/addon-essentials": "^8.2.9",
"@storybook/addon-interactions": "^8.2.9",
"@storybook/addon-links": "^8.2.9",
"@storybook/addon-onboarding": "^8.2.9",
"@storybook/blocks": "^8.2.9",
"@storybook/react": "^8.2.9",
"@storybook/react-vite": "^8.2.9",
"@storybook/test": "^8.2.9",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"@storybook/addon-a11y": "^8.3.3",
"@storybook/addon-essentials": "^8.3.3",
"@storybook/addon-interactions": "^8.3.3",
"@storybook/addon-links": "^8.3.3",
"@storybook/addon-onboarding": "^8.3.3",
"@storybook/blocks": "^8.3.3",
"@storybook/react": "^8.3.3",
"@storybook/react-vite": "^8.3.3",
"@storybook/test": "^8.3.3",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"@vitejs/plugin-react": "^4.3.1",
"esbuild": "^0.23.0",
"eslint-plugin-storybook": "^0.8.0",
"esbuild": "^0.24.0",
"eslint-plugin-storybook": "^0.9.0",
"prop-types": "^15.8.1",
"storybook": "^8.2.9",
"tsup": "^8.2.4",
"vite": "^5.4.1"
"storybook": "^8.3.3",
"tsup": "^8.3.0",
"vite": "^5.4.8"
}
}

View File

@@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />
// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

View File

@@ -47,7 +47,7 @@
"lru-cache": "^11.0.0",
"lucide-react": "^0.427.0",
"mime": "^4.0.4",
"next": "14.2.5",
"next": "14.2.13",
"next-safe-action": "^7.6.2",
"optional": "^0.1.4",
"otplib": "^12.0.1",
@@ -56,7 +56,7 @@
"prismjs": "^1.29.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-hook-form": "^7.52.2",
"react-hook-form": "^7.53.0",
"react-hot-toast": "^2.4.1",
"redis": "^4.7.0",
"sharp": "^0.33.4",

View File

@@ -52,8 +52,7 @@
"data-migration:advanced-logic": "ts-node ./data-migrations/20240828122408_advanced_logic_editor/data-migration.ts"
},
"dependencies": {
"@prisma/client": "^5.18.0",
"@prisma/extension-accelerate": "^1.1.0",
"@prisma/client": "^5.20.0",
"dotenv-cli": "^7.4.2"
},
"devDependencies": {
@@ -61,7 +60,7 @@
"@formbricks/types": "workspace:*",
"@paralleldrive/cuid2": "^2.2.2",
"@formbricks/eslint-config": "workspace:*",
"prisma": "^5.18.0",
"prisma": "^5.20.0",
"prisma-dbml-generator": "^0.12.0",
"prisma-json-types-generator": "^3.0.4",
"ts-node": "^10.9.2",

View File

@@ -1,21 +1,14 @@
import { PrismaClient } from "@prisma/client";
import { withAccelerate } from "@prisma/extension-accelerate";
const prismaClientSingleton = () => {
return new PrismaClient({
datasources: { db: { url: process.env.DATABASE_URL } },
...(process.env.DEBUG === "1" && {
log: ["query", "info"],
}),
}).$extends(withAccelerate());
const prismaClientSingleton = (): PrismaClient => {
return new PrismaClient();
};
type PrismaClientSingleton = ReturnType<typeof prismaClientSingleton>;
declare const globalThis: {
prismaGlobal: ReturnType<typeof prismaClientSingleton>;
} & typeof global;
const globalForPrisma = globalThis as unknown as {
prisma: PrismaClientSingleton | undefined;
};
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- as stated by the Prisma documentation
export const prisma = globalThis.prismaGlobal ?? prismaClientSingleton();
export const prisma = globalForPrisma.prisma ?? prismaClientSingleton();
if (process.env.NODE_ENV !== "production") globalForPrisma.prisma = prisma;
if (process.env.NODE_ENV !== "production") globalThis.prismaGlobal = prisma;

View File

@@ -17,7 +17,7 @@
"@formbricks/types": "*",
"@formbricks/ui": "*",
"@types/dompurify": "^3.0.5",
"@types/react": "18.3.3"
"@types/react": "18.3.9"
},
"dependencies": {
"@formbricks/database": "workspace:*",
@@ -25,14 +25,14 @@
"@paralleldrive/cuid2": "^2.2.2",
"@radix-ui/react-collapsible": "^1.1.0",
"https-proxy-agent": "^7.0.5",
"lucide-react": "^0.427.0",
"next": "^14.2.5",
"next-auth": "^4.24.7",
"lucide-react": "^0.446.0",
"next": "^14.2.13",
"next-auth": "^4.24.8",
"node-fetch": "^3.3.2",
"react-hook-form": "^7.52.2",
"react-hook-form": "^7.53.0",
"react-hot-toast": "^2.4.1",
"server-only": "^0.0.1",
"stripe": "^16.7.0",
"stripe": "^16.12.0",
"zod": "^3.23.8"
}
}

View File

@@ -4,7 +4,11 @@ import "server-only";
import { Prisma } from "@prisma/client";
import { cache as reactCache } from "react";
import { prisma } from "@formbricks/database";
import { TActionClass, TActionClassInput, ZActionClassInput } from "@formbricks/types/action-classes";
import {
type TActionClass,
type TActionClassInput,
ZActionClassInput,
} from "@formbricks/types/action-classes";
import { ZOptionalNumber, ZString } from "@formbricks/types/common";
import { ZId } from "@formbricks/types/common";
import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";

View File

@@ -14,23 +14,23 @@
"test": "dotenv -e ../../.env -- vitest run"
},
"dependencies": {
"@aws-sdk/client-s3": "3.631.0",
"@aws-sdk/s3-presigned-post": "3.631.0",
"@aws-sdk/s3-request-presigner": "3.631.0",
"@aws-sdk/client-s3": "3.658.1",
"@aws-sdk/s3-presigned-post": "3.658.1",
"@aws-sdk/s3-request-presigner": "3.658.1",
"@formbricks/api": "*",
"@formbricks/database": "*",
"@formbricks/types": "*",
"@paralleldrive/cuid2": "^2.2.2",
"@t3-oss/env-nextjs": "^0.11.0",
"@t3-oss/env-nextjs": "^0.11.1",
"@ungap/structured-clone": "^1.2.0",
"aws-crt": "^1.21.3",
"date-fns": "^3.6.0",
"aws-crt": "^1.22.0",
"date-fns": "^4.1.0",
"jsonwebtoken": "^9.0.2",
"markdown-it": "^14.1.0",
"mime-types": "^2.1.35",
"nanoid": "^5.0.7",
"next-auth": "^4.24.7",
"posthog-node": "^4.1.0",
"next-auth": "^4.24.8",
"posthog-node": "^4.2.0",
"qrcode": "^1.5.4",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
@@ -38,13 +38,13 @@
},
"devDependencies": {
"@formbricks/config-typescript": "workspace:*",
"@types/jsonwebtoken": "^9.0.6",
"@types/jsonwebtoken": "^9.0.7",
"@types/mime-types": "^2.1.4",
"@types/ungap__structured-clone": "^1.2.0",
"dotenv": "^16.4.5",
"@formbricks/eslint-config": "workspace:*",
"ts-node": "^10.9.2",
"vitest": "^2.0.5",
"vitest-mock-extended": "^2.0.0"
"vitest": "^2.1.1",
"vitest-mock-extended": "^2.0.2"
}
}

View File

@@ -12,21 +12,21 @@
"@formbricks/config-typescript": "workspace:*",
"@formbricks/eslint-config": "workspace:*",
"@formbricks/types": "workspace:*",
"concurrently": "^8.2.2",
"postcss": "^8.4.41",
"concurrently": "^9.0.1",
"postcss": "^8.4.47",
"react": "18.3.1"
},
"dependencies": {
"@formbricks/database": "workspace:*",
"@formbricks/lib": "workspace:*",
"@formbricks/surveys": "workspace:*",
"@lexical/code": "^0.17.0",
"@lexical/link": "^0.17.0",
"@lexical/list": "^0.17.0",
"@lexical/markdown": "^0.17.0",
"@lexical/react": "^0.17.0",
"@lexical/rich-text": "^0.17.0",
"@lexical/table": "^0.17.0",
"@lexical/code": "^0.17.1",
"@lexical/link": "^0.17.1",
"@lexical/list": "^0.17.1",
"@lexical/markdown": "^0.17.1",
"@lexical/react": "^0.17.1",
"@lexical/rich-text": "^0.17.1",
"@lexical/table": "^0.17.1",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-checkbox": "^1.1.1",
"@radix-ui/react-dialog": "^1.1.1",
@@ -40,18 +40,18 @@
"@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"@tailwindcss/forms": "^0.5.9",
"@tailwindcss/typography": "^0.5.13",
"@tailwindcss/typography": "^0.5.15",
"autoprefixer": "^10.4.20",
"boring-avatars": "^1.10.2",
"boring-avatars": "^1.11.2",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cmdk": "^1.0.0",
"lexical": "^0.17.0",
"lucide-react": "^0.427.0",
"lexical": "^0.17.1",
"lucide-react": "^0.446.0",
"mime": "^4.0.4",
"react-colorful": "^5.6.1",
"react-confetti": "^6.1.0",
"react-day-picker": "^9.0.8",
"react-day-picker": "^9.1.2",
"react-hot-toast": "^2.4.1",
"react-radio-group": "^3.0.3",
"react-use": "^17.5.1",

5665
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff