Merge branch 'dev' into sharing_bug_2

.env-sample

@@ -15,23 +15,6 @@
 # POSTGRES_PORT=5432
 # POSTGRES_HOST=localhost
 
-# =============================================================================
-# TRANSCRIBE CONFIG EXAMPLE
-# -----------------------------------------------------------------------------
-# This service is not required, and it will be ignored by using --profile server
-# when running docker-compose. If you want to use it, you need to set the
-# following environment variables.
-# =============================================================================
-
-# TRANSCRIBE_API_KEY=secret_string_shared_between_server_and_transcribe
-# TRANSCRIBE_ENABLED=true
-
-# QUEUE_DATABASE_NAME=transcribe
-# QUEUE_DATABASE_USER=transcribe
-# QUEUE_DATABASE_PASSWORD=transcribe
-# QUEUE_DATABASE_PORT=5431
-# HTR_CLI_IMAGES_FOLDER=/home/user/images_storage
-
 # =============================================================================
 # DEV CONFIG EXAMPLE
 # -----------------------------------------------------------------------------

.env-transcribe-sample

@@ -9,18 +9,14 @@ API_KEY=random-string
 QUEUE_TTL=900000
 QUEUE_RETRY_COUNT=2
 QUEUE_MAINTENANCE_INTERVAL=30000
-IMAGE_MAX_DIMENSION=400
 
-HTR_CLI_DOCKER_IMAGE=joplin/htr-cli:latest
-# Fullpath to images folder e.g.:
-#HTR_CLI_IMAGES_FOLDER=/home/user/joplin/packages/transcribe/images
-HTR_CLI_IMAGES_FOLDER=
+HTR_CLI_DOCKER_IMAGE=joplin/htr-cli:0.0.2
+# Fullpath to images folder
+HTR_CLI_IMAGES_FOLDER=/home/user/joplin/packages/transcribe/images
 
 QUEUE_DRIVER=pg
 # QUEUE_DRIVER=sqlite
 
-FILE_STORAGE_MAINTENANCE_INTERVAL=3600000
-FILE_STORAGE_TTL=604800000 # one week
 
 # =============================================================================
 # Queue driver
@@ -31,5 +27,4 @@ FILE_STORAGE_TTL=604800000 # one week
 QUEUE_DATABASE_NAME=transcribe
 QUEUE_DATABASE_USER=transcribe
 QUEUE_DATABASE_PASSWORD=transcribe
-QUEUE_DATABASE_PORT=5432
-QUEUE_DATABASE_HOST=localhost
+QUEUE_DATABASE_PORT=5432

.eslintignore

@@ -55,7 +55,6 @@ packages/app-desktop/vendor/lib/
 packages/app-mobile/packageInfo.js
 packages/app-mobile/android
 packages/app-mobile/**/*.bundle.js
-packages/app-mobile/**/*.bundle.css
 packages/app-mobile/web/public/pluginAssets/**/*
 packages/app-mobile/ios
 packages/app-mobile/lib/rnInjectedJs/
@@ -75,7 +74,6 @@ packages/lib/services/database/types.ts
 packages/lib/vendor/
 packages/lib/vendor/fountain.min.js
 packages/lib/welcomeAssets.js
-packages/editor/*/vendor/
 packages/plugins/**/api
 packages/plugins/**/dist
 packages/server/dist/
@@ -96,10 +94,8 @@ packages/onenote-converter/pkg/onenote_converter.js
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/app.js
 packages/app-cli/app/base-command.js
-packages/app-cli/app/cli-integration-tests.js
 packages/app-cli/app/command-apidoc.js
 packages/app-cli/app/command-attach.js
-packages/app-cli/app/command-batch.js
 packages/app-cli/app/command-cat.js
 packages/app-cli/app/command-config.js
 packages/app-cli/app/command-cp.js
@@ -118,8 +114,6 @@ packages/app-cli/app/command-ls.js
 packages/app-cli/app/command-mkbook.test.js
 packages/app-cli/app/command-mkbook.js
 packages/app-cli/app/command-mv.js
-packages/app-cli/app/command-publish.test.js
-packages/app-cli/app/command-publish.js
 packages/app-cli/app/command-ren.js
 packages/app-cli/app/command-restore.js
 packages/app-cli/app/command-rmbook.test.js
@@ -132,8 +126,6 @@ packages/app-cli/app/command-share.test.js
 packages/app-cli/app/command-share.js
 packages/app-cli/app/command-sync.js
 packages/app-cli/app/command-testing.js
-packages/app-cli/app/command-unpublish.test.js
-packages/app-cli/app/command-unpublish.js
 packages/app-cli/app/command-use.js
 packages/app-cli/app/command-version.js
 packages/app-cli/app/gui/FolderListWidget.js
@@ -141,7 +133,6 @@ packages/app-cli/app/gui/StatusBarWidget.js
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/setupCommand.js
 packages/app-cli/app/utils/initializeCommandService.js
-packages/app-cli/app/utils/iterateStdin.js
 packages/app-cli/app/utils/shimInitCli.js
 packages/app-cli/app/utils/testUtils.js
 packages/app-cli/tests/HtmlToMd.js
@@ -164,8 +155,6 @@ packages/app-desktop/app.reducer.js
 packages/app-desktop/app.js
 packages/app-desktop/bridge.js
 packages/app-desktop/checkForUpdates.js
-packages/app-desktop/commands/convertNoteToMarkdown.test.js
-packages/app-desktop/commands/convertNoteToMarkdown.js
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyToClipboard.js
 packages/app-desktop/commands/editProfileConfig.js
@@ -206,7 +195,6 @@ packages/app-desktop/gui/ConfigScreen/controls/ToggleAdvancedSettingsButton.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.js
-packages/app-desktop/gui/ConversionNotification/ConversionNotification.js
 packages/app-desktop/gui/Dialog.js
 packages/app-desktop/gui/DialogButtonRow.js
 packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.js
@@ -308,7 +296,6 @@ packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js
 packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js
-packages/app-desktop/gui/NoteEditor/utils/getResourceBaseUrl.js
 packages/app-desktop/gui/NoteEditor/utils/getWindowCommandPriority.js
 packages/app-desktop/gui/NoteEditor/utils/index.js
 packages/app-desktop/gui/NoteEditor/utils/markupRenderOptions.js
@@ -566,8 +553,6 @@ packages/app-desktop/integration-tests/util/setSettingValue.js
 packages/app-desktop/integration-tests/util/test.js
 packages/app-desktop/integration-tests/util/waitForNextOpenPath.js
 packages/app-desktop/integration-tests/wcag.spec.js
-packages/app-desktop/main-html.js
-packages/app-desktop/main.js
 packages/app-desktop/playwright.config.js
 packages/app-desktop/plugins/GotoAnything.js
 packages/app-desktop/services/autoUpdater/AutoUpdaterService.test.js
@@ -640,21 +625,16 @@ packages/app-mobile/components/CameraView/Camera/index.web.js
 packages/app-mobile/components/CameraView/Camera/types.js
 packages/app-mobile/components/CameraView/CameraView.test.js
 packages/app-mobile/components/CameraView/CameraView.js
-packages/app-mobile/components/CameraView/CameraView.web.js
 packages/app-mobile/components/CameraView/CameraViewMultiPage.test.js
 packages/app-mobile/components/CameraView/CameraViewMultiPage.js
-packages/app-mobile/components/CameraView/PhotoPreview.js
 packages/app-mobile/components/CameraView/ScannedBarcodes.js
 packages/app-mobile/components/CameraView/types.js
 packages/app-mobile/components/CameraView/utils/fitRectIntoBounds.js
 packages/app-mobile/components/CameraView/utils/testing.js
 packages/app-mobile/components/CameraView/utils/useBarcodeScanner.js
 packages/app-mobile/components/Checkbox.js
-packages/app-mobile/components/ComboBox.test.js
-packages/app-mobile/components/ComboBox.js
 packages/app-mobile/components/DialogManager/PromptButton.js
 packages/app-mobile/components/DialogManager/PromptDialog.js
-packages/app-mobile/components/DialogManager/TextInputDialog.js
 packages/app-mobile/components/DialogManager/hooks/useDialogControl.js
 packages/app-mobile/components/DialogManager/index.js
 packages/app-mobile/components/DialogManager/types.js
@@ -676,59 +656,64 @@ packages/app-mobile/components/ExtendedWebView/index.jest.js
 packages/app-mobile/components/ExtendedWebView/index.js
 packages/app-mobile/components/ExtendedWebView/index.web.js
 packages/app-mobile/components/ExtendedWebView/types.js
-packages/app-mobile/components/ExtendedWebView/utils/useCss.js
-packages/app-mobile/components/FeedbackBanner.test.js
-packages/app-mobile/components/FeedbackBanner.js
 packages/app-mobile/components/FolderPicker.js
 packages/app-mobile/components/Icon.js
 packages/app-mobile/components/IconButton.js
 packages/app-mobile/components/Modal.js
 packages/app-mobile/components/ModalDialog.js
-packages/app-mobile/components/NestableFlatList.js
 packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.test.js
 packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/Renderer.test.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/Renderer.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/noteBodyViewerBundle.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/types.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/utils/addPluginAssets.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/utils/makeResourceModel.js
+packages/app-mobile/components/NoteBodyViewer/hooks/useContentScripts.js
+packages/app-mobile/components/NoteBodyViewer/hooks/useEditPopup.test.js
+packages/app-mobile/components/NoteBodyViewer/hooks/useEditPopup.js
 packages/app-mobile/components/NoteBodyViewer/hooks/useOnMessage.js
 packages/app-mobile/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
+packages/app-mobile/components/NoteBodyViewer/hooks/useRenderer.js
 packages/app-mobile/components/NoteBodyViewer/hooks/useRerenderHandler.js
 packages/app-mobile/components/NoteBodyViewer/hooks/useSource.js
 packages/app-mobile/components/NoteBodyViewer/types.js
+packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.js
 packages/app-mobile/components/NoteEditor/EditLinkDialog.js
 packages/app-mobile/components/NoteEditor/ImageEditor/ImageEditor.js
 packages/app-mobile/components/NoteEditor/ImageEditor/autosave.js
 packages/app-mobile/components/NoteEditor/ImageEditor/isEditableResource.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/applyTemplateToEditor.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/createJsDrawEditor.test.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/createJsDrawEditor.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/polyfills.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/startAutosaveLoop.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/types.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/watchEditorForTemplateChanges.js
 packages/app-mobile/components/NoteEditor/ImageEditor/promptRestoreAutosave.js
-packages/app-mobile/components/NoteEditor/MarkdownEditor.js
+packages/app-mobile/components/NoteEditor/ImageEditor/utils/useEditorMessenger.js
 packages/app-mobile/components/NoteEditor/NoteEditor.test.js
 packages/app-mobile/components/NoteEditor/NoteEditor.js
-packages/app-mobile/components/NoteEditor/RichTextEditor.test.js
-packages/app-mobile/components/NoteEditor/RichTextEditor.js
 packages/app-mobile/components/NoteEditor/SearchPanel.js
-packages/app-mobile/components/NoteEditor/WarningBanner.js
 packages/app-mobile/components/NoteEditor/commandDeclarations.js
+packages/app-mobile/components/NoteEditor/hooks/useCodeMirrorPlugins.js
 packages/app-mobile/components/NoteEditor/hooks/useEditorCommandHandler.test.js
 packages/app-mobile/components/NoteEditor/hooks/useEditorCommandHandler.js
-packages/app-mobile/components/NoteEditor/testing/createTestEditorProps.js
 packages/app-mobile/components/NoteEditor/types.js
 packages/app-mobile/components/NoteItem.js
 packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
 packages/app-mobile/components/ProfileSwitcher/ProfileSwitcher.js
 packages/app-mobile/components/ProfileSwitcher/useProfileConfig.js
-packages/app-mobile/components/SafeAreaView.js
 packages/app-mobile/components/ScreenHeader/Menu.js
 packages/app-mobile/components/ScreenHeader/WarningBanner.test.js
 packages/app-mobile/components/ScreenHeader/WarningBanner.js
 packages/app-mobile/components/ScreenHeader/WarningBox.js
 packages/app-mobile/components/ScreenHeader/WebBetaButton.js
 packages/app-mobile/components/ScreenHeader/index.js
-packages/app-mobile/components/SearchInput.js
 packages/app-mobile/components/SelectDateTimeDialog.js
 packages/app-mobile/components/SideMenu.js
 packages/app-mobile/components/SideMenuContentNote.js
-packages/app-mobile/components/SyncWizard/JoplinCloudIcon.js
-packages/app-mobile/components/SyncWizard/SyncWizard.js
-packages/app-mobile/components/TagEditor.test.js
-packages/app-mobile/components/TagEditor.js
 packages/app-mobile/components/TextInput.js
 packages/app-mobile/components/accessibility/AccessibleView.test.js
 packages/app-mobile/components/accessibility/AccessibleView.js
@@ -743,7 +728,6 @@ packages/app-mobile/components/base-screen.js
 packages/app-mobile/components/biometrics/BiometricPopup.js
 packages/app-mobile/components/biometrics/biometricAuthenticate.js
 packages/app-mobile/components/biometrics/sensorInfo.js
-packages/app-mobile/components/buttons/CardButton.js
 packages/app-mobile/components/buttons/FloatingActionButton.js
 packages/app-mobile/components/buttons/LabelledIconButton.js
 packages/app-mobile/components/buttons/MultiTouchableOpacity.js
@@ -754,7 +738,6 @@ packages/app-mobile/components/getResponsiveValue.js
 packages/app-mobile/components/global-style.js
 packages/app-mobile/components/plugins/PluginNotification.js
 packages/app-mobile/components/plugins/PluginRunner.js
-packages/app-mobile/components/plugins/PluginRunnerWebView.test.js
 packages/app-mobile/components/plugins/PluginRunnerWebView.js
 packages/app-mobile/components/plugins/backgroundPage/initializeDialogWebView.js
 packages/app-mobile/components/plugins/backgroundPage/initializePluginBackgroundIframe.js
@@ -819,14 +802,13 @@ packages/app-mobile/components/screens/ConfigScreen/plugins/buttons/InstallButto
 packages/app-mobile/components/screens/ConfigScreen/plugins/testUtils/WrappedPluginStates.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/testUtils/mockRepositoryApiConstructor.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/testUtils/newRepoApi.js
+packages/app-mobile/components/screens/ConfigScreen/plugins/testUtils/pluginServiceSetup.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/utils/openWebsiteForPlugin.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/utils/usePluginCallbacks.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/utils/usePluginItem.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/utils/useRepoApi.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/utils/useUpdateState.js
 packages/app-mobile/components/screens/ConfigScreen/types.js
-packages/app-mobile/components/screens/DocumentScanner/DocumentScanner.js
-packages/app-mobile/components/screens/DocumentScanner/NotePreview.js
 packages/app-mobile/components/screens/JoplinCloudLoginScreen.js
 packages/app-mobile/components/screens/LogScreen.js
 packages/app-mobile/components/screens/Note/Note.test.js
@@ -865,38 +847,6 @@ packages/app-mobile/components/voiceTyping/AudioRecordingBanner.js
 packages/app-mobile/components/voiceTyping/RecordingControls.js
 packages/app-mobile/components/voiceTyping/SpeechToTextBanner.js
 packages/app-mobile/components/voiceTyping/types.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/applyTemplateToEditor.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/index.test.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/index.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/startAutosaveLoop.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/types.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/watchEditorForTemplateChanges.js
-packages/app-mobile/contentScripts/imageEditorBundle/useWebViewSetup.js
-packages/app-mobile/contentScripts/imageEditorBundle/utils/useEditorMessenger.js
-packages/app-mobile/contentScripts/markdownEditorBundle/contentScript.js
-packages/app-mobile/contentScripts/markdownEditorBundle/types.js
-packages/app-mobile/contentScripts/markdownEditorBundle/useWebViewSetup.js
-packages/app-mobile/contentScripts/markdownEditorBundle/utils/useCodeMirrorPlugins.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/Renderer.test.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/Renderer.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/index.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/types.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/utils/addPluginAssets.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/utils/afterFullPageRender.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/utils/makeResourceModel.js
-packages/app-mobile/contentScripts/rendererBundle/types.js
-packages/app-mobile/contentScripts/rendererBundle/useWebViewSetup.js
-packages/app-mobile/contentScripts/rendererBundle/utils/useContentScripts.js
-packages/app-mobile/contentScripts/rendererBundle/utils/useEditPopup.test.js
-packages/app-mobile/contentScripts/rendererBundle/utils/useEditPopup.js
-packages/app-mobile/contentScripts/richTextEditorBundle/contentScript/convertHtmlToMarkdown.js
-packages/app-mobile/contentScripts/richTextEditorBundle/contentScript/index.js
-packages/app-mobile/contentScripts/richTextEditorBundle/types.js
-packages/app-mobile/contentScripts/richTextEditorBundle/useWebViewSetup.js
-packages/app-mobile/contentScripts/types.js
-packages/app-mobile/contentScripts/utils/polyfills.js
-packages/app-mobile/contentScripts/utils/readFileToBase64.js
-packages/app-mobile/contentScripts/utils/setUpLogger.js
 packages/app-mobile/gulpfile.js
 packages/app-mobile/index.web.js
 packages/app-mobile/root.js
@@ -906,19 +856,20 @@ packages/app-mobile/services/AlarmServiceDriver.web.js
 packages/app-mobile/services/BackButtonService.js
 packages/app-mobile/services/commands/stateToWhenClauseContext.js
 packages/app-mobile/services/e2ee/RSA.react-native.js
-packages/app-mobile/services/e2ee/RSA.react-native.web.js
 packages/app-mobile/services/e2ee/crypto.js
 packages/app-mobile/services/plugins/PlatformImplementation.js
 packages/app-mobile/services/profiles/index.js
 packages/app-mobile/services/voiceTyping/VoiceTyping.js
 packages/app-mobile/services/voiceTyping/utils/unzip.android.js
 packages/app-mobile/services/voiceTyping/utils/unzip.js
+packages/app-mobile/services/voiceTyping/vosk.android.js
+packages/app-mobile/services/voiceTyping/vosk.js
 packages/app-mobile/services/voiceTyping/whisper.test.js
 packages/app-mobile/services/voiceTyping/whisper.js
 packages/app-mobile/setupQuickActions.js
 packages/app-mobile/tools/buildInjectedJs/BundledFile.js
 packages/app-mobile/tools/buildInjectedJs/constants.js
-packages/app-mobile/tools/buildInjectedJs/copyAssets.js
+packages/app-mobile/tools/buildInjectedJs/copyJs.js
 packages/app-mobile/tools/buildInjectedJs/gulpTasks.js
 packages/app-mobile/tools/copyAssets.js
 packages/app-mobile/utils/ShareExtension.js
@@ -926,9 +877,7 @@ packages/app-mobile/utils/ShareUtils.test.js
 packages/app-mobile/utils/ShareUtils.js
 packages/app-mobile/utils/TlsUtils.js
 packages/app-mobile/utils/appDefaultState.js
-packages/app-mobile/utils/appReducer.js
 packages/app-mobile/utils/autodetectTheme.js
-packages/app-mobile/utils/buildStartupTasks.js
 packages/app-mobile/utils/checkPermissions.js
 packages/app-mobile/utils/createRootStyle.js
 packages/app-mobile/utils/database-driver-react-native.js
@@ -948,7 +897,6 @@ packages/app-mobile/utils/fs-driver/testUtil/verifyDirectoryMatches.js
 packages/app-mobile/utils/getPackageInfo.js
 packages/app-mobile/utils/getVersionInfoText.js
 packages/app-mobile/utils/hooks/useBackHandler.js
-packages/app-mobile/utils/hooks/useIsScreenReaderEnabled.js
 packages/app-mobile/utils/hooks/useKeyboardState.js
 packages/app-mobile/utils/hooks/useOnLongPressProps.js
 packages/app-mobile/utils/hooks/useReduceMotionEnabled.js
@@ -957,6 +905,7 @@ packages/app-mobile/utils/image/fileToImage.web.js
 packages/app-mobile/utils/image/getImageDimensions.js
 packages/app-mobile/utils/image/resizeImage.js
 packages/app-mobile/utils/initializeCommandService.js
+packages/app-mobile/utils/injectedJs.js
 packages/app-mobile/utils/ipc/RNToWebViewMessenger.js
 packages/app-mobile/utils/ipc/WebViewToRNMessenger.js
 packages/app-mobile/utils/lockToSingleInstance.js
@@ -966,7 +915,6 @@ packages/app-mobile/utils/pickDocument.js
 packages/app-mobile/utils/polyfills/bufferPolyfill.js
 packages/app-mobile/utils/polyfills/crypto-polyfill/index.js
 packages/app-mobile/utils/polyfills/index.js
-packages/app-mobile/utils/polyfills/index.web.js
 packages/app-mobile/utils/setupNotifications.js
 packages/app-mobile/utils/shareFile.js
 packages/app-mobile/utils/shareHandler.js
@@ -977,7 +925,6 @@ packages/app-mobile/utils/shim-init-react/shimInitShared.js
 packages/app-mobile/utils/testing/createMockReduxStore.js
 packages/app-mobile/utils/testing/getWebViewDomById.js
 packages/app-mobile/utils/testing/getWebViewWindowById.js
-packages/app-mobile/utils/testing/mockPluginServiceSetup.js
 packages/app-mobile/utils/testing/setupGlobalStore.js
 packages/app-mobile/utils/testing/testingLibrary.js
 packages/app-mobile/utils/types.js
@@ -1004,70 +951,47 @@ packages/editor/CodeMirror/editorCommands/duplicateLine.js
 packages/editor/CodeMirror/editorCommands/editorCommands.js
 packages/editor/CodeMirror/editorCommands/insertLineAfter.test.js
 packages/editor/CodeMirror/editorCommands/insertLineAfter.js
-packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.test.js
-packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.js
 packages/editor/CodeMirror/editorCommands/jumpToHash.test.js
 packages/editor/CodeMirror/editorCommands/jumpToHash.js
-packages/editor/CodeMirror/editorCommands/markdownCommands.bulletedVsChecklist.test.js
-packages/editor/CodeMirror/editorCommands/markdownCommands.test.js
-packages/editor/CodeMirror/editorCommands/markdownCommands.toggleList.test.js
-packages/editor/CodeMirror/editorCommands/markdownCommands.js
 packages/editor/CodeMirror/editorCommands/sortSelectedLines.test.js
 packages/editor/CodeMirror/editorCommands/sortSelectedLines.js
 packages/editor/CodeMirror/editorCommands/supportsCommand.js
-packages/editor/CodeMirror/extensions/biDirectionalTextExtension.js
-packages/editor/CodeMirror/extensions/ctrlClickActionExtension.js
-packages/editor/CodeMirror/extensions/ctrlClickCheckboxExtension.js
-packages/editor/CodeMirror/extensions/highlightActiveLineExtension.js
-packages/editor/CodeMirror/extensions/keyUpHandlerExtension.js
-packages/editor/CodeMirror/extensions/links/ctrlClickLinksExtension.js
-packages/editor/CodeMirror/extensions/links/followLinkTooltipExtension.test.js
-packages/editor/CodeMirror/extensions/links/followLinkTooltipExtension.js
-packages/editor/CodeMirror/extensions/links/referenceLinksStateField.js
-packages/editor/CodeMirror/extensions/links/utils/findLineMatchingLink.test.js
-packages/editor/CodeMirror/extensions/links/utils/findLineMatchingLink.js
-packages/editor/CodeMirror/extensions/links/utils/getUrlAtPosition.js
-packages/editor/CodeMirror/extensions/links/utils/openLink.js
-packages/editor/CodeMirror/extensions/markdownDecorationExtension.test.js
-packages/editor/CodeMirror/extensions/markdownDecorationExtension.js
-packages/editor/CodeMirror/extensions/markdownHighlightExtension.test.js
-packages/editor/CodeMirror/extensions/markdownHighlightExtension.js
-packages/editor/CodeMirror/extensions/markdownMathExtension.test.js
-packages/editor/CodeMirror/extensions/markdownMathExtension.js
-packages/editor/CodeMirror/extensions/modifierKeyCssExtension.js
-packages/editor/CodeMirror/extensions/overwriteModeExtension.test.js
-packages/editor/CodeMirror/extensions/overwriteModeExtension.js
-packages/editor/CodeMirror/extensions/rendering/addFormattingClasses.js
-packages/editor/CodeMirror/extensions/rendering/renderBlockImages.test.js
-packages/editor/CodeMirror/extensions/rendering/renderBlockImages.js
-packages/editor/CodeMirror/extensions/rendering/renderingExtension.js
-packages/editor/CodeMirror/extensions/rendering/replaceBulletLists.js
-packages/editor/CodeMirror/extensions/rendering/replaceCheckboxes.js
-packages/editor/CodeMirror/extensions/rendering/replaceDividers.js
-packages/editor/CodeMirror/extensions/rendering/replaceFormatCharacters.js
-packages/editor/CodeMirror/extensions/rendering/types.js
-packages/editor/CodeMirror/extensions/rendering/utils/makeBlockReplaceExtension.js
-packages/editor/CodeMirror/extensions/rendering/utils/makeInlineReplaceExtension.js
-packages/editor/CodeMirror/extensions/rendering/utils/nodeIntersectsSelection.js
-packages/editor/CodeMirror/extensions/searchExtension.js
-packages/editor/CodeMirror/extensions/selectedNoteIdExtension.js
 packages/editor/CodeMirror/getScrollFraction.js
-packages/editor/CodeMirror/index.js
+packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.test.js
+packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.js
+packages/editor/CodeMirror/markdown/MarkdownMathExtension.test.js
+packages/editor/CodeMirror/markdown/MarkdownMathExtension.js
+packages/editor/CodeMirror/markdown/codeBlockLanguages/allLanguages.js
+packages/editor/CodeMirror/markdown/codeBlockLanguages/defaultLanguage.js
+packages/editor/CodeMirror/markdown/codeBlockLanguages/lookUpLanguage.js
+packages/editor/CodeMirror/markdown/computeSelectionFormatting.test.js
+packages/editor/CodeMirror/markdown/computeSelectionFormatting.js
+packages/editor/CodeMirror/markdown/decoratorExtension.test.js
+packages/editor/CodeMirror/markdown/decoratorExtension.js
+packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.test.js
+packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.js
+packages/editor/CodeMirror/markdown/markdownCommands.bulletedVsChecklist.test.js
+packages/editor/CodeMirror/markdown/markdownCommands.test.js
+packages/editor/CodeMirror/markdown/markdownCommands.toggleList.test.js
+packages/editor/CodeMirror/markdown/markdownCommands.js
+packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.test.js
+packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.js
+packages/editor/CodeMirror/markdown/utils/stripBlockquote.js
 packages/editor/CodeMirror/pluginApi/PluginLoader.js
 packages/editor/CodeMirror/pluginApi/codeMirrorRequire.js
 packages/editor/CodeMirror/pluginApi/customEditorCompletion.test.js
 packages/editor/CodeMirror/pluginApi/customEditorCompletion.js
-packages/editor/CodeMirror/testing/createEditorControl.js
-packages/editor/CodeMirror/testing/createTestEditor.js
-packages/editor/CodeMirror/testing/findNodesWithName.js
-packages/editor/CodeMirror/testing/forceFullParse.js
-packages/editor/CodeMirror/testing/loadLanguages.js
-packages/editor/CodeMirror/testing/pressReleaseKey.js
-packages/editor/CodeMirror/testing/typeText.js
+packages/editor/CodeMirror/testUtil/createEditorControl.js
+packages/editor/CodeMirror/testUtil/createEditorSettings.js
+packages/editor/CodeMirror/testUtil/createTestEditor.js
+packages/editor/CodeMirror/testUtil/findNodesWithName.js
+packages/editor/CodeMirror/testUtil/forceFullParse.js
+packages/editor/CodeMirror/testUtil/loadLanguages.js
+packages/editor/CodeMirror/testUtil/pressReleaseKey.js
+packages/editor/CodeMirror/testUtil/typeText.js
 packages/editor/CodeMirror/theme.js
+packages/editor/CodeMirror/utils/biDirectionalTextExtension.js
 packages/editor/CodeMirror/utils/formatting/RegionSpec.js
-packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.test.js
-packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.js
 packages/editor/CodeMirror/utils/formatting/findInlineMatch.test.js
 packages/editor/CodeMirror/utils/formatting/findInlineMatch.js
 packages/editor/CodeMirror/utils/formatting/isIndentationEquivalent.js
@@ -1086,72 +1010,15 @@ packages/editor/CodeMirror/utils/handleLinkEditRequests.js
 packages/editor/CodeMirror/utils/handlePasteEvent.js
 packages/editor/CodeMirror/utils/isCursorAtBeginning.js
 packages/editor/CodeMirror/utils/isInSyntaxNode.js
-packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/allLanguages.js
-packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/defaultLanguage.js
-packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/lookUpLanguage.js
-packages/editor/CodeMirror/utils/markdown/getCheckboxAtPosition.js
-packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.test.js
-packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.js
-packages/editor/CodeMirror/utils/markdown/stripBlockquote.js
-packages/editor/CodeMirror/utils/markdown/toggleCheckboxAt.js
+packages/editor/CodeMirror/utils/keyUpHandlerExtension.js
+packages/editor/CodeMirror/utils/overwriteModeExtension.test.js
+packages/editor/CodeMirror/utils/overwriteModeExtension.js
+packages/editor/CodeMirror/utils/searchExtension.js
+packages/editor/CodeMirror/utils/selectedNoteIdExtension.js
 packages/editor/CodeMirror/utils/setupVim.js
-packages/editor/ProseMirror/commands.test.js
-packages/editor/ProseMirror/commands.js
-packages/editor/ProseMirror/createEditor.js
-packages/editor/ProseMirror/index.js
-packages/editor/ProseMirror/plugins/detailsPlugin.test.js
-packages/editor/ProseMirror/plugins/detailsPlugin.js
-packages/editor/ProseMirror/plugins/imagePlugin.test.js
-packages/editor/ProseMirror/plugins/imagePlugin.js
-packages/editor/ProseMirror/plugins/inputRulesPlugin.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/createEditorDialog.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/joplinEditablePlugin.test.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/joplinEditablePlugin.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/postProcessRenderedHtml.js
-packages/editor/ProseMirror/plugins/joplinEditorApiPlugin.js
-packages/editor/ProseMirror/plugins/keymapPlugin.js
-packages/editor/ProseMirror/plugins/linkTooltipPlugin.test.js
-packages/editor/ProseMirror/plugins/linkTooltipPlugin.js
-packages/editor/ProseMirror/plugins/listPlugin.js
-packages/editor/ProseMirror/plugins/originalMarkupPlugin.js
-packages/editor/ProseMirror/plugins/searchPlugin.js
-packages/editor/ProseMirror/plugins/utils/createExternalEditorPlugin.js
-packages/editor/ProseMirror/plugins/utils/createFloatingButtonPlugin.js
-packages/editor/ProseMirror/schema.js
-packages/editor/ProseMirror/styles.js
-packages/editor/ProseMirror/testing/createTestEditor.js
-packages/editor/ProseMirror/testing/createTestEditorWithSerializer.js
-packages/editor/ProseMirror/types.js
-packages/editor/ProseMirror/utils/SelectableNodeView.js
-packages/editor/ProseMirror/utils/UndoStackSynchronizer.js
-packages/editor/ProseMirror/utils/canReplaceSelectionWith.js
-packages/editor/ProseMirror/utils/computeSelectionFormatting.js
-packages/editor/ProseMirror/utils/dom/createButton.js
-packages/editor/ProseMirror/utils/dom/createTextArea.js
-packages/editor/ProseMirror/utils/dom/createTextNode.js
-packages/editor/ProseMirror/utils/dom/createUniqueId.js
-packages/editor/ProseMirror/utils/dom/showModal.js
-packages/editor/ProseMirror/utils/extractSelectedLinesTo.test.js
-packages/editor/ProseMirror/utils/extractSelectedLinesTo.js
-packages/editor/ProseMirror/utils/forEachHeading.js
-packages/editor/ProseMirror/utils/jumpToHash.js
-packages/editor/ProseMirror/utils/makeLinksClickableInElement.js
-packages/editor/ProseMirror/utils/postprocessEditorOutput.test.js
-packages/editor/ProseMirror/utils/postprocessEditorOutput.js
-packages/editor/ProseMirror/utils/preprocessEditorInput.test.js
-packages/editor/ProseMirror/utils/preprocessEditorInput.js
-packages/editor/ProseMirror/utils/sanitizeHtml.js
-packages/editor/ProseMirror/utils/selectFirstInstanceOfNode.js
-packages/editor/ProseMirror/utils/trimEmptyParagraphs.js
-packages/editor/ProseMirror/vendor/changedDescendants.js
-packages/editor/ProseMirror/vendor/splitBlockAs.js
 packages/editor/SelectionFormatting.js
 packages/editor/events.js
