Skip to content

Commit

Permalink
Merge Release 2.13.0
Browse files Browse the repository at this point in the history
Conflicts:
	src/routes/pages/inbox/MarkAllAsReadButton.tsx
	src/routes/pages/search/results/SearchCommunitiesPage.tsx
  • Loading branch information
sharunkumar committed Jul 19, 2024
2 parents ee0dd47 + e0c14a6 commit 8523139
Show file tree
Hide file tree
Showing 40 changed files with 2,415 additions and 2,133 deletions.
76 changes: 0 additions & 76 deletions .eslintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Run Playwright tests
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/playwright:v1.44.1-jammy
image: mcr.microsoft.com/playwright:v1.45.1-jammy
steps:
- uses: actions/checkout@v4
- run: corepack enable
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "app.vger.voyager"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 254
versionName "2.12.4"
versionCode 255
versionName "2.13.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
16 changes: 8 additions & 8 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<data android:host="burggit.moe" />
<data android:host="discuss.online" />
<data android:host="discuss.tchncs.de" />
<data android:host="feddit.de" />
<data android:host="feddit.org" />
<data android:host="feddit.dk" />
<data android:host="feddit.it" />
<data android:host="feddit.nl" />
Expand Down Expand Up @@ -119,7 +119,7 @@
<data android:host="burggit.moe" />
<data android:host="discuss.online" />
<data android:host="discuss.tchncs.de" />
<data android:host="feddit.de" />
<data android:host="feddit.org" />
<data android:host="feddit.dk" />
<data android:host="feddit.it" />
<data android:host="feddit.nl" />
Expand Down Expand Up @@ -198,7 +198,7 @@
<data android:host="burggit.moe" />
<data android:host="discuss.online" />
<data android:host="discuss.tchncs.de" />
<data android:host="feddit.de" />
<data android:host="feddit.org" />
<data android:host="feddit.dk" />
<data android:host="feddit.it" />
<data android:host="feddit.nl" />
Expand Down Expand Up @@ -277,7 +277,7 @@
<data android:host="burggit.moe" />
<data android:host="discuss.online" />
<data android:host="discuss.tchncs.de" />
<data android:host="feddit.de" />
<data android:host="feddit.org" />
<data android:host="feddit.dk" />
<data android:host="feddit.it" />
<data android:host="feddit.nl" />
Expand Down Expand Up @@ -356,7 +356,7 @@
<data android:host="burggit.moe" />
<data android:host="discuss.online" />
<data android:host="discuss.tchncs.de" />
<data android:host="feddit.de" />
<data android:host="feddit.org" />
<data android:host="feddit.dk" />
<data android:host="feddit.it" />
<data android:host="feddit.nl" />
Expand Down Expand Up @@ -435,7 +435,7 @@
<data android:host="burggit.moe" />
<data android:host="discuss.online" />
<data android:host="discuss.tchncs.de" />
<data android:host="feddit.de" />
<data android:host="feddit.org" />
<data android:host="feddit.dk" />
<data android:host="feddit.it" />
<data android:host="feddit.nl" />
Expand Down Expand Up @@ -514,7 +514,7 @@
<data android:host="burggit.moe" />
<data android:host="discuss.online" />
<data android:host="discuss.tchncs.de" />
<data android:host="feddit.de" />
<data android:host="feddit.org" />
<data android:host="feddit.dk" />
<data android:host="feddit.it" />
<data android:host="feddit.nl" />
Expand Down Expand Up @@ -593,7 +593,7 @@
<data android:host="burggit.moe" />
<data android:host="discuss.online" />
<data android:host="discuss.tchncs.de" />
<data android:host="feddit.de" />
<data android:host="feddit.org" />
<data android:host="feddit.dk" />
<data android:host="feddit.it" />
<data android:host="feddit.nl" />
Expand Down
36 changes: 18 additions & 18 deletions android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
// 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.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/android/capacitor')
project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capacitor+android@6.1.0_@capacitor+core@6.1.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.0.0/node_modules/@capacitor-community/app-icon/android')
project(':capacitor-community-app-icon').projectDir = new File('../node_modules/.pnpm/@capacitor-community+app-icon@5.0.0_@capacitor+core@6.1.0/node_modules/@capacitor-community/app-icon/android')

