Merge branch 'main' into mery/update-ui

clerk · Dec 20, 2024 · 8619dc7 · 8619dc7
2 parents fdf6e1c + 389133b
commit 8619dc7
Show file tree

Hide file tree

Showing 37 changed files with 294 additions and 539 deletions.
diff --git a/.changeset/friendly-trains-love.md b/.changeset/friendly-trains-love.md
@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Fix broken enterprise connection icon for custom SAML provider
diff --git a/.changeset/light-impalas-visit.md b/.changeset/light-impalas-visit.md
@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-expo': patch
+---
+
+Re-export the `isClerkRuntimeError()` utility function from `@clerk/clerk-react`.
diff --git a/.changeset/metal-tables-beg.md b/.changeset/metal-tables-beg.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/proud-terms-wave.md b/.changeset/proud-terms-wave.md
@@ -0,0 +1,5 @@
+---
+"@clerk/localizations": patch
+---
+
+Fix delete account action for `nb-NO` localization.
diff --git a/.changeset/shy-mangos-visit.md b/.changeset/shy-mangos-visit.md
@@ -0,0 +1,5 @@
+---
+"@clerk/nuxt": patch
+---
+
+Fix Vite optimization issue that caused duplicate versions of @clerk/vue to be created on first load, resulting in the Vue plugin losing context.
diff --git a/.changeset/ten-taxis-decide.md b/.changeset/ten-taxis-decide.md
@@ -0,0 +1,5 @@
+---
+"@clerk/clerk-js": patch
+---
+
+fix(clerk-js): Rethrow errors if not requires_captcha during init
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "@testing-library/user-event": "^14.5.2",
     "@types/cross-spawn": "^6.0.3",
     "@types/jest": "^29.3.1",
-    "@types/node": "^20.11.24",
+    "@types/node": "^20.17.10",
     "@types/react": "catalog:react",
     "@types/react-dom": "catalog:react",
     "@vitest/coverage-v8": "2.1.4",

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -88,9 +88,7 @@
     "nanostores": "0.11.3"
   },
   "devDependencies": {
-    "@clerk/eslint-config-custom": "workspace:*",
-    "react": "catalog:react",
-    "typescript": "catalog:repo"
+    "@clerk/eslint-config-custom": "workspace:*"
   },
   "peerDependencies": {
     "astro": "^4.15.0 || ^5.0.0"

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -102,11 +102,8 @@
     "@clerk/eslint-config-custom": "workspace:*",
     "@edge-runtime/vm": "4.0.4",
     "@types/cookie": "^0.6.0",
-    "@types/node": "^18.19.33",
     "msw": "2.6.4",
     "npm-run-all": "^4.1.5",
-    "tsup": "catalog:repo",
-    "typescript": "catalog:repo",
     "vitest-environment-miniflare": "2.14.4"
   },
   "engines": {

diff --git a/packages/chrome-extension/package.json b/packages/chrome-extension/package.json
@@ -55,13 +55,8 @@
   "devDependencies": {
     "@clerk/eslint-config-custom": "workspace:*",
     "@types/chrome": "*",
-    "@types/node": "^18.19.33",
-    "@types/react": "catalog:react",
-    "@types/react-dom": "catalog:react",
     "@types/webextension-polyfill": "^0.10.7",
-    "tsup": "catalog:repo",
-    "type-fest": "^4.8.3",
-    "typescript": "catalog:repo"
+    "type-fest": "^4.8.3"
   },
   "peerDependencies": {
     "react": "catalog:peer-react",

diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json
@@ -81,15 +81,12 @@
     "@rspack/core": "^1.0.14",
     "@rspack/plugin-react-refresh": "^1.0.0",
     "@svgr/webpack": "^6.2.1",
-    "@types/react": "catalog:react",
-    "@types/react-dom": "catalog:react",
     "@types/webpack-dev-server": "^4.7.2",
     "@types/webpack-env": "^1.16.4",
     "react-refresh": "^0.14.0",
     "react-refresh-typescript": "^2.0.5",
     "terser-webpack-plugin": "^5.3.10",
     "ts-loader": "^9.3.0",
-    "typescript": "catalog:repo",
     "webpack-merge": "^5.9.0"
   },
   "peerDependencies": {

diff --git a/packages/clerk-js/src/core/clerk.ts b/packages/clerk-js/src/core/clerk.ts
@@ -1898,6 +1898,8 @@ export class Clerk implements ClerkInterface {
             await initEnvironmentPromise;
             initComponents();
             await initClient();
+          } else {
+            throw e;
           }
         });
 

