merge main and resolve conflicts

Resolve conflicts in fastify proxy support files with main branch.
Take main's simpler proxyUrl resolution approach (path-only instead of
full URL derivation) and cleaner JSDoc style.

Author: nikosdouvlis

.changeset/breezy-stingrays-give.md

@@ -113,7 +113,7 @@ Release Process
 Local Development Tips
 - Use playground applications to test changes quickly
 - Set up multiple test environments for different scenarios
-- Use Verdaccio for local npm registry testing
+- Use pkglab for local npm registry testing (`pkglab pub` to publish, `pkglab add` to install)
 - Leverage hot reloading for faster development cycles
 - Use proper IDE setup with TypeScript support
 

.changeset/tame-moments-grin.md

@@ -75,7 +75,7 @@ Environment Configuration
 
 - Supports multiple Clerk environment variables (CLERK*\*, NEXT_PUBLIC_CLERK*\*, etc.)
 - Development, staging, and production configurations
-- Verdaccio for local npm registry testing
+- pkglab for local npm registry testing
 - Docker support for integration testing
 - CI/CD with GitHub Actions
 

.cursor/rules/development.mdc

@@ -88,6 +88,12 @@ runs:
           )
 
           if (ENABLED === 'true') {
+            if (!TEAM) {
+              throw new Error('turbo-team input is required and must not be empty')
+            }
+            if (!TOKEN) {
+              throw new Error('turbo-token input is required and must not be empty')
+            }
             core.exportVariable('TURBO_CACHE', CACHE)
             core.exportVariable('TURBO_TEAM', TEAM)
             core.exportVariable('TURBO_TOKEN', TOKEN)
@@ -119,6 +125,10 @@ runs:
       run: pnpm install
       shell: bash
 
+    - name: Add node_modules/.bin to PATH
+      run: echo "${{ github.workspace }}/node_modules/.bin" >> $GITHUB_PATH
+      shell: bash
+
     - name: Get Playwright Version
       if: inputs.playwright-enabled == 'true'
       shell: bash

.cursor/rules/monorepo.mdc

@@ -88,6 +88,12 @@ runs:
           )
 
           if (ENABLED === 'true') {
+            if (!TEAM) {
+              throw new Error('turbo-team input is required and must not be empty')
+            }
+            if (!TOKEN) {
+              throw new Error('turbo-token input is required and must not be empty')
+            }
             core.exportVariable('TURBO_CACHE', CACHE)
             core.exportVariable('TURBO_TEAM', TEAM)
             core.exportVariable('TURBO_TOKEN', TOKEN)
@@ -119,6 +125,10 @@ runs:
       run: pnpm install
       shell: bash
 
+    - name: Add node_modules/.bin to PATH
+      run: echo "${{ github.workspace }}/node_modules/.bin" >> $GITHUB_PATH
+      shell: bash
+
     - name: Get Playwright Version
       if: inputs.playwright-enabled == 'true'
       shell: bash

.github/actions/init-blacksmith/action.yml

@@ -69,10 +69,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
@@ -117,11 +117,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
@@ -163,11 +163,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
@@ -237,10 +237,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: Run tests in packages
         run: |
@@ -273,8 +273,7 @@ jobs:
           retention-days: 5
 
   integration-tests:
-    # needs: [check-permissions, build-packages]
-    needs: [check-permissions]
+    needs: [check-permissions, build-packages]
     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) || '' }})
     permissions:
@@ -305,6 +304,7 @@ jobs:
             "nuxt",
             "react-router",
             "custom",
+            "hono",
           ]
         test-project: ["chrome"]
         include:
@@ -341,9 +341,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
@@ -379,47 +379,32 @@ jobs:
           echo "affected=${AFFECTED}"
           echo "affected=${AFFECTED}" >> $GITHUB_OUTPUT
 
-      - name: Version packages for snapshot
+      - name: Build packages
         if: ${{ steps.task-status.outputs.affected == '1' }}
-        run: npm run version-packages:snapshot ci
+        run: pnpm turbo build $TURBO_ARGS --only
 
-      - name: Verdaccio
+      - name: Publish to local registry
         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 pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
+        run: pkglab pub --force
 
       - name: Edit .npmrc [link-workspace-packages=false]
         run: sed -i -E 's/link-workspace-packages=(deep|true)/link-workspace-packages=false/' .npmrc
 
-      - name: Install @clerk/backend in /integration
-        if: ${{ steps.task-status.outputs.affected == '1' }}
-        working-directory: ./integration
-        run: |
-          pnpm init
-          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}}
         run: |
           mkdir clerk-js && cd clerk-js
           pnpm init
-          pnpm config set minimum-release-age-exclude @clerk/*
-          pnpm add @clerk/clerk-js
+          pkglab add @clerk/clerk-js
 
       - name: Install @clerk/ui in os temp
         if: ${{ steps.task-status.outputs.affected == '1' }}
         working-directory: ${{runner.temp}}
         run: |
           mkdir clerk-ui && cd clerk-ui
           pnpm init
-          pnpm config set minimum-release-age-exclude @clerk/*
-          pnpm add @clerk/ui
+          pkglab add @clerk/ui
 
       - name: Copy components @clerk/astro
         if: ${{ matrix.test-name == 'astro' }}
@@ -500,10 +485,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/actions/init/action.yml

@@ -27,15 +27,8 @@ jobs:
           turbo-token: ${{ secrets.TURBO_TOKEN }}
           playwright-enabled: true
 
-      - name: Verdaccio
-        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 pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag; fi
-
-      - name: Install @clerk/backend in /integration
-        working-directory: ./integration
-        run: pnpm init && pnpm add @clerk/backend
+      - name: Build packages
+        run: pnpm turbo build $TURBO_ARGS --only
 
       - name: Run cleanup
         run: pnpm test:integration:cleanup