Merge branch 'main' into poc/observable-signin

Author: jacekradko

.changeset/every-cows-think.md

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

.changeset/petite-ravens-see.md

@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Do not allow `setActive({ organization: null })` when organization selection is forced

package.json

@@ -79,9 +79,10 @@
     "@testing-library/user-event": "^14.5.2",
     "@types/cross-spawn": "^6.0.6",
     "@types/jest": "^29.3.1",
-    "@types/node": "^22.15.24",
+    "@types/node": "^22.15.29",
     "@types/react": "catalog:react",
     "@types/react-dom": "catalog:react",
+    "@vitejs/plugin-react": "^4.5.1",
     "@vitest/coverage-v8": "3.0.2",
     "chalk": "4.1.2",
     "citty": "^0.1.6",

packages/clerk-js/bundlewatch.config.json

@@ -3,7 +3,7 @@
     { "path": "./dist/clerk.js", "maxSize": "605kB" },
     { "path": "./dist/clerk.browser.js", "maxSize": "69.2KB" },
     { "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
-    { "path": "./dist/clerk.headless*.js", "maxSize": "52.2KB" },
+    { "path": "./dist/clerk.headless*.js", "maxSize": "53KB" },
     { "path": "./dist/ui-common*.js", "maxSize": "106.3KB" },
     { "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
     { "path": "./dist/coinbase*.js", "maxSize": "38KB" },

packages/clerk-js/package.json

@@ -47,10 +47,11 @@
     "lint": "eslint src",
     "lint:attw": "attw --pack . --profile node16 --ignore-rules named-exports",
     "lint:publint": "publint || true",
-    "test": "jest",
+    "test": "jest && vitest --watch=false",
     "test:cache:clear": "jest --clearCache --useStderr",
     "test:ci": "jest --maxWorkers=70%",
     "test:coverage": "jest --collectCoverage && open coverage/lcov-report/index.html",
+    "test:vitest": "vitest",
     "watch": "rspack build --config rspack.config.js --env production --watch"
   },
   "browserslist": "last 2 years",

packages/clerk-js/src/core/clerk.ts

@@ -1071,6 +1071,10 @@ export class Clerk implements ClerkInterface {
         );
       }
 
+      if (organization === null && this.environment?.organizationSettings?.forceOrganizationSelection) {
+        throw new Error('setActive requires an organization parameter when organization selection is forced.');
+      }
+
       const onBeforeSetActive: SetActiveHook =
         typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
           ? window.__unstable__onBeforeSetActive

packages/clerk-js/src/ui/router/__tests__/HashRouter.test.tsx renamed to packages/clerk-js/src/ui/router/__tests__/HashRouter.spec.tsx

@@ -1,13 +1,14 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import type { Clerk } from '../../../core/clerk';
 import { HashRouter, Route, useRouter } from '..';
 
-const mockNavigate = jest.fn();
+const mockNavigate = vi.fn();
 
-jest.mock('@clerk/shared/react', () => {
+vi.mock('@clerk/shared/react', () => {
   return {
     useClerk: () => {
       return {

packages/clerk-js/src/utils/__tests__/email.test.ts renamed to packages/clerk-js/src/utils/__tests__/email.spec.ts

@@ -1,3 +1,5 @@
+import { expect, test } from 'vitest';
+
 import { buildEmailAddress } from '../email';
 
 test.each([

packages/clerk-js/vitest.config.mts

@@ -0,0 +1,14 @@
+import { defineConfig } from 'vitest/config';
+import react from '@vitejs/plugin-react';
+
+export default defineConfig({
+  plugins: [react({ jsxRuntime: 'automatic', jsxImportSource: '@emotion/react' })],
+  define: {
+    __PKG_NAME__: JSON.stringify('@clerk/clerk-js'),
+  },
+  test: {
+    include: ['**/*.spec.?(c|m)[jt]s?(x)'],
+    environment: 'jsdom',
+    setupFiles: './vitest.setup.mts',
+  },
+});

packages/clerk-js/vitest.setup.mts

@@ -0,0 +1,5 @@
+import { afterEach } from 'vitest';
+import { cleanup } from '@testing-library/react';
+import '@testing-library/jest-dom/vitest';
+
+afterEach(cleanup);

packages/elements/examples/nextjs/package.json

@@ -22,11 +22,11 @@
     "react-dom": "18.3.1"
   },
   "devDependencies": {
-    "@types/node": "^18.19.105",
+    "@types/node": "^18.19.110",
     "@types/react": "catalog:react",
     "@types/react-dom": "catalog:react",
     "autoprefixer": "^10.4.21",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.4",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.8.3"
   }

packages/expo/package.json

@@ -92,7 +92,7 @@
     "expo-local-authentication": "^13.8.0",
     "expo-secure-store": "^12.8.1",
     "expo-web-browser": "^12.8.2",
-    "react-native": "^0.79.2"
+    "react-native": "^0.79.3"
   },
   "peerDependencies": {
     "@clerk/expo-passkeys": ">=0.0.6",