Merge branch 'vincent-and-the-doctor' into feat/protect-refactor

Author: jacekradko

.changeset/odd-rice-swim.md

@@ -0,0 +1,9 @@
+---
+'@clerk/ui': major
+---
+
+Removes `simple` theme export from UI package in favor of using the `simple` theme via the appearance prop:
+
+```tsx
+<ClerkProvider appearance={{ theme: 'simple' }} />
+```

.github/actions/verdaccio/action.yml

@@ -75,7 +75,7 @@ runs:
     - name: Print published Clerk package versions
       shell: bash
       run: |
-        echo "Published @clerk packages under 'integration' tag:"
+        echo "Published @clerk packages (snapshot versions):"
         echo "=================================================="
         packages=(
           "@clerk/agent-toolkit"
@@ -102,6 +102,6 @@ runs:
           "@clerk/vue"
         )
         for pkg in "${packages[@]}"; do
-          version=$(pnpm view "$pkg@integration" version 2>/dev/null || echo "not found")
-          printf "%-35s %s\n" "$pkg@integration:" "$version"
+          version=$(pnpm view "$pkg" version 2>/dev/null || echo "not found")
+          printf "%-35s %s\n" "$pkg:" "$version"
         done

.github/labeler.yml

@@ -1,61 +1,100 @@
 # See https://github.com/actions/labeler
 
 astro:
