self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-10 22:11:50 +02:00
Code Issues Releases Activity

Merge branch 'dev' into renovate/major-eslint

Browse Source
This commit is contained in:
Laurent Cozic
2025-08-05 12:28:53 +01:00
parent 0ad9e8f112 4d8a16bda7
commit d3954e769f
19 changed files with 233 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.env-transcribe-sample
View File

@@ -11,8 +11,9 @@ QUEUE_RETRY_COUNT=2
QUEUE_MAINTENANCE_INTERVAL=30000 QUEUE_MAINTENANCE_INTERVAL=30000
HTR_CLI_DOCKER_IMAGE=joplin/htr-cli:0.0.2 HTR_CLI_DOCKER_IMAGE=joplin/htr-cli:0.0.2
# Fullpath to images folder # Fullpath to images folder e.g.:
HTR_CLI_IMAGES_FOLDER=/home/user/joplin/packages/transcribe/images #HTR_CLI_IMAGES_FOLDER=/home/user/joplin/packages/transcribe/images
HTR_CLI_IMAGES_FOLDER=
QUEUE_DRIVER=pg QUEUE_DRIVER=pg
# QUEUE_DRIVER=sqlite # QUEUE_DRIVER=sqlite

2
packages/app-cli/package.json
View File

@@ -57,7 +57,7 @@
"proper-lockfile": "4.1.2", "proper-lockfile": "4.1.2",
"redux": "4.2.1", "redux": "4.2.1",
"server-destroy": "1.0.1", "server-destroy": "1.0.1",
"sharp": "0.33.5", "sharp": "0.34.0",
"sprintf-js": "1.1.3", "sprintf-js": "1.1.3",
"sqlite3": "5.1.6", "sqlite3": "5.1.6",
"string-padding": "1.0.2", "string-padding": "1.0.2",

4
packages/app-desktop/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "@joplin/app-desktop", "name": "@joplin/app-desktop",
"version": "3.4.3", "version": "3.4.4",
"description": "Joplin for Desktop", "description": "Joplin for Desktop",
"main": "main.bundle.js", "main": "main.bundle.js",
"private": true, "private": true,
@@ -146,7 +146,7 @@
"@sentry/electron": "4.24.0", "@sentry/electron": "4.24.0",
"@testing-library/react-hooks": "8.0.1", "@testing-library/react-hooks": "8.0.1",
"@types/jest": "29.5.14", "@types/jest": "29.5.14",
"@types/mustache": "4.2.5", "@types/mustache": "4.2.6",
"@types/node": "18.19.87", "@types/node": "18.19.87",
"@types/react": "18.3.20", "@types/react": "18.3.20",
"@types/react-dom": "18.3.7", "@types/react-dom": "18.3.7",

4
packages/app-mobile/android/app/build.gradle
View File

@@ -89,8 +89,8 @@ android {
applicationId "net.cozic.joplin" applicationId "net.cozic.joplin"
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097775 versionCode 2097776
versionName "3.4.2" versionName "3.4.3"
ndk { ndk {
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
} }

27
packages/app-mobile/android/app/src/main/java/net/cozic/joplin/MainActivity.kt
View File

@@ -6,6 +6,12 @@ import com.facebook.react.ReactActivityDelegate
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
import com.facebook.react.defaults.DefaultReactActivityDelegate import com.facebook.react.defaults.DefaultReactActivityDelegate
import android.os.Build
import android.os.Bundle
import android.view.View
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
class MainActivity : ReactActivity() { class MainActivity : ReactActivity() {
/** /**
@@ -20,4 +26,25 @@ class MainActivity : ReactActivity() {
*/ */
override fun createReactActivityDelegate(): ReactActivityDelegate = override fun createReactActivityDelegate(): ReactActivityDelegate =
ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)) ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled))
/**
* This is a workaround to fix the upstream issue https://github.com/facebook/react-native/issues/49759#issuecomment-2918934967
*/
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
if (Build.VERSION.SDK_INT >= 35) {
val rootView = findViewById<View>(android.R.id.content)
ViewCompat.setOnApplyWindowInsetsListener(rootView) { _, insets ->
val innerPadding = insets.getInsets(WindowInsetsCompat.Type.ime())
rootView.setPadding(
innerPadding.left,
innerPadding.top,
innerPadding.right,
innerPadding.bottom
)
insets
}
}
}
} }

4
packages/app-mobile/ios/Podfile.lock
View File

@@ -1408,7 +1408,7 @@ PODS:
- ReactCommon/turbomodule/core - ReactCommon/turbomodule/core
- react-native-alarm-notification (3.4.0): - react-native-alarm-notification (3.4.0):
- React - React
- react-native-document-picker (10.1.2): - react-native-document-picker (10.1.3):
- DoubleConversion - DoubleConversion
- glog - glog
- hermes-engine - hermes-engine
@@ -2335,7 +2335,7 @@ SPEC CHECKSUMS:
React-Mapbuffer: c3f4b608e4a59dd2f6a416ef4d47a14400194468 React-Mapbuffer: c3f4b608e4a59dd2f6a416ef4d47a14400194468
React-microtasksnativemodule: 054f34e9b82f02bd40f09cebd4083828b5b2beb6 React-microtasksnativemodule: 054f34e9b82f02bd40f09cebd4083828b5b2beb6
react-native-alarm-notification: fd7c73a3dc15ce2d5bd9b28dfaa5aa2e25850c7b react-native-alarm-notification: fd7c73a3dc15ce2d5bd9b28dfaa5aa2e25850c7b
react-native-document-picker: 3491100f1048571593b284b74b93ce99b14e20a2 react-native-document-picker: da39c5e4f279d39c0356dca157b98f9dc349e5bb
react-native-geolocation: ec15ffebc53790314885eb9e5f2132132fbc2600 react-native-geolocation: ec15ffebc53790314885eb9e5f2132132fbc2600
react-native-get-random-values: d16467cf726c618e9c7a8c3c39c31faa2244bbba react-native-get-random-values: d16467cf726c618e9c7a8c3c39c31faa2244bbba
react-native-image-picker: 99fbcec11cf4679170a7cfba4e4d9f598297448c react-native-image-picker: 99fbcec11cf4679170a7cfba4e4d9f598297448c

