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 Jan 1, 2025
2 parents fcbdbba + 797b6a0 commit 5c7c416
Show file tree
Hide file tree
Showing 36 changed files with 2,179 additions and 1,438 deletions.
4 changes: 2 additions & 2 deletions android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capacitor+android@6.2.0_@capacitor+core@6.2.0/node_modules/@capacitor/android/capacitor')
project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capacitor+android@6.2.0_patch_hash=a7fuehdtpweg2aifrflzmu363i_@capacitor+core@6.2.0/node_modules/@capacitor/android/capacitor')

include ':capacitor-community-app-icon'
project(':capacitor-community-app-icon').projectDir = new File('../node_modules/.pnpm/@capacitor-community+app-icon@5.0.0_@capacitor+core@6.2.0/node_modules/@capacitor-community/app-icon/android')
Expand Down Expand Up @@ -48,7 +48,7 @@ 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.2.0/node_modules/capacitor-plugin-safe-area/android')

include ':capacitor-reader'
project(':capacitor-reader').projectDir = new File('../node_modules/.pnpm/capacitor-reader@0.2.0_@capacitor+core@6.2.0/node_modules/capacitor-reader/android')
project(':capacitor-reader').projectDir = new File('../node_modules/.pnpm/capacitor-reader@0.3.0_@capacitor+core@6.2.0/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.2.0/node_modules/capacitor-stash-media/android')
Expand Down
2 changes: 1 addition & 1 deletion ios/App/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def capacitor_pods
pod 'CapacitorClearCache', :path => '../../node_modules/.pnpm/capacitor-clear-cache@1.0.1_@capacitor+core@6.2.0/node_modules/capacitor-clear-cache'
pod 'CapacitorLaunchNative', :path => '../../node_modules/.pnpm/capacitor-launch-native@1.0.0_@capacitor+core@6.2.0/node_modules/capacitor-launch-native'
pod 'CapacitorPluginSafeArea', :path => '../../node_modules/.pnpm/capacitor-plugin-safe-area@3.0.3_@capacitor+core@6.2.0/node_modules/capacitor-plugin-safe-area'
pod 'CapacitorReader', :path => '../../node_modules/.pnpm/capacitor-reader@0.2.0_@capacitor+core@6.2.0/node_modules/capacitor-reader'
pod 'CapacitorReader', :path => '../../node_modules/.pnpm/capacitor-reader@0.3.0_@capacitor+core@6.2.0/node_modules/capacitor-reader'
pod 'CapacitorStashMedia', :path => '../../node_modules/.pnpm/capacitor-stash-media@2.0.1_@capacitor+core@6.2.0/node_modules/capacitor-stash-media'
pod 'CapacitorTips', :path => '../../node_modules/.pnpm/capacitor-tips@1.0.0_@capacitor+core@6.2.0/node_modules/capacitor-tips'
end
Expand Down
10 changes: 5 additions & 5 deletions ios/App/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ PODS:
- Capacitor
- CapacitorPluginSafeArea (3.0.3):
- Capacitor
- CapacitorReader (0.2.0):
- CapacitorReader (0.3.0):
- Capacitor
- CapacitorShare (6.0.3):
- Capacitor
Expand Down Expand Up @@ -58,7 +58,7 @@ DEPENDENCIES:
- "CapacitorLaunchNative (from `../../node_modules/.pnpm/capacitor-launch-native@1.0.0_@capacitor+core@6.2.0/node_modules/capacitor-launch-native`)"
- "CapacitorNetwork (from `../../node_modules/.pnpm/@capacitor+network@6.0.3_@capacitor+core@6.2.0/node_modules/@capacitor/network`)"
- "CapacitorPluginSafeArea (from `../../node_modules/.pnpm/capacitor-plugin-safe-area@3.0.3_@capacitor+core@6.2.0/node_modules/capacitor-plugin-safe-area`)"
- "CapacitorReader (from `../../node_modules/.pnpm/capacitor-reader@0.2.0_@capacitor+core@6.2.0/node_modules/capacitor-reader`)"
- "CapacitorReader (from `../../node_modules/.pnpm/capacitor-reader@0.3.0_@capacitor+core@6.2.0/node_modules/capacitor-reader`)"
- "CapacitorShare (from `../../node_modules/.pnpm/@capacitor+share@6.0.3_@capacitor+core@6.2.0/node_modules/@capacitor/share`)"
- "CapacitorSplashScreen (from `../../node_modules/.pnpm/@capacitor+splash-screen@6.0.3_@capacitor+core@6.2.0/node_modules/@capacitor/splash-screen`)"
- "CapacitorStashMedia (from `../../node_modules/.pnpm/capacitor-stash-media@2.0.1_@capacitor+core@6.2.0/node_modules/capacitor-stash-media`)"
Expand Down Expand Up @@ -99,7 +99,7 @@ EXTERNAL SOURCES:
CapacitorPluginSafeArea:
:path: "../../node_modules/.pnpm/capacitor-plugin-safe-area@3.0.3_@capacitor+core@6.2.0/node_modules/capacitor-plugin-safe-area"
CapacitorReader:
:path: "../../node_modules/.pnpm/capacitor-reader@0.2.0_@capacitor+core@6.2.0/node_modules/capacitor-reader"
:path: "../../node_modules/.pnpm/capacitor-reader@0.3.0_@capacitor+core@6.2.0/node_modules/capacitor-reader"
CapacitorShare:
:path: "../../node_modules/.pnpm/@capacitor+share@6.0.3_@capacitor+core@6.2.0/node_modules/@capacitor/share"
CapacitorSplashScreen:
Expand All @@ -126,14 +126,14 @@ SPEC CHECKSUMS:
CapacitorLaunchNative: 6508ec892ad035d5556658c10cc3b55bfbb7929d
CapacitorNetwork: da96b5fff8d05b67f4658503aabb22f65bda2c0f
CapacitorPluginSafeArea: e1eca7f70974f0e270d96f70cd0a5f51523164b1
CapacitorReader: 03775fab36b94587953bafcaa7131ade10cbf391
CapacitorReader: 5f2c81961166ad9341424aeae0e25b4115fafeaa
CapacitorShare: 7af6ca761ce62030e8e9fbd2eb82416f5ceced38
CapacitorSplashScreen: 68893659d77b5f82d753b3a70475082845e3039c
CapacitorStashMedia: 10aa96dc5f874c4c27642528a4c327c46792abf2
CapacitorStatusBar: 3b9ac7d0684770522c532d1158a1434512ab1477
CapacitorTips: 2087733aea06ec041b210085395ca934c8554907
SDWebImage: f9258c58221ed854cfa0e2b80ee4033710b1c6d3

