Merge Release 2.18.3

sharunkumar · Oct 20, 2024 · ee40f48 · ee40f48
2 parents 6d8eeb5 + e092943
commit ee40f48
Show file tree

Hide file tree

Showing 12 changed files with 2,130 additions and 1,081 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "app.vger.voyager"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 264
-        versionName "2.18.2"
+        versionCode 265
+        versionName "2.18.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -9,7 +9,7 @@ include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacitor+app@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/app/android')
 
 include ':capacitor-browser'
-project(':capacitor-browser').projectDir = new File('../node_modules/.pnpm/@capacitor+browser@6.0.2_patch_hash=33x6bihgpnt6i5jbwxndhs4p3q_@capacitor+core@6.1.2/node_modules/@capacitor/browser/android')
+project(':capacitor-browser').projectDir = new File('../node_modules/.pnpm/@capacitor+browser@6.0.3_patch_hash=33x6bihgpnt6i5jbwxndhs4p3q_@capacitor+core@6.1.2/node_modules/@capacitor/browser/android')
 
 include ':capacitor-filesystem'
 project(':capacitor-filesystem').projectDir = new File('../node_modules/.pnpm/@capacitor+filesystem@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/filesystem/android')

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -600,7 +600,6 @@
 			baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				"ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES[sdk=*]" = pride_v2;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_STYLE = Automatic;

diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -17,7 +17,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.18.2</string>
+    <string>2.18.3</string>
     <key>CFBundleURLTypes</key>
     <array>
       <dict>
@@ -32,7 +32,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>264</string>
+    <string>265</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSRequiresIPhoneOS</key>

diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -13,7 +13,7 @@ def capacitor_pods
   pod 'CapacitorCordova', :path => '../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios'
   pod 'CapacitorCommunityAppIcon', :path => '../../node_modules/.pnpm/@capacitor-community+app-icon@5.0.0_@capacitor+core@6.1.2/node_modules/@capacitor-community/app-icon'
   pod 'CapacitorApp', :path => '../../node_modules/.pnpm/@capacitor+app@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/app'
-  pod 'CapacitorBrowser', :path => '../../node_modules/.pnpm/@capacitor+browser@6.0.2_patch_hash=33x6bihgpnt6i5jbwxndhs4p3q_@capacitor+core@6.1.2/node_modules/@capacitor/browser'
+  pod 'CapacitorBrowser', :path => '../../node_modules/.pnpm/@capacitor+browser@6.0.3_patch_hash=33x6bihgpnt6i5jbwxndhs4p3q_@capacitor+core@6.1.2/node_modules/@capacitor/browser'
   pod 'CapacitorFilesystem', :path => '../../node_modules/.pnpm/@capacitor+filesystem@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/filesystem'
   pod 'CapacitorHaptics', :path => '../../node_modules/.pnpm/@capacitor+haptics@6.0.1_patch_hash=isktf3ewuigcwl72katxy46idi_@capacitor+core@6.1.2/node_modules/@capacitor/haptics'
   pod 'CapacitorKeyboard', :path => '../../node_modules/.pnpm/@capacitor+keyboard@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/keyboard'

diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -9,7 +9,7 @@ PODS:
     - Capacitor
   - CapacitorBiometricLock (1.0.0):
     - Capacitor
-  - CapacitorBrowser (6.0.2):
+  - CapacitorBrowser (6.0.3):
     - Capacitor
   - CapacitorClearCache (1.0.1):
     - Capacitor
@@ -47,7 +47,7 @@ DEPENDENCIES:
   - "CapacitorApp (from `../../node_modules/.pnpm/@capacitor+app@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/app`)"
   - "CapacitorApplicationContext (from `../../node_modules/.pnpm/capacitor-application-context@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-application-context`)"
   - "CapacitorBiometricLock (from `../../node_modules/.pnpm/capacitor-biometric-lock@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-biometric-lock`)"
-  - "CapacitorBrowser (from `../../node_modules/.pnpm/@capacitor+browser@6.0.2_patch_hash=33x6bihgpnt6i5jbwxndhs4p3q_@capacitor+core@6.1.2/node_modules/@capacitor/browser`)"
+  - "CapacitorBrowser (from `../../node_modules/.pnpm/@capacitor+browser@6.0.3_patch_hash=33x6bihgpnt6i5jbwxndhs4p3q_@capacitor+core@6.1.2/node_modules/@capacitor/browser`)"
   - "CapacitorClearCache (from `../../node_modules/.pnpm/capacitor-clear-cache@1.0.1_@capacitor+core@6.1.2/node_modules/capacitor-clear-cache`)"
   - "CapacitorCommunityAppIcon (from `../../node_modules/.pnpm/@capacitor-community+app-icon@5.0.0_@capacitor+core@6.1.2/node_modules/@capacitor-community/app-icon`)"
   - "CapacitorCordova (from `../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios`)"
