Merge branch 'comment-webm'

sharunkumar · Nov 17, 2023 · b0e9af1 · b0e9af1
2 parents 1393c26 + b061e38
commit b0e9af1
Show file tree

Hide file tree

Showing 38 changed files with 1,463 additions and 1,357 deletions.
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -9,7 +9,6 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
-    implementation project(':capacitor-biometric-lock')
     implementation project(':capacitor-community-app-icon')
     implementation project(':capacitor-app')
     implementation project(':capacitor-browser')
@@ -19,6 +18,7 @@ dependencies {
     implementation project(':capacitor-status-bar')
     implementation project(':capacitor-android-nav-mode')
     implementation project(':capacitor-application-context')
+    implementation project(':capacitor-biometric-lock')
     implementation project(':capacitor-plugin-safe-area')
     implementation project(':capacitor-stash-media')
     implementation "com.android.billingclient:billing:5.2.1"

diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -2,9 +2,6 @@
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capacitor+android@5.2.3_@capacitor+core@5.2.3/node_modules/@capacitor/android/capacitor')
 
-include ':capacitor-biometric-lock'
-project(':capacitor-biometric-lock').projectDir = new File('../node_modules/.pnpm/capacitor-biometric-lock@0.1.0_@capacitor+core@5.2.3/node_modules/capacitor-biometric-lock/android')
-
 include ':capacitor-community-app-icon'
 project(':capacitor-community-app-icon').projectDir = new File('../node_modules/.pnpm/@capacitor-community+app-icon@4.1.1_@capacitor+core@5.2.3/node_modules/@capacitor-community/app-icon/android')
 
@@ -32,6 +29,9 @@ project(':capacitor-android-nav-mode').projectDir = new File('../node_modules/.p
 include ':capacitor-application-context'
 project(':capacitor-application-context').projectDir = new File('../node_modules/.pnpm/capacitor-application-context@0.0.1_@capacitor+core@5.2.3/node_modules/capacitor-application-context/android')
 
+include ':capacitor-biometric-lock'
+project(':capacitor-biometric-lock').projectDir = new File('../node_modules/.pnpm/capacitor-biometric-lock@0.1.0_@capacitor+core@5.2.3/node_modules/capacitor-biometric-lock/android')
+
 include ':capacitor-plugin-safe-area'
 project(':capacitor-plugin-safe-area').projectDir = new File('../node_modules/.pnpm/capacitor-plugin-safe-area@2.0.5_@capacitor+core@5.2.3/node_modules/capacitor-plugin-safe-area/android')
 

diff --git a/capacitor.config.ts b/capacitor.config.ts
@@ -1,4 +1,5 @@
 import { CapacitorConfig } from "@capacitor/cli";
+import { KeyboardResize } from "@capacitor/keyboard";
 
 const config: CapacitorConfig = {
   appId: "app.vger.voyager",
@@ -13,6 +14,7 @@ const config: CapacitorConfig = {
     },
     Keyboard: {
       resizeOnFullScreen: true,
+      resize: KeyboardResize.None,
     },
   },
 };

diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -11,7 +11,6 @@ install! 'cocoapods', :disable_input_output_paths => true
 def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/.pnpm/@capacitor+ios@5.2.3_@capacitor+core@5.2.3/node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/.pnpm/@capacitor+ios@5.2.3_@capacitor+core@5.2.3/node_modules/@capacitor/ios'
-  pod 'CapacitorBiometricLock', :path => '../../node_modules/.pnpm/capacitor-biometric-lock@0.1.0_@capacitor+core@5.2.3/node_modules/capacitor-biometric-lock'
   pod 'CapacitorCommunityAppIcon', :path => '../../node_modules/.pnpm/@capacitor-community+app-icon@4.1.1_@capacitor+core@5.2.3/node_modules/@capacitor-community/app-icon'
   pod 'CapacitorApp', :path => '../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.2.3/node_modules/@capacitor/app'
   pod 'CapacitorBrowser', :path => '../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.2.3/node_modules/@capacitor/browser'
@@ -21,6 +20,7 @@ def capacitor_pods
   pod 'CapacitorStatusBar', :path => '../../node_modules/.pnpm/@capacitor+status-bar@5.0.6_@capacitor+core@5.2.3/node_modules/@capacitor/status-bar'
   pod 'CapacitorAndroidNavMode', :path => '../../node_modules/.pnpm/capacitor-android-nav-mode@0.0.1_@capacitor+core@5.2.3/node_modules/capacitor-android-nav-mode'
   pod 'CapacitorApplicationContext', :path => '../../node_modules/.pnpm/capacitor-application-context@0.0.1_@capacitor+core@5.2.3/node_modules/capacitor-application-context'
+  pod 'CapacitorBiometricLock', :path => '../../node_modules/.pnpm/capacitor-biometric-lock@0.1.0_@capacitor+core@5.2.3/node_modules/capacitor-biometric-lock'
   pod 'CapacitorPluginSafeArea', :path => '../../node_modules/.pnpm/capacitor-plugin-safe-area@2.0.5_@capacitor+core@5.2.3/node_modules/capacitor-plugin-safe-area'
   pod 'CapacitorStashMedia', :path => '../../node_modules/.pnpm/capacitor-stash-media@0.0.7_@capacitor+core@5.2.3/node_modules/capacitor-stash-media'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'

diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -104,6 +104,6 @@ SPEC CHECKSUMS:
   CordovaPlugins: 3fc4a63e9ddeb694a31d5066f262ddbffa996240
   SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
 
-PODFILE CHECKSUM: 28bec64e8057857fa542b87f186d4a9901f4538f
+PODFILE CHECKSUM: 85149bbae99ffc6b028ae0aaae642fa809801685
 
 COCOAPODS: 1.12.1
diff --git a/package.json b/package.json
@@ -21,18 +21,16 @@
   },
   "pnpm": {
     "overrides": {
-      "@ionic/core": "npm:voyager-ionic-core@^7.5.0"
+      "@ionic/core": "npm:voyager-ionic-core@^7.5.5"
     }
   },
   "dependencies": {
     "compression": "^1.7.4",
     "express": "^4.18.2",
     "http-proxy-middleware": "^2.0.6",
-    "mime": "4.0.0-beta.1",
-    "vite-express": "^0.10.0"
+    "vite-express": "^0.11.0"
   },
   "devDependencies": {
-    "capacitor-biometric-lock": "^0.1.0",
     "@capacitor-community/app-icon": "^4.1.1",
     "@capacitor/android": "5.2.3",
     "@capacitor/app": "^5.0.6",
@@ -51,7 +49,7 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@github/markdown-toolbar-element": "^2.2.1",
-    "@ionic/core": "npm:voyager-ionic-core@^7.5.1",
+    "@ionic/core": "npm:voyager-ionic-core@^7.5.5",
     "@ionic/react": "^7.5.1",
     "@ionic/react-router": "^7.5.1",
     "@reduxjs/toolkit": "^1.9.7",
@@ -72,10 +70,11 @@
     "@types/uuid": "^9.0.6",
     "@typescript-eslint/eslint-plugin": "^6.8.0",
     "@typescript-eslint/parser": "^6.8.0",
-    "@vitejs/plugin-legacy": "^4.1.1",
+    "@vitejs/plugin-legacy": "^5.0.0",
     "@vitejs/plugin-react": "^4.1.0",
     "capacitor-android-nav-mode": "^0.0.1",
     "capacitor-application-context": "^0.0.1",
+    "capacitor-biometric-lock": "^0.1.0",
     "capacitor-plugin-safe-area": "^2.0.5",
     "capacitor-set-version": "^2.2.0",
     "capacitor-stash-media": "^0.0.7",
@@ -93,7 +92,7 @@
     "ionicons": "^7.2.1",
     "js-cookie": "^3.0.5",
     "jsdom": "^22.1.0",
-    "lemmy-js-client": "0.19.0-alpha.16",
+    "lemmy-js-client": "0.19.0-alpha.18",
     "lodash": "^4.17.21",
     "mdast-util-gfm-autolink-literal-lemmy": "^1.0.3",
     "mdast-util-gfm-strikethrough": "^1.0.3",
@@ -116,7 +115,7 @@
     "react-router-dom": "^5.3.4",
     "react-textarea-autosize": "^8.5.3",
     "react-transition-state": "^2.1.1",
-    "release-it": "^16.2.1",
+    "release-it": "^17.0.0",
     "remark-gfm": "^3.0.1",
     "remark-parse": "^10.0.2",
     "terser": "^5.22.0",
@@ -127,8 +126,8 @@
     "use-long-press": "^3.2.0",
     "usehooks-ts": "^2.9.1",
     "uuid": "^9.0.1",
-    "virtua": "^0.15.4",
-    "vite": "^5.0.0-beta.14",
+    "virtua": "^0.16.3",
+    "vite": "^5.0.0",
     "vite-plugin-pwa": "^0.16.6",
     "vite-plugin-svgr": "^4.1.0",
     "vitest": "^0.34.6",