Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Darren test #592

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ on:
types: [checks_requested]

env:
GITHUB_TOKEN: ${{ secrets.ADMIN_TOKEN }}
GH_TOKEN: ${{ secrets.ADMIN_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

jobs:
Expand All @@ -17,13 +16,8 @@ jobs:
name: Build
if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.ADMIN_TOKEN }}

- name: Prepare repository
run: git fetch --unshallow --tags

- uses: actions/checkout@v2
- name: Setup node
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -53,14 +47,8 @@ jobs:
needs: build
steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.ADMIN_TOKEN }}

- name: Prepare repository
run: git fetch --unshallow --tags

- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v2
with:
node-version: 16
cache: 'yarn'
Expand All @@ -78,3 +66,4 @@ jobs:

- name: Create Canary Release
run: yarn auto canary -v

4 changes: 2 additions & 2 deletions packages/@magic-sdk/react-native-bare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
"react-native": "^0.62.2",
"react-native-device-info": "^10.3.0",
"react-native-safe-area-context": "^4.4.1",
"react-native-webview": "^11.26.0"
"react-native-webview": "^12.4.0"
},
"peerDependencies": {
"@react-native-async-storage/async-storage": ">=1.15.5",
"react": ">=16",
"react-native": ">=0.60",
"react-native-device-info": ">=10.3.0",
"react-native-safe-area-context": ">=4.4.1",
"react-native-webview": ">=11.0.0"
"react-native-webview": ">=12.4.0"
},
"gitHead": "1ef062ea699d48d5e9a9375a93b7c147632b05ca"
}
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ export class ReactNativeWebViewController extends ViewController {
source={{ uri: `${this.endpoint}/send/?params=${encodeURIComponent(this.parameters)}` }}
onMessage={handleWebViewMessage}
style={this.styles['magic-webview']}
webviewDebuggingEnabled
autoManageStatusBarEnabled={false}
onShouldStartLoadWithRequest={(event) => {
const queryParams = new URLSearchParams(event.url.split('?')[1]);
Expand Down
4 changes: 2 additions & 2 deletions packages/@magic-sdk/react-native-expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
"react": "^16.13.1",
"react-native": "^0.62.2",
"react-native-safe-area-context": "^4.4.1",
"react-native-webview": "^11.26.0"
"react-native-webview": ">=12.4.0"
},
"peerDependencies": {
"expo": "*",
"react": ">=16",
"react-native": ">=0.60",
"react-native-safe-area-context": ">=4.4.1",
"react-native-webview": ">=11.26.0"
"react-native-webview": ">=12.4.0"
},
"gitHead": "1ef062ea699d48d5e9a9375a93b7c147632b05ca"
}
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ export class ReactNativeWebViewController extends ViewController {
onMessage={handleWebViewMessage}
style={this.styles['magic-webview']}
autoManageStatusBarEnabled={false}
webviewDebuggingEnabled
onShouldStartLoadWithRequest={(event) => {
const queryParams = new URLSearchParams(event.url.split('?')[1]);
const openInDeviceBrowser = queryParams.get(OPEN_IN_DEVICE_BROWSER);
Expand Down
35 changes: 24 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3098,7 +3098,7 @@ __metadata:
react-native: ^0.62.2
react-native-device-info: ^10.3.0
react-native-safe-area-context: ^4.4.1
react-native-webview: ^11.26.0
react-native-webview: ^12.4.0
tslib: ^2.0.3
whatwg-url: ~8.1.0
peerDependencies:
Expand All @@ -3107,7 +3107,7 @@ __metadata:
react-native: ">=0.60"
react-native-device-info: ">=10.3.0"
react-native-safe-area-context: ">=4.4.1"
react-native-webview: ">=11.0.0"
react-native-webview: ">=12.4.0"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -3135,15 +3135,15 @@ __metadata:
react: ^16.13.1
react-native: ^0.62.2
react-native-safe-area-context: ^4.4.1
react-native-webview: ^11.26.0
react-native-webview: ">=12.4.0"
tslib: ^2.0.3
whatwg-url: ~8.1.0
peerDependencies:
expo: "*"
react: ">=16"
react-native: ">=0.60"
react-native-safe-area-context: ">=4.4.1"
react-native-webview: ">=11.26.0"
react-native-webview: ">=12.4.0"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -15815,16 +15815,29 @@ fsevents@^2.3.2:
languageName: node
linkType: hard

"react-native-webview@npm:^11.26.0":
version: 11.26.1
resolution: "react-native-webview@npm:11.26.1"
"react-native-webview@npm:>=12.4.0":
version: 13.2.3
resolution: "react-native-webview@npm:13.2.3"
dependencies:
escape-string-regexp: 2.0.0
invariant: 2.2.4
peerDependencies:
react: "*"
react-native: "*"
checksum: d2f95a89e944a2f1e8cf402e4e274f3568edae42e7ef190915e9fba8004a01d699c962459bdc9688c159060538e90aea3017cab24e6f4112021cbbc10ef57104
checksum: 4b3d14503aa622fc8bbf8b069437af06509bcfa9f2a84654d4904fce4e164132e738a73fc918694d45c14b9f460a05a2ce8389bd7fad21df95bb3b3911046ea7
languageName: node
linkType: hard

"react-native-webview@npm:^12.4.0":
version: 12.4.0
resolution: "react-native-webview@npm:12.4.0"
dependencies:
escape-string-regexp: 2.0.0
invariant: 2.2.4
peerDependencies:
react: "*"
react-native: "*"
checksum: f7bd69b71af6bd2f62ae290aa40d8d7e7191dd7fd451327b2b6fcde7f8035e85de89d9f8f9e6c8ca913850e0efc91e195181f41c17df68516a47ff50977a49a1
languageName: node
linkType: hard

Expand Down Expand Up @@ -19342,9 +19355,9 @@ typescript@~4.4.2:
linkType: hard

"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3":
version: 1.2.3
resolution: "word-wrap@npm:1.2.3"
checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f
version: 1.2.4
resolution: "word-wrap@npm:1.2.4"
checksum: 8f1f2e0a397c0e074ca225ba9f67baa23f99293bc064e31355d426ae91b8b3f6b5f6c1fc9ae5e9141178bb362d563f55e62fd8d5c31f2a77e3ade56cb3e35bd1
languageName: node
linkType: hard

Expand Down
Loading