Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .yarn/patches/zod-prisma-types-npm-3.3.11.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/dist/classes/directoryHelper.js b/dist/classes/directoryHelper.js
index 4558509..bbca3b4 100644
--- a/dist/classes/directoryHelper.js
+++ b/dist/classes/directoryHelper.js
@@ -23,7 +23,11 @@ class DirectoryHelper {
if (!this.pathOrDirExists(path))
return;
try {
- fs_1.default.rmdirSync(path, { recursive: true });
+ if (typeof fs_1.default.rmSync === 'function') {
+ fs_1.default.rmSync(path, { recursive: true, force: true });
+ } else {
+ fs_1.default.rmdirSync(path, { recursive: true });
+ }
}
catch (err) {
if (err instanceof Error)
2 changes: 1 addition & 1 deletion apps/api/v2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"ts-loader": "9.5.1",
"ts-node": "10.9.2",
"tsconfig-paths": "4.2.0",
"typescript": "5.9.3"
"typescript": "6.0.3"
},
"prisma": {
"schema": "../../../packages/prisma/schema.prisma"
Expand Down
2 changes: 2 additions & 0 deletions apps/api/v2/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"ignoreDeprecations": "6.0",
"module": "commonjs",
"esModuleInterop": true,
"declaration": true,
Expand All @@ -9,6 +10,7 @@
"experimentalDecorators": true,
"allowSyntheticDefaultImports": true,
"target": "ES2021",
"rootDir": "../../..",
"sourceMap": true,
"outDir": "./dist",
"baseUrl": ".",
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
},
"devDependencies": {
"@types/react": "^19.0.0",
"typescript": "^5.0.0"
"typescript": "6.0.3"
}
}
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
"tailwindcss": "4.1.17",
"ts-node": "10.9.2",
"turbo": "2.5.5",
"typescript": "5.9.3"
"typescript": "6.0.3"
},
"nextBundleAnalysis": {
"budget": 358400,
Expand Down
2 changes: 1 addition & 1 deletion apps/web/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
"**/*.tsx",
".next/types/**/*.ts"
],
"exclude": ["**/node_modules/**", ".next", "playwright"]
"exclude": ["**/node_modules/**", ".next", "playwright", "**/*.test.ts", "**/*.test.tsx"]
}
2 changes: 1 addition & 1 deletion example-apps/credential-sync/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"dotenv": "16.6.1",
"postcss": "8.5.6",
"tailwindcss": "3.4.1",
"typescript": "5.9.3"
"typescript": "6.0.3"
}
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"resize-observer-polyfill": "1.5.1",
"tsc-absolute": "1.0.0",
"turbo": "2.7.1",
"typescript": "5.9.3",
"typescript": "6.0.3",
"vitest": "4.1.8",
"vitest-fetch-mock": "0.4.5",
"vitest-mock-extended": "3.1.0"
Expand All @@ -136,6 +136,7 @@
"dayjs@1.11.2": "patch:dayjs@npm%3A1.11.4#./.yarn/patches/dayjs-npm-1.11.4-97921cd375.patch",
"dayjs@^1": "patch:dayjs@npm%3A1.11.4#./.yarn/patches/dayjs-npm-1.11.4-97921cd375.patch",
"dayjs@^1.8.29": "patch:dayjs@npm%3A1.11.4#./.yarn/patches/dayjs-npm-1.11.4-97921cd375.patch",
"zod-prisma-types": "patch:zod-prisma-types@npm%3A3.3.11#./.yarn/patches/zod-prisma-types-npm-3.3.11.patch",
"import-in-the-middle": "1.13.1",
"react@19.2.0": "19.2.4",
"react@19.2.1": "19.2.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-store-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
"@types/react": "18.0.26",
"chokidar": "3.6.0",
"ts-node": "10.9.2",
"typescript": "5.9.3"
"typescript": "6.0.3"
}
}
3 changes: 3 additions & 0 deletions packages/app-store-cli/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"extends": "@calcom/tsconfig/base.json",
"compilerOptions": {
"ignoreDeprecations": "6.0",
"strict": true,
"module": "commonjs",
"jsx": "react-jsx",
"esModuleInterop": true,
"outDir": "dist",
"rootDir": ".",
"noEmitOnError": false,
"target": "ES2020",
"baseUrl": ".",
Expand Down
3 changes: 2 additions & 1 deletion packages/app-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
},
"devDependencies": {
"@calcom/testing": "workspace:*",
"@calcom/types": "workspace:*"
"@calcom/types": "workspace:*",
"typescript": "6.0.3"
}
}
11 changes: 10 additions & 1 deletion packages/app-store/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"extends": "@calcom/tsconfig/react-library.json",
"exclude": ["dist", "types", "build", "**/node_modules/**"],
"exclude": [
"dist",
"types",
"build",
"**/node_modules/**",
"**/*.test.*",
"**/__mocks__/*",
"**/__tests__/*",
"tests"
],
"compilerOptions": {
"baseUrl": ".",
"paths": {
Expand Down
2 changes: 1 addition & 1 deletion packages/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
},
"devDependencies": {
"@tailwindcss/typography": "0.5.4",
"typescript": "5.9.3"
"typescript": "6.0.3"
}
}
2 changes: 1 addition & 1 deletion packages/coss-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@
"@biomejs/biome": "2.3.10",
"ts-node": "10.9.2",
"tsc-absolute": "1.0.0",
"typescript": "5.9.3"
"typescript": "6.0.3"
}
}
2 changes: 1 addition & 1 deletion packages/embeds/embed-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"npm-run-all": "4.1.5",
"postcss": "8.5.6",
"tailwindcss": "4.1.17",
"typescript": "5.9.3",
"typescript": "6.0.3",
"vite": "6.4.2",
"vite-plugin-environment": "1.1.3"
}
Expand Down
6 changes: 4 additions & 2 deletions packages/embeds/embed-core/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@
"extends": "@calcom/tsconfig/base.json",
"compilerOptions": {
"jsx": "react",
"target": "ES2015",
"target": "ES2022",
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"module": "esnext",
"moduleResolution": "Node",
"baseUrl": ".",
"outDir": "dist",
"types": ["node"],
"paths": {
"@calcom/embed-react": ["../embed-react/src"],
"@calcom/embed-snippet": ["../embed-snippet/src"]
}
},
"include": ["src", "env.d.ts", "index.ts", "*.ts"],
"exclude": ["dist", "build", "**/node_modules/**"]
"exclude": ["dist", "build", "**/node_modules/**", "**/*.test.ts", "**/__tests__/**"]
}
2 changes: 1 addition & 1 deletion packages/embeds/embed-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@types/react-dom": "18.2.6",
"@vitejs/plugin-react": "5.1.2",
"npm-run-all": "4.1.5",
"typescript": "5.9.3",
"typescript": "6.0.3",
"vite": "6.4.2"
},
"dependencies": {
Expand Down
6 changes: 4 additions & 2 deletions packages/embeds/embed-react/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
"extends": "@calcom/tsconfig/base.json",
"compilerOptions": {
"module": "ESNext",
"target": "ES2015",
"target": "ES2022",
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"moduleResolution": "Node",
"baseUrl": ".",
"rootDir": "..",
"declaration": true,
"jsx": "preserve",
"outDir": "dist",
Expand All @@ -15,5 +17,5 @@
},
"include": ["src/**/*.ts", "src/**/*.tsx", "env.d.ts", "*.tsx", "*.ts"],
// Exclude "test" because that has `api.test.ts` which imports @calcom/embed-react which needs it to be built using this tsconfig.json first. Excluding it here prevents type-check from validating test folder
"exclude": ["**/node_modules/**", "test"]
"exclude": ["**/node_modules/**", "test", "**/*.test.ts", "**/*.test.tsx"]
}
2 changes: 1 addition & 1 deletion packages/embeds/embed-snippet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
],
"types": "./dist/index.d.ts",
"devDependencies": {
"typescript": "5.9.3",
"typescript": "6.0.3",
"vite": "6.4.2"
},
"dependencies": {
Expand Down
6 changes: 4 additions & 2 deletions packages/embeds/embed-snippet/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
"extends": "@calcom/tsconfig/base.json",
"compilerOptions": {
"jsx": "react",
"target": "ES2015",
"target": "ES2022",
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"baseUrl": ".",
"rootDir": "src",
"module": "ESNext",
"declaration": true,
"outDir": "dist",
Expand All @@ -12,6 +14,6 @@
"@calcom/embed-react": ["../embed-react/src"]
}
},
"include": ["."],
"include": ["src", "env.d.ts"],

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Setting "rootDir": "src" while including "env.d.ts" (which resides at the root, outside of src) can trigger the TypeScript compiler error TS6059: File '.../env.d.ts' is not under 'rootDir' 'src'. To resolve this cleanly, move env.d.ts into the src/ directory (e.g., src/env.d.ts) and update the include array to only target the src folder.