-  - packages/astro/**
+  - changed-files:
+      - any-glob-to-any-file: packages/astro/**
 
 backend:
-  - packages/backend/**
+  - changed-files:
+      - any-glob-to-any-file: packages/backend/**
 
 chrome-extension:
-  - packages/chrome-extension/**
+  - changed-files:
+      - any-glob-to-any-file: packages/chrome-extension/**
 
 clerk-js:
-  - packages/clerk-js/**
+  - changed-files:
+      - any-glob-to-any-file: packages/clerk-js/**
+
+elements:
+  - changed-files:
+      - any-glob-to-any-file: packages/elements/**
 
 expo:
-  - packages/expo/**
+  - changed-files:
+      - any-glob-to-any-file: packages/expo/**
 
 express:
-  - packages/express/**
+  - changed-files:
+      - any-glob-to-any-file: packages/express/**
 
 fastify:
-  - packages/fastify/**
+  - changed-files:
+      - any-glob-to-any-file: packages/fastify/**
 
 localizations:
-  - packages/localizations/**
+  - changed-files:
+      - any-glob-to-any-file: packages/localizations/**
 
 nextjs:
-  - packages/nextjs/**
+  - changed-files:
+      - any-glob-to-any-file: packages/nextjs/**
 
 nuxt:
-  - packages/nuxt/**
+  - changed-files:
+      - any-glob-to-any-file: packages/nuxt/**
 
 react:
-  - packages/react/**
+  - changed-files:
+      - any-glob-to-any-file: packages/react/**
 
 react-router:
-  - packages/react-router/**
+  - changed-files:
+      - any-glob-to-any-file: packages/react-router/**
+
+remix:
+  - changed-files:
+      - any-glob-to-any-file: packages/remix/**
 
 tanstack:
-  - packages/tanstack-react-start/**
+  - changed-files:
+      - any-glob-to-any-file: packages/tanstack-react-start/**
 
 testing:
-  - packages/testing/**
+  - changed-files:
+      - any-glob-to-any-file: packages/testing/**
 
 themes:
-  - packages/themes/**
+  - changed-files:
+      - any-glob-to-any-file: packages/themes/**
+
+types:
+  - changed-files:
+      - any-glob-to-any-file: packages/types/**
 
 vue:
-  - packages/vue/**
+  - changed-files:
+      - any-glob-to-any-file: packages/vue/**
 
 playground:
-  - playground/**
+  - changed-files:
+      - any-glob-to-any-file: playground/**
 
 actions:
-  - .github/workflows/**
+  - changed-files:
+      - any-glob-to-any-file: .github/workflows/**
 
 integration:
-  - integration/**
+  - changed-files:
+      - any-glob-to-any-file: integration/**
 
 agent-toolkit:
-  - packages/agent-toolkit/**
+  - changed-files:
+      - any-glob-to-any-file: packages/agent-toolkit/**
+
+# Base branch labels
+core2:
+  - base-branch: '^main$'
+
+core3:
+  - base-branch: '^vincent-and-the-doctor$'

.github/workflows/ci.yml

@@ -64,10 +64,10 @@ jobs:
       - name: Setup
         id: config
         uses: ./.github/actions/init-blacksmith
-        with:
-          turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
-          turbo-team: ${{ vars.TURBO_TEAM }}
-          turbo-token: ${{ secrets.TURBO_TOKEN }}
+        # with:
+        # turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
+        # turbo-team: ${{ vars.TURBO_TEAM }}
+        # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
       - name: Verify lockfile is deduped
         run: pnpm dedupe --check
@@ -110,11 +110,11 @@ jobs:
       - name: Setup
         id: config
         uses: ./.github/actions/init-blacksmith
-        with:
-          turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
-          turbo-summarize: ${{ env.TURBO_SUMMARIZE }}
-          turbo-team: ${{ vars.TURBO_TEAM }}
-          turbo-token: ${{ secrets.TURBO_TOKEN }}
+        # with:
+        # turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
+        # turbo-summarize: ${{ env.TURBO_SUMMARIZE }}
+        # turbo-team: ${{ vars.TURBO_TEAM }}
+        # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
       - name: Turbo Build
         run: pnpm turbo build $TURBO_ARGS --only
@@ -154,11 +154,11 @@ jobs:
       - name: Setup
         id: config
         uses: ./.github/actions/init-blacksmith
-        with:
-          turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
-          turbo-summarize: ${{ env.TURBO_SUMMARIZE }}
-          turbo-team: ${{ vars.TURBO_TEAM }}
-          turbo-token: ${{ secrets.TURBO_TOKEN }}
+        # with:
+        # turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
+        # turbo-summarize: ${{ env.TURBO_SUMMARIZE }}
+        # turbo-team: ${{ vars.TURBO_TEAM }}
+        # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
       - name: Check size using bundlewatch
         continue-on-error: true
@@ -231,10 +231,10 @@ jobs:
         with:
           # Ensures that all builds are cached appropriately with a consistent run name `Unit Tests (20)`.
           node-version: ${{ matrix.node-version }}
-          turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
-          turbo-summarize: ${{ env.TURBO_SUMMARIZE }}
-          turbo-team: ${{ vars.TURBO_TEAM }}
-          turbo-token: ${{ secrets.TURBO_TOKEN }}
+          # turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
+          # turbo-summarize: ${{ env.TURBO_SUMMARIZE }}
+          # turbo-team: ${{ vars.TURBO_TEAM }}
+          # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
       - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
         if: ${{ matrix.clerk-use-rq == 'true' }}
@@ -280,7 +280,8 @@ jobs:
           retention-days: 5
 
   integration-tests:
-    needs: [check-permissions, build-packages]
+    # needs: [check-permissions, build-packages]
+    needs: [check-permissions]
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
     name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
     permissions:
@@ -355,9 +356,9 @@ jobs:
         id: config
         uses: ./.github/actions/init-blacksmith
         with:
-          turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
-          turbo-team: ${{ vars.TURBO_TEAM }}
-          turbo-token: ${{ secrets.TURBO_TOKEN }}
+          # turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
+          # turbo-team: ${{ vars.TURBO_TEAM }}
+          # turbo-token: ${{ secrets.TURBO_TOKEN }}
           playwright-enabled: true
 
       - name: Verify jq is installed
@@ -405,12 +406,16 @@ jobs:
         env:
           CLERK_USE_RQ: true
 
+      - name: Version packages for snapshot
+        if: ${{ steps.task-status.outputs.affected == '1' }}
+        run: npm run version-packages:snapshot ci
+
       - name: Verdaccio
         if: ${{ steps.task-status.outputs.affected == '1' }}
         uses: ./.github/actions/verdaccio
         with:
           publish-cmd: |
-            if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else CLERK_USE_RQ=${{ matrix.clerk-use-rq }} pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag integration; fi
+            if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else ${{ matrix.clerk-use-rq == 'true' && 'CLERK_USE_RQ=true' || '' }} pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
 
       - name: Edit .npmrc [link-workspace-packages=false]
         run: sed -i -E 's/link-workspace-packages=(deep|true)/link-workspace-packages=false/' .npmrc
@@ -423,6 +428,8 @@ jobs:
           pnpm config set minimum-release-age-exclude @clerk/*
           pnpm add @clerk/backend
 
+      # Install published packages from Verdaccio to test against real npm install scenarios
+      # rather than local monorepo builds. Validates package structure, dependencies, and entry points.
       - name: Install @clerk/clerk-js in os temp
         if: ${{ steps.task-status.outputs.affected == '1' }}
         working-directory: ${{runner.temp}}
@@ -474,6 +481,7 @@ jobs:
         timeout-minutes: 25
         run: pnpm turbo test:integration:${{ matrix.test-name }} $TURBO_ARGS
         env:
+          E2E_DEBUG: "1"
           E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
           E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
           E2E_CLERK_JS_VERSION: "latest"
@@ -483,8 +491,8 @@ jobs:
           E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
           CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
           INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
-          MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}
           NODE_EXTRA_CA_CERTS: ${{ github.workspace }}/integration/certs/rootCA.pem
+          VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
 
       - name: Upload test-results
         if: ${{ cancelled() || failure() }}
@@ -518,10 +526,10 @@ jobs:
         with:
           turbo-enabled: true
           node-version: 22
-          turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
-          turbo-summarize: ${{ env.TURBO_SUMMARIZE }}
-          turbo-team: ${{ vars.TURBO_TEAM }}
-          turbo-token: ${{ secrets.TURBO_TOKEN }}
+          # turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
+          # turbo-summarize: ${{ env.TURBO_SUMMARIZE }}
+          # turbo-team: ${{ vars.TURBO_TEAM }}
+          # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
       - name: Publish with pkg-pr-new
         run: pnpm run build && pnpx pkg-pr-new@${{ vars.PKG_PR_NEW_VERSION || '0.0.49' }} publish --compact --pnpm './packages/*'

.github/workflows/labeler.yml

@@ -16,6 +16,6 @@ jobs:
         with:
           fetch-depth: 0
           show-progress: false
-      - uses: actions/labeler@v4
+      - uses: actions/labeler@v6
         with:
           repo-token: ${{ secrets.CLERK_COOKIE_PAT }}

.github/workflows/nightly-checks.yml

@@ -68,10 +68,9 @@ jobs:
           E2E_CLERK_UI_VERSION: "latest"
           E2E_NEXTJS_VERSION: "canary"
           E2E_NPM_FORCE: "true"
-          E2E_REACT_DOM_VERSION: "19.1.0"
-          E2E_REACT_VERSION: "19.1.0"
+          E2E_REACT_DOM_VERSION: "19.2.1"
+          E2E_REACT_VERSION: "19.2.1"
           INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
-          MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}
 
       # Upload test artifacts if tests failed
       - name: Upload Test Artifacts

integration/.env.local.sample

@@ -1,4 +1,3 @@
-MAILSAC_API_KEY=
 VERCEL_PROJECT_ID=
 VERCEL_ORG_ID=
 VERCEL_TOKEN=

integration/README.md

@@ -75,10 +75,10 @@ Below you can find code snippets for running tests in a specific manner, easily
 
 #### Keep temporary site
 
-During E2E runs a temporary site is created in which the template is copied into. If you want to keep the site around, pass the `CLEANUP` environment variable:
+During E2E runs a temporary site is created in which the template is copied into. If you want to keep the site around, pass the `E2E_CLEANUP` environment variable:
 
 ```shell
-CLEANUP=0 pnpm test:integration:base
+E2E_CLEANUP=0 pnpm test:integration:base
 ```
 
 For all available environment variables, check the [`constants.ts`](../integration/constants.ts) file.
@@ -578,7 +578,6 @@ Before writing tests, it's important to understand how Playwright handles test i
 > [!NOTE]
 > The test suite also uses these environment variables to run some tests:
 >
-> - `MAILSAC_API_KEY`: Used for [Mailsac](https://mailsac.com/) to retrieve email codes and magic links from temporary email addresses.
 > - `VERCEL_PROJECT_ID`: Only required if you plan on running deployment tests locally. This is the Vercel project ID, and it points to an application created via the Vercel dashboard. The easiest way to get access to it is by linking a local app to the Vercel project using the Vercel CLI, and then copying the values from the `.vercel` directory.
 > - `VERCEL_ORG_ID`: The organization that owns the Vercel project. See above for more details.
 > - `VERCEL_TOKEN`: A personal access token. This corresponds to a real user running the deployment command. Attention: Be extra careful with this token as it can't be scoped to a single Vercel project, meaning that the token has access to every project in the account it belongs to.

integration/constants.ts

@@ -38,10 +38,10 @@ export const constants = {
    */
   E2E_APP_CLERK_UI_DIR: process.env.E2E_APP_CLERK_UI_DIR,
   /**
-   * If CLEANUP=0 is used, the .tmp_integration directory will not be deleted.
+   * If E2E_CLEANUP=0 is used, the .tmp_integration directory will not be deleted.
    * This is useful for debugging locally.
    */
-  CLEANUP: !(process.env.CLEANUP === '0' || process.env.CLEANUP === 'false'),
+  E2E_CLEANUP: !(process.env.E2E_CLEANUP === '0' || process.env.E2E_CLEANUP === 'false'),
   DEBUG: process.env.DEBUG === 'true' || process.env.DEBUG === '1',
   /**
    * Used with E2E_APP_URL if the tests need to access BAPI.