Merge branch 'main' into feat/nextjs-cache-components-support

Author: jacekradko

.changeset/expo-optional-native-auth.md

@@ -0,0 +1,19 @@
+---
+"@clerk/expo": major
+---
+
+Move `useSignInWithApple` and `useSignInWithGoogle` to dedicated entry points to avoid bundling optional dependencies.
+
+**Breaking Change:** Import paths have changed:
+
+```typescript
+// Before
+import { useSignInWithApple } from '@clerk/expo';
+import { useSignInWithGoogle } from '@clerk/expo';
+
+// After
+import { useSignInWithApple } from '@clerk/expo/apple';
+import { useSignInWithGoogle } from '@clerk/expo/google';
+```
+
+This change prevents `expo-crypto` and `expo-apple-authentication` from being bundled when not using native sign-in hooks.

.changeset/fix-ui-min-version.md

@@ -0,0 +1,5 @@
+---
+'@clerk/ui': patch
+---
+
+Fix MIN_CLERK_JS_VERSION to match current clerk-js version until major release

.changeset/quiet-doors-wave.md

@@ -0,0 +1,5 @@
+---
+'@clerk/backend': patch
+---
+
+Allow `null` for `period_end` in `BillingSubscriptionItemWebhookEventJSON`

.changeset/quiet-panthers-beam.md

@@ -0,0 +1,6 @@
+---
+"@clerk/backend": patch
+"@clerk/nextjs": patch
+---
+
+fix: Update getAuthData to use isMachineToken

.changeset/wet-boxes-decide.md

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

.github/workflows/ci.yml

@@ -324,6 +324,9 @@ jobs:
           - test-name: "quickstart"
             test-project: "chrome"
             next-version: "16"
+          - test-name: "cache-components"
+            test-project: "chrome"
+            next-version: "16"
 
     steps:
       - name: Checkout Repo

integration/presets/longRunningApps.ts

@@ -36,6 +36,11 @@ export const createLongRunningApps = () => {
     { id: 'next.appRouter.withNeedsClientTrust', config: next.appRouter, env: envs.withNeedsClientTrust },
     { id: 'next.appRouter.withSharedUIVariant', config: next.appRouter, env: envs.withSharedUIVariant },
 
+    /**
+     * NextJS apps - cache components
+     */
+    { id: 'next.cacheComponents', config: next.cacheComponents, env: envs.withEmailCodes },
+
     /**
      * Quickstart apps
      */

integration/presets/next.ts

@@ -36,11 +36,23 @@ const appRouterAPWithClerkNextV6 = appRouterQuickstartV6
   .setName('next-app-router-ap-clerk-next-v6')
   .addDependency('@clerk/nextjs', '6');
 
+const cacheComponents = applicationConfig()
+  .setName('next-cache-components')
+  .useTemplate(templates['next-cache-components'])
+  .setEnvFormatter('public', key => `NEXT_PUBLIC_${key}`)
+  .addScript('setup', constants.E2E_NPM_FORCE ? 'pnpm install --force' : 'pnpm install')
+  .addScript('dev', 'pnpm dev')
+  .addScript('build', 'pnpm build')
+  .addScript('serve', 'pnpm start')
+  .addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
+  .addDependency('@clerk/shared', linkPackage('shared'));
+
 export const next = {
   appRouter,
   appRouterTurbo,
   appRouterQuickstart,
   appRouterAPWithClerkNextLatest,
   appRouterAPWithClerkNextV6,
   appRouterQuickstartV6,
+  cacheComponents,
 } as const;

integration/templates/astro-node/package.json

@@ -16,7 +16,7 @@
     "@astrojs/tailwind": "^5.1.3",
     "@types/react": "18.3.7",
     "@types/react-dom": "18.3.0",
-    "astro": "^5.0.3",
+    "astro": "^5.15.9",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "tailwindcss": "^3.4.17",

integration/templates/index.ts

@@ -5,6 +5,7 @@ export const templates = {
   // If /integration becomes a module in the future, use these helpers:
   // 'next-app-router': fileURLToPath(new URL('./next-app-router', import.meta.url)),
   'next-app-router': resolve(__dirname, './next-app-router'),
+  'next-cache-components': resolve(__dirname, './next-cache-components'),
   'next-app-router-quickstart': resolve(__dirname, './next-app-router-quickstart'),
   'next-app-router-quickstart-v6': resolve(__dirname, './next-app-router-quickstart-v6'),
   'react-cra': resolve(__dirname, './react-cra'),