Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
sharunkumar committed Nov 18, 2024
2 parents f6542e7 + 813c901 commit 98d5467
Show file tree
Hide file tree
Showing 29 changed files with 960 additions and 950 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Build (Ionic)
run: pnpm exec ionic cap sync
env:
BUILD_FOSS_ONLY: 1
BUILD_FOSS_ONLY: true
CI_PLATFORM: android

- name: Set up JDK 11
Expand Down
2 changes: 1 addition & 1 deletion .release-it.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://unpkg.com/release-it@17/schema/release-it.json",
"git": {
"commitMessage": "release: bump version to ${version}",
"commitMessage": "chore: bump version to ${version}",
"tag": false,
"getLatestTagFromAllRefs": true
},
Expand Down
3 changes: 2 additions & 1 deletion android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,20 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-community-app-icon')
implementation project(':capacitor-app')
implementation project(':capacitor-browser')
implementation project(':capacitor-filesystem')
implementation project(':capacitor-haptics')
implementation project(':capacitor-keyboard')
implementation project(':capacitor-network')
implementation project(':capacitor-share')
implementation project(':capacitor-splash-screen')
implementation project(':capacitor-status-bar')
implementation project(':capacitor-android-nav-mode')
implementation project(':capacitor-application-context')
implementation project(':capacitor-biometric-lock')
implementation project(':capacitor-clear-cache')
implementation project(':capacitor-launch-native')
implementation project(':capacitor-plugin-safe-area')
implementation project(':capacitor-reader')
implementation project(':capacitor-stash-media')
implementation project(':capacitor-tips')

