Merge branch 'main' into ss/DOCS-11879

Author: SarahSoutoul

.changeset/calm-combs-search.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/dir-sync-self-serve-wiring.md

@@ -0,0 +1,9 @@
+---
+'@clerk/clerk-js': minor
+'@clerk/localizations': minor
+'@clerk/react': minor
+'@clerk/shared': minor
+'@clerk/ui': minor
+---
+
+Introduce self-serve Directory Sync (SCIM) capabilities and related functionality.

.changeset/fix-he-il-formatting.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/lockuser-protect-rules-system-link.md

@@ -0,0 +1,5 @@
+---
+'@clerk/backend': patch
+---
+
+Update the `lockUser()` JSDoc to point at the **System** page under **Protect** > **Rules** (`/~/protect/rules/system`), matching the Clerk Dashboard's Protect navigation.

.changeset/quiet-flow-dialog.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/warm-taxis-call.md

@@ -0,0 +1,2 @@
+---
+---

packages/backend/src/api/endpoints/UserApi.ts

@@ -785,7 +785,7 @@ export class UserAPI extends AbstractAPI {
   }
 
   /**
-   * Locks the given [`User`](https://clerk.com/docs/reference/backend/types/backend-user), which means that they are not allowed to sign in again until the lock expires or is manually unlocked. By default, lockout duration is 1 hour, but it can be configured in the application's [**Rules**](https://dashboard.clerk.com/~/protect/rules) settings. See the [guide on user locks](https://clerk.com/docs/guides/secure/user-lockout).
+   * Locks the given [`User`](https://clerk.com/docs/reference/backend/types/backend-user), which means that they are not allowed to sign in again until the lock expires or is manually unlocked. By default, lockout duration is 1 hour, but it can be configured in the application's [**System**](https://dashboard.clerk.com/~/protect/rules/system) settings under **Protect** > **Rules**. See the [guide on user locks](https://clerk.com/docs/guides/secure/user-lockout).
    * @param userId - The ID of the user to lock.
    */
   public async lockUser(userId: string) {

packages/clerk-js/bundlewatch.config.json

@@ -1,10 +1,10 @@
 {
   "files": [
-    { "path": "./dist/clerk.js", "maxSize": "552KB" },
-    { "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
-    { "path": "./dist/clerk.legacy.browser.js", "maxSize": "122KB" },
+    { "path": "./dist/clerk.js", "maxSize": "554KB" },
+    { "path": "./dist/clerk.browser.js", "maxSize": "81KB" },
+    { "path": "./dist/clerk.legacy.browser.js", "maxSize": "122.5KB" },
     { "path": "./dist/clerk.no-rhc.js", "maxSize": "320KB" },
-    { "path": "./dist/clerk.native.js", "maxSize": "79KB" },
+    { "path": "./dist/clerk.native.js", "maxSize": "80KB" },
     { "path": "./dist/vendors*.js", "maxSize": "7KB" },
     { "path": "./dist/coinbase*.js", "maxSize": "36KB" },
     { "path": "./dist/base-account-sdk*.js", "maxSize": "207KB" },

packages/clerk-js/sandbox/app.ts

@@ -34,6 +34,7 @@ const AVAILABLE_COMPONENTS = [
   'pricingTable',
   'apiKeys',
   'configureSSO',
+  'configureDirectorySync',
   'oauthConsent',
   'oauthDeviceVerification',
   'taskChooseOrganization',
@@ -154,6 +155,7 @@ const componentControls: Record<AvailableComponent, ComponentPropsControl> = {
   pricingTable: buildComponentControls('pricingTable'),
   apiKeys: buildComponentControls('apiKeys'),
   configureSSO: buildComponentControls('configureSSO'),
+  configureDirectorySync: buildComponentControls('configureDirectorySync'),
   oauthConsent: buildComponentControls('oauthConsent'),
   oauthDeviceVerification: buildComponentControls('oauthDeviceVerification'),
   taskChooseOrganization: buildComponentControls('taskChooseOrganization'),
@@ -431,6 +433,10 @@ void (async () => {
       mount: '__internal_mountOAuthDeviceVerification',
       component: 'oauthDeviceVerification',
     },
+    '/configure-directory-sync': {
+      mount: '__internal_mountConfigureDirectorySync',
+      component: 'configureDirectorySync',
+    },
     '/task-choose-organization': {
       mount: 'mountTaskChooseOrganization',
       component: 'taskChooseOrganization',

packages/clerk-js/sandbox/template.html

@@ -313,6 +313,11 @@
             label="Configure SSO"
             component="<ConfigureSSO />"
           ></nav-link>
+          <nav-link
+            href="/configure-directory-sync"
+            label="Configure Directory Sync"
+            component="<ConfigureDirectorySync />"
+          ></nav-link>
           <nav-link
             href="/open-invite-members"
             label="Open invite members"