@@ -78,7 +78,7 @@ EXTERNAL SOURCES:
   CapacitorBiometricLock:
     :path: "../../node_modules/.pnpm/capacitor-biometric-lock@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-biometric-lock"
   CapacitorBrowser:
-    :path: "../../node_modules/.pnpm/@capacitor+browser@6.0.2_patch_hash=33x6bihgpnt6i5jbwxndhs4p3q_@capacitor+core@6.1.2/node_modules/@capacitor/browser"
+    :path: "../../node_modules/.pnpm/@capacitor+browser@6.0.3_patch_hash=33x6bihgpnt6i5jbwxndhs4p3q_@capacitor+core@6.1.2/node_modules/@capacitor/browser"
   CapacitorClearCache:
     :path: "../../node_modules/.pnpm/capacitor-clear-cache@1.0.1_@capacitor+core@6.1.2/node_modules/capacitor-clear-cache"
   CapacitorCommunityAppIcon:
@@ -112,7 +112,7 @@ SPEC CHECKSUMS:
   CapacitorApp: 0bc633b4eae40a1f32cd2834788fad3bc42da6a1
   CapacitorApplicationContext: 2bee68107e6efb8f89b5db102dc95a9cf74c9464
   CapacitorBiometricLock: a91f2e8b28527e0d98032270f9363c4844abf1b9
-  CapacitorBrowser: 83ec661a9ccd56c28a6851e4dd1ac33b181227ec
+  CapacitorBrowser: aab1ed943b01c0365c4810538a8b3477e2d9f72e
   CapacitorClearCache: 66a0b1bd6ed2d130d1c5467d3c001486cc1aa1eb
   CapacitorCommunityAppIcon: 4873c7de4cd50e68a36e08fe93f88f479e7b16a2
   CapacitorCordova: f48c89f96c319101cd2f0ce8a2b7449b5fb8b3dd
@@ -128,6 +128,6 @@ SPEC CHECKSUMS:
   CapacitorTips: 2087733aea06ec041b210085395ca934c8554907
   SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
 
-PODFILE CHECKSUM: 5ca86318d997d7fd0fc8bc5b29560c7de0d0c229
+PODFILE CHECKSUM: d6642cc2d1bb1e1c0cbeb8c6b21a091b24db78c6
 
 COCOAPODS: 1.12.1
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "voyager",
   "description": "A progressive webapp Lemmy client",
   "private": true,
-  "version": "2.18.2",
+  "version": "2.18.3",
   "type": "module",
   "packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e",
   "scripts": {
@@ -23,10 +23,10 @@
   },
   "pnpm": {
     "overrides": {
-      "@ionic/core": "npm:voyager-ionic-core@8.2.6"
+      "@ionic/core": "npm:voyager-ionic-core@8.3.3"
     },
     "patchedDependencies": {
-      "@capacitor/browser@6.0.2": "patches/@capacitor__browser@6.0.2.patch",
+      "@capacitor/browser@6.0.3": "patches/@capacitor__browser@6.0.3.patch",
       "@capacitor/haptics@6.0.1": "patches/@capacitor__haptics@6.0.1.patch"
     }
   },
@@ -36,7 +36,7 @@
     "@capacitor/android": "^6.1.2",
     "@capacitor/app": "^6.0.1",
     "@capacitor/assets": "^3.0.5",
-    "@capacitor/browser": "^6.0.2",
+    "@capacitor/browser": "^6.0.3",
     "@capacitor/core": "^6.1.2",
     "@capacitor/filesystem": "^6.0.1",
     "@capacitor/haptics": "^6.0.1",
@@ -46,12 +46,12 @@
     "@capacitor/share": "^6.0.2",
     "@capacitor/status-bar": "^6.0.1",
     "@github/markdown-toolbar-element": "^2.2.3",
-    "@ionic/core": "npm:voyager-ionic-core@8.2.6",
-    "@ionic/react": "8.2.6",
-    "@ionic/react-router": "8.2.6",
+    "@ionic/core": "npm:voyager-ionic-core@8.3.3",
+    "@ionic/react": "8.3.3",
+    "@ionic/react-router": "8.3.3",
     "@linaria/core": "^6.2.0",
     "@linaria/react": "^6.2.1",
