Merge branch 'main' into nikos/migrate-types-to-shared

Author: nikosdouvlis

.changeset/gold-planes-wear.md

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

integration/tests/middleware-placement.test.ts

@@ -15,20 +15,31 @@ function parseSemverMajor(range?: string): number | undefined {
   return match ? Number.parseInt(match[0], 10) : undefined;
 }
 
-async function detectNext(app: Application): Promise<{ isNext: boolean; version?: string }> {
+/**
+ * Detects the installed Next.js version for a given application.
+ * Reads the version from node_modules/next/package.json to ensure
+ * we get the actual installed version rather than a tag like "latest" or "canary".
+ */
+async function detectNext(app: Application): Promise<{ version: string | undefined | null }> {
   // app.appDir exists for normal Application; for long-running apps, read it from the state file by serverUrl
   const appDir =
     (app as any).appDir ||
     Object.values(stateFile.getLongRunningApps() || {}).find(a => a.serverUrl === app.serverUrl)?.appDir;
 
   if (!appDir) {
-    return { isNext: false };
+    return { version: null };
   }
 
-  const pkg = await fs.readJSON(path.join(appDir, 'package.json'));
-  const nextRange: string | undefined = pkg.dependencies?.next || pkg.devDependencies?.next;
+  let installedVersion: string | undefined;
+  try {
+    const nextPkg = await fs.readJSON(path.join(appDir, 'node_modules', 'next', 'package.json'));
+    installedVersion = String(nextPkg?.version || '');
+  } catch {
+    // ignore
+  }
 
-  return { isNext: Boolean(nextRange), version: nextRange };
+  console.log('---detectNext---', installedVersion);
+  return { version: installedVersion };
 }
 
 const middlewareFileContents = `

packages/chrome-extension/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.7.10
+
+### Patch Changes
+
+- Updated dependencies [[`3410bc6`](https://github.com/clerk/javascript/commit/3410bc6f85d1d87c9ed35c9aa4ec764a684cc4ec)]:
+  - @clerk/clerk-js@5.103.1
+
 ## 2.7.9
 
 ### Patch Changes

packages/chrome-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/chrome-extension",
-  "version": "2.7.9",
+  "version": "2.7.10",
   "description": "Clerk SDK for Chrome extensions",
   "keywords": [
     "auth",

packages/clerk-js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 5.103.1
+
+### Patch Changes
+
+- Bring back OrgPreview within the OrgSwitcher component ([#7091](https://github.com/clerk/javascript/pull/7091)) by [@alexcarpenter](https://github.com/alexcarpenter)
+
 ## 5.103.0
 
 ### Minor Changes

packages/clerk-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-js",
-  "version": "5.103.0",
+  "version": "5.103.1",
   "description": "Clerk JS library",
   "keywords": [
     "clerk",

packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx

@@ -1,6 +1,7 @@
 import { useOrganization, useOrganizationList, useUser } from '@clerk/shared/react';
 import { forwardRef } from 'react';
 
+import { OrganizationPreview } from '@/ui/elements/OrganizationPreview';
 import { PersonalWorkspacePreview } from '@/ui/elements/PersonalWorkspacePreview';
 import { withAvatarShimmer } from '@/ui/elements/withAvatarShimmer';
 
@@ -51,6 +52,16 @@ export const OrganizationSwitcherTrigger = withAvatarShimmer(
         aria-haspopup='dialog'
         {...rest}
       >
+        {organization && (
+          <OrganizationPreview
+            elementId={'organizationSwitcherTrigger'}
+            gap={3}
+            size='xs'
+            organization={organization}
+            sx={{ maxWidth: '30ch' }}
+          />
+        )}
+
         {!organization && (
           <PersonalWorkspacePreview
             size='xs'

packages/clerk-js/src/ui/components/OrganizationSwitcher/__tests__/OrganizationSwitcher.test.tsx

@@ -62,6 +62,52 @@ describe('OrganizationSwitcher', () => {
   });
 
   describe('OrganizationSwitcherTrigger', () => {
+    it('shows OrganizationPreview when user has an active organization', async () => {
+      const { wrapper, fixtures } = await createFixtures(f => {
+        f.withOrganizations();
+        f.withUser({
+          email_addresses: ['[email protected]'],
+          organization_memberships: [{ name: 'Test Organization', id: '1', role: 'admin' }],
+        });
+      });
+
+      // Set the active organization in the context
+      fixtures.clerk.organization = {
+        id: '1',
+        name: 'Test Organization',
+        slug: 'test-organization',
+        membersCount: 1,
+        pendingInvitationsCount: 0,
+        adminDeleteEnabled: true,
+        maxAllowedMemberships: 100,
+      } as any;
+
+      const { getByText } = render(<OrganizationSwitcher />, { wrapper });
+      expect(getByText('Test Organization')).toBeInTheDocument();
+    });
+
+    it('shows PersonalWorkspacePreview when user has no active organization and hidePersonal is false', async () => {
+      const { wrapper, props } = await createFixtures(f => {
+        f.withOrganizations();
+        f.withUser({ email_addresses: ['[email protected]'] });
+      });
+
+      props.setProps({ hidePersonal: false });
+      const { getByText } = render(<OrganizationSwitcher />, { wrapper });
+      expect(getByText('Personal account')).toBeInTheDocument();
+    });
+
+    it('shows "No organization selected" when user has no active organization and hidePersonal is true', async () => {
+      const { wrapper, props } = await createFixtures(f => {
+        f.withOrganizations();
+        f.withUser({ email_addresses: ['[email protected]'] });
+      });
+
+      props.setProps({ hidePersonal: true });
+      const { getByText } = render(<OrganizationSwitcher />, { wrapper });
+      expect(getByText('No organization selected')).toBeInTheDocument();
+    });
+
     it('shows the counter for pending suggestions and invitations', async () => {
       const { wrapper, fixtures } = await createFixtures(f => {
         f.withOrganizations();

packages/expo/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.17.3
+
+### Patch Changes
+
+- Updated dependencies [[`3410bc6`](https://github.com/clerk/javascript/commit/3410bc6f85d1d87c9ed35c9aa4ec764a684cc4ec)]:
+  - @clerk/clerk-js@5.103.1
+
 ## 2.17.2
 
 ### Patch Changes

packages/expo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-expo",
-  "version": "2.17.2",
+  "version": "2.17.3",
   "description": "Clerk React Native/Expo library",
   "keywords": [
     "react",