include ':capacitor-app'
project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/app/android')
project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.0/node_modules/@capacitor/app/android')

include ':capacitor-browser'
project(':capacitor-browser').projectDir = new File('../node_modules/.pnpm/@capacitor+browser@6.0.0_patch_hash=33x6bihgpnt6i5jbwxndhs4p3q_@capacitor+core@6.0.0/node_modules/@capacitor/browser/android')
project(':capacitor-browser').projectDir = new File('../node_modules/.pnpm/@capacitor+browser@6.0.1_patch_hash=33x6bihgpnt6i5jbwxndhs4p3q_@capacitor+core@6.1.0/node_modules/@capacitor/browser/android')

include ':capacitor-filesystem'
project(':capacitor-filesystem').projectDir = new File('../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/filesystem/android')
project(':capacitor-filesystem').projectDir = new File('../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.0/node_modules/@capacitor/filesystem/android')

include ':capacitor-haptics'
project(':capacitor-haptics').projectDir = new File('../node_modules/.pnpm/@capacitor+haptics@6.0.0_patch_hash=isktf3ewuigcwl72katxy46idi_@capacitor+core@6.0.0/node_modules/@capacitor/haptics/android')
project(':capacitor-haptics').projectDir = new File('../node_modules/.pnpm/@capacitor+haptics@6.0.0_patch_hash=isktf3ewuigcwl72katxy46idi_@capacitor+core@6.1.0/node_modules/@capacitor/haptics/android')

include ':capacitor-keyboard'
project(':capacitor-keyboard').projectDir = new File('../node_modules/.pnpm/@capacitor+keyboard@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/keyboard/android')
project(':capacitor-keyboard').projectDir = new File('../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.0/node_modules/@capacitor/keyboard/android')

include ':capacitor-network'
project(':capacitor-network').projectDir = new File('../node_modules/.pnpm/@capacitor+network@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/network/android')
project(':capacitor-network').projectDir = new File('../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.0/node_modules/@capacitor/network/android')

include ':capacitor-share'
project(':capacitor-share').projectDir = new File('../node_modules/.pnpm/@capacitor+share@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/share/android')
project(':capacitor-share').projectDir = new File('../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.0/node_modules/@capacitor/share/android')

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

include ':capacitor-android-nav-mode'
project(':capacitor-android-nav-mode').projectDir = new File('../node_modules/.pnpm/capacitor-android-nav-mode@1.0.0_@capacitor+core@6.0.0/node_modules/capacitor-android-nav-mode/android')
project(':capacitor-android-nav-mode').projectDir = new File('../node_modules/.pnpm/capacitor-android-nav-mode@1.0.0_@capacitor+core@6.1.0/node_modules/capacitor-android-nav-mode/android')

include ':capacitor-application-context'
project(':capacitor-application-context').projectDir = new File('../node_modules/.pnpm/capacitor-application-context@1.0.0_@capacitor+core@6.0.0/node_modules/capacitor-application-context/android')
project(':capacitor-application-context').projectDir = new File('../node_modules/.pnpm/capacitor-application-context@1.0.0_@capacitor+core@6.1.0/node_modules/capacitor-application-context/android')

include ':capacitor-biometric-lock'
project(':capacitor-biometric-lock').projectDir = new File('../node_modules/.pnpm/capacitor-biometric-lock@1.0.0_@capacitor+core@6.0.0/node_modules/capacitor-biometric-lock/android')
project(':capacitor-biometric-lock').projectDir = new File('../node_modules/.pnpm/capacitor-biometric-lock@1.0.0_@capacitor+core@6.1.0/node_modules/capacitor-biometric-lock/android')