-    "@reduxjs/toolkit": "^2.2.7",
+    "@reduxjs/toolkit": "^2.3.0",
     "capacitor-android-nav-mode": "^1.0.0",
     "capacitor-application-context": "^1.0.0",
     "capacitor-biometric-lock": "^1.0.0",
@@ -82,16 +82,16 @@
     "react": "^18.3.1",
     "react-animate-height": "^3.2.3",
     "react-dom": "^18.3.1",
-    "react-error-boundary": "^4.0.13",
+    "react-error-boundary": "^4.1.1",
     "react-intersection-observer": "^9.13.1",
     "react-markdown": "^9.0.1",
     "react-merge-refs": "^2.1.1",
     "react-redux": "^9.1.2",
     "react-reverse-portal": "^2.1.2",
     "react-router": "^5.3.4",
     "react-router-dom": "^5.3.4",
-    "react-textarea-autosize": "^8.5.3",
-    "react-transition-state": "^2.1.2",
+    "react-textarea-autosize": "^8.5.4",
+    "react-transition-state": "^2.1.3",
     "rehype-highlight": "^6.0.0",
     "rehype-parse": "^9.0.1",
     "rehype-remark": "^10.0.0",
@@ -105,55 +105,55 @@
     "use-long-press": "^3.2.0",
     "usehooks-ts": "^3.1.0",
     "uuid": "^10.0.0",
-    "virtua": "^0.34.2",
+    "virtua": "^0.35.1",
     "workbox-window": "^7.1.0"
   },
   "devDependencies": {
-    "@babel/preset-react": "^7.24.7",
-    "@babel/preset-typescript": "^7.24.7",
+    "@babel/preset-react": "^7.25.7",
+    "@babel/preset-typescript": "^7.25.7",
     "@capacitor/cli": "^6.1.2",
-    "@eslint/compat": "^1.1.1",
+    "@eslint/compat": "^1.2.0",
     "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.11.1",
+    "@eslint/js": "^9.12.0",
     "@ionic/cli": "^7.2.0",
-    "@playwright/test": "^1.47.2",
-    "@testing-library/jest-dom": "^6.5.0",
+    "@playwright/test": "^1.48.1",
+    "@testing-library/jest-dom": "^6.6.2",
     "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.5.2",
     "@trapezedev/configure": "^7.0.10",
     "@types/history": "^4.7.11",
     "@types/jest": "^29.5.13",
-    "@types/lodash": "^4.17.9",
+    "@types/lodash": "^4.17.10",
     "@types/mdast": "^4.0.4",
-    "@types/node": "^22.7.4",
-    "@types/react": "^18.3.10",
-    "@types/react-dom": "^18.3.0",
+    "@types/node": "^22.7.6",
+    "@types/react": "^18.3.11",
+    "@types/react-dom": "^18.3.1",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "^5.3.3",
     "@types/ua-parser-js": "^0.7.39",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.8.0",
-    "@typescript-eslint/parser": "^8.8.0",
+    "@typescript-eslint/eslint-plugin": "^8.10.0",
+    "@typescript-eslint/parser": "^8.10.0",
     "@vitejs/plugin-legacy": "^5.4.2",
     "@vitejs/plugin-react": "^4.3.2",
     "@wyw-in-js/babel-preset": "^0.5.4",
     "@wyw-in-js/vite": "^0.5.4",
-    "eslint": "^9.11.1",
+    "eslint": "^9.12.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.37.1",
-    "eslint-plugin-react-hooks": "^4.6.2",
-    "globals": "^15.10.0",
+    "eslint-plugin-react-hooks": "^5.0.0",
+    "globals": "^15.11.0",
     "jsdom": "^25.0.1",
     "mdast-util-lemmy-spoiler": "^2.0.0",
     "prettier": "^3.3.3",
     "pwa-asset-generator": "^6.3.2",
-    "release-it": "^17.6.0",
-    "terser": "^5.34.1",
-    "typescript": "^5.6.2",
-    "vite": "^5.4.8",
+    "release-it": "^17.10.0",
+    "terser": "^5.36.0",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.9",
     "vite-plugin-pwa": "^0.20.5",
     "vite-plugin-svgr": "^4.2.0",
-    "vitest": "^2.1.1"
+    "vitest": "^2.1.3"
   }
 }
diff --git a/patches/@capacitor__browser@6.0.2.patch → patches/@capacitor__browser@6.0.3.patch b/patches/@capacitor__browser@6.0.2.patch → patches/@capacitor__browser@6.0.3.patch