-packages/editor/polyfills.js
-packages/editor/testing/createEditorSettings.js
-packages/editor/testing/setUpLogger.js
 packages/editor/types.js
-packages/editor/utils/getFileFromPasteEvent.js
 packages/fork-htmlparser2/src/CollectingHandler.js
 packages/fork-htmlparser2/src/FeedHandler.spec.js
 packages/fork-htmlparser2/src/FeedHandler.js
@@ -1196,8 +1063,6 @@ packages/lib/JoplinDatabase.js
 packages/lib/JoplinError.js
 packages/lib/JoplinServerApi.js
 packages/lib/ObjectUtils.js
-packages/lib/PerformanceLogger.test.js
-packages/lib/PerformanceLogger.js
 packages/lib/PoorManIntervals.js
 packages/lib/RotatingLogs.test.js
 packages/lib/RotatingLogs.js
@@ -1215,8 +1080,6 @@ packages/lib/array.js
 packages/lib/callbackUrlUtils.test.js
 packages/lib/callbackUrlUtils.js
 packages/lib/clipperUtils.js
-packages/lib/commands/convertHtmlToMarkdown.test.js
-packages/lib/commands/convertHtmlToMarkdown.js
 packages/lib/commands/deleteNote.js
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyForward.js
@@ -1233,8 +1096,6 @@ packages/lib/commands/toggleAllFolders.js
 packages/lib/commands/toggleEditorPlugin.js
 packages/lib/components/EncryptionConfigScreen/utils.test.js
 packages/lib/components/EncryptionConfigScreen/utils.js
-packages/lib/components/shared/NoteEditor/WarningBanner/onRichTextDismissLinkClick.js
-packages/lib/components/shared/NoteEditor/WarningBanner/onRichTextReadMoreLinkClick.js
 packages/lib/components/shared/NoteList/getEmptyFolderMessage.js
 packages/lib/components/shared/NoteRevisionViewer/getHelpMessage.js
 packages/lib/components/shared/NoteRevisionViewer/useDeleteHistoryClick.js
@@ -1411,26 +1272,20 @@ packages/lib/services/database/migrations/44.js
 packages/lib/services/database/migrations/45.js
 packages/lib/services/database/migrations/46.js
 packages/lib/services/database/migrations/47.js
-packages/lib/services/database/migrations/48.js
 packages/lib/services/database/migrations/index.js
 packages/lib/services/database/sqlStringToLines.js
 packages/lib/services/database/types.js
 packages/lib/services/debug/populateDatabase.js
 packages/lib/services/e2ee/EncryptionService.test.js
 packages/lib/services/e2ee/EncryptionService.js
+packages/lib/services/e2ee/RSA.node.js
 packages/lib/services/e2ee/crypto.test.js
 packages/lib/services/e2ee/crypto.js
 packages/lib/services/e2ee/cryptoShared.js
 packages/lib/services/e2ee/cryptoTestUtils.js
-packages/lib/services/e2ee/ppk/RSA.node.js
-packages/lib/services/e2ee/ppk/ppk.test.js
-packages/lib/services/e2ee/ppk/ppk.js
-packages/lib/services/e2ee/ppk/ppkTestUtils.js
-packages/lib/services/e2ee/ppk/webCrypto/LongDataWrapper.js
-packages/lib/services/e2ee/ppk/webCrypto/StringToBufferWrapper.js
-packages/lib/services/e2ee/ppk/webCrypto/WebCryptoRsa.js
-packages/lib/services/e2ee/ppk/webCrypto/buildRsaCryptoProvider.test.js
-packages/lib/services/e2ee/ppk/webCrypto/buildRsaCryptoProvider.js
+packages/lib/services/e2ee/ppk.test.js
+packages/lib/services/e2ee/ppk.js
+packages/lib/services/e2ee/ppkTestUtils.js
 packages/lib/services/e2ee/types.js
 packages/lib/services/e2ee/utils.test.js
 packages/lib/services/e2ee/utils.js
@@ -1485,8 +1340,6 @@ packages/lib/services/ocr/OcrDriverBase.js
 packages/lib/services/ocr/OcrService.test.js
 packages/lib/services/ocr/OcrService.js
 packages/lib/services/ocr/drivers/OcrDriverTesseract.js
-packages/lib/services/ocr/drivers/OcrDriverTranscribe.test.js
-packages/lib/services/ocr/drivers/OcrDriverTranscribe.js
 packages/lib/services/ocr/utils/filterOcrText.test.js
 packages/lib/services/ocr/utils/filterOcrText.js
 packages/lib/services/ocr/utils/types.js
@@ -1656,7 +1509,6 @@ packages/lib/shim-init-node.js
 packages/lib/shim.js
 packages/lib/string-utils.test.js
 packages/lib/string-utils.js
-packages/lib/testing/plugins/createTestPlugin.js
 packages/lib/testing/share/makeMockShareInvitation.js
 packages/lib/testing/share/mockShareService.js
 packages/lib/testing/syncTargetUtils.js
@@ -1801,14 +1653,12 @@ packages/tools/fuzzer/Client.js
 packages/tools/fuzzer/ClientPool.js
 packages/tools/fuzzer/Server.js
 packages/tools/fuzzer/constants.js
-packages/tools/fuzzer/model/FolderRecord.js
 packages/tools/fuzzer/sync-fuzzer.js
 packages/tools/fuzzer/types.js
 packages/tools/fuzzer/utils/SeededRandom.js
 packages/tools/fuzzer/utils/getNumberProperty.js
 packages/tools/fuzzer/utils/getProperty.js
 packages/tools/fuzzer/utils/getStringProperty.js
-packages/tools/fuzzer/utils/openDebugSession.js
 packages/tools/fuzzer/utils/retryWithCount.js
 packages/tools/generate-database-types.js
 packages/tools/generate-images.js
@@ -1840,7 +1690,6 @@ packages/tools/release-electron.js
 packages/tools/release-ios.js
 packages/tools/release-plugin-repo-cli.js
 packages/tools/release-server.js
-packages/tools/release-transcribe.js
 packages/tools/saveClaConsentRecords.js
 packages/tools/setupNewRelease.js
 packages/tools/spellcheck.js

.eslintrc.js

@@ -23,7 +23,6 @@ module.exports = {
 		'FileSystemCreateWritableOptions': 'readonly',
 		'FileSystemHandle': 'readonly',
 		'IDBTransactionMode': 'readonly',
-		'FlatArray': 'readonly',
 		'BigInt': 'readonly',
 		'globalThis': 'readonly',
 

.github/scripts/run_ci.sh

@@ -7,13 +7,9 @@
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 ROOT_DIR="$SCRIPT_DIR/../.."
 
-TRANSCRIBE_TAG_PREFIX=transcribe
-TRANSCRIBE_REPOSITORY=joplin/transcribe
-
 IS_PULL_REQUEST=0
 IS_DESKTOP_RELEASE=0
 IS_SERVER_RELEASE=0
-IS_TRANSCRIBE_RELEASE=0
 IS_LINUX=0
 IS_MACOS=0
 
@@ -27,10 +23,6 @@ if [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
 	IS_SERVER_RELEASE=1
 fi
 
-if [[ $GIT_TAG_NAME = $TRANSCRIBE_TAG_PREFIX-* ]]; then
-	IS_TRANSCRIBE_RELEASE=1
-fi
-
 if [[ $GIT_TAG_NAME = v* ]]; then
 	IS_DESKTOP_RELEASE=1
 fi
@@ -49,17 +41,15 @@ DOCKER_IMAGE_PLATFORM="linux/amd64"
 # a release
 RUN_TESTS=0
 
-if [ "$IS_SERVER_RELEASE" = 0 ] && [ "$IS_DESKTOP_RELEASE" = 0 ] && [ "$IS_TRANSCRIBE_RELEASE" = 0 ]; then
+if [ "$IS_SERVER_RELEASE" = 0 ] && [ "$IS_DESKTOP_RELEASE" = 0 ]; then
 	RUN_TESTS=1
 fi
 
-if [ "$RUNNER_ARCH" == "ARM64" ]; then
-	if [ "$IS_SERVER_RELEASE" == "0" ] && [ "$IS_TRANSCRIBE_RELEASE" == "0" ]; then
-		# We exit now because nothing works properly with the ARM64 architecture.
-		# We only proceed  if building the server image.
-		echo "Running on ARM64 and not trying to build server image - early exit"
-		exit 0
-	fi
+if [ "$RUNNER_ARCH" == "ARM64" ] && [ "$IS_SERVER_RELEASE" == "0" ]; then
+	# We exit now because nothing works properly with the ARM64 architecture.
+	# We only proceed  if building the server image.
+	echo "Running on ARM64 and not trying to build server image - early exit"
+	exit 0
 fi
 
 if [ "$RUNNER_ARCH" == "ARM64" ]; then
@@ -90,14 +80,12 @@ echo "GIT_TAG_NAME=$GIT_TAG_NAME"
 echo "BUILD_SEQUENCIAL=$BUILD_SEQUENCIAL"
 echo "SERVER_REPOSITORY=$SERVER_REPOSITORY"
 echo "SERVER_TAG_PREFIX=$SERVER_TAG_PREFIX"
-echo "TRANSCRIBE_TAG_PREFIX=$TRANSCRIBE_TAG_PREFIX"
 echo "DOCKER_IMAGE_PLATFORM=$DOCKER_IMAGE_PLATFORM"
 
 echo "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION"
 echo "IS_PULL_REQUEST=$IS_PULL_REQUEST"
 echo "IS_DESKTOP_RELEASE=$IS_DESKTOP_RELEASE"
 echo "IS_SERVER_RELEASE=$IS_SERVER_RELEASE"
-echo "IS_TRANSCRIBE_RELEASE=$IS_TRANSCRIBE_RELEASE"
 echo "RUN_TESTS=$RUN_TESTS"
 echo "IS_LINUX=$IS_LINUX"
 echo "IS_MACOS=$IS_MACOS"
@@ -313,13 +301,9 @@ if [ "$IS_DESKTOP_RELEASE" == "1" ]; then
 		USE_HARD_LINKS=false yarn dist
 	fi	
 elif [[ $IS_LINUX = 1 ]] && [ "$IS_SERVER_RELEASE" == "1" ]; then
-	echo "Step: Building Joplin Server Docker Image..."
+	echo "Step: Building Docker Image..."
 	cd "$ROOT_DIR"
-	yarn buildServerDocker --docker-file Dockerfile.server --platform $DOCKER_IMAGE_PLATFORM --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
-elif [[ $IS_LINUX = 1 ]] && [ "$IS_TRANSCRIBE_RELEASE" == "1" ]; then
-	echo "Step: Building Joplin Transcribe Docker Image..."
-	cd "$ROOT_DIR"
-	yarn buildServerDocker --docker-file Dockerfile.transcribe --platform $DOCKER_IMAGE_PLATFORM --tag-name $GIT_TAG_NAME --push-images --repository $TRANSCRIBE_REPOSITORY
+	yarn buildServerDocker --platform $DOCKER_IMAGE_PLATFORM --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
 else
 	echo "Step: Building but *not* publishing desktop application..."
 	

.github/workflows/build-android.yml

@@ -40,29 +40,4 @@ jobs:
           cd packages/app-mobile/android
           sed -i -- 's/signingConfig signingConfigs.release/signingConfig signingConfigs.debug/' app/build.gradle
           ./gradlew assembleRelease
-      
-      - name: Verify alignment
-        run: |
-          cd packages/app-mobile/android/app
-          APK_FILE="./build/outputs/apk/release/app-release.apk"
-          if test ! -f "$APK_FILE" ; then
-            echo "APK file not found."
-            exit 1
-          else
-            echo "APK file found at: $APK_FILE"
-          fi
-
-          BUILD_TOOLS_PATH="$ANDROID_HOME/build-tools/"
-          if test ! -d "$BUILD_TOOLS_PATH" ; then
-            echo "Build tools not found at $BUILD_TOOLS_PATH ($ANDROID_HOME, $BUILD_TOOLS_VERSION)"
-            exit 1
-          fi
-          # The build-tools/ directory contains different subdirectories
-          # for each build tools version. As a result, there may be multiple
-          # zipalign tools. Select the most recent (biggest two-digit version number):
-          ZIPALIGN_PATH="$(find $BUILD_TOOLS_PATH -name "zipalign" -print | sort | tail -n1)"
-          if test ! -x "$ZIPALIGN_PATH" ; then
-            echo "zipalign not found (searching in $BUILD_TOOLS_PATH, candidate: $ZIPALIGN_PATH)"
-            exit 1
-          fi
-          "$ZIPALIGN_PATH" -c -P 16 -v 4 "$APK_FILE"
+          

.github/workflows/github-actions-main.yml

@@ -17,6 +17,7 @@ jobs:
         uses: ./.github/workflows/shared/setup-build-environment
 
       - name: Install Docker Engine
+        # if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
         if: runner.os == 'Linux'
         run: |
           sudo apt-get install -y apt-transport-https
@@ -31,21 +32,11 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin
 
-      - name: Free disk space
-        if: runner.os == 'Linux'
-        run: |
-          sudo rm -rf /usr/local/lib/android || true
-          sudo rm -rf /usr/share/dotnet || true
-          sudo rm -rf /opt/ghc || true
-          docker system prune -af || true
-          docker builder prune -af || true
-          sudo rm -rf /var/lib/docker/tmp/* || true
-
       # Login to Docker only if we're on a server release tag. If we run this on
       # a pull request it will fail because the PR doesn't have access to
       # secrets
       - uses: docker/login-action@v3
-        if: runner.os == 'Linux' && (startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/transcribe-v'))
+        if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -132,16 +123,6 @@ jobs:
         with:
           node-version: '18'
 
-      - name: Free disk space
-        if: runner.os == 'Linux'
-        run: |
-          sudo rm -rf /usr/local/lib/android || true
-          sudo rm -rf /usr/share/dotnet || true
-          sudo rm -rf /opt/ghc || true
-          docker system prune -af || true
-          docker builder prune -af || true
-          sudo rm -rf /var/lib/docker/tmp/* || true
-
       - name: Install Yarn
         run: |
           # https://yarnpkg.com/getting-started/install
@@ -160,7 +141,7 @@ jobs:
           echo "DOCKER_IMAGE_PLATFORM=$DOCKER_IMAGE_PLATFORM"
 
           yarn install
-          yarn buildServerDocker --docker-file Dockerfile.server --platform $DOCKER_IMAGE_PLATFORM --tag-name server-v0.0.0 --repository joplin/server
+          yarn buildServerDocker --platform $DOCKER_IMAGE_PLATFORM --tag-name server-v0.0.0 --repository joplin/server
 
           # Basic test to ensure that the created build is valid. It should exit with
           # code 0 if it works.

.gitignore

@@ -69,10 +69,8 @@ docs/**/*.mustache
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/app.js
 packages/app-cli/app/base-command.js
-packages/app-cli/app/cli-integration-tests.js
 packages/app-cli/app/command-apidoc.js
 packages/app-cli/app/command-attach.js
-packages/app-cli/app/command-batch.js
 packages/app-cli/app/command-cat.js
 packages/app-cli/app/command-config.js
 packages/app-cli/app/command-cp.js
@@ -91,8 +89,6 @@ packages/app-cli/app/command-ls.js
 packages/app-cli/app/command-mkbook.test.js
 packages/app-cli/app/command-mkbook.js
 packages/app-cli/app/command-mv.js
-packages/app-cli/app/command-publish.test.js
-packages/app-cli/app/command-publish.js
 packages/app-cli/app/command-ren.js
 packages/app-cli/app/command-restore.js
 packages/app-cli/app/command-rmbook.test.js
@@ -105,8 +101,6 @@ packages/app-cli/app/command-share.test.js
 packages/app-cli/app/command-share.js
 packages/app-cli/app/command-sync.js
 packages/app-cli/app/command-testing.js
-packages/app-cli/app/command-unpublish.test.js
-packages/app-cli/app/command-unpublish.js
 packages/app-cli/app/command-use.js
 packages/app-cli/app/command-version.js
 packages/app-cli/app/gui/FolderListWidget.js
@@ -114,7 +108,6 @@ packages/app-cli/app/gui/StatusBarWidget.js
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/setupCommand.js
 packages/app-cli/app/utils/initializeCommandService.js
-packages/app-cli/app/utils/iterateStdin.js
 packages/app-cli/app/utils/shimInitCli.js
 packages/app-cli/app/utils/testUtils.js
 packages/app-cli/tests/HtmlToMd.js
@@ -137,8 +130,6 @@ packages/app-desktop/app.reducer.js
 packages/app-desktop/app.js
 packages/app-desktop/bridge.js
 packages/app-desktop/checkForUpdates.js
-packages/app-desktop/commands/convertNoteToMarkdown.test.js
-packages/app-desktop/commands/convertNoteToMarkdown.js
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyToClipboard.js
 packages/app-desktop/commands/editProfileConfig.js
@@ -179,7 +170,6 @@ packages/app-desktop/gui/ConfigScreen/controls/ToggleAdvancedSettingsButton.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.js
-packages/app-desktop/gui/ConversionNotification/ConversionNotification.js
 packages/app-desktop/gui/Dialog.js
 packages/app-desktop/gui/DialogButtonRow.js
 packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.js
@@ -281,7 +271,6 @@ packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js
 packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js
-packages/app-desktop/gui/NoteEditor/utils/getResourceBaseUrl.js
 packages/app-desktop/gui/NoteEditor/utils/getWindowCommandPriority.js
 packages/app-desktop/gui/NoteEditor/utils/index.js
 packages/app-desktop/gui/NoteEditor/utils/markupRenderOptions.js
@@ -539,8 +528,6 @@ packages/app-desktop/integration-tests/util/setSettingValue.js
 packages/app-desktop/integration-tests/util/test.js
 packages/app-desktop/integration-tests/util/waitForNextOpenPath.js
 packages/app-desktop/integration-tests/wcag.spec.js
-packages/app-desktop/main-html.js
-packages/app-desktop/main.js
 packages/app-desktop/playwright.config.js
 packages/app-desktop/plugins/GotoAnything.js
 packages/app-desktop/services/autoUpdater/AutoUpdaterService.test.js
@@ -613,21 +600,16 @@ packages/app-mobile/components/CameraView/Camera/index.web.js
 packages/app-mobile/components/CameraView/Camera/types.js
 packages/app-mobile/components/CameraView/CameraView.test.js
 packages/app-mobile/components/CameraView/CameraView.js
-packages/app-mobile/components/CameraView/CameraView.web.js
 packages/app-mobile/components/CameraView/CameraViewMultiPage.test.js
 packages/app-mobile/components/CameraView/CameraViewMultiPage.js
-packages/app-mobile/components/CameraView/PhotoPreview.js
 packages/app-mobile/components/CameraView/ScannedBarcodes.js
 packages/app-mobile/components/CameraView/types.js
 packages/app-mobile/components/CameraView/utils/fitRectIntoBounds.js
 packages/app-mobile/components/CameraView/utils/testing.js
 packages/app-mobile/components/CameraView/utils/useBarcodeScanner.js
 packages/app-mobile/components/Checkbox.js
-packages/app-mobile/components/ComboBox.test.js
-packages/app-mobile/components/ComboBox.js
 packages/app-mobile/components/DialogManager/PromptButton.js
 packages/app-mobile/components/DialogManager/PromptDialog.js
-packages/app-mobile/components/DialogManager/TextInputDialog.js
 packages/app-mobile/components/DialogManager/hooks/useDialogControl.js
 packages/app-mobile/components/DialogManager/index.js
 packages/app-mobile/components/DialogManager/types.js
@@ -649,59 +631,64 @@ packages/app-mobile/components/ExtendedWebView/index.jest.js
 packages/app-mobile/components/ExtendedWebView/index.js
 packages/app-mobile/components/ExtendedWebView/index.web.js
 packages/app-mobile/components/ExtendedWebView/types.js
-packages/app-mobile/components/ExtendedWebView/utils/useCss.js
-packages/app-mobile/components/FeedbackBanner.test.js
-packages/app-mobile/components/FeedbackBanner.js
 packages/app-mobile/components/FolderPicker.js
 packages/app-mobile/components/Icon.js
 packages/app-mobile/components/IconButton.js
 packages/app-mobile/components/Modal.js
 packages/app-mobile/components/ModalDialog.js
-packages/app-mobile/components/NestableFlatList.js
 packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.test.js
 packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/Renderer.test.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/Renderer.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/noteBodyViewerBundle.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/types.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/utils/addPluginAssets.js
+packages/app-mobile/components/NoteBodyViewer/bundledJs/utils/makeResourceModel.js
+packages/app-mobile/components/NoteBodyViewer/hooks/useContentScripts.js
+packages/app-mobile/components/NoteBodyViewer/hooks/useEditPopup.test.js
+packages/app-mobile/components/NoteBodyViewer/hooks/useEditPopup.js
 packages/app-mobile/components/NoteBodyViewer/hooks/useOnMessage.js
 packages/app-mobile/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
+packages/app-mobile/components/NoteBodyViewer/hooks/useRenderer.js
 packages/app-mobile/components/NoteBodyViewer/hooks/useRerenderHandler.js
 packages/app-mobile/components/NoteBodyViewer/hooks/useSource.js
 packages/app-mobile/components/NoteBodyViewer/types.js
+packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.js
 packages/app-mobile/components/NoteEditor/EditLinkDialog.js
 packages/app-mobile/components/NoteEditor/ImageEditor/ImageEditor.js
 packages/app-mobile/components/NoteEditor/ImageEditor/autosave.js
 packages/app-mobile/components/NoteEditor/ImageEditor/isEditableResource.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/applyTemplateToEditor.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/createJsDrawEditor.test.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/createJsDrawEditor.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/polyfills.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/startAutosaveLoop.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/types.js
+packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/watchEditorForTemplateChanges.js
 packages/app-mobile/components/NoteEditor/ImageEditor/promptRestoreAutosave.js
-packages/app-mobile/components/NoteEditor/MarkdownEditor.js
+packages/app-mobile/components/NoteEditor/ImageEditor/utils/useEditorMessenger.js
 packages/app-mobile/components/NoteEditor/NoteEditor.test.js
 packages/app-mobile/components/NoteEditor/NoteEditor.js
-packages/app-mobile/components/NoteEditor/RichTextEditor.test.js
-packages/app-mobile/components/NoteEditor/RichTextEditor.js
 packages/app-mobile/components/NoteEditor/SearchPanel.js
-packages/app-mobile/components/NoteEditor/WarningBanner.js
 packages/app-mobile/components/NoteEditor/commandDeclarations.js
+packages/app-mobile/components/NoteEditor/hooks/useCodeMirrorPlugins.js
 packages/app-mobile/components/NoteEditor/hooks/useEditorCommandHandler.test.js
 packages/app-mobile/components/NoteEditor/hooks/useEditorCommandHandler.js
-packages/app-mobile/components/NoteEditor/testing/createTestEditorProps.js
 packages/app-mobile/components/NoteEditor/types.js
 packages/app-mobile/components/NoteItem.js
 packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
 packages/app-mobile/components/ProfileSwitcher/ProfileSwitcher.js
 packages/app-mobile/components/ProfileSwitcher/useProfileConfig.js
-packages/app-mobile/components/SafeAreaView.js
 packages/app-mobile/components/ScreenHeader/Menu.js
 packages/app-mobile/components/ScreenHeader/WarningBanner.test.js
 packages/app-mobile/components/ScreenHeader/WarningBanner.js
 packages/app-mobile/components/ScreenHeader/WarningBox.js
 packages/app-mobile/components/ScreenHeader/WebBetaButton.js
 packages/app-mobile/components/ScreenHeader/index.js
-packages/app-mobile/components/SearchInput.js
 packages/app-mobile/components/SelectDateTimeDialog.js
 packages/app-mobile/components/SideMenu.js
 packages/app-mobile/components/SideMenuContentNote.js
-packages/app-mobile/components/SyncWizard/JoplinCloudIcon.js
-packages/app-mobile/components/SyncWizard/SyncWizard.js
-packages/app-mobile/components/TagEditor.test.js
-packages/app-mobile/components/TagEditor.js
 packages/app-mobile/components/TextInput.js
 packages/app-mobile/components/accessibility/AccessibleView.test.js
 packages/app-mobile/components/accessibility/AccessibleView.js
@@ -716,7 +703,6 @@ packages/app-mobile/components/base-screen.js
 packages/app-mobile/components/biometrics/BiometricPopup.js
 packages/app-mobile/components/biometrics/biometricAuthenticate.js
 packages/app-mobile/components/biometrics/sensorInfo.js
-packages/app-mobile/components/buttons/CardButton.js
 packages/app-mobile/components/buttons/FloatingActionButton.js
 packages/app-mobile/components/buttons/LabelledIconButton.js
 packages/app-mobile/components/buttons/MultiTouchableOpacity.js
@@ -727,7 +713,6 @@ packages/app-mobile/components/getResponsiveValue.js
 packages/app-mobile/components/global-style.js
 packages/app-mobile/components/plugins/PluginNotification.js
 packages/app-mobile/components/plugins/PluginRunner.js
-packages/app-mobile/components/plugins/PluginRunnerWebView.test.js
 packages/app-mobile/components/plugins/PluginRunnerWebView.js
 packages/app-mobile/components/plugins/backgroundPage/initializeDialogWebView.js
 packages/app-mobile/components/plugins/backgroundPage/initializePluginBackgroundIframe.js
@@ -792,14 +777,13 @@ packages/app-mobile/components/screens/ConfigScreen/plugins/buttons/InstallButto
 packages/app-mobile/components/screens/ConfigScreen/plugins/testUtils/WrappedPluginStates.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/testUtils/mockRepositoryApiConstructor.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/testUtils/newRepoApi.js
+packages/app-mobile/components/screens/ConfigScreen/plugins/testUtils/pluginServiceSetup.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/utils/openWebsiteForPlugin.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/utils/usePluginCallbacks.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/utils/usePluginItem.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/utils/useRepoApi.js
 packages/app-mobile/components/screens/ConfigScreen/plugins/utils/useUpdateState.js
 packages/app-mobile/components/screens/ConfigScreen/types.js
-packages/app-mobile/components/screens/DocumentScanner/DocumentScanner.js
-packages/app-mobile/components/screens/DocumentScanner/NotePreview.js
 packages/app-mobile/components/screens/JoplinCloudLoginScreen.js
 packages/app-mobile/components/screens/LogScreen.js
 packages/app-mobile/components/screens/Note/Note.test.js
@@ -838,38 +822,6 @@ packages/app-mobile/components/voiceTyping/AudioRecordingBanner.js
 packages/app-mobile/components/voiceTyping/RecordingControls.js
 packages/app-mobile/components/voiceTyping/SpeechToTextBanner.js
 packages/app-mobile/components/voiceTyping/types.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/applyTemplateToEditor.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/index.test.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/index.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/startAutosaveLoop.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/types.js
-packages/app-mobile/contentScripts/imageEditorBundle/contentScript/watchEditorForTemplateChanges.js
-packages/app-mobile/contentScripts/imageEditorBundle/useWebViewSetup.js
-packages/app-mobile/contentScripts/imageEditorBundle/utils/useEditorMessenger.js
-packages/app-mobile/contentScripts/markdownEditorBundle/contentScript.js
-packages/app-mobile/contentScripts/markdownEditorBundle/types.js
-packages/app-mobile/contentScripts/markdownEditorBundle/useWebViewSetup.js
-packages/app-mobile/contentScripts/markdownEditorBundle/utils/useCodeMirrorPlugins.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/Renderer.test.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/Renderer.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/index.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/types.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/utils/addPluginAssets.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/utils/afterFullPageRender.js
-packages/app-mobile/contentScripts/rendererBundle/contentScript/utils/makeResourceModel.js
-packages/app-mobile/contentScripts/rendererBundle/types.js
-packages/app-mobile/contentScripts/rendererBundle/useWebViewSetup.js
-packages/app-mobile/contentScripts/rendererBundle/utils/useContentScripts.js
-packages/app-mobile/contentScripts/rendererBundle/utils/useEditPopup.test.js
-packages/app-mobile/contentScripts/rendererBundle/utils/useEditPopup.js
-packages/app-mobile/contentScripts/richTextEditorBundle/contentScript/convertHtmlToMarkdown.js
-packages/app-mobile/contentScripts/richTextEditorBundle/contentScript/index.js
-packages/app-mobile/contentScripts/richTextEditorBundle/types.js
-packages/app-mobile/contentScripts/richTextEditorBundle/useWebViewSetup.js
-packages/app-mobile/contentScripts/types.js
-packages/app-mobile/contentScripts/utils/polyfills.js
-packages/app-mobile/contentScripts/utils/readFileToBase64.js
-packages/app-mobile/contentScripts/utils/setUpLogger.js
 packages/app-mobile/gulpfile.js
 packages/app-mobile/index.web.js
 packages/app-mobile/root.js
@@ -879,19 +831,20 @@ packages/app-mobile/services/AlarmServiceDriver.web.js
 packages/app-mobile/services/BackButtonService.js
 packages/app-mobile/services/commands/stateToWhenClauseContext.js
 packages/app-mobile/services/e2ee/RSA.react-native.js
-packages/app-mobile/services/e2ee/RSA.react-native.web.js
 packages/app-mobile/services/e2ee/crypto.js
 packages/app-mobile/services/plugins/PlatformImplementation.js
 packages/app-mobile/services/profiles/index.js
 packages/app-mobile/services/voiceTyping/VoiceTyping.js
 packages/app-mobile/services/voiceTyping/utils/unzip.android.js
 packages/app-mobile/services/voiceTyping/utils/unzip.js
+packages/app-mobile/services/voiceTyping/vosk.android.js
+packages/app-mobile/services/voiceTyping/vosk.js
 packages/app-mobile/services/voiceTyping/whisper.test.js
 packages/app-mobile/services/voiceTyping/whisper.js
 packages/app-mobile/setupQuickActions.js
 packages/app-mobile/tools/buildInjectedJs/BundledFile.js
 packages/app-mobile/tools/buildInjectedJs/constants.js
-packages/app-mobile/tools/buildInjectedJs/copyAssets.js
+packages/app-mobile/tools/buildInjectedJs/copyJs.js
 packages/app-mobile/tools/buildInjectedJs/gulpTasks.js
 packages/app-mobile/tools/copyAssets.js
 packages/app-mobile/utils/ShareExtension.js
@@ -899,9 +852,7 @@ packages/app-mobile/utils/ShareUtils.test.js
 packages/app-mobile/utils/ShareUtils.js
 packages/app-mobile/utils/TlsUtils.js
 packages/app-mobile/utils/appDefaultState.js
-packages/app-mobile/utils/appReducer.js
 packages/app-mobile/utils/autodetectTheme.js
-packages/app-mobile/utils/buildStartupTasks.js
 packages/app-mobile/utils/checkPermissions.js
 packages/app-mobile/utils/createRootStyle.js
 packages/app-mobile/utils/database-driver-react-native.js
@@ -921,7 +872,6 @@ packages/app-mobile/utils/fs-driver/testUtil/verifyDirectoryMatches.js
 packages/app-mobile/utils/getPackageInfo.js
 packages/app-mobile/utils/getVersionInfoText.js
 packages/app-mobile/utils/hooks/useBackHandler.js
-packages/app-mobile/utils/hooks/useIsScreenReaderEnabled.js
 packages/app-mobile/utils/hooks/useKeyboardState.js
 packages/app-mobile/utils/hooks/useOnLongPressProps.js
 packages/app-mobile/utils/hooks/useReduceMotionEnabled.js
@@ -930,6 +880,7 @@ packages/app-mobile/utils/image/fileToImage.web.js
 packages/app-mobile/utils/image/getImageDimensions.js
 packages/app-mobile/utils/image/resizeImage.js
 packages/app-mobile/utils/initializeCommandService.js
+packages/app-mobile/utils/injectedJs.js
 packages/app-mobile/utils/ipc/RNToWebViewMessenger.js
 packages/app-mobile/utils/ipc/WebViewToRNMessenger.js
 packages/app-mobile/utils/lockToSingleInstance.js
@@ -939,7 +890,6 @@ packages/app-mobile/utils/pickDocument.js
 packages/app-mobile/utils/polyfills/bufferPolyfill.js
 packages/app-mobile/utils/polyfills/crypto-polyfill/index.js
 packages/app-mobile/utils/polyfills/index.js
-packages/app-mobile/utils/polyfills/index.web.js
 packages/app-mobile/utils/setupNotifications.js
 packages/app-mobile/utils/shareFile.js
 packages/app-mobile/utils/shareHandler.js
@@ -950,7 +900,6 @@ packages/app-mobile/utils/shim-init-react/shimInitShared.js
 packages/app-mobile/utils/testing/createMockReduxStore.js
 packages/app-mobile/utils/testing/getWebViewDomById.js
 packages/app-mobile/utils/testing/getWebViewWindowById.js
-packages/app-mobile/utils/testing/mockPluginServiceSetup.js
 packages/app-mobile/utils/testing/setupGlobalStore.js
 packages/app-mobile/utils/testing/testingLibrary.js
 packages/app-mobile/utils/types.js
@@ -977,70 +926,47 @@ packages/editor/CodeMirror/editorCommands/duplicateLine.js
 packages/editor/CodeMirror/editorCommands/editorCommands.js
 packages/editor/CodeMirror/editorCommands/insertLineAfter.test.js
 packages/editor/CodeMirror/editorCommands/insertLineAfter.js
-packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.test.js
-packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.js
 packages/editor/CodeMirror/editorCommands/jumpToHash.test.js
 packages/editor/CodeMirror/editorCommands/jumpToHash.js
-packages/editor/CodeMirror/editorCommands/markdownCommands.bulletedVsChecklist.test.js
-packages/editor/CodeMirror/editorCommands/markdownCommands.test.js
-packages/editor/CodeMirror/editorCommands/markdownCommands.toggleList.test.js
-packages/editor/CodeMirror/editorCommands/markdownCommands.js
 packages/editor/CodeMirror/editorCommands/sortSelectedLines.test.js
 packages/editor/CodeMirror/editorCommands/sortSelectedLines.js
 packages/editor/CodeMirror/editorCommands/supportsCommand.js
-packages/editor/CodeMirror/extensions/biDirectionalTextExtension.js
-packages/editor/CodeMirror/extensions/ctrlClickActionExtension.js
-packages/editor/CodeMirror/extensions/ctrlClickCheckboxExtension.js
-packages/editor/CodeMirror/extensions/highlightActiveLineExtension.js
-packages/editor/CodeMirror/extensions/keyUpHandlerExtension.js
-packages/editor/CodeMirror/extensions/links/ctrlClickLinksExtension.js
-packages/editor/CodeMirror/extensions/links/followLinkTooltipExtension.test.js
-packages/editor/CodeMirror/extensions/links/followLinkTooltipExtension.js
-packages/editor/CodeMirror/extensions/links/referenceLinksStateField.js
-packages/editor/CodeMirror/extensions/links/utils/findLineMatchingLink.test.js
-packages/editor/CodeMirror/extensions/links/utils/findLineMatchingLink.js
-packages/editor/CodeMirror/extensions/links/utils/getUrlAtPosition.js
-packages/editor/CodeMirror/extensions/links/utils/openLink.js
-packages/editor/CodeMirror/extensions/markdownDecorationExtension.test.js
-packages/editor/CodeMirror/extensions/markdownDecorationExtension.js
-packages/editor/CodeMirror/extensions/markdownHighlightExtension.test.js
-packages/editor/CodeMirror/extensions/markdownHighlightExtension.js
-packages/editor/CodeMirror/extensions/markdownMathExtension.test.js
-packages/editor/CodeMirror/extensions/markdownMathExtension.js
-packages/editor/CodeMirror/extensions/modifierKeyCssExtension.js
-packages/editor/CodeMirror/extensions/overwriteModeExtension.test.js
-packages/editor/CodeMirror/extensions/overwriteModeExtension.js
-packages/editor/CodeMirror/extensions/rendering/addFormattingClasses.js
-packages/editor/CodeMirror/extensions/rendering/renderBlockImages.test.js
-packages/editor/CodeMirror/extensions/rendering/renderBlockImages.js
-packages/editor/CodeMirror/extensions/rendering/renderingExtension.js
-packages/editor/CodeMirror/extensions/rendering/replaceBulletLists.js
-packages/editor/CodeMirror/extensions/rendering/replaceCheckboxes.js
-packages/editor/CodeMirror/extensions/rendering/replaceDividers.js
-packages/editor/CodeMirror/extensions/rendering/replaceFormatCharacters.js
-packages/editor/CodeMirror/extensions/rendering/types.js
-packages/editor/CodeMirror/extensions/rendering/utils/makeBlockReplaceExtension.js
-packages/editor/CodeMirror/extensions/rendering/utils/makeInlineReplaceExtension.js
-packages/editor/CodeMirror/extensions/rendering/utils/nodeIntersectsSelection.js
-packages/editor/CodeMirror/extensions/searchExtension.js
-packages/editor/CodeMirror/extensions/selectedNoteIdExtension.js
 packages/editor/CodeMirror/getScrollFraction.js
-packages/editor/CodeMirror/index.js
+packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.test.js
+packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.js
+packages/editor/CodeMirror/markdown/MarkdownMathExtension.test.js
+packages/editor/CodeMirror/markdown/MarkdownMathExtension.js
+packages/editor/CodeMirror/markdown/codeBlockLanguages/allLanguages.js
+packages/editor/CodeMirror/markdown/codeBlockLanguages/defaultLanguage.js
+packages/editor/CodeMirror/markdown/codeBlockLanguages/lookUpLanguage.js
+packages/editor/CodeMirror/markdown/computeSelectionFormatting.test.js
+packages/editor/CodeMirror/markdown/computeSelectionFormatting.js
+packages/editor/CodeMirror/markdown/decoratorExtension.test.js
+packages/editor/CodeMirror/markdown/decoratorExtension.js
+packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.test.js
+packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.js
+packages/editor/CodeMirror/markdown/markdownCommands.bulletedVsChecklist.test.js
+packages/editor/CodeMirror/markdown/markdownCommands.test.js
+packages/editor/CodeMirror/markdown/markdownCommands.toggleList.test.js
+packages/editor/CodeMirror/markdown/markdownCommands.js
+packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.test.js
+packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.js
+packages/editor/CodeMirror/markdown/utils/stripBlockquote.js
 packages/editor/CodeMirror/pluginApi/PluginLoader.js
 packages/editor/CodeMirror/pluginApi/codeMirrorRequire.js
 packages/editor/CodeMirror/pluginApi/customEditorCompletion.test.js
 packages/editor/CodeMirror/pluginApi/customEditorCompletion.js
-packages/editor/CodeMirror/testing/createEditorControl.js
-packages/editor/CodeMirror/testing/createTestEditor.js
-packages/editor/CodeMirror/testing/findNodesWithName.js
-packages/editor/CodeMirror/testing/forceFullParse.js
-packages/editor/CodeMirror/testing/loadLanguages.js
-packages/editor/CodeMirror/testing/pressReleaseKey.js
-packages/editor/CodeMirror/testing/typeText.js
+packages/editor/CodeMirror/testUtil/createEditorControl.js
+packages/editor/CodeMirror/testUtil/createEditorSettings.js
+packages/editor/CodeMirror/testUtil/createTestEditor.js
+packages/editor/CodeMirror/testUtil/findNodesWithName.js
+packages/editor/CodeMirror/testUtil/forceFullParse.js
+packages/editor/CodeMirror/testUtil/loadLanguages.js
+packages/editor/CodeMirror/testUtil/pressReleaseKey.js
+packages/editor/CodeMirror/testUtil/typeText.js
 packages/editor/CodeMirror/theme.js
+packages/editor/CodeMirror/utils/biDirectionalTextExtension.js
 packages/editor/CodeMirror/utils/formatting/RegionSpec.js
-packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.test.js
-packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.js
 packages/editor/CodeMirror/utils/formatting/findInlineMatch.test.js
 packages/editor/CodeMirror/utils/formatting/findInlineMatch.js
 packages/editor/CodeMirror/utils/formatting/isIndentationEquivalent.js
@@ -1059,72 +985,15 @@ packages/editor/CodeMirror/utils/handleLinkEditRequests.js
 packages/editor/CodeMirror/utils/handlePasteEvent.js
 packages/editor/CodeMirror/utils/isCursorAtBeginning.js
 packages/editor/CodeMirror/utils/isInSyntaxNode.js
-packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/allLanguages.js
-packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/defaultLanguage.js
-packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/lookUpLanguage.js
-packages/editor/CodeMirror/utils/markdown/getCheckboxAtPosition.js
-packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.test.js
-packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.js
-packages/editor/CodeMirror/utils/markdown/stripBlockquote.js
-packages/editor/CodeMirror/utils/markdown/toggleCheckboxAt.js
+packages/editor/CodeMirror/utils/keyUpHandlerExtension.js
+packages/editor/CodeMirror/utils/overwriteModeExtension.test.js
+packages/editor/CodeMirror/utils/overwriteModeExtension.js
+packages/editor/CodeMirror/utils/searchExtension.js
+packages/editor/CodeMirror/utils/selectedNoteIdExtension.js
 packages/editor/CodeMirror/utils/setupVim.js
-packages/editor/ProseMirror/commands.test.js
-packages/editor/ProseMirror/commands.js
-packages/editor/ProseMirror/createEditor.js
-packages/editor/ProseMirror/index.js
-packages/editor/ProseMirror/plugins/detailsPlugin.test.js
-packages/editor/ProseMirror/plugins/detailsPlugin.js
-packages/editor/ProseMirror/plugins/imagePlugin.test.js
-packages/editor/ProseMirror/plugins/imagePlugin.js
-packages/editor/ProseMirror/plugins/inputRulesPlugin.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/createEditorDialog.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/joplinEditablePlugin.test.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/joplinEditablePlugin.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/postProcessRenderedHtml.js
-packages/editor/ProseMirror/plugins/joplinEditorApiPlugin.js
-packages/editor/ProseMirror/plugins/keymapPlugin.js
-packages/editor/ProseMirror/plugins/linkTooltipPlugin.test.js
-packages/editor/ProseMirror/plugins/linkTooltipPlugin.js
-packages/editor/ProseMirror/plugins/listPlugin.js
-packages/editor/ProseMirror/plugins/originalMarkupPlugin.js
-packages/editor/ProseMirror/plugins/searchPlugin.js
-packages/editor/ProseMirror/plugins/utils/createExternalEditorPlugin.js
-packages/editor/ProseMirror/plugins/utils/createFloatingButtonPlugin.js
-packages/editor/ProseMirror/schema.js
-packages/editor/ProseMirror/styles.js
-packages/editor/ProseMirror/testing/createTestEditor.js
-packages/editor/ProseMirror/testing/createTestEditorWithSerializer.js
-packages/editor/ProseMirror/types.js
-packages/editor/ProseMirror/utils/SelectableNodeView.js
-packages/editor/ProseMirror/utils/UndoStackSynchronizer.js
-packages/editor/ProseMirror/utils/canReplaceSelectionWith.js
-packages/editor/ProseMirror/utils/computeSelectionFormatting.js
-packages/editor/ProseMirror/utils/dom/createButton.js
-packages/editor/ProseMirror/utils/dom/createTextArea.js
-packages/editor/ProseMirror/utils/dom/createTextNode.js
-packages/editor/ProseMirror/utils/dom/createUniqueId.js
-packages/editor/ProseMirror/utils/dom/showModal.js
-packages/editor/ProseMirror/utils/extractSelectedLinesTo.test.js
-packages/editor/ProseMirror/utils/extractSelectedLinesTo.js
-packages/editor/ProseMirror/utils/forEachHeading.js
-packages/editor/ProseMirror/utils/jumpToHash.js
-packages/editor/ProseMirror/utils/makeLinksClickableInElement.js
-packages/editor/ProseMirror/utils/postprocessEditorOutput.test.js
-packages/editor/ProseMirror/utils/postprocessEditorOutput.js
-packages/editor/ProseMirror/utils/preprocessEditorInput.test.js
-packages/editor/ProseMirror/utils/preprocessEditorInput.js
-packages/editor/ProseMirror/utils/sanitizeHtml.js
-packages/editor/ProseMirror/utils/selectFirstInstanceOfNode.js
-packages/editor/ProseMirror/utils/trimEmptyParagraphs.js
-packages/editor/ProseMirror/vendor/changedDescendants.js
-packages/editor/ProseMirror/vendor/splitBlockAs.js
 packages/editor/SelectionFormatting.js
 packages/editor/events.js
-packages/editor/polyfills.js
-packages/editor/testing/createEditorSettings.js
-packages/editor/testing/setUpLogger.js
 packages/editor/types.js
-packages/editor/utils/getFileFromPasteEvent.js
 packages/fork-htmlparser2/src/CollectingHandler.js
 packages/fork-htmlparser2/src/FeedHandler.spec.js
 packages/fork-htmlparser2/src/FeedHandler.js
@@ -1169,8 +1038,6 @@ packages/lib/JoplinDatabase.js
 packages/lib/JoplinError.js
 packages/lib/JoplinServerApi.js
 packages/lib/ObjectUtils.js
-packages/lib/PerformanceLogger.test.js
-packages/lib/PerformanceLogger.js
 packages/lib/PoorManIntervals.js
 packages/lib/RotatingLogs.test.js
 packages/lib/RotatingLogs.js
@@ -1188,8 +1055,6 @@ packages/lib/array.js
 packages/lib/callbackUrlUtils.test.js
 packages/lib/callbackUrlUtils.js
 packages/lib/clipperUtils.js
-packages/lib/commands/convertHtmlToMarkdown.test.js
-packages/lib/commands/convertHtmlToMarkdown.js
 packages/lib/commands/deleteNote.js
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyForward.js
@@ -1206,8 +1071,6 @@ packages/lib/commands/toggleAllFolders.js
 packages/lib/commands/toggleEditorPlugin.js
 packages/lib/components/EncryptionConfigScreen/utils.test.js
 packages/lib/components/EncryptionConfigScreen/utils.js
-packages/lib/components/shared/NoteEditor/WarningBanner/onRichTextDismissLinkClick.js
-packages/lib/components/shared/NoteEditor/WarningBanner/onRichTextReadMoreLinkClick.js
 packages/lib/components/shared/NoteList/getEmptyFolderMessage.js
 packages/lib/components/shared/NoteRevisionViewer/getHelpMessage.js
 packages/lib/components/shared/NoteRevisionViewer/useDeleteHistoryClick.js
@@ -1384,26 +1247,20 @@ packages/lib/services/database/migrations/44.js
 packages/lib/services/database/migrations/45.js
 packages/lib/services/database/migrations/46.js
 packages/lib/services/database/migrations/47.js
-packages/lib/services/database/migrations/48.js
 packages/lib/services/database/migrations/index.js
 packages/lib/services/database/sqlStringToLines.js
 packages/lib/services/database/types.js
 packages/lib/services/debug/populateDatabase.js
 packages/lib/services/e2ee/EncryptionService.test.js
 packages/lib/services/e2ee/EncryptionService.js
+packages/lib/services/e2ee/RSA.node.js
 packages/lib/services/e2ee/crypto.test.js
 packages/lib/services/e2ee/crypto.js
 packages/lib/services/e2ee/cryptoShared.js
 packages/lib/services/e2ee/cryptoTestUtils.js
-packages/lib/services/e2ee/ppk/RSA.node.js
-packages/lib/services/e2ee/ppk/ppk.test.js
-packages/lib/services/e2ee/ppk/ppk.js
-packages/lib/services/e2ee/ppk/ppkTestUtils.js
-packages/lib/services/e2ee/ppk/webCrypto/LongDataWrapper.js
-packages/lib/services/e2ee/ppk/webCrypto/StringToBufferWrapper.js
-packages/lib/services/e2ee/ppk/webCrypto/WebCryptoRsa.js
-packages/lib/services/e2ee/ppk/webCrypto/buildRsaCryptoProvider.test.js
-packages/lib/services/e2ee/ppk/webCrypto/buildRsaCryptoProvider.js
+packages/lib/services/e2ee/ppk.test.js
+packages/lib/services/e2ee/ppk.js
+packages/lib/services/e2ee/ppkTestUtils.js
 packages/lib/services/e2ee/types.js
 packages/lib/services/e2ee/utils.test.js
 packages/lib/services/e2ee/utils.js
@@ -1458,8 +1315,6 @@ packages/lib/services/ocr/OcrDriverBase.js
 packages/lib/services/ocr/OcrService.test.js
 packages/lib/services/ocr/OcrService.js
 packages/lib/services/ocr/drivers/OcrDriverTesseract.js
-packages/lib/services/ocr/drivers/OcrDriverTranscribe.test.js
-packages/lib/services/ocr/drivers/OcrDriverTranscribe.js
 packages/lib/services/ocr/utils/filterOcrText.test.js
 packages/lib/services/ocr/utils/filterOcrText.js
 packages/lib/services/ocr/utils/types.js
@@ -1629,7 +1484,6 @@ packages/lib/shim-init-node.js
 packages/lib/shim.js
 packages/lib/string-utils.test.js
 packages/lib/string-utils.js
-packages/lib/testing/plugins/createTestPlugin.js
 packages/lib/testing/share/makeMockShareInvitation.js
 packages/lib/testing/share/mockShareService.js
 packages/lib/testing/syncTargetUtils.js
@@ -1774,14 +1628,12 @@ packages/tools/fuzzer/Client.js
 packages/tools/fuzzer/ClientPool.js
 packages/tools/fuzzer/Server.js
 packages/tools/fuzzer/constants.js
-packages/tools/fuzzer/model/FolderRecord.js
 packages/tools/fuzzer/sync-fuzzer.js
 packages/tools/fuzzer/types.js
 packages/tools/fuzzer/utils/SeededRandom.js
 packages/tools/fuzzer/utils/getNumberProperty.js
 packages/tools/fuzzer/utils/getProperty.js
 packages/tools/fuzzer/utils/getStringProperty.js
-packages/tools/fuzzer/utils/openDebugSession.js
 packages/tools/fuzzer/utils/retryWithCount.js
 packages/tools/generate-database-types.js
 packages/tools/generate-images.js
@@ -1813,7 +1665,6 @@ packages/tools/release-electron.js
 packages/tools/release-ios.js
 packages/tools/release-plugin-repo-cli.js
 packages/tools/release-server.js
-packages/tools/release-transcribe.js
 packages/tools/saveClaConsentRecords.js
 packages/tools/setupNewRelease.js
 packages/tools/spellcheck.js

.yarn/patches/depd-npm-1.1.2-b0c8414da7.patch

@@ -1,36 +0,0 @@
-# Patch to remove eval. This allows using depd in an environment with
-# a strict Content-Security-Policy.
-# Ref: https://github.com/dougwilson/nodejs-depd/pull/33
-diff --git a/index.js b/index.js
-index d758d3c8f58a60bf27ef377ad77639bf10ce7854..2bad40d4eeba553d3bcfb206873eac059067ae3b 100644
---- a/index.js
-+++ b/index.js
-@@ -399,19 +399,20 @@ function wrapfunction (fn, message) {
-     throw new TypeError('argument fn must be a function')
-   }
- 
--  var args = createArgumentsString(fn.length)
--  var deprecate = this // eslint-disable-line no-unused-vars
-   var stack = getStack()
-   var site = callSiteLocation(stack[1])
- 
-   site.name = fn.name
- 
--   // eslint-disable-next-line no-eval
--  var deprecatedfn = eval('(function (' + args + ') {\n' +
--    '"use strict"\n' +
--    'log.call(deprecate, message, site)\n' +
--    'return fn.apply(this, arguments)\n' +
--    '})')
-+  var deprecatedfn
-+  var self = this
-+  deprecatedfn = function () {
-+    'use strict'
-+    log.call(self, message, site)
-+    return fn.apply(this, arguments)
-+  }
-+  Object.defineProperty(deprecatedfn, 'length', { value: fn.length })
-+  Object.defineProperty(deprecatedfn, 'name', { value: fn.name })
- 
-   return deprecatedfn
- }

.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch

@@ -1,35 +0,0 @@
-# Patch to remove eval. This allows using depd in an environment with
-# a strict Content-Security-Policy.
-# Ref: https://github.com/dougwilson/nodejs-depd/pull/33
-diff --git a/index.js b/index.js
-index 1bf2fcfdeffc984e5ad792eec08744c29d4a4590..1b24aa2414458bc651abfdded81b103c131efeaa 100644
---- a/index.js
-+++ b/index.js
-@@ -415,19 +415,19 @@ function wrapfunction (fn, message) {
-     throw new TypeError('argument fn must be a function')
-   }
- 
--  var args = createArgumentsString(fn.length)
-   var stack = getStack()
-   var site = callSiteLocation(stack[1])
- 
-   site.name = fn.name
- 
--  // eslint-disable-next-line no-new-func
--  var deprecatedfn = new Function('fn', 'log', 'deprecate', 'message', 'site',
--    '"use strict"\n' +
--    'return function (' + args + ') {' +
--    'log.call(deprecate, message, site)\n' +
--    'return fn.apply(this, arguments)\n' +
--    '}')(fn, log, this, message, site)
-+  var self = this
-+  var deprecatedfn = function () {
-+    'use strict'
-+    log.call(self, message, site)
-+    return fn.apply(this, arguments)
-+  }
-+  Object.defineProperty(deprecatedfn, 'length', { value: fn.length })
-+  Object.defineProperty(deprecatedfn, 'name', { value: fn.name })
- 
-   return deprecatedfn
- }

