Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ public List<Package> getPackageList() {
new expo.modules.imageloader.ImageLoaderPackage(),
new expo.modules.permissions.PermissionsPackage(),
new expo.modules.screenorientation.ScreenOrientationPackage(),
new expo.modules.splashscreen.SplashScreenPackage()
new expo.modules.splashscreen.SplashScreenPackage(),
new expo.modules.webbrowser.WebBrowserPackage()
);
}
}
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ buildscript {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:3.5.4'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
144 changes: 144 additions & 0 deletions flow-typed/expo-web-browser_vx.x.x.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
/**
* Flowtype definitions for WebBrowser
* Generated by Flowgen from a Typescript Definition
* Flowgen v1.14.1
*/

declare module 'expo-web-browser' {
import type {
WebBrowserAuthSessionResult,
WebBrowserCoolDownResult,
WebBrowserCustomTabsResults,
WebBrowserMayInitWithUrlResult,
WebBrowserOpenOptions,
WebBrowserRedirectResult,
WebBrowserResult,
WebBrowserResultType,
WebBrowserWarmUpResult,
WebBrowserWindowFeatures,
} from 'expo-web-browser/build/WebBrowser.types';

declare export * from './WebBrowser.types'
declare export function getCustomTabsSupportingBrowsersAsync(): Promise<WebBrowserCustomTabsResults>;
declare export function warmUpAsync(browserPackage?: string): Promise<WebBrowserWarmUpResult>;
declare export function mayInitWithUrlAsync(
url: string,
browserPackage?: string,
): Promise<WebBrowserMayInitWithUrlResult>;
declare export function coolDownAsync(browserPackage?: string): Promise<WebBrowserCoolDownResult>;
declare export function openBrowserAsync(
url: string,
browserParams?: WebBrowserOpenOptions,
): Promise<WebBrowserResult>;
declare export function dismissBrowser(): void;
declare export function openAuthSessionAsync(
url: string,
redirectUrl: string,
browserParams?: WebBrowserOpenOptions,
): Promise<WebBrowserAuthSessionResult>;
declare export function dismissAuthSession(): void;

/**
* Attempts to complete an auth session in the browser.
* @param options
*/
declare export function maybeCompleteAuthSession(options?: {
skipRedirectCheck?: boolean,
...
}): {
type: 'success' | 'failed',
message: string,
...
};
}

declare module 'expo-web-browser/build/WebBrowser.types' {
declare export type RedirectEvent = {
url: string,
...
};
declare export type WebBrowserWindowFeatures = {
[key: string]: number | boolean | string,
...,
};
declare export type WebBrowserOpenOptions = {
/**
* Color of the toolbar in either #AARRGGBB or #RRGGBB format.
*/
toolbarColor?: string,
browserPackage?: string,

/**
* Whether the toolbar should be hiding when a user scrolls the website.
*/
enableBarCollapsing?: boolean,

/**
* Android only
*/
/**
* Color of the secondary toolbar in either #AARRGGBB or #RRGGBB format.
*/
secondaryToolbarColor?: string,

/**
* Whether the browser should show the title of website on the toolbar.
*/
showTitle?: boolean,
enableDefaultShareMenuItem?: boolean,

/**
* Whether browsed website should be shown as separate entry in Android recents/multitasking view.
* Default: `false`
*/
showInRecents?: boolean,

/**
* iOS only
*/
controlsColor?: string,
dismissButtonStyle?: 'done' | 'close' | 'cancel',
readerMode?: boolean,

/**
* **Web:** name to assign to the popup window.
*/
windowName?: string,

/**
* **Web:** features to use with `window.open()`
*/
windowFeatures?: string | WebBrowserWindowFeatures,
...
};
declare export type WebBrowserAuthSessionResult = WebBrowserRedirectResult | WebBrowserResult;
declare export type WebBrowserCustomTabsResults = {
defaultBrowserPackage?: string,
preferredBrowserPackage?: string,
browserPackages: string[],
servicePackages: string[],
...
};
declare export var WebBrowserResultType: {|
+CANCEL: 'cancel', // "cancel"
+DISMISS: 'dismiss', // "dismiss"
+OPENED: 'opened', // "opened"
+LOCKED: 'locked', // "locked"
|};
declare export type WebBrowserResult = {
type: $Values<typeof WebBrowserResultType>,
...
};
declare export type WebBrowserRedirectResult = {
type: 'success',
url: string,
...
};
declare export type ServiceActionResult = {
servicePackage?: string,
...
};
declare export type WebBrowserMayInitWithUrlResult = ServiceActionResult;
declare export type WebBrowserWarmUpResult = ServiceActionResult;
declare export type WebBrowserCoolDownResult = ServiceActionResult;
}
45 changes: 0 additions & 45 deletions flow-typed/npm/react-native-safari-view_vx.x.x.js

This file was deleted.

86 changes: 43 additions & 43 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ PODS:
- boost-for-react-native (1.63.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
- EXAppleAuthentication (2.1.1):
- EXAppleAuthentication (2.2.2):
- UMCore
- EXApplication (2.1.1):
- EXApplication (2.4.1):
- UMCore
- EXConstants (9.1.1):
- UMConstantsInterface
Expand All @@ -19,12 +19,14 @@ PODS:
- EXPermissions (9.0.1):
- UMCore
- UMPermissionsInterface
- EXScreenOrientation (1.0.0):
- EXScreenOrientation (1.1.1):
- React-Core
- UMCore
- EXSplashScreen (0.5.0):
- React
- UMCore
- EXWebBrowser (9.1.0):
- UMCore
- FBLazyVector (0.63.4)
- FBReactNativeSpec (0.63.4):
- Folly (= 2020.01.13.00)
Expand Down Expand Up @@ -267,23 +269,21 @@ PODS:
- React-jsinspector (0.63.4)
- react-native-cameraroll (4.0.4):
- React-Core
- react-native-image-picker (2.3.3):
- React
- react-native-netinfo (5.9.5):
- React
- react-native-image-picker (2.3.4):
- React-Core
- react-native-netinfo (5.9.10):
- React-Core
- react-native-notifications (1.5.0):
- React
- react-native-photo-view (1.5.2):
- React
- react-native-safari-view (1.0.0):
- React
- react-native-safe-area-context (3.1.7):
- React
- react-native-simple-toast (1.0.0):
- React
- react-native-safe-area-context (3.2.0):
- React-Core
- react-native-simple-toast (1.1.3):
- React-Core
- Toast (~> 4.0.0)
- react-native-webview (10.8.3):
- React
- react-native-webview (10.10.2):
- React-Core
- React-RCTActionSheet (0.63.4):
- React-Core/RCTActionSheetHeaders (= 0.63.4)
- React-RCTAnimation (0.63.4):
Expand Down Expand Up @@ -352,17 +352,17 @@ PODS:
- React-jsi (= 0.63.4)
- rn-fetch-blob (0.11.2):
- React-Core
- RNCAsyncStorage (1.6.3):
- React
- RNCMaskedView (0.1.10):
- React
- RNDeviceInfo (6.0.2):
- React
- RNGestureHandler (1.8.0):
- React
- RNReanimated (1.13.0):
- RNCAsyncStorage (1.12.1):
- React-Core
- RNCMaskedView (0.1.11):
- React
- RNSentry (2.2.1):
- RNDeviceInfo (6.2.1):
- React-Core
- RNGestureHandler (1.10.3):
- React-Core
- RNReanimated (1.13.3):
- React-Core
- RNSentry (2.4.3):
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should have done this in 7dce4e7. It looks like it was missed
because the quality-of-life improvement in 683f387 came with the
side effect of skipping pod install even when autolinking wants to
upgrade the Podfile.lock because of an NPM package upgrade. Hmm.

Any ideas/plans on how to fix this in general?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. I think I'll revert 683f387 for now, and ponder a better fix later.

- React-Core
- Sentry (= 6.1.4)
- RNSound (0.11.0):
Expand Down Expand Up @@ -407,6 +407,7 @@ DEPENDENCIES:
- EXPermissions (from `../node_modules/expo-permissions/ios`)
- EXScreenOrientation (from `../node_modules/expo-screen-orientation/ios`)
- EXSplashScreen (from `../node_modules/expo-splash-screen/ios`)
- EXWebBrowser (from `../node_modules/expo-web-browser/ios`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
- Flipper (= 0.75.1)
Expand Down Expand Up @@ -447,7 +448,6 @@ DEPENDENCIES:
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
- react-native-notifications (from `../node_modules/react-native-notifications`)
- react-native-photo-view (from `../node_modules/react-native-photo-view`)
- react-native-safari-view (from `../node_modules/react-native-safari-view`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- react-native-simple-toast (from `../node_modules/react-native-simple-toast`)
- react-native-webview (from `../node_modules/react-native-webview`)
Expand Down Expand Up @@ -522,6 +522,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/expo-screen-orientation/ios"
EXSplashScreen:
:path: "../node_modules/expo-splash-screen/ios"
EXWebBrowser:
:path: "../node_modules/expo-web-browser/ios"
FBLazyVector:
:path: "../node_modules/react-native/Libraries/FBLazyVector"
FBReactNativeSpec:
Expand Down Expand Up @@ -560,8 +562,6 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-notifications"
react-native-photo-view:
:path: "../node_modules/react-native-photo-view"
react-native-safari-view:
:path: "../node_modules/react-native-safari-view"
react-native-safe-area-context:
:path: "../node_modules/react-native-safe-area-context"
react-native-simple-toast:
Expand Down Expand Up @@ -641,14 +641,15 @@ SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: cde416483dac037923206447da6e1454df403714
EXAppleAuthentication: 046c76335343eaa97f6ed8d35a9cf493a2c4d351
EXApplication: 7cf81de6fafccff42f5d1caa5c24a159db6b9437
EXAppleAuthentication: 97d5db59f3fb7aefc6cb06e351ba0828c8982232
EXApplication: e3c201e7b913d081bbd37bd3c5d0e2cdc21733b4
EXConstants: f907b3b6ce16e20d1750f22af1e095e924574bcb
EXFileSystem: 76875135b61708b9afa7e6a89b72a60ba0fdfa20
EXImageLoader: 02ca02c9cd5cc8a97b423207a73a791e0a86bea5
EXPermissions: 80ac3acbdb145930079810fe5b08c022b3428aa8
EXScreenOrientation: 44d3cd3a99a86b9cb681e742697bc2c057d7fbd2
EXScreenOrientation: c9cfb33eaff7ce83330c5238eba523d027b9eb53
EXSplashScreen: 9423d258b71afa5bf128a83dcb57b636d9900a74
EXWebBrowser: 0b466c50e5ff61c9758095d49d5081e3229d77ac
FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
Expand All @@ -673,14 +674,13 @@ SPEC CHECKSUMS:
React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
react-native-image-picker: 3d3f85baabca60a00b75fb8facc1376db7bbdafa
react-native-netinfo: a53b00d949b6456913aaf507d9dba90c4008c611
react-native-image-picker: c6d75c4ab2cf46f9289f341242b219cb3c1180d3
react-native-netinfo: 30fb89fa913c342be82a887b56e96be6d71201dd
react-native-notifications: ce37363008fe2d6a226da4e721eace23b6ae3ad9
react-native-photo-view: 63e9e61da873531f931008b545d8d10c5373ddf8
react-native-safari-view: 955d7160d159241b8e9395d12d10ea0ef863dcdd
react-native-safe-area-context: 955ecfce672683b495d9294d2f154a9ad1d9796b
react-native-simple-toast: 6c376bd79b1e255a4bee90a72ead6447f96ea10d
react-native-webview: 598605cd213f5096e695f5b33fbee210a47e60ab
react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
react-native-simple-toast: bf002828cf816775a6809f7a9ec3907509bce11f
react-native-webview: 0aa2cde4ee7e3e1c5fffdf64dbce9c709aa18155
React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0
Expand All @@ -693,12 +693,12 @@ SPEC CHECKSUMS:
React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
rn-fetch-blob: f525a73a78df9ed5d35e67ea65e79d53c15255bc
RNCAsyncStorage: 3c304d1adfaea02ec732ac218801cb13897aa8c0
RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
RNDeviceInfo: bdd61e8b070d13a1dd9d022091981075ed4cde16
RNGestureHandler: 7a5833d0f788dbd107fbb913e09aa0c1ff333c39
RNReanimated: 89f5e0a04d1dd52fbf27e7e7030d8f80a646a3fc
RNSentry: 7104cdfc1072ccb86015d9c8f210d81ae76806c1
RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
RNDeviceInfo: 9b6aba9ffaed69ecb72bd13c7bcb0debf277bc9f
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
RNSentry: 6f8f9ee7e4c939dcd35e5633b94d0e3782888e46
RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
RNVectorIcons: da6fe858f5a65d7bbc3379540a889b0b12aa5976
Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
const transformModulesWhitelist = [
'expo-apple-authentication',
'expo-application',
'expo-web-browser',
'react-native',
// @rnc/async-storage itself is precompiled, but its mock-helper is not
'@react-native-community/async-storage',
Expand Down
Loading