PODFILE CHECKSUM: 810e83271706ad233eac03b47e2284efbdcfc205
PODFILE CHECKSUM: f8c9e2e5019140f5c73954cbfccfad7f8537322d

COCOAPODS: 1.16.2
57 changes: 28 additions & 29 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.21.1",
"version": "2.23.0",
"type": "module",
"packageManager": "pnpm@9.12.2+sha512.22721b3a11f81661ae1ec68ce1a7b879425a1ca5b991c975b074ac220b187ce56c708fe5db69f4c962c989452eee76c82877f4ee80f474cebd61ee13461b6228",
"scripts": {
Expand Down Expand Up @@ -46,8 +46,7 @@
"react-router",
"react-router-dom",
"@types/react-router",
"@types/react-router-dom",
"rehype-highlight"
"@types/react-router-dom"
]
}
},
Expand All @@ -69,23 +68,23 @@
"@ionic/core": "npm:voyager-ionic-core@8.4.1",
"@ionic/react": "8.4.1",
"@ionic/react-router": "8.4.1",
"@mantine/hooks": "^7.14.3",
"@reduxjs/toolkit": "^2.4.0",
"@mantine/hooks": "^7.15.1",
"@reduxjs/toolkit": "^2.5.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.2.0",
"capacitor-reader": "^0.3.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.10",
"dexie-export-import": "^4.1.4",
"es-toolkit": "^1.28.0",
"eslint-plugin-perfectionist": "^4.1.2",
"es-toolkit": "^1.31.0",
"eslint-plugin-perfectionist": "^4.3.0",
"history": "^4.10.1",
"immer": "^10.1.1",
"ionicons": "^7.4.0",
Expand All @@ -96,21 +95,21 @@
"micromark-extension-gfm-strikethrough": "^2.1.0",
"micromark-extension-gfm-table": "^2.1.0",
"micromark-util-combine-extensions": "^2.0.1",
"modern-screenshot": "^4.5.4",
"modern-screenshot": "^4.5.5",
"photoswipe": "^5.4.4",
"react": "0.0.0-experimental-7670501b-20241124",
"react": "0.0.0-experimental-4dff0e62-20241213",
"react-animate-height": "^3.2.3",
"react-dom": "0.0.0-experimental-7670501b-20241124",
"react-dom": "0.0.0-experimental-4dff0e62-20241213",
"react-error-boundary": "^4.1.2",
"react-intersection-observer": "^9.13.1",
"react-intersection-observer": "^9.14.0",
"react-markdown": "^9.0.1",
"react-redux": "^9.1.2",
"react-redux": "^9.2.0",
"react-reverse-portal": "^2.1.2",
"react-router": "^5.3.4",
"react-router-dom": "^5.3.4",
"react-textarea-autosize": "^8.5.5",
"react-textarea-autosize": "^8.5.6",
"react-transition-state": "^2.2.0",
"rehype-highlight": "^6.0.0",
"rehype-highlight": "^7.0.1",
"rehype-parse": "^9.0.1",
"rehype-remark": "^10.0.0",
"remark-parse": "^11.0.0",
Expand All @@ -120,44 +119,44 @@
"unified": "^11.0.5",
"unist-util-visit": "^5.0.0",
"use-long-press": "^3.2.0",
"virtua": "^0.38.1"
"virtua": "^0.39.2"
},
"devDependencies": {
"@capacitor/cli": "^6.2.0",
"@eslint/js": "^9.16.0",
"@eslint/js": "^9.17.0",
"@ionic/cli": "^7.2.0",
"@playwright/test": "^1.49.0",
"@playwright/test": "^1.49.1",
"@trapezedev/configure": "^7.1.3",
"@types/history": "^4.7.11",
"@types/mdast": "^4.0.4",
"@types/node": "^22.10.1",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/node": "^22.10.2",
"@types/react": "^18.3.16",
"@types/react-dom": "^18.3.5",
"@types/react-router": "^5.1.20",
"@types/react-router-dom": "^5.3.3",
"@types/ua-parser-js": "^0.7.39",
"@vitejs/plugin-legacy": "^6.0.0",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"babel-plugin-react-compiler": "0.0.0-experimental-df7b47d-20241124",
"eslint": "^9.16.0",
"babel-plugin-react-compiler": "0.0.0-experimental-ba7b8e5-20241213",
"eslint": "^9.17.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-compiler": "0.0.0-experimental-df7b47d-20241124",
"eslint-plugin-react-hooks": "0.0.0-experimental-7670501b-20241124",
"eslint-plugin-react-compiler": "0.0.0-experimental-ba7b8e5-20241213",
"eslint-plugin-react-hooks": "0.0.0-experimental-4dff0e62-20241213",
"eslint-plugin-vitest": "^0.5.4",
"jsdom": "^25.0.1",
"mdast-util-lemmy-spoiler": "^2.0.0",
"postcss": "^8.4.49",
"prettier": "^3.4.1",
"prettier": "^3.4.2",
"pwa-asset-generator": "^6.4.0",
"release-it": "^17.10.0",
"typed-css-modules": "^0.9.1",
"typescript": "^5.7.2",
"typescript-eslint": "^8.16.0",
"vite": "^6.0.1",
"typescript-eslint": "^8.18.0",
"vite": "^6.0.3",
"vite-plugin-pwa": "^0.21.1",
"vite-plugin-svgr": "^4.3.0",
"vitest": "^2.1.6"
"vitest": "3.0.0-beta.2"
}
}
Loading

0 comments on commit 5c7c416

Please sign in to comment.