.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch

@@ -0,0 +1,209 @@
+diff --git a/android/build.gradle b/android/build.gradle
+index 6afcbbf0cc8ca2d69dd78077d61e59a90b2136bb..9f8d72b4ec5b2b3d290975d6a255917c95300854 100644
+--- a/android/build.gradle
++++ b/android/build.gradle
+@@ -67,19 +67,19 @@ repositories {
+ }
+ 
+ // Generate UUIDs for each models contained in android/src/main/assets/
+-tasks.register('genUUID') {
+-  doLast {
+-    fileTree(dir: "$rootDir/app/src/main/assets", exclude: ['*/*']).visit { fileDetails ->
+-      if (fileDetails.directory) {
+-        def odir = file("$rootDir/app/src/main/assets/$fileDetails.relativePath")
+-        def ofile = file("$odir/uuid")
+-        mkdir odir
+-        ofile.text = UUID.randomUUID().toString()
+-      }
+-    }
+-  }
+-}
+-preBuild.dependsOn genUUID
++// tasks.register('genUUID') {
++//   doLast {
++//     fileTree(dir: "$rootDir/app/src/main/assets", exclude: ['*/*']).visit { fileDetails ->
++//       if (fileDetails.directory) {
++//         def odir = file("$rootDir/app/src/main/assets/$fileDetails.relativePath")
++//         def ofile = file("$odir/uuid")
++//         mkdir odir
++//         ofile.text = UUID.randomUUID().toString()
++//       }
++//     }
++//   }
++// }
++// preBuild.dependsOn genUUID
+ 
+ def kotlin_version = getExtOrDefault('kotlinVersion')
+ 
+diff --git a/android/src/main/java/com/reactnativevosk/VoskModule.kt b/android/src/main/java/com/reactnativevosk/VoskModule.kt
+index 0e2b6595b1b2cf1ee01c6c64239c4b0ea37fce19..5a8539b9cce8951967640dba755e29a4e3ff404a 100644
+--- a/android/src/main/java/com/reactnativevosk/VoskModule.kt
++++ b/android/src/main/java/com/reactnativevosk/VoskModule.kt
+@@ -19,13 +19,25 @@ class VoskModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
+     return "Vosk"
+   }
+ 
++  @ReactMethod
++  fun addListener(type: String?) {
++    // Keep: Required for RN built in Event Emitter Calls.
++  }
++
++  @ReactMethod
++  fun removeListeners(type: Int?) {
++    // Keep: Required for RN built in Event Emitter Calls.
++  }
++
+   override fun onResult(hypothesis: String) {
+     // Get text data from string object
+     val text = getHypothesisText(hypothesis)
+ 
+     // Stop recording if data found
+     if (text != null && text.isNotEmpty()) {
+-      cleanRecognizer();
++      // Don't auto-stop the recogniser - we want to do that when the user
++      // presses on "stop" only.
++      // cleanRecognizer();
+       sendEvent("onResult", text)
+     }
+   }
+@@ -93,12 +105,11 @@ class VoskModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
+   @ReactMethod
+   fun loadModel(path: String, promise: Promise) {
+     cleanModel();
+-    StorageService.unpack(context, path, "models",
+-      { model: Model? ->
+-        this.model = model
+-        promise.resolve("Model successfully loaded")
+-      }
+-    ) { e: IOException ->
++    
++    try {
++      this.model = Model(path);
++      promise.resolve("Model successfully loaded")
++    } catch (e: IOException) {
+       this.model = null
+       promise.reject(e)
+     }
+@@ -153,6 +164,25 @@ class VoskModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
+     cleanRecognizer();
+   }
+ 
++  @ReactMethod
++  fun stopOnly() {
++    if (speechService != null) {
++      speechService!!.stop()
++    }
++  }
++
++  @ReactMethod
++  fun cleanup() {
++    if (speechService != null) {
++      speechService!!.shutdown();
++      speechService = null
++    }
++    if (recognizer != null) {
++      recognizer!!.close();
++      recognizer = null;
++    }
++  }
++
+   @ReactMethod
+   fun unload() {
+     cleanRecognizer();
+diff --git a/lib/typescript/index.d.ts b/lib/typescript/index.d.ts
+index 441e41cc402cca3a60b34978ef4fea976076259c..a173acebb4b314402550442ad471e0f7c706e3c4 100644
+--- a/lib/typescript/index.d.ts
++++ b/lib/typescript/index.d.ts
+@@ -10,6 +10,8 @@ export default class Vosk {
+     currentRegisteredEvents: EmitterSubscription[];
+     start: (grammar?: string[] | null) => Promise<String>;
+     stop: () => void;
++    stopOnly: () => void;
++    cleanup: () => void;
+     unload: () => void;
+     onResult: (onResult: (e: VoskEvent) => void) => EventSubscription;
+     onFinalResult: (onFinalResult: (e: VoskEvent) => void) => EventSubscription;
+diff --git a/package.json b/package.json
+index 707eddb8d68007f93071ac659c5b087c935c5f01..90ebe20f224eeec472c377df1fef9b15f2ff8200 100644
+--- a/package.json
++++ b/package.json
+@@ -11,12 +11,9 @@
+     "src",
+     "lib",
+     "android",
+-    "ios",
+     "cpp",
+-    "react-native-vosk.podspec",
+     "!lib/typescript/example",
+     "!android/build",
+-    "!ios/build",
+     "!**/__tests__",
+     "!**/__fixtures__",
+     "!**/__mocks__"
+diff --git a/react-native-vosk.podspec b/react-native-vosk.podspec
+deleted file mode 100644
+index e3d41b90c5eef890c7a5108aaf16ac07d34a698b..0000000000000000000000000000000000000000
+--- a/react-native-vosk.podspec
++++ /dev/null
+@@ -1,41 +0,0 @@
+-require "json"
+-
+-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+-folly_version = '2021.06.28.00-v2'
+-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+-
+-Pod::Spec.new do |s|
+-  s.name         = "react-native-vosk"
+-  s.version      = package["version"]
+-  s.summary      = package["description"]
+-  s.homepage     = package["homepage"]
+-  s.license      = package["license"]
+-  s.authors      = package["author"]
+-
+-  s.platforms    = { :ios => "10.0" }
+-  s.source       = { :git => "https://github.com/riderodd/react-native-vosk.git", :tag => "#{s.version}" }
+-
+-  s.source_files = "ios/**/*.{h,m,mm,swift}"
+-  s.resource_bundles = { 'Vosk' => ['ios/Vosk/*'] }
+-
+-  s.dependency "React-Core"
+-  s.frameworks = "Accelerate"
+-  s.library = "c++"
+-  s.vendored_frameworks = "ios/libvosk.xcframework"
+-  s.requires_arc = true
+-
+-  # Don't install the dependencies when we run `pod install` in the old architecture.
+-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+-    s.pod_target_xcconfig    = {
+-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+-    }
+-
+-    s.dependency "React-Codegen"
+-    s.dependency "RCT-Folly", folly_version
+-    s.dependency "RCTRequired"
+-    s.dependency "RCTTypeSafety"
+-    s.dependency "ReactCommon/turbomodule/core"
+-  end
+-end
+diff --git a/src/index.tsx b/src/index.tsx
+index d9f90c921d89b1b4d85e145443ed3376546a368a..29e4068dbd7500828a73145bd25497a52c9bf638 100644
+--- a/src/index.tsx
++++ b/src/index.tsx
+@@ -69,6 +69,15 @@ export default class Vosk {
+     VoskModule.stop();
+   };
+ 
++  stopOnly = () => {
++		VoskModule.stopOnly();
++	};
++
++	cleanup = () => {
++		this.cleanListeners();
++		VoskModule.cleanup();
++	};
++
+   unload = () => {
+     this.cleanListeners();
+     VoskModule.unload();

Assets/WebsiteAssets/locales/hr_HR.po

@@ -1,215 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: Milo Ivir <mail@mivirtype.de>\n"
-"Language-Team: \n"
-"Language: hr_HR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.6\n"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:13
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:9
-msgid "/month"
-msgstr "/mjesec"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:19
-msgid "/year"
-msgstr "/godina"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:8
-msgid ""
-"<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to "
-"synchronise your notes across devices. It also lets you publish notes, and "
-"collaborate on notebooks with your friends, family or colleagues."
-msgstr ""
-"<a href=\"https://joplincloud.com\">Joplin Cloud</a> omogućuje "
-"sinkronizaciju bilješki na različitim uređajima. Omogućuje i objavljivanje "
-"bilješki i suradnju na bilježnicama s prijateljima, obitelji ili kolegama."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:205
-msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
-msgstr "<span class=\"frame-bg frame-bg-yellow-lg\">Prilagodi</span> uslugu"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:104
-msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
-msgstr "<span class=\"frame-bg frame-bg-yellow\">Multimedijske</span> bilješke"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:256
-msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
-msgstr "100 % <span class=\"frame-bg frame-bg-yellow-lg\">tvoji podaci</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:298
-msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
-msgstr ""
-"<span class=\"frame-bg frame-bg-yellow-lg\">Francuska</span> alternativa"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:236
-msgid ""
-"Access your notes from your computer, phone or tablet by synchronising with "
-"various services, including Joplin Cloud, Dropbox and OneDrive. The app is "
-"available on Windows, macOS, Linux, Android and iOS. A terminal app is also "
-"available!"
-msgstr ""
-"Pristupi svojim bilješkama s računala, mobitela ili tableta sinkronizacijom "
-"s raznim uslugama, uključujući Joplin Cloud, Dropbox i OneDrive. Program je "
-"dostupan za Windows, macOS, Linux, Android i iOS sustave. Dostupan je i "
-"program za terminal!"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
-msgid ""
-"Already have a Joplin Cloud account? <a href=\"https://"
-"joplincloud.com\">Login now</a>"
-msgstr ""
-"Već imaš Joplin Cloud račun? <a href=\"https://joplincloud.com\">Prijavi se "
-"sada</a>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:208
-msgid ""
-"Customise the app with plugins, custom themes and multiple text editors "
-"(Rich Text or Markdown). Or create your own scripts and plugins using the "
-"Extension API."
-msgstr ""
-"Prilagodi program pomoću dodataka, prilagođenih tema i uređivača teksta "
-"(formatirani tekst ili Markdown). Ili izradi vlastita skripta i dodatke "
-"pomoću API-ja za proširenja."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:242
-msgid "Download it now"
-msgstr "Preuzmi sada"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:112
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
-msgid "Download the app"
-msgstr "Preuzmi program"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:213
-msgid "Find out more"
-msgstr "Saznaj više"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
-msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
-msgstr "Oslobodi svoje <span class=\"frame-bg frame-bg-blue\">bilješke</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:175
-msgid "Get the clipper"
-msgstr "Nabavi Clipper"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:107
-msgid ""
-"Images, videos, PDFs and audio files are supported. Create math expressions "
-"and diagrams directly from the app. Take photos with the mobile app and save "
-"them to a note."
-msgstr ""
-"Podržane su slike, videozapisi, PDF-ovi i audio datoteke. Stvori matematičke "
-"izraze i dijagrame izravno iz programa. Snimaj fotografije s programom za "
-"mobitel i spremi ih u bilješku."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:327
-msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
-msgstr "<span class=\"frame-bg frame-bg-yellow\">Recenzije</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:5
-msgid "Joplin Cloud <span class=\"frame-bg frame-bg-yellow\">plans</span>"
-msgstr "Joplin Cloud <span class=\"frame-bg frame-bg-yellow\">tarife</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:301
-msgid ""
-"Joplin Cloud is based in France. This means your data is protected by strict "
-"European Union privacy laws. In addition, Joplin Cloud implements strong end-"
-"to-end encryption so that not even us can have access to your data."
-msgstr ""
-"Joplin Cloud ima sjedište u Francuskoj. To znači da su tvoji podaci "
-"zaštićeni strogim zakonima o privatnosti Europske unije. Osim toga, Joplin "
-"Cloud implementira snažno sveobuhvatno šifriranje (end-to-end encryption) "
-"tako da čak ni mi ne možemo pristupiti tvojim podacima."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
-msgid ""
-"Joplin is an open source note-taking app. Capture your thoughts and securely "
-"access them from any device."
-msgstr ""
-"Joplin je program za bilješke otvorenog koda. Zabilježi svoje misli i "
-"sigurno im pristupi s bilo kojeg uređaja."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:262
-msgid "More about E2EE"
-msgstr "Više o E2EE"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:391
-msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
-msgstr "Naši <span class=\"frame-bg frame-bg-blue-lg\">sponzori</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:23
-msgid "Pay Monthly"
-msgstr "Plaćaj mjesečno"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:30
-msgid "Pay Yearly"
-msgstr "Plaćaj godišnje"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:167
-msgid ""
-"Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
-msgstr ""
-"Spremaj <span class=\"frame-bg frame-bg-blue\">web stranice</span> <br>kao "
-"bilješke"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
-msgid "Sign up with Joplin Cloud"
-msgstr "Registriraj se na Joplin Cloud"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:394
-msgid "Thank you for your support!"
-msgstr "Hvala ti na podršci!"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
-msgid ""
-"The app is open source and your notes are saved to an open format, so you'll "
-"always have access to them. Uses End-To-End Encryption (E2EE) to secure your "
-"notes and ensure no-one but yourself can access them."
-msgstr ""
-"Program je otvorenog koda i tvoje se bilješke spremaju u otvorenom formatu, "
-"tako da ćeš im uvijek moći pristupiti. Program koristi sveobuhvatno "
-"šifriranje – engl. End-To-End Encryption (E2EE) – kako bi zaštitila tvoje "
-"bilješke i osigurala da im nitko osim tebe ne može pristupiti."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:144
-msgid "Try it now"
-msgstr "Isprobaj sada"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:170
-msgid ""
-"Use the web clipper extension, available on Chrome and Firefox, to save web "
-"pages or take screenshots as notes."
-msgstr ""
-"Koristi proširenje Web Clipper, dostupno za Chrome i Firefox, za spremanje "
-"web stranica ili snimanje ekrana kao bilješku."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
-msgid ""
-"With Joplin Cloud, share your notes with your friends, family or colleagues "
-"and collaborate on them."
-msgstr ""
-"Joplin Cloud ti omogućuje da dijeliš bilješke s prijateljima, obitelji ili "
-"kolegama te da na njima surađujete."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:137
-msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
-msgstr "<span class=\"frame-bg frame-bg-yellow\">Surađuj</span> s drugima"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:141
-msgid ""
-"You can also publish a note to the internet and share the URL with others."
-msgstr "Bilješke možeš objaviti i na internetu te dijeliti URL s drugima."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:233
-msgid ""
-"Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you "
-"are"
-msgstr ""
-"Tvoje bilješke, <span class=\"frame-bg frame-bg-blue-lg\">gdje god</span> se "
-"nalaziš"

Assets/WebsiteAssets/rss.xml

@@ -1,77 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Mon, 22 Sep 2025 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Mon, 22 Sep 2025 00:00:00 GMT</pubDate><item><title><![CDATA[What's new in Joplin 3.4]]></title><description><![CDATA[<p>Joplin 3.4 includes many bug fixes and improvements, with a focus on the mobile app.</p>
-<h2>Mobile<a name="mobile" href="#mobile" class="heading-anchor">🔗</a></h2>
-<h3>Rich Text Editor<a name="rich-text-editor" href="#rich-text-editor" class="heading-anchor">🔗</a></h3>
-<p>The mobile app now includes a beta <a href="https://joplinapp.org/help/apps/rich_text_editor">Rich Text Editor</a>! The new editor renders formatting/math/images within the editor:</p>
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-mobile-rte.png" width="400" alt="screenshot: Mobile Rich Text Editor editing the welcome notes. Images, headings, etc are rendering."/>
-<p>To try it, 1) open a note in the default Markdown editor 2) open the note actions menu (the three vertical dots) for the note and 3) click “Edit as Rich Text”.</p>
-<p>Be aware that this editor is still in active development and <a href="https://github.com/laurent22/joplin/issues/12840">has a number of known limitations and issues</a>. The Rich Text editor is based on <a href="https://prosemirror.net/">ProseMirror</a> and will behave differently from the desktop Rich Text Editor in many cases.</p>
-<h3>Support for publishing notes with Joplin Cloud and Server<a name="support-for-publishing-notes-with-joplin-cloud-and-server" href="#support-for-publishing-notes-with-joplin-cloud-and-server" class="heading-anchor">🔗</a></h3>
-<p>It's now possible to <a href="https://joplinapp.org/help/apps/publish_note">publish notes</a> from the mobile app! To do so, open the “Properties” menu for a note, then click “Publish/unpublish”:</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-publish-notes.png" alt="screenshot: A Publish/unpublish note action is shown in the &quot;Note properties&quot; sidebar, just below a &quot;Previous versions&quot; button"></p>
-<p>Next, in the “publish note” dialog, click “Copy shareable link”. Notes can later be unpublished by clicking &quot;Unpublish&quot; in the publication dialog.</p>
-<h3>Viewing note history<a name="viewing-note-history" href="#viewing-note-history" class="heading-anchor">🔗</a></h3>
-<p>It is now possible to view and restore previous note versions from the mobile app. Like the &quot;publish note&quot; feature, previous note versions can be accessed from the note properties menu.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-note-history.png" alt="screenshot: The note history page"></p>
-<p>As on desktop, the note history feature can be configured from the “Note History” tab in settings.</p>
-<h3>Updated tag dialog<a name="updated-tag-dialog" href="#updated-tag-dialog" class="heading-anchor">🔗</a></h3>
-<p>The tag dialog has been redesigned, with a new UI for adding, removing, and creating new tags:<br>
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-tag-editor.png" width="500" alt="screenshot: Tag dialog now consists of three sections: Added tags, Add new tags, Actions."/></p>
-<h3>Android: Improved voice typing<a name="android-improved-voice-typing" href="#android-improved-voice-typing" class="heading-anchor">🔗</a></h3>
-<p>The voice typing feature on Android has been updated with <a href="https://github.com/laurent22/joplin/pull/12404">improved silence detection</a> and a new “<a href="https://github.com/laurent22/joplin/pull/12370">custom glossary</a>” setting. Voice typing also now <a href="https://github.com/laurent22/joplin/pull/12352">defaults to a more accurate (but somewhat slower) model</a>.</p>
-<h3>Quickly creating a note from multiple photos<a name="quickly-creating-a-note-from-multiple-photos" href="#quickly-creating-a-note-from-multiple-photos" class="heading-anchor">🔗</a></h3>
-<p>A “scan notebook” action has been added to the “New note” menu:</p>
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-scan-notebook.png" width="500"/>
-<p>This action allows quickly creating a new note with multiple pictures taken from the camera.</p>
-<h2>Desktop<a name="desktop" href="#desktop" class="heading-anchor">🔗</a></h2>
-<h3>More Markdown Editor settings<a name="more-markdown-editor-settings" href="#more-markdown-editor-settings" class="heading-anchor">🔗</a></h3>
-<p>The &quot;Note&quot; tab in settings now includes new settings for the Markdown editor, including:</p>
-<ul>
-<li>An option to render headers, lists, and certain other formatting within the editor.</li>
-<li>An option to render images in the editor.</li>
-</ul>
-<p>When enabled, these settings bring the Markdown editor closer to the Rich Text Editor, without <a href="https://joplinapp.org/help/apps/rich_text_editor">some of the Rich Text Editor's limitations</a>.</p>
-<p>These settings are also available on mobile.</p>
-<h3>Smaller application size and faster startup<a name="smaller-application-size-and-faster-startup" href="#smaller-application-size-and-faster-startup" class="heading-anchor">🔗</a></h3>
-<p>We've made the desktop application roughly 33% smaller! In addition to faster application startup, this means that the desktop app should be faster to download take up less space.</p>
-<table class="table">
-<thead>
-<tr>
-<th>Joplin version</th>
-<th>Previous size (v3.3.13)</th>
-<th>New size (v3.4.12)</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Joplin for MacOS (ARM)</td>
-<td>211 MB</td>
-<td>141 MB</td>
-</tr>
-<tr>
-<td>Joplin for Windows (installer)</td>
-<td>321 MB</td>
-<td>219 MB</td>
-</tr>
-<tr>
-<td>Joplin for Windows (portable)</td>
-<td>320 MB</td>
-<td>219 MB</td>
-</tr>
-<tr>
-<td>Joplin for Linux (AppImage)</td>
-<td>219 MB</td>
-<td>147 MB</td>
-</tr>
-</tbody>
-</table>
-<h2>Terminal app<a name="terminal-app" href="#terminal-app" class="heading-anchor">🔗</a></h2>
-<h3>Collapsible folders<a name="collapsible-folders" href="#collapsible-folders" class="heading-anchor">🔗</a></h3>
-<p>The <a href="https://joplinapp.org/help/apps/terminal/">terminal application</a> now supports expanding and collapsing folders by pressing <kbd>z</kbd>. For additional information, see <a href="https://github.com/laurent22/joplin/pull/12718">the original pull request</a>.</p>
-<h3>Managing shared notebooks and published notes<a name="managing-shared-notebooks-and-published-notes" href="#managing-shared-notebooks-and-published-notes" class="heading-anchor">🔗</a></h3>
-<p>New commands have been added to the terminal app, including <code>publish</code>, <code>unpublish</code>, and <code>share</code>. This allows the terminal app to manage shared folders and published notes.</p>
-<h2>Bug fixes<a name="bug-fixes" href="#bug-fixes" class="heading-anchor">🔗</a></h2>
-<p>For the full list of changes, see <a href="https://joplinapp.org/help/about/changelog/desktop/">the desktop changelog</a> and <a href="https://joplinapp.org/help/about/changelog/android/">the mobile changelog</a>.</p>
-]]></description><link>https://joplinapp.org/news/20250922-release-3-4</link><guid isPermaLink="false">20250922-release-3-4</guid><pubDate>Mon, 22 Sep 2025 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[What's new in Joplin 3.3]]></title><description><![CDATA[<h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
+<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Mon, 28 Apr 2025 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Mon, 28 Apr 2025 00:00:00 GMT</pubDate><item><title><![CDATA[What's new in Joplin 3.3]]></title><description><![CDATA[<h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
 <h3>Accessibility improvements<a name="accessibility-improvements" href="#accessibility-improvements" class="heading-anchor">🔗</a></h3>
 <p>The Joplin 3.3 release introduces significant accessibility enhancements designed to make the application more inclusive and user-friendly. Users can now benefit from improved keyboard navigation, thanks to newly added shortcuts and clearer labels that streamline interaction across the interface. We've also added a &quot;go to viewer&quot; menu item that moves focus from the note editor to the note viewer. Focus is moved to the location in the viewer corresponding to the location of the cursor in the editor.</p>
 <p>Screen reader support has been bolstered, ensuring elements like the note list and sidebar are easier to toggle and interact with. These updates make the application more usable for individuals relying on assistive technologies.</p>
@@ -519,4 +446,10 @@ sys 0m38.013s</p>
 <p>Unfortunately we cannot publish the Android version because it is based on a framework version that Google does not accept. To upgrade the app a lot of changes are needed and another round of pre-releases, and therefore there will not be a 2.9 version for Google Play. You may however download the official APK directly from there: <a href="https://github.com/laurent22/joplin-android/releases/tag/android-v2.9.8">Android 2.9 Official Release</a></p>
 <p>This is the reality of app stores in general - small developers being imposed never ending new requirements by all-powerful companies, and by the time a version is finally ready we can't even publish it because yet more requirements are in place.</p>
 <p>For the record the current 2.9 app works perfectly fine. It targets Android 11, which is only 2 years old and is still supported (and installed on millions of phones). Google requires us to target Android 12 which only came out last year.</p>
-]]></description><link>https://joplinapp.org/news/20221216-release-2-9</link><guid isPermaLink="false">20221216-release-2-9</guid><pubDate>Fri, 16 Dec 2022 00:00:00 GMT</pubDate><twitter-text>What&apos;s new in Joplin 2.9</twitter-text></item></channel></rss>
+]]></description><link>https://joplinapp.org/news/20221216-release-2-9</link><guid isPermaLink="false">20221216-release-2-9</guid><pubDate>Fri, 16 Dec 2022 00:00:00 GMT</pubDate><twitter-text>What&apos;s new in Joplin 2.9</twitter-text></item><item><title><![CDATA[Joplin is hiring!]]></title><description><![CDATA[<p>Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device.</p>
+<p>We are looking to hire two JavaScript software developers to work on the desktop, mobile, and server applications. All those are built using modern technologies, including React, React Native and Electron with a strong focus on test units.</p>
+<p>You need to demonstrate some experience with at least some of these technologies, and willing to learn more and touch various different projects.</p>
+<p>You will be part of a small team, so you will have an opportunity for a high-impact role, targeting hundreds of thousands of users.</p>
+<p>If you're interested please contact us at job-AT-joplin.cloud</p>
+<p>No agencies please.</p>
+]]></description><link>https://joplinapp.org/news/20221209-job</link><guid isPermaLink="false">20221209-job</guid><pubDate>Fri, 09 Dec 2022 00:00:00 GMT</pubDate><twitter-text>Joplin is hiring!</twitter-text></item></channel></rss>