4
packages/app-mobile/package.json
View File

@@ -33,7 +33,7 @@
"@react-native-community/geolocation": "3.4.0", "@react-native-community/geolocation": "3.4.0",
"@react-native-community/netinfo": "11.4.1", "@react-native-community/netinfo": "11.4.1",
"@react-native-community/push-notification-ios": "1.11.0", "@react-native-community/push-notification-ios": "1.11.0",
"@react-native-documents/picker": "10.1.2", "@react-native-documents/picker": "10.1.3",
"assert-browserify": "2.0.0", "assert-browserify": "2.0.0",
"buffer": "6.0.3", "buffer": "6.0.3",
"color": "3.2.1", "color": "3.2.1",
@@ -130,7 +130,7 @@
"react-native-web": "0.20.0", "react-native-web": "0.20.0",
"react-refresh": "0.17.0", "react-refresh": "0.17.0",
"react-test-renderer": "19.0.0", "react-test-renderer": "19.0.0",
"sharp": "0.33.5", "sharp": "0.34.0",
"sqlite3": "5.1.6", "sqlite3": "5.1.6",
"timers-browserify": "2.0.12", "timers-browserify": "2.0.12",
"ts-jest": "29.3.1", "ts-jest": "29.3.1",

4
packages/lib/package.json
View File

@@ -24,7 +24,7 @@
"@types/js-yaml": "4.0.9", "@types/js-yaml": "4.0.9",
"@types/jsdom": "21.1.7", "@types/jsdom": "21.1.7",
"@types/markdown-it": "13.0.9", "@types/markdown-it": "13.0.9",
"@types/mustache": "4.2.5", "@types/mustache": "4.2.6",
"@types/node": "18.19.87", "@types/node": "18.19.87",
"@types/node-rsa": "1.1.4", "@types/node-rsa": "1.1.4",
"@types/react": "18.3.20", "@types/react": "18.3.20",
@@ -36,7 +36,7 @@
"pdfjs-dist": "3.11.174", "pdfjs-dist": "3.11.174",
"react": "18.3.1", "react": "18.3.1",
"react-test-renderer": "18.3.1", "react-test-renderer": "18.3.1",
"sharp": "0.33.5", "sharp": "0.34.0",
"tesseract.js": "5.1.1", "tesseract.js": "5.1.1",
"typescript": "5.8.2" "typescript": "5.8.2"
}, },

2
packages/server/package.json
View File

@@ -72,7 +72,7 @@
"@types/jsdom": "21.1.7", "@types/jsdom": "21.1.7",
"@types/koa": "2.15.0", "@types/koa": "2.15.0",
"@types/markdown-it": "13.0.9", "@types/markdown-it": "13.0.9",
"@types/mustache": "4.2.5", "@types/mustache": "4.2.6",
"@types/node-os-utils": "1.3.4", "@types/node-os-utils": "1.3.4",
"@types/nodemailer": "6.4.17", "@types/nodemailer": "6.4.17",
"@types/yargs": "17.0.33", "@types/yargs": "17.0.33",

56
packages/server/src/utils/requestUtils.ts
View File

@@ -75,29 +75,49 @@ export async function formParse(request: IncomingMessage): Promise<FormParseResu
// headers // headers
// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied // eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
return new Promise((resolve: Function, reject: Function) => { return new Promise((resolve: Function, reject: Function) => {
let promiseCompleted = false;
const form = formidable({ const form = formidable({
allowEmptyFiles: true, allowEmptyFiles: true,
minFileSize: 0, minFileSize: 0,
}); });
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
form.parse(req, (error: any, fields: Fields, files: Files) => {
if (error) {
error.message = `Could not parse form: ${error.message}`;
reject(error);
return;
}
// Formidable seems to be doing some black magic and once a request try {
// has been parsed it cannot be parsed again. Doing so will do form.on('error', (error) => {
// nothing, the code will just end there, or maybe wait if (promiseCompleted) return;
// indefinitely. So we cache the result on success and return it if promiseCompleted = true;
// some code somewhere tries again to parse the form. const wrapped = new Error(`Could not parse form (1): ${error.message}`);
req.__parsed = { reject(wrapped);
fields: isFormContentType ? convertFieldsToKeyValue(fields) : fields, });
files: convertFieldsToKeyValue(files),
}; form.parse(req, (error: Error, fields: Fields, files: Files) => {
resolve(req.__parsed); if (promiseCompleted) return;
}); promiseCompleted = true;
if (error) {
error.message = `Could not parse form (2): ${error.message}`;
reject(error);
return;
}
// Formidable seems to be doing some black magic and once a request
// has been parsed it cannot be parsed again. Doing so will do
// nothing, the code will just end there, or maybe wait
// indefinitely. So we cache the result on success and return it if
// some code somewhere tries again to parse the form.
req.__parsed = {
fields: isFormContentType ? convertFieldsToKeyValue(fields) : fields,
files: convertFieldsToKeyValue(files),
};
resolve(req.__parsed);
});
} catch (error) {
if (promiseCompleted) return;
promiseCompleted = true;
const wrapped = new Error(`Could not parse form (3): ${error.message}`);
reject(wrapped);
}
}); });
} }

