From 972f6cbc027efbda968f4397f0ed6a20551b5d53 Mon Sep 17 00:00:00 2001 From: Alexandros Ntitoras Date: Tue, 19 Nov 2024 10:05:13 +0200 Subject: [PATCH 1/5] chore(clerk-expo-passkeys): import the correct buffer --- packages/expo-passkeys/src/utils.ts | 3 +-- packages/expo/package.json | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/expo-passkeys/src/utils.ts b/packages/expo-passkeys/src/utils.ts index 0a7bfb5cee2..c9dc88fe9e5 100644 --- a/packages/expo-passkeys/src/utils.ts +++ b/packages/expo-passkeys/src/utils.ts @@ -1,6 +1,5 @@ -import { Buffer } from 'node:buffer'; - import { ClerkWebAuthnError } from '@clerk/shared/error'; +import { Buffer } from 'buffer'; export { ClerkWebAuthnError }; export function encodeBase64(data: ArrayLike | ArrayBufferLike) { diff --git a/packages/expo/package.json b/packages/expo/package.json index 782ca86349d..79c5854d4a6 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -62,7 +62,6 @@ "dependencies": { "@clerk/clerk-js": "workspace:*", "@clerk/clerk-react": "workspace:*", - "@clerk/expo-passkeys": "workspace:*", "@clerk/shared": "workspace:*", "@clerk/types": "workspace:*", "base-64": "^1.0.0", @@ -71,6 +70,7 @@ }, "devDependencies": { "@clerk/eslint-config-custom": "workspace:*", + "@clerk/expo-passkeys": "workspace:*", "@types/base-64": "^1.0.2", "@types/node": "^20.11.24", "@types/react": "18.3.12", @@ -83,6 +83,7 @@ "typescript": "*" }, "peerDependencies": { + "@clerk/expo-passkeys": ">=0.0.6", "expo-auth-session": ">=5", "expo-local-authentication": ">=13.5.0", "expo-secure-store": ">=12.4.0", From d41dbc136596b016f899895ab70f231bd3799450 Mon Sep 17 00:00:00 2001 From: Alexandros Ntitoras Date: Tue, 19 Nov 2024 10:26:06 +0200 Subject: [PATCH 2/5] chore: Add changeset --- .changeset/fifty-cameras-tease.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/fifty-cameras-tease.md diff --git a/.changeset/fifty-cameras-tease.md b/.changeset/fifty-cameras-tease.md new file mode 100644 index 00000000000..b0c77f8f96f --- /dev/null +++ b/.changeset/fifty-cameras-tease.md @@ -0,0 +1,6 @@ +--- +'@clerk/expo-passkeys': patch +'@clerk/clerk-expo': patch +--- +- Replaced import { Buffer } from 'node:buffer' with import { Buffer } from 'buffer'. +- Moved @clerk/expo-passkeys to a devDependency in @clerk/clerk-expo. From ba9e0b98b15c66548dc3fd739132cca736bbd160 Mon Sep 17 00:00:00 2001 From: Alexandros Ntitoras Date: Tue, 19 Nov 2024 10:28:56 +0200 Subject: [PATCH 3/5] chore: Update pnpm-lock --- pnpm-lock.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e1799e9e378..210360bb9f2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -595,6 +595,9 @@ importers: '@clerk/eslint-config-custom': specifier: workspace:* version: link:../eslint-config-custom + '@clerk/expo-passkeys': + specifier: 0.0.6 + version: link:../expo-passkeys '@types/base-64': specifier: ^1.0.2 version: 1.0.2 From 8193da1451671b624cd617b43490e1cbe1a7f9dd Mon Sep 17 00:00:00 2001 From: Alexandros Ntitoras Date: Tue, 19 Nov 2024 19:05:55 +0200 Subject: [PATCH 4/5] chore: Adress PR comments --- packages/expo-passkeys/.eslintrc.js | 8 ++++++++ packages/expo/package.json | 3 +++ 2 files changed, 11 insertions(+) diff --git a/packages/expo-passkeys/.eslintrc.js b/packages/expo-passkeys/.eslintrc.js index 9c27d64800c..0aab09b0b25 100644 --- a/packages/expo-passkeys/.eslintrc.js +++ b/packages/expo-passkeys/.eslintrc.js @@ -4,4 +4,12 @@ module.exports = { settings: { 'import/ignore': ['node_modules/react-native/index\\.js$'], }, + rules: { + 'no-restricted-imports': [ + 'error', + { + patterns: ['node:*'], + }, + ], + }, }; diff --git a/packages/expo/package.json b/packages/expo/package.json index 79c5854d4a6..2456ad046fb 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -93,6 +93,9 @@ "react-native": ">=0.73" }, "peerDependenciesMeta": { + "@clerk/expo-passkeys": { + "optional": true + }, "expo-local-authentication": { "optional": true }, From bb7267f7eacb68c487a58f8b7db217553e5c9c72 Mon Sep 17 00:00:00 2001 From: Alexandros Ntitoras Date: Tue, 19 Nov 2024 19:13:11 +0200 Subject: [PATCH 5/5] chore: Update pnpm lock --- pnpm-lock.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 210360bb9f2..12722556667 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -567,9 +567,6 @@ importers: '@clerk/clerk-react': specifier: workspace:* version: link:../react - '@clerk/expo-passkeys': - specifier: workspace:* - version: link:../expo-passkeys '@clerk/shared': specifier: workspace:* version: link:../shared @@ -596,7 +593,7 @@ importers: specifier: workspace:* version: link:../eslint-config-custom '@clerk/expo-passkeys': - specifier: 0.0.6 + specifier: workspace:* version: link:../expo-passkeys '@types/base-64': specifier: ^1.0.2