Skip to content

Commit e18b790

Browse files
volneivolnei
authored
chore: Upgrade Turborepo from 1 to 2.5 (#23101)
* upgrade turborepo from 1 to 2.5 * Fix tsconfig.json paths path * chore: fix root path on tsconfig.paths * chore: add baseUrl to tsconfig.json * chore: tsconfig.json issue * try: CI without tsconfig paths * chore: add only local paths on tsconfig.json * chore: Fix docs * Fix missing env var on turbo.json
1 parent 0274417 commit e18b790

8 files changed

Lines changed: 303 additions & 313 deletions

File tree

‎.yarn/releases/yarn-3.4.1.cjs‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎apps/api/v1/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ There's some settings that you'll need to setup.
199199
Under Vercel > Your API Project > Settings
200200

201201
In General > Build & Development Settings
202-
BUILD COMMAND: `yarn turbo run build --scope=@calcom/api --include-dependencies --no-deps`
202+
BUILD COMMAND: `yarn turbo run build --filter=@calcom/api --no-deps`
203203
OUTPUT DIRECTORY: `apps/api/.next`
204204

205205
In Git > Ignored Build Step

‎docs/self-hosting/deployments/vercel.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Sometimes, yarn install might fail during deployment on Vercel, in which case, y
7676
<Step title="Override the build command">
7777
Override to:
7878
```
79-
cd ../.. && yarn build --include-dependencies --no-deps
79+
cd ../.. && yarn build --no-deps
8080
```
8181
</Step>
8282
<Step title="Hit Deploy">

‎infra/docker/api/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ RUN set -eux; \
3333
apt-get clean && \
3434
rm -rf /var/lib/apt/lists /var/cache/apt/archives && \
3535
yarn config set httpTimeout 1200000 && \
36-
npx turbo prune --scope=@calcom/web --docker && \
37-
npx turbo prune --scope=@calcom/api --docker && \
36+
npx turbo prune --filter=@calcom/web --docker && \
37+
npx turbo prune --filter=@calcom/api --docker && \
3838
yarn install && \
3939
yarn turbo run build --filter=@calcom/api
4040

‎package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@
2828
"edit-app-template": "yarn app-store edit-template",
2929
"delete-app-template": "yarn app-store delete-template",
3030
"build": "turbo run build --filter=@calcom/web...",
31-
"build:ai": "turbo run build --scope=\"@calcom/ai\"",
31+
"build:ai": "turbo run build --filter=\"@calcom/ai\"",
3232
"clean": "find . -name node_modules -o -name .next -o -name .turbo -o -name dist -type d -prune | xargs rm -rf",
3333
"db-deploy": "turbo run db-deploy",
3434
"db-seed": "turbo run db-seed",
3535
"db-studio": "yarn prisma studio",
3636
"deploy": "turbo run deploy",
37-
"dev:all": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/website\" --scope=\"@calcom/console\"",
38-
"dev:ai": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/api-proxy\" --scope=\"@calcom/api\" --scope=\"@calcom/ai\"",
39-
"dev:api": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/api-proxy\" --scope=\"@calcom/api\"",
40-
"dev:api:console": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/api-proxy\" --scope=\"@calcom/api\" --scope=\"@calcom/console\"",
41-
"dev:console": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/console\"",
42-
"dev:swagger": "turbo run dev --scope=\"@calcom/api-proxy\" --scope=\"@calcom/api\" --scope=\"@calcom/swagger\"",
43-
"dev:website": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/website\"",
44-
"dev": "turbo run dev --scope=\"@calcom/web\"",
45-
"build-storybook": "turbo run build --scope=\"@calcom/storybook\"",
37+
"dev:all": "turbo run dev --filter=\"@calcom/web\" --filter=\"@calcom/website\" --filter=\"@calcom/console\"",
38+
"dev:ai": "turbo run dev --filter=\"@calcom/web\" --filter=\"@calcom/api-proxy\" --filter=\"@calcom/api\" --filter=\"@calcom/ai\"",
39+
"dev:api": "turbo run dev --filter=\"@calcom/web\" --filter=\"@calcom/api-proxy\" --filter=\"@calcom/api\"",
40+
"dev:api:console": "turbo run dev --filter=\"@calcom/web\" --filter=\"@calcom/api-proxy\" --filter=\"@calcom/api\" --filter=\"@calcom/console\"",
41+
"dev:console": "turbo run dev --filter=\"@calcom/web\" --filter=\"@calcom/console\"",
42+
"dev:swagger": "turbo run dev --filter=\"@calcom/api-proxy\" --filter=\"@calcom/api\" --filter=\"@calcom/swagger\"",
43+
"dev:website": "turbo run dev --filter=\"@calcom/web\" --filter=\"@calcom/website\"",
44+
"dev": "turbo run dev --filter=\"@calcom/web\"",
45+
"build-storybook": "turbo run build --filter=\"@calcom/storybook\"",
4646
"dx": "turbo run dx",
47-
"i-dev": "infisical run -- turbo run dev --scope=\"@calcom/web\"",
47+
"i-dev": "infisical run -- turbo run dev --filter=\"@calcom/web\"",
4848
"i-dx": "infisical run -- turbo run dx",
4949
"i-gen-web-example-env": "infisical secrets generate-example-env --tags=web > .env.example",
5050
"i-gen-app-store-example-env": "infisical secrets generate-example-env --tags=appstore > .env.appStore.example",
@@ -61,7 +61,7 @@
6161
"pre-commit": "lint-staged",
6262
"predev": "echo 'Checking env files'",
6363
"prisma": "yarn workspace @calcom/prisma prisma",
64-
"start": "turbo run start --scope=\"@calcom/web\"",
64+
"start": "turbo run start --filter=\"@calcom/web\"",
6565
"tdd": "vitest watch",
6666
"e2e": "NEXT_PUBLIC_IS_E2E=1 yarn playwright test --project=@calcom/web",
6767
"e2e:app-store": "QUICK=true yarn playwright test --project=@calcom/app-store",
@@ -124,7 +124,7 @@
124124
"date-fns-tz": "^3.2.0",
125125
"eslint": "^8.34.0",
126126
"p-limit": "^6.2.0",
127-
"turbo": "^1.10.1"
127+
"turbo": "^2.5.5"
128128
},
129129
"resolutions": {
130130
"types-ramda": "0.29.4",

‎packages/trpc/tsconfig.json‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
{
22
"extends": "@calcom/tsconfig/react-library.json",
3-
"paths": {
4-
"~/*": ["/*"],
5-
"@calcom/app-store": ["../app-store"],
6-
"@calcom/app-store/*": ["../app-store/*"],
7-
"@calcom/dayjs": ["../dayjs"],
8-
"@calcom/dayjs/*": ["../dayjs/*"],
9-
"@calcom/features": ["../features"],
10-
"@calcom/features/*": ["../features/*"],
11-
"@calcom/lib": ["../lib"],
12-
"@calcom/lib/*": ["../lib/*"],
13-
"@calcom/prisma": ["../prisma"],
14-
"@calcom/prisma/*": ["../prisma/*"],
15-
"@calcom/repository/*": ["../lib/server/repository/*"]
16-
},
173
"include": [
184
"../types/@wojtekmaj__react-daterange-picker.d.ts",
195
"../types/business-days-plugin.d.ts",
@@ -33,6 +19,9 @@
3319
"declarationMap": false,
3420
"resolveJsonModule": true,
3521
"declarationDir": "types/server",
36-
"moduleResolution": "node"
22+
"moduleResolution": "node",
23+
"paths": {
24+
"~/*": ["./*"]
25+
}
3726
}
3827
}

0 commit comments

Comments
 (0)