Skip to content

Commit

Permalink
deps: Run yarn upgrade
Browse files Browse the repository at this point in the history
Tested on Android (office device) and iOS (my iPhone). See the
previous commit about some preparation that was needed; we upgraded
the AGP.
  • Loading branch information
chrisbobbe committed Jan 27, 2024
1 parent e55dba1 commit 1222bc9
Show file tree
Hide file tree
Showing 11 changed files with 1,716 additions and 1,425 deletions.
36 changes: 18 additions & 18 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,13 @@ PODS:
- React-Core
- react-native-document-picker (8.2.1):
- React-Core
- react-native-image-picker (5.6.1):
- react-native-image-picker (5.7.0):
- React-Core
- react-native-netinfo (6.0.0):
- React-Core
- react-native-photo-view (1.5.3):
- React-Core
- react-native-safe-area-context (4.7.2):
- react-native-safe-area-context (4.8.2):
- React-Core
- react-native-simple-toast (1.1.4):
- React-Core
Expand Down Expand Up @@ -396,13 +396,13 @@ PODS:
- React-Core
- RNCAsyncStorage (1.17.12):
- React-Core
- RNCClipboard (1.11.2):
- RNCClipboard (1.13.2):
- React-Core
- RNCMaskedView (0.1.11):
- React
- RNCPushNotificationIOS (1.11.0):
- React-Core
- RNGestureHandler (2.12.1):
- RNGestureHandler (2.14.1):
- React-Core
- RNReanimated (2.2.4):
- DoubleConversion
Expand Down Expand Up @@ -433,17 +433,17 @@ PODS:
- React-RCTVibration
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (3.25.0):
- RNScreens (3.29.0):
- React-Core
- React-RCTImage
- RNSentry (5.10.0):
- RNSentry (5.17.0):
- React-Core
- Sentry/HybridSDK (= 8.11.0)
- Sentry/HybridSDK (= 8.17.1)
- RNVectorIcons (9.2.0):
- React-Core
- Sentry/HybridSDK (8.11.0):
- SentryPrivate (= 8.11.0)
- SentryPrivate (8.11.0)
- Sentry/HybridSDK (8.17.1):
- SentryPrivate (= 8.17.1)
- SentryPrivate (8.17.1)
- SocketRocket (0.6.0)
- Toast (4.0.0)
- Yoga (1.14.0)
Expand Down Expand Up @@ -732,10 +732,10 @@ SPEC CHECKSUMS:
React-logger: b75b80500ea80457b2cf169427d66de986cdcb29
react-native-cameraroll: cb752fda6d5268f1646b4390bd5be1f27706b9a0
react-native-document-picker: 69ca2094d8780cfc1e7e613894d15290fdc54bba
react-native-image-picker: 5fcac5a5ffcb3737837f0617d43fd767249290de
react-native-image-picker: 3269f75c251cdcd61ab51b911dd30d6fff8c6169
react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d
react-native-photo-view: ea0ec91bf5991a6843e740b1f47ab355171c996c
react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284
react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89
react-native-simple-toast: 8ee5d23f0b92b935ab7434cdb65159ce12dfb4b7
react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1
React-perflogger: 44436b315d757100a53dfb1ab6b77c58cb646d7d
Expand All @@ -752,16 +752,16 @@ SPEC CHECKSUMS:
ReactCommon: 29bb6fad3242e30e9d049bc9d592736fa3da9e50
rn-fetch-blob: f525a73a78df9ed5d35e67ea65e79d53c15255bc
RNCAsyncStorage: 09fc8595e6d6f6d5abf16b23a56b257d9c6b7c5b
RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc
RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8
RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
RNGestureHandler: e98441928705d9d1184b599d7c1c6df2dd4f7724
RNReanimated: e7d8afaf8fed4b3bf1a46e06adb2e04a2b248f1c
RNScreens: 85d3880b52d34db7b8eeebe2f1a0e807c05e69fa
RNSentry: 11917f7bf3e28806aca4c2791c6ba7522d8f09fe
RNScreens: fa9b582d85ae5d62c91c66003b5278458fed7aaa
RNSentry: 960fdf84a98f7cf46bedc05a04a77d23eb1a453a
RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
Sentry: 39d57e691e311bdb73bc1ab5bbebbd6bc890050d
SentryPrivate: 48712023cdfd523735c2edb6b06bedf26c4730a3
Sentry: d9f99f9cc13777c5d938650c1e1c85047bb4f0d1
SentryPrivate: 839b1e58addf58624087a80b2628e543193fa8ef
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
Yoga: 0bc4b37c3b8a345336ff601e2cf7d9704bab7e93
Expand Down
28 changes: 14 additions & 14 deletions src/webview/js/generatedEs3.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,20 @@ var compiledWebviewJs = (function (exports) {
}
return e;
}
function _toPrimitive(t, r) {
if ("object" != typeof t || !t) return t;
var e = t[Symbol.toPrimitive];
if (void 0 !== e) {
var i = e.call(t, r || "default");
if ("object" != typeof i) return i;
throw new TypeError("@@toPrimitive must return a primitive value.");
}
return ("string" === r ? String : Number)(t);
}
function _toPropertyKey(t) {
var i = _toPrimitive(t, "string");
return "symbol" == typeof i ? i : String(i);
}
function _defineProperty(obj, key, value) {
key = _toPropertyKey(key);
if (key in obj) {
Expand All @@ -50,20 +64,6 @@ var compiledWebviewJs = (function (exports) {
}
return obj;
}
function _toPrimitive(input, hint) {
if (typeof input !== "object" || input === null) return input;
var prim = input[Symbol.toPrimitive];
if (prim !== undefined) {
var res = prim.call(input, hint || "default");
if (typeof res !== "object") return res;
throw new TypeError("@@toPrimitive must return a primitive value.");
}
return (hint === "string" ? String : Number)(input);
}
function _toPropertyKey(arg) {
var key = _toPrimitive(arg, "string");
return typeof key === "symbol" ? key : String(key);
}
const makeUserId = id => id;
Expand Down
10 changes: 5 additions & 5 deletions types/@react-native-clipboard/clipboard/dist/Clipboard.js.flow
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ declare export var Clipboard: {
getImage(): Promise<string>,
setString(content: string): void,
setStrings(content: string[]): void,
hasString(): any,
hasImage(): any,
hasURL(): any,
hasNumber(): any,
hasWebURL(): any,
hasString(): Promise<boolean>,
hasImage(): Promise<boolean>,
hasURL(): Promise<boolean> | void,
hasNumber(): Promise<boolean> | void,
hasWebURL(): Promise<boolean> | void,
addListener(callback: () => void): $tsflower_subst$RN$EmitterSubscription,
removeAllListeners(): void,
...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,26 @@
*/
import type { EmitterSubscription as $tsflower_subst$RN$EmitterSubscription } from 'tsflower/subst/react-native';
import 'react-native';
declare var _default: any;
import { type TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';

export interface Spec extends TurboModule {
getConstants: () => { ... };
getString: () => Promise<string>;
getStrings: () => Promise<string[]>;
setString: (content: string) => void;
hasString: () => Promise<boolean>;
hasNumber: () => Promise<boolean>;
getImagePNG: () => Promise<string>;
getImageJPG: () => Promise<string>;
setImage: (content: string) => void;
getImage: () => Promise<string>;
setStrings: (content: string[]) => void;
hasImage: () => Promise<boolean>;
hasURL: () => Promise<boolean>;
hasWebURL: () => Promise<boolean>;
}

declare var _default: Spec;
export default _default;
declare var addListener: (callback: () => void) => $tsflower_subst$RN$EmitterSubscription;
declare var removeAllListeners: () => void;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* @flow
* @generated by TsFlower
*/
import type { EmitterSubscription as $tsflower_subst$RN$EmitterSubscription } from 'tsflower/subst/react-native';
import { type TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
import { type Int32 } from 'react-native/Libraries/Types/CodegenTypes';

export interface Spec extends TurboModule {
getString(): Promise<string>;
getStrings(): Promise<string[]>;
getImagePNG(): Promise<string>;
getImageJPG(): Promise<string>;
setImage(content: string): Promise<void>;
getImage(): Promise<string>;
setString(content: string): void;
setStrings(content: string[]): void;
hasString(): Promise<boolean>;
hasImage(): Promise<boolean>;
hasURL(): Promise<boolean>;
hasNumber(): Promise<boolean>;
hasWebURL(): Promise<boolean>;
setListener(): void;
removeListener(): void;
addListener(eventName: string): void;
removeListeners(count: Int32): void;
}

declare var ClipboardTurboModule: Spec;
export default ClipboardTurboModule;
declare var addListener: (callback: () => void) => $tsflower_subst$RN$EmitterSubscription;
declare var removeAllListeners: () => void;
export { addListener, removeAllListeners };
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,37 @@ something like (untested):

export type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
---
.../clipboard/dist/NativeClipboard.js.flow | 2 +-
.../clipboard/dist/NativeClipboardModule.js.flow | 2 +-
.../lib/typescript/src/specs/NativeSafeAreaContext.js.flow | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git types/@react-native-clipboard/clipboard/dist/NativeClipboard.js.flow types/@react-native-clipboard/clipboard/dist/NativeClipboard.js.flow
index c7446d1d7..637eaf154 100644
--- types/@react-native-clipboard/clipboard/dist/NativeClipboard.js.flow
+++ types/@react-native-clipboard/clipboard/dist/NativeClipboard.js.flow
@@ -3,7 +3,7 @@
*/
import type { EmitterSubscription as $tsflower_subst$RN$EmitterSubscription } from 'tsflower/subst/react-native';
import 'react-native';
-import { type TurboModule } from 'react-native';
+import { type TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';

export interface Spec extends TurboModule {
getConstants: () => { ... };
diff --git types/@react-native-clipboard/clipboard/dist/NativeClipboardModule.js.flow types/@react-native-clipboard/clipboard/dist/NativeClipboardModule.js.flow
index f4df10f6a..58fa7b277 100644
--- types/@react-native-clipboard/clipboard/dist/NativeClipboardModule.js.flow
+++ types/@react-native-clipboard/clipboard/dist/NativeClipboardModule.js.flow
@@ -2,7 +2,7 @@
* @generated by TsFlower
*/
import type { EmitterSubscription as $tsflower_subst$RN$EmitterSubscription } from 'tsflower/subst/react-native';
-import { type TurboModule } from 'react-native';
+import { type TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
import { typeof Int32 } from 'react-native/Libraries/Types/CodegenTypes';

export interface Spec extends TurboModule {
diff --git types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaContext.js.flow types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaContext.js.flow
index 9d8051c08..22525e663 100644
--- types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaContext.js.flow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ Subject: [tsflower] rnsac: Find NativeMethods and import properly
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git types/react-native-safe-area-context/lib/typescript/src/SafeAreaView.js.flow types/react-native-safe-area-context/lib/typescript/src/SafeAreaView.js.flow
index 77f87914f..c046448cc 100644
index 43be07963..c046448cc 100644
--- types/react-native-safe-area-context/lib/typescript/src/SafeAreaView.js.flow
+++ types/react-native-safe-area-context/lib/typescript/src/SafeAreaView.js.flow
@@ -1,7 +1,7 @@
/* @flow
* @generated by TsFlower
*/
-import type { NativeMethods as $tsflower_import_type$_$react_2d_native_2f_types$NativeMethods } from 'react-native/types';
-import type { NativeMethods as $tsflower_import_type$_$react_2d_native$NativeMethods } from 'react-native';
+import type { NativeMethods } from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';

import type {
Expand All @@ -24,7 +24,7 @@ index 77f87914f..c046448cc 100644
NativeSafeAreaViewProps &
$tsflower_subst$React$RefAttributes<
$FlowFixMe /* React.Component<import("./specs/NativeSafeAreaView").NativeProps, {}, any> */ /* tsflower-error: bad React.Component: 3 arguments (expected 0-2) */ &
- Readonly<$tsflower_import_type$_$react_2d_native_2f_types$NativeMethods>,
- Readonly<$tsflower_import_type$_$react_2d_native$NativeMethods>,
+ Readonly<NativeMethods>,
>,
>;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Bobbe <[email protected]>
Date: Fri, 26 Jan 2024 11:43:38 -0800
Subject: [tsflower] Fix a `typeof` to `type` in Int32 import

---
.../clipboard/dist/NativeClipboardModule.js.flow | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git types/@react-native-clipboard/clipboard/dist/NativeClipboardModule.js.flow types/@react-native-clipboard/clipboard/dist/NativeClipboardModule.js.flow
index 58fa7b277..ae2537986 100644
--- types/@react-native-clipboard/clipboard/dist/NativeClipboardModule.js.flow
+++ types/@react-native-clipboard/clipboard/dist/NativeClipboardModule.js.flow
@@ -3,7 +3,7 @@
*/
import type { EmitterSubscription as $tsflower_subst$RN$EmitterSubscription } from 'tsflower/subst/react-native';
import { type TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { typeof Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import { type Int32 } from 'react-native/Libraries/Types/CodegenTypes';

export interface Spec extends TurboModule {
getString(): Promise<string>;
--
2.32.0

Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
/* @flow
* @generated by TsFlower
*/
declare var _default: any;
import type { EdgeInsets as $tsflower_import_type$_$_2e__2e__2f_src_2f_SafeArea_2e_types$EdgeInsets } from '../src/SafeArea.types';
import type { Rect as $tsflower_import_type$_$_2e__2e__2f_src_2f_SafeArea_2e_types$Rect } from '../src/SafeArea.types';

import type {
JSX$Element as $tsflower_subst$React$JSX$Element,
Context as $tsflower_subst$React$Context,
} from 'tsflower/subst/react';

import React from 'react';
import { type Metrics } from '../src/SafeArea.types';
import { type SafeAreaProviderProps } from '../src/SafeAreaContext';

declare var _default: {
initialWindowMetrics: Metrics,
useSafeAreaInsets: () => $tsflower_import_type$_$_2e__2e__2f_src_2f_SafeArea_2e_types$EdgeInsets,
useSafeAreaFrame: () => $tsflower_import_type$_$_2e__2e__2f_src_2f_SafeArea_2e_types$Rect,
SafeAreaProvider: SafeAreaProviderProps => $tsflower_subst$React$JSX$Element,
SafeAreaInsetsContext: $tsflower_subst$React$Context<$tsflower_import_type$_$_2e__2e__2f_src_2f_SafeArea_2e_types$EdgeInsets | null>,
SafeAreaFrameContext: $tsflower_subst$React$Context<$tsflower_import_type$_$_2e__2e__2f_src_2f_SafeArea_2e_types$Rect | null>,
...
};

export default _default;
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* @generated by TsFlower
*/
import type { JSX$Element as $tsflower_subst$React$JSX$Element } from 'tsflower/subst/react';
import * as React from 'react';
import { type NativeSafeAreaProviderProps } from './SafeArea.types';
declare export function CompatNativeSafeAreaProvider(
NativeSafeAreaProviderProps,
Expand Down
Loading

0 comments on commit 1222bc9

Please sign in to comment.