10
packages/tools/locales/hu_HU.po
View File

@@ -309,7 +309,7 @@ msgid ""
"A comma-separated list of words. May be used for uncommon words, to help " "A comma-separated list of words. May be used for uncommon words, to help "
"voice typing spell them correctly." "voice typing spell them correctly."
msgstr "" msgstr ""
"Szavak vesszővel elválasztott listája. Használható a nem gyakori szavak " "Szavak vesszővel elválasztott listája. Használható a nem túl gyakori szavak "
"esetében, hogy segítse a hangalapú gépelést a helyesírásban." "esetében, hogy segítse a hangalapú gépelést a helyesírásban."
#: packages/app-desktop/gui/UpdateNotification/UpdateNotification.tsx:37 #: packages/app-desktop/gui/UpdateNotification/UpdateNotification.tsx:37
@@ -1074,7 +1074,7 @@ msgstr ""
#: packages/app-desktop/gui/NoteEditor/StatusBar.tsx:61 #: packages/app-desktop/gui/NoteEditor/StatusBar.tsx:61
msgid "Click to add tags..." msgid "Click to add tags..."
msgstr "Kattintson a címke hozzáadáshoz…" msgstr "Kattintson ide a címke hozzáadáshoz…"
#: packages/lib/versionInfo.ts:89 #: packages/lib/versionInfo.ts:89
msgid "Client ID: %s" msgid "Client ID: %s"
@@ -5369,7 +5369,7 @@ msgstr "Csak monospace betűcsaládok megjelenítése."
#: packages/lib/models/settings/builtInMetadata.ts:652 #: packages/lib/models/settings/builtInMetadata.ts:652
msgid "Show note counts" msgid "Show note counts"
msgstr "Jegyzet számának megjelenítése" msgstr "Jegyzetek darabszámának megjelenítése"
#: packages/app-mobile/components/side-menu-content.tsx:258 #: packages/app-mobile/components/side-menu-content.tsx:258
msgid "Show notebook options" msgid "Show notebook options"
@@ -5477,7 +5477,7 @@ msgstr "Néhány elemet nem sikerült szinkronizálni."
#: packages/app-mobile/components/ScreenHeader/WarningBanner.tsx:43 #: packages/app-mobile/components/ScreenHeader/WarningBanner.tsx:43
msgid "Some items cannot be synchronised. Press for more info." msgid "Some items cannot be synchronised. Press for more info."
msgstr "" msgstr ""
"Néhány elemet nem sikerült szinkronizálni. Kattintson a további " "Néhány elemet nem sikerült szinkronizálni. Kattintson ide a további "
"információkért." "információkért."
#: packages/lib/models/settings/settingValidations.ts:24 #: packages/lib/models/settings/settingValidations.ts:24
@@ -5890,7 +5890,7 @@ msgstr "Szöveges dokumentum"
#: packages/lib/models/settings/builtInMetadata.ts:1351 #: packages/lib/models/settings/builtInMetadata.ts:1351
msgid "Text editor command" msgid "Text editor command"
msgstr "Szövegszerkesztő parancs" msgstr "Szövegszerkesztő-parancs"
#: packages/lib/services/profileConfig/index.ts:106 #: packages/lib/services/profileConfig/index.ts:106
msgid "" msgid ""

4
packages/tools/package.json
View File

@@ -38,7 +38,7 @@
"node-fetch": "2.6.7", "node-fetch": "2.6.7",
"relative": "3.0.2", "relative": "3.0.2",
"request": "2.88.2", "request": "2.88.2",
"sharp": "0.33.5", "sharp": "0.34.0",
"source-map-support": "0.5.21", "source-map-support": "0.5.21",
"uri-template": "2.0.0", "uri-template": "2.0.0",
"yargs": "17.7.2" "yargs": "17.7.2"
@@ -51,7 +51,7 @@
"@types/jest": "29.5.14", "@types/jest": "29.5.14",
"@types/js-yaml": "4.0.9", "@types/js-yaml": "4.0.9",
"@types/markdown-it": "13.0.9", "@types/markdown-it": "13.0.9",
"@types/mustache": "4.2.5", "@types/mustache": "4.2.6",
"@types/node": "18.19.87", "@types/node": "18.19.87",
"@types/node-fetch": "2.6.12", "@types/node-fetch": "2.6.12",
"@types/yargs": "17.0.33", "@types/yargs": "17.0.33",

3
packages/tools/postPreReleasesToForum.json
View File

@@ -165,6 +165,7 @@
"v3.4.2": true, "v3.4.2": true,
"android-v3.4.1": true, "android-v3.4.1": true,
"v3.4.3": true, "v3.4.3": true,
"android-v3.4.2": true "android-v3.4.2": true,
"android-v3.4.3": true
} }
} }

2
packages/transcribe/entrypoint.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
if [ ! -f "/images/$1" ]; then if [ ! -f "/images/$1" ]; then
echo "Error: Image file /images/$1 does not exist." echo "Error: Image file /images/$1 does not exist. Check if HTR_CLI_IMAGES_FOLDER environment variable is set correctly."
exit 1 exit 1
fi fi

15
packages/transcribe/src/api/app.ts
View File

