Upgrade to yarn 3

.gitignore

@@ -66,4 +66,13 @@ buck-out/
 web-build/
 dist/
 
-# @end expo-cli
+# @end expo-cli
+
+# yarn 3
+.pnp.*
+.yarn/*
+!.yarn/patches
+# !.yarn/plugins
+# !.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.yarn/patches/@types-react-native-share-menu-npm-5.0.2-373df17ecc.patch

@@ -1,7 +1,7 @@
-diff --git a/node_modules/@types/react-native-share-menu/index.d.ts b/node_modules/@types/react-native-share-menu/index.d.ts
+diff --git a/index.d.ts b/index.d.ts
-index f52822c..ee98565 100755
+index f52822c8bed928f387baf90fdb7342c7416a775a..6d9d480d18342832c4b07af2b10f4a63ff538e7b 100755
---- a/node_modules/@types/react-native-share-menu/index.d.ts
+--- a/index.d.ts
-+++ b/node_modules/@types/react-native-share-menu/index.d.ts
++++ b/index.d.ts
 @@ -5,11 +5,9 @@
  // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
  // Minimum TypeScript Version: 3.7
@@ -17,12 +17,18 @@ index f52822c..ee98565 100755
  
  export type ShareCallback = (share?: ShareData) => void;
  
-@@ -28,7 +26,7 @@ interface ShareMenuReactView {
+@@ -25,10 +23,10 @@ interface ShareMenu {
-     dismissExtension(error?: string): void;
+ }
-     openApp(): void;
+ 
-     continueInApp(extraData?: object): void;
+ interface ShareMenuReactView {
+-    dismissExtension(error?: string): void;
+-    openApp(): void;
+-    continueInApp(extraData?: object): void;
 -    data(): Promise<{mimeType: string, data: string}>;
-+    data(): Promise<{data: {mimeType: string; data: string}[]}>;
++    dismissExtension(error?: string): void
++    openApp(): void
++    continueInApp(extraData?: object): void
++    data(): Promise<{ data: { mimeType: string; data: string }[] }>
  }
  
  export const ShareMenuReactView: ShareMenuReactView;

.yarn/patches/expo-av-npm-13.0.2-7a651776f1.patch

@@ -0,0 +1,13 @@
+diff --git a/ios/EXAV/EXAudioSessionManager.m b/ios/EXAV/EXAudioSessionManager.m
+index 81dce13366c3947b12c863f7b39c0237882a6c36..fa27e0a354d48a994ca46e19642a5e224d42d9a8 100644
+--- a/ios/EXAV/EXAudioSessionManager.m
++++ b/ios/EXAV/EXAudioSessionManager.m
+@@ -170,7 +170,7 @@ - (void)moduleDidBackground:(id)backgroundingModule
+   [_foregroundedModules compact];
+ 
+   // Any possible failures are silent
+-  [self _updateSessionConfiguration];
++  // [self _updateSessionConfiguration];
+ }
+ 
+ - (void)moduleDidForeground:(id)module

.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch

@@ -1,7 +1,7 @@
-diff --git a/node_modules/react-native-fast-image/RNFastImage.podspec b/node_modules/react-native-fast-image/RNFastImage.podspec
+diff --git a/RNFastImage.podspec b/RNFastImage.podspec
-index db0fada..b23cd91 100644
+index db0fada63fc06191f8620d336d244edde6c3dba3..b23cd91a9d70bdb8abd2f4ba1417c2c35e5a1d4c 100644
---- a/node_modules/react-native-fast-image/RNFastImage.podspec
+--- a/RNFastImage.podspec
-+++ b/node_modules/react-native-fast-image/RNFastImage.podspec
++++ b/RNFastImage.podspec
 @@ -16,6 +16,6 @@ Pod::Spec.new do |s|
    s.source_files  = "ios/**/*.{h,m}"
  
