Merge branch 'main' into locale-update

.changeset/calm-wasps-accept.md

@@ -0,0 +1,36 @@
+---
+'@clerk/clerk-expo': minor
+---
+
+Introduce `getClerkInstance()` to avoid importing the Clerk class from clerk-js manually.
+
+This enables developers to create and access a Clerk instance in their application outside of React.
+```tsx
+import { ClerkProvider, getClerkInstance } from "@clerk/expo"
+
+const clerkInstance = getClerkInstance({ publishableKey: 'xxxx' })
+
+// Always pass the `publishableKey` to `ClerkProvider`
+<ClerkProvider publishableKey={'xxxx'}>
+    ...
+</ClerkProvider>
+
+// Somewhere in your code, outside of React you can do
+const token = await clerkInstance.session?.getToken();
+fetch('http://example.com/', {headers: {Authorization: token })
+```
+```tsx
+import { ClerkProvider, getClerkInstance } from "@clerk/expo"
+
+// Always pass the `publishableKey` to `ClerkProvider`
+<ClerkProvider publishableKey={'xxxx'}>
+    ...
+</ClerkProvider>
+
+// If you sure that this code will run after the ClerkProvider has rendered then you can use `getClerkIntance` without options
+const token = await getClerkInstance().session?.getToken();
+fetch('http://example.com/', {headers: {Authorization: token })
+
+```
+Attention: If `getClerkInstance` is called without a publishable key, and ClerkProvider has not rendered yet, an error will be thrown 
+

.changeset/dirty-panthers-perform.md

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

.changeset/empty-deers-notice.md

@@ -0,0 +1,5 @@
+---
+"@clerk/shared": patch
+---
+
+Update `js-cookie` from `3.0.1` to `3.0.5`. Update `swr` from `2.2.0` to `2.2.5`.

.changeset/gentle-brooms-worry.md

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

.changeset/giant-cougars-grab.md

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

.changeset/metal-foxes-raise.md

@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-react': patch
+---
+
+Update `SignUpButton` and `SignInButton` to respect `forceRedirect` and `fallbackRedirect` props. Previously, these were getting ignored and successful completions of the flows would fallback to the default redirect URL.

.changeset/pretty-hounds-drive.md

@@ -0,0 +1,3 @@
+---
+---
+

.changeset/rotten-eyes-tickle.md

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

.changeset/sixty-ears-rest.md

@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Fixed a bug where Clerk components rendered in modals were wrapped with `aria-hidden`.

.changeset/yellow-deers-dress.md

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

integration/templates/express-vite/package.json

@@ -14,11 +14,11 @@
     "ejs": "^3.1.6",
     "express": "^4.18.2",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.3",
