Skip to content

Commit

Permalink
deps: Run yarn upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisbobbe committed Sep 5, 2023
1 parent 4456ec4 commit 2e61687
Show file tree
Hide file tree
Showing 73 changed files with 2,083 additions and 1,643 deletions.
28 changes: 12 additions & 16 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -312,20 +312,16 @@ PODS:
- glog
- react-native-cameraroll (5.2.4):
- React-Core
- react-native-document-picker (8.2.0):
- react-native-document-picker (8.2.1):
- React-Core
- react-native-image-picker (5.3.1):
- react-native-image-picker (5.6.1):
- 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.5.0):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- react-native-safe-area-context (4.7.2):
- React-Core
- ReactCommon/turbomodule/core
- react-native-simple-toast (1.1.4):
- React-Core
- Toast (~> 4.0.0)
Expand Down Expand Up @@ -404,9 +400,9 @@ PODS:
- React-Core
- RNCMaskedView (0.1.11):
- React
- RNCPushNotificationIOS (1.10.1):
- RNCPushNotificationIOS (1.11.0):
- React-Core
- RNGestureHandler (2.9.0):
- RNGestureHandler (2.12.1):
- React-Core
- RNReanimated (2.2.4):
- DoubleConversion
Expand Down Expand Up @@ -437,7 +433,7 @@ PODS:
- React-RCTVibration
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (3.20.0):
- RNScreens (3.25.0):
- React-Core
- React-RCTImage
- RNSentry (3.4.3):
Expand Down Expand Up @@ -734,11 +730,11 @@ SPEC CHECKSUMS:
React-jsinspector: cab4d37ebde480f84c79ac89568abbf76b916c3e
React-logger: b75b80500ea80457b2cf169427d66de986cdcb29
react-native-cameraroll: cb752fda6d5268f1646b4390bd5be1f27706b9a0
react-native-document-picker: 495c444c0c773c6e83a5d91165890ecb1c0a399a
react-native-image-picker: ec9b713e248760bfa0f879f0715391de4651a7cb
react-native-document-picker: 69ca2094d8780cfc1e7e613894d15290fdc54bba
react-native-image-picker: 5fcac5a5ffcb3737837f0617d43fd767249290de
react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d
react-native-photo-view: ea0ec91bf5991a6843e740b1f47ab355171c996c
react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc
react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284
react-native-simple-toast: 8ee5d23f0b92b935ab7434cdb65159ce12dfb4b7
react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1
React-perflogger: 44436b315d757100a53dfb1ab6b77c58cb646d7d
Expand All @@ -757,10 +753,10 @@ SPEC CHECKSUMS:
RNCAsyncStorage: 09fc8595e6d6f6d5abf16b23a56b257d9c6b7c5b
RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
RNCPushNotificationIOS: 87b8d16d3ede4532745e05b03c42cff33a36cc45
RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8
RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
RNReanimated: e7d8afaf8fed4b3bf1a46e06adb2e04a2b248f1c
RNScreens: 218801c16a2782546d30bd2026bb625c0302d70f
RNScreens: 85d3880b52d34db7b8eeebe2f1a0e807c05e69fa
RNSentry: 85f6525b5fe8d2ada065858026b338605b3c09da
RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
Sentry: 0c5cd63d714187b4a39c331c1f0eb04ba7868341
Expand Down
1 change: 0 additions & 1 deletion src/storage/__tests__/migrations-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ describe('migrations', () => {
{ ...endBase, accounts: [...base37.accounts] },
],
]) {
/* eslint-disable no-loop-func */
test(desc, async () => {
// $FlowIgnore[incompatible-exact]
// $FlowIgnore[incompatible-type]
Expand Down
30 changes: 15 additions & 15 deletions src/webview/js/generatedEs3.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@ export default `
var compiledWebviewJs = (function (exports) {
'use strict';
function ownKeys(object, enumerableOnly) {
var keys = Object.keys(object);
function ownKeys(e, r) {
var t = Object.keys(e);
if (Object.getOwnPropertySymbols) {
var symbols = Object.getOwnPropertySymbols(object);
enumerableOnly && (symbols = symbols.filter(function (sym) {
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
})), keys.push.apply(keys, symbols);
var o = Object.getOwnPropertySymbols(e);
r && (o = o.filter(function (r) {
return Object.getOwnPropertyDescriptor(e, r).enumerable;
})), t.push.apply(t, o);
}
return keys;
return t;
}
function _objectSpread2(target) {
for (var i = 1; i < arguments.length; i++) {
var source = null != arguments[i] ? arguments[i] : {};
i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
_defineProperty(target, key, source[key]);
}) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
function _objectSpread2(e) {
for (var r = 1; r < arguments.length; r++) {
var t = null != arguments[r] ? arguments[r] : {};
r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
_defineProperty(e, r, t[r]);
}) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
});
}
return target;
return e;
}
function _defineProperty(obj, key, value) {
key = _toPropertyKey(key);
Expand Down
4 changes: 3 additions & 1 deletion tools/tsflower
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,11 @@ run_only()
rm -rf "${rootdir}"/types/"${package}"/lib/typescript/example/
format_dir "${rootdir}"/types/"${package}"

# Remove all *.web.js.flow files. We don't use RN for the web.
# Remove all *.web.js.flow files, *.windows.js.flow files, etc.
# TODO(tsflower): When tsflower supports skipping files, simplify away.
rm -f "${rootdir}"/types/**/*.web.js.flow
rm -f "${rootdir}"/types/**/*.macos.js.flow
rm -f "${rootdir}"/types/**/*.windows.js.flow
}

apply_patches()
Expand Down

This file was deleted.

27 changes: 27 additions & 0 deletions types/patches/0002-tsflower-rnsac-Use-ReadOnlyArray.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Bobbe <cbobbe@zulip.com>
Date: Fri, 1 Sep 2023 18:05:02 -0700
Subject: [tsflower] rnsac: Use $ReadOnlyArray

---
.../lib/typescript/src/SafeArea.types.js.flow | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow
index 2a11287b6..c4e816378 100644
--- types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow
+++ types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow
@@ -17,9 +17,7 @@ export type EdgeMode = 'off' | 'additive' | 'maximum';
export type EdgeRecord =
Partial<$FlowFixMe /* Record<Edge, EdgeMode> */ /* tsflower-unimplemented: Record with key type TypeReference */>;

-export type Edges =
- /* tsflower-warning: unimplemented: 'readonly' as type operator */
- Edge[] /* readonly Edge[] */ | Readonly<EdgeRecord>;
+export type Edges = $ReadOnlyArray<Edge> | Readonly<EdgeRecord>;

export interface EdgeInsets {
top: number;
--
2.32.0

26 changes: 26 additions & 0 deletions types/patches/0003-tsflower-rnsac-Translate-a-TS-Record-type.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Bobbe <cbobbe@zulip.com>
Date: Fri, 1 Sep 2023 18:29:58 -0700
Subject: [tsflower] rnsac: Translate a TS `Record` type

---
.../lib/typescript/src/SafeArea.types.js.flow | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow
index c4e816378..3a71dca37 100644
--- types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow
+++ types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow
@@ -14,8 +14,7 @@ import 'react-native';
import NativeSafeAreaView from './specs/NativeSafeAreaView';
export type Edge = 'top' | 'right' | 'bottom' | 'left';
export type EdgeMode = 'off' | 'additive' | 'maximum';
-export type EdgeRecord =
- Partial<$FlowFixMe /* Record<Edge, EdgeMode> */ /* tsflower-unimplemented: Record with key type TypeReference */>;
+export type EdgeRecord = {| [Edge]: EdgeMode |};

export type Edges = $ReadOnlyArray<Edge> | Readonly<EdgeRecord>;

--
2.32.0

Original file line number Diff line number Diff line change
Expand Up @@ -25,47 +25,50 @@ interface declaration to an object type, with `extends` turned into
a spread, when the base is an object type -- as it is in these
examples.
---
.../lib/typescript/SafeArea.types.js.flow | 22 +++++++++++--------
.../lib/typescript/SafeAreaContext.js.flow | 12 +++++-----
.../specs/NativeSafeAreaProvider.js.flow | 8 ++++---
.../specs/NativeSafeAreaView.js.flow | 10 +++++----
4 files changed, 31 insertions(+), 21 deletions(-)
.../lib/typescript/src/SafeArea.types.js.flow | 24 +++++++++++--------
.../typescript/src/SafeAreaContext.js.flow | 12 ++++++----
.../src/specs/NativeSafeAreaProvider.js.flow | 8 ++++---
.../src/specs/NativeSafeAreaView.js.flow | 10 ++++----
4 files changed, 32 insertions(+), 22 deletions(-)

diff --git types/react-native-safe-area-context/lib/typescript/SafeArea.types.js.flow types/react-native-safe-area-context/lib/typescript/SafeArea.types.js.flow
index 88ba6cc09..056367669 100644
--- types/react-native-safe-area-context/lib/typescript/SafeArea.types.js.flow
+++ types/react-native-safe-area-context/lib/typescript/SafeArea.types.js.flow
@@ -33,13 +33,17 @@ export interface Metrics {
diff --git types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow
index 3a71dca37..81a9fb120 100644
--- types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow
+++ types/react-native-safe-area-context/lib/typescript/src/SafeArea.types.js.flow
@@ -40,15 +40,19 @@ export interface Metrics {
export type InsetChangedEvent = $tsflower_subst$RN$NativeSyntheticEvent<Metrics>;
export type InsetChangeNativeCallback = (event: InsetChangedEvent) => void;

-export interface NativeSafeAreaProviderProps extends $tsflower_subst$RN$ViewProps {
- children?: $tsflower_subst$React$ReactNode;
- onInsetsChange: InsetChangeNativeCallback;
-}
-
-export interface NativeSafeAreaViewProps extends $tsflower_subst$RN$ViewProps {
- children?: $tsflower_subst$React$ReactNode;
- mode?: 'padding' | 'margin';
- edges?: Edges;
-}
+export type NativeSafeAreaProviderProps = {
+ ...$tsflower_subst$RN$ViewProps,
+ children?: $tsflower_subst$React$ReactNode,
+ onInsetsChange: InsetChangeNativeCallback,
+ ...
+};

-export interface NativeSafeAreaViewProps extends $tsflower_subst$RN$ViewProps {
- children?: $tsflower_subst$React$ReactNode;
- mode?: 'padding' | 'margin';
- edges?: $ReadOnlyArray<Edge>;
-}
+
+export type NativeSafeAreaViewProps = {
+ ...$tsflower_subst$RN$ViewProps,
+ children?: $tsflower_subst$React$ReactNode,
+ mode?: 'padding' | 'margin',
+ edges?: $ReadOnlyArray<Edge>,
+ edges?: Edges,
+ ...
+};
diff --git types/react-native-safe-area-context/lib/typescript/SafeAreaContext.js.flow types/react-native-safe-area-context/lib/typescript/SafeAreaContext.js.flow

export type NativeSafeAreaViewInstance = InstanceType<typeof NativeSafeAreaView>;
diff --git types/react-native-safe-area-context/lib/typescript/src/SafeAreaContext.js.flow types/react-native-safe-area-context/lib/typescript/src/SafeAreaContext.js.flow
index 7231a733b..5e7699444 100644
--- types/react-native-safe-area-context/lib/typescript/SafeAreaContext.js.flow
+++ types/react-native-safe-area-context/lib/typescript/SafeAreaContext.js.flow
--- types/react-native-safe-area-context/lib/typescript/src/SafeAreaContext.js.flow
+++ types/react-native-safe-area-context/lib/typescript/src/SafeAreaContext.js.flow
@@ -18,11 +18,13 @@ import { type EdgeInsets, type Metrics, type Rect } from './SafeArea.types';
declare export var SafeAreaInsetsContext: $tsflower_subst$React$Context<EdgeInsets | null>;
declare export var SafeAreaFrameContext: $tsflower_subst$React$Context<Rect | null>;
Expand All @@ -85,10 +88,10 @@ index 7231a733b..5e7699444 100644

declare export function SafeAreaProvider(SafeAreaProviderProps): $tsflower_subst$React$JSX$Element;
declare export function useSafeAreaInsets(): EdgeInsets;
diff --git types/react-native-safe-area-context/lib/typescript/specs/NativeSafeAreaProvider.js.flow types/react-native-safe-area-context/lib/typescript/specs/NativeSafeAreaProvider.js.flow
diff --git types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaProvider.js.flow types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaProvider.js.flow
index 7a1594b3b..5d9e21df4 100644
--- types/react-native-safe-area-context/lib/typescript/specs/NativeSafeAreaProvider.js.flow
+++ types/react-native-safe-area-context/lib/typescript/specs/NativeSafeAreaProvider.js.flow
--- types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaProvider.js.flow
+++ types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaProvider.js.flow
@@ -27,8 +27,10 @@ export type Event = Readonly<{
...
}>;
Expand All @@ -103,22 +106,28 @@ index 7a1594b3b..5d9e21df4 100644
+};
declare var _default: HostComponent<NativeProps>;
export default _default;
diff --git types/react-native-safe-area-context/lib/typescript/specs/NativeSafeAreaView.js.flow types/react-native-safe-area-context/lib/typescript/specs/NativeSafeAreaView.js.flow
index 6e8337b9b..300c246bb 100644
--- types/react-native-safe-area-context/lib/typescript/specs/NativeSafeAreaView.js.flow
+++ types/react-native-safe-area-context/lib/typescript/specs/NativeSafeAreaView.js.flow
@@ -5,10 +5,12 @@ import type { ViewProps as $tsflower_subst$RN$ViewProps } from 'tsflower/subst/r
diff --git types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaView.js.flow types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaView.js.flow
index e30582cb5..87fdeaef0 100644
--- types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaView.js.flow
+++ types/react-native-safe-area-context/lib/typescript/src/specs/NativeSafeAreaView.js.flow
@@ -6,16 +6,18 @@ import type { Readonly } from 'tsflower/subst/lib';
import { typeof WithDefault } from 'react-native/Libraries/Types/CodegenTypes';
import { type HostComponent } from 'react-native';

-export interface NativeProps extends $tsflower_subst$RN$ViewProps {
- mode?: WithDefault<'padding' | 'margin', 'padding'>;
- edges /* tsflower-warning: unimplemented: 'readonly' as type operator */?: string[] /* readonly string[] */;
-}
+export type NativeProps = {
+ ...$tsflower_subst$RN$ViewProps,
+ mode?: WithDefault<'padding' | 'margin', 'padding'>,
+ edges /* tsflower-warning: unimplemented: 'readonly' as type operator */?: string[] /* readonly string[] */,
edges?: Readonly<{
top: string,
right: string,
bottom: string,
left: string,
...
- }>;
-}
+ }>,
+ ...
+};

Expand Down
Loading

0 comments on commit 2e61687

Please sign in to comment.