Merge remote-tracking branch 'origin/main' into refactor/migrate-trpc-stuff-from-features-to-web-6

Author: hbjORbj

.easignore

@@ -209,11 +209,13 @@ NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE=
 NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN=0
 NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE=
 STRIPE_TEAM_MONTHLY_PRICE_ID=
+STRIPE_TEAM_ANNUAL_PRICE_ID=
 NEXT_PUBLIC_STRIPE_CREDITS_PRICE_ID=
 ORG_MONTHLY_CREDITS=
 STRIPE_TEAM_PRODUCT_ID=
 # It is a price ID in the product with id STRIPE_ORG_PRODUCT_ID
 STRIPE_ORG_MONTHLY_PRICE_ID=
+STRIPE_ORG_ANNUAL_PRICE_ID=
 STRIPE_ORG_PRODUCT_ID=
 # Used to pass trial days for orgs during the Stripe checkout session
 STRIPE_ORG_TRIAL_DAYS=

.env.example

@@ -37,3 +37,11 @@
 /packages/trpc/server/routers/viewer/bookings/get.handler.ts @calcom/Foundation
 /packages/trpc/server/routers/viewer/slots/**/* @calcom/Foundation
 /packages/ui/**/* @calcom/Consumer @calcom/Foundation
+
+# Exclude test files from requiring foundation/consumer approval
+**/*.spec.*
+**/*.e2e.*
+**/*.e2e-spec.*
+**/*.test.*
+**/*.test-suite.*
+**/*.integration-test.*

.github/CODEOWNERS

@@ -167,7 +167,6 @@ jobs:
       pull-requests: read
     outputs:
       has-files-requiring-all-checks: ${{ steps.filter-exclusions.outputs.has-files-requiring-all-checks }}
-      has-companion: ${{ steps.filter-inclusions.outputs.has-companion }}
       has-api-v2-changes: ${{ steps.filter-inclusions.outputs.has-api-v2-changes }}
       has-prisma-changes: ${{ steps.filter-inclusions.outputs.has-prisma-changes }}
       has-agents-changes: ${{ steps.filter-inclusions.outputs.has-agents-changes }}
@@ -197,7 +196,6 @@ jobs:
           filters: |
             has-files-requiring-all-checks:
               - '**'
-              - '!companion/**'
               - '!.vscode/**'
               - '!**/*.md'
               - '!**/*.mdx'
@@ -213,8 +211,6 @@ jobs:
           filters: |
             has-agents-changes:
               - "agents/**"
-            has-companion:
-              - "companion/**"
             has-api-v2-changes:
               - "apps/api/v2/**"
               - "packages/platform-constants/**"
@@ -387,27 +383,6 @@ jobs:
     uses: ./.github/workflows/docs-build.yml
     secrets: inherit
 
-  build-companion:
-    name: Companion builds
-    needs: [prepare]
-    if: needs.prepare.outputs.has-companion == 'true'
-    uses: ./.github/workflows/companion-build.yml
-    secrets: inherit
-
-  typecheck-companion:
-    name: Type Checks
-    needs: [prepare]
-    if: needs.prepare.outputs.has-companion == 'true'
-    uses: ./.github/workflows/companion-typecheck.yml
-    secrets: inherit
-
-  lint-companion:
-    name: Linters
-    needs: [prepare]
-    if: needs.prepare.outputs.has-companion == 'true'
-    uses: ./.github/workflows/companion-lint.yml
-    secrets: inherit
-
   build:
     name: Production builds
     needs: [prepare]
@@ -489,9 +464,6 @@ jobs:
         build-api-v2,
         build-atoms,
         build-docs,
-        build-companion,
-        typecheck-companion,
-        lint-companion,
         setup-db,
         e2e,
         e2e-api-v2,
@@ -540,14 +512,6 @@ jobs:
               needs.e2e-app-store.result != 'success'
             )
           ) ||
-          (
-            needs.prepare.outputs.has-companion == 'true' &&
-            (
-              needs.build-companion.result != 'success' ||
-              needs.typecheck-companion.result != 'success' ||
-              needs.lint-companion.result != 'success'
-            )
-          ) ||
           (
             needs.prepare.outputs.has-agents-changes == 'true' &&
             needs.validate-agents-format.result != 'success'