+    "typescript": "^5.4.5",
     "vite-express": "^0.11.0"
   },
   "devDependencies": {
-    "@types/express": "^4.17.15",
+    "@types/express": "^4.17.21",
     "@types/node": "^18.19.33",
     "nodemon": "^2.0.20",
     "vite": "^4.0.4"

integration/templates/next-app-router-quickstart/package.json

@@ -15,7 +15,7 @@
     "next": "14.1.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "typescript": "^5"
+    "typescript": "^5.4.5"
   },
   "engines": {
     "node": ">=18.17.0"

integration/templates/next-app-router/package.json

@@ -15,7 +15,7 @@
     "next": "^13.5",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "typescript": "5.1.6"
+    "typescript": "^5.4.5"
   },
   "engines": {
     "node": ">=18.17.0"

integration/templates/next-app-router/src/app/buttons/page.tsx

@@ -0,0 +1,35 @@
+import { SignInButton, SignUpButton } from '@clerk/nextjs';
+
+export default function Home() {
+  return (
+    <main>
+      <SignInButton
+        mode='modal'
+        forceRedirectUrl='/protected'
+      >
+        Sign in button (force)
+      </SignInButton>
+
+      <SignInButton
+        mode='modal'
+        fallbackRedirectUrl='/protected'
+      >
+        Sign in button (fallback)
+      </SignInButton>
+
+      <SignUpButton
+        mode='modal'
+        forceRedirectUrl='/protected'
+      >
+        Sign up button (force)
+      </SignUpButton>
+
+      <SignUpButton
+        mode='modal'
+        fallbackRedirectUrl='/protected'
+      >
+        Sign up button (fallback)
+      </SignUpButton>
+    </main>
+  );
+}

integration/templates/react-vite/package.json

@@ -24,7 +24,7 @@
     "eslint": "^8.38.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.3.4",
-    "typescript": "^5.0.2",
+    "typescript": "^5.4.5",
     "vite": "^4.3.9"
   },
   "engines": {

integration/templates/remix-node/package.json

@@ -25,7 +25,7 @@
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "eslint": "^8.38.0",
-    "typescript": "^5.0.4"
+    "typescript": "^5.4.5"
   },
   "engines": {
     "node": ">=18.17.0"

integration/tests/redirects.test.ts

@@ -0,0 +1,130 @@
+import { test } from '@playwright/test';
+
+import { appConfigs } from '../presets';
+import type { FakeUser } from '../testUtils';
+import { createTestUtils, testAgainstRunningApps } from '../testUtils';
+
+testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('redirect props @nextjs', ({ app }) => {
+  test.describe.configure({ mode: 'serial' });
+
+  let fakeUser: FakeUser;
+
+  test.beforeAll(async () => {
+    const u = createTestUtils({ app });
+    fakeUser = u.services.users.createFakeUser({
+      fictionalEmail: true,
+      withPhoneNumber: true,
+      withUsername: true,
+    });
+    await u.services.users.createBapiUser(fakeUser);
+  });
+
+  test.afterAll(async () => {
+    await fakeUser.deleteIfExists();
+    await app.teardown();
+  });
+
+  test.afterEach(async ({ page, context }) => {
+    const u = createTestUtils({ app, page, context });
+    await u.page.signOut();
+    await u.page.context().clearCookies();
+  });
+
+  test.describe('SignInButton', () => {
+    test('sign in button respects forceRedirectUrl', async ({ page, context }) => {
+      const u = createTestUtils({ app, page, context });
+
+      await u.page.goToRelative('/buttons');
+      await u.page.waitForClerkJsLoaded();
+      await u.po.expect.toBeSignedOut();
+
+      await u.page.getByText('Sign in button (force)').click();
+
+      await u.po.signIn.waitForMounted();
+      await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
+
+      await u.page.waitForAppUrl('/protected');
+
+      await u.po.expect.toBeSignedIn();
+    });
+
+    test('sign in button respects fallbackRedirectUrl', async ({ page, context }) => {
+      const u = createTestUtils({ app, page, context });
+
+      await u.page.goToRelative('/buttons');
+      await u.page.waitForClerkJsLoaded();
+      await u.po.expect.toBeSignedOut();
+
+      await u.page.getByText('Sign in button (fallback)').click();
+
+      await u.po.signIn.waitForMounted();
+      await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
+
+      await u.page.waitForAppUrl('/protected');
+
+      await u.po.expect.toBeSignedIn();
+    });
+  });
+
+  test.describe('SignUpButton', () => {
+    test('sign up button respects forceRedirectUrl', async ({ page, context }) => {
+      const u = createTestUtils({ app, page, context });
+      const fakeUser = u.services.users.createFakeUser({
+        fictionalEmail: true,
+        withPhoneNumber: true,
+        withUsername: true,
+      });
+
+      await u.page.goToRelative('/buttons');
+      await u.page.waitForClerkJsLoaded();
+
+      await u.page.getByText('Sign up button (force)').click();
+
+      // Fill in sign up form
+      await u.po.signUp.signUpWithEmailAndPassword({
+        email: fakeUser.email,
+        password: fakeUser.password,
+      });
+
+      // Verify email
+      await u.po.signUp.enterTestOtpCode();
+
+      await u.page.waitForAppUrl('/protected');
+
+      // Check if user is signed in
+      await u.po.expect.toBeSignedIn();
+
+      await fakeUser.deleteIfExists();
+    });
+
+    test('sign up button respects fallbackRedirectUrl', async ({ page, context }) => {
+      const u = createTestUtils({ app, page, context });
+      const fakeUser = u.services.users.createFakeUser({
+        fictionalEmail: true,
+        withPhoneNumber: true,
+        withUsername: true,
+      });
+
+      await u.page.goToRelative('/buttons');
+      await u.page.waitForClerkJsLoaded();
+
+      await u.page.getByText('Sign up button (fallback)').click();
+
+      // Fill in sign up form
+      await u.po.signUp.signUpWithEmailAndPassword({
+        email: fakeUser.email,
+        password: fakeUser.password,
+      });
+
+      // Verify email
+      await u.po.signUp.enterTestOtpCode();
+
+      await u.page.waitForAppUrl('/protected');
+
+      // Check if user is signed in
+      await u.po.expect.toBeSignedIn();
+
+      await fakeUser.deleteIfExists();
+    });
+  });
+});