Suggested change
"include": ["src", "env.d.ts"],
"include": ["src"],

"exclude": ["dist", "build", "**/node_modules/**"]
}
2 changes: 1 addition & 1 deletion packages/i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
},
"devDependencies": {
"@calcom/tsconfig": "workspace:*",
"typescript": "5.9.3"
"typescript": "6.0.3"
}
}
2 changes: 1 addition & 1 deletion packages/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"@calcom/tsconfig": "workspace:*",
"@calcom/types": "workspace:*",
"@faker-js/faker": "7.6.0",
"typescript": "5.9.3"
"typescript": "6.0.3"
}
}
2 changes: 1 addition & 1 deletion packages/mcp-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@calcom/tsconfig": "workspace:*",
"@types/node": "20.17.24",
"ts-node": "^10.9.2",
"typescript": "5.9.3",
"typescript": "6.0.3",
"vitest": "^4.1.8"
}
}
2 changes: 1 addition & 1 deletion packages/mcp-server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"resolveJsonModule": true
},
"include": ["src/**/*", "bin/**/*"],
"exclude": ["dist", "build", "**/node_modules/**"]
"exclude": ["dist", "build", "**/node_modules/**", "**/*.test.ts", "**/__tests__/**"]
}
2 changes: 1 addition & 1 deletion packages/platform/atoms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"postcss-prefixer": "3.0.0",
"postcss-prefixwrap": "1.57.0",
"ts-jest": "29.1.4",
"typescript": "5.9.3",
"typescript": "6.0.3",
"vite": "6.4.2",
"vite-plugin-dts": "4.5.4",
"vite-plugin-inspect": "0.8.4"
Expand Down
2 changes: 2 additions & 0 deletions packages/platform/constants/permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ export const PERMISSIONS = [
PROFILE_WRITE,
] as const;