@@ -1,6 +1,6 @@
require('dotenv').config(); require('dotenv').config();
import * as Koa from 'koa'; import * as Koa from 'koa';
import Logger from '@joplin/utils/Logger'; import Logger, { LoggerWrapper } from '@joplin/utils/Logger';
import koaBody from 'koa-body'; import koaBody from 'koa-body';
import initiateLogger from '../services/initiateLogger'; import initiateLogger from '../services/initiateLogger';
import createQueue from '../services/createQueue'; import createQueue from '../services/createQueue';
@@ -10,12 +10,11 @@ import env, { EnvVariables } from '../env';
import HtrCli from '../core/HtrCli'; import HtrCli from '../core/HtrCli';
import JobProcessor from '../workers/JobProcessor'; import JobProcessor from '../workers/JobProcessor';
initiateLogger();
const logger = Logger.create('api/app');
const init = async () => { const init = async (logger: LoggerWrapper) => {
const envVariables = env(); const envVariables = env();
logger.info('Checking configurations');
await checkServerConfigurations(envVariables); await checkServerConfigurations(envVariables);
const app = new Koa(); const app = new Koa();
@@ -26,6 +25,7 @@ const init = async () => {
await router(app, envVariables.API_KEY); await router(app, envVariables.API_KEY);
logger.info('Creating queue');
const queue = await createQueue(envVariables, true); const queue = await createQueue(envVariables, true);
const fileStorage = new FileStorage(); const fileStorage = new FileStorage();
@@ -39,19 +39,22 @@ const init = async () => {
logger.info('Starting worker'); logger.info('Starting worker');
await jobProcessor.init(); await jobProcessor.init();
logger.info('Server started successfully');
}; };
const checkServerConfigurations = (envVariables: EnvVariables) => { const checkServerConfigurations = (envVariables: EnvVariables) => {
if (!envVariables.API_KEY) throw Error('API_KEY environment variable not set.'); if (!envVariables.API_KEY) throw Error('API_KEY environment variable not set.');
if (!envVariables.HTR_CLI_IMAGES_FOLDER) throw Error('HTR_CLI_IMAGES_FOLDER environment variable not set. This should point to a folder where images will be stored.');
}; };
const main = async () => { const main = async () => {
initiateLogger();
const logger = Logger.create('api/app');
logger.info('Starting...'); logger.info('Starting...');
await init(); await init(logger);
}; };
main().catch(error => { main().catch(error => {
console.error(error); console.error(error);
logger.error(error);
process.exit(1); process.exit(1);
}); });

2
packages/transcribe/src/env.ts
View File

@@ -6,7 +6,7 @@ export const defaultEnvValues: EnvVariables = {
QUEUE_RETRY_COUNT: 2, QUEUE_RETRY_COUNT: 2,
QUEUE_MAINTENANCE_INTERVAL: 60000, QUEUE_MAINTENANCE_INTERVAL: 60000,
HTR_CLI_DOCKER_IMAGE: 'joplin/htr-cli:0.0.2', HTR_CLI_DOCKER_IMAGE: 'joplin/htr-cli:0.0.2',
HTR_CLI_IMAGES_FOLDER: '/home/js/joplin/packages/transcribe/images', HTR_CLI_IMAGES_FOLDER: '',
QUEUE_DRIVER: 'pg', // 'sqlite' QUEUE_DRIVER: 'pg', // 'sqlite'
QUEUE_DATABASE_PASSWORD: '', QUEUE_DATABASE_PASSWORD: '',
QUEUE_DATABASE_NAME: '', QUEUE_DATABASE_NAME: '',

2
packages/transcribe/src/workers/JobProcessor.ts
View File

@@ -54,7 +54,7 @@ export default class JobProcessor {
try { try {
await this.checkForJobs(); await this.checkForJobs();
} catch (error) { } catch (error) {
logger.error(`Error while processing job: ${this.currentJob}`, error); logger.error(`Error while processing job: ${this.currentJob?.id}`, error);
const e = error as Error; const e = error as Error;
if (this.currentJob) { if (this.currentJob) {
await this.queue.fail(this.currentJob.id, e); await this.queue.fail(this.currentJob.id, e);

11
readme/about/changelog/android.md
View File

@@ -1,5 +1,16 @@
# Joplin Android Changelog # Joplin Android Changelog
## [android-v3.4.3](https://github.com/laurent22/joplin/releases/tag/android-v3.4.3) (Pre-release) - 2025-08-04T17:38:13Z
- New: Add a Rich Text Editor (#12748 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
- Improved: Performance: Improve Rich Text Editor startup performance (#12819 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
- Improved: Updated packages @react-native-documents/picker (v10.1.3), babel-plugin-react-native-web (v0.20.0), jsdom (v26), react-refresh (v0.17.0), sharp (v0.34.0)
- Fixed: Fix editor becomes blank after dismissing search (#12818) (#12781 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
- Fixed: Fix on screen keyboard covers the markdown toolbar and contents on Android 15+ (#12838) (#12821 by [@mrjo118](https://github.com/mrjo118))
- Fixed: Fix save button is invisible in release builds (#12826) (#12782 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
- Fixed: Improve usability of inline search in notes (#12791) (#12783 by [@mrjo118](https://github.com/mrjo118))
- Fixed: Markdown editor: Make list indentation size equivalent to four spaces (#12794) (#12573 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
## [android-v3.4.2](https://github.com/laurent22/joplin/releases/tag/android-v3.4.2) (Pre-release) - 2025-07-25T08:30:30Z ## [android-v3.4.2](https://github.com/laurent22/joplin/releases/tag/android-v3.4.2) (Pre-release) - 2025-07-25T08:30:30Z
- Improved: Updated packages react-native-paper (v5.13.5) - Improved: Updated packages react-native-paper (v5.13.5)

232
yarn.lock
View File

@@ -7275,12 +7275,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@emnapi/runtime@npm:^1.2.0": "@emnapi/runtime@npm:^1.4.0":
version: 1.4.3 version: 1.4.5
resolution: "@emnapi/runtime@npm:1.4.3" resolution: "@emnapi/runtime@npm:1.4.5"
dependencies: dependencies:
tslib: "npm:^2.4.0" tslib: "npm:^2.4.0"
checksum: 10/4f90852a1a5912982cc4e176b6420556971bcf6a85ee23e379e2455066d616219751367dcf43e6a6eaf41ea7e95ba9dc830665a52b5d979dfe074237d19578f8 checksum: 10/1d6f406ff116d2363e60aef3ed49eb8d577387f4941abea508ba376900d8831609d5cce92a58076b1a9613f8e83c75c2e3fea71e4fbcdbe06019876144c2559b
languageName: node languageName: node
linkType: hard linkType: hard
@@ -8403,11 +8403,11 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-darwin-arm64@npm:0.33.5": "@img/sharp-darwin-arm64@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-darwin-arm64@npm:0.33.5" resolution: "@img/sharp-darwin-arm64@npm:0.34.0"
dependencies: dependencies:
"@img/sharp-libvips-darwin-arm64": "npm:1.0.4" "@img/sharp-libvips-darwin-arm64": "npm:1.1.0"
dependenciesMeta: dependenciesMeta:
"@img/sharp-libvips-darwin-arm64": "@img/sharp-libvips-darwin-arm64":
optional: true optional: true
@@ -8415,11 +8415,11 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-darwin-x64@npm:0.33.5": "@img/sharp-darwin-x64@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-darwin-x64@npm:0.33.5" resolution: "@img/sharp-darwin-x64@npm:0.34.0"
dependencies: dependencies:
"@img/sharp-libvips-darwin-x64": "npm:1.0.4" "@img/sharp-libvips-darwin-x64": "npm:1.1.0"
dependenciesMeta: dependenciesMeta:
"@img/sharp-libvips-darwin-x64": "@img/sharp-libvips-darwin-x64":
optional: true optional: true
@@ -8427,67 +8427,74 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-libvips-darwin-arm64@npm:1.0.4": "@img/sharp-libvips-darwin-arm64@npm:1.1.0":
version: 1.0.4 version: 1.1.0
resolution: "@img/sharp-libvips-darwin-arm64@npm:1.0.4" resolution: "@img/sharp-libvips-darwin-arm64@npm:1.1.0"
conditions: os=darwin & cpu=arm64 conditions: os=darwin & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-libvips-darwin-x64@npm:1.0.4": "@img/sharp-libvips-darwin-x64@npm:1.1.0":
version: 1.0.4 version: 1.1.0
resolution: "@img/sharp-libvips-darwin-x64@npm:1.0.4" resolution: "@img/sharp-libvips-darwin-x64@npm:1.1.0"
conditions: os=darwin & cpu=x64 conditions: os=darwin & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-libvips-linux-arm64@npm:1.0.4": "@img/sharp-libvips-linux-arm64@npm:1.1.0":
version: 1.0.4 version: 1.1.0
resolution: "@img/sharp-libvips-linux-arm64@npm:1.0.4" resolution: "@img/sharp-libvips-linux-arm64@npm:1.1.0"
conditions: os=linux & cpu=arm64 & libc=glibc conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-libvips-linux-arm@npm:1.0.5": "@img/sharp-libvips-linux-arm@npm:1.1.0":
version: 1.0.5 version: 1.1.0
resolution: "@img/sharp-libvips-linux-arm@npm:1.0.5" resolution: "@img/sharp-libvips-linux-arm@npm:1.1.0"
conditions: os=linux & cpu=arm & libc=glibc conditions: os=linux & cpu=arm & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-libvips-linux-s390x@npm:1.0.4": "@img/sharp-libvips-linux-ppc64@npm:1.1.0":
version: 1.0.4 version: 1.1.0
resolution: "@img/sharp-libvips-linux-s390x@npm:1.0.4" resolution: "@img/sharp-libvips-linux-ppc64@npm:1.1.0"
conditions: os=linux & cpu=ppc64 & libc=glibc
languageName: node
linkType: hard
"@img/sharp-libvips-linux-s390x@npm:1.1.0":
version: 1.1.0
resolution: "@img/sharp-libvips-linux-s390x@npm:1.1.0"
conditions: os=linux & cpu=s390x & libc=glibc conditions: os=linux & cpu=s390x & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-libvips-linux-x64@npm:1.0.4": "@img/sharp-libvips-linux-x64@npm:1.1.0":
version: 1.0.4 version: 1.1.0
resolution: "@img/sharp-libvips-linux-x64@npm:1.0.4" resolution: "@img/sharp-libvips-linux-x64@npm:1.1.0"
conditions: os=linux & cpu=x64 & libc=glibc conditions: os=linux & cpu=x64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4": "@img/sharp-libvips-linuxmusl-arm64@npm:1.1.0":
version: 1.0.4 version: 1.1.0
resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4" resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.1.0"
conditions: os=linux & cpu=arm64 & libc=musl conditions: os=linux & cpu=arm64 & libc=musl
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-libvips-linuxmusl-x64@npm:1.0.4": "@img/sharp-libvips-linuxmusl-x64@npm:1.1.0":
version: 1.0.4 version: 1.1.0
resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.0.4" resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.1.0"
conditions: os=linux & cpu=x64 & libc=musl conditions: os=linux & cpu=x64 & libc=musl
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-linux-arm64@npm:0.33.5": "@img/sharp-linux-arm64@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-linux-arm64@npm:0.33.5" resolution: "@img/sharp-linux-arm64@npm:0.34.0"
dependencies: dependencies:
"@img/sharp-libvips-linux-arm64": "npm:1.0.4" "@img/sharp-libvips-linux-arm64": "npm:1.1.0"
dependenciesMeta: dependenciesMeta:
"@img/sharp-libvips-linux-arm64": "@img/sharp-libvips-linux-arm64":
optional: true optional: true
@@ -8495,11 +8502,11 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-linux-arm@npm:0.33.5": "@img/sharp-linux-arm@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-linux-arm@npm:0.33.5" resolution: "@img/sharp-linux-arm@npm:0.34.0"
dependencies: dependencies:
"@img/sharp-libvips-linux-arm": "npm:1.0.5" "@img/sharp-libvips-linux-arm": "npm:1.1.0"
dependenciesMeta: dependenciesMeta:
"@img/sharp-libvips-linux-arm": "@img/sharp-libvips-linux-arm":
optional: true optional: true
@@ -8507,11 +8514,11 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-linux-s390x@npm:0.33.5": "@img/sharp-linux-s390x@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-linux-s390x@npm:0.33.5" resolution: "@img/sharp-linux-s390x@npm:0.34.0"
dependencies: dependencies:
"@img/sharp-libvips-linux-s390x": "npm:1.0.4" "@img/sharp-libvips-linux-s390x": "npm:1.1.0"
dependenciesMeta: dependenciesMeta:
"@img/sharp-libvips-linux-s390x": "@img/sharp-libvips-linux-s390x":
optional: true optional: true
@@ -8519,11 +8526,11 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-linux-x64@npm:0.33.5": "@img/sharp-linux-x64@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-linux-x64@npm:0.33.5" resolution: "@img/sharp-linux-x64@npm:0.34.0"
dependencies: dependencies:
"@img/sharp-libvips-linux-x64": "npm:1.0.4" "@img/sharp-libvips-linux-x64": "npm:1.1.0"
dependenciesMeta: dependenciesMeta:
"@img/sharp-libvips-linux-x64": "@img/sharp-libvips-linux-x64":
optional: true optional: true
@@ -8531,11 +8538,11 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-linuxmusl-arm64@npm:0.33.5": "@img/sharp-linuxmusl-arm64@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.5" resolution: "@img/sharp-linuxmusl-arm64@npm:0.34.0"
dependencies: dependencies:
"@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.4" "@img/sharp-libvips-linuxmusl-arm64": "npm:1.1.0"
dependenciesMeta: dependenciesMeta:
"@img/sharp-libvips-linuxmusl-arm64": "@img/sharp-libvips-linuxmusl-arm64":
optional: true optional: true
@@ -8543,11 +8550,11 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-linuxmusl-x64@npm:0.33.5": "@img/sharp-linuxmusl-x64@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-linuxmusl-x64@npm:0.33.5" resolution: "@img/sharp-linuxmusl-x64@npm:0.34.0"
dependencies: dependencies:
"@img/sharp-libvips-linuxmusl-x64": "npm:1.0.4" "@img/sharp-libvips-linuxmusl-x64": "npm:1.1.0"
dependenciesMeta: dependenciesMeta:
"@img/sharp-libvips-linuxmusl-x64": "@img/sharp-libvips-linuxmusl-x64":
optional: true optional: true
@@ -8555,25 +8562,25 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-wasm32@npm:0.33.5": "@img/sharp-wasm32@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-wasm32@npm:0.33.5" resolution: "@img/sharp-wasm32@npm:0.34.0"
dependencies: dependencies:
"@emnapi/runtime": "npm:^1.2.0" "@emnapi/runtime": "npm:^1.4.0"
conditions: cpu=wasm32 conditions: cpu=wasm32
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-win32-ia32@npm:0.33.5": "@img/sharp-win32-ia32@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-win32-ia32@npm:0.33.5" resolution: "@img/sharp-win32-ia32@npm:0.34.0"
conditions: os=win32 & cpu=ia32 conditions: os=win32 & cpu=ia32
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-win32-x64@npm:0.33.5": "@img/sharp-win32-x64@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "@img/sharp-win32-x64@npm:0.33.5" resolution: "@img/sharp-win32-x64@npm:0.34.0"
conditions: os=win32 & cpu=x64 conditions: os=win32 & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
@@ -9026,7 +9033,7 @@ __metadata:
"@sentry/electron": "npm:4.24.0" "@sentry/electron": "npm:4.24.0"
"@testing-library/react-hooks": "npm:8.0.1" "@testing-library/react-hooks": "npm:8.0.1"
"@types/jest": "npm:29.5.14" "@types/jest": "npm:29.5.14"
"@types/mustache": "npm:4.2.5" "@types/mustache": "npm:4.2.6"
"@types/node": "npm:18.19.87" "@types/node": "npm:18.19.87"
"@types/react": "npm:18.3.20" "@types/react": "npm:18.3.20"
"@types/react-dom": "npm:18.3.7" "@types/react-dom": "npm:18.3.7"
@@ -9119,7 +9126,7 @@ __metadata:
"@react-native-community/geolocation": "npm:3.4.0" "@react-native-community/geolocation": "npm:3.4.0"
"@react-native-community/netinfo": "npm:11.4.1" "@react-native-community/netinfo": "npm:11.4.1"
"@react-native-community/push-notification-ios": "npm:1.11.0" "@react-native-community/push-notification-ios": "npm:1.11.0"
"@react-native-documents/picker": "npm:10.1.2" "@react-native-documents/picker": "npm:10.1.3"
"@react-native/babel-preset": "npm:0.79.2" "@react-native/babel-preset": "npm:0.79.2"
"@react-native/metro-config": "npm:0.79.2" "@react-native/metro-config": "npm:0.79.2"
"@react-native/typescript-config": "npm:0.79.2" "@react-native/typescript-config": "npm:0.79.2"
@@ -9195,7 +9202,7 @@ __metadata:
react-test-renderer: "npm:19.0.0" react-test-renderer: "npm:19.0.0"
redux: "npm:4.2.1" redux: "npm:4.2.1"
rn-fetch-blob: "npm:0.12.0" rn-fetch-blob: "npm:0.12.0"
sharp: "npm:0.33.5" sharp: "npm:0.34.0"
sqlite3: "npm:5.1.6" sqlite3: "npm:5.1.6"
stream: "npm:0.0.3" stream: "npm:0.0.3"
stream-browserify: "npm:3.0.0" stream-browserify: "npm:3.0.0"
@@ -9383,7 +9390,7 @@ __metadata:
"@types/js-yaml": "npm:4.0.9" "@types/js-yaml": "npm:4.0.9"
"@types/jsdom": "npm:21.1.7" "@types/jsdom": "npm:21.1.7"
"@types/markdown-it": "npm:13.0.9" "@types/markdown-it": "npm:13.0.9"
"@types/mustache": "npm:4.2.5" "@types/mustache": "npm:4.2.6"
"@types/nanoid": "npm:3.0.0" "@types/nanoid": "npm:3.0.0"
"@types/node": "npm:18.19.87" "@types/node": "npm:18.19.87"
"@types/node-rsa": "npm:1.1.4" "@types/node-rsa": "npm:1.1.4"
@@ -9435,7 +9442,7 @@ __metadata:
relative: "npm:3.0.2" relative: "npm:3.0.2"
reselect: "npm:4.1.8" reselect: "npm:4.1.8"
server-destroy: "npm:1.0.1" server-destroy: "npm:1.0.1"
sharp: "npm:0.33.5" sharp: "npm:0.34.0"
sprintf-js: "npm:1.1.3" sprintf-js: "npm:1.1.3"
sqlite3: "npm:5.1.6" sqlite3: "npm:5.1.6"
string-padding: "npm:1.0.2" string-padding: "npm:1.0.2"
@@ -9606,7 +9613,7 @@ __metadata:
"@types/jsdom": "npm:21.1.7" "@types/jsdom": "npm:21.1.7"
"@types/koa": "npm:2.15.0" "@types/koa": "npm:2.15.0"
"@types/markdown-it": "npm:13.0.9" "@types/markdown-it": "npm:13.0.9"
"@types/mustache": "npm:4.2.5" "@types/mustache": "npm:4.2.6"
"@types/node-os-utils": "npm:1.3.4" "@types/node-os-utils": "npm:1.3.4"
"@types/nodemailer": "npm:6.4.17" "@types/nodemailer": "npm:6.4.17"
"@types/uuid": "npm:10.0.0" "@types/uuid": "npm:10.0.0"
@@ -9666,7 +9673,7 @@ __metadata:
"@types/jest": "npm:29.5.14" "@types/jest": "npm:29.5.14"
"@types/js-yaml": "npm:4.0.9" "@types/js-yaml": "npm:4.0.9"
"@types/markdown-it": "npm:13.0.9" "@types/markdown-it": "npm:13.0.9"
"@types/mustache": "npm:4.2.5" "@types/mustache": "npm:4.2.6"
"@types/node": "npm:18.19.87" "@types/node": "npm:18.19.87"
"@types/node-fetch": "npm:2.6.12" "@types/node-fetch": "npm:2.6.12"
"@types/yargs": "npm:17.0.33" "@types/yargs": "npm:17.0.33"
@@ -9691,7 +9698,7 @@ __metadata:
request: "npm:2.88.2" request: "npm:2.88.2"
rss: "npm:1.2.2" rss: "npm:1.2.2"
sass: "npm:1.86.3" sass: "npm:1.86.3"
sharp: "npm:0.33.5" sharp: "npm:0.34.0"
source-map-support: "npm:0.5.21" source-map-support: "npm:0.5.21"
sqlite3: "npm:5.1.6" sqlite3: "npm:5.1.6"
style-to-js: "npm:1.1.16" style-to-js: "npm:1.1.16"
@@ -12222,13 +12229,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@react-native-documents/picker@npm:10.1.2": "@react-native-documents/picker@npm:10.1.3":
version: 10.1.2 version: 10.1.3
resolution: "@react-native-documents/picker@npm:10.1.2" resolution: "@react-native-documents/picker@npm:10.1.3"
peerDependencies: peerDependencies:
react: "*" react: "*"
react-native: "*" react-native: "*"
checksum: 10/9d448f347a4739aff945e9f7ebca7a1f404975d8d625eddacd3f39132784baa9e5828907cbaccd927091451b2b8ba58e8e977207858be204670e826b9470fc30 checksum: 10/d248d26f6a71b7b2c731d51b0e3c1a33315f1997ee56ed6b8ca719fb0c967aa339c9b879addfd0cdd3d7f4aa6a6a7d4f55cf132488dcc3273a67fa94adda0af9
languageName: node languageName: node
linkType: hard linkType: hard
@@ -14441,10 +14448,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/mustache@npm:4.2.5": "@types/mustache@npm:4.2.6":
version: 4.2.5 version: 4.2.6
resolution: "@types/mustache@npm:4.2.5" resolution: "@types/mustache@npm:4.2.6"
checksum: 10/29581027fe420120ae0591e28d44209d0e01adf5175910d03401327777ee9c649a1508e2aa63147c782c7e53fcea4b69b5f9a2fbedcadc5500561d1161ae5ded checksum: 10/56a9b979a9984d4f8b370ccdf04b54ae07f055b9e7326a526cf86b2fac73b04576cc71c83edaceaaf80038817520cbe2405f73623200a8ce03dcdd1e578e5016
languageName: node languageName: node
linkType: hard linkType: hard
@@ -32731,7 +32738,7 @@ __metadata:
proper-lockfile: "npm:4.1.2" proper-lockfile: "npm:4.1.2"
redux: "npm:4.2.1" redux: "npm:4.2.1"
server-destroy: "npm:1.0.1" server-destroy: "npm:1.0.1"
sharp: "npm:0.33.5" sharp: "npm:0.34.0"
sprintf-js: "npm:1.1.3" sprintf-js: "npm:1.1.3"
sqlite3: "npm:5.1.6" sqlite3: "npm:5.1.6"
string-padding: "npm:1.0.2" string-padding: "npm:1.0.2"
@@ -45089,32 +45096,33 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"sharp@npm:0.33.5": "sharp@npm:0.34.0":
version: 0.33.5 version: 0.34.0
resolution: "sharp@npm:0.33.5" resolution: "sharp@npm:0.34.0"
dependencies: dependencies:
"@img/sharp-darwin-arm64": "npm:0.33.5" "@img/sharp-darwin-arm64": "npm:0.34.0"
"@img/sharp-darwin-x64": "npm:0.33.5" "@img/sharp-darwin-x64": "npm:0.34.0"
"@img/sharp-libvips-darwin-arm64": "npm:1.0.4" "@img/sharp-libvips-darwin-arm64": "npm:1.1.0"
"@img/sharp-libvips-darwin-x64": "npm:1.0.4" "@img/sharp-libvips-darwin-x64": "npm:1.1.0"
"@img/sharp-libvips-linux-arm": "npm:1.0.5" "@img/sharp-libvips-linux-arm": "npm:1.1.0"
"@img/sharp-libvips-linux-arm64": "npm:1.0.4" "@img/sharp-libvips-linux-arm64": "npm:1.1.0"
"@img/sharp-libvips-linux-s390x": "npm:1.0.4" "@img/sharp-libvips-linux-ppc64": "npm:1.1.0"
"@img/sharp-libvips-linux-x64": "npm:1.0.4" "@img/sharp-libvips-linux-s390x": "npm:1.1.0"
"@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.4" "@img/sharp-libvips-linux-x64": "npm:1.1.0"
"@img/sharp-libvips-linuxmusl-x64": "npm:1.0.4" "@img/sharp-libvips-linuxmusl-arm64": "npm:1.1.0"
"@img/sharp-linux-arm": "npm:0.33.5" "@img/sharp-libvips-linuxmusl-x64": "npm:1.1.0"
"@img/sharp-linux-arm64": "npm:0.33.5" "@img/sharp-linux-arm": "npm:0.34.0"
"@img/sharp-linux-s390x": "npm:0.33.5" "@img/sharp-linux-arm64": "npm:0.34.0"
"@img/sharp-linux-x64": "npm:0.33.5" "@img/sharp-linux-s390x": "npm:0.34.0"
"@img/sharp-linuxmusl-arm64": "npm:0.33.5" "@img/sharp-linux-x64": "npm:0.34.0"
"@img/sharp-linuxmusl-x64": "npm:0.33.5" "@img/sharp-linuxmusl-arm64": "npm:0.34.0"
"@img/sharp-wasm32": "npm:0.33.5" "@img/sharp-linuxmusl-x64": "npm:0.34.0"
"@img/sharp-win32-ia32": "npm:0.33.5" "@img/sharp-wasm32": "npm:0.34.0"
"@img/sharp-win32-x64": "npm:0.33.5" "@img/sharp-win32-ia32": "npm:0.34.0"
"@img/sharp-win32-x64": "npm:0.34.0"
color: "npm:^4.2.3" color: "npm:^4.2.3"
detect-libc: "npm:^2.0.3" detect-libc: "npm:^2.0.3"
semver: "npm:^7.6.3" semver: "npm:^7.7.1"
dependenciesMeta: dependenciesMeta:
"@img/sharp-darwin-arm64": "@img/sharp-darwin-arm64":
optional: true optional: true
@@ -45128,6 +45136,8 @@ __metadata:
optional: true optional: true
"@img/sharp-libvips-linux-arm64": "@img/sharp-libvips-linux-arm64":
optional: true optional: true
"@img/sharp-libvips-linux-ppc64":
optional: true
"@img/sharp-libvips-linux-s390x": "@img/sharp-libvips-linux-s390x":
optional: true optional: true
"@img/sharp-libvips-linux-x64": "@img/sharp-libvips-linux-x64":
@@ -45154,7 +45164,7 @@ __metadata:
optional: true optional: true
"@img/sharp-win32-x64": "@img/sharp-win32-x64":
optional: true optional: true
checksum: 10/9f153578cb02735359cbcc874f52b56b8074ed997498c35255c7099d4f4f506f6ddf83a437a55242c7ad4f979336660504b6c78e29d6933f4981dedbdae5ce09 checksum: 10/40a5d613fc3455b68bffff70603110fbe380bee63b8759153a51ab53e5ec8b524bf0d47957b8b8e415a75528c4d73a299e4f751283c0a63226a61acaa3d5b609
languageName: node languageName: node
linkType: hard linkType: hard