Skip to content

Commit 4088338

Browse files
fix: address peer dependency issues across the monorepo (calcom#26105)
MOVE: - Move @next/third-parties from root to apps/web (only used there) - Remove date-fns-tz from root, add date-fns and date-fns-tz to root deps REMOVE: - Remove sonner from packages/lib (not used there, already in apps/web) - Remove next-seo from packages/ui (not used there, already in apps/web) - Remove next-auth from apps/api/v2 (only used for User type in tests) ADD peerDependencies: - packages/ui: add react-dom - packages/features: add react, react-dom, react-is, date-fns-tz, stripe, zod - packages/platform/atoms: add react-dom - packages/trpc: add next, react, react-dom ADD dependencies: - apps/web: add @next/third-parties, i18next, react-i18next - apps/api/v2: add axios (required by @nestjs/axios) FIX: - apps/api/v2: replace next-auth User type with @calcom/prisma/client User Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
1 parent 0673d66 commit 4088338

10 files changed

Lines changed: 68 additions & 10 deletions

File tree

apps/api/v2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"@sentry/node": "^9.15.0",
6060
"@sentry/profiling-node": "^9.15.0",
6161
"@snyk/protect": "latest",
62+
"axios": "^1.9.0",
6263
"body-parser": "^1.20.2",
6364
"bull": "^4.12.4",
6465
"class-transformer": "^0.5.1",
@@ -73,7 +74,6 @@
7374
"lodash": "4.17.21",
7475
"luxon": "3.4.4",
7576
"nest-winston": "^1.9.4",
76-
"next-auth": "^4.22.1",
7777
"passport": "^0.7.0",
7878
"passport-jwt": "^4.0.1",
7979
"qs-stringify": "^1.2.1",

apps/api/v2/src/modules/teams/teams/controllers/teams.controller.e2e-spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import { TeamsModule } from "@/modules/teams/teams/teams.module";
1010
import { INestApplication } from "@nestjs/common";
1111
import { NestExpressApplication } from "@nestjs/platform-express";
1212
import { Test } from "@nestjs/testing";
13-
import { User } from "next-auth";
1413
import Stripe from "stripe";
14+
15+
import { User } from "@calcom/prisma/client";
1516
import * as request from "supertest";
1617
import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture";
1718
import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";

apps/web/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"@hookform/resolvers": "^2.9.7",
6262
"@next-auth/prisma-adapter": "^1.0.4",
6363
"@next/bundle-analyzer": "^16.1.0",
64+
"@next/third-parties": "^14.2.5",
6465
"@prisma/nextjs-monorepo-workaround-plugin": "^6.16.1",
6566
"@radix-ui/react-avatar": "1.1.3",
6667
"@radix-ui/react-collapsible": "^1.0.0",
@@ -93,6 +94,7 @@
9394
"entities": "4.5.0",
9495
"gray-matter": "^4.0.3",
9596
"handlebars": "^4.7.7",
97+
"i18next": "^23.2.3",
9698
"ical.js": "^1.4.0",
9799
"ics": "^2.37.0",
98100
"isbot": "^5.1.30",
@@ -129,6 +131,7 @@
129131
"react-dom": "18.2.0",
130132
"react-easy-crop": "^3.5.2",
131133
"react-hook-form": "^7.43.3",
134+
"react-i18next": "^12.3.1",
132135
"react-live-chat-loader": "^2.8.1",
133136
"react-multi-email": "^0.5.3",
134137
"react-phone-input-2": "^2.15.1",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@
122122
"dependencies": {
123123
"@daily-co/daily-js": "^0.83.1",
124124
"@evyweb/ioctopus": "^1.2.0",
125-
"@next/third-parties": "^14.2.5",
126125
"@vercel/functions": "^1.4.0",
127126
"city-timezones": "^1.2.1",
127+
"date-fns": "^3.6.0",
128128
"date-fns-tz": "^3.2.0",
129129
"p-limit": "^6.2.0"
130130
},

packages/features/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
"web-push": "^3.6.7",
3434
"zustand": "^4.3.2"
3535
},
36+
"peerDependencies": {
37+
"date-fns-tz": "^3.2.0",
38+
"react": "^18.2.0",
39+
"react-dom": "^18.2.0",
40+
"react-is": "^18.2.0",
41+
"stripe": "^9.0.0 || ^15.0.0",
42+
"zod": "^3.0.0"
43+
},
3644
"devDependencies": {
3745
"@testing-library/react-hooks": "^8.0.1",
3846
"@types/web-push": "^3.6.3",

packages/lib/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"lingo.dev": "0.117.14",
2626
"rrule": "^2.7.1",
2727
"sharp": "0.33.5",
28-
"sonner": "^1.7.4",
2928
"tsdav": "2.0.3",
3029
"tslog": "^4.9.2",
3130
"uuid": "^8.3.2"

packages/platform/atoms/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
},
9393
"peerDependencies": {
9494
"react": "^18.0.0 || ^19.0.0",
95+
"react-dom": "^18.0.0 || ^19.0.0",
9596
"typescript": "^5.0.0"
9697
},
9798
"main": "./dist/cal-atoms.umd.cjs"

