Merge branch 'main' into elef/billing-hooks-should-accept-enabled-option

Author: panteliselef

.changeset/fuzzy-keys-smell.md

@@ -0,0 +1,8 @@
+---
+'@clerk/backend': minor
+---
+
+Add `external_id` field to `user.deleted` webhook events; Add `user` field to `SessionWebhookEventJSON`
+
+- Adds `external_id` field to `user.deleted` webhook events by creating a new `UserDeletedJSON` interface that extends `DeletedObjectJSON` to include an optional `external_id` string.
+- Creates a new `SessionWebhookEventJSON` interface that extends `SessionJSON` to include a nullable `user` field as the `UserJSON` interface, and updates the webhook event types to use this new interface for `session.created`, `session.ended`, `session.removed`, and `session.revoked` events.

.changeset/lovely-tools-sleep.md

@@ -1,5 +1,14 @@
 # @clerk/agent-toolkit
 
+## 0.2.1
+
+### Patch Changes
+
+- Updated dependencies [[`b5a7e2f`](https://github.com/clerk/javascript/commit/b5a7e2f8af5514e19e06918632d982be65f4a854), [`a1d10fc`](https://github.com/clerk/javascript/commit/a1d10fc6e231f27ec7eabd0db45b8f7e8c98250e), [`b944ff3`](https://github.com/clerk/javascript/commit/b944ff30494a8275450ca0d5129cdf58f02bea81), [`4011c5e`](https://github.com/clerk/javascript/commit/4011c5e0014ede5e480074b73d064a1bc2a577dd)]:
+  - @clerk/types@4.100.0
+  - @clerk/shared@3.34.0
+  - @clerk/backend@2.22.0
+
 ## 0.2.0
 
 ### Minor Changes

packages/agent-toolkit/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/agent-toolkit",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Clerk Toolkit for AI Agents",
   "homepage": "https://clerk.com/",
   "bugs": {

packages/agent-toolkit/package.json

@@ -1,5 +1,16 @@
 # @clerk/astro
 
+## 2.15.1
+
+### Patch Changes
+
+- Fixed missing API keys props within `<UserButton />` ([#7201](https://github.com/clerk/javascript/pull/7201)) by [@wobsoriano](https://github.com/wobsoriano)
+
+- Updated dependencies [[`b5a7e2f`](https://github.com/clerk/javascript/commit/b5a7e2f8af5514e19e06918632d982be65f4a854), [`a1d10fc`](https://github.com/clerk/javascript/commit/a1d10fc6e231f27ec7eabd0db45b8f7e8c98250e), [`b944ff3`](https://github.com/clerk/javascript/commit/b944ff30494a8275450ca0d5129cdf58f02bea81), [`4011c5e`](https://github.com/clerk/javascript/commit/4011c5e0014ede5e480074b73d064a1bc2a577dd)]:
+  - @clerk/types@4.100.0
+  - @clerk/shared@3.34.0
+  - @clerk/backend@2.22.0
+
 ## 2.15.0
 
 ### Minor Changes

packages/astro/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/astro",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Clerk SDK for Astro",
   "keywords": [
     "auth",

packages/astro/package.json

@@ -2,7 +2,7 @@
 import type { UserButtonProps, UserProfileProps, Without } from '@clerk/types';
 
 type Props = Without<UserButtonProps, 'userProfileProps'> & {
-  userProfileProps?: Pick<UserProfileProps, 'additionalOAuthScopes' | 'appearance'>;
+  userProfileProps?: Pick<UserProfileProps, 'additionalOAuthScopes' | 'appearance' | 'apiKeysProps'>;
   /**
    * If you have more than one UserButton on a page, providing a custom ID is required
    * to properly scope menu items to the correct button.

packages/astro/src/astro-components/interactive/UserButton/UserButton.astro

@@ -1,5 +1,17 @@
 # Change Log
 
+## 2.22.0
+
+### Minor Changes
+
+- Removed internal parameter when creating API keys ([#7207](https://github.com/clerk/javascript/pull/7207)) by [@wobsoriano](https://github.com/wobsoriano)
+
+### Patch Changes
+
+- Updated dependencies [[`b5a7e2f`](https://github.com/clerk/javascript/commit/b5a7e2f8af5514e19e06918632d982be65f4a854), [`a1d10fc`](https://github.com/clerk/javascript/commit/a1d10fc6e231f27ec7eabd0db45b8f7e8c98250e), [`b944ff3`](https://github.com/clerk/javascript/commit/b944ff30494a8275450ca0d5129cdf58f02bea81), [`4011c5e`](https://github.com/clerk/javascript/commit/4011c5e0014ede5e480074b73d064a1bc2a577dd)]:
+  - @clerk/types@4.100.0
+  - @clerk/shared@3.34.0
+
 ## 2.21.0
 
 ### Minor Changes

packages/backend/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/backend",
-  "version": "2.21.0",
+  "version": "2.22.0",
   "description": "Clerk Backend SDK - REST Client for Backend API & JWT verification utilities",
   "homepage": "https://clerk.com/",
   "bugs": {

packages/backend/package.json

@@ -21,7 +21,6 @@ type GetAPIKeyListParams = ClerkPaginationRequest<{
 }>;
 
 type CreateAPIKeyParams = {
-  type?: 'api_key';
   /**
    * API key name
    */