export type PLATFORM_PERMISSION = (typeof PERMISSIONS)[number];

export const PERMISSION_MAP = {
EVENT_TYPE_READ,
EVENT_TYPE_WRITE,
Expand Down
2 changes: 1 addition & 1 deletion packages/platform/enums/permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
APPS_WRITE,
PROFILE_READ,
PROFILE_WRITE,
type PLATFORM_PERMISSION,
} from "@calcom/platform-constants";
import type { PLATFORM_PERMISSION } from "@calcom/platform-types";

export const hasPermission = (userPermissions: number, permission: PLATFORM_PERMISSION): boolean => {
// use bitwise AND to check if user has the permission
Expand Down
2 changes: 1 addition & 1 deletion packages/platform/examples/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"dotenv": "17.2.2",
"postcss": "8.5.6",
"tailwindcss": "4.1.17",
"typescript": "5.9.3"
"typescript": "6.0.3"
}
}
2 changes: 1 addition & 1 deletion packages/platform/libraries/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@types/node": "20.17.23",
"@vitejs/plugin-react": "5.1.2",
"typescript": "5.9.3",
"typescript": "6.0.3",
"vite": "6.4.2",
"vite-plugin-dts": "4.5.4",
"vite-plugin-environment": "1.1.3"
Expand Down
4 changes: 1 addition & 3 deletions packages/platform/types/permissions.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
import type { PERMISSIONS } from "@calcom/platform-constants";

