Merge branch 'main' into lekoarts/eco-247-bootstrap-new-package

clerk · Nov 25, 2024 · 94e4944 · 94e4944
2 parents ef306a6 + c7f509e
commit 94e4944
Show file tree

Hide file tree

Showing 289 changed files with 11,904 additions and 3,778 deletions.
diff --git a/.changeset/few-files-switch.md b/.changeset/few-files-switch.md
diff --git a/.changeset/fifty-cameras-tease.md b/.changeset/fifty-cameras-tease.md
diff --git a/.changeset/friendly-mice-pull.md b/.changeset/friendly-mice-pull.md
diff --git a/.changeset/itchy-cycles-sell.md b/.changeset/itchy-cycles-sell.md
diff --git a/.changeset/large-bulldogs-tap.md b/.changeset/large-bulldogs-tap.md
diff --git a/.changeset/mighty-clouds-explode.md b/.changeset/mighty-clouds-explode.md
diff --git a/.changeset/orange-radios-nail.md b/.changeset/orange-radios-nail.md
diff --git a/.changeset/polite-seals-bake.md b/.changeset/polite-seals-bake.md
diff --git a/.changeset/proud-carrots-carry.md b/.changeset/proud-carrots-carry.md
diff --git a/.changeset/proud-poems-walk.md b/.changeset/proud-poems-walk.md
diff --git a/.changeset/red-chicken-visit.md b/.changeset/red-chicken-visit.md
diff --git a/.changeset/rude-lions-know.md b/.changeset/rude-lions-know.md
diff --git a/.changeset/shaggy-donuts-cry.md b/.changeset/shaggy-donuts-cry.md
diff --git a/.changeset/shy-months-invite.md b/.changeset/shy-months-invite.md
diff --git a/.changeset/silent-bears-worry.md b/.changeset/silent-bears-worry.md
diff --git a/.changeset/small-knives-behave.md b/.changeset/small-knives-behave.md
diff --git a/.changeset/ten-hornets-deny.md b/.changeset/ten-hornets-deny.md
diff --git a/.changeset/ten-jeans-double.md b/.changeset/ten-jeans-double.md
diff --git a/.changeset/thin-turkeys-turn.md b/.changeset/thin-turkeys-turn.md
diff --git a/.changeset/unlucky-teachers-joke.md b/.changeset/unlucky-teachers-joke.md
diff --git a/.changeset/wet-dryers-pay.md b/.changeset/wet-dryers-pay.md
diff --git a/.github/actions/init-blacksmith/action.yml b/.github/actions/init-blacksmith/action.yml
@@ -114,6 +114,8 @@ runs:
         registry-url: ${{ inputs.registry-url }}
 
     - name: Install PNPM Dependencies
+      env:
+        CYPRESS_INSTALL_BINARY: 0
       run: pnpm install
       shell: bash
 

diff --git a/.github/actions/init/action.yml b/.github/actions/init/action.yml
@@ -114,7 +114,9 @@ runs:
         registry-url: ${{ inputs.registry-url }}
 
     - name: Install PNPM Dependencies
-      run: pnpm install 
+      env:
+        CYPRESS_INSTALL_BINARY: 0
+      run: pnpm install
       shell: bash
 
     - name: Get Playwright Version