diff --git a/packages/clerk-js/src/ui/components/UserProfile/EnterpriseAccountsSection.tsx b/packages/clerk-js/src/ui/components/UserProfile/EnterpriseAccountsSection.tsx
@@ -1,4 +1,3 @@
-import { iconImageUrl } from '@clerk/shared/constants';
 import { useUser } from '@clerk/shared/react';
 import type { EnterpriseAccountResource, OAuthProvider } from '@clerk/types';
 
@@ -83,7 +82,6 @@ const EnterpriseAccount = ({ account }: { account: EnterpriseAccountResource })
 const EnterpriseAccountProviderIcon = ({ account }: { account: EnterpriseAccountResource }) => {
   const { provider, enterpriseConnection } = account;
 
-  const isCustomOAuthProvider = provider.startsWith('oauth_custom_');
   const providerWithoutPrefix = provider.replace(/(oauth_|saml_)/, '').trim() as OAuthProvider;
   const connectionName = enterpriseConnection?.name ?? providerWithoutPrefix;
 
@@ -94,15 +92,6 @@ const EnterpriseAccountProviderIcon = ({ account }: { account: EnterpriseAccount
     elementId: descriptors.enterpriseButtonsProviderIcon.setId(account.provider),
   };
 
-  if (!isCustomOAuthProvider) {
-    return (
-      <Image
-        {...commonImageProps}
-        src={iconImageUrl(providerWithoutPrefix)}
-      />
-    );
-  }
-
   return enterpriseConnection?.logoPublicUrl ? (
     <Image
       {...commonImageProps}

diff --git a/packages/dev-cli/package.json b/packages/dev-cli/package.json
@@ -29,9 +29,7 @@
     "jscodeshift": "^0.16.1"
   },
   "devDependencies": {
-    "@clerk/eslint-config-custom": "workspace:*",
-    "@types/node": "^20.14.8",
-    "typescript": "catalog:repo"
+    "@clerk/eslint-config-custom": "workspace:*"
   },
   "engines": {
     "node": ">=18.17.0"

diff --git a/packages/elements/package.json b/packages/elements/package.json
@@ -79,20 +79,15 @@
     "@radix-ui/react-slot": "^1.1.0",
     "@xstate/react": "^4.1.1",
     "client-only": "^0.0.1",
+    "tslib": "catalog:repo",
     "xstate": "^5.15.0"
   },
   "devDependencies": {
     "@clerk/eslint-config-custom": "workspace:*",
     "@statelyai/inspect": "^0.4.0",
-    "@types/node": "^18.19.33",
-    "@types/react": "catalog:react",
-    "@types/react-dom": "catalog:react",
     "concurrently": "^8.2.2",
     "next": "^14.2.18",
-    "tslib": "catalog:repo",
-    "tsup": "catalog:repo",
-    "type-fest": "^4.29.0",
-    "typescript": "catalog:repo"
+    "type-fest": "^4.29.0"
   },
   "peerDependencies": {
     "next": "^13.5.4 || ^14.0.3 || ^15",

diff --git a/packages/expo-passkeys/package.json b/packages/expo-passkeys/package.json
@@ -35,10 +35,9 @@
     "@clerk/types": "workspace:^",
     "expo-modules-core": "1.12.26"
   },
-  "devDependencies": {},
   "peerDependencies": {
     "expo": "*",
-    "react": "*",
+    "react": "catalog:peer-react",
     "react-native": "*"
   }
 }
diff --git a/packages/expo/package.json b/packages/expo/package.json
@@ -78,24 +78,20 @@
     "@clerk/eslint-config-custom": "workspace:*",
     "@clerk/expo-passkeys": "workspace:*",
     "@types/base-64": "^1.0.2",
-    "@types/node": "^20.11.24",
-    "@types/react": "catalog:react",
-    "@types/react-dom": "catalog:react",
     "expo-auth-session": "^5.4.0",
     "expo-local-authentication": "^13.8.0",
     "expo-secure-store": "^12.8.1",
     "expo-web-browser": "^12.8.2",
-    "react-native": "^0.73.9",
-    "typescript": "catalog:repo"
+    "react-native": "^0.73.9"
   },
   "peerDependencies": {
     "@clerk/expo-passkeys": ">=0.0.6",
     "expo-auth-session": ">=5",
     "expo-local-authentication": ">=13.5.0",
     "expo-secure-store": ">=12.4.0",
     "expo-web-browser": ">=12.5.0",
-    "react": ">=18",
-    "react-dom": ">=18",
+    "react": "catalog:peer-react",
+    "react-dom": "catalog:peer-react",
     "react-native": ">=0.73"
   },
   "peerDependenciesMeta": {

diff --git a/packages/expo/src/index.ts b/packages/expo/src/index.ts
@@ -1,6 +1,12 @@
 import { setErrorThrowerOptions } from '@clerk/clerk-react/internal';
 
-export { isClerkAPIResponseError, isEmailLinkError, isKnownError, isMetamaskError } from '@clerk/clerk-react/errors';
+export {
+  isClerkAPIResponseError,
+  isEmailLinkError,
+  isKnownError,
+  isMetamaskError,
+  isClerkRuntimeError,
+} from '@clerk/clerk-react/errors';
 
 /**
  * @deprecated Use `getClerkInstance()` instead.

diff --git a/packages/express/package.json b/packages/express/package.json
@@ -62,12 +62,9 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
-    "@types/node": "^18.19.33",
     "@types/supertest": "^6.0.2",
     "express": "^4.20.0",
-    "supertest": "^6.3.4",
-    "tsup": "catalog:repo",
-    "typescript": "catalog:repo"
+    "supertest": "^6.3.4"
   },
   "peerDependencies": {
     "express": "^4.17.0 || ^5.0.0"

diff --git a/packages/fastify/package.json b/packages/fastify/package.json
@@ -48,10 +48,7 @@
   },
   "devDependencies": {
     "@clerk/eslint-config-custom": "workspace:*",
-    "@types/node": "^20.14.8",
-    "fastify": "^5.0.0",
-    "tsup": "catalog:repo",
-    "typescript": "catalog:repo"
+    "fastify": "^5.0.0"
   },
   "peerDependencies": {
     "fastify": ">=5"

diff --git a/packages/localizations/package.json b/packages/localizations/package.json
@@ -105,9 +105,7 @@
     "@clerk/types": "workspace:^"
   },
   "devDependencies": {
-    "@clerk/eslint-config-custom": "workspace:*",
-    "tsup": "catalog:repo",
-    "typescript": "catalog:repo"
+    "@clerk/eslint-config-custom": "workspace:*"
   },
   "engines": {
     "node": ">=18.17.0"

diff --git a/packages/localizations/src/nb-NO.ts b/packages/localizations/src/nb-NO.ts
@@ -52,7 +52,7 @@ export const nbNO: LocalizationResource = {
   formFieldHintText__optional: 'Valgfritt',
   formFieldHintText__slug: 'En slug er en menneskelesbar ID som må være unik. Den brukes ofte i URL-er.',
   formFieldInputPlaceholder__backupCode: undefined,
-  formFieldInputPlaceholder__confirmDeletionUserAccount: 'Slett bruker',
+  formFieldInputPlaceholder__confirmDeletionUserAccount: 'Slett konto',
   formFieldInputPlaceholder__emailAddress: undefined,
   formFieldInputPlaceholder__emailAddress_username: undefined,
   formFieldInputPlaceholder__emailAddresses:
@@ -675,7 +675,7 @@ export const nbNO: LocalizationResource = {
       title: 'Legg til tilknyttet konto',
     },
     deletePage: {
-      actionDescription: 'Skriv inn "Delete account" under for å fortsette.',
+      actionDescription: 'Skriv inn "Slett konto" under for å fortsette.',
       confirm: 'Slett konto',
       messageLine1: 'Er du sikker på at du vil slette kontoen din?',
       messageLine2: 'Denne handlingen er permanent og kan ikke reverseres.',

diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
@@ -76,9 +76,7 @@
   "devDependencies": {
     "@clerk/eslint-config-custom": "workspace:*",
     "@types/crypto-js": "4.2.2",
-    "@types/node": "^18.19.33",
-    "next": "^14.2.20",
-    "typescript": "catalog:repo"
+    "next": "^14.2.20"
   },
   "peerDependencies": {
     "next": "^13.5.4 || ^14.0.3 || ^15.0.0",

diff --git a/packages/nuxt/src/module.ts b/packages/nuxt/src/module.ts
@@ -79,6 +79,11 @@ export default defineNuxtModule<ModuleOptions>({
     // Handle Nuxt-specific imports (e.g #imports)
     nuxt.options.build.transpile.push(resolver.resolve('./runtime'));
 
+    // Optimize @clerk/vue to avoid missing injection Symbol key errors
+    nuxt.options.vite.optimizeDeps = nuxt.options.vite.optimizeDeps || {};
+    nuxt.options.vite.optimizeDeps.include = nuxt.options.vite.optimizeDeps.include || [];
+    nuxt.options.vite.optimizeDeps.include.push('@clerk/vue');
+
     // Add the `@clerk/vue` plugin
     addPlugin(resolver.resolve('./runtime/plugin'));
 

diff --git a/packages/react-router/package.json b/packages/react-router/package.json
@@ -82,12 +82,8 @@
   "devDependencies": {
     "@clerk/eslint-config-custom": "workspace:*",
     "@types/cookie": "^0.6.0",
-    "@types/node": "^18.19.33",
-    "@types/react": "catalog:react",
-    "@types/react-dom": "catalog:react",
     "esbuild-plugin-file-path-extensions": "^2.1.3",
-    "react-router": "7.0.2",
-    "typescript": "catalog:repo"
+    "react-router": "7.0.2"
   },
   "peerDependencies": {
     "react": "catalog:peer-react",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -82,9 +82,7 @@
     "@clerk/eslint-config-custom": "workspace:*",
     "@clerk/localizations": "workspace:*",
     "@clerk/themes": "workspace:*",
-    "@types/node": "^18.19.33",
-    "@types/semver": "^7.5.8",
-    "typescript": "catalog:repo"
+    "@types/semver": "^7.5.8"
   },
   "peerDependencies": {
     "react": "catalog:peer-react",

diff --git a/packages/remix/package.json b/packages/remix/package.json
@@ -84,11 +84,7 @@
     "@clerk/eslint-config-custom": "workspace:*",
     "@remix-run/react": "^2.0.0",
     "@remix-run/server-runtime": "^2.0.0",
-    "@types/cookie": "^0.6.0",
-    "@types/node": "^18.19.33",
-    "@types/react": "catalog:react",
-    "@types/react-dom": "catalog:react",
-    "typescript": "catalog:repo"
+    "@types/cookie": "^0.6.0"
   },
   "peerDependencies": {
     "@remix-run/react": "^2.0.0",

diff --git a/packages/sdk-node/package.json b/packages/sdk-node/package.json
@@ -61,11 +61,8 @@
   "devDependencies": {
     "@clerk/eslint-config-custom": "workspace:*",
     "@types/express": "^4.17.21",
-    "@types/node": "^18.19.33",
     "nock": "^13.0.7",
-    "npm-run-all": "^4.1.5",
-    "tsup": "catalog:repo",
-    "typescript": "catalog:repo"
+    "npm-run-all": "^4.1.5"
   },
   "engines": {
     "node": ">=18.17.0"

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -144,11 +144,8 @@
     "@clerk/eslint-config-custom": "workspace:*",
     "@types/glob-to-regexp": "0.4.4",
     "@types/js-cookie": "3.0.6",
-    "@types/node": "^18.19.33",
     "cross-fetch": "^4.0.0",
-    "esbuild": "0.20.2",
-    "tsup": "catalog:repo",
-    "typescript": "catalog:repo"
+    "esbuild": "0.20.2"
   },
   "peerDependencies": {
     "react": "catalog:peer-react",

diff --git a/packages/tanstack-start/package.json b/packages/tanstack-start/package.json
@@ -69,11 +69,7 @@
     "@clerk/eslint-config-custom": "workspace:*",
     "@tanstack/react-router": "^1.81.9",
     "@tanstack/start": "^1.81.9",
-    "@types/node": "^18.19.43",
-    "@types/react": "catalog:react",
-    "@types/react-dom": "catalog:react",
     "esbuild-plugin-file-path-extensions": "^2.1.2",
-    "typescript": "catalog:repo",
     "vinxi": "^0.4.1"
   },
   "peerDependencies": {

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -70,10 +70,7 @@
   "devDependencies": {
     "@clerk/eslint-config-custom": "workspace:*",
     "@playwright/test": "^1.44.0",
-    "@types/node": "^18.19.33",
-    "cypress": "^13.9.0",
-    "tsup": "catalog:repo",
-    "typescript": "catalog:repo"
+    "cypress": "^13.9.0"
   },
   "peerDependencies": {
     "@playwright/test": "^1",

diff --git a/packages/themes/package.json b/packages/themes/package.json
@@ -41,8 +41,7 @@
     "tslib": "catalog:repo"
   },
   "devDependencies": {
-    "@clerk/eslint-config-custom": "workspace:*",
-    "typescript": "catalog:repo"
+    "@clerk/eslint-config-custom": "workspace:*"
   },
   "engines": {
     "node": ">=18.17.0"