From 30a4d421e84990b9622852a6afc7f111baf20968 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Mon, 6 May 2024 12:07:29 -0400 Subject: [PATCH 1/3] feat(clerk-expo): Remove headers - this reverts #2528 --- package-lock.json | 2 -- packages/expo/package.json | 2 -- packages/expo/src/singleton.ts | 9 --------- 3 files changed, 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2814bdbea5b..91e133f26d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38887,9 +38887,7 @@ "node": ">=18.17.0" }, "peerDependencies": { - "expo-application": ">=5", "expo-auth-session": ">=4", - "expo-constants": ">=14", "expo-web-browser": ">=12.5.0", "react": ">=18", "react-dom": ">=18" diff --git a/packages/expo/package.json b/packages/expo/package.json index 80ef86d191c..5e28260f34f 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -60,9 +60,7 @@ "typescript": "*" }, "peerDependencies": { - "expo-application": ">=5", "expo-auth-session": ">=4", - "expo-constants": ">=14", "expo-web-browser": ">=12.5.0", "react": ">=18", "react-dom": ">=18" diff --git a/packages/expo/src/singleton.ts b/packages/expo/src/singleton.ts index 63604cfba3f..996e2fee415 100644 --- a/packages/expo/src/singleton.ts +++ b/packages/expo/src/singleton.ts @@ -1,8 +1,6 @@ import type { FapiRequestInit, FapiResponse } from '@clerk/clerk-js/dist/types/core/fapiClient'; import { Clerk } from '@clerk/clerk-js/headless'; import type { HeadlessBrowserClerk } from '@clerk/clerk-react'; -import * as Application from 'expo-application'; -import Constants from 'expo-constants'; import type { TokenCache } from './cache'; @@ -43,13 +41,6 @@ export function buildClerk({ key, tokenCache }: BuildClerkOptions): HeadlessBrow const jwt = await getToken(KEY); (requestInit.headers as Headers).set('authorization', jwt || ''); - - // Send some non-identifying headers that are useful for logging - (requestInit.headers as Headers).set('x-expo-execution-environment', Constants.executionEnvironment); - (requestInit.headers as Headers).set( - 'x-expo-native-application-version', - Application.nativeApplicationVersion || 'NULL', - ); }); // @ts-expect-error From e392c80ae65cafa233b41f02db7cefc7f141f0b3 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Mon, 6 May 2024 12:11:46 -0400 Subject: [PATCH 2/3] chore(clerk-expo): Changeset --- .changeset/sweet-beds-pump.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/sweet-beds-pump.md diff --git a/.changeset/sweet-beds-pump.md b/.changeset/sweet-beds-pump.md new file mode 100644 index 00000000000..b378fb21352 --- /dev/null +++ b/.changeset/sweet-beds-pump.md @@ -0,0 +1,7 @@ +--- +'@clerk/clerk-expo': minor +--- + +Remove headers that were added in #2528 + +Remove `expo-application` & `expo-constants` peer deps From 05e82b497e9a8e98043ea64acb16da8a7892abf0 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Fri, 10 May 2024 14:45:17 -0400 Subject: [PATCH 3/3] chore(clerk-expo): Remove dev deps and update changset --- .changeset/sweet-beds-pump.md | 11 +++++++++-- packages/expo/package.json | 2 -- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.changeset/sweet-beds-pump.md b/.changeset/sweet-beds-pump.md index b378fb21352..eeb928488e2 100644 --- a/.changeset/sweet-beds-pump.md +++ b/.changeset/sweet-beds-pump.md @@ -2,6 +2,13 @@ '@clerk/clerk-expo': minor --- -Remove headers that were added in #2528 +This removes headers that were added for internal observability purposes. (see #2528) -Remove `expo-application` & `expo-constants` peer deps +```diff +- x-expo-execution-environment +- x-expo-native-application-version +``` + +This aims to resolve reported CORS errors. (see #2266) + +This removes `expo-application` & `expo-constants` as peer and development dependencies. diff --git a/packages/expo/package.json b/packages/expo/package.json index 5e28260f34f..60bdf395be3 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -53,9 +53,7 @@ "@types/node": "^20.11.24", "@types/react": "*", "@types/react-dom": "*", - "expo-application": "^4.2.2", "expo-auth-session": "^5.4.0", - "expo-constants": "^14.5.1", "expo-web-browser": "^12.8.2", "typescript": "*" },