export type PLATFORM_PERMISSION = (typeof PERMISSIONS)[number];
export type { PLATFORM_PERMISSION } from "@calcom/platform-constants";
2 changes: 1 addition & 1 deletion packages/prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"prisma-kysely": "2.2.0",
"uuid": "8.3.2",
"zod": "3.25.76",
"zod-prisma-types": "3.2.4"
"zod-prisma-types": "3.3.11"
},
"devDependencies": {
"npm-run-all": "4.1.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/trpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"@tanstack/react-query": "5.17.19",
"@types/cookie": "0.6.0",
"@types/uuid": "8.3.4",
"typescript": "5.9.3"
"typescript": "6.0.3"
}
}
1 change: 1 addition & 0 deletions packages/trpc/tsconfig.react.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
],
"exclude": ["**/node_modules/**", "./server", "./react/**/*.test.ts", "./react/**/*.spec.ts"],
"compilerOptions": {
"rootDir": "react",
"isolatedModules": false,
"noEmit": false,
"declaration": true,
Expand Down
1 change: 1 addition & 0 deletions packages/trpc/tsconfig.server.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
],
"exclude": ["**/node_modules/**", "./react", "./server/**/*.test.ts", "./server/**/*.spec.ts"],
"compilerOptions": {
"rootDir": "server",
"isolatedModules": false,
"noEmit": false,
"declaration": true,
Expand Down
1 change: 1 addition & 0 deletions packages/tsconfig/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$schema": "https://json.schemastore.org/tsconfig",
"display": "Default",
"compilerOptions": {
"ignoreDeprecations": "6.0",
"composite": false,
"declaration": true,
"declarationMap": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,6 @@
"fs-extra": "11.3.2",
"lucide-static": "0.424.0",
"node-html-parser": "6.1.13",
"typescript": "5.9.3"
"typescript": "6.0.3"
}
}
2 changes: 1 addition & 1 deletion packages/ui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
"**/*.ts",
"**/*.tsx"
],
"exclude": ["dist", "build", "**/node_modules/**"]
"exclude": ["dist", "build", "**/node_modules/**", "**/*.test.*", "**/__mocks__/*", "**/__tests__/*"]
}
3 changes: 2 additions & 1 deletion turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,9 @@
"outputs": ["lint-results"]
},
"post-install": {
"cache": false,
"dependsOn": [],
"outputs": ["../../node_modules/@prisma/client/**", "../../node_modules/@prisma/admin-client/**"],
"outputs": ["dist/**", "../../node_modules/@prisma/client/**", "../../node_modules/@prisma/admin-client/**"],
"inputs": ["./schema.prisma", "./prisma/schema.prisma"],
"env": ["PRISMA_GENERATE_DATAPROXY"]
Comment on lines +532 to 536

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

When "cache": false is specified for a task in Turborepo, caching is completely disabled. As a result, the "inputs" and "outputs" configurations have no effect and are ignored by Turbo. To keep the configuration clean and avoid confusion, you should either remove the redundant "inputs" and "outputs" fields if you want to always run post-install without caching, or enable caching by setting "cache": true (or removing "cache": false since it defaults to true) if you want Turborepo to cache and restore the generated Prisma client outputs.

},
Expand Down
1 change: 1 addition & 0 deletions vitest.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ function getTestExclude() {
const baseExclude = [
"**/node_modules/**",
"**/dist/**",
"**/.next/**",
"apps/api/v2/**/*.spec.ts",
"__checks__/**/*.spec.ts",
];
Expand Down
Loading
Loading