Expand Down
9 changes: 6 additions & 3 deletions android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ project(':capacitor-community-app-icon').projectDir = new File('../node_modules/
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.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')

Expand All @@ -26,6 +23,9 @@ project(':capacitor-network').projectDir = new File('../node_modules/.pnpm/@capa
include ':capacitor-share'
project(':capacitor-share').projectDir = new File('../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share/android')

include ':capacitor-splash-screen'
project(':capacitor-splash-screen').projectDir = new File('../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen/android')

include ':capacitor-status-bar'
project(':capacitor-status-bar').projectDir = new File('../node_modules/.pnpm/@capacitor+status-bar@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/status-bar/android')

Expand All @@ -47,6 +47,9 @@ project(':capacitor-launch-native').projectDir = new File('../node_modules/.pnpm
include ':capacitor-plugin-safe-area'
project(':capacitor-plugin-safe-area').projectDir = new File('../node_modules/.pnpm/capacitor-plugin-safe-area@3.0.3_@capacitor+core@6.1.2/node_modules/capacitor-plugin-safe-area/android')

include ':capacitor-reader'
project(':capacitor-reader').projectDir = new File('../node_modules/.pnpm/capacitor-reader@0.1.0_@capacitor+core@6.1.2/node_modules/capacitor-reader/android')

include ':capacitor-stash-media'
project(':capacitor-stash-media').projectDir = new File('../node_modules/.pnpm/capacitor-stash-media@2.0.1_@capacitor+core@6.1.2/node_modules/capacitor-stash-media/android')

Expand Down
3 changes: 3 additions & 0 deletions capacitor.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ const config: CapacitorConfig = {
resize: KeyboardResize.Ionic,
resizeOnFullScreen: true,
},
SplashScreen: {
launchShowDuration: 3_000,
},
},
};

Expand Down
3 changes: 2 additions & 1 deletion ios/App/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,20 @@ 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.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_patch_hash=2ihcxo2fu55l7b6g5u7feswwlm_@capacitor+core@6.1.2/node_modules/@capacitor/keyboard'
pod 'CapacitorNetwork', :path => '../../node_modules/.pnpm/@capacitor+network@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/network'
pod 'CapacitorShare', :path => '../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share'
pod 'CapacitorSplashScreen', :path => '../../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen'
pod 'CapacitorStatusBar', :path => '../../node_modules/.pnpm/@capacitor+status-bar@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/status-bar'
pod 'CapacitorAndroidNavMode', :path => '../../node_modules/.pnpm/capacitor-android-nav-mode@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-android-nav-mode'
pod 'CapacitorApplicationContext', :path => '../../node_modules/.pnpm/capacitor-application-context@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-application-context'
pod 'CapacitorBiometricLock', :path => '../../node_modules/.pnpm/capacitor-biometric-lock@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-biometric-lock'
pod 'CapacitorClearCache', :path => '../../node_modules/.pnpm/capacitor-clear-cache@1.0.1_@capacitor+core@6.1.2/node_modules/capacitor-clear-cache'
pod 'CapacitorLaunchNative', :path => '../../node_modules/.pnpm/capacitor-launch-native@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-launch-native'
pod 'CapacitorPluginSafeArea', :path => '../../node_modules/.pnpm/capacitor-plugin-safe-area@3.0.3_@capacitor+core@6.1.2/node_modules/capacitor-plugin-safe-area'
pod 'CapacitorReader', :path => '../../node_modules/.pnpm/capacitor-reader@0.1.0_@capacitor+core@6.1.2/node_modules/capacitor-reader'
pod 'CapacitorStashMedia', :path => '../../node_modules/.pnpm/capacitor-stash-media@2.0.1_@capacitor+core@6.1.2/node_modules/capacitor-stash-media'
pod 'CapacitorTips', :path => '../../node_modules/.pnpm/capacitor-tips@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-tips'
end
Expand Down
20 changes: 13 additions & 7 deletions ios/App/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ PODS:
- Capacitor
- CapacitorBiometricLock (1.0.0):
- Capacitor
- CapacitorBrowser (6.0.3):
- Capacitor
- CapacitorClearCache (1.0.1):
- Capacitor
- CapacitorCommunityAppIcon (5.0.0):
Expand All @@ -28,8 +26,12 @@ PODS:
- Capacitor
- CapacitorPluginSafeArea (3.0.3):
- Capacitor
- CapacitorReader (0.1.0):
- Capacitor
- CapacitorShare (6.0.2):
- Capacitor
- CapacitorSplashScreen (6.0.2):
- Capacitor
- CapacitorStashMedia (2.0.1):
- Capacitor
- SDWebImage
Expand All @@ -47,7 +49,6 @@ 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.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`)"
Expand All @@ -57,7 +58,9 @@ DEPENDENCIES:
- "CapacitorLaunchNative (from `../../node_modules/.pnpm/capacitor-launch-native@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-launch-native`)"
- "CapacitorNetwork (from `../../node_modules/.pnpm/@capacitor+network@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/network`)"
- "CapacitorPluginSafeArea (from `../../node_modules/.pnpm/capacitor-plugin-safe-area@3.0.3_@capacitor+core@6.1.2/node_modules/capacitor-plugin-safe-area`)"
- "CapacitorReader (from `../../node_modules/.pnpm/capacitor-reader@0.1.0_@capacitor+core@6.1.2/node_modules/capacitor-reader`)"
- "CapacitorShare (from `../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share`)"
- "CapacitorSplashScreen (from `../../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen`)"
- "CapacitorStashMedia (from `../../node_modules/.pnpm/capacitor-stash-media@2.0.1_@capacitor+core@6.1.2/node_modules/capacitor-stash-media`)"
- "CapacitorStatusBar (from `../../node_modules/.pnpm/@capacitor+status-bar@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/status-bar`)"
- "CapacitorTips (from `../../node_modules/.pnpm/capacitor-tips@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-tips`)"
Expand All @@ -77,8 +80,6 @@ EXTERNAL SOURCES:
:path: "../../node_modules/.pnpm/capacitor-application-context@1.0.0_@capacitor+core@6.1.2/node_modules/capacitor-application-context"
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.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:
Expand All @@ -97,8 +98,12 @@ EXTERNAL SOURCES:
:path: "../../node_modules/.pnpm/@capacitor+network@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/network"
CapacitorPluginSafeArea:
:path: "../../node_modules/.pnpm/capacitor-plugin-safe-area@3.0.3_@capacitor+core@6.1.2/node_modules/capacitor-plugin-safe-area"
CapacitorReader:
:path: "../../node_modules/.pnpm/capacitor-reader@0.1.0_@capacitor+core@6.1.2/node_modules/capacitor-reader"
CapacitorShare:
:path: "../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share"
CapacitorSplashScreen:
:path: "../../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen"
CapacitorStashMedia:
:path: "../../node_modules/.pnpm/capacitor-stash-media@2.0.1_@capacitor+core@6.1.2/node_modules/capacitor-stash-media"
CapacitorStatusBar:
Expand All @@ -112,7 +117,6 @@ SPEC CHECKSUMS:
CapacitorApp: 0bc633b4eae40a1f32cd2834788fad3bc42da6a1
CapacitorApplicationContext: 2bee68107e6efb8f89b5db102dc95a9cf74c9464
CapacitorBiometricLock: a91f2e8b28527e0d98032270f9363c4844abf1b9
CapacitorBrowser: aab1ed943b01c0365c4810538a8b3477e2d9f72e
CapacitorClearCache: 66a0b1bd6ed2d130d1c5467d3c001486cc1aa1eb
CapacitorCommunityAppIcon: 4873c7de4cd50e68a36e08fe93f88f479e7b16a2
CapacitorCordova: f48c89f96c319101cd2f0ce8a2b7449b5fb8b3dd
Expand All @@ -122,12 +126,14 @@ SPEC CHECKSUMS:
CapacitorLaunchNative: 6508ec892ad035d5556658c10cc3b55bfbb7929d
CapacitorNetwork: 8796cf1f1104a00b289957b6150b7c60e1c2a8d3
CapacitorPluginSafeArea: e1eca7f70974f0e270d96f70cd0a5f51523164b1
CapacitorReader: 6dbaa64adfbcaafe6713758078c3d510b2231083
CapacitorShare: 591ae4693d85686ceb590db8e8b44aa014ec6490
CapacitorSplashScreen: 250df9ef8014fac5c7c1fd231f0f8b1d8f0b5624
CapacitorStashMedia: 10aa96dc5f874c4c27642528a4c327c46792abf2
CapacitorStatusBar: b81d4fb5d4e0064c712018071b3ab4b810b39a63
CapacitorTips: 2087733aea06ec041b210085395ca934c8554907
SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9

PODFILE CHECKSUM: 4bb941cdad3a08d4337f1a3589da9a7a0f40fd60
PODFILE CHECKSUM: 6b3917369f289c038252d105fb0992ec312a864c

COCOAPODS: 1.16.2
44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "voyager",
"description": "A progressive webapp Lemmy client",
"private": true,
"version": "2.19.3",
"version": "2.20.0",
"type": "module",
"packageManager": "pnpm@9.12.2+sha512.22721b3a11f81661ae1ec68ce1a7b879425a1ca5b991c975b074ac220b187ce56c708fe5db69f4c962c989452eee76c82877f4ee80f474cebd61ee13461b6228",
"scripts": {
Expand Down Expand Up @@ -34,7 +34,6 @@
"@ionic/core": "npm:voyager-ionic-core@8.4.0"
},
"patchedDependencies": {
"@capacitor/browser": "patches/@capacitor__browser@6.0.3.patch",
"@capacitor/haptics": "patches/@capacitor__haptics@6.0.1.patch",
"@capacitor/keyboard": "patches/@capacitor__keyboard@6.0.2.patch"
},
Expand All @@ -55,36 +54,37 @@
"@capacitor-community/app-icon": "^5.0.0",
"@capacitor/android": "^6.1.2",
"@capacitor/app": "^6.0.1",
"@capacitor/browser": "^6.0.3",
"@capacitor/core": "^6.1.2",
"@capacitor/filesystem": "^6.0.1",
"@capacitor/haptics": "^6.0.1",
"@capacitor/ios": "^6.1.2",
"@capacitor/keyboard": "^6.0.2",
"@capacitor/network": "^6.0.2",
"@capacitor/share": "^6.0.2",
"@capacitor/splash-screen": "^6.0.2",
"@capacitor/status-bar": "^6.0.1",
"@github/markdown-toolbar-element": "^2.2.3",
"@ionic/core": "npm:voyager-ionic-core@8.4.0",
"@ionic/react": "8.4.0",
"@ionic/react-router": "8.4.0",
"@linaria/core": "^6.2.0",
"@linaria/react": "^6.2.1",
"@mantine/hooks": "^7.13.5",
"@mantine/hooks": "^7.14.0",
"@reduxjs/toolkit": "^2.3.0",
"capacitor-android-nav-mode": "^1.0.0",
"capacitor-application-context": "^1.0.0",
"capacitor-biometric-lock": "^1.0.0",
"capacitor-clear-cache": "^1.0.1",
"capacitor-launch-native": "^1.0.0",
"capacitor-plugin-safe-area": "^3.0.3",
"capacitor-reader": "^0.1.0",
"capacitor-stash-media": "^2.0.1",
"colorjs.io": "^0.5.2",
"compare-versions": "^6.1.1",
"date-fns": "^4.1.0",
"dexie": "^4.0.9",
"dexie-export-import": "^4.1.2",
"es-toolkit": "^1.26.1",
"dexie-export-import": "^4.1.3",
"es-toolkit": "^1.27.0",
"eslint-plugin-perfectionist": "^3.9.1",
"history": "^4.10.1",
"immer": "^10.1.1",
Expand All @@ -95,21 +95,21 @@
"mdast-util-gfm-table": "^2.0.0",
"micromark-extension-gfm-strikethrough": "^2.1.0",
"micromark-extension-gfm-table": "^2.1.0",
"micromark-util-combine-extensions": "^2.0.0",
"modern-screenshot": "^4.5.2",
"micromark-util-combine-extensions": "^2.0.1",
"modern-screenshot": "^4.5.4",
"photoswipe": "^5.4.4",
"react": "0.0.0-experimental-5c56b873-20241107",
"react": "0.0.0-experimental-b01722d5-20241114",
"react-animate-height": "^3.2.3",
"react-dom": "0.0.0-experimental-5c56b873-20241107",
"react-dom": "0.0.0-experimental-b01722d5-20241114",
"react-error-boundary": "^4.1.2",
"react-intersection-observer": "^9.13.1",
"react-markdown": "^9.0.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.4",
"react-transition-state": "^2.1.3",
"react-textarea-autosize": "^8.5.5",
"react-transition-state": "^2.2.0",
"rehype-highlight": "^6.0.0",
"rehype-parse": "^9.0.1",
"rehype-remark": "^10.0.0",
Expand All @@ -120,7 +120,7 @@
"unified": "^11.0.5",
"unist-util-visit": "^5.0.0",
"use-long-press": "^3.2.0",
"virtua": "^0.36.3"
"virtua": "^0.37.0"
},
"devDependencies": {
"@babel/preset-react": "^7.25.9",
Expand All @@ -129,7 +129,7 @@
"@eslint/js": "^9.14.0",
"@ionic/cli": "^7.2.0",
"@playwright/test": "^1.48.2",
"@trapezedev/configure": "^7.0.10",
"@trapezedev/configure": "^7.1.3",
"@types/history": "^4.7.11",
"@types/mdast": "^4.0.4",
"@types/node": "^22.9.0",
Expand All @@ -140,25 +140,25 @@
"@types/ua-parser-js": "^0.7.39",
"@vitejs/plugin-legacy": "^5.4.3",
"@vitejs/plugin-react": "^4.3.3",
"@wyw-in-js/vite": "^0.5.4",
"babel-plugin-react-compiler": "0.0.0-experimental-19cbb8f-20241107",
"@wyw-in-js/vite": "^0.5.5",
"babel-plugin-react-compiler": "0.0.0-experimental-19c7e06-20241113",
"eslint": "^9.14.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-compiler": "0.0.0-experimental-19cbb8f-20241107",
"eslint-plugin-react-hooks": "0.0.0-experimental-5c56b873-20241107",
"eslint-plugin-react-compiler": "0.0.0-experimental-19c7e06-20241113",
"eslint-plugin-react-hooks": "0.0.0-experimental-b01722d5-20241114",
"eslint-plugin-vitest": "^0.5.4",
"jsdom": "^25.0.1",
"mdast-util-lemmy-spoiler": "^2.0.0",
"prettier": "^3.3.3",
"pwa-asset-generator": "^6.4.0",
"release-it": "^17.10.0",
"typescript": "^5.6.3",
"typescript-eslint": "^8.13.0",
"vite": "^5.4.10",
"vite-plugin-pwa": "^0.20.5",
"typescript-eslint": "^8.14.0",
"vite": "^5.4.11",
"vite-plugin-pwa": "^0.21.0",
"vite-plugin-svgr": "^4.3.0",
"vite-tsconfig-paths": "^5.1.2",
"vitest": "^2.1.4"
"vitest": "^2.1.5"
}
}
Loading

0 comments on commit 98d5467

Please sign in to comment.