Uh oh!
There was an error while loading. Please reload this page.
feat(clerk-js): Remove dummy default free plan subscription - #6109
Conversation
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
📝 WalkthroughWalkthroughThe changes replace the previous custom SWR-based Possibly related PRs
Suggested reviewers
📜 Recent review detailsConfiguration used: CodeRabbit UI 📒 Files selected for processing (1)
✅ Files skipped from review due to trivial changes (1)
⏰ Context from checks skipped due to timeout of 90000ms (5)
🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File ( |
@clerk/agent-toolkit@clerk/astro@clerk/backend@clerk/chrome-extension@clerk/clerk-js@clerk/dev-cli@clerk/elements@clerk/clerk-expo@clerk/expo-passkeys@clerk/express@clerk/fastify@clerk/localizations@clerk/nextjs@clerk/nuxt@clerk/clerk-react@clerk/react-router@clerk/remix@clerk/shared@clerk/tanstack-react-start@clerk/testing@clerk/themes@clerk/types@clerk/upgrade@clerk/vuecommit: |
There was a problem hiding this comment.
Actionable comments posted: 2
🔭 Outside diff range comments (1)
packages/clerk-js/src/ui/contexts/components/Plans.tsx (1)
85-93:⚠️ Potential issueFetcher never fires for organization subscriptions
billing.getSubscriptionsis only invoked whenuserIdis truthy:({ args, userId })=>(userId ? billing.getSubscriptions(args) : undefined)For organization contexts (
subscriberType === 'org')userIdisundefined, so the fetcher returnsundefinedand SWR will never request the organization’s subscriptions—even thoughorgIdis available.-({ args, userId }) => (userId ? billing.getSubscriptions(args) : undefined)+({ args, userId }) =>+ userId || args.orgId ? billing.getSubscriptions(args) : undefinedWithout this, any org-level billing UI will think the org has no subscriptions.
🧹 Nitpick comments (4)
packages/clerk-js/src/ui/components/PricingTable/PricingTable.tsx (1)
14-16: Doubledatashadowing – prefer explicit namesTwo nested objects called
data(SWRResponse.dataand the paginated payload’sdata) forces the unpopulardata.dataaccess and hurts readability.-const { data } = useSubscriptions();-const { data: subscriptions = [] } = data || {};+const swr = useSubscriptions(); // SWR wrapper+const subscriptions = swr?.data?.data ?? []; // payloadUsing explicit identifiers removes the shadowing and instantly conveys which object is which.
packages/clerk-js/src/core/resources/CommerceSubscription.ts (1)
55-56: Hard-coded endpoint string – extract to a shared constant
'/commerce/subscription_items'is now duplicated here and inCommerceBilling.getSubscriptions. Consolidating into a constant (e.g.SUBSCRIPTION_ITEMS_PATH) keeps the code DRY and shields you from the next rename.// constants.tsexportconstSUBSCRIPTION_ITEMS_PATH='/commerce/subscription_items';path: orgId ? `/organizations/${orgId}${SUBSCRIPTION_ITEMS_PATH}/${this.id}` : `/me${SUBSCRIPTION_ITEMS_PATH}/${this.id}`,packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx (1)
350-352: Rename variables to avoiddata.dataconfusionSame pattern as in
PricingTable: shadoweddatavariables make the code harder to follow.-const { data } = useSubscriptions();-const { data: subscriptions = [] } = data || {};+const swr = useSubscriptions();+const subscriptions = swr?.data?.data ?? [];packages/clerk-js/src/core/modules/commerce/CommerceBilling.ts (1)
48-48: Duplicate endpoint literal
'/commerce/subscription_items'is hard-coded here and inCommerceSubscription.cancel. Use a shared constant to avoid divergence:constSUBSCRIPTION_ITEMS_PATH='/commerce/subscription_items';path: orgId ? `/organizations/${orgId}${SUBSCRIPTION_ITEMS_PATH}` : `/me${SUBSCRIPTION_ITEMS_PATH}`,
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (6)
packages/clerk-js/src/core/modules/commerce/CommerceBilling.ts(1 hunks)packages/clerk-js/src/core/resources/CommerceSubscription.ts(1 hunks)packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx(1 hunks)packages/clerk-js/src/ui/components/PricingTable/PricingTable.tsx(1 hunks)packages/clerk-js/src/ui/components/Subscriptions/SubscriptionsList.tsx(1 hunks)packages/clerk-js/src/ui/contexts/components/Plans.tsx(2 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (4)
packages/clerk-js/src/ui/components/Subscriptions/SubscriptionsList.tsx (1)
packages/clerk-js/src/ui/contexts/components/Plans.tsx (1)
useSubscriptions(79-94)
packages/clerk-js/src/ui/components/PricingTable/PricingTable.tsx (1)
packages/clerk-js/src/ui/contexts/components/Plans.tsx (1)
useSubscriptions(79-94)
packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx (1)
packages/clerk-js/src/ui/contexts/components/Plans.tsx (1)
useSubscriptions(79-94)
packages/clerk-js/src/ui/contexts/components/Plans.tsx (1)
packages/clerk-js/src/ui/contexts/components/SubscriberType.ts (1)
useSubscriberTypeContext(6-6)
⏰ Context from checks skipped due to timeout of 90000ms (5)
- GitHub Check: semgrep-cloud-platform/scan
- GitHub Check: Build Packages
- GitHub Check: Formatting | Dedupe | Changeset
- GitHub Check: semgrep/ci
- GitHub Check: Analyze (javascript-typescript)
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
subscription_items endpoints…om/clerk/javascript into keiran/commerce-subscription-items
🦋 Changeset detectedLatest commit: fafbdee The changes in this PR will be included in the next version bump. This PR includes changesets to release 3 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Description
Drops the dummy free plan subscription item. Also uses new
__experimental_useSubscriptionItemsinternal hook.Checklist
pnpm testruns as expected.pnpm buildruns as expected.Type of change
Summary by CodeRabbit