@@ -11,10 +11,10 @@ index db0fada..b23cd91 100644
 +  s.dependency 'SDWebImage', '~> 5.14.2'
 +  s.dependency 'SDWebImageWebPCoder', '~> 0.9.1'
  end
-diff --git a/node_modules/react-native-fast-image/android/build.gradle b/node_modules/react-native-fast-image/android/build.gradle
+diff --git a/android/build.gradle b/android/build.gradle
-index 5b21cd5..19d82f8 100644
+index 5b21cd59c40a5754f5d19c77e2a0eb0229925911..19d82f826e88125c5e6d87ee7c348fac621f548c 100644
---- a/node_modules/react-native-fast-image/android/build.gradle
+--- a/android/build.gradle
-+++ b/node_modules/react-native-fast-image/android/build.gradle
++++ b/android/build.gradle
 @@ -65,4 +65,5 @@ dependencies {
      implementation "com.github.bumptech.glide:glide:${glideVersion}"
      implementation "com.github.bumptech.glide:okhttp3-integration:${glideVersion}"

.yarn/patches/react-native-htmlview-npm-0.16.0-501f1b89ba.patch

@@ -1,7 +1,7 @@
-diff --git a/node_modules/react-native-htmlview/HTMLView.js b/node_modules/react-native-htmlview/HTMLView.js
+diff --git a/HTMLView.js b/HTMLView.js
-index 43f8b7e..728112b 100644
+index 43f8b7eb552d9a44b5feef74ec2ae7d7ddbc2fca..334d144f1fb96067726bca199ff37267c2fa0fb2 100644
---- a/node_modules/react-native-htmlview/HTMLView.js
+--- a/HTMLView.js
-+++ b/node_modules/react-native-htmlview/HTMLView.js
++++ b/HTMLView.js
 @@ -1,7 +1,7 @@
  import React, {PureComponent} from 'react';
  import PropTypes from 'prop-types';
@@ -16,7 +16,7 @@ index 43f8b7e..728112b 100644
    RootComponent: PropTypes.func,
    rootComponentProps: PropTypes.object,
 -  style: ViewPropTypes.style,
-+  style: PropTypes.any,
++  style: PropTypes.object,
    stylesheet: PropTypes.object,
    TextComponent: PropTypes.func,
    textComponentProps: PropTypes.object,

.yarn/patches/react-native-share-menu-npm-6.0.0-f1094c3204.patch

@@ -1,7 +1,7 @@
-diff --git a/node_modules/react-native-share-menu/android/build.gradle b/node_modules/react-native-share-menu/android/build.gradle
+diff --git a/android/build.gradle b/android/build.gradle
-index 9557fdb..ebdeb6f 100644
+index 9557fdbf2fbf97b7f7aeaf7ce86d301a8ced213d..ebdeb6f4de7846d3241101001755595c52a4b05e 100644
---- a/node_modules/react-native-share-menu/android/build.gradle
+--- a/android/build.gradle
-+++ b/node_modules/react-native-share-menu/android/build.gradle
++++ b/android/build.gradle
 @@ -1,12 +1,12 @@
  apply plugin: 'com.android.library'
  
@@ -19,10 +19,10 @@ index 9557fdb..ebdeb6f 100644
          versionCode 1
          versionName "1.0"
          ndk {
-diff --git a/node_modules/react-native-share-menu/ios/ReactShareViewController.swift b/node_modules/react-native-share-menu/ios/ReactShareViewController.swift
+diff --git a/ios/ReactShareViewController.swift b/ios/ReactShareViewController.swift
-index f42bce6..ee36062 100644
+index f42bce6ce7e3f48a7ddc83f3366b68fd0664b1a0..ee360622b1d03cc9661c78c6f210b84c3b19a725 100644
---- a/node_modules/react-native-share-menu/ios/ReactShareViewController.swift
+--- a/ios/ReactShareViewController.swift
-+++ b/node_modules/react-native-share-menu/ios/ReactShareViewController.swift
++++ b/ios/ReactShareViewController.swift
 @@ -13,7 +13,7 @@ class ReactShareViewController: ShareViewController, RCTBridgeDelegate, ReactSha
    func sourceURL(for bridge: RCTBridge!) -> URL! {
  #if DEBUG
@@ -32,10 +32,10 @@ index f42bce6..ee36062 100644
  #else
      return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
  #endif
-diff --git a/node_modules/react-native-share-menu/ios/ShareViewController.swift b/node_modules/react-native-share-menu/ios/ShareViewController.swift
+diff --git a/ios/ShareViewController.swift b/ios/ShareViewController.swift
-index 12d8c92..64aa72b 100644
+index 12d8c92dda20fabd9e7b55fec57b3d867414063c..8a1db0de285b18a9358a10b2ca8293a8c7d56a8e 100644
---- a/node_modules/react-native-share-menu/ios/ShareViewController.swift
+--- a/ios/ShareViewController.swift
-+++ b/node_modules/react-native-share-menu/ios/ShareViewController.swift
++++ b/ios/ShareViewController.swift
 @@ -19,8 +19,8 @@ class ShareViewController: SLComposeServiceViewController {
    var hostAppUrlScheme: String?
    var sharedItems: [Any] = []
@@ -78,7 +78,7 @@ index 12d8c92..64aa72b 100644
      override func configurationItems() -> [Any]! {
          // To add configuration options via table cells at the bottom of the sheet, return an array of SLComposeSheetConfigurationItem here.
          return []
-@@ -238,11 +235,10 @@ class ShareViewController: SLComposeServiceViewController {
+@@ -238,7 +235,7 @@ class ShareViewController: SLComposeServiceViewController {
    
    func completeRequest() {
      // Inform the host that we're done, so it un-blocks its UI. Note: Alternatively you could call super's -didSelectPost, which will similarly complete the extension context.
@@ -87,7 +87,3 @@ index 12d8c92..64aa72b 100644
    }
    
    func cancelRequest() {
-     extensionContext!.cancelRequest(withError: NSError())
-   }
--
- }

.yarnrc.yml

@@ -0,0 +1,7 @@
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
+    spec: "@yarnpkg/plugin-typescript"
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"

babel.config.js

@@ -1,47 +1,30 @@
 module.exports = function (api) {
-  api.cache(true)
+  api.cache(false)
 
-  const plugins = [
+  if (process.env.NODE_ENV === 'production' || process.env.BABEL_ENV === 'production') {
-    '@babel/plugin-proposal-optional-chaining',
-    [
-      'module-resolver',
-      {
-        root: ['./'],
-        alias: {
-          '@assets': './assets',
-          '@root': './src',
-          '@api': './src/api',
-          '@helpers': './src/helpers',
-          '@components': './src/components',
-          '@screens': './src/screens',
-          '@utils': './src/utils'
-        }
-      }
-    ],
-    'react-native-reanimated/plugin'
-  ]
-
-  if (
-    process.env.NODE_ENV === 'production' ||
-    process.env.BABEL_ENV === 'production'
-  ) {
     plugins.push('transform-remove-console')
   }
 
   return {
-    presets: [
+    presets: ['babel-preset-expo'],
-      'babel-preset-expo',
+    plugins: [
+      '@babel/plugin-proposal-optional-chaining',
       [
-        '@babel/preset-react',
+        'module-resolver',
         {
-          importSource: '@welldone-software/why-did-you-render',
+          root: ['./'],
-          runtime: 'automatic',
+          alias: {
-          development:
+            '@assets': './assets',
-            process.env.NODE_ENV === 'development' ||
+            '@root': './src',
-            process.env.BABEL_ENV === 'development'
+            '@api': './src/api',
+            '@helpers': './src/helpers',
+            '@components': './src/components',
+            '@screens': './src/screens',
+            '@utils': './src/utils'
+          }
         }
-      ]
+      ],
-    ],
+      'react-native-reanimated/plugin'
-    plugins
+    ]
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tooot",
-  "version": "4.7.3",
+  "version": "4.8.0",
   "description": "tooot for Mastodon",
   "author": "xmflsct <me@xmflsct.com>",
   "license": "GPL-3.0-or-later",
@@ -14,8 +14,7 @@
     "iphone": "react-native run-ios --simulator 'iPhone 14 Pro'",
     "ipad": "react-native run-ios --simulator 'iPad Pro (11-inch) (4th generation)'",
     "app:build": "bundle exec fastlane",
-    "clean": "react-native-clean-project",
+    "clean": "react-native-clean-project"
-    "postinstall": "patch-package"
   },
   "dependencies": {
     "@expo/react-native-action-sheet": "^4.0.1",
@@ -34,24 +33,24 @@
     "@react-native-community/netinfo": "9.3.7",
     "@react-native-community/segmented-control": "^2.2.2",
     "@react-native-menu/menu": "^0.7.2",
-    "@react-navigation/bottom-tabs": "^6.5.1",
+    "@react-navigation/bottom-tabs": "^6.5.2",
     "@react-navigation/native": "^6.1.1",
-    "@react-navigation/native-stack": "^6.9.6",
+    "@react-navigation/native-stack": "^6.9.7",
-    "@react-navigation/stack": "^6.3.9",
+    "@react-navigation/stack": "^6.3.10",
     "@reduxjs/toolkit": "^1.9.1",
     "@sentry/react-native": "4.12.0",
     "@sharcoux/slider": "^6.1.1",
     "@tanstack/react-query": "^4.20.4",
     "axios": "^1.2.1",
     "diff": "^5.1.0",
-    "expo": "^47.0.8",
+    "expo": "^47.0.9",
-    "expo-auth-session": "^3.7.3",
+    "expo-auth-session": "^3.8.0",
     "expo-av": "^13.0.2",
     "expo-constants": "^14.0.2",
     "expo-crypto": "^12.0.0",
     "expo-file-system": "^15.1.1",
     "expo-haptics": "^12.0.1",
-    "expo-linking": "^3.2.3",
+    "expo-linking": "^3.3.0",
     "expo-localization": "^14.0.0",
     "expo-notifications": "^0.17.0",
     "expo-random": "^13.0.0",
@@ -61,14 +60,14 @@
     "expo-store-review": "^6.0.0",
     "expo-video-thumbnails": "^7.0.0",
     "expo-web-browser": "~12.0.0",
-    "i18next": "^22.4.5",
+    "i18next": "^22.4.6",
     "linkify-it": "^4.0.1",
     "lodash": "^4.17.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-i18next": "^12.1.1",
     "react-intl": "^6.2.5",
-    "react-native": "0.70.6",
+    "react-native": "^0.70.6",
     "react-native-animated-spinkit": "^1.5.2",
     "react-native-base64": "^0.2.1",
     "react-native-blurhash": "^1.1.10",
@@ -77,7 +76,7 @@
     "react-native-flash-message": "^0.3.1",
     "react-native-gesture-handler": "~2.8.0",
     "react-native-htmlview": "^0.16.0",
-    "react-native-image-picker": "^4.10.2",
+    "react-native-image-picker": "^4.10.3",
     "react-native-ios-context-menu": "^1.15.1",
     "react-native-language-detection": "^0.2.2",
     "react-native-pager-view": "^6.1.2",
@@ -94,33 +93,35 @@
     "rn-placeholder": "^3.0.3",
     "rtl-detect": "^1.0.4",
     "valid-url": "^1.0.9",
-    "zeego": "^0.5.0"
+    "zeego": "^1.0.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.5",
+    "@babel/core": "^7.20.7",
-    "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+    "@babel/plugin-proposal-optional-chaining": "^7.20.7",
-    "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@expo/config": "^7.0.3",
     "@types/diff": "^5.0.2",
     "@types/linkify-it": "^3.0.2",
     "@types/lodash": "^4.14.191",
-    "@types/react": "~18.0.26",
+    "@types/react": "^18.0.26",
-    "@types/react-dom": "~18.0.9",
+    "@types/react-dom": "^18.0.10",
-    "@types/react-native": "~0.70.8",
+    "@types/react-native": "^0.70.8",
     "@types/react-native-base64": "^0.2.0",
     "@types/react-native-share-menu": "^5.0.2",
-    "@types/react-timeago": "^4.1.3",
     "@types/valid-url": "^1.0.3",
-    "@welldone-software/why-did-you-render": "^7.0.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "chalk": "^4.1.2",
     "dotenv": "^16.0.3",
-    "expo-cli": "^6.0.8",
-    "patch-package": "^6.5.0",
-    "postinstall-postinstall": "^2.1.0",
     "react-native-clean-project": "^4.0.1",
     "typescript": "^4.9.4"
+  },
+  "packageManager": "yarn@3.3.1",
+  "resolutions": {
+    "react-native-fast-image@^8.6.3": "patch:react-native-fast-image@npm%3A8.6.3#./.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch",
+    "expo-av@^13.0.2": "patch:expo-av@npm%3A13.0.2#./.yarn/patches/expo-av-npm-13.0.2-7a651776f1.patch",
+    "react-native-htmlview@^0.16.0": "patch:react-native-htmlview@npm%3A0.16.0#./.yarn/patches/react-native-htmlview-npm-0.16.0-501f1b89ba.patch",
+    "react-native-share-menu@^6.0.0": "patch:react-native-share-menu@npm%3A6.0.0#./.yarn/patches/react-native-share-menu-npm-6.0.0-f1094c3204.patch",
+    "@types/react-native-share-menu@^5.0.2": "patch:@types/react-native-share-menu@npm%3A5.0.2#./.yarn/patches/@types-react-native-share-menu-npm-5.0.2-373df17ecc.patch"
   }
 }

patches/expo-av+13.0.2.patch

@@ -1,14 +0,0 @@
-diff --git a/node_modules/expo-av/ios/EXAV/EXAudioSessionManager.m b/node_modules/expo-av/ios/EXAV/EXAudioSessionManager.m
-index 81dce13..8664b90 100644
---- a/node_modules/expo-av/ios/EXAV/EXAudioSessionManager.m
-+++ b/node_modules/expo-av/ios/EXAV/EXAudioSessionManager.m
-@@ -168,9 +168,6 @@ - (void)moduleDidBackground:(id)backgroundingModule
-   // compact doesn't work, that's why we need the `|| !pointer` above
-   // http://www.openradar.me/15396578
-   [_foregroundedModules compact];
--
--  // Any possible failures are silent
--  [self _updateSessionConfiguration];
- }
- 
- - (void)moduleDidForeground:(id)module

src/App.tsx

@@ -4,7 +4,6 @@ import queryClient from '@helpers/queryClient'
 import i18n from '@root/i18n/i18n'
 import Screens from '@root/Screens'
 import audio from '@root/startup/audio'
-import dev from '@root/startup/dev'
 import log from '@root/startup/log'
 import netInfo from '@root/startup/netInfo'
 import push from '@root/startup/push'
@@ -31,7 +30,6 @@ Platform.select({
   android: LogBox.ignoreLogs(['Setting a timer for a long period of time'])
 })
 
-dev()
 sentry()
 audio()
 push()

src/startup/dev.ts

@@ -1,12 +0,0 @@
-const dev = () => {
-  if (__DEV__) {
-    // log('log', 'devs', 'initializing wdyr')
-    // const whyDidYouRender = require('@welldone-software/why-did-you-render')
-    // whyDidYouRender(React, {
-    //   trackHooks: true,
-    //   hotReloadBufferMs: 1000
-    // })
-  }
-}
-
-export default dev