diff --git a/...emplates/next-app-router/src/app/(reverification)/action-with-use-reverification/page.tsx b/...emplates/next-app-router/src/app/(reverification)/action-with-use-reverification/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 import { useState, useTransition } from 'react';
-import { __experimental_useReverification as useReverification } from '@clerk/nextjs';
+import { useReverification } from '@clerk/nextjs';
 import { logUserIdActionReverification } from '@/app/(reverification)/actions';
 
 function Page() {

diff --git a/integration/templates/next-app-router/src/app/(reverification)/actions.ts b/integration/templates/next-app-router/src/app/(reverification)/actions.ts
@@ -1,19 +1,17 @@
 'use server';
 
-import { auth } from '@clerk/nextjs/server';
-import { __experimental_reverificationError as reverificationError } from '@clerk/shared/authorization-errors';
-import { __experimental_ReverificationConfig } from '@clerk/types';
-
+import { auth, reverificationError } from '@clerk/nextjs/server';
+import { ReverificationConfig } from '@clerk/types';
 const logUserIdActionReverification = async () => {
   const { userId, has } = await auth.protect();
 
   const config = {
     level: 'second_factor',
     afterMinutes: 1,
-  } satisfies __experimental_ReverificationConfig;
+  } satisfies ReverificationConfig;
 
   const userNeedsReverification = !has({
-    __experimental_reverification: config,
+    reverification: config,
   });
 
   if (userNeedsReverification) {

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "version-packages": "changeset version && pnpm install --lockfile-only --engine-strict=false",
     "version-packages:canary": "./scripts/canary.mjs",
     "version-packages:snapshot": "./scripts/snapshot.mjs",
-    "yalc:all": "for d in packages/*/; do echo $d; cd $d; pnpm dlx yalc push --replace --sig; cd '../../'; done"
+    "yalc:all": "for d in packages/*/; do echo $d; cd $d; pnpm yalc push --replace --sig; cd '../../'; done"
   },
   "devDependencies": {
     "@actions/core": "^1.10.1",
@@ -106,6 +106,7 @@
     "typescript": "catalog:repo",
     "verdaccio": "^5.26.3",
     "vitest": "2.1.4",
+    "yalc": "1.0.0-pre.53",
     "zx": "^7.2.3"
   },
   "packageManager": "pnpm@9.13.0+sha512.beb9e2a803db336c10c9af682b58ad7181ca0fbd0d4119f2b33d5f2582e96d6c0d93c85b23869295b765170fbdaa92890c0da6ada457415039769edf3c959efe",
@@ -117,6 +118,9 @@
     "overrides": {
       "jest": "29.7.0",
       "jest-snapshot-prettier": "npm:prettier@^3"
+    },
+    "patchedDependencies": {
+      "yalc@1.0.0-pre.53": "patches/yalc@1.0.0-pre.53.patch"
     }
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @clerk/astro
 
+## 1.4.17
+
+### Patch Changes
+
+- Ignore pre-rendered files in Clerk Middleware ([#4640](https://github.com/clerk/javascript/pull/4640)) by [@jlengstorf](https://github.com/jlengstorf)
+
+## 1.4.16
+
+### Patch Changes
+
+- Updated dependencies [[`fe9e147e366153d664af7fc325655ecb299a1f9d`](https://github.com/clerk/javascript/commit/fe9e147e366153d664af7fc325655ecb299a1f9d), [`fe9e147e366153d664af7fc325655ecb299a1f9d`](https://github.com/clerk/javascript/commit/fe9e147e366153d664af7fc325655ecb299a1f9d), [`d84d7e31235c5c7da3415981dc76db4473a71a39`](https://github.com/clerk/javascript/commit/d84d7e31235c5c7da3415981dc76db4473a71a39), [`fe9e147e366153d664af7fc325655ecb299a1f9d`](https://github.com/clerk/javascript/commit/fe9e147e366153d664af7fc325655ecb299a1f9d), [`dce4f7ffca7248c0500f0ec9a978672b1f2fad69`](https://github.com/clerk/javascript/commit/dce4f7ffca7248c0500f0ec9a978672b1f2fad69)]:
+  - @clerk/shared@2.17.0
+  - @clerk/types@4.35.0
+  - @clerk/backend@1.18.0
+
+## 1.4.15
+
+### Patch Changes
+
+- Updated dependencies [[`c70994b5b6f92a6550dfe37547f01bbfa810c223`](https://github.com/clerk/javascript/commit/c70994b5b6f92a6550dfe37547f01bbfa810c223), [`7623a99594e7329200b6b374e483152d7679ce66`](https://github.com/clerk/javascript/commit/7623a99594e7329200b6b374e483152d7679ce66)]:
+  - @clerk/types@4.34.2
+  - @clerk/backend@1.17.2
+  - @clerk/shared@2.16.1
+
+## 1.4.14
+
+### Patch Changes
+
+- Updated dependencies [[`e47eb5882a7fd4a8dee25933c6644790d6ea3407`](https://github.com/clerk/javascript/commit/e47eb5882a7fd4a8dee25933c6644790d6ea3407), [`273d16cb0665d4d960838cb294dc356f41814745`](https://github.com/clerk/javascript/commit/273d16cb0665d4d960838cb294dc356f41814745), [`6b0961765e1f3d09679be4b163fa13ac7dd97191`](https://github.com/clerk/javascript/commit/6b0961765e1f3d09679be4b163fa13ac7dd97191)]:
+  - @clerk/shared@2.16.0
+  - @clerk/types@4.34.1
+  - @clerk/backend@1.17.1
+
 ## 1.4.13
 
 ### Patch Changes

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/astro",
-  "version": "1.4.13",
+  "version": "1.4.17",
   "description": "Clerk SDK for Astro",
   "keywords": [
     "auth",
@@ -78,7 +78,7 @@
     "lint": "eslint src/",
     "lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm internal-resolution-error",
     "lint:publint": "pnpm copy:components && publint",
-    "publish:local": "pnpm dlx yalc push --replace --sig"
+    "publish:local": "pnpm yalc push --replace --sig"
   },
   "dependencies": {
     "@clerk/backend": "workspace:*",

diff --git a/packages/astro/src/server/clerk-middleware.ts b/packages/astro/src/server/clerk-middleware.ts
@@ -61,6 +61,11 @@ export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]): any => {
   const [handler, options] = parseHandlerAndOptions(args);
 
   const astroMiddleware: AstroMiddleware = async (context, next) => {
+    // if the current page is prerendered, do nothing
+    if ('isPrerendered' in context && context.isPrerendered) {
+      return next();
+    }
+
     const clerkRequest = createClerkRequest(context.request);
 
     clerkClient(context).telemetry.record(

diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Change Log
 
+## 1.18.0
+
+### Minor Changes
+
+- Update AuthObject property from `__experimental_factorVerificationAge` to `factorVerificationAge`. ([#4536](https://github.com/clerk/javascript/pull/4536)) by [@panteliselef](https://github.com/panteliselef)
+
+  Also replaces the following APIs:
+
+  - `__experimental_reverificationError` -> `__reverificationError`
+  - `__experimental_reverificationErrorResponse` -> `reverificationErrorResponse`
+
+### Patch Changes
+
+- Updated dependencies [[`fe9e147e366153d664af7fc325655ecb299a1f9d`](https://github.com/clerk/javascript/commit/fe9e147e366153d664af7fc325655ecb299a1f9d), [`fe9e147e366153d664af7fc325655ecb299a1f9d`](https://github.com/clerk/javascript/commit/fe9e147e366153d664af7fc325655ecb299a1f9d), [`d84d7e31235c5c7da3415981dc76db4473a71a39`](https://github.com/clerk/javascript/commit/d84d7e31235c5c7da3415981dc76db4473a71a39), [`dce4f7ffca7248c0500f0ec9a978672b1f2fad69`](https://github.com/clerk/javascript/commit/dce4f7ffca7248c0500f0ec9a978672b1f2fad69)]:
+  - @clerk/shared@2.17.0
+  - @clerk/types@4.35.0
+
+## 1.17.2
+
+### Patch Changes
+
+- Updated dependencies [[`c70994b5b6f92a6550dfe37547f01bbfa810c223`](https://github.com/clerk/javascript/commit/c70994b5b6f92a6550dfe37547f01bbfa810c223), [`7623a99594e7329200b6b374e483152d7679ce66`](https://github.com/clerk/javascript/commit/7623a99594e7329200b6b374e483152d7679ce66)]:
+  - @clerk/types@4.34.2
+  - @clerk/shared@2.16.1
+
+## 1.17.1
+
+### Patch Changes
+
+- Updated dependencies [[`e47eb5882a7fd4a8dee25933c6644790d6ea3407`](https://github.com/clerk/javascript/commit/e47eb5882a7fd4a8dee25933c6644790d6ea3407), [`273d16cb0665d4d960838cb294dc356f41814745`](https://github.com/clerk/javascript/commit/273d16cb0665d4d960838cb294dc356f41814745), [`6b0961765e1f3d09679be4b163fa13ac7dd97191`](https://github.com/clerk/javascript/commit/6b0961765e1f3d09679be4b163fa13ac7dd97191)]:
+  - @clerk/shared@2.16.0
+  - @clerk/types@4.34.1
+
 ## 1.17.0
 
 ### Minor Changes

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/backend",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "Clerk Backend SDK - REST Client for Backend API & JWT verification utilities",
   "homepage": "https://clerk.com/",
   "bugs": {
@@ -79,7 +79,7 @@
     "build:declarations": "tsc -p tsconfig.declarations.json",
     "dev": "tsup --watch",
     "dev:publish": "pnpm dev -- --env.publish",
-    "publish:local": "pnpm dlx yalc push --replace --sig",
+    "publish:local": "pnpm yalc push --replace --sig",
     "build:lib": "tsup --env.NODE_ENV production",
     "build:runtime": "cpy 'src/runtime/**/*.{mjs,js,cjs}' dist/runtime",
     "clean": "rimraf ./dist",

diff --git a/packages/backend/src/__tests__/exports.test.ts b/packages/backend/src/__tests__/exports.test.ts
@@ -37,15 +37,15 @@ describe('subpath /internal exports', () => {
     expect(Object.keys(internalExports).sort()).toMatchInlineSnapshot(`
       [
         "AuthStatus",
-        "__experimental_reverificationError",
-        "__experimental_reverificationErrorResponse",
         "constants",
         "createAuthenticateRequest",
         "createClerkRequest",
         "createRedirect",
         "debugRequestState",
         "decorateObjectWithResources",
         "makeAuthObjectSerializable",
+        "reverificationError",
+        "reverificationErrorResponse",
         "signedInAuthObject",
         "signedOutAuthObject",
         "stripPrivateDataFromObject",

diff --git a/packages/backend/src/internal.ts b/packages/backend/src/internal.ts
@@ -20,7 +20,4 @@ export { decorateObjectWithResources, stripPrivateDataFromObject } from './util/
 export { createClerkRequest } from './tokens/clerkRequest';
 export type { ClerkRequest } from './tokens/clerkRequest';
 
-export {
-  __experimental_reverificationError,
-  __experimental_reverificationErrorResponse,
-} from '@clerk/shared/authorization-errors';
+export { reverificationError, reverificationErrorResponse } from '@clerk/shared/authorization-errors';
diff --git a/packages/backend/src/tokens/authObjects.ts b/packages/backend/src/tokens/authObjects.ts
@@ -39,9 +39,8 @@ export type SignedInAuthObject = {
    * Factor Verification Age
    * Each item represents the minutes that have passed since the last time a first or second factor were verified.
    * [fistFactorAge, secondFactorAge]
-   * @experimental This API is experimental and may change at any moment.
    */
-  __experimental_factorVerificationAge: [number, number] | null;
+  factorVerificationAge: [number, number] | null;
   getToken: ServerGetToken;
   has: CheckAuthorizationWithCustomPermissions;
   debug: AuthObjectDebug;
@@ -63,9 +62,8 @@ export type SignedOutAuthObject = {
    * Factor Verification Age
    * Each item represents the minutes that have passed since the last time a first or second factor were verified.
    * [fistFactorAge, secondFactorAge]
-   * @experimental This API is experimental and may change at any moment.
    */
-  __experimental_factorVerificationAge: null;
+  factorVerificationAge: null;
   getToken: ServerGetToken;
   has: CheckAuthorizationWithCustomPermissions;
   debug: AuthObjectDebug;
@@ -111,7 +109,7 @@ export function signedInAuthObject(
   });
 
   // fva can be undefined for instances that have not opt-in
-  const __experimental_factorVerificationAge = fva ?? null;
+  const factorVerificationAge = fva ?? null;
 
   return {
     actor,
@@ -122,9 +120,9 @@ export function signedInAuthObject(
     orgRole,
     orgSlug,
     orgPermissions,
-    __experimental_factorVerificationAge,
+    factorVerificationAge,
     getToken,
-    has: createCheckAuthorization({ orgId, orgRole, orgPermissions, userId, __experimental_factorVerificationAge }),
+    has: createCheckAuthorization({ orgId, orgRole, orgPermissions, userId, factorVerificationAge }),
     debug: createDebug({ ...authenticateContext, sessionToken }),
   };
 }
@@ -142,7 +140,7 @@ export function signedOutAuthObject(debugData?: AuthObjectDebugData): SignedOutA
     orgRole: null,
     orgSlug: null,
     orgPermissions: null,
-    __experimental_factorVerificationAge: null,
+    factorVerificationAge: null,
     getToken: () => Promise.resolve(null),
     has: () => false,
     debug: createDebug(debugData),