packages/trpc/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
"superjson": "1.9.1",
2323
"zod": "3.25.76"
2424
},
25+
"peerDependencies": {
26+
"next": ">=14.0.0",
27+
"react": "^18.0.0 || ^19.0.0",
28+
"react-dom": "^18.0.0 || ^19.0.0"
29+
},
2530
"devDependencies": {
2631
"@calcom/eslint-config": "workspace:*",
2732
"typescript": "5.9.2"

packages/ui/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"cmk": "^0.1.1",
9292
"date-fns": "^3.6.0",
9393
"downshift": "^6.1.9",
94-
"next-seo": "^6.0.0",
9594
"react": "^18.2.0",
9695
"react-colorful": "^5.6.0",
9796
"react-day-picker": "^8.10.1",
@@ -101,6 +100,9 @@
101100
"tailwind-merge": "^1.13.2",
102101
"uuid": "^11.1.0"
103102
},
103+
"peerDependencies": {
104+
"react-dom": "^18.2.0"
105+
},
104106
"devDependencies": {
105107
"@calcom/config": "workspace:*",
106108
"@calcom/eslint-config": "workspace:*",

yarn.lock

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1891,6 +1891,7 @@ __metadata:
18911891
"@types/supertest": "npm:^2.0.12"
18921892
"@typescript-eslint/eslint-plugin": "npm:^6"
18931893
"@typescript-eslint/parser": "npm:^6"
1894+
axios: "npm:^1.9.0"
18941895
body-parser: "npm:^1.20.2"
18951896
bull: "npm:^4.12.4"
18961897
class-transformer: "npm:^0.5.1"
@@ -1908,7 +1909,6 @@ __metadata:
19081909
lodash: "npm:4.17.21"
19091910
luxon: "npm:3.4.4"
19101911
nest-winston: "npm:^1.9.4"
1911-
next-auth: "npm:^4.22.1"
19121912
node-mocks-http: "npm:^1.16.2"
19131913
passport: "npm:^0.7.0"
19141914
passport-jwt: "npm:^4.0.1"
@@ -2057,6 +2057,7 @@ __metadata:
20572057
vite-plugin-node-polyfills: "npm:^0.22.0"
20582058
peerDependencies:
20592059
react: ^18.0.0 || ^19.0.0
2060+
react-dom: ^18.0.0 || ^19.0.0
20602061
typescript: ^5.0.0
20612062
languageName: unknown
20622063
linkType: soft
@@ -2566,6 +2567,13 @@ __metadata:
25662567
trigger.dev: "npm:^4.0.0"
25672568
web-push: "npm:^3.6.7"
25682569
zustand: "npm:^4.3.2"
2570+
peerDependencies:
2571+
date-fns-tz: ^3.2.0
2572+
react: ^18.2.0
2573+
react-dom: ^18.2.0
2574+
react-is: ^18.2.0
2575+
stripe: ^9.0.0 || ^15.0.0
2576+
zod: ^3.0.0
25692577
languageName: unknown
25702578
linkType: soft
25712579

@@ -2791,7 +2799,6 @@ __metadata:
27912799
lingo.dev: "npm:0.117.14"
27922800
rrule: "npm:^2.7.1"
27932801
sharp: "npm:0.33.5"
2794-
sonner: "npm:^1.7.4"
27952802
tsdav: "npm:2.0.3"
27962803
tslog: "npm:^4.9.2"
27972804
typescript: "npm:5.9.2"
@@ -3258,6 +3265,10 @@ __metadata:
32583265
superjson: "npm:1.9.1"
32593266
typescript: "npm:5.9.2"
32603267
zod: "npm:3.25.76"
3268+
peerDependencies:
3269+
next: ">=14.0.0"
3270+
react: ^18.0.0 || ^19.0.0
3271+
react-dom: ^18.0.0 || ^19.0.0
32613272
languageName: unknown
32623273
linkType: soft
32633274

@@ -3320,7 +3331,6 @@ __metadata:
33203331
fast-glob: "npm:^3.3.2"
33213332
fs-extra: "npm:^11.2.0"
33223333
lucide-static: "npm:^0.424.0"
3323-
next-seo: "npm:^6.0.0"
33243334
node-html-parser: "npm:^6.1.13"
33253335
react: "npm:^18.2.0"
33263336
react-colorful: "npm:^5.6.0"
@@ -3331,6 +3341,8 @@ __metadata:
33313341
tailwind-merge: "npm:^1.13.2"
33323342
typescript: "npm:5.9.2"
33333343
uuid: "npm:^11.1.0"
3344+
peerDependencies:
3345+
react-dom: ^18.2.0
33343346
languageName: unknown
33353347
linkType: soft
33363348

@@ -3411,6 +3423,7 @@ __metadata:
34113423
"@microsoft/microsoft-graph-types-beta": "npm:0.15.0-preview"
34123424
"@next-auth/prisma-adapter": "npm:^1.0.4"
34133425
"@next/bundle-analyzer": "npm:^16.1.0"
3426+
"@next/third-parties": "npm:^14.2.5"
34143427
"@playwright/test": "npm:^1.45.3"
34153428
"@prisma/nextjs-monorepo-workaround-plugin": "npm:^6.16.1"
34163429
"@radix-ui/react-avatar": "npm:1.1.3"
@@ -3476,6 +3489,7 @@ __metadata:
34763489
google-auth-library: "npm:^9.15.0"
34773490
gray-matter: "npm:^4.0.3"
34783491
handlebars: "npm:^4.7.7"
3492+
i18next: "npm:^23.2.3"
34793493
ical.js: "npm:^1.4.0"
34803494
ics: "npm:^2.37.0"
34813495
isbot: "npm:^5.1.30"
@@ -3517,6 +3531,7 @@ __metadata:
35173531
react-dom: "npm:18.2.0"
35183532
react-easy-crop: "npm:^3.5.2"
35193533
react-hook-form: "npm:^7.43.3"
3534+
react-i18next: "npm:^12.3.1"
35203535
react-live-chat-loader: "npm:^2.8.1"
35213536
react-multi-email: "npm:^0.5.3"
35223537
react-phone-input-2: "npm:^2.15.1"
@@ -19285,6 +19300,17 @@ __metadata:
1928519300
languageName: node
1928619301
linkType: hard
1928719302

19303+
"axios@npm:^1.9.0":
19304+
version: 1.13.2
19305+
resolution: "axios@npm:1.13.2"
19306+
dependencies:
19307+
follow-redirects: "npm:^1.15.6"
19308+
form-data: "npm:^4.0.4"
19309+
proxy-from-env: "npm:^1.1.0"
19310+
checksum: 10/ae4e06dcd18289f2fd18179256d550d27f9a53ecb2f9c59f2ccc4efd1d7151839ba8c3e0fb533dac793e4a59a576ca8689a19244dce5c396680837674a47a867
19311+
languageName: node
19312+
linkType: hard
19313+
1928819314
"axobject-query@npm:^3.2.1":
1928919315
version: 3.2.1
1929019316
resolution: "axobject-query@npm:3.2.1"
@@ -20168,7 +20194,6 @@ __metadata:
2016820194
"@evyweb/ioctopus": "npm:^1.2.0"
2016920195
"@faker-js/faker": "npm:9.2.0"
2017020196
"@jetstreamapp/soql-parser-js": "npm:^6.1.0"
20171-
"@next/third-parties": "npm:^14.2.5"
2017220197
"@playwright/test": "npm:^1.45.3"
2017320198
"@prisma/internals": "npm:^6.16.2"
2017420199
"@snaplet/copycat": "npm:^4.1.0"
@@ -20179,6 +20204,7 @@ __metadata:
2017920204
c8: "npm:^7.13.0"
2018020205
checkly: "npm:latest"
2018120206
city-timezones: "npm:^1.2.1"
20207+
date-fns: "npm:^3.6.0"
2018220208
date-fns-tz: "npm:^3.2.0"
2018320209
dotenv-checker: "npm:^1.1.5"
2018420210
eslint: "npm:9.36.0"
@@ -25597,6 +25623,19 @@ __metadata:
2559725623
languageName: node
2559825624
linkType: hard
2559925625

25626+
"form-data@npm:^4.0.4":
25627+
version: 4.0.5
25628+
resolution: "form-data@npm:4.0.5"
25629+
dependencies:
25630+
asynckit: "npm:^0.4.0"
25631+
combined-stream: "npm:^1.0.8"
25632+
es-set-tostringtag: "npm:^2.1.0"
25633+
hasown: "npm:^2.0.2"
25634+
mime-types: "npm:^2.1.12"
25635+
checksum: 10/52ecd6e927c8c4e215e68a7ad5e0f7c1031397439672fd9741654b4a94722c4182e74cc815b225dcb5be3f4180f36428f67c6dd39eaa98af0dcfdd26c00c19cd
25636+
languageName: node
25637+
linkType: hard
25638+
2560025639
"form-data@npm:~2.3.2":
2560125640
version: 2.3.3
2560225641
resolution: "form-data@npm:2.3.3"
@@ -36881,7 +36920,7 @@ __metadata:
3688136920
languageName: node
3688236921
linkType: hard
3688336922

36884-
"react-i18next@npm:^12.2.0":
36923+
"react-i18next@npm:^12.2.0, react-i18next@npm:^12.3.1":
3688536924
version: 12.3.1
3688636925
resolution: "react-i18next@npm:12.3.1"
3688736926
dependencies:

0 commit comments

Comments
 (0)