include ':capacitor-clear-cache'
project(':capacitor-clear-cache').projectDir = new File('../node_modules/.pnpm/capacitor-clear-cache@1.0.1_@capacitor+core@6.0.0/node_modules/capacitor-clear-cache/android')
project(':capacitor-clear-cache').projectDir = new File('../node_modules/.pnpm/capacitor-clear-cache@1.0.1_@capacitor+core@6.1.0/node_modules/capacitor-clear-cache/android')

include ':capacitor-launch-native'
project(':capacitor-launch-native').projectDir = new File('../node_modules/.pnpm/capacitor-launch-native@1.0.0_@capacitor+core@6.0.0/node_modules/capacitor-launch-native/android')
project(':capacitor-launch-native').projectDir = new File('../node_modules/.pnpm/capacitor-launch-native@1.0.0_@capacitor+core@6.1.0/node_modules/capacitor-launch-native/android')

include ':capacitor-plugin-safe-area'
project(':capacitor-plugin-safe-area').projectDir = new File('../node_modules/.pnpm/capacitor-plugin-safe-area@3.0.1_@capacitor+core@6.0.0/node_modules/capacitor-plugin-safe-area/android')
project(':capacitor-plugin-safe-area').projectDir = new File('../node_modules/.pnpm/capacitor-plugin-safe-area@3.0.1_@capacitor+core@6.1.0/node_modules/capacitor-plugin-safe-area/android')

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

include ':capacitor-tips'
project(':capacitor-tips').projectDir = new File('../node_modules/.pnpm/capacitor-tips@1.0.0_@capacitor+core@6.0.0/node_modules/capacitor-tips/android')
project(':capacitor-tips').projectDir = new File('../node_modules/.pnpm/capacitor-tips@1.0.0_@capacitor+core@6.1.0/node_modules/capacitor-tips/android')
127 changes: 127 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
import { fixupConfigRules, fixupPluginRules } from "@eslint/compat";
import react from "eslint-plugin-react";
import typescriptEslint from "@typescript-eslint/eslint-plugin";
import globals from "globals";
import tsParser from "@typescript-eslint/parser";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

export default [
...fixupConfigRules(
compat.extends(
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:prettier/recommended",
),
),
{
plugins: {
react: fixupPluginRules(react),
"@typescript-eslint": fixupPluginRules(typescriptEslint),
},

languageOptions: {
globals: {
...globals.browser,
},

parser: tsParser,
ecmaVersion: 2022,
sourceType: "module",

parserOptions: {
ecmaFeatures: {
jsx: true,
},
},
},

settings: {
react: {
version: "detect",
},
},

rules: {
"react/react-in-jsx-scope": "off",

"no-console": [
"warn",
{
allow: ["warn", "error", "info"],
},
],

"linebreak-style": ["warn", "unix"],
"react/jsx-fragments": ["warn", "syntax"],
"@typescript-eslint/no-empty-function": 0,
"@typescript-eslint/no-empty-interface": 0,
"react/jsx-curly-brace-presence": ["warn", "never"],
eqeqeq: ["warn", "smart"],
"no-unreachable": ["warn"],

"react/no-unknown-property": [
"error",
{
ignore: ["css"],
},
],

"@typescript-eslint/no-unused-vars": [
"warn",
{
destructuredArrayIgnorePattern: "^_",
},
],

"react/prop-types": 0,

"no-restricted-imports": [
1,
{
paths: [
{
name: "@ionic/react",
importNames: ["IonHeader"],
message: "Please use AppHeader instead.",
},
],
},
],

"no-nested-ternary": [1],
},
},
{
files: ["**/*.test.ts", "**/*.test.tsx"],

languageOptions: {
globals: {
...globals.jest,
global: "writable",
},
},
},
{
files: ["src/**"],

languageOptions: {
globals: {
APP_VERSION: true,
BUILD_FOSS_ONLY: true,
},
},
},
];
4 changes: 2 additions & 2 deletions ios/App/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.12.4</string>
<string>2.13.0</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand All @@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>254</string>
<string>255</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
Expand Down
Loading

0 comments on commit 8523139

Please sign in to comment.