Merge branch 'main' into aa/fix-typedoc

Author: alexisintech

.changeset/brave-apples-sign.md

@@ -0,0 +1,6 @@
+---
+'@clerk/clerk-expo': minor
+'@clerk/types': patch
+---
+
+Add native Apple Sign-In support for iOS via `useAppleSignIn()` hook. Requires `expo-apple-authentication` and native build (EAS Build or local prebuild).

.changeset/cold-bottles-watch.md

@@ -0,0 +1,7 @@
+---
+'@clerk/clerk-js': patch
+'@clerk/shared': patch
+'@clerk/clerk-react': patch
+---
+
+Experimental: Ground work for fixing stale data between hooks and components by sharing a single cache. 

.changeset/deprecate-clerk-types.md

@@ -1,5 +1,5 @@
 /**
- * DO NOT EDIT THIS FILE UNLESS YOU DEFINITELY KNWO WHAT YOU ARE DOING.
+ * DO NOT EDIT THIS FILE UNLESS YOU DEFINITELY KNOW WHAT YOU ARE DOING.
  * THIS ENSURES THAT INTEGRATION TESTS ARE LOADING THE CORRECT DEPENDENCIES.
  */
 const { getDefaultConfig } = require('expo/metro-config');
@@ -30,25 +30,93 @@ const clerkExpoPath = getClerkExpoPath();
 const clerkMonorepoPath = clerkExpoPath?.replace(/\/packages\/expo$/, '');
 
 /** @type {import('expo/metro-config').MetroConfig} */
-const config = {
-  ...getDefaultConfig(__dirname),
-  watchFolders: [clerkMonorepoPath],
-  resolver: {
-    sourceExts: ['js', 'json', 'ts', 'tsx', 'cjs', 'mjs'],
-    nodeModulesPaths: [
-      path.resolve(__dirname, 'node_modules'),
-      clerkExpoPath && `${clerkMonorepoPath}/node_modules`,
-      clerkExpoPath && `${clerkExpoPath}/node_modules`,
-    ],
-    // This is a workaround for a to prevent multiple versions of react and react-native from being loaded.
-    // https://github.com/expo/expo/pull/26209
-    blockList: [
-      clerkExpoPath && new RegExp(`${clerkMonorepoPath}/node_modules/react`),
-      clerkExpoPath && new RegExp(`${clerkMonorepoPath}/node_modules/react-native`),
-    ],
-  },
-};
+const config = getDefaultConfig(__dirname);
 
-module.exports = {
-  ...config,
-};
+// Only customize Metro config when running from monorepo
+if (clerkMonorepoPath) {
+  console.log('[Metro Config] Applying monorepo customizations');
+  config.watchFolders = [clerkMonorepoPath];
+
+  // Disable file watching to prevent infinite reload loops in integration tests
+  config.watchFolders = [clerkMonorepoPath];
+  config.watcher = {
+    healthCheck: {
+      enabled: false,
+    },
+  };
+
+  // Prioritize local node_modules over monorepo node_modules
+  config.resolver.nodeModulesPaths = [path.resolve(__dirname, 'node_modules'), `${clerkMonorepoPath}/node_modules`];
+
+  // Explicitly map @clerk packages to their source locations
+  // Point to the root of the package so Metro can properly resolve subpath exports
+  config.resolver.extraNodeModules = {
+    '@clerk/clerk-react': path.resolve(clerkMonorepoPath, 'packages/react'),
+    '@clerk/clerk-expo': path.resolve(clerkMonorepoPath, 'packages/expo'),
+    '@clerk/shared': path.resolve(clerkMonorepoPath, 'packages/shared'),
+    '@clerk/types': path.resolve(clerkMonorepoPath, 'packages/types'),
+  };
+
+  // This is a workaround to prevent multiple versions of react and react-native from being loaded.
+  // Block React/React-Native in both monorepo root and all package node_modules
+  // Use word boundaries to avoid blocking clerk-react
+  // https://github.com/expo/expo/pull/26209
+  const escapedPath = clerkMonorepoPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  config.resolver.blockList = [
+    // Block monorepo root node_modules for react/react-native/react-dom
+    new RegExp(`${escapedPath}/node_modules/react/`),
+    new RegExp(`${escapedPath}/node_modules/react$`),
+    new RegExp(`${escapedPath}/node_modules/react-dom/`),
+    new RegExp(`${escapedPath}/node_modules/react-dom$`),
+    new RegExp(`${escapedPath}/node_modules/react-native/`),
+    new RegExp(`${escapedPath}/node_modules/react-native$`),
+    // Block react in monorepo's pnpm store
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react/`),
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react$`),
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react-dom/`),
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react-dom$`),
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react-native/`),
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react-native$`),
+    // Block react/react-native/react-dom in all package node_modules
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react/`),
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react$`),
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react-dom/`),
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react-dom$`),
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react-native/`),
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react-native$`),
+  ];
+
+  // Custom resolver to handle package.json subpath exports for @clerk packages
+  // This enables Metro to resolve imports like '@clerk/clerk-react/internal'
+  const originalResolveRequest = config.resolver.resolveRequest;
+  config.resolver.resolveRequest = (context, moduleName, platform) => {
+    // Check if this is a @clerk package with a subpath
+    const clerkPackageMatch = moduleName.match(/^(@clerk\/[^/]+)\/(.+)$/);
+    if (clerkPackageMatch && config.resolver.extraNodeModules) {
+      const [, packageName, subpath] = clerkPackageMatch;
+      const packageRoot = config.resolver.extraNodeModules[packageName];
+
+      if (packageRoot) {
+        // Try to resolve via the subpath-workaround directory (e.g., internal/package.json)
+        const subpathDir = path.join(packageRoot, subpath);
+        try {
+          const subpathPkg = require(path.join(subpathDir, 'package.json'));
+          if (subpathPkg.main) {
+            const resolvedPath = path.join(subpathDir, subpathPkg.main);
+            return { type: 'sourceFile', filePath: resolvedPath };
+          }
+        } catch (e) {
+          // Subpath directory doesn't exist, continue with default resolution
+        }
+      }
+    }
+
+    // Fall back to default resolution
+    if (originalResolveRequest) {
+      return originalResolveRequest(context, moduleName, platform);
+    }
+    return context.resolveRequest(context, moduleName, platform);
+  };
+}
+
+module.exports = config;

.changeset/gold-planes-wear.md

@@ -1,5 +1,14 @@
 # @clerk/agent-toolkit
 
+## 0.1.45
+
+### Patch Changes
+
+- Updated dependencies [[`3e0ef92`](https://github.com/clerk/javascript/commit/3e0ef9281194714f56dcf656d0caf4f75dcf097c), [`2587aa6`](https://github.com/clerk/javascript/commit/2587aa671dac1ca66711889bf1cd1c2e2ac8d7c8)]:
+  - @clerk/shared@3.30.0
+  - @clerk/types@4.97.0
+  - @clerk/backend@2.19.2
+
 ## 0.1.44
 
 ### Patch Changes