Skip to content

Commit dc16cf2

Browse files
anikdhabalanikdhabal
authored
Merge branch 'main' into devin/1752595792-fix-e2e-hardcoded-test-date
2 parents 96dd4ff + 12b418b commit dc16cf2

520 files changed

Lines changed: 29263 additions & 7675 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cursor/rules/review.mdc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Review Instructions
22

3+
## File Naming Conventions
4+
5+
- **Repository Files**: Must include `Repository` suffix, prefix with technology if applicable (e.g., `PrismaAppRepository.ts`), use PascalCase matching exported class
6+
- **Service Files**: Must include `Service` suffix, use PascalCase matching exported class, avoid generic names (e.g., `MembershipService.ts`)
7+
- **New files**: Avoid dot-suffixes like `.service.ts` or `.repository.ts`; reserve `.test.ts`, `.spec.ts`, `.types.ts` for their specific purposes
8+
9+
## Code Quality
10+
311
- Prefer early returns. It is recommended to throw/return early so we can ensure null-checks and prevent further nesting.
412
- Prefer Composition over Prop Drilling. Instead of relying on prop drilling, let's try to take advantage of react children feature.
513
- For Prisma queries:
@@ -19,3 +27,10 @@
1927
- "summary" fields do not end with a period
2028
- "summary" fields are written in proper American english
2129
- When changes to API v2 or v1 are made, ensure there are no breaking changes on existing endpoints. Instead, there needs to be a newly versioned endpoint with the updated functionality but the old one must remain functional
30+
- For large pull requests (>500 lines changed or >10 files touched), advise splitting into smaller, focused PRs:
31+
- Split by feature boundaries: separate different features or user stories
32+
- Split by layer/component: frontend changes, backend changes, database migrations, and tests in separate PRs
33+
- Split by dependency chain: create PRs that can be merged sequentially
34+
- Split by file/module: group related file changes together
35+
- Suggested pattern: Database migrations → Backend logic → Frontend components → Integration tests
36+
- Benefits: easier review, faster feedback, reduced conflicts, easier rollback, better history

‎.github/workflows/changesets.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,7 @@ jobs:
3434
env:
3535
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3636
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
37-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
37+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
38+
VITE_BOOKER_EMBED_OAUTH_CLIENT_ID: ${{ secrets.VITE_BOOKER_EMBED_OAUTH_CLIENT_ID }}
39+
VITE_BOOKER_EMBED_API_URL: ${{ secrets.VITE_BOOKER_EMBED_API_URL }}
40+
NEXT_PUBLIC_WEBAPP_URL: ${{ secrets.NEXT_PUBLIC_WEBAPP_URL }}

‎.yarn/versions/1085cfbb.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
undecided:
2+
- "@calcom/prisma"

‎.yarn/versions/178162d8.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
undecided:
2+
- calcom-monorepo
3+
- "@calcom/prisma"

‎.yarn/versions/26346cfc.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
undecided:
2+
- "@calcom/prisma"

‎.yarn/versions/3d3aec2b.yml‎

Whitespace-only changes.

‎.yarn/versions/9511a7f4.yml‎

Whitespace-only changes.

‎.yarn/versions/a6aae389.yml‎

Whitespace-only changes.

‎.yarn/versions/b1103ee7.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
undecided:
2+
- "@calcom/prisma"

‎.yarn/versions/df8c1d7f.yml‎

Whitespace-only changes.

0 commit comments

Comments
 (0)