Skip to content

Commit 8dd52c4

Browse files
joshuascanjoshuascan
authored
Merge branch 'master' into rjwebb/669-fix-node16-magic-ext-imports
2 parents c1bf17e + 7432597 commit 8dd52c4

File tree

8 files changed

+89
-44
lines changed

8 files changed

+89
-44
lines changed

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# (Tue Nov 21 2023)
2+
3+
#### 💥 Breaking Change
4+
5+
- `@magic-ext/[email protected]`, `@magic-ext/[email protected]`
6+
- Revert "Rename: ready -> checkIsReadyForRequest and isReady -> isReadyForRequest" [#668](https://github.com/magiclabs/magic-js/pull/668) ([@romin-halltari](https://github.com/romin-halltari))
7+
8+
#### Authors: 1
9+
10+
- [@romin-halltari](https://github.com/romin-halltari)
11+
12+
---
13+
114
# (Mon Nov 20 2023)
215

316
#### 🚀 Enhancement

‎packages/@magic-ext/react-native-bare-oauth/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# v18.0.0 (Tue Nov 21 2023)
2+
3+
#### 💥 Breaking Change
4+
5+
- Revert "Rename: ready -> checkIsReadyForRequest and isReady -> isReadyForRequest" [#668](https://github.com/magiclabs/magic-js/pull/668) ([@romin-halltari](https://github.com/romin-halltari))
6+
7+
#### 🐛 Bug Fix
8+
9+
- Revert "Rename: ready -> checkIsReadyForRequest and isReady -> isReadyForRequest" ([@romin-halltari](https://github.com/romin-halltari))
10+
11+
#### Authors: 1
12+
13+
- [@romin-halltari](https://github.com/romin-halltari)
14+
15+
---
16+
117
# v17.1.0 (Mon Nov 20 2023)
218

319
#### 🐛 Bug Fix

‎packages/@magic-ext/react-native-bare-oauth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@magic-ext/react-native-bare-oauth",
3-
"version": "17.1.0",
3+
"version": "18.0.0",
44
"description": "Magic SDK OAuth Extension for Bare React Native environments.",
55
"author": "Magic <[email protected]> (https://magic.link/)",
66
"license": "MIT",

‎packages/@magic-ext/react-native-bare-oauth/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class OAuthExtension extends Extension.Internal<'oauth'> {
2020
'@magic-sdk/react-native': false,
2121
};
2222

23-
public loginWithRedirect(configuration: OAuthRedirectConfiguration) {
23+
public loginWithPopup(configuration: OAuthRedirectConfiguration) {
2424
return this.utils.createPromiEvent<OAuthRedirectResult>(async (resolve, reject) => {
2525
try {
2626
const { provider, query, redirectURI } = await createURI.call(this, configuration);

‎packages/@magic-ext/react-native-expo-oauth/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# v18.0.0 (Tue Nov 21 2023)
2+
3+
#### 💥 Breaking Change
4+
5+
- Revert "Rename: ready -> checkIsReadyForRequest and isReady -> isReadyForRequest" [#668](https://github.com/magiclabs/magic-js/pull/668) ([@romin-halltari](https://github.com/romin-halltari))
6+
7+
#### 🐛 Bug Fix
8+
9+
- Revert "Rename: ready -> checkIsReadyForRequest and isReady -> isReadyForRequest" ([@romin-halltari](https://github.com/romin-halltari))
10+
11+
#### Authors: 1
12+
13+
- [@romin-halltari](https://github.com/romin-halltari)
14+
15+
---
16+
117
# v17.1.0 (Mon Nov 20 2023)
218

319
#### 🐛 Bug Fix

‎packages/@magic-ext/react-native-expo-oauth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@magic-ext/react-native-expo-oauth",
3-
"version": "17.1.0",
3+
"version": "18.0.0",
44
"description": "Magic SDK OAuth Extension for Expo React Native environments.",
55
"author": "Magic <[email protected]> (https://magic.link/)",
66
"license": "MIT",

‎packages/@magic-ext/react-native-expo-oauth/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class OAuthExtension extends Extension.Internal<'oauth'> {
2020
'@magic-sdk/react-native-expo': '>=13.0.0',
2121
};
2222

23-
public loginWithRedirect(configuration: OAuthRedirectConfiguration) {
23+
public loginWithPopup(configuration: OAuthRedirectConfiguration) {
2424
return this.utils.createPromiEvent<OAuthRedirectResult>(async (resolve, reject) => {
2525
try {
2626
const { provider, query, redirectURI } = await createURI.call(this, configuration);

‎yarn.lock

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2835,7 +2835,7 @@ __metadata:
28352835
version: 0.0.0-use.local
28362836
resolution: "@magic-ext/algorand@workspace:packages/@magic-ext/algorand"
28372837
dependencies:
2838-
"@magic-sdk/commons": ^17.2.1
2838+
"@magic-sdk/commons": ^17.3.0
28392839
languageName: unknown
28402840
linkType: soft
28412841

@@ -2844,8 +2844,8 @@ __metadata:
28442844
resolution: "@magic-ext/aptos@workspace:packages/@magic-ext/aptos"
28452845
dependencies:
28462846
"@aptos-labs/wallet-adapter-core": ^2.2.0
2847-
"@magic-sdk/commons": ^17.2.1
2848-
"@magic-sdk/provider": ^21.2.1
2847+
"@magic-sdk/commons": ^17.3.0
2848+
"@magic-sdk/provider": ^21.3.0
28492849
aptos: ^1.8.5
28502850
peerDependencies:
28512851
"@aptos-labs/wallet-adapter-core": ^2.2.0
@@ -2857,55 +2857,55 @@ __metadata:
28572857
version: 0.0.0-use.local
28582858
resolution: "@magic-ext/auth@workspace:packages/@magic-ext/auth"
28592859
dependencies:
2860-
"@magic-sdk/commons": ^17.2.1
2860+
"@magic-sdk/commons": ^17.3.0
28612861
languageName: unknown
28622862
linkType: soft
28632863

28642864
"@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche":
28652865
version: 0.0.0-use.local
28662866
resolution: "@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche"
28672867
dependencies:
2868-
"@magic-sdk/commons": ^17.2.1
2868+
"@magic-sdk/commons": ^17.3.0
28692869
languageName: unknown
28702870
linkType: soft
28712871

28722872
"@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin":
28732873
version: 0.0.0-use.local
28742874
resolution: "@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin"
28752875
dependencies:
2876-
"@magic-sdk/commons": ^17.2.1
2876+
"@magic-sdk/commons": ^17.3.0
28772877
languageName: unknown
28782878
linkType: soft
28792879

28802880
"@magic-ext/conflux@workspace:packages/@magic-ext/conflux":
28812881
version: 0.0.0-use.local
28822882
resolution: "@magic-ext/conflux@workspace:packages/@magic-ext/conflux"
28832883
dependencies:
2884-
"@magic-sdk/commons": ^17.2.1
2884+
"@magic-sdk/commons": ^17.3.0
28852885
languageName: unknown
28862886
linkType: soft
28872887

28882888
"@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos":
28892889
version: 0.0.0-use.local
28902890
resolution: "@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos"
28912891
dependencies:
2892-
"@magic-sdk/commons": ^17.2.1
2892+
"@magic-sdk/commons": ^17.3.0
28932893
languageName: unknown
28942894
linkType: soft
28952895

28962896
"@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519":
28972897
version: 0.0.0-use.local
28982898
resolution: "@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519"
28992899
dependencies:
2900-
"@magic-sdk/commons": ^17.2.1
2900+
"@magic-sdk/commons": ^17.3.0
29012901
languageName: unknown
29022902
linkType: soft
29032903

29042904
"@magic-ext/flow@workspace:packages/@magic-ext/flow":
29052905
version: 0.0.0-use.local
29062906
resolution: "@magic-ext/flow@workspace:packages/@magic-ext/flow"
29072907
dependencies:
2908-
"@magic-sdk/commons": ^17.2.1
2908+
"@magic-sdk/commons": ^17.3.0
29092909
"@onflow/fcl": ^1.4.1
29102910
"@onflow/types": ^1.1.0
29112911
peerDependencies:
@@ -2918,7 +2918,7 @@ __metadata:
29182918
version: 0.0.0-use.local
29192919
resolution: "@magic-ext/gdkms@workspace:packages/@magic-ext/gdkms"
29202920
dependencies:
2921-
"@magic-sdk/commons": ^17.2.1
2921+
"@magic-sdk/commons": ^17.3.0
29222922
"@magic-sdk/types": ^17.2.0
29232923
"@peculiar/webcrypto": ^1.4.3
29242924
languageName: unknown
@@ -2928,7 +2928,7 @@ __metadata:
29282928
version: 0.0.0-use.local
29292929
resolution: "@magic-ext/harmony@workspace:packages/@magic-ext/harmony"
29302930
dependencies:
2931-
"@magic-sdk/commons": ^17.2.1
2931+
"@magic-sdk/commons": ^17.3.0
29322932
languageName: unknown
29332933
linkType: soft
29342934

@@ -2946,23 +2946,23 @@ __metadata:
29462946
version: 0.0.0-use.local
29472947
resolution: "@magic-ext/icon@workspace:packages/@magic-ext/icon"
29482948
dependencies:
2949-
"@magic-sdk/commons": ^17.2.1
2949+
"@magic-sdk/commons": ^17.3.0
29502950
languageName: unknown
29512951
linkType: soft
29522952

29532953
"@magic-ext/near@workspace:packages/@magic-ext/near":
29542954
version: 0.0.0-use.local
29552955
resolution: "@magic-ext/near@workspace:packages/@magic-ext/near"
29562956
dependencies:
2957-
"@magic-sdk/commons": ^17.2.1
2957+
"@magic-sdk/commons": ^17.3.0
29582958
languageName: unknown
29592959
linkType: soft
29602960

2961-
"@magic-ext/oauth@^15.2.1, @magic-ext/oauth@workspace:packages/@magic-ext/oauth":
2961+
"@magic-ext/oauth@^15.3.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth":
29622962
version: 0.0.0-use.local
29632963
resolution: "@magic-ext/oauth@workspace:packages/@magic-ext/oauth"
29642964
dependencies:
2965-
"@magic-sdk/commons": ^17.2.1
2965+
"@magic-sdk/commons": ^17.3.0
29662966
"@types/crypto-js": ~3.1.47
29672967
crypto-js: ^3.3.0
29682968
languageName: unknown
@@ -2972,23 +2972,23 @@ __metadata:
29722972
version: 0.0.0-use.local
29732973
resolution: "@magic-ext/oidc@workspace:packages/@magic-ext/oidc"
29742974
dependencies:
2975-
"@magic-sdk/commons": ^17.2.1
2975+
"@magic-sdk/commons": ^17.3.0
29762976
languageName: unknown
29772977
linkType: soft
29782978

29792979
"@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot":
29802980
version: 0.0.0-use.local
29812981
resolution: "@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot"
29822982
dependencies:
2983-
"@magic-sdk/commons": ^17.2.1
2983+
"@magic-sdk/commons": ^17.3.0
29842984
languageName: unknown
29852985
linkType: soft
29862986

29872987
"@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth":
29882988
version: 0.0.0-use.local
29892989
resolution: "@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth"
29902990
dependencies:
2991-
"@magic-sdk/react-native-bare": ^22.2.2
2991+
"@magic-sdk/react-native-bare": ^22.3.0
29922992
"@magic-sdk/types": ^10.0.1
29932993
"@types/crypto-js": ~3.1.47
29942994
crypto-js: ^3.3.0
@@ -3004,7 +3004,7 @@ __metadata:
30043004
version: 0.0.0-use.local
30053005
resolution: "@magic-ext/react-native-expo-oauth@workspace:packages/@magic-ext/react-native-expo-oauth"
30063006
dependencies:
3007-
"@magic-sdk/react-native-expo": ^22.2.2
3007+
"@magic-sdk/react-native-expo": ^22.3.0
30083008
"@magic-sdk/types": ^10.0.0
30093009
"@types/crypto-js": ~3.1.47
30103010
crypto-js: ^3.3.0
@@ -3019,7 +3019,7 @@ __metadata:
30193019
version: 0.0.0-use.local
30203020
resolution: "@magic-ext/solana@workspace:packages/@magic-ext/solana"
30213021
dependencies:
3022-
"@magic-sdk/commons": ^17.2.1
3022+
"@magic-sdk/commons": ^17.3.0
30233023
"@solana/web3.js": ^1.87.2
30243024
peerDependencies:
30253025
"@solana/web3.js": ^1.87.2
@@ -3030,47 +3030,47 @@ __metadata:
30303030
version: 0.0.0-use.local
30313031
resolution: "@magic-ext/taquito@workspace:packages/@magic-ext/taquito"
30323032
dependencies:
3033-
"@magic-sdk/commons": ^17.2.1
3033+
"@magic-sdk/commons": ^17.3.0
30343034
languageName: unknown
30353035
linkType: soft
30363036

30373037
"@magic-ext/terra@workspace:packages/@magic-ext/terra":
30383038
version: 0.0.0-use.local
30393039
resolution: "@magic-ext/terra@workspace:packages/@magic-ext/terra"
30403040
dependencies:
3041-
"@magic-sdk/commons": ^17.2.1
3041+
"@magic-sdk/commons": ^17.3.0
30423042
languageName: unknown
30433043
linkType: soft
30443044

30453045
"@magic-ext/tezos@workspace:packages/@magic-ext/tezos":
30463046
version: 0.0.0-use.local
30473047
resolution: "@magic-ext/tezos@workspace:packages/@magic-ext/tezos"
30483048
dependencies:
3049-
"@magic-sdk/commons": ^17.2.1
3049+
"@magic-sdk/commons": ^17.3.0
30503050
languageName: unknown
30513051
linkType: soft
30523052

30533053
"@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn":
30543054
version: 0.0.0-use.local
30553055
resolution: "@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn"
30563056
dependencies:
3057-
"@magic-sdk/commons": ^17.2.1
3057+
"@magic-sdk/commons": ^17.3.0
30583058
languageName: unknown
30593059
linkType: soft
30603060

30613061
"@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa":
30623062
version: 0.0.0-use.local
30633063
resolution: "@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa"
30643064
dependencies:
3065-
"@magic-sdk/commons": ^17.2.1
3065+
"@magic-sdk/commons": ^17.3.0
30663066
languageName: unknown
30673067
linkType: soft
30683068

3069-
"@magic-sdk/commons@^17.2.1, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
3069+
"@magic-sdk/commons@^17.3.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
30703070
version: 0.0.0-use.local
30713071
resolution: "@magic-sdk/commons@workspace:packages/@magic-sdk/commons"
30723072
dependencies:
3073-
"@magic-sdk/provider": ^21.2.1
3073+
"@magic-sdk/provider": ^21.3.0
30743074
"@magic-sdk/types": ^17.2.0
30753075
peerDependencies:
30763076
"@magic-sdk/provider": ">=18.6.0"
@@ -3095,12 +3095,12 @@ __metadata:
30953095
"@babel/core": ^7.9.6
30963096
"@babel/plugin-proposal-optional-chaining": ^7.9.0
30973097
"@babel/runtime": ^7.9.6
3098-
"@magic-ext/oauth": ^15.2.1
3099-
magic-sdk: ^21.2.1
3098+
"@magic-ext/oauth": ^15.3.0
3099+
magic-sdk: ^21.3.0
31003100
languageName: unknown
31013101
linkType: soft
31023102

3103-
"@magic-sdk/provider@^21.2.1, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
3103+
"@magic-sdk/provider@^21.3.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
31043104
version: 0.0.0-use.local
31053105
resolution: "@magic-sdk/provider@workspace:packages/@magic-sdk/provider"
31063106
dependencies:
@@ -3117,16 +3117,16 @@ __metadata:
31173117
languageName: unknown
31183118
linkType: soft
31193119

3120-
"@magic-sdk/react-native-bare@^22.2.2, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare":
3120+
"@magic-sdk/react-native-bare@^22.3.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare":
31213121
version: 0.0.0-use.local
31223122
resolution: "@magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare"
31233123
dependencies:
31243124
"@aveq-research/localforage-asyncstorage-driver": ^3.0.1
31253125
"@babel/core": ^7.15.0
31263126
"@babel/plugin-transform-flow-strip-types": ^7.14.5
31273127
"@babel/runtime": ~7.10.4
3128-
"@magic-sdk/commons": ^17.2.1
3129-
"@magic-sdk/provider": ^21.2.1
3128+
"@magic-sdk/commons": ^17.3.0
3129+
"@magic-sdk/provider": ^21.3.0
31303130
"@magic-sdk/types": ^17.2.0
31313131
"@react-native-async-storage/async-storage": ^1.15.5
31323132
"@react-native-community/netinfo": ">11.0.0"
@@ -3157,16 +3157,16 @@ __metadata:
31573157
languageName: unknown
31583158
linkType: soft
31593159

3160-
"@magic-sdk/react-native-expo@^22.2.2, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo":
3160+
"@magic-sdk/react-native-expo@^22.3.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo":
31613161
version: 0.0.0-use.local
31623162
resolution: "@magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo"
31633163
dependencies:
31643164
"@aveq-research/localforage-asyncstorage-driver": ^3.0.1
31653165
"@babel/core": ^7.15.0
31663166
"@babel/plugin-transform-flow-strip-types": ^7.14.5
31673167
"@babel/runtime": ~7.10.4
3168-
"@magic-sdk/commons": ^17.2.1
3169-
"@magic-sdk/provider": ^21.2.1
3168+
"@magic-sdk/commons": ^17.3.0
3169+
"@magic-sdk/provider": ^21.3.0
31703170
"@magic-sdk/types": ^17.2.0
31713171
"@react-native-async-storage/async-storage": ^1.15.5
31723172
"@react-native-community/netinfo": ">11.0.0"
@@ -13077,15 +13077,15 @@ fsevents@^2.3.2:
1307713077
languageName: unknown
1307813078
linkType: soft
1307913079

13080-
"magic-sdk@^21.2.1, magic-sdk@workspace:packages/magic-sdk":
13080+
"magic-sdk@^21.3.0, magic-sdk@workspace:packages/magic-sdk":
1308113081
version: 0.0.0-use.local
1308213082
resolution: "magic-sdk@workspace:packages/magic-sdk"
1308313083
dependencies:
1308413084
"@babel/core": ^7.9.6
1308513085
"@babel/plugin-proposal-optional-chaining": ^7.9.0
1308613086
"@babel/runtime": ^7.9.6
13087-
"@magic-sdk/commons": ^17.2.1
13088-
"@magic-sdk/provider": ^21.2.1
13087+
"@magic-sdk/commons": ^17.3.0
13088+
"@magic-sdk/provider": ^21.3.0
1308913089
"@magic-sdk/types": ^17.2.0
1309013090
localforage: ^1.7.4
1309113091
localforage-driver-memory: ^1.0.5

0 commit comments

Comments
 (0)