Assets/WebsiteAssets/templates/plans.mustache

@@ -219,7 +219,10 @@
 				$('.feature-description-' + featureId).toggle(200);
 			});
 		});
+	</script>
 
+
+	<script>
 		const setHostingType = (type) => {
 			const other = type === 'managed' ? 'self' : 'managed';
 			$('.toggle-button-' + type).addClass('active');
@@ -241,7 +244,6 @@
 			setHostingType('self');
 		});
 
-		const initialHostingType = urlQuery.get('hosting') ? urlQuery.get('hosting') : 'managed';
-		setHostingType(initialHostingType);
+		setHostingType('managed');
 	</script>
 </div>

Dockerfile.server

@@ -63,24 +63,11 @@ FROM node:18-slim
 ARG user=joplin
 RUN useradd --create-home --shell /bin/bash $user
 
-# Install PM2 and set home directory. Setting the PM2 data dir so modules/config persist regardless
-# of user home.
-RUN npm i -g pm2@5.4.3 && mkdir -p /opt/pm2 && chown -R $user:$user /opt/pm2
-ENV PM2_HOME=/opt/pm2
-
 USER $user
 
 COPY --chown=$user:$user --from=builder /build/packages /home/$user/packages
 COPY --chown=$user:$user --from=builder /usr/bin/tini /usr/local/bin/tini
 
-# We download a specific version of the plugin to prevent pm2 from fetching the latest, since it may
-# not have been properly audited (that fact was used to spread malware at some point). Ref:
-# https://github.com/laurent22/joplin/issues/12754
-RUN pm2 install https://registry.npmjs.org/pm2-logrotate/-/pm2-logrotate-3.0.0.tgz \
-	&& pm2 set pm2-logrotate:max_size 100MB \
-	&& pm2 set pm2-logrotate:retain 5 \
-	&& pm2 set pm2-logrotate:compress true
-
 ENV NODE_ENV=production
 ENV RUNNING_IN_DOCKER=1
 EXPOSE ${APP_PORT}

Dockerfile.transcribe

@@ -23,6 +23,7 @@ RUN corepack enable
 
 WORKDIR /app
 
+COPY .yarn/plugins ./.yarn/plugins
 COPY .yarn/releases ./.yarn/releases
 COPY .yarn/patches ./.yarn/patches
 COPY package.json .

README.md

@@ -31,7 +31,7 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 # Sponsors
 
 <!-- SPONSORS-ORG -->
-<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a> <a href="https://www.socialfollowers.uk/buy-tiktok-followers/"><img title="Social Followers" width="256" src="https://joplinapp.org/images/sponsors/SocialFollowers.png"/></a> <a href="https://stormlikes.com/"><img title="Stormlikes" width="256" src="https://joplinapp.org/images/sponsors/Stormlikes.png"/></a> <a href="https://route4me.com"><img title="Route4Me" width="256" src="https://joplinapp.org/images/sponsors/Route4Me.png"/></a> <a href="https://topagency.webflow.io"><img title="WebDesignAgency" width="256" src="https://joplinapp.org/images/sponsors/WebDesignAgency.png" alt="topagency"/></a> <a href="https://www.slotozilla.com/nz/no-deposit-bonus"><img title="casino without making any upfront cost" width="256" src="https://joplinapp.org/images/sponsors/Slotozilla.png" alt="casino without making any upfront cost"/></a> <a href="https://writepaper.com/"><img title="best service to write my paper for me" width="256" src="https://joplinapp.org/images/sponsors/WritePaper.png" alt="best service to write my paper for me"/></a> <a href="https://paperwriter.com/"><img title="high-quality paper writing service PaperWriter" width="256" src="https://joplinapp.org/images/sponsors/PaperWriter.png" alt="high-quality paper writing service PaperWriter"/></a> <a href="https://www.bestetf.net/"><img title="BestETF" width="256" src="https://joplinapp.org/images/sponsors/BestEtf.png" alt="BestETF"/></a> <a href="https://freespinny.io/free-spins-no-deposit/"><img title="Freespinny.io Free Spins Bonus site" width="256" src="https://joplinapp.org/images/sponsors/Freespinny.png" alt="Freespinny.io Free Spins Bonus site"/></a> <a href="https://essayshark.com"><img title="EssayShark - essay writers for hire" width="256" src="https://joplinapp.org/images/sponsors/EssayShark.png" alt="EssayShark - essay writers for hire"/></a> <a href="https://pokieslab1.com/real-money-pokies/"><img title="Australian Real Money Pokies" width="256" src="https://joplinapp.org/images/sponsors/PokiesLab.png" alt="Australian Real Money Pokies"/></a> <a href="https://pokiesman1.net/real-money-pokies/"><img title="Australian Real Money Pokies" width="256" src="https://joplinapp.org/images/sponsors/Pokiesman.png" alt="Australian Real Money Pokies"/></a> <a href="https://domyessay.com"><img title="Essay writers DoMyEssay are dedicated to providing top-notch, custom-written papers that meet your academic requirements" width="256" src="https://joplinapp.org/images/sponsors/DoMyEssay.png" alt="DoMyEssay"/></a> <a href="https://essaypro.com/"><img title="best essay writing service" width="256" src="https://joplinapp.org/images/sponsors/EssayPro.png" alt="best essay writing service"/></a> <a href="https://socialkings.online"><img title="Boost your reach and buy real followers" width="256" src="https://joplinapp.org/images/sponsors/SocialKings.png" alt="Boost your reach and buy real followers"/></a> <a href="https://uk.notgamstop.com/bonuses/free-spins-no-deposit-no-gamstop/"><img title="free spins no deposit at NotGamstop" width="256" src="https://joplinapp.org/images/sponsors/NotGamStop.jpg" alt="free spins no deposit at NotGamstop"/></a> <a href="https://www.writemyessay.com/"><img title="writing service for students WriteMyEssay" width="256" src="https://joplinapp.org/images/sponsors/WriteMyEssay.png" alt="writing service for students WriteMyEssay"/></a>
+<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-webseite&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a> <a href="https://www.socialfollowers.uk/buy-tiktok-followers/"><img title="Social Followers" width="256" src="https://joplinapp.org/images/sponsors/SocialFollowers.png"/></a> <a href="https://stormlikes.com/"><img title="Stormlikes" width="256" src="https://joplinapp.org/images/sponsors/Stormlikes.png"/></a> <a href="https://route4me.com"><img title="Route4Me" width="256" src="https://joplinapp.org/images/sponsors/Route4Me.png"/></a> <a href="https://topagency.webflow.io"><img title="WebDesignAgency" width="256" src="https://joplinapp.org/images/sponsors/WebDesignAgency.png" alt="topagency"/></a> <a href="https://realgambling.ca/"><img title="RealGambling.ca" width="256" src="https://joplinapp.org/images/sponsors/RealGambling.png" alt="RealGambling.ca"/></a> <a href="https://essaypro.com/"><img title="write an essay online with EssayPro" width="256" src="https://joplinapp.org/images/sponsors/EssayPro.png" alt="write an essay online with EssayPro"/></a> <a href="https://www.slotozilla.com/nz/no-deposit-bonus"><img title="casino without making any upfront cost" width="256" src="https://joplinapp.org/images/sponsors/Slotozilla.png" alt="casino without making any upfront cost"/></a> <a href="https://essaywriter.pro"><img title="write my essay services by EssayWriter" width="256" src="https://joplinapp.org/images/sponsors/EssayWriterPro.png" alt="write my essay services by EssayWriter"/></a> <a href="https://essayservice.com"><img title="quick and reliable service to write my paper for me" width="256" src="https://joplinapp.org/images/sponsors/EssayService.png" alt="quick and reliable service to write my paper for me"/></a> <a href="https://writepaper.com/"><img title="best service to write my paper for me" width="256" src="https://joplinapp.org/images/sponsors/WritePaper.png" alt="best service to write my paper for me"/></a> <a href="https://paperwriter.com/"><img title="high-quality paper writing service PaperWriter" width="256" src="https://joplinapp.org/images/sponsors/PaperWriter.png" alt="high-quality paper writing service PaperWriter"/></a> <a href="https://homeworkguy.org/someone-to-take-my-online-class"><img title="someone to take my online class" width="256" src="https://joplinapp.org/images/sponsors/HomeworkGuy.png" alt="someone to take my online class"/></a> <a href="https://www.bestetf.net/"><img title="BestETF" width="256" src="https://joplinapp.org/images/sponsors/BestEtf.png" alt="BestETF"/></a> <a href="https://freespinny.io/free-spins-no-deposit/"><img title="Freespinny.io Free Spins Bonus site" width="256" src="https://joplinapp.org/images/sponsors/Freespinny.png" alt="Freespinny.io Free Spins Bonus site"/></a>
 <!-- SPONSORS-ORG -->
 
 * * *
@@ -40,8 +40,9 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 |       |       |       |       |
 | :---: | :---: | :---: | :---: |
 | <img width="50" src="https://avatars2.githubusercontent.com/u/97193607?s=96&v=4"/></br>[Akhil-CM](https://github.com/Akhil-CM) | <img width="50" src="https://avatars2.githubusercontent.com/u/552452?s=96&v=4"/></br>[andypiper](https://github.com/andypiper) | <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[avanderberg](https://github.com/avanderberg) | <img width="50" src="https://avatars2.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/1177810?s=96&v=4"/></br>[felixstorm](https://github.com/felixstorm) | <img width="50" src="https://avatars2.githubusercontent.com/u/11947658?s=96&v=4"/></br>[KentBrockman](https://github.com/KentBrockman) | <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) | <img width="50" src="https://avatars2.githubusercontent.com/u/668977?s=96&v=4"/></br>[ugoertz](https://github.com/ugoertz) |
-|       |       |       |       |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/1177810?s=96&v=4"/></br>[felixstorm](https://github.com/felixstorm) | <img width="50" src="https://avatars2.githubusercontent.com/u/8030470?s=96&v=4"/></br>[Galliver7](https://github.com/Galliver7) | <img width="50" src="https://avatars2.githubusercontent.com/u/64712218?s=96&v=4"/></br>[Hegghammer](https://github.com/Hegghammer) | <img width="50" src="https://avatars2.githubusercontent.com/u/11947658?s=96&v=4"/></br>[KentBrockman](https://github.com/KentBrockman) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) | <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) | <img width="50" src="https://avatars2.githubusercontent.com/u/327998?s=96&v=4"/></br>[sif](https://github.com/sif) | <img width="50" src="https://avatars2.githubusercontent.com/u/765564?s=96&v=4"/></br>[taskcruncher](https://github.com/taskcruncher) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/668977?s=96&v=4"/></br>[ugoertz](https://github.com/ugoertz) |       |       |       |
 <!-- SPONSORS-GITHUB -->
 	
 # Community

devbox.json

@@ -5,24 +5,24 @@
       "version":   "latest",
       "platforms": ["aarch64-darwin", "x86_64-darwin"],
     },
-    "yarn": "1.22.19",
+    "yarn": "latest",
     "vips.dev": {
       "platforms": ["aarch64-darwin"],
     },
-    "nodejs":     "23.11.0",
+    "nodejs":     "23.8.0",
     "pkg-config": "latest",
     "darwin.apple_sdk.frameworks.Foundation": { // satisfies missing CoreText/CoreText.h
       // https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/default.nix
       "version":   "",
       "platforms": ["aarch64-darwin", "x86_64-darwin"],
     },
-    "python": "3.13.3",
+    "python": "3.13.1",
     "bat":    "latest",
     "electron": {
       "version":            "latest",
       "excluded_platforms": ["aarch64-darwin", "x86_64-darwin"],
     },
-    "git":    "2.48.1",
+    "git":    "2.47.2",
   },
   "shell": {
     "init_hook": [

docker-compose.db-dev.yml

@@ -16,10 +16,12 @@
 # SLAVE_POSTGRES_PORT=5433
 # SLAVE_POSTGRES_HOST=localhost
 
+version: '2'
+
 services:
 
     postgresql-master:
-        image: 'bitnamilegacy/postgresql:17.4.0'
+        image: 'bitnami/postgresql:17.3.0'
         ports:
             - '5432:5432'
         environment:
@@ -36,7 +38,7 @@ services:
             - POSTGRESQL_EXTRA_FLAGS=-c work_mem=100000 -c log_statement=all
 
     postgresql-slave:
-        image: 'bitnamilegacy/postgresql:17.4.0'
+        image: 'bitnami/postgresql:17.3.0'
         ports:
             - '5433:5432'
         depends_on:

docker-compose.server-dev.yml

@@ -1,6 +1,8 @@
 # This compose file can be used in development to run both the database and app
 # within Docker.
 
+version: '3'
+
 services:
     app:
         build:

docker-compose.server.yml

@@ -15,21 +15,13 @@
 #	- This would typically be mapped to port to 443 (TLS) with a reverse proxy.
 #	- If Joplin Server does not need to be accessible over the internet, the port can be mapped to 22300.
 
-networks:
-    app-network:
-    transcribe-network:
-    shared-network:
+version: '3'
 
 services:
     db:
         image: postgres:16
-        profiles:
-            - full
-            - server
         volumes:
             - ./data/postgres:/var/lib/postgresql/data
-        networks:
-            - app-network
         ports:
             - "5432:5432"
         restart: unless-stopped
@@ -39,17 +31,10 @@ services:
             - POSTGRES_DB=${POSTGRES_DATABASE}
     app:
         image: joplin/server:latest
-        profiles:
-            - full
-            - server
         depends_on:
             - db
-            - transcribe
         ports:
             - "22300:22300"
-        networks:
-            - app-network
-            - shared-network
         restart: unless-stopped
         environment:
             - APP_PORT=22300
@@ -60,48 +45,3 @@ services:
             - POSTGRES_USER=${POSTGRES_USER}
             - POSTGRES_PORT=${POSTGRES_PORT}
             - POSTGRES_HOST=db
-            - TRANSCRIBE_API_KEY=${TRANSCRIBE_API_KEY}
-            - TRANSCRIBE_BASE_URL=http://transcribe:4567
-            - TRANSCRIBE_ENABLED=${TRANSCRIBE_ENABLED}
-    transcribe-db:
-        image: postgres:16
-        profiles:
-            - full
-        volumes:
-            - ./data/transcribe-postgres:/var/lib/postgresql/data
-        networks:
-            - transcribe-network
-        ports:
-            - "${QUEUE_DATABASE_PORT}:5432"
-        restart: unless-stopped
-        environment:
-            - POSTGRES_PASSWORD=${QUEUE_DATABASE_PASSWORD}
-            - POSTGRES_USER=${QUEUE_DATABASE_USER}
-            - POSTGRES_DB=${QUEUE_DATABASE_NAME}
-        command: -p ${QUEUE_DATABASE_PORT}
-    transcribe:
-        image: joplin/transcribe:latest
-        profiles:
-            - full
-        volumes:
-            - /var/run/docker.sock:/var/run/docker.sock
-            - ${HTR_CLI_IMAGES_FOLDER}:/app/packages/transcribe/images
-        depends_on:
-            - transcribe-db
-        ports:
-            - "4567:4567"
-        networks:
-            - transcribe-network
-            - shared-network
-        restart: unless-stopped
-        environment:
-            - APP_PORT=4567
-            - DB_CLIENT=pg
-            - QUEUE_DATABASE_NAME=${QUEUE_DATABASE_NAME}
-            - QUEUE_DATABASE_USER=${QUEUE_DATABASE_USER}
-            - QUEUE_DATABASE_PASSWORD=${QUEUE_DATABASE_PASSWORD}
-            - QUEUE_DATABASE_PORT=${QUEUE_DATABASE_PORT}
-            - QUEUE_DATABASE_HOST=transcribe-db
-            - API_KEY=${TRANSCRIBE_API_KEY}
-            - HTR_CLI_IMAGES_FOLDER=${HTR_CLI_IMAGES_FOLDER}
-

fastlane/metadata/android/hr/full_description.txt

@@ -1,13 +0,0 @@
-<strong>Joplin</strong> je besplatan program otvorenog koda za bilješke i popis zadataka koji može obraditi veliki broj bilješki organizirane u bilježnice. Bilješke se mogu pretraživati, kopirati, označavati i mijenjati izravno iz programa ili iz vlastitog uređivača teksta.
-
-Bilješke su u <a href="https://joplinapp.org/help/apps/markdown">Markdown formatu</a>.
-
-Iz Evernotea izvezene bilješke <a href="https://joplinapp.org/help/apps/import_export">mogu se uvesti</a> u Joplin, uključujući formatirani sadržaj (koji se pretvara u Markdown), resurse (slike, privitke itd.) i potpune metapodatke (geografski podaci mjesta, vrijeme aktualiziranja, vrijeme stvaranja itd.). Mogu se uvesti i obične Markdown datoteke.
-
-Joplin radi ponajprije s lokalnim podacima (offline first), što znači da uvijek imaš sve svoje podatke na mobitelu ili računalu. To osigurava da su tvoje bilješke uvijek dostupne, bez obzira je li imaš internetsku vezu ili ne.</p>
-
-Bilješke se mogu sigurno <a href="https://joplinapp.org/help/apps/sync">sinkronizirati</a> pomoću <a href="https://joplinapp.org/help/apps/sync/e2ee">sveobuhvatnog šifriranja</a> s raznim uslugama u oblaku, uključujući Nextcloud, Dropbox, OneDrive i <a href="https://joplinapp.org/plans/">Joplin Cloud</a>.
-
-Pretraživanje cijelog teksta dostupno je na svim platformama za brzo pronalaženje potrebnih informacija. Program se može prilagoditi pomoću dodataka i tema, a možeš stvoriti i vlastite.
-
-Program je dostupan za Windows, Linux, macOS, Android i iOS sustave. <a href="https://joplinapp.org/help/apps/clipper">Web Clipper</a>, za spremanje web stranica i snimaka ekrana iz tvog preglednika, je također dostupan za <a href="https://addons.mozilla.org/firefox/addon/joplin-web-clipper/">Firefox</a> i <a href="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek">Chrome</a>.

fastlane/metadata/android/hr/short_description.txt

@@ -1 +0,0 @@
-Program za bilješke i popis zadataka sa sinkronizacijom između Linuxa, macOS-a, Windowsa i mobitela

package.json

@@ -51,8 +51,6 @@
     "releasePluginGenerator": "node packages/tools/release-plugin-generator.js",
     "releasePluginRepoCli": "node packages/tools/release-plugin-repo-cli.js",
     "releaseServer": "node packages/tools/release-server.js",
-    "releaseTranscribe": "node packages/tools/release-transcribe.js",
-    "saveClaConsentRecords": "node packages/tools/saveClaConsentRecords.js",
     "setupNewRelease": "node ./packages/tools/setupNewRelease",
     "spellcheck": "node packages/tools/spellcheck.js",
     "tagServerLatest": "node packages/tools/tagServerLatest.js",
@@ -74,34 +72,35 @@
     "@typescript-eslint/eslint-plugin": "6.21.0",
     "@typescript-eslint/parser": "6.21.0",
     "cspell": "5.21.2",
-    "eslint": "8.57.1",
+    "eslint": "8.57.0",
     "eslint-interactive": "10.8.0",
-    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jest": "27.9.0",
-    "eslint-plugin-promise": "6.6.0",
-    "eslint-plugin-react": "7.37.5",
+    "eslint-plugin-promise": "6.2.0",
+    "eslint-plugin-react": "7.34.3",
     "execa": "5.1.1",
     "fs-extra": "11.2.0",
-    "glob": "11.0.3",
+    "glob": "11.0.1",
     "gulp": "4.0.2",
     "husky": "9.1.7",
     "lerna": "3.22.1",
-    "lint-staged": "15.5.2",
+    "lint-staged": "15.5.0",
     "madge": "8.0.0",
     "npm-package-json-lint": "8.0.0",
-    "typescript": "5.8.3"
+    "typescript": "5.4.5"
   },
   "dependencies": {
     "@types/fs-extra": "11.0.4",
     "eslint-plugin-github": "4.10.2",
     "http-server": "14.1.1",
-    "node-gyp": "11.2.0",
-    "nodemon": "3.1.10"
+    "node-gyp": "9.4.1",
+    "nodemon": "3.1.9"
   },
   "packageManager": "yarn@4.9.2",
   "resolutions": {
     "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
-    "eslint": "patch:eslint@8.57.1#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
+    "react-native-vosk@0.1.12": "patch:react-native-vosk@npm%3A0.1.12#./.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch",
+    "eslint": "patch:eslint@8.57.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
     "app-builder-lib@24.4.0": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch",
     "nanoid": "patch:nanoid@npm%3A3.3.7#./.yarn/patches/nanoid-npm-3.3.7-98824ba130.patch",
     "pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
@@ -116,13 +115,6 @@
     "pdfjs-dist@2.16.105": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
     "pdfjs-dist@*": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
     "pdfjs-dist@3.11.174": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
-    "canvas@npm:^2.11.2": "link:./.yarn/joplin-empty-package/",
-    "node-gyp@npm:^9.0.0": "11.2.0",
-    "depd@npm:^2.0.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
-    "depd@npm:~2.0.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
-    "depd@npm:~1.1.2": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
-    "depd@npm:2.0.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
-    "depd@npm:^1.1.2": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
-    "depd@npm:^1.1.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch"
+    "canvas@npm:^2.11.2": "link:./.yarn/joplin-empty-package/"
   }
 }

packages/app-cli/app/app-gui.js

@@ -380,13 +380,6 @@ class AppGui {
 		this.widget('noteList').toggleShowIds();
 	}
 
-	toggleFolderCollapse() {
-		const folderList = this.widget('folderList');
-		if (folderList && folderList.toggleFolderCollapse) {
-			folderList.toggleFolderCollapse();
-		}
-	}
-
 	widget(name) {
 		if (name === 'root') return this.rootWidget_;
 		return this.rootWidget_.childByName(name);
@@ -513,8 +506,6 @@ class AppGui {
 			this.toggleNoteMetadata();
 		} else if (cmd === 'toggle_ids') {
 			this.toggleFolderIds();
-		} else if (cmd === 'toggle_folder_collapse') {
-			this.toggleFolderCollapse();
 		} else if (cmd === 'enter_command_line_mode') {
 			const cmd = await this.widget('statusBar').prompt();
 			if (!cmd) return;

packages/app-cli/app/app.ts

@@ -9,6 +9,7 @@ import Tag from '@joplin/lib/models/Tag';
 import Setting, { Env } from '@joplin/lib/models/Setting';
 import { reg } from '@joplin/lib/registry.js';
 import { dirname, fileExtension } from '@joplin/lib/path-utils';
+import { splitCommandString } from '@joplin/utils';
 import { _ } from '@joplin/lib/locale';
 import { pathExists, readFile, readdirSync } from 'fs-extra';
 import RevisionService from '@joplin/lib/services/RevisionService';
@@ -18,6 +19,7 @@ import { FolderEntity, NoteEntity } from '@joplin/lib/services/database/types';
 import initializeCommandService from './utils/initializeCommandService';
 const { cliUtils } = require('./cli-utils.js');
 const Cache = require('@joplin/lib/Cache');
+const { splitCommandBatch } = require('@joplin/lib/string-utils');
 
 class Application extends BaseApplication {
 
@@ -220,7 +222,6 @@ class Application extends BaseApplication {
 		return { ...this.commandMetadata_ };
 	}
 
-
 	public hasGui() {
 		return this.gui() && !this.gui().isDummy();
 	}
@@ -331,7 +332,6 @@ class Application extends BaseApplication {
 			{ keys: ['mb'], type: 'prompt', command: 'mkbook ""', cursorPosition: -2 },
 			{ keys: ['yn'], type: 'prompt', command: 'cp $n ""', cursorPosition: -2 },
 			{ keys: ['dn'], type: 'prompt', command: 'mv $n ""', cursorPosition: -2 },
-			{ keys: ['z'], type: 'function', command: 'toggle_folder_collapse' },
 		];
 
 		// Filter the keymap item by command so that items in keymap.json can override
@@ -381,6 +381,22 @@ class Application extends BaseApplication {
 		return output;
 	}
 
+	public async commandList(argv: string[]) {
+		if (argv.length && argv[0] === 'batch') {
+			const commands = [];
+			const commandLines = splitCommandBatch(await readFile(argv[1], 'utf-8'));
+
+			for (const commandLine of commandLines) {
+				if (!commandLine.trim()) continue;
+				const splitted = splitCommandString(commandLine.trim());
+				commands.push(splitted);
+			}
+			return commands;
+		} else {
+			return [argv];
+		}
+	}
+
 	// We need this special case here because by the time the `version` command
 	// runs, the keychain has already been setup.
 	public checkIfKeychainEnabled(argv: string[]) {
@@ -417,12 +433,15 @@ class Application extends BaseApplication {
 		if (argv.length) {
 			this.gui_ = this.dummyGui();
 
-			const initialFolder = await Folder.load(Setting.value('activeFolderId'));
-			await this.switchCurrentFolder(initialFolder);
+			this.currentFolder_ = await Folder.load(Setting.value('activeFolderId'));
+
 			await this.applySettingsSideEffects();
 
 			try {
-				await this.execCommand(argv);
+				const commands = await this.commandList(argv);
+				for (const command of commands) {
+					await this.execCommand(command);
+				}
 			} catch (error) {
 				if (this.showStackTraces_) {
 					console.error(error);
@@ -434,7 +453,6 @@ class Application extends BaseApplication {
 			}
 
 			await Setting.saveAll();
-			await this.database_.close();
 
 			// Need to call exit() explicitly, otherwise Node wait for any timeout to complete
 			// https://stackoverflow.com/questions/18050095

packages/app-cli/app/cli-integration-tests.js

@@ -2,44 +2,33 @@
 
 /* eslint-disable no-console */
 
-import * as fs from 'fs-extra';
-import Logger, { TargetType } from '@joplin/utils/Logger';
-import { dirname } from '@joplin/lib/path-utils';
+const fs = require('fs-extra');
+const Logger = require('@joplin/utils/Logger').default;
+const { dirname } = require('@joplin/lib/path-utils');
 const { DatabaseDriverNode } = require('@joplin/lib/database-driver-node.js');
-import JoplinDatabase from '@joplin/lib/JoplinDatabase';
-import BaseModel from '@joplin/lib/BaseModel';
-import Folder from '@joplin/lib/models/Folder';
-import Note from '@joplin/lib/models/Note';
-import Setting from '@joplin/lib/models/Setting';
+const JoplinDatabase = require('@joplin/lib/JoplinDatabase').default;
+const BaseModel = require('@joplin/lib/BaseModel').default;
+const Folder = require('@joplin/lib/models/Folder').default;
+const Note = require('@joplin/lib/models/Note').default;
+const Setting = require('@joplin/lib/models/Setting').default;
 const { sprintf } = require('sprintf-js');
 const exec = require('child_process').exec;
-const nodeSqlite = require('sqlite3');
-const { loadKeychainServiceAndSettings } = require('@joplin/lib/services/SettingUtils');
-const { default: shimInitCli } = require('./utils/shimInitCli');
 
 const baseDir = `${dirname(__dirname)}/tests/cli-integration`;
 const joplinAppPath = `${__dirname}/main.js`;
 
-shimInitCli({ nodeSqlite, appVersion: () => require('../package.json').version, keytar: null });
-require('@joplin/lib/testing/test-utils');
-
 const logger = new Logger();
-logger.addTarget(TargetType.Console);
+logger.addTarget('console');
 logger.setLevel(Logger.LEVEL_ERROR);
 
 const dbLogger = new Logger();
-dbLogger.addTarget(TargetType.Console);
+dbLogger.addTarget('console');
 dbLogger.setLevel(Logger.LEVEL_INFO);
 
 const db = new JoplinDatabase(new DatabaseDriverNode());
 db.setLogger(dbLogger);
 
-interface Client {
-	id: number;
-	profileDir: string;
-}
-
-function createClient(id: number): Client {
+function createClient(id) {
 	return {
 		id: id,
 		profileDir: `${baseDir}/client${id}`,
@@ -48,13 +37,13 @@ function createClient(id: number): Client {
 
 const client = createClient(1);
 
-function execCommand(client: Client, command: string) {
+function execCommand(client, command) {
 	const exePath = `node ${joplinAppPath}`;
 	const cmd = `${exePath} --update-geolocation-disabled --env dev --profile ${client.profileDir} ${command}`;
 	logger.info(`${client.id}: ${command}`);
 
-	return new Promise<string>((resolve, reject) => {
-		exec(cmd, (error: string, stdout: string, stderr: string) => {
+	return new Promise((resolve, reject) => {
+		exec(cmd, (error, stdout, stderr) => {
 			if (error) {
 				logger.error(stderr);
 				reject(error);
@@ -65,17 +54,17 @@ function execCommand(client: Client, command: string) {
 	});
 }
 
-function assertTrue(v: unknown) {
+function assertTrue(v) {
 	if (!v) throw new Error(sprintf('Expected "true", got "%s"."', v));
 	process.stdout.write('.');
 }
 
-function assertFalse(v: unknown) {
+function assertFalse(v) {
 	if (v) throw new Error(sprintf('Expected "false", got "%s"."', v));
 	process.stdout.write('.');
 }
 
-function assertEquals(expected: unknown, real: unknown) {
+function assertEquals(expected, real) {
 	if (expected !== real) throw new Error(sprintf('Expecting "%s", got "%s"', expected, real));
 	process.stdout.write('.');
 }
@@ -84,7 +73,7 @@ async function clearDatabase() {
 	await db.transactionExecBatch(['DELETE FROM folders', 'DELETE FROM notes', 'DELETE FROM tags', 'DELETE FROM note_tags', 'DELETE FROM resources', 'DELETE FROM deleted_items']);
 }
 
-const testUnits: Record<string, ()=> Promise<void>> = {};
+const testUnits = {};
 
 testUnits.testFolders = async () => {
 	await execCommand(client, 'mkbook nb1');
@@ -95,17 +84,11 @@ testUnits.testFolders = async () => {
 
 	await execCommand(client, 'mkbook nb1');
 
-	folders = await Folder.all();
-	assertEquals(2, folders.length);
-	assertEquals('nb1', folders[0].title);
-	assertEquals('nb1', folders[1].title);
-
-	await execCommand(client, 'rmbook -p -f nb1');
-
 	folders = await Folder.all();
 	assertEquals(1, folders.length);
+	assertEquals('nb1', folders[0].title);
 
-	await execCommand(client, 'rmbook -p -f nb1');
+	await execCommand(client, 'rm -r -f nb1');
 
 	folders = await Folder.all();
 	assertEquals(0, folders.length);
@@ -119,7 +102,7 @@ testUnits.testNotes = async () => {
 	assertEquals(1, notes.length);
 	assertEquals('n1', notes[0].title);
 
-	await execCommand(client, 'rmnote -p -f n1');
+	await execCommand(client, 'rm -f n1');
 	notes = await Note.all();
 	assertEquals(0, notes.length);
 
@@ -129,19 +112,12 @@ testUnits.testNotes = async () => {
 	notes = await Note.all();
 	assertEquals(2, notes.length);
 
-	// Should fail to delete a non-existent note
-	let failed = false;
-	try {
-		await execCommand(client, 'rmnote -f \'blabla*\'');
-	} catch (error) {
-		failed = true;
-	}
-	assertEquals(failed, true);
+	await execCommand(client, 'rm -f \'blabla*\'');
 
 	notes = await Note.all();
 	assertEquals(2, notes.length);
 
-	await execCommand(client, 'rmnote -f -p \'n*\'');
+	await execCommand(client, 'rm -f \'n*\'');
 
 	notes = await Note.all();
 	assertEquals(0, notes.length);
@@ -164,12 +140,10 @@ testUnits.testCat = async () => {
 
 testUnits.testConfig = async () => {
 	await execCommand(client, 'config editor vim');
-	await Setting.reset();
 	await Setting.load();
 	assertEquals('vim', Setting.value('editor'));
 
 	await execCommand(client, 'config editor subl');
-	await Setting.reset();
 	await Setting.load();
 	assertEquals('subl', Setting.value('editor'));
 
@@ -227,47 +201,15 @@ testUnits.testMv = async () => {
 	await execCommand(client, 'mknote note2');
 	await execCommand(client, 'mknote note3');
 	await execCommand(client, 'mknote blabla');
-
-	notes1 = await Note.previews(f1.id);
-	notes2 = await Note.previews(f2.id);
-
-	assertEquals(4, notes1.length);
-	assertEquals(1, notes2.length);
-
 	await execCommand(client, 'mv \'note*\' nb2');
 
-	notes2 = await Note.previews(f2.id);
 	notes1 = await Note.previews(f1.id);
+	notes2 = await Note.previews(f2.id);
 
 	assertEquals(1, notes1.length);
 	assertEquals(4, notes2.length);
 };
 
-testUnits.testUse = async () => {
-	await execCommand(client, 'mkbook nb1');
-	await execCommand(client, 'mkbook nb2');
-	await execCommand(client, 'mknote n1');
-	await execCommand(client, 'mknote n2');
-
-	const f1 = await Folder.loadByTitle('nb1');
-	const f2 = await Folder.loadByTitle('nb2');
-	let notes1 = await Note.previews(f1.id);
-	let notes2 = await Note.previews(f2.id);
-
-	assertEquals(0, notes1.length);
-	assertEquals(2, notes2.length);
-
-	await execCommand(client, 'use nb1');
-	await execCommand(client, 'mknote note2');
-	await execCommand(client, 'mknote note3');
-
-	notes1 = await Note.previews(f1.id);
-	notes2 = await Note.previews(f2.id);
-
-	assertEquals(2, notes1.length);
-	assertEquals(2, notes2.length);
-};
-
 async function main() {
 	await fs.remove(baseDir);
 
@@ -275,9 +217,7 @@ async function main() {
 
 	await db.open({ name: `${client.profileDir}/database.sqlite` });
 	BaseModel.setDb(db);
-	Setting.setConstant('rootProfileDir', client.profileDir);
-	Setting.setConstant('profileDir', client.profileDir);
-	await loadKeychainServiceAndSettings([]);
+	await Setting.load();
 
 	let onlyThisTest = 'testMv';
 	onlyThisTest = '';
@@ -294,7 +234,7 @@ async function main() {
 	}
 }
 
-main().catch(error => {
+main(process.argv).catch(error => {
 	console.info('');
 	logger.error(error);
 });

packages/app-cli/app/command-batch.js

@@ -0,0 +1,19 @@
+const BaseCommand = require('./base-command').default;
+const { _ } = require('@joplin/lib/locale');
+
+class Command extends BaseCommand {
+	usage() {
+		return 'batch <file-path>';
+	}
+
+	description() {
+		return _('Runs the commands contained in the text file. There should be one command per line.');
+	}
+
+	async action() {
+		// Implementation is in app.js::commandList()
+		throw new Error('No implemented');
+	}
+}
+
+module.exports = Command;

packages/app-cli/app/command-batch.ts

@@ -1,79 +0,0 @@
-import { splitCommandBatch } from '@joplin/lib/string-utils';
-import BaseCommand from './base-command';
-import { _ } from '@joplin/lib/locale';
-import { splitCommandString } from '@joplin/utils';
-import iterateStdin from './utils/iterateStdin';
-import { readFile } from 'fs-extra';
-import app from './app';
-
-interface Options {
-	'file-path': string;
-	options: {
-		'continue-on-failure': boolean;
-	};
-}
-
-class Command extends BaseCommand {
-	public usage() {
-		return 'batch <file-path>';
-	}
-
-	public options() {
-		return [
-			// These are present mostly for testing purposes
-			['--continue-on-failure', 'Continue running commands when one command in the batch fails.'],
-		];
-	}
-
-	public description() {
-		return _('Runs the commands contained in the text file. There should be one command per line.');
-	}
-
-	private streamCommands_ = async function*(filePath: string) {
-		const processLines = function*(lines: string) {
-			const commandLines = splitCommandBatch(lines);
-
-			for (const command of commandLines) {
-				if (!command.trim()) continue;
-				yield splitCommandString(command.trim());
-			}
-		};
-
-		if (filePath === '-') { // stdin
-			// Iterating over standard input conflicts with the CLI app's GUI.
-			if (app().hasGui()) {
-				throw new Error(_('Reading commands from standard input is only available in CLI mode.'));
-			}
-
-			for await (const lines of iterateStdin('command> ')) {
-				yield* processLines(lines);
-			}
-		} else {
-			const data = await readFile(filePath, 'utf-8');
-			yield* processLines(data);
-		}
-	};
-
-	public async action(options: Options) {
-		let lastError;
-		for await (const command of this.streamCommands_(options['file-path'])) {
-			try {
-				await app().refreshCurrentFolder();
-				await app().execCommand(command);
-			} catch (error) {
-				if (options.options['continue-on-failure']) {
-					app().stdout(error.message);
-					lastError = error;
-				} else {
-					throw error;
-				}
-			}
-		}
-
-		if (lastError) {
-			throw lastError;
-		}
-	}
-}
-
-module.exports = Command;

packages/app-cli/app/command-import.ts

@@ -6,7 +6,6 @@ import app from './app';
 import { _ } from '@joplin/lib/locale';
 import { ImportOptions } from '@joplin/lib/services/interop/types';
 import { unique } from '@joplin/lib/array';
-import Folder from '@joplin/lib/models/Folder';
 
 class Command extends BaseCommand {
 	public override usage() {
@@ -33,16 +32,14 @@ class Command extends BaseCommand {
 
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
-		let destinationFolder = await app().loadItem(BaseModel.TYPE_FOLDER, args.notebook);
+		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, args.notebook);
 
-		if (args.notebook && !destinationFolder) throw new Error(_('Cannot find "%s".', args.notebook));
-
-		if (!destinationFolder) destinationFolder = await Folder.defaultFolder();
+		if (args.notebook && !folder) throw new Error(_('Cannot find "%s".', args.notebook));
 
 		const importOptions: ImportOptions = {};
 		importOptions.path = args.path;
 		importOptions.format = args.options.format ? args.options.format : 'auto';
-		importOptions.destinationFolderId = destinationFolder ? destinationFolder.id : null;
+		importOptions.destinationFolderId = folder ? folder.id : null;
 
 		let lastProgress = '';
 

packages/app-cli/app/command-publish.test.ts

@@ -1,104 +0,0 @@
-import ShareService from '@joplin/lib/services/share/ShareService';
-import mockShareService from '@joplin/lib/testing/share/mockShareService';
-import { createFolderTree, setupDatabaseAndSynchronizer, switchClient, waitFor } from '@joplin/lib/testing/test-utils';
-import { setupApplication, setupCommandForTesting } from './utils/testUtils';
-import Note from '@joplin/lib/models/Note';
-import Folder from '@joplin/lib/models/Folder';
-import Setting from '@joplin/lib/models/Setting';
-const Command = require('./command-publish');
-
-const setUpCommand = () => {
-	const onStdout = jest.fn();
-	const command = setupCommandForTesting(Command, onStdout);
-
-	return { command, onStdout };
-};
-
-describe('command-publish', () => {
-	beforeEach(async () => {
-		await setupDatabaseAndSynchronizer(1);
-		await switchClient(1);
-		await setupApplication();
-
-		mockShareService({
-			getShares: async () => {
-				return { items: [] };
-			},
-			postShares: async () => ({ id: 'test-id' }),
-			getShareInvitations: async () => null,
-		}, ShareService.instance());
-	});
-
-	test('should publish a note', async () => {
-		const { command, onStdout } = setUpCommand();
-
-		const testFolder = await Folder.save({ title: 'Test' });
-		const testNote = await Note.save({ title: 'test', parent_id: testFolder.id });
-
-		await command.action({
-			note: testNote.id,
-			options: {
-				force: true,
-			},
-		});
-
-		// Should be shared
-		await waitFor(async () => {
-			expect(await Note.load(testNote.id)).toMatchObject({
-				is_shared: 1,
-			});
-		});
-
-		// Should have logged the publication URL
-		expect(onStdout).toHaveBeenCalled();
-		expect(onStdout.mock.lastCall[0]).toMatch(/Published at URL:/);
-	});
-
-	test('should be enabled for Joplin Server and Cloud sync targets', () => {
-		const { command } = setUpCommand();
-
-		Setting.setValue('sync.target', 1);
-		expect(command.enabled()).toBe(false);
-
-		const supportedSyncTargets = [9, 10, 11];
-		for (const id of supportedSyncTargets) {
-			Setting.setValue('sync.target', id);
-			expect(command.enabled()).toBe(true);
-		}
-	});
-
-	test('should not ask for confirmation if a note is already published', async () => {
-		const { command } = setUpCommand();
-
-		const promptMock = jest.fn(() => true);
-		command.setPrompt(promptMock);
-
-		await createFolderTree('', [
-			{
-				title: 'folder 1',
-				children: [
-					{
-						title: 'note 1',
-						body: 'test',
-					},
-				],
-			},
-		]);
-		const noteId = (await Note.loadByTitle('note 1')).id;
-
-		// Should ask for confirmation when first sharing
-		await command.action({
-			note: noteId,
-			options: { },
-		});
-		expect(promptMock).toHaveBeenCalledTimes(1);
-		expect(await Note.load(noteId)).toMatchObject({ is_shared: 1 });
-
-		// Should not ask for confirmation if called again for the same note
-		await command.action({
-			note: noteId,
-			options: { },
-		});
-		expect(promptMock).toHaveBeenCalledTimes(1);
-	});
-});

packages/app-cli/app/command-publish.ts

@@ -1,64 +0,0 @@
-import { _ } from '@joplin/lib/locale';
-import BaseCommand from './base-command';
-import app from './app';
-import Logger from '@joplin/utils/Logger';
-import ShareService from '@joplin/lib/services/share/ShareService';
-import { ModelType } from '@joplin/lib/BaseModel';
-import SyncTargetRegistry from '@joplin/lib/SyncTargetRegistry';
-import Setting from '@joplin/lib/models/Setting';
-import { reg } from '@joplin/lib/registry';
-
-const logger = Logger.create('command-publish');
-
-type Args = {
-	note: string;
-	options: {
-		force?: boolean;
-	};
-};
-
-
-class Command extends BaseCommand {
-	public usage() {
-		return 'publish [note]';
-	}
-
-	public description() {
-		return _('Publishes a note to Joplin Server or Joplin Cloud');
-	}
-
-	public options() {
-		return [
-			['-f, --force', _('Do not ask for user confirmation.')],
-		];
-	}
-
-	public enabled() {
-		return SyncTargetRegistry.isJoplinServerOrCloud(Setting.value('sync.target'));
-	}
-
-	public async action(args: Args) {
-		const targetNote = await app().loadItemOrFail(ModelType.Note, args.note);
-		const parent = await app().loadItem(ModelType.Folder, targetNote.parent_id);
-
-		const force = args.options.force;
-		const alreadyShared = !!targetNote.is_shared;
-		const ok = force || alreadyShared ? true : await this.prompt(
-			_('Publish note "%s" (in notebook "%s")?', targetNote.title, parent.title ?? '<root>'),
-			{ booleanAnswerDefault: 'n' },
-		);
-		if (!ok) return;
-
-		logger.info('Share note: ', targetNote.id);
-		const share = await ShareService.instance().shareNote(targetNote.id, false);
-
-		this.stdout(_('Synchronising...'));
-		await reg.waitForSyncFinishedThenSync();
-
-		const userId = ShareService.instance().userId;
-		const shareUrl = ShareService.instance().shareUrl(userId, share);
-		this.stdout(_('Published at URL: %s', shareUrl));
-	}
-}
-
-module.exports = Command;

packages/app-cli/app/command-server.js

@@ -14,25 +14,17 @@ class Command extends BaseCommand {
 		return `${_('Start, stop or check the API server. To specify on which port it should run, set the api.port config variable. Commands are (%s).', ['start', 'stop', 'status'].join('|'))} This is an experimental feature - use at your own risks! It is recommended that the server runs off its own separate profile so that no two CLI instances access that profile at the same time. Use --profile to specify the profile path.`;
 	}
 
-	options() {
-		return [
-			['--exit-early', 'Allow the command to exit while the server is still running. The server will still stop when the app exits. Valid only for the `start` subcommand.'],
-			['--quiet', 'Log less information to the console. More verbose logs will still be available through log-clipper.txt.'],
-		];
-	}
-
 	async action(args) {
 		const command = args.command;
 
 		const ClipperServer = require('@joplin/lib/ClipperServer').default;
 		ClipperServer.instance().initialize();
 		const stdoutFn = (...s) => this.stdout(s.join(' '));
-		const ignoreOutputFn = ()=>{};
 		const clipperLogger = new Logger();
 		clipperLogger.addTarget('file', { path: `${Setting.value('profileDir')}/log-clipper.txt` });
 		clipperLogger.addTarget('console', { console: {
-			info: args.options.quiet ? ignoreOutputFn : stdoutFn,
-			warn: args.options.quiet ? ignoreOutputFn : stdoutFn,
+			info: stdoutFn,
+			warn: stdoutFn,
 			error: stdoutFn,
 		} });
 		ClipperServer.instance().setDispatch(() => {});
@@ -46,11 +38,7 @@ class Command extends BaseCommand {
 				this.stdout(_('Server is already running on port %d', runningOnPort));
 			} else {
 				await shim.fsDriver().writeFile(pidPath, process.pid.toString(), 'utf-8');
-				const promise = ClipperServer.instance().start();
-
-				if (!args.options['exit-early']) {
-					await promise; // Never exit
-				}
+				await ClipperServer.instance().start(); // Never exit
 			}
 		} else if (command === 'status') {
 			this.stdout(runningOnPort ? _('Server is running on port %d', runningOnPort) : _('Server is not running.'));

packages/app-cli/app/command-share.ts

@@ -149,7 +149,6 @@ class Command extends BaseCommand {
 						waiting: invitation.status === ShareUserStatus.Waiting,
 						rejected: invitation.status === ShareUserStatus.Rejected,
 						folderId: invitation.share.folder_id,
-						canWrite: !!invitation.can_write,
 						fromUser: {
 							email: invitation.share.user?.email,
 						},

packages/app-cli/app/command-unpublish.test.ts

@@ -1,43 +0,0 @@
-import ShareService from '@joplin/lib/services/share/ShareService';
-import mockShareService from '@joplin/lib/testing/share/mockShareService';
-import { setupDatabaseAndSynchronizer, switchClient, waitFor } from '@joplin/lib/testing/test-utils';
-import { setupApplication, setupCommandForTesting } from './utils/testUtils';
-import Note from '@joplin/lib/models/Note';
-import Folder from '@joplin/lib/models/Folder';
-const Command = require('./command-unpublish');
-
-
-describe('command-unpublish', () => {
-	beforeEach(async () => {
-		await setupDatabaseAndSynchronizer(1);
-		await switchClient(1);
-		await setupApplication();
-
-		mockShareService({
-			getShares: async () => {
-				return { items: [{ id: 'test-id' }] };
-			},
-			postShares: async () => {
-				throw new Error('Unexpected call to postShares');
-			},
-			getShareInvitations: async () => null,
-		}, ShareService.instance());
-	});
-
-	test('should unpublish a note', async () => {
-		const command = setupCommandForTesting(Command, ()=>{});
-
-		const testFolder = await Folder.save({ title: 'Test' });
-		const testNote = await Note.save({ title: 'test', parent_id: testFolder.id, is_shared: 1 });
-
-		await command.action({
-			note: testNote.id,
-		});
-
-		await waitFor(async () => {
-			expect(await Note.load(testNote.id)).toMatchObject({
-				is_shared: 0,
-			});
-		});
-	});
-});

packages/app-cli/app/command-unpublish.ts

@@ -1,57 +0,0 @@
-import { _ } from '@joplin/lib/locale';
-import BaseCommand from './base-command';
-import app from './app';
-import Logger from '@joplin/utils/Logger';
-import ShareService from '@joplin/lib/services/share/ShareService';
-import { ModelType } from '@joplin/lib/BaseModel';
-import Note from '@joplin/lib/models/Note';
-import SyncTargetRegistry from '@joplin/lib/SyncTargetRegistry';
-import Setting from '@joplin/lib/models/Setting';
-import { reg } from '@joplin/lib/registry';
-
-const logger = Logger.create('command-unpublish');
-
-type Args = {
-	note: string;
-};
-
-class Command extends BaseCommand {
-	public usage() {
-		return 'publish [note]';
-	}
-
-	public description() {
-		return _('Publishes a note to Joplin Server or Joplin Cloud');
-	}
-
-	public options() {
-		return [
-			['-f, --force', _('Do not ask for user confirmation.')],
-		];
-	}
-
-	public enabled() {
-		return SyncTargetRegistry.isJoplinServerOrCloud(Setting.value('sync.target'));
-	}
-
-	public async action(args: Args) {
-		const targetNote = await app().loadItemOrFail(ModelType.Note, args.note);
-
-		if (!targetNote.is_shared) {
-			throw new Error(_('Note not published: %s', targetNote.title));
-		}
-
-		logger.info('Unshare note: ', targetNote.id);
-		await ShareService.instance().unshareNote(targetNote.id);
-
-		const note = await Note.load(targetNote.id);
-		if (note.is_shared) {
-			throw new Error('Assertion failure: The note is still shared.');
-		}
-
-		this.stdout(_('Synchronising...'));
-		await reg.waitForSyncFinishedThenSync();
-	}
-}
-
-module.exports = Command;

packages/app-cli/app/command-use.ts

@@ -2,7 +2,6 @@ import BaseCommand from './base-command';
 import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
-import Folder from '@joplin/lib/models/Folder';
 
 class Command extends BaseCommand {
 	public override usage() {
@@ -21,18 +20,6 @@ class Command extends BaseCommand {
 	public override async action(args: any) {
 		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, args['notebook']);
 		if (!folder) throw new Error(_('Cannot find "%s".', args['notebook']));
-
-		// Auto-expand parent folders in GUI if present
-		if (app().gui() && app().gui().widget && app().gui().widget('folderList')) {
-			const folderListWidget = app().gui().widget('folderList');
-			if (folderListWidget.expandToFolder) {
-				// Get all folders to pass to expandToFolder
-				const folders = await Folder.all();
-				folderListWidget.folders = folders; // Ensure widget has current folders
-				folderListWidget.expandToFolder(folder.id);
-			}
-		}
-
 		app().switchCurrentFolder(folder);
 	}
 }

packages/app-cli/app/gui/FolderListWidget.ts

@@ -4,14 +4,11 @@ import BaseModel from '@joplin/lib/BaseModel';
 import Setting from '@joplin/lib/models/Setting';
 import { _ } from '@joplin/lib/locale';
 import { FolderEntity } from '@joplin/lib/services/database/types';
-import {
-	getDisplayParentId,
-	getTrashFolderId,
-} from '@joplin/lib/services/trash';
+import { getDisplayParentId, getTrashFolderId } from '@joplin/lib/services/trash';
 const ListWidget = require('tkwidgets/ListWidget.js');
 
-
 export default class FolderListWidget extends ListWidget {
+
 	private folders_: FolderEntity[] = [];
 
 	public constructor() {
@@ -34,18 +31,7 @@ export default class FolderListWidget extends ListWidget {
 			if (item === '-') {
 				output.push('-'.repeat(this.innerWidth));
 			} else if (item.type_ === Folder.modelType()) {
-				const depth = this.folderDepth(this.folders, item.id);
-				output.push(' '.repeat(depth));
-
-				// Add collapse/expand indicator
-				const hasChildren = this.folderHasChildren_(this.folders, item.id);
-				if (hasChildren) {
-					const collapsedFolders = Setting.value('collapsedFolderIds');
-					const isCollapsed = collapsedFolders.includes(item.id);
-					output.push(isCollapsed ? '[+] ' : '[-] ');
-				} else {
-					output.push('  '); // Space for alignment
-				}
+				output.push(' '.repeat(this.folderDepth(this.folders, item.id)));
 
 				if (this.showIds) {
 					output.push(Folder.shortId(item.id));
@@ -79,10 +65,7 @@ export default class FolderListWidget extends ListWidget {
 		let output = 0;
 		while (true) {
 			const folder = BaseModel.byId(folders, folderId);
-			const folderParentId = getDisplayParentId(
-				folder,
-				folders.find((f) => f.id === folder.parent_id),
-			);
+			const folderParentId = getDisplayParentId(folder, folders.find(f => f.id === folder.parent_id));
 			if (!folder || !folderParentId) return output;
 			output++;
 			folderId = folderParentId;
@@ -170,10 +153,7 @@ export default class FolderListWidget extends ListWidget {
 	public folderHasChildren_(folders: FolderEntity[], folderId: string) {
 		for (let i = 0; i < folders.length; i++) {
 			const folder = folders[i];
-			const folderParentId = getDisplayParentId(
-				folder,
-				folders.find((f) => f.id === folder.parent_id),
-			);
+			const folderParentId = getDisplayParentId(folder, folders.find(f => f.id === folder.parent_id));
 			if (folderParentId === folderId) return true;
 		}
 		return false;
@@ -181,12 +161,7 @@ export default class FolderListWidget extends ListWidget {
 
 	public render() {
 		if (this.updateItems_) {
-			this.logger().debug(
-				'Rebuilding items...',
-				this.notesParentType,
-				this.selectedJoplinItemId,
-				this.selectedSearchId,
-			);
+			this.logger().debug('Rebuilding items...', this.notesParentType, this.selectedJoplinItemId, this.selectedSearchId);
 			const wasSelectedItemId = this.selectedJoplinItemId;
 			const previousParentType = this.notesParentType;
 
@@ -195,20 +170,12 @@ export default class FolderListWidget extends ListWidget {
 			const orderFolders = (parentId: string) => {
 				for (let i = 0; i < this.folders.length; i++) {
 					const f = this.folders[i];
-					const originalParent = this.folders_.find(
-						(f) => f.id === f.parent_id,
-					);
+					const originalParent = this.folders_.find(f => f.id === f.parent_id);
 
 					const folderParentId = getDisplayParentId(f, originalParent); // f.parent_id ? f.parent_id : '';
 					if (folderParentId === parentId) {
 						newItems.push(f);
-						// Only recurse into children if the folder is not collapsed
-						if (this.folderHasChildren_(this.folders, f.id)) {
-							const collapsedFolders = Setting.value('collapsedFolderIds');
-							if (!collapsedFolders.includes(f.id)) {
-								orderFolders(f.id);
-							}
-						}
+						if (this.folderHasChildren_(this.folders, f.id)) orderFolders(f.id);
 					}
 				}
 			};
@@ -254,53 +221,4 @@ export default class FolderListWidget extends ListWidget {
 		const index = this.itemIndexByKey('id', itemId);
 		this.currentIndex = index >= 0 ? index : 0;
 	}
-
-	public toggleFolderCollapse() {
-		const item = this.currentItem;
-		if (item && item.type_ === Folder.modelType() && this.folderHasChildren_(this.folders, item.id)) {
-			const collapsedFolders = Setting.value('collapsedFolderIds');
-			const isCollapsed = collapsedFolders.includes(item.id);
-			if (isCollapsed) {
-				const newCollapsed = collapsedFolders.filter((id: string) => id !== item.id);
-				Setting.setValue('collapsedFolderIds', newCollapsed);
-			} else {
-				Setting.setValue('collapsedFolderIds', [...collapsedFolders, item.id]);
-			}
-			this.updateItems_ = true;
-			this.invalidate();
-			return true;
-		}
-		return false;
-	}
-
-
-	public expandToFolder(folderId: string) {
-		// Find all parent folders and expand them
-		const parentsToExpand: string[] = [];
-		let currentId = folderId;
-
-		while (currentId) {
-			const folder = BaseModel.byId(this.folders, currentId);
-			if (!folder) break;
-
-			const parentId = getDisplayParentId(
-				folder,
-				this.folders.find((f) => f.id === folder.parent_id),
-			);
-			if (parentId) {
-				parentsToExpand.unshift(parentId);
-				currentId = parentId;
-			} else {
-				break;
-			}
-		}
-
-		// Expand all parent folders
-		const collapsedFolders = Setting.value('collapsedFolderIds');
-		const newCollapsed = collapsedFolders.filter((id: string) => !parentsToExpand.includes(id));
-		Setting.setValue('collapsedFolderIds', newCollapsed);
-
-		this.updateItems_ = true;
-		this.invalidate();
-	}
 }

packages/app-cli/app/utils/iterateStdin.ts

@@ -1,54 +0,0 @@
-import { createInterface } from 'readline/promises';
-
-const iterateStdin = async function*(prompt: string) {
-	let nextLineListeners: (()=> void)[] = [];
-	const dispatchAllListeners = () => {
-		const listeners = nextLineListeners;
-		nextLineListeners = [];
-		for (const listener of listeners) {
-			listener();
-		}
-	};
-
-	const rl = createInterface({
-		input: process.stdin,
-		output: process.stdout,
-	});
-	rl.setPrompt(prompt);
-
-	let buffer: string[] = [];
-	rl.on('line', (line) => {
-		buffer.push(line);
-		dispatchAllListeners();
-	});
-
-	let done = false;
-	rl.on('close', () => {
-		done = true;
-		dispatchAllListeners();
-	});
-
-	const readNextLines = () => {
-		return new Promise<string|null>(resolve => {
-			if (done) {
-				resolve(null);
-			} else if (buffer.length > 0) {
-				resolve(buffer.join('\n'));
-				buffer = [];
-			} else {
-				nextLineListeners.push(() => {
-					resolve(buffer.join('\n'));
-					buffer = [];
-				});
-			}
-		});
-	};
-
-	while (!done) {
-		rl.prompt();
-		const lines = await readNextLines();
-		yield lines;
-	}
-};
-
-export default iterateStdin;

packages/app-cli/app/utils/shimInitCli.ts

@@ -9,7 +9,7 @@ const shimInitCli = (options: ShimInitOptions) => {
 
 	shim.showMessageBox = async (message: string, options: ShowMessageBoxOptions) => {
 		const gui = app()?.gui();
-		let answers = options.buttons ?? [_('OK'), _('Cancel')];
+		let answers = options.buttons ?? [_('Ok'), _('Cancel')];
 
 		if (options.type === 'error' || options.type === 'info') {
 			answers = [];

packages/app-cli/package.json

@@ -35,15 +35,15 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "3.5.0",
+  "version": "3.4.0",
   "bin": "./main.js",
   "engines": {
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@joplin/lib": "~3.5",
-    "@joplin/renderer": "~3.5",
-    "@joplin/utils": "~3.5",
+    "@joplin/lib": "~3.4",
+    "@joplin/renderer": "~3.4",
+    "@joplin/utils": "~3.4",
     "aws-sdk": "2.1340.0",
     "chalk": "4.1.2",
     "compare-version": "0.1.2",
@@ -57,7 +57,7 @@
     "proper-lockfile": "4.1.2",
     "redux": "4.2.1",
     "server-destroy": "1.0.1",
-    "sharp": "0.34.2",
+    "sharp": "0.33.5",
     "sprintf-js": "1.1.3",
     "sqlite3": "5.1.6",
     "string-padding": "1.0.2",
@@ -70,14 +70,14 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@joplin/tools": "~3.5",
+    "@joplin/tools": "~3.4",
     "@types/fs-extra": "11.0.4",
-    "@types/jest": "29.5.14",
-    "@types/node": "18.19.115",
+    "@types/jest": "29.5.12",
+    "@types/node": "18.19.86",
     "@types/proper-lockfile": "^4.1.2",
     "gulp": "4.0.2",
     "jest": "29.7.0",
     "temp": "0.9.4",
-    "typescript": "5.8.3"
+    "typescript": "5.4.5"
   }
 }

packages/app-cli/tests/MarkupToHtml.ts

@@ -1,6 +1,6 @@
 
-import MarkupToHtml from '@joplin/renderer/MarkupToHtml';
-import { RenderResult, MarkupLanguage } from '@joplin/renderer/types';
+import MarkupToHtml, { MarkupLanguage } from '@joplin/renderer/MarkupToHtml';
+import { RenderResult } from '@joplin/renderer/types';
 
 describe('MarkupToHtml', () => {
 

packages/app-cli/tests/html_to_md/task_list_block_content.html

@@ -1,13 +0,0 @@
-<p>A task list created by the TipTap editor:</p>
-<ul data-type="taskList">
-	<li><label contenteditable="false"><input type="checkbox"><span></span></label>
-		<div>
-			<p>Testing...</p>
-		</div>
-	</li>
-	<li><label contenteditable="false"><input type="checkbox"><span></span></label>
-		<div>
-			<p>testing</p>
-		</div>
-	</li>
-</ul>

packages/app-cli/tests/html_to_md/task_list_block_content.md

@@ -1,5 +0,0 @@
-A task list created by the TipTap editor:
-
-- [ ] Testing...
-    
-- [ ] testing

packages/app-cli/tests/html_to_md/task_lists.html

@@ -1,26 +0,0 @@
-<p>List 1:</p>
-<ul>
-	<li><label><input type="checkbox"/>This</label></li>
-	<li><label><input type="checkbox" checked/>is a test.</label></li>
-</ul>
-<p>List 2:</p>
-<ul>
-	<li>
-		<input type="checkbox" id="checkbox-1"/><label for="checkbox-1">This</label>
-	</li>
-	<li>
-		<input type="checkbox" checked id="checkbox-2"/><label for="checkbox-2">is another test.</label>
-	</li>
-</ul>
-<p>List 3:</p>
-<ul>
-	<li>
-		<input type="checkbox" id="checkbox-a1"/><label for="checkbox-a1">This</label>
-	</li>
-	<li>
-		<input type="checkbox" checked id="checkbox-a2"/><label for="checkbox-a2">is another test.</label>
-	</li>
-	<li>
-		<input type="checkbox" checked id="checkbox-a3"/><label for="checkbox-a3"></label>
-	</li>
-</ul>

packages/app-cli/tests/html_to_md/task_lists.md

@@ -1,15 +0,0 @@
-List 1:
-
-- [ ] This
-- [x] is a test.
-
-List 2:
-
-- [ ] This
-- [x] is another test.
-
-List 3:
-
-- [ ] This
-- [x] is another test.
-- [x]  

packages/app-cli/tests/md_to_html/checkbox_alternative.html

@@ -1,7 +1,7 @@
-<ul class="joplin-checklist" data-is-checklist="1">
+<ul class="joplin-checklist">
 <li>Not checked</li>
 <li class="checked">Checked!!
-<ul class="joplin-checklist" data-is-checklist="1">
+<ul class="joplin-checklist">
 <li class="checked">Indented, with <strong>bold</strong></li>
 <li>Indented, not checked</li>
 </ul>

packages/app-cli/tests/md_to_html/resource_nonexistent_image.html

@@ -1,15 +1,15 @@
-<span class="not-loaded-resource not-loaded-image-resource resource-status-notDownloaded" data-resource-id="a1test2a1test2a1test2a1test22345" data-original-alt data-original-title="test" contenteditable="false"><img src="data:image/svg+xml;utf8,
+<div class="not-loaded-resource not-loaded-image-resource resource-status-notDownloaded" data-resource-id="a1test2a1test2a1test2a1test22345" data-original-alt data-original-title="test" contenteditable="false"><img src="data:image/svg+xml;utf8,
 &Tab;&Tab;&lt;svg width=&quot;1700&quot; height=&quot;1536&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot;&gt;
 &Tab;&Tab;    &lt;path d=&quot;M1280 1344c0-35-29-64-64-64s-64 29-64 64 29 64 64 64 64-29 64-64zm256 0c0-35-29-64-64-64s-64 29-64 64 29 64 64 64 64-29 64-64zm128-224v320c0 53-43 96-96 96H96c-53 0-96-43-96-96v-320c0-53 43-96 96-96h465l135 136c37 36 85 56 136 56s99-20 136-56l136-136h464c53 0 96 43 96 96zm-325-569c10 24 5 52-14 70l-448 448c-12 13-29 19-45 19s-33-6-45-19L339 621c-19-18-24-46-14-70 10-23 33-39 59-39h256V64c0-35 29-64 64-64h256c35 0 64 29 64 64v448h256c26 0 49 16 59 39z&quot;/&gt;
 &Tab;&Tab;&lt;/svg&gt;
-&Tab;"/></span>
-<span class="not-loaded-resource not-loaded-image-resource resource-status-notDownloaded" data-resource-id="a1test2a1test2a1test2a1test22346" data-original-alt="test" data-original-title contenteditable="false"><img src="data:image/svg+xml;utf8,
+&Tab;"/></div>
+<div class="not-loaded-resource not-loaded-image-resource resource-status-notDownloaded" data-resource-id="a1test2a1test2a1test2a1test22346" data-original-alt="test" data-original-title contenteditable="false"><img src="data:image/svg+xml;utf8,
 &Tab;&Tab;&lt;svg width=&quot;1700&quot; height=&quot;1536&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot;&gt;
 &Tab;&Tab;    &lt;path d=&quot;M1280 1344c0-35-29-64-64-64s-64 29-64 64 29 64 64 64 64-29 64-64zm256 0c0-35-29-64-64-64s-64 29-64 64 29 64 64 64 64-29 64-64zm128-224v320c0 53-43 96-96 96H96c-53 0-96-43-96-96v-320c0-53 43-96 96-96h465l135 136c37 36 85 56 136 56s99-20 136-56l136-136h464c53 0 96 43 96 96zm-325-569c10 24 5 52-14 70l-448 448c-12 13-29 19-45 19s-33-6-45-19L339 621c-19-18-24-46-14-70 10-23 33-39 59-39h256V64c0-35 29-64 64-64h256c35 0 64 29 64 64v448h256c26 0 49 16 59 39z&quot;/&gt;
 &Tab;&Tab;&lt;/svg&gt;
-&Tab;"/></span>
-<span class="not-loaded-resource not-loaded-image-resource resource-status-notDownloaded" data-resource-id="a1test2a1test2a1test2a1test22347" data-original-before=" " data-original-after=" class=&quot;jop-noMdConv&quot;/" contenteditable="false"><img src="data:image/svg+xml;utf8,
+&Tab;"/></div>
+<div class="not-loaded-resource not-loaded-image-resource resource-status-notDownloaded" data-resource-id="a1test2a1test2a1test2a1test22347" data-original-before=" " data-original-after=" class=&quot;jop-noMdConv&quot;/" contenteditable="false"><img src="data:image/svg+xml;utf8,
 &Tab;&Tab;&lt;svg width=&quot;1700&quot; height=&quot;1536&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot;&gt;
 &Tab;&Tab;    &lt;path d=&quot;M1280 1344c0-35-29-64-64-64s-64 29-64 64 29 64 64 64 64-29 64-64zm256 0c0-35-29-64-64-64s-64 29-64 64 29 64 64 64 64-29 64-64zm128-224v320c0 53-43 96-96 96H96c-53 0-96-43-96-96v-320c0-53 43-96 96-96h465l135 136c37 36 85 56 136 56s99-20 136-56l136-136h464c53 0 96 43 96 96zm-325-569c10 24 5 52-14 70l-448 448c-12 13-29 19-45 19s-33-6-45-19L339 621c-19-18-24-46-14-70 10-23 33-39 59-39h256V64c0-35 29-64 64-64h256c35 0 64 29 64 64v448h256c26 0 49 16 59 39z&quot;/&gt;
 &Tab;&Tab;&lt;/svg&gt;
-&Tab;"/></span>
+&Tab;"/></div>

packages/app-cli/tests/support/test_notes/md/resources_without_extension/file1

@@ -1 +0,0 @@
-content

packages/app-cli/tests/support/test_notes/md/resources_without_extension/file2

@@ -1 +0,0 @@
-content

packages/app-cli/tests/support/test_notes/md/resources_without_extension/file3.text

@@ -1 +0,0 @@
-content

packages/app-cli/tests/support/test_notes/md/resources_without_extension/markdown_file.md

@@ -1,3 +0,0 @@
-1. File without extension and leading `./`: [file1](./file1). Gets imported, but filename is converted to extension, like `<internal_id>.file1`
-2. File without extension: [file2](file2). Not imported at all.
-3. File with extension: [file3](file3.text). Gets imported properly.

packages/app-cli/tests/support/test_notes/yaml/filename-title.md

@@ -1,7 +0,0 @@
----
-aliases:
-  - An Obsidian-style note
----
-
-This is a note with no `title` field in the YAML Frontmatter.
-Joplin should be smart enough to pull the title from the filename in such cases.

packages/app-clipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "3.5.0",
+    "version": "3.4.0",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": {

packages/app-desktop/ElectronAppWrapper.ts

@@ -8,7 +8,7 @@ import { FileLocker } from '@joplin/utils/fs';
 import { IpcMessageHandler, IpcServer, Message, newHttpError, sendMessage, SendMessageOptions, startServer, stopServer } from '@joplin/utils/ipc';
 import { BrowserWindow, Tray, WebContents, screen, App, nativeTheme } from 'electron';
 import bridge from './bridge';
-import * as url from 'url';
+const url = require('url');
 const path = require('path');
 const { dirname } = require('@joplin/lib/path-utils');
 const fs = require('fs-extra');
@@ -407,17 +407,7 @@ export default class ElectronAppWrapper {
 					isGoingToExit = true;
 				} else {
 					event.preventDefault();
-
-					const w = this.win_;
-					if (!w) return;
-
-					if (w.isFullScreen()) {
-						// leave fullscreen, then hide
-						w.once('leave-full-screen', () => w.hide());
-						w.setFullScreen(false);
-					} else {
-						w.hide();
-					}
+					this.hide();
 				}
 			} else {
 				const hasBackgroundWindows = this.secondaryWindows_.size > 0;
@@ -622,11 +612,7 @@ export default class ElectronAppWrapper {
 					console.warn('The window object was not available during the click event from tray icon');
 					return;
 				}
-				if (!this.mainWindow().isVisible()) {
-					this.mainWindow().show();
-				} else {
-					this.mainWindow().hide();
-				}
+				this.mainWindow().show();
 			});
 		} catch (error) {
 			console.error('Cannot create tray', error);

packages/app-desktop/InteropServiceHelper.ts

@@ -86,14 +86,8 @@ export default class InteropServiceHelper {
 								// pdfs.
 								// https://github.com/laurent22/joplin/issues/6254.
 								await win.webContents.executeJavaScript('document.querySelectorAll(\'details\').forEach(el=>el.setAttribute(\'open\',\'\'))');
-								const data = await win.webContents.printToPDF({
-									...options,
-									// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Partially refactored old code before rule was applied
-									pageSize: options.pageSize as any,
-									// Allows users to override the CSS page size.
-									// See https://github.com/laurent22/joplin/issues/13096
-									preferCSSPageSize: true,
-								});
+								// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+								const data = await win.webContents.printToPDF(options as any);
 								resolve(data);
 							} catch (error) {
 								reject(error);

packages/app-desktop/app.ts

@@ -55,18 +55,11 @@ import userFetcher, { initializeUserFetcher } from '@joplin/lib/utils/userFetche
 import { parseNotesParent } from '@joplin/lib/reducer';
 import OcrService from '@joplin/lib/services/ocr/OcrService';
 import OcrDriverTesseract from '@joplin/lib/services/ocr/drivers/OcrDriverTesseract';
-import OcrDriverTranscribe from '@joplin/lib/services/ocr/drivers/OcrDriverTranscribe';
 import SearchEngine from '@joplin/lib/services/search/SearchEngine';
 import { PackageInfo } from '@joplin/lib/versionInfo';
 import { CustomProtocolHandler } from './utils/customProtocols/handleCustomProtocols';
 import { refreshFolders } from '@joplin/lib/folders-screen-utils';
 import initializeCommandService from './utils/initializeCommandService';
-import OcrDriverBase from '@joplin/lib/services/ocr/OcrDriverBase';
-import PerformanceLogger from '@joplin/lib/PerformanceLogger';
-import Note from '@joplin/lib/models/Note';
-import Resource from '@joplin/lib/models/Resource';
-
-const perfLogger = PerformanceLogger.create();
 
 const pluginClasses = [
 	require('./plugins/GotoAnything').default,
@@ -74,8 +67,6 @@ const pluginClasses = [
 
 const appDefaultState = createAppDefaultState(resourceEditWatcherDefaultState);
 
-type StartupTask = { label: string; task: ()=> void|Promise<void> };
-
 class Application extends BaseApplication {
 
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
@@ -357,19 +348,16 @@ class Application extends BaseApplication {
 				// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 				const Tesseract = (window as any).Tesseract;
 
-				const drivers: OcrDriverBase[] = [];
-				drivers.push(new OcrDriverTesseract(
+				const driver = new OcrDriverTesseract(
 					{ createWorker: Tesseract.createWorker },
 					{
 						workerPath: `${bridge().buildDir()}/tesseract.js/worker.min.js`,
 						corePath: `${bridge().buildDir()}/tesseract.js-core`,
 						languageDataPath: Setting.value('ocr.languageDataPath') || null,
 					},
-				));
+				);
 
-				drivers.push(new OcrDriverTranscribe());
-
-				this.ocrService_ = new OcrService(drivers);
+				this.ocrService_ = new OcrService(driver);
 			}
 
 			void this.ocrService_.runInBackground();
@@ -423,53 +411,56 @@ class Application extends BaseApplication {
 		});
 	}
 
-	private buildStartupTasks_() {
-		const tasks: StartupTask[] = [];
-		const addTask = (label: string, task: StartupTask['task']) => {
-			tasks.push({ label, task });
-		};
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+	public async start(argv: string[], startOptions: StartOptions = null): Promise<any> {
+		// If running inside a package, the command line, instead of being "node.exe <path> <flags>" is "joplin.exe <flags>" so
+		// insert an extra argument so that they can be processed in a consistent way everywhere.
+		if (!bridge().electronIsDev()) argv.splice(1, 0, '.');
 
-		addTask('app/set up extra debug logging', () => {
-			reg.logger().info('app.start: doing regular boot');
-			const dir: string = Setting.value('profileDir');
+		argv = await super.start(argv, startOptions);
 
-			syncDebugLog.enabled = false;
+		await this.setupIntegrationTestUtils();
 
-			if (dir.endsWith('dev-desktop-2')) {
-				syncDebugLog.addTarget(TargetType.File, {
-					path: `${homedir()}/synclog.txt`,
-				});
-				syncDebugLog.enabled = true;
-				syncDebugLog.info(`Profile dir: ${dir}`);
-			}
-		});
+		bridge().setLogFilePath(Logger.globalLogger.logFilePath());
 
-		addTask('app/set up registry', () => {
-			reg.setDispatch(this.dispatch.bind(this));
-			reg.setShowErrorMessageBoxHandler((message: string) => { bridge().showErrorMessageBox(message); });
-		});
+		await this.applySettingsSideEffects();
 
-		addTask('app/set up auto updater', () => {
-			this.setupAutoUpdaterService();
-		});
-
-		addTask('app/set up AlarmService', () => {
-			AlarmService.setDriver(new AlarmServiceDriverNode({ appName: packageInfo.build.appId }));
-			AlarmService.setLogger(reg.logger());
-		});
-
-		if (Setting.value('flagOpenDevTools')) {
-			addTask('app/openDevTools', () => {
-				bridge().openDevTools();
-			});
+		if (Setting.value('sync.upgradeState') === Setting.SYNC_UPGRADE_STATE_MUST_DO) {
+			reg.logger().info('app.start: doing upgradeSyncTarget action');
+			bridge().mainWindow().show();
+			return { action: 'upgradeSyncTarget' };
 		}
 
-		addTask('app/set up custom protocol handler', async () => {
-			this.protocolHandler_ = bridge().electronApp().getCustomProtocolHandler();
-			this.protocolHandler_.allowReadAccessToDirectory(__dirname); // App bundle directory
-			this.protocolHandler_.allowReadAccessToDirectory(Setting.value('cacheDir'));
-			this.protocolHandler_.allowReadAccessToDirectory(Setting.value('resourceDir'));
-		});
+		reg.logger().info('app.start: doing regular boot');
+
+		const dir: string = Setting.value('profileDir');
+
+		syncDebugLog.enabled = false;
+
+		if (dir.endsWith('dev-desktop-2')) {
+			syncDebugLog.addTarget(TargetType.File, {
+				path: `${homedir()}/synclog.txt`,
+			});
+			syncDebugLog.enabled = true;
+			syncDebugLog.info(`Profile dir: ${dir}`);
+		}
+
+		this.setupAutoUpdaterService();
+
+		AlarmService.setDriver(new AlarmServiceDriverNode({ appName: packageInfo.build.appId }));
+		AlarmService.setLogger(reg.logger());
+
+		reg.setDispatch(this.dispatch.bind(this));
+		reg.setShowErrorMessageBoxHandler((message: string) => { bridge().showErrorMessageBox(message); });
+
+		if (Setting.value('flagOpenDevTools')) {
+			bridge().openDevTools();
+		}
+
+		this.protocolHandler_ = bridge().electronApp().getCustomProtocolHandler();
+		this.protocolHandler_.allowReadAccessToDirectory(__dirname); // App bundle directory
+		this.protocolHandler_.allowReadAccessToDirectory(Setting.value('cacheDir'));
+		this.protocolHandler_.allowReadAccessToDirectory(Setting.value('resourceDir'));
 		// this.protocolHandler_.allowReadAccessTo(Setting.value('tempDir'));
 		// For now, this doesn't seem necessary:
 		//  this.protocolHandler_.allowReadAccessTo(Setting.value('profileDir'));
@@ -477,52 +468,44 @@ class Application extends BaseApplication {
 		// handler, and, as such, it may make sense to also limit permissions of
 		// allowed pages with a Content Security Policy.
 
-		addTask('app/initialize PluginManager, redux, CommandService, and KeymapService', async () => {
-			PluginManager.instance().dispatch_ = this.dispatch.bind(this);
-			PluginManager.instance().setLogger(reg.logger());
-			PluginManager.instance().register(pluginClasses);
+		PluginManager.instance().dispatch_ = this.dispatch.bind(this);
+		PluginManager.instance().setLogger(reg.logger());
+		PluginManager.instance().register(pluginClasses);
 
-			this.initRedux();
+		this.initRedux();
 
-			initializeCommandService(this.store(), Setting.value('env') === 'dev');
+		PerFolderSortOrderService.initialize();
 
-			const keymapService = KeymapService.instance();
-			// We only add the commands that appear in the menu because only
-			// those can have a shortcut associated with them.
-			keymapService.initialize(menuCommandNames());
+		initializeCommandService(this.store(), Setting.value('env') === 'dev');
 
-			try {
-				await keymapService.loadCustomKeymap(`${Setting.value('profileDir')}/keymap-desktop.json`);
-			} catch (error) {
-				reg.logger().error(error);
-			}
+		const keymapService = KeymapService.instance();
+		// We only add the commands that appear in the menu because only
+		// those can have a shortcut associated with them.
+		keymapService.initialize(menuCommandNames());
+
+		try {
+			await keymapService.loadCustomKeymap(`${dir}/keymap-desktop.json`);
+		} catch (error) {
+			reg.logger().error(error);
+		}
+
+		// Since the settings need to be loaded before the store is
+		// created, it will never receive the SETTING_UPDATE_ALL even,
+		// which mean state.settings will not be initialised. So we
+		// manually call dispatchUpdateAll() to force an update.
+		Setting.dispatchUpdateAll();
+
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+		await refreshFolders((action: any) => this.dispatch(action), '');
+
+		const tags = await Tag.allWithNotes();
+
+		this.dispatch({
+			type: 'TAG_UPDATE_ALL',
+			items: tags,
 		});
 
-		addTask('app/initialize PerFolderSortOrderService', () => {
-			PerFolderSortOrderService.initialize();
-		});
-
-		addTask('app/dispatch initial settings', () => {
-			// Since the settings need to be loaded before the store is
-			// created, it will never receive the SETTING_UPDATE_ALL even,
-			// which mean state.settings will not be initialised. So we
-			// manually call dispatchUpdateAll() to force an update.
-			Setting.dispatchUpdateAll();
-		});
-
-		addTask('app/update folders and tags', async () => {
-			await refreshFolders((action) => this.dispatch(action), '');
-
-			const tags = await Tag.allWithNotes();
-			this.dispatch({
-				type: 'TAG_UPDATE_ALL',
-				items: tags,
-			});
-		});
-
-		addTask('app/set up custom CSS', async () => {
-			await this.setupCustomCss();
-		});
+		await this.setupCustomCss();
 
 		// const masterKeys = await MasterKey.all();
 
@@ -531,242 +514,188 @@ class Application extends BaseApplication {
 		// 	items: masterKeys,
 		// });
 
-		addTask('app/send initial selection to redux', async () => {
-			const getNotesParent = async () => {
-				let notesParent = parseNotesParent(Setting.value('notesParent'), Setting.value('activeFolderId'));
-				if (notesParent.type === 'Tag' && !(await Tag.load(notesParent.selectedItemId))) {
-					notesParent = {
-						type: 'Folder',
-						selectedItemId: Setting.value('activeFolderId'),
-					};
-				}
-				return notesParent;
-			};
-
-			const notesParent = await getNotesParent();
-			if (notesParent.type === 'SmartFilter') {
-				this.store().dispatch({
-					type: 'SMART_FILTER_SELECT',
-					id: notesParent.selectedItemId,
-				});
-			} else if (notesParent.type === 'Tag') {
-				this.store().dispatch({
-					type: 'TAG_SELECT',
-					id: notesParent.selectedItemId,
-				});
-			} else {
-				this.store().dispatch({
-					type: 'FOLDER_SELECT',
-					id: notesParent.selectedItemId,
-				});
+		const getNotesParent = async () => {
+			let notesParent = parseNotesParent(Setting.value('notesParent'), Setting.value('activeFolderId'));
+			if (notesParent.type === 'Tag' && !(await Tag.load(notesParent.selectedItemId))) {
+				notesParent = {
+					type: 'Folder',
+					selectedItemId: Setting.value('activeFolderId'),
+				};
 			}
+			return notesParent;
+		};
 
+		const notesParent = await getNotesParent();
+
+		if (notesParent.type === 'SmartFilter') {
 			this.store().dispatch({
-				type: 'FOLDER_SET_COLLAPSED_ALL',
-				ids: Setting.value('collapsedFolderIds'),
+				type: 'SMART_FILTER_SELECT',
+				id: notesParent.selectedItemId,
 			});
-
+		} else if (notesParent.type === 'Tag') {
 			this.store().dispatch({
-				type: 'NOTE_DEVTOOLS_SET',
-				value: Setting.value('flagOpenDevTools'),
+				type: 'TAG_SELECT',
+				id: notesParent.selectedItemId,
 			});
+		} else {
+			this.store().dispatch({
+				type: 'FOLDER_SELECT',
+				id: notesParent.selectedItemId,
+			});
+		}
+
+		this.store().dispatch({
+			type: 'FOLDER_SET_COLLAPSED_ALL',
+			ids: Setting.value('collapsedFolderIds'),
 		});
 
-		addTask('app/initializeUserFetcher', async () => {
-			initializeUserFetcher();
-			shim.setInterval(() => { void userFetcher(); }, 1000 * 60 * 60);
+		this.store().dispatch({
+			type: 'NOTE_DEVTOOLS_SET',
+			value: Setting.value('flagOpenDevTools'),
 		});
 
-		addTask('app/updateTray', () => this.updateTray());
+		// Always disable on Mac for now - and disable too for the few apps that may have the flag enabled.
+		// At present, it only seems to work on Windows.
+		if (shim.isMac()) {
+			Setting.setValue('featureFlag.autoUpdaterServiceEnabled', false);
+		}
 
-		addTask('app/set main window state', () => {
-			if (Setting.value('startMinimized') && Setting.value('showTrayIcon')) {
-				bridge().mainWindow().hide();
-			} else {
-				bridge().mainWindow().show();
+		// Note: Auto-update is a misnomer in the code.
+		// The code below only checks, if a new version is available.
+		// We only allow Windows and macOS users to automatically check for updates
+		if (!Setting.value('featureFlag.autoUpdaterServiceEnabled')) {
+			if (shim.isWindows() || shim.isMac()) {
+				const runAutoUpdateCheck = () => {
+					if (Setting.value('autoUpdateEnabled')) {
+						void checkForUpdates(true, bridge().mainWindow(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
+					}
+				};
+
+				// Initial check on startup
+				shim.setTimeout(() => { runAutoUpdateCheck(); }, 5000);
+				// Then every x hours
+				shim.setInterval(() => { runAutoUpdateCheck(); }, 12 * 60 * 60 * 1000);
 			}
-		});
+		}
 
-		addTask('app/start maintenance tasks', () => {
-			// Always disable on Mac for now - and disable too for the few apps that may have the flag enabled.
-			// At present, it only seems to work on Windows.
-			if (shim.isMac()) {
-				Setting.setValue('featureFlag.autoUpdaterServiceEnabled', false);
-			}
+		initializeUserFetcher();
+		shim.setInterval(() => { void userFetcher(); }, 1000 * 60 * 60);
 
-			// Note: Auto-update is a misnomer in the code.
-			// The code below only checks, if a new version is available.
-			// We only allow Windows and macOS users to automatically check for updates
-			if (!Setting.value('featureFlag.autoUpdaterServiceEnabled')) {
-				if (shim.isWindows() || shim.isMac()) {
-					const runAutoUpdateCheck = () => {
-						if (Setting.value('autoUpdateEnabled')) {
-							void checkForUpdates(true, bridge().mainWindow(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
-						}
-					};
+		this.updateTray();
 
-					// Initial check on startup
-					shim.setTimeout(() => { runAutoUpdateCheck(); }, 5000);
-					// Then every x hours
-					shim.setInterval(() => { runAutoUpdateCheck(); }, 12 * 60 * 60 * 1000);
-				}
-			}
+		shim.setTimeout(() => {
+			void AlarmService.garbageCollect();
+		}, 1000 * 60 * 60);
 
-			shim.setTimeout(() => {
-				void AlarmService.garbageCollect();
-			}, 1000 * 60 * 60);
-			void ShareService.instance().maintenance();
+		if (Setting.value('startMinimized') && Setting.value('showTrayIcon')) {
+			bridge().mainWindow().hide();
+		} else {
+			bridge().mainWindow().show();
+		}
 
-			ResourceService.runInBackground();
+		void ShareService.instance().maintenance();
 
-			if (Setting.value('env') === 'dev') {
+		ResourceService.runInBackground();
+
+		if (Setting.value('env') === 'dev') {
+			void AlarmService.updateAllNotifications();
+		} else {
+			// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
+			void reg.scheduleSync(1000).then(() => {
+				// Wait for the first sync before updating the notifications, since synchronisation
+				// might change the notifications.
 				void AlarmService.updateAllNotifications();
-			} else {
-				// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
-				void reg.scheduleSync(1000).then(() => {
-					// Wait for the first sync before updating the notifications, since synchronisation
-					// might change the notifications.
-					void AlarmService.updateAllNotifications();
 
-					void DecryptionWorker.instance().scheduleStart();
-				});
-			}
-
-			RevisionService.instance().runInBackground();
-			this.startRotatingLogMaintenance(Setting.value('profileDir'));
-		});
-
-		addTask('app/set up ClipperServer', () => {
-			const clipperLogger = new Logger();
-			clipperLogger.addTarget(TargetType.File, { path: `${Setting.value('profileDir')}/log-clipper.txt` });
-			clipperLogger.addTarget(TargetType.Console);
-
-			ClipperServer.instance().initialize(actionApi);
-			ClipperServer.instance().setEnabled(!Setting.value('altInstanceId'));
-			ClipperServer.instance().setLogger(clipperLogger);
-			ClipperServer.instance().setDispatch(this.store().dispatch);
-
-			if (ClipperServer.instance().enabled() && Setting.value('clipperServer.autoStart')) {
-				void ClipperServer.instance().start();
-			}
-		});
-
-		addTask('app/set up external edit watchers', () => {
-			ExternalEditWatcher.instance().setLogger(reg.logger());
-			ExternalEditWatcher.instance().initialize(bridge, this.store().dispatch);
-
-			ResourceEditWatcher.instance().initialize(
-				reg.logger(),
-				// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
-				(action: any) => { this.store().dispatch(action); },
-				(path: string) => bridge().openItem(path),
-				() => this.store().getState().windowId,
-			);
-
-			// Forwards the local event to the global event manager, so that it can
-			// be picked up by the plugin manager.
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
-			ResourceEditWatcher.instance().on('resourceChange', (event: any) => {
-				eventManager.emit(EventName.ResourceChange, event);
+				void DecryptionWorker.instance().scheduleStart();
 			});
+		}
+
+		const clipperLogger = new Logger();
+		clipperLogger.addTarget(TargetType.File, { path: `${Setting.value('profileDir')}/log-clipper.txt` });
+		clipperLogger.addTarget(TargetType.Console);
+
+		ClipperServer.instance().initialize(actionApi);
+		ClipperServer.instance().setEnabled(!Setting.value('altInstanceId'));
+		ClipperServer.instance().setLogger(clipperLogger);
+		ClipperServer.instance().setDispatch(this.store().dispatch);
+
+		if (ClipperServer.instance().enabled() && Setting.value('clipperServer.autoStart')) {
+			void ClipperServer.instance().start();
+		}
+
+		ExternalEditWatcher.instance().setLogger(reg.logger());
+		ExternalEditWatcher.instance().initialize(bridge, this.store().dispatch);
+
+		ResourceEditWatcher.instance().initialize(
+			reg.logger(),
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+			(action: any) => { this.store().dispatch(action); },
+			(path: string) => bridge().openItem(path),
+			() => this.store().getState().windowId,
+		);
+
+		// Forwards the local event to the global event manager, so that it can
+		// be picked up by the plugin manager.
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+		ResourceEditWatcher.instance().on('resourceChange', (event: any) => {
+			eventManager.emit(EventName.ResourceChange, event);
 		});
 
+		RevisionService.instance().runInBackground();
+
 		// Make it available to the console window - useful to call revisionService.collectRevisions()
 		if (Setting.value('env') === 'dev') {
-			addTask('app/add debug variables', () => {
-				// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
-				(window as any).joplin = {
-					revisionService: RevisionService.instance(),
-					migrationService: MigrationService.instance(),
-					decryptionWorker: DecryptionWorker.instance(),
-					commandService: CommandService.instance(),
-					pluginService: PluginService.instance(),
-					bridge: bridge(),
-					debug: new DebugService(reg.db()),
-					resourceService: ResourceService.instance(),
-					searchEngine: SearchEngine.instance(),
-					shim,
-					Note,
-					Folder,
-					Resource,
-					Setting,
-					ocrService: () => this.ocrService_,
-				};
-			});
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+			(window as any).joplin = {
+				revisionService: RevisionService.instance(),
+				migrationService: MigrationService.instance(),
+				decryptionWorker: DecryptionWorker.instance(),
+				commandService: CommandService.instance(),
+				pluginService: PluginService.instance(),
+				bridge: bridge(),
+				debug: new DebugService(reg.db()),
+				resourceService: ResourceService.instance(),
+				searchEngine: SearchEngine.instance(),
+				ocrService: () => this.ocrService_,
+			};
 		}
 
-		addTask('app/listen for main process events', () => {
-			bridge().addEventListener('nativeThemeUpdated', this.bridge_nativeThemeUpdated);
-			bridge().setOnAllowedExtensionsChangeListener((newExtensions) => {
-				Setting.setValue('linking.extraAllowedExtensions', newExtensions);
-			});
-
-			ipcRenderer.on('window-focused', (_event, newWindowId) => {
-				const currentWindowId = this.store().getState().windowId;
-				if (newWindowId !== currentWindowId) {
-					this.dispatch({
-						type: 'WINDOW_FOCUS',
-						windowId: newWindowId,
-						lastWindowId: currentWindowId,
-					});
-				}
-			});
+		bridge().addEventListener('nativeThemeUpdated', this.bridge_nativeThemeUpdated);
+		bridge().setOnAllowedExtensionsChangeListener((newExtensions) => {
+			Setting.setValue('linking.extraAllowedExtensions', newExtensions);
 		});
 
-		addTask('app/initPluginService', () => this.initPluginService());
-
-		addTask('app/setupContextMenu', () => {
-			this.setupContextMenu();
+		ipcRenderer.on('window-focused', (_event, newWindowId) => {
+			const currentWindowId = this.store().getState().windowId;
+			if (newWindowId !== currentWindowId) {
+				this.dispatch({
+					type: 'WINDOW_FOCUS',
+					windowId: newWindowId,
+					lastWindowId: currentWindowId,
+				});
+			}
 		});
 
-		addTask('app/set up SpellCheckerService', async () => {
-			await SpellCheckerService.instance().initialize(new SpellCheckerServiceDriverNative());
+		await this.initPluginService();
+
+		this.setupContextMenu();
+
+		await SpellCheckerService.instance().initialize(new SpellCheckerServiceDriverNative());
+
+		this.startRotatingLogMaintenance(Setting.value('profileDir'));
+
+		await this.setupOcrService();
+
+		eventManager.on(EventName.OcrServiceResourcesProcessed, async () => {
+			await ResourceService.instance().indexNoteResources();
 		});
 
-		addTask('app/listen for resource events', () => {
-			eventManager.on(EventName.OcrServiceResourcesProcessed, async () => {
-				await ResourceService.instance().indexNoteResources();
-			});
-
-			eventManager.on(EventName.NoteResourceIndexed, async () => {
-				SearchEngine.instance().scheduleSyncTables();
-			});
+		eventManager.on(EventName.NoteResourceIndexed, async () => {
+			SearchEngine.instance().scheduleSyncTables();
 		});
 
-		addTask('app/setupOcrService', () => this.setupOcrService());
-
-		return tasks;
-	}
-
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
-	public async start(argv: string[], startOptions: StartOptions = null): Promise<any> {
-		const startupTask = perfLogger.taskStart('app/start');
-
-		// If running inside a package, the command line, instead of being "node.exe <path> <flags>" is "joplin.exe <flags>" so
-		// insert an extra argument so that they can be processed in a consistent way everywhere.
-		if (!bridge().electronIsDev()) argv.splice(1, 0, '.');
-
-
-		argv = await super.start(argv, startOptions);
-
-		await this.setupIntegrationTestUtils();
-
-		bridge().setLogFilePath(Logger.globalLogger.logFilePath());
-		await this.applySettingsSideEffects();
-
-		if (Setting.value('sync.upgradeState') === Setting.SYNC_UPGRADE_STATE_MUST_DO) {
-			reg.logger().info('app.start: doing upgradeSyncTarget action');
-			bridge().mainWindow().show();
-			startupTask.onEnd();
-
-			return { action: 'upgradeSyncTarget' };
-		}
-
-		const startupTasks = this.buildStartupTasks_();
-		for (const task of startupTasks) {
-			await perfLogger.track(task.label, async () => task.task());
-		}
-
+		// Used by tests
+		ipcRenderer.send('startup-finished');
 
 		// setTimeout(() => {
 		// 	void populateDatabase(reg.db(), {
@@ -820,10 +749,6 @@ class Application extends BaseApplication {
 
 		// await runIntegrationTests();
 
-		// Used by tests
-		ipcRenderer.send('startup-finished');
-
-		startupTask.onEnd();
 		return null;
 	}
 

packages/app-desktop/bridge.ts

@@ -8,8 +8,8 @@ import { urlDecode } from '@joplin/lib/string-utils';
 import * as Sentry from '@sentry/electron/main';
 import { homedir } from 'os';
 import { msleep } from '@joplin/utils/time';
-import { pathExists, pathExistsSync, writeFileSync, ensureDirSync } from 'fs-extra';
-import { extname, normalize, join } from 'path';
+import { pathExists, pathExistsSync, writeFileSync } from 'fs-extra';
+import { extname, normalize } from 'path';
 import isSafeToOpen from './utils/isSafeToOpen';
 import { closeSync, openSync, readSync, statSync } from 'fs';
 import { KB } from '@joplin/utils/bytes';
@@ -67,30 +67,6 @@ export class Bridge {
 		this.logFilePath_ = v;
 	}
 
-	private getCrashDumpDirectory(): string {
-		try {
-			const platformName = shim.platformName();
-			switch (platformName) {
-			case 'win32':
-				// Windows: Use %LOCALAPPDATA%\CrashDumps
-				return join(process.env.LOCALAPPDATA || join(homedir(), 'AppData', 'Local'), 'CrashDumps');
-			case 'darwin':
-				// macOS: Use ~/Library/Logs/DiagnosticReports
-				return join(homedir(), 'Library', 'Logs', 'DiagnosticReports');
-			case 'linux':
-				// Linux: Use XDG_STATE_HOME (for logs) or fallback to ~/.local/state
-				return join(process.env.XDG_STATE_HOME || join(homedir(), '.local', 'state'), 'joplin');
-			default:
-				// For unknown platforms, default to the home directory
-				return homedir();
-			}
-		} catch (error) {
-			// If we can't get the platform name, fallback to the home directory
-			return homedir();
-		}
-
-	}
-
 	private sentryInit() {
 		const getLogLines = () => {
 			try {
@@ -133,10 +109,7 @@ export class Bridge {
 						log: logAttachment ? logAttachment.data.trim().split('\n') : [],
 					};
 
-					const crashDumpDir = this.getCrashDumpDirectory();
-					ensureDirSync(crashDumpDir);
-					const crashDumpPath = join(crashDumpDir, `joplin_crash_dump_${date}.json`);
-					writeFileSync(crashDumpPath, JSON.stringify(errorEventWithLog, null, '\t'), 'utf-8');
+					writeFileSync(`${homedir()}/joplin_crash_dump_${date}.json`, JSON.stringify(errorEventWithLog, null, '\t'), 'utf-8');
 				} catch (error) {
 					// Ignore the error since we can't handle it here
 				}

packages/app-desktop/commands/convertNoteToMarkdown.test.ts

@@ -1,96 +0,0 @@
-import * as convertHtmlToMarkdown from './convertNoteToMarkdown';
-import { AppState, createAppDefaultState } from '../app.reducer';
-import Note from '@joplin/lib/models/Note';
-import { MarkupLanguage } from '@joplin/renderer';
-import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
-import Folder from '@joplin/lib/models/Folder';
-import { NoteEntity } from '@joplin/lib/services/database/types';
-
-describe('convertNoteToMarkdown', () => {
-	let state: AppState = undefined;
-
-	beforeEach(async () => {
-		state = createAppDefaultState({});
-		await setupDatabaseAndSynchronizer(1);
-		await switchClient(1);
-	});
-
-	it('should set the original note to be trashed', async () => {
-		const folder = await Folder.save({ title: 'test_folder' });
-		const htmlNote = await Note.save({ title: 'test', body: '<p>Hello</p>', parent_id: folder.id, markup_language: MarkupLanguage.Html });
-		state.selectedNoteIds = [htmlNote.id];
-
-		await convertHtmlToMarkdown.runtime().execute({ state, dispatch: () => {} });
-
-		const refreshedNote = await Note.load(htmlNote.id);
-
-		expect(htmlNote.deleted_time).toBe(0);
-		expect(refreshedNote.deleted_time).not.toBe(0);
-	});
-
-	it('should recreate a new note that is a clone of the original', async () => {
-		let noteConvertedToMarkdownId = '';
-		const dispatchFn = jest.fn()
-			.mockImplementationOnce(() => {})
-			.mockImplementationOnce(action => {
-				noteConvertedToMarkdownId = action.id;
-			});
-
-		const folder = await Folder.save({ title: 'test_folder' });
-		const htmlNoteProperties = {
-			title: 'test',
-			body: '<p>Hello</p>',
-			parent_id: folder.id,
-			markup_language: MarkupLanguage.Html,
-			author: 'test-author',
-			is_todo: 1,
-			todo_completed: 1,
-		};
-		const htmlNote = await Note.save(htmlNoteProperties);
-		state.selectedNoteIds = [htmlNote.id];
-
-		await convertHtmlToMarkdown.runtime().execute({ state, dispatch: dispatchFn });
-
-		expect(dispatchFn).toHaveBeenCalledTimes(2);
-		expect(noteConvertedToMarkdownId).not.toBe('');
-
-		const markdownNote = await Note.load(noteConvertedToMarkdownId);
-
-		const fields: (keyof NoteEntity)[] = ['parent_id', 'title', 'author', 'is_todo', 'todo_completed'];
-		for (const field of fields) {
-			expect(htmlNote[field]).toEqual(markdownNote[field]);
-		}
-	});
-
-	it('should generate action to trigger notification', async () => {
-		let originalHtmlNoteId = '';
-		let actionType = '';
-		const dispatchFn = jest.fn()
-			.mockImplementationOnce(action => {
-				originalHtmlNoteId = action.value;
-				actionType = action.type;
-			})
-			.mockImplementationOnce(() => {});
-
-		const folder = await Folder.save({ title: 'test_folder' });
-		const htmlNoteProperties = {
-			title: 'test',
-			body: '<p>Hello</p>',
-			parent_id: folder.id,
-			markup_language: MarkupLanguage.Html,
-			author: 'test-author',
-			is_todo: 1,
-			todo_completed: 1,
-		};
-		const htmlNote = await Note.save(htmlNoteProperties);
-		state.selectedNoteIds = [htmlNote.id];
-
-		await convertHtmlToMarkdown.runtime().execute({ state, dispatch: dispatchFn });
-
-		expect(dispatchFn).toHaveBeenCalledTimes(2);
-
-		expect(originalHtmlNoteId).toBe(htmlNote.id);
-		expect(actionType).toBe('NOTE_HTML_TO_MARKDOWN_DONE');
-	});
-
-});

packages/app-desktop/commands/convertNoteToMarkdown.ts

@@ -1,52 +0,0 @@
-import { _ } from '@joplin/lib/locale';
-import Note from '@joplin/lib/models/Note';
-import { stateUtils } from '@joplin/lib/reducer';
-import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
-import { MarkupLanguage } from '@joplin/renderer';
-import { runtime as convertHtmlToMarkdown } from '@joplin/lib/commands/convertHtmlToMarkdown';
-import bridge from '../services/bridge';
-
-export const declaration: CommandDeclaration = {
-	name: 'convertNoteToMarkdown',
-	label: () => _('Convert note to Markdown'),
-};
-
-export const runtime = (): CommandRuntime => {
-	return {
-		execute: async (context: CommandContext, noteId: string = null) => {
-			noteId = noteId || stateUtils.selectedNoteId(context.state);
-
-			const note = await Note.load(noteId);
-
-			if (!note) return;
-
-			try {
-				const markdownBody = await convertHtmlToMarkdown().execute(context, note.body);
-
-				const newNote = await Note.duplicate(note.id);
-
-				newNote.body = markdownBody;
-				newNote.markup_language = MarkupLanguage.Markdown;
-
-				await Note.save(newNote);
-
-				await Note.delete(note.id, { toTrash: true });
-
-				context.dispatch({
-					type: 'NOTE_HTML_TO_MARKDOWN_DONE',
-					value: note.id,
-				});
-
-				context.dispatch({
-					type: 'NOTE_SELECT',
-					id: newNote.id,
-				});
-			} catch (error) {
-				bridge().showErrorMessageBox(_('Could not convert note to Markdown: %s', error.message));
-			}
-
-
-		},
-		enabledCondition: 'oneNoteSelected && noteIsHtml && !noteIsReadOnly',
-	};
-};

packages/app-desktop/commands/index.ts

@@ -1,5 +1,4 @@
 // AUTO-GENERATED using `gulp buildScriptIndexes`
-import * as convertNoteToMarkdown from './convertNoteToMarkdown';
 import * as copyDevCommand from './copyDevCommand';
 import * as copyToClipboard from './copyToClipboard';
 import * as editProfileConfig from './editProfileConfig';
@@ -25,7 +24,6 @@ import * as toggleSafeMode from './toggleSafeMode';
 import * as toggleTabMovesFocus from './toggleTabMovesFocus';
 
 const index: any[] = [
-	convertNoteToMarkdown,
 	copyDevCommand,
 	copyToClipboard,
 	editProfileConfig,

packages/app-desktop/gui/Button/Button.tsx

@@ -225,7 +225,7 @@ const Button = React.forwardRef(({
 			animation={iconAnimation}
 			mr={iconOnly ? '0' : '6px'}
 			color={color}
-			className={`${iconName} icon`}
+			className={iconName}
 			role='img'
 		/>;
 	}

packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.tsx

@@ -150,9 +150,8 @@ export default function(props: Props) {
 
 	const onNameClick = useCallback(() => {
 		const manifest = item.manifest;
-		const url = manifest.homepage_url ? manifest.homepage_url : manifest.repository_url;
-		if (!url) return;
-		void bridge().openExternal(url);
+		if (!manifest.homepage_url) return;
+		void bridge().openExternal(manifest.homepage_url);
 	}, [item]);
 
 	const onRecommendedClick = useCallback(() => {

packages/app-desktop/gui/ConversionNotification/ConversionNotification.tsx

@@ -1,28 +0,0 @@
-import * as React from 'react';
-import { useContext, useEffect } from 'react';
-import { _ } from '@joplin/lib/locale';
-import { Dispatch } from 'redux';
-import { PopupNotificationContext } from '../PopupNotification/PopupNotificationProvider';
-import { NotificationType } from '../PopupNotification/types';
-
-interface Props {
-	noteId: string;
-	dispatch: Dispatch;
-}
-
-export default (props: Props) => {
-	const popupManager = useContext(PopupNotificationContext);
-
-	useEffect(() => {
-		if (!props.noteId || props.noteId === '') return;
-
-		props.dispatch({ type: 'NOTE_HTML_TO_MARKDOWN_DONE', value: '' });
-
-		const notification = popupManager.createPopup(() => (
-			<div>{_('The note has been converted to Markdown and the original note has been moved to the trash')}</div>
-		), { type: NotificationType.Success });
-		notification.scheduleDismiss();
-	}, [props.dispatch, popupManager, props.noteId]);
-
-	return <div style={{ display: 'none' }}/>;
-};

packages/app-desktop/gui/EmojiBox.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useRef, useState, useCallback } from 'react';
+import { useMemo, useRef, useState } from 'react';
 
 interface Props {
 	width: number;
@@ -9,62 +9,40 @@ interface Props {
 const fontSizeCache_: Record<string, number> = {};
 
 export default (props: Props) => {
-	const containerRef = useRef<HTMLDivElement>(null);
+	const containerRef = useRef(null);
 	const [containerReady, setContainerReady] = useState(false);
 
-	const refCallback = useCallback((el: HTMLDivElement | null) => {
-		if (el && !containerRef.current) {
-			containerRef.current = el;
-			requestAnimationFrame(() => {
-				setContainerReady(true);
-			});
-		}
-	}, []);
-
 	const fontSize = useMemo(() => {
-		if (!containerReady || !containerRef.current) {
-			return Math.min(props.height * 0.7, 14);
-		}
+		if (!containerReady) return props.height;
 
 		const cacheKey = [props.width, props.height, props.emoji].join('-');
 		if (fontSizeCache_[cacheKey]) {
 			return fontSizeCache_[cacheKey];
 		}
 
+		// Set the emoji font size so that it fits within the specified width
+		// and height. In fact, currently it only looks at the height.
+
 		let spanFontSize = props.height;
 
 		const span = document.createElement('span');
 		span.innerText = props.emoji;
 		span.style.fontSize = `${spanFontSize}px`;
-		span.style.visibility = 'hidden';
-		span.style.position = 'absolute';
-		span.style.whiteSpace = 'nowrap';
 		containerRef.current.appendChild(span);
 
 		let rect = span.getBoundingClientRect();
-		while ((rect.height > props.height || rect.width > props.width) && spanFontSize > 1) {
-			spanFontSize -= 0.5;
+
+		while (rect.height > props.height) {
+			spanFontSize -= .5;
 			span.style.fontSize = `${spanFontSize}px`;
 			rect = span.getBoundingClientRect();
 		}
 
 		span.remove();
+
 		fontSizeCache_[cacheKey] = spanFontSize;
 		return spanFontSize;
-	}, [props.width, props.height, props.emoji, containerReady]);
+	}, [props.width, props.height, props.emoji, containerReady, containerRef]);
 
-	return <div
-		ref={refCallback}
-		style={{
-			width: props.width,
-			height: props.height,
-			display: 'flex',
-			alignItems: 'center',
-			justifyContent: 'center',
-			overflow: 'hidden',
-			fontSize,
-		}}
-	>
-		{props.emoji}
-	</div>;
+	return <div className="emoji-box" ref={el => { containerRef.current = el; setContainerReady(true); }} style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', width: props.width, height: props.height, fontSize }}>{props.emoji}</div>;
 };

packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx

@@ -15,7 +15,7 @@ import { connect } from 'react-redux';
 import { AppState } from '../../app.reducer';
 import Setting from '@joplin/lib/models/Setting';
 import CommandService from '@joplin/lib/services/CommandService';
-import { PublicPrivateKeyPair } from '@joplin/lib/services/e2ee/ppk/ppk';
+import { PublicPrivateKeyPair } from '@joplin/lib/services/e2ee/ppk';
 import ToggleAdvancedSettingsButton from '../ConfigScreen/controls/ToggleAdvancedSettingsButton';
 import MacOSMissingPasswordHelpLink from '../ConfigScreen/controls/MissingPasswordHelpLink';
 

packages/app-desktop/gui/MainScreen.tsx

@@ -38,14 +38,12 @@ import restart from '../services/restart';
 import { connect } from 'react-redux';
 import { NoteListColumns } from '@joplin/lib/services/plugins/api/noteListType';
 import validateColumns from './NoteListHeader/utils/validateColumns';
-import ConversionNotification from './ConversionNotification/ConversionNotification';
 import TrashNotification from './TrashNotification/TrashNotification';
 import UpdateNotification from './UpdateNotification/UpdateNotification';
 import NoteEditor from './NoteEditor/NoteEditor';
 import PluginNotification from './PluginNotification/PluginNotification';
 import { Toast } from '@joplin/lib/services/plugins/api/types';
 import PluginService from '@joplin/lib/services/plugins/PluginService';
-import { Dispatch } from 'redux';
 
 const ipcRenderer = require('electron').ipcRenderer;
 
@@ -86,7 +84,6 @@ interface Props {
 	showInvalidJoplinCloudCredential: boolean;
 	toast: Toast;
 	shouldSwitchToAppleSiliconVersion: boolean;
-	noteHtmlToMarkdownDone: string;
 }
 
 interface ShareFolderDialogOptions {
@@ -800,10 +797,6 @@ class MainScreenComponent extends React.Component<Props, State> {
 
 		return (
 			<div style={style}>
-				<ConversionNotification
-					noteId={this.props.noteHtmlToMarkdownDone}
-					dispatch={this.props.dispatch as Dispatch}
-				/>
 				<TrashNotification
 					lastDeletion={this.props.lastDeletion}
 					lastDeletionNotificationTime={this.props.lastDeletionNotificationTime}
@@ -860,7 +853,6 @@ const mapStateToProps = (state: AppState) => {
 		showInvalidJoplinCloudCredential: state.settings['sync.target'] === 10 && state.mustAuthenticate,
 		toast: state.toast,
 		shouldSwitchToAppleSiliconVersion: shim.isAppleSilicon() && process.arch !== 'arm64',
-		noteHtmlToMarkdownDone: state.noteHtmlToMarkdownDone,
 	};
 };
 

packages/app-desktop/gui/MenuBar.tsx

@@ -803,7 +803,6 @@ function useMenu(props: Props) {
 						menuItemDic.toggleNoteList,
 						menuItemDic.toggleVisiblePanes,
 						menuItemDic.toggleEditorPlugin,
-						menuItemDic.toggleEditors,
 						{
 							label: _('Layout button sequence'),
 							submenu: layoutButtonSequenceMenuItems,
@@ -907,7 +906,6 @@ function useMenu(props: Props) {
 						separator(),
 						menuItemDic.setTags,
 						menuItemDic.showShareNoteDialog,
-						menuItemDic.convertNoteToMarkdown,
 						separator(),
 						menuItemDic.showNoteProperties,
 						menuItemDic.showNoteContentProperties,

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v5/Editor.tsx

@@ -67,11 +67,6 @@ import 'codemirror/mode/diff/diff';
 import 'codemirror/mode/erlang/erlang';
 import 'codemirror/mode/sql/sql';
 
-interface ExtendedWindow {
-	CodeMirror?: unknown;
-}
-declare const window: ExtendedWindow;
-
 
 export interface EditorProps {
 	value: string;
@@ -105,14 +100,6 @@ function Editor(props: EditorProps, ref: any) {
 	const editorParent = useRef(null);
 	const lastEditTime = useRef(NaN);
 
-	useEffect(() => {
-		window.CodeMirror = CodeMirror;
-
-		return () => {
-			window.CodeMirror = undefined;
-		};
-	}, []);
-
 	// Codemirror plugins add new commands to codemirror (or change it's behavior)
 	// This command adds the smartListIndent function which will be bound to tab
 	useListIdent(CodeMirror);

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v5/utils/useExternalPlugins.ts

@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
 import { PluginStates } from '@joplin/lib/services/plugins/reducer';
-import bridge from '../../../../../../services/bridge';
 import { contentScriptsToCodeMirrorPlugin } from '@joplin/lib/services/plugins/utils/loadContentScripts';
 import { extname } from 'path';
 import shim from '@joplin/lib/shim';
@@ -8,18 +7,6 @@ import uuid from '@joplin/lib/uuid';
 
 import { reg } from '@joplin/lib/registry';
 
-const addPluginDependency = (path: string) => {
-	const id = `content-script-${encodeURIComponent(path)}`;
-	if (document.getElementById(id)) {
-		return;
-	}
-
-	const element = document.createElement('script');
-	element.setAttribute('id', id);
-	element.setAttribute('src', path);
-	document.head.appendChild(element);
-};
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 export default function useExternalPlugins(CodeMirror: any, plugins: PluginStates) {
 	const [options, setOptions] = useState({});
@@ -36,14 +23,7 @@ export default function useExternalPlugins(CodeMirror: any, plugins: PluginState
 				if (mod.codeMirrorResources) {
 					for (const asset of mod.codeMirrorResources) {
 						try {
-							let assetPath = shim.fsDriver().resolveRelativePathWithinDir(`${bridge().vendorDir()}/lib/codemirror/`, asset);
-
-							// Compatibility with old versions of Joplin, where the file extension was automatically added by require().
-							if (extname(assetPath) === '') {
-								assetPath += '.js';
-							}
-
-							addPluginDependency(assetPath);
+							require(`codemirror/${asset}`);
 						} catch (error) {
 							error.message = `${asset} is not a valid CodeMirror asset, keymap or mode. You can find a list of valid assets here: https://codemirror.net/doc/manual.html#addons`;
 							throw error;

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/CodeMirror.tsx

@@ -30,7 +30,6 @@ import useEditorSearchHandler from '../utils/useEditorSearchHandler';
 import CommandService from '@joplin/lib/services/CommandService';
 import useRefocusOnVisiblePaneChange from './utils/useRefocusOnVisiblePaneChange';
 import { WindowIdContext } from '../../../../NewWindowOrIFrame';
-import eventManager, { EventName, ResourceChangeEvent } from '@joplin/lib/eventManager';
 
 const logger = Logger.create('CodeMirror6');
 const logDebug = (message: string) => logger.debug(message);
@@ -273,17 +272,6 @@ const CodeMirror = (props: NoteBodyEditorProps, ref: ForwardedRef<NoteBodyEditor
 		props.noteId, props.useCustomPdfViewer,
 	]);
 
-	useEffect(() => {
-		const listener = (event: ResourceChangeEvent) => {
-			editorRef.current?.onResourceChanged(event.id);
-		};
-
-		eventManager.on(EventName.ResourceChange, listener);
-		return () => {
-			eventManager.off(EventName.ResourceChange, listener);
-		};
-	}, [props.resourceInfos]);
-
 	useEffect(() => {
 		if (!webviewReady) return;
 
@@ -352,8 +340,6 @@ const CodeMirror = (props: NoteBodyEditorProps, ref: ForwardedRef<NoteBodyEditor
 				props.setShowLocalSearch(event.searchState.dialogVisible);
 			}
 			lastSearchState.current = event.searchState;
-		} else if (event.kind === EditorEventType.FollowLink) {
-			void CommandService.instance().execute('openItem', event.link);
 		}
 	}, [editor_scroll, codeMirror_change, props.setLocalSearch, props.setShowLocalSearch]);
 
@@ -376,9 +362,6 @@ const CodeMirror = (props: NoteBodyEditorProps, ref: ForwardedRef<NoteBodyEditor
 			readOnly: props.disabled,
 			markdownMarkEnabled: Setting.value('markdown.plugin.mark'),
 			katexEnabled: Setting.value('markdown.plugin.katex'),
-			inlineRenderingEnabled: Setting.value('editor.inlineRendering'),
-			imageRenderingEnabled: Setting.value('editor.imageRendering'),
-			highlightActiveLine: Setting.value('editor.highlightActiveLine'),
 			themeData: {
 				...styles.globalTheme,
 				marginLeft: 0,
@@ -427,7 +410,6 @@ const CodeMirror = (props: NoteBodyEditorProps, ref: ForwardedRef<NoteBodyEditor
 					onSelectPastBeginning={onSelectPastBeginning}
 					externalSearch={props.searchMarkers}
 					useLocalSearch={props.useLocalSearch}
-					onLocalize={_}
 				/>
 			</div>
 		);

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/Editor.tsx

@@ -15,10 +15,6 @@ import useEditorSearch from '../utils/useEditorSearchExtension';
 import CommandService from '@joplin/lib/services/CommandService';
 import { SearchMarkers } from '../../../utils/useSearchMarkers';
 import localisation from './utils/localisation';
-import Resource from '@joplin/lib/models/Resource';
-import { parseResourceUrl } from '@joplin/lib/urlUtils';
-import { resourceFilename } from '@joplin/lib/models/utils/resourceUtils';
-import getResourceBaseUrl from '../../../utils/getResourceBaseUrl';
 
 interface Props extends EditorProps {
 	style: React.CSSProperties;
@@ -108,16 +104,7 @@ const Editor = (props: Props, ref: ForwardedRef<CodeMirrorControl>) => {
 			onLogMessage: message => onLogMessageRef.current(message),
 		};
 
-		const editor = createEditor(editorContainerRef.current, {
-			...editorProps,
-			resolveImageSrc: async (src, reloadCounter) => {
-				const url = parseResourceUrl(src);
-				if (!url.itemId) return null;
-				const item = await Resource.load(url.itemId);
-				if (!item) return null;
-				return `${getResourceBaseUrl()}/${resourceFilename(item)}${reloadCounter ? `?r=${reloadCounter}` : ''}`;
-			},
-		});
+		const editor = createEditor(editorContainerRef.current, editorProps);
 		editor.addStyles({
 			'.cm-scroller': { overflow: 'auto' },
 			'&.CodeMirror': {

packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx

@@ -1387,18 +1387,16 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: Ref<NoteBodyEditorRef>) => {
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 		async function onCopy(event: any) {
 			const copiedContent = editor.selection.getContent();
-			if (!copiedContent) return;
 			copyHtmlToClipboard(copiedContent);
 			event.preventDefault();
 		}
 
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 		async function onCut(event: any) {
-			event.preventDefault();
 			const selectedContent = editor.selection.getContent();
-			if (!selectedContent) return;
 			copyHtmlToClipboard(selectedContent);
 			editor.insertContent('');
+			event.preventDefault();
 			onChangeHandler();
 		}
 
@@ -1446,7 +1444,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: Ref<NoteBodyEditorRef>) => {
 		// `compositionend` means that a user has finished entering a Chinese
 		// (or other languages that require IME) character.
 		editor.on(TinyMceEditorEvents.CompositionEnd, onChangeHandler);
-		editor.on(TinyMceEditorEvents.Cut, onCut, true);
+		editor.on(TinyMceEditorEvents.Cut, onCut);
 		editor.on(TinyMceEditorEvents.JoplinChange, onChangeHandler);
 		editor.on(TinyMceEditorEvents.Undo, onChangeHandler);
 		editor.on(TinyMceEditorEvents.Redo, onChangeHandler);

packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/shouldPasteResources.ts

@@ -18,12 +18,11 @@ const logger = Logger.create('shouldPasteResources');
 // instead the clipboard resources, which will contain the actual image.
 //
 // We have a lot of log statements so that if someone reports a bug we can ask
-// them to check the console and give us the messages they have. However, to avoid
-// including sensitive information in the logs, users will need to check the console,
-// not the log file.
+// them to check the console and give us the messages they have.
 export default (pastedText: string, pastedHtml: string, resourceMds: string[]) => {
-	const debugInformation = JSON.stringify({ pastedText, pastedHtml, resourceMds }, undefined, '\t');
-	logger.debug('Input data:', debugInformation);
+	logger.info('Pasted text:', pastedText);
+	logger.info('Pasted HTML:', pastedHtml);
+	logger.info('Resources:', resourceMds);
 
 	if (pastedText) {
 		logger.info('Not pasting resources only because the clipboard contains plain text');

packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useLinkTooltips.ts

@@ -5,7 +5,6 @@ import shim from '@joplin/lib/shim';
 
 const useLinkTooltips = (editor: Editor|null) => {
 	const resetModifiedTitles = useCallback(() => {
-		if (!editor) return;
 		for (const element of editor.getDoc().querySelectorAll('a[data-joplin-original-title]')) {
 			element.setAttribute('title', element.getAttribute('data-joplin-original-title') ?? '');
 			element.removeAttribute('data-joplin-original-title');

packages/app-desktop/gui/NoteEditor/NoteEditor.tsx

@@ -56,7 +56,6 @@ import useResourceUnwatcher from './utils/useResourceUnwatcher';
 import StatusBar from './StatusBar';
 import useVisiblePluginEditorViewIds from '@joplin/lib/hooks/plugins/useVisiblePluginEditorViewIds';
 import useConnectToEditorPlugin from './utils/useConnectToEditorPlugin';
-import getResourceBaseUrl from './utils/getResourceBaseUrl';
 
 const debounce = require('debounce');
 
@@ -170,7 +169,7 @@ function NoteEditorContent(props: NoteEditorProps) {
 		const theme = themeStyle(options.themeId ? options.themeId : props.themeId);
 
 		const markupToHtml = markupLanguageUtils.newMarkupToHtml(props.plugins, {
-			resourceBaseUrl: getResourceBaseUrl(),
+			resourceBaseUrl: `joplin-content://note-viewer/${Setting.value('resourceDir')}/`,
 			customCss: props.customCss,
 		});
 
@@ -467,7 +466,6 @@ function NoteEditorContent(props: NoteEditorProps) {
 		// It is currently used to remember pdf scroll position for each attachments of each note uniquely.
 		noteId: props.noteId,
 		watchedNoteFiles: props.watchedNoteFiles,
-		enableHtmlToMarkdownBanner: props.enableHtmlToMarkdownBanner,
 	};
 
 	let editor = null;
@@ -490,17 +488,6 @@ function NoteEditorContent(props: NoteEditorProps) {
 		setShowRevisions(false);
 	}, []);
 
-	const onBannerConvertItToMarkdown = useCallback(async (event: React.MouseEvent<HTMLAnchorElement>) => {
-		event.preventDefault();
-		if (!props.selectedNoteIds || props.selectedNoteIds.length === 0) return;
-		await CommandService.instance().execute('convertNoteToMarkdown', props.selectedNoteIds[0]);
-	}, [props.selectedNoteIds]);
-
-	const onHideBannerConvertItToMarkdown = async (event: React.MouseEvent<HTMLAnchorElement>) => {
-		event.preventDefault();
-		Setting.setValue('editor.enableHtmlToMarkdownBanner', false);
-	};
-
 	const onBannerResourceClick = useCallback(async (event: React.MouseEvent<HTMLAnchorElement>) => {
 		event.preventDefault();
 		const resourceId = event.currentTarget.getAttribute('data-resource-id');
@@ -645,30 +632,9 @@ function NoteEditorContent(props: NoteEditorProps) {
 
 	const theme = themeStyle(props.themeId);
 
-	function renderConvertHtmlToMarkdown(): React.ReactNode {
-		if (!props.enableHtmlToMarkdownBanner) return null;
-
-		const note = props.notes.find(n => n.id === props.selectedNoteIds[0]);
-		if (!note) return null;
-		if (note.markup_language !== MarkupLanguage.Html) return null;
-
-		return (
-			<div style={styles.resourceWatchBanner}>
-				<p style={styles.resourceWatchBannerLine}>
-					{_('This note is in HTML format. Convert it to Markdown to edit it more easily.')}
-					&nbsp;
-					<a href="#" style={styles.resourceWatchBannerAction} onClick={onBannerConvertItToMarkdown}>{`${_('Convert it')}`}</a>
-					{' / '}
-					<a href="#" style={styles.resourceWatchBannerAction} onClick={onHideBannerConvertItToMarkdown}>{_('Don\'t show this message again')}</a>
-				</p>
-			</div>
-		);
-	}
-
 	return (
 		<div style={styles.root} onDragOver={onDragOver} onDrop={onDrop} ref={containerRef}>
 			<div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
-				{renderConvertHtmlToMarkdown()}
 				{renderResourceWatchingNotification()}
 				{renderResourceInSearchResultsNotification()}
 				<NoteTitleBar
@@ -756,7 +722,6 @@ const mapStateToProps = (state: AppState, ownProps: ConnectProps) => {
 		syncUserId: state.settings['sync.userId'],
 		shareCacheSetting: state.settings['sync.shareCache'],
 		searchResults: state.searchResults,
-		enableHtmlToMarkdownBanner: state.settings['editor.enableHtmlToMarkdownBanner'],
 	};
 };
 

packages/app-desktop/gui/NoteEditor/WarningBanner/WarningBanner.tsx

@@ -4,8 +4,7 @@ import { AppState } from '../../../app.reducer';
 import Setting from '@joplin/lib/models/Setting';
 import BannerContent from './BannerContent';
 import { _ } from '@joplin/lib/locale';
-import onRichTextReadMoreLinkClick from '@joplin/lib/components/shared/NoteEditor/WarningBanner/onRichTextReadMoreLinkClick';
-import onRichTextDismissLinkClick from '@joplin/lib/components/shared/NoteEditor/WarningBanner/onRichTextDismissLinkClick';
+import bridge from '../../../services/bridge';
 import { useMemo } from 'react';
 import { PluginStates } from '@joplin/lib/services/plugins/reducer';
 import PluginService from '@joplin/lib/services/plugins/PluginService';
@@ -17,6 +16,14 @@ interface Props {
 	plugins: PluginStates;
 }
 
+const onRichTextDismissLinkClick = () => {
+	Setting.setValue('richTextBannerDismissed', true);
+};
+
+const onRichTextReadMoreLinkClick = () => {
+	void bridge().openExternal('https://joplinapp.org/help/apps/rich_text_editor');
+};
+
 const onSwitchToLegacyEditor = () => {
 	Setting.setValue('editor.legacyMarkdown', true);
 };

packages/app-desktop/gui/NoteEditor/styles/index.ts

@@ -69,10 +69,6 @@ export default function styles(props: NoteEditorProps) {
 				marginTop: 0,
 				marginBottom: 10,
 			},
-			resourceWatchBannerAction: {
-				textDecoration: 'underline',
-				color: theme.colorWarnUrl,
-			},
 		};
 	});
 }

packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts

@@ -8,15 +8,14 @@ const MenuItem = bridge().MenuItem;
 import Resource, { resourceOcrStatusToString } from '@joplin/lib/models/Resource';
 import BaseItem from '@joplin/lib/models/BaseItem';
 import BaseModel, { ModelType } from '@joplin/lib/BaseModel';
-import { NoteEntity, ResourceEntity, ResourceOcrDriverId, ResourceOcrStatus } from '@joplin/lib/services/database/types';
+import { NoteEntity, ResourceEntity, ResourceOcrStatus } from '@joplin/lib/services/database/types';
 import { TinyMceEditorEvents } from '../NoteBody/TinyMCE/utils/types';
 import { itemIsReadOnlySync, ItemSlice } from '@joplin/lib/models/utils/readOnly';
 import Setting from '@joplin/lib/models/Setting';
 import ItemChange from '@joplin/lib/models/ItemChange';
-import shim, { MessageBoxType } from '@joplin/lib/shim';
+import shim from '@joplin/lib/shim';
 import { openFileWithExternalEditor } from '@joplin/lib/services/ExternalEditWatcher/utils';
 import CommandService from '@joplin/lib/services/CommandService';
-import SyncTargetRegistry from '@joplin/lib/SyncTargetRegistry';
 const fs = require('fs-extra');
 const { writeFile } = require('fs-extra');
 const { clipboard } = require('electron');
@@ -138,40 +137,6 @@ export function menuItems(dispatch: Function): ContextMenuItems {
 			},
 			isActive: (itemType: ContextMenuItemType, options: ContextMenuOptions) => !!options.textToCopy && itemType === ContextMenuItemType.Image && options.mime?.startsWith('image/svg'),
 		},
-		recognizeHandwrittenImage: {
-			label: _('Recognize handwritten image'),
-			onAction: async (options: ContextMenuOptions) => {
-				const syncTargetId = Setting.value('sync.target');
-				if (!SyncTargetRegistry.isJoplinServerOrCloud(syncTargetId)) {
-					await shim.showMessageBox(_('This feature is only available on Joplin Cloud and Joplin Server.'), { type: MessageBoxType.Error });
-					return;
-				}
-
-				if (!Setting.value('ocr.handwrittenTextDriverEnabled')) {
-					await shim.showMessageBox(_('This feature is disabled by default, you need to manually enable it by turning on the option to \'Enable handwritten transcription\'.'), { type: MessageBoxType.Error });
-					return;
-				}
-
-				const { resource } = await resourceInfo(options);
-
-				if (!['image/png', 'image/jpg', 'image/jpeg', 'image/bmp'].includes(resource.mime)) {
-					await shim.showMessageBox(_('This image type is not supported by the recognition system.'), { type: MessageBoxType.Error });
-					return;
-				}
-
-				await Resource.save({
-					id: resource.id,
-					ocr_status: ResourceOcrStatus.Todo,
-					ocr_driver_id: ResourceOcrDriverId.HandwrittenText,
-					ocr_details: '',
-					ocr_error: '',
-					ocr_text: '',
-				});
-			},
-			isActive: (itemType: ContextMenuItemType, options: ContextMenuOptions) => {
-				return itemType === ContextMenuItemType.Resource || (itemType === ContextMenuItemType.Image && options.resourceId);
-			},
-		},
 		revealInFolder: {
 			label: _('Reveal file in folder'),
 			onAction: async (options: ContextMenuOptions) => {

packages/app-desktop/gui/NoteEditor/utils/getResourceBaseUrl.ts

@@ -1,4 +0,0 @@
-import Setting from '@joplin/lib/models/Setting';
-
-const getResourceBaseUrl = () => `joplin-content://note-viewer/${Setting.value('resourceDir')}/`;
-export default getResourceBaseUrl;

packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts

@@ -15,7 +15,6 @@ const joplinRendererUtils = require('@joplin/renderer').utils;
 const { clipboard } = require('electron');
 import * as mimeUtils from '@joplin/lib/mime-utils';
 import bridge from '../../../services/bridge';
-import { getCollator, getCollatorLocale } from '@joplin/lib/models/utils/getCollator';
 const md5 = require('md5');
 const path = require('path');
 
@@ -44,30 +43,22 @@ export async function commandAttachFileToBody(body: string, filePaths: string[]
 		if (!filePaths || !filePaths.length) return null;
 	}
 
-	const collatorLocale = getCollatorLocale();
-	const collator = getCollator(collatorLocale);
-	filePaths = filePaths.sort((a, b) => {
-		return collator.compare(a, b);
-	});
-
-	let pos = options.position ?? 0;
-
 	for (let i = 0; i < filePaths.length; i++) {
 		const filePath = filePaths[i];
-		const beforeLen = body.length;
 		try {
 			logger.info(`Attaching ${filePath}`);
-			const newBody = await shim.attachFileToNoteBody(body, filePath, pos, {
+			const newBody = await shim.attachFileToNoteBody(body, filePath, options.position, {
 				createFileURL: options.createFileURL,
 				resizeLargeImages: Setting.value('imageResizing'),
 				markupLanguage: options.markupLanguage,
-				resourcePrefix: i > 0 ? ' ' : '',
+				resourceSuffix: i > 0 ? ' ' : '',
 			});
+
 			if (!newBody) {
 				logger.info('File attachment was cancelled');
 				return null;
 			}
-			pos += newBody.length - beforeLen;
+
 			body = newBody;
 			logger.info('File was attached.');
 		} catch (error) {
@@ -75,6 +66,7 @@ export async function commandAttachFileToBody(body: string, filePaths: string[]
 			bridge().showErrorMessageBox(error.message);
 		}
 	}
+
 	return body;
 }
 

packages/app-desktop/gui/NoteEditor/utils/types.ts

@@ -13,7 +13,6 @@ import { MarkupToHtmlOptions } from '../../hooks/useMarkupToHtml';
 import { ScrollbarSize } from '@joplin/lib/models/settings/builtInMetadata';
 import { RefObject, SetStateAction } from 'react';
 import * as React from 'react';
-import { ResourceEntity, ResourceLocalStateEntity } from '@joplin/lib/services/database/types';
 
 export interface AllAssetsOptions {
 	contentMaxWidthTarget?: string;
@@ -68,7 +67,6 @@ export interface NoteEditorProps {
 	onTitleChange?: (title: string)=> void;
 	bodyEditor: string;
 	startupPluginsLoaded: boolean;
-	enableHtmlToMarkdownBanner: boolean;
 }
 
 export interface NoteBodyEditorRef {
@@ -140,7 +138,6 @@ export interface NoteBodyEditorProps {
 	noteId: string;
 	useCustomPdfViewer: boolean;
 	watchedNoteFiles: string[];
-	enableHtmlToMarkdownBanner: boolean;
 }
 
 export interface NoteBodyEditorPropsAndRef extends NoteBodyEditorProps {
@@ -215,8 +212,10 @@ export function defaultFormNote(): FormNote {
 }
 
 export interface ResourceInfo {
-	localState: ResourceLocalStateEntity;
-	item: ResourceEntity;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+	localState: any;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+	item: any;
 }
 
 export interface ResourceInfos {

packages/app-desktop/gui/NoteEditor/utils/useScheduleSaveCallbacks.ts

@@ -49,7 +49,7 @@ const useScheduleSaveCallbacks = (props: Props) => {
 	}, [props.dispatch, props.editorId, props.setFormNote]);
 
 	const saveNoteIfWillChange = useCallback(async (formNote: FormNote) => {
-		if (!formNote.id || !formNote.bodyWillChangeId || !props.editorRef.current) return;
+		if (!formNote.id || !formNote.bodyWillChangeId) return;
 
 		const body = await props.editorRef.current.content();
 

packages/app-desktop/gui/NotePropertiesDialog.tsx

@@ -343,7 +343,6 @@ class NotePropertiesDialog extends React.Component<Props, State> {
 					style={styles.input}
 					id={uniqueId(key)}
 					name={uniqueId(key)}
-					autoFocus
 				/>;
 
 				editCompHandler = () => {
@@ -364,7 +363,6 @@ class NotePropertiesDialog extends React.Component<Props, State> {
 							id={uniqueId(key)}
 							name={uniqueId(key)}
 							aria-invalid={!this.state.isValid.location}
-							autoFocus
 						/>
 						{
 							this.state.isValid.location ? null
@@ -389,7 +387,6 @@ class NotePropertiesDialog extends React.Component<Props, State> {
 						style={styles.input}
 						id={uniqueId(key)}
 						name={uniqueId(key)}
-						autoFocus
 					/>
 				);
 			}
@@ -414,14 +411,7 @@ class NotePropertiesDialog extends React.Component<Props, State> {
 					const ll = this.latLongFromLocation(value);
 					url = Note.geoLocationUrlFromLatLong(ll.latitude, ll.longitude);
 				}
-				const urlStyle: React.CSSProperties = {
-					...theme.urlStyle,
-					maxWidth: '180px',
-					overflow: 'hidden',
-					whiteSpace: 'nowrap',
-					textOverflow: 'ellipsis',
-					display: 'inline-block',
-				};
+				const urlStyle: React.CSSProperties = { ...theme.urlStyle, maxWidth: '180px', overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis' };
 				controlComp = (
 					<a href="#" onClick={() => bridge().openExternal(url)} style={urlStyle}>
 						{displayedValue}

packages/app-desktop/gui/PromptDialog.tsx

@@ -8,7 +8,6 @@ import { focus } from '@joplin/lib/utils/focusHandler';
 import Dialog from './Dialog';
 import { ChangeEvent } from 'react';
 import { formatDateTimeLocalToMs, isValidDate } from '@joplin/utils/time';
-import lightTheme from '@joplin/lib/themes/light';
 
 interface Props {
 	themeId: number;
@@ -118,15 +117,6 @@ export default class PromptDialog extends React.Component<Props, any> {
 			borderColor: theme.dividerColor,
 		};
 
-		// The button to change the date/time cannot be customized easily so we need to use the
-		// light theme for that particular component.
-		this.styles_.dateTimeInput = {
-			...this.styles_.input,
-			color: lightTheme.color,
-			backgroundColor: lightTheme.backgroundColor,
-			borderColor: lightTheme.dividerColor,
-		};
-
 		this.styles_.select = {
 			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			control: (provided: any) => {
@@ -251,6 +241,8 @@ export default class PromptDialog extends React.Component<Props, any> {
 				} else {
 					onClose(true);
 				}
+			} else if (event.key === 'Escape') {
+				onClose(false);
 			}
 		};
 
@@ -264,7 +256,7 @@ export default class PromptDialog extends React.Component<Props, any> {
 				onChange={onChange}
 				type="datetime-local"
 				className='datetime-picker'
-				style={styles.dateTimeInput}
+				style={styles.input}
 			/>;
 		} else if (this.props.inputType === 'tags') {
 			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
@@ -307,7 +299,7 @@ export default class PromptDialog extends React.Component<Props, any> {
 		}
 
 		return (
-			<Dialog className='prompt-dialog' contentStyle={styles.dialog} onCancel={() => onClose(false, 'cancel')}>
+			<Dialog className='prompt-dialog' contentStyle={styles.dialog}>
 				<label style={styles.label}>{this.props.label ? this.props.label : ''}</label>
 				<div style={{ display: 'inline-block', color: 'black', backgroundColor: theme.backgroundColor }}>
 					{inputComp}

packages/app-desktop/gui/Sidebar/Sidebar.tsx

@@ -25,13 +25,14 @@ interface Props {
 const SidebarComponent = (props: Props) => {
 	const renderSynchronizeButton = (type: string) => {
 		const label = type === 'sync' ? _('Synchronise') : _('Cancel');
+		const iconAnimation = type !== 'sync' ? 'icon-infinite-rotation 1s linear infinite' : '';
 
 		return (
 			<StyledSynchronizeButton
 				level={ButtonLevel.SidebarSecondary}
-				className={`sidebar-sync-button ${type === 'sync' ? '' : '-syncing'}`}
 				iconName="icon-sync"
 				key="sync_button"
+				iconAnimation={iconAnimation}
 				title={label}
 				onClick={() => {
 					void CommandService.instance().execute('synchronize', type !== 'sync');

packages/app-desktop/gui/Sidebar/hooks/useOnRenderListWrapper.tsx

@@ -27,7 +27,7 @@ const CollapseExpandAllButton = (props: CollapseExpandAllButtonProps) => {
 	const icon = props.allFoldersCollapsed ? 'far fa-caret-square-right' : 'far fa-caret-square-down';
 	const label = props.allFoldersCollapsed ? _('Expand all notebooks') : _('Collapse all notebooks');
 
-	return <button onClick={() => onToggleAllFolders(props.allFoldersCollapsed)} className='sidebar-header-button -collapseall' title={label}>
+	return <button onClick={() => onToggleAllFolders(props.allFoldersCollapsed)} className='sidebar-header-button -collapseall'>
 		<i
 			aria-label={label}
 			role='img'
@@ -39,11 +39,9 @@ const CollapseExpandAllButton = (props: CollapseExpandAllButtonProps) => {
 const NewFolderButton = () => {
 	// To allow it to be accessed by accessibility tools, the new folder button
 	// is not included in the portion of the list with role='tree'.
-	const label = _('New notebook');
-
-	return <button onClick={onAddFolderButtonClick} className='sidebar-header-button -newfolder' title={label}>
+	return <button onClick={onAddFolderButtonClick} className='sidebar-header-button -newfolder'>
 		<i
-			aria-label={label}
+			aria-label={_('New notebook')}
 			role='img'
 			className='fas fa-plus'
 		/>