mirror/formbricks
1
0
Fork 0
mirror of https://github.com/formbricks/formbricks.git synced 2026-04-19 19:21:15 -05:00
Code Issues Packages Projects Releases 162 Wiki Activity

Merge branch 'feature/ai-summary' of https://github.com/formbricks/formbricks into 363-ai-fix-current-feature

Browse Source
This commit is contained in:
Piyush Gupta
2024-10-03 09:55:05 +05:30
parent 897c2de656 57927f6a3e
commit 4f5ac2b27f
6 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/middleware.ts
View File

@@ -20,8 +20,8 @@ import { RATE_LIMITING_DISABLED, WEBAPP_URL } from "@formbricks/lib/constants";
import { isValidCallbackUrl } from "@formbricks/lib/utils/url";
export const middleware = async (request: NextRequest) => {
// issue with next auth types & Next 15; let's review when new fixes are available
const token = await getToken({ req: request });
// TODO: any type because of conflict between nextjs and next-auth types. Will likely be solved with future packae updates
const token = await getToken({ req: request as any });
if (isAuthProtectedRoute(request.nextUrl.pathname) && !token) {
const loginUrl = `${WEBAPP_URL}/auth/login?callbackUrl=${encodeURIComponent(WEBAPP_URL + request.nextUrl.pathname + request.nextUrl.search)}`;

4
packages/config-eslint/package.json
View File

@@ -3,11 +3,11 @@
"version": "0.0.0",
"private": true,
"devDependencies": {
"@next/eslint-plugin-next": "^14.2.5",
"@next/eslint-plugin-next": "14.2.5",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"@vercel/style-guide": "^6.0.0",
"eslint-config-next": "^14.2.5",
"eslint-config-next": "14.2.5",
"eslint-config-prettier": "^9.1.0",
"eslint-config-turbo": "^2.0.14",
"eslint-plugin-react": "7.35.0",

14
packages/database/package.json
View File

@@ -61,13 +61,13 @@
"devDependencies": {
"@formbricks/config-typescript": "workspace:*",
"@formbricks/types": "workspace:*",
"@paralleldrive/cuid2": "^2.2.2",
"@paralleldrive/cuid2": "2.2.2",
"@formbricks/eslint-config": "workspace:*",
"prisma": "^5.18.0",
"prisma-dbml-generator": "^0.12.0",
"prisma-json-types-generator": "^3.0.4",
"ts-node": "^10.9.2",
"zod": "^3.23.8",
"zod-prisma": "^0.5.4"
"prisma": "5.18.0",
"prisma-dbml-generator": "0.12.0",
"prisma-json-types-generator": "3.0.4",
"ts-node": "10.9.2",
"zod": "3.23.8",
"zod-prisma": "0.5.4"
}
}

2
packages/ee/package.json
View File

@@ -28,7 +28,7 @@
"ai": "^3.2.37",
"https-proxy-agent": "^7.0.5",
"lucide-react": "^0.427.0",
"next": "^14.2.5",
"next": "14.2.5",
"next-auth": "^4.24.7",
"node-fetch": "^3.3.2",
"react-hook-form": "^7.52.2",

2
packages/ui/tailwind.config.js
View File

@@ -4,7 +4,7 @@ module.exports = {
"./app/**/*.{js,ts,jsx,tsx}", // Note the addition of the `app` directory.
"./pages/**/*.{js,ts,jsx,tsx}",
// include packages if not transpiling
"../../packages/ui/**/*.{ts,tsx}",
"../../packages/ui/components/**/*.{ts,tsx}",
],
theme: {
extend: {

28
pnpm-lock.yaml generated
View File

@@ -564,7 +564,7 @@ importers:
packages/config-eslint:
devDependencies:
'@next/eslint-plugin-next':
specifier: ^14.2.5
specifier: 14.2.5
version: 14.2.5
'@typescript-eslint/eslint-plugin':
specifier: ^8.0.0
@@ -576,7 +576,7 @@ importers:
specifier: ^6.0.0
version: 6.0.0(@next/eslint-plugin-next@14.2.5)(eslint@8.57.0)(prettier@3.3.3)(typescript@5.5.4)(vitest@2.0.5)
eslint-config-next:
specifier: ^14.2.5
specifier: 14.2.5
version: 14.2.5(eslint@8.57.0)(typescript@5.5.4)
eslint-config-prettier:
specifier: ^9.1.0
@@ -643,25 +643,25 @@ importers:
specifier: workspace:*
version: link:../types
'@paralleldrive/cuid2':
specifier: ^2.2.2
specifier: 2.2.2
version: 2.2.2
prisma:
specifier: ^5.18.0
specifier: 5.18.0
version: 5.18.0
prisma-dbml-generator:
specifier: ^0.12.0
specifier: 0.12.0
version: 0.12.0(encoding@0.1.13)
prisma-json-types-generator:
specifier: ^3.0.4
specifier: 3.0.4
version: 3.0.4(prisma@5.18.0)(typescript@5.5.4)
ts-node:
specifier: ^10.9.2
specifier: 10.9.2
version: 10.9.2(@swc/core@1.3.101)(@types/node@22.3.0)(typescript@5.5.4)
zod:
specifier: ^3.23.8
specifier: 3.23.8
version: 3.23.8
zod-prisma:
specifier: ^0.5.4
specifier: 0.5.4
version: 0.5.4(decimal.js@10.4.3)(prisma@5.18.0)(zod@3.23.8)
packages/ee:
@@ -691,7 +691,7 @@ importers:
specifier: ^0.427.0
version: 0.427.0(react@19.0.0-rc-935180c7e0-20240524)
next:
specifier: ^14.2.5
specifier: 14.2.5
version: 14.2.5(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(react-dom@19.0.0-rc-935180c7e0-20240524(react@19.0.0-rc-935180c7e0-20240524))(react@19.0.0-rc-935180c7e0-20240524)
next-auth:
specifier: ^4.24.7
@@ -9906,10 +9906,6 @@ packages:
loupe@3.1.1:
resolution: {integrity: sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==}
lru-cache@10.2.2:
resolution: {integrity: sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==}
engines: {node: 14 || >=16.14}
lru-cache@10.3.0:
resolution: {integrity: sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==}
engines: {node: 14 || >=16.14}
@@ -25388,8 +25384,6 @@ snapshots:
dependencies:
get-func-name: 2.0.2
lru-cache@10.2.2: {}
lru-cache@10.3.0: {}
lru-cache@11.0.0: {}
@@ -26997,7 +26991,7 @@ snapshots:
path-scurry@1.11.1:
dependencies:
lru-cache: 10.2.2
lru-cache: 10.3.0
minipass: 7.1.2
path-scurry@2.0.0: