diff --git a/patches/better-auth.patch b/patches/better-auth.patch deleted file mode 100644 index deb7ba415..000000000 --- a/patches/better-auth.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/dist/client/plugins/index.d.ts b/dist/client/plugins/index.d.ts -index 2c58e8f611d55c2db9fae02b6fe8daf036e41e81..5729498fbcb623b3d712ada1c16f2af739c07ff1 100644 ---- a/dist/client/plugins/index.d.ts -+++ b/dist/client/plugins/index.d.ts -@@ -14,6 +14,7 @@ import { Session } from 'inspector'; - import { Passkey, passkey } from '../../plugins/passkey/index.js'; - export { twoFactorClient } from '../../plugins/two-factor/index.js'; - import { magicLink } from '../../plugins/magic-link/index.js'; -+export type { MagicLinkopts } from '../../plugins/magic-link/index.js'; - import { phoneNumber } from '../../plugins/phone-number/index.js'; - import { anonymous } from '../../plugins/anonymous/index.js'; - import { admin } from '../../plugins/admin/index.js'; -diff --git a/dist/plugins/magic-link/index.d.ts b/dist/plugins/magic-link/index.d.ts -index f67f6d844c1d84f5b3545978d2492e8f644aab45..8ea3bc96dd93f7dbdb3fd94ebe71726883f07500 100644 ---- a/dist/plugins/magic-link/index.d.ts -+++ b/dist/plugins/magic-link/index.d.ts -@@ -253,4 +253,4 @@ declare const magicLink: (options: MagicLinkopts) => { - }[]; - }; - --export { magicLink }; -+export { magicLink, MagicLinkopts }; diff --git a/patches/jsonpointer.patch b/patches/jsonpointer.patch deleted file mode 100644 index f258c4db8..000000000 --- a/patches/jsonpointer.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/package.json b/package.json -index a832ba9fc48f08300d8e5e595409c0488217af86..23af6ad8e16a8add0580151e8124f71451ebfc94 100644 ---- a/package.json -+++ b/package.json -@@ -23,8 +23,8 @@ - "engines": { - "node": ">=0.10.0" - }, -- "main": "./jsonpointer", -- "typings": "jsonpointer.d.ts", -+ "main": "./jsonpointer.js", -+ "typings": "./jsonpointer.d.ts", - "files": [ - "jsonpointer.js", - "jsonpointer.d.ts" diff --git a/patches/react-native-ios-utilities.patch b/patches/react-native-ios-utilities.patch deleted file mode 100644 index 54336d5ae..000000000 --- a/patches/react-native-ios-utilities.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/native_components/RNIDetachedView/RNIDetachedView.tsx b/src/native_components/RNIDetachedView/RNIDetachedView.tsx -index 5f7eb500892fbcef4a799a26a2c02c01e7abcf49..e029167f980b83f471040af62e1f3f0c4500c338 100644 ---- a/src/native_components/RNIDetachedView/RNIDetachedView.tsx -+++ b/src/native_components/RNIDetachedView/RNIDetachedView.tsx -@@ -68,6 +68,10 @@ export const RNIDetachedView = React.forwardRef< - const reactChildrenCount = React.Children.count(props.children); - - const children = React.Children.map(props.children, (child) => { -+ // child is React.Fragment -+ if (React.isValidElement(child) && child.type === React.Fragment) { -+ return child; -+ } - return React.cloneElement( - child as React.ReactElement, - { -diff --git a/src/native_components/RNIDetachedView/RNIDetachedViewContent.tsx b/src/native_components/RNIDetachedView/RNIDetachedViewContent.tsx -index 37db0454c3430fc1eed0c9fc1d82660613b47353..6abf37083b34f69b4db9ebf04c3e82b1fca84d4d 100644 ---- a/src/native_components/RNIDetachedView/RNIDetachedViewContent.tsx -+++ b/src/native_components/RNIDetachedView/RNIDetachedViewContent.tsx -@@ -14,7 +14,7 @@ export function RNIDetachedViewContent( - props: React.PropsWithChildren - ) { - const [viewID, setViewID] = React.useState(); -- -+ const { isParentDetached, ...rest } = props - const wrapperStyle: StyleProp = [ - props.shouldEnableDebugBackgroundColors && styles.wrapperViewDebug, - props.contentContainerStyle, -@@ -25,12 +25,12 @@ export function RNIDetachedViewContent( - ?? DEFAULT_DETACHED_SUBVIEW_ENTRY; - - const didDetach = -- (props.isParentDetached ?? false) -+ (isParentDetached ?? false) - || detachedSubviewEntry.didDetachFromOriginalParent; - - return ( - -+@interface RNSNavigationController : UINavigationController - - @end - -diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm -index 9eb103b135e420484c44f26464338aaf3503215e..6a76b06f45ad36230244b822b689b0fac910660c 100644 ---- a/ios/RNSScreenStack.mm -+++ b/ios/RNSScreenStack.mm -@@ -19,6 +19,8 @@ - #import - #import "RCTTouchHandler+RNSUtility.h" - #endif // RCT_NEW_ARCH_ENABLED -+#import -+ - - #import "RNSDefines.h" - #import "RNSPercentDrivenInteractiveTransition.h" -@@ -54,6 +56,37 @@ namespace react = facebook::react; - - @implementation RNSNavigationController - -+- (void)viewDidLoad -+{ -+ [super viewDidLoad]; -+ // Add back gesture -+ // @credits: https://github.com/unixzii -+ [self _installFullScreenGestureRecognizer]; -+ -+} -+ -+- (void)_installFullScreenGestureRecognizer __attribute__((objc_direct)) { -+ id originalTarget = [[self.interactivePopGestureRecognizer valueForKey:@"_targets"] firstObject]; -+ Ivar actionIvar = class_getInstanceVariable([originalTarget class], "_action"); -+ SEL originalAction = *(SEL *) (( ptrdiff_t)(__bridge void *) originalTarget + ivar_getOffset(actionIvar)); -+ UIPanGestureRecognizer *panGestureRecognizer = [[UIPanGestureRecognizer alloc] -+ initWithTarget:[originalTarget valueForKey:@"target"] -+ action:originalAction]; -+ panGestureRecognizer.delegate = self; -+ [self.view addGestureRecognizer:panGestureRecognizer]; -+} -+ -+#pragma mark - UIGestureRecognizerDelegate -+ -+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { -+ return NO; -+} -+ -+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch { -+ return self.viewControllers.count > 1; -+} -+ -+ - #if !TARGET_OS_TV - - (UIViewController *)childViewControllerForStatusBarStyle - { -@@ -347,6 +380,7 @@ RNS_IGNORE_SUPER_CALL_END - if (parentView.reactViewController) { - [parentView.reactViewController addChildViewController:controller]; - [self addSubview:controller.view]; -+ - #if !TARGET_OS_TV - _controller.interactivePopGestureRecognizer.delegate = self; - #endif diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a2a35d20..1658b0044 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,15 +20,14 @@ catalogs: version: 5.9.3 overrides: + '@react-native-menu/menu': 2.0.0 + drizzle-orm: 0.45.1 '@electron/node-gyp': 10.2.0-electron.2 + '@types/react': 19.1.17 '@floating-ui/core': 1.7.2 '@floating-ui/dom': 1.7.2 '@floating-ui/react': 0.27.14 '@floating-ui/react-dom': 2.1.4 - '@react-native-menu/menu': 2.0.0 - '@types/react': 19.1.17 - drizzle-orm: 0.45.1 - global-agent>serialize-error: 7.0.1 is-core-module: npm:@nolyfill/is-core-module@1.0.39 isarray: npm:@nolyfill/isarray@1.0.44 lan-network@<0.1.7: 0.1.7 @@ -38,6 +37,7 @@ overrides: react-native-ios-context-menu: 3.2.1 react-native-ios-utilities: 5.2.0 serialize-error: 2.1.0 + global-agent>serialize-error: 7.0.1 patchedDependencies: '@microflash/remark-callout-directives': @@ -52,15 +52,9 @@ patchedDependencies: '@sentry/electron': hash: c53ad89ecd1e379589255a5f24f183dc3b3779c8cc70629689cc866e69e07738 path: patches/@sentry__electron.patch - better-auth: - hash: d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e - path: patches/better-auth.patch daisyui@4.12.24: hash: d393ab1cbfbfcff21dce0796a59c2d8a37e2c6dd634a8ab476cbc67e47b93d9c path: patches/daisyui@4.12.24.patch - jsonpointer: - hash: ad796d54956ca5a7e9e5232503e5f22d4ffa732fc4552a7e53121ea5fa81d6c1 - path: patches/jsonpointer.patch re-resizable@6.11.2: hash: adb774d32dfdf0ef779d30a8e9e35ba7f3d07706cfe61907db2a53775ea09f23 path: patches/re-resizable@6.11.2.patch @@ -808,7 +802,7 @@ importers: dependencies: '@better-auth/expo': specifier: 1.3.28 - version: 1.3.28(better-auth@1.3.28(patch_hash=d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e)(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(expo-constants@18.0.13(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5)))(expo-crypto@15.0.8(expo@54.0.33))(expo-linking@8.0.11(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))(react@19.1.0))(expo-secure-store@15.0.8(expo@54.0.33))(expo-web-browser@15.0.10(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))) + version: 1.3.28(better-auth@1.3.28(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(expo-constants@18.0.13(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5)))(expo-crypto@15.0.8(expo@54.0.33))(expo-linking@8.0.11(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))(react@19.1.0))(expo-secure-store@15.0.8(expo@54.0.33))(expo-web-browser@15.0.10(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))) '@expo/metro-runtime': specifier: 6.1.2 version: 6.1.2(expo@54.0.33)(react-dom@19.1.0(react@19.1.0))(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))(react@19.1.0) @@ -901,7 +895,7 @@ importers: version: 1.5.6 better-auth: specifier: 1.3.28 - version: 1.3.28(patch_hash=d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e)(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + version: 1.3.28(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) camelcase-keys: specifier: 10.0.2 version: 10.0.2 @@ -1802,7 +1796,7 @@ importers: dependencies: '@better-auth/stripe': specifier: 1.3.28 - version: 1.3.28(@better-auth/core@1.3.34(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.18)(better-call@1.0.19)(jose@6.1.0)(kysely@0.28.8)(nanostores@1.0.1))(better-auth@1.3.28(patch_hash=d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e)(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(stripe@20.3.1(@types/node@25.2.3)) + version: 1.3.28(@better-auth/core@1.3.34(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.18)(better-call@1.0.19)(jose@6.1.0)(kysely@0.28.8)(nanostores@1.0.1))(better-auth@1.3.28(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(stripe@20.3.1(@types/node@25.2.3)) '@electron-toolkit/preload': specifier: 3.0.2 version: 3.0.2(electron@38.3.0) @@ -1823,7 +1817,7 @@ importers: version: 6.0.85(zod@3.25.76) better-auth: specifier: 1.3.28 - version: 1.3.28(patch_hash=d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e)(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + version: 1.3.28(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) drizzle-orm: specifier: 0.45.1 version: 0.45.1(@opentelemetry/api@1.9.0)(@types/pg@8.15.5)(better-sqlite3@12.4.1)(expo-sqlite@16.0.10(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))(react@19.1.0))(kysely@0.28.8)(pg@8.16.3) @@ -17524,7 +17518,7 @@ snapshots: dependencies: ajv: 8.17.1 json-schema: 0.4.0 - jsonpointer: 5.0.1(patch_hash=ad796d54956ca5a7e9e5232503e5f22d4ffa732fc4552a7e53121ea5fa81d6c1) + jsonpointer: 5.0.1 leven: 3.1.0 '@ark/schema@0.46.0': @@ -19162,10 +19156,10 @@ snapshots: nanostores: 1.0.1 zod: 4.3.6 - '@better-auth/expo@1.3.28(better-auth@1.3.28(patch_hash=d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e)(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(expo-constants@18.0.13(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5)))(expo-crypto@15.0.8(expo@54.0.33))(expo-linking@8.0.11(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))(react@19.1.0))(expo-secure-store@15.0.8(expo@54.0.33))(expo-web-browser@15.0.10(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5)))': + '@better-auth/expo@1.3.28(better-auth@1.3.28(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(expo-constants@18.0.13(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5)))(expo-crypto@15.0.8(expo@54.0.33))(expo-linking@8.0.11(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))(react@19.1.0))(expo-secure-store@15.0.8(expo@54.0.33))(expo-web-browser@15.0.10(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5)))': dependencies: '@better-fetch/fetch': 1.1.18 - better-auth: 1.3.28(patch_hash=d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e)(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + better-auth: 1.3.28(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) expo-constants: 18.0.13(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5)) expo-crypto: 15.0.8(expo@54.0.33) expo-linking: 8.0.11(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))(react@19.1.0) @@ -19173,10 +19167,10 @@ snapshots: expo-web-browser: 15.0.10(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5)) zod: 4.3.6 - '@better-auth/stripe@1.3.28(@better-auth/core@1.3.34(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.18)(better-call@1.0.19)(jose@6.1.0)(kysely@0.28.8)(nanostores@1.0.1))(better-auth@1.3.28(patch_hash=d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e)(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(stripe@20.3.1(@types/node@25.2.3))': + '@better-auth/stripe@1.3.28(@better-auth/core@1.3.34(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.18)(better-call@1.0.19)(jose@6.1.0)(kysely@0.28.8)(nanostores@1.0.1))(better-auth@1.3.28(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(stripe@20.3.1(@types/node@25.2.3))': dependencies: '@better-auth/core': 1.3.34(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.18)(better-call@1.0.19)(jose@6.1.0)(kysely@0.28.8)(nanostores@1.0.1) - better-auth: 1.3.28(patch_hash=d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e)(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + better-auth: 1.3.28(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) defu: 6.1.4 stripe: 20.3.1(@types/node@25.2.3) zod: 4.3.6 @@ -21755,7 +21749,7 @@ snapshots: '@folo-services/drizzle': 0.1.44(@opentelemetry/api@1.9.0)(@types/pg@8.15.5)(better-sqlite3@12.4.1)(expo-sqlite@16.0.10(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))(react@19.1.0))(hono@4.9.8)(kysely@0.28.8) '@folo-services/exceptions': 0.1.28 '@folo-services/shared': 0.0.44(@opentelemetry/api@1.9.0)(@types/pg@8.15.5)(better-sqlite3@12.4.1)(expo-sqlite@16.0.10(expo@54.0.33)(react-native@0.81.5(@babel/core@7.29.0)(@types/react@19.1.17)(bufferutil@4.1.0)(react@19.1.0)(utf-8-validate@6.0.5))(react@19.1.0))(hono@4.9.8)(kysely@0.28.8)(pg@8.16.3) - better-auth: 1.3.28(patch_hash=d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e)(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + better-auth: 1.3.28(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) zod: 4.1.12 transitivePeerDependencies: - '@aws-sdk/client-rds-data' @@ -26490,7 +26484,7 @@ snapshots: before-after-hook@2.2.3: {} - better-auth@1.3.28(patch_hash=d961389742aff1e3712a53d0108f4f5f38a61d83be33e94710634d470975263e)(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0): + better-auth@1.3.28(better-sqlite3@12.4.1)(react-dom@19.1.0(react@19.1.0))(react@19.1.0): dependencies: '@better-auth/core': 1.3.28(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.18)(better-call@1.0.19)(better-sqlite3@12.4.1)(jose@6.1.0)(kysely@0.28.8)(nanostores@1.0.1) '@better-auth/telemetry': 1.3.28(better-call@1.0.19)(better-sqlite3@12.4.1)(jose@6.1.0)(kysely@0.28.8)(nanostores@1.0.1) @@ -30698,7 +30692,7 @@ snapshots: generate-function: 2.3.1 generate-object-property: 1.2.0 is-my-ip-valid: 1.0.1 - jsonpointer: 5.0.1(patch_hash=ad796d54956ca5a7e9e5232503e5f22d4ffa732fc4552a7e53121ea5fa81d6c1) + jsonpointer: 5.0.1 xtend: 4.0.2 optional: true @@ -31023,7 +31017,7 @@ snapshots: optionalDependencies: graceful-fs: 4.2.11 - jsonpointer@5.0.1(patch_hash=ad796d54956ca5a7e9e5232503e5f22d4ffa732fc4552a7e53121ea5fa81d6c1): {} + jsonpointer@5.0.1: {} jsonwebtoken@9.0.0: dependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 26fac32ee..24a463b6e 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -66,9 +66,7 @@ patchedDependencies: "@mozilla/readability@0.6.0": patches/@mozilla__readability@0.6.0.patch "@pengx17/electron-forge-maker-appimage": patches/@pengx17__electron-forge-maker-appimage.patch "@sentry/electron": patches/@sentry__electron.patch - better-auth: patches/better-auth.patch daisyui@4.12.24: patches/daisyui@4.12.24.patch - jsonpointer: patches/jsonpointer.patch re-resizable@6.11.2: patches/re-resizable@6.11.2.patch react-native-sheet-transitions: patches/react-native-sheet-transitions.patch react-native-track-player@4.1.1: patches/react-native-track-player@4.1.1.patch