update

fix
android ci
2025-08-30 20:39:46 +02:00 · 2022-11-11 12:53:29 +00:00 · 2022-11-11 12:37:42 +00:00 · 2022-11-11 12:36:18 +00:00 · 2022-11-11 12:22:52 +00:00 · 2022-11-11 10:04:03 +00:00
394 changed files with 45534 additions and 29062 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -78,6 +78,12 @@ readme/
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/LinkSelector.js.map
+packages/app-cli/app/base-command.d.ts
+packages/app-cli/app/base-command.js
+packages/app-cli/app/base-command.js.map
+packages/app-cli/app/command-done.test.d.ts
+packages/app-cli/app/command-done.test.js
+packages/app-cli/app/command-done.test.js.map
 packages/app-cli/app/command-e2ee.d.ts
 packages/app-cli/app/command-e2ee.js
 packages/app-cli/app/command-e2ee.js.map
@@ -93,6 +99,12 @@ packages/app-cli/app/command-testing.js.map
 packages/app-cli/app/services/plugins/PluginRunner.d.ts
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/services/plugins/PluginRunner.js.map
+packages/app-cli/app/setupCommand.d.ts
+packages/app-cli/app/setupCommand.js
+packages/app-cli/app/setupCommand.js.map
+packages/app-cli/app/utils/testUtils.d.ts
+packages/app-cli/app/utils/testUtils.js
+packages/app-cli/app/utils/testUtils.js.map
 packages/app-cli/tests/HtmlToMd.d.ts
 packages/app-cli/tests/HtmlToMd.js
 packages/app-cli/tests/HtmlToMd.js.map
@@ -117,6 +129,9 @@ packages/app-cli/tests/services/plugins/api/JoplinViewMenuItem.js.map
 packages/app-cli/tests/services/plugins/api/JoplinWorkspace.d.ts
 packages/app-cli/tests/services/plugins/api/JoplinWorkspace.js
 packages/app-cli/tests/services/plugins/api/JoplinWorkspace.js.map
+packages/app-cli/tests/services/plugins/defaultPluginsUtils.d.ts
+packages/app-cli/tests/services/plugins/defaultPluginsUtils.js
+packages/app-cli/tests/services/plugins/defaultPluginsUtils.js.map
 packages/app-cli/tests/services/plugins/sandboxProxy.d.ts
 packages/app-cli/tests/services/plugins/sandboxProxy.js
 packages/app-cli/tests/services/plugins/sandboxProxy.js.map
@@ -249,6 +264,9 @@ packages/app-desktop/gui/EditFolderDialog/Dialog.js.map
 packages/app-desktop/gui/EditFolderDialog/IconSelector.d.ts
 packages/app-desktop/gui/EditFolderDialog/IconSelector.js
 packages/app-desktop/gui/EditFolderDialog/IconSelector.js.map
+packages/app-desktop/gui/EmojiBox.d.ts
+packages/app-desktop/gui/EmojiBox.js
+packages/app-desktop/gui/EmojiBox.js.map
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.d.ts
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js.map
@@ -330,6 +348,9 @@ packages/app-desktop/gui/MainScreen/commands/openItem.js.map
 packages/app-desktop/gui/MainScreen/commands/openNote.d.ts
 packages/app-desktop/gui/MainScreen/commands/openNote.js
 packages/app-desktop/gui/MainScreen/commands/openNote.js.map
+packages/app-desktop/gui/MainScreen/commands/openPdfViewer.d.ts
+packages/app-desktop/gui/MainScreen/commands/openPdfViewer.js
+packages/app-desktop/gui/MainScreen/commands/openPdfViewer.js.map
 packages/app-desktop/gui/MainScreen/commands/openTag.d.ts
 packages/app-desktop/gui/MainScreen/commands/openTag.js
 packages/app-desktop/gui/MainScreen/commands/openTag.js.map
@@ -594,6 +615,9 @@ packages/app-desktop/gui/OneDriveLoginScreen.js.map
 packages/app-desktop/gui/PasswordInput/PasswordInput.d.ts
 packages/app-desktop/gui/PasswordInput/PasswordInput.js
 packages/app-desktop/gui/PasswordInput/PasswordInput.js.map
+packages/app-desktop/gui/PdfViewer.d.ts
+packages/app-desktop/gui/PdfViewer.js
+packages/app-desktop/gui/PdfViewer.js.map
 packages/app-desktop/gui/ResizableLayout/MoveButtons.d.ts
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js.map
@@ -849,6 +873,9 @@ packages/app-mobile/components/CustomButton.js.map
 packages/app-mobile/components/Dropdown.d.ts
 packages/app-mobile/components/Dropdown.js
 packages/app-mobile/components/Dropdown.js.map
+packages/app-mobile/components/ExtendedWebView.d.ts
+packages/app-mobile/components/ExtendedWebView.js
+packages/app-mobile/components/ExtendedWebView.js.map
 packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.d.ts
 packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.js
 packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.js.map
@@ -915,6 +942,9 @@ packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.js.map
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.d.ts
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.js.map
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleSpaceButton.d.ts
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleSpaceButton.js
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleSpaceButton.js.map
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.d.ts
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.js.map
@@ -966,6 +996,9 @@ packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js.map
 packages/app-mobile/components/screens/encryption-config.d.ts
 packages/app-mobile/components/screens/encryption-config.js
 packages/app-mobile/components/screens/encryption-config.js.map
+packages/app-mobile/components/side-menu-content.d.ts
+packages/app-mobile/components/side-menu-content.js
+packages/app-mobile/components/side-menu-content.js.map
 packages/app-mobile/gulpfile.d.ts
 packages/app-mobile/gulpfile.js
 packages/app-mobile/gulpfile.js.map
@@ -999,6 +1032,9 @@ packages/app-mobile/utils/TlsUtils.js.map
 packages/app-mobile/utils/checkPermissions.d.ts
 packages/app-mobile/utils/checkPermissions.js
 packages/app-mobile/utils/checkPermissions.js.map
+packages/app-mobile/utils/debounce.d.ts
+packages/app-mobile/utils/debounce.js
+packages/app-mobile/utils/debounce.js.map
 packages/app-mobile/utils/fs-driver-rn.d.ts
 packages/app-mobile/utils/fs-driver-rn.js
 packages/app-mobile/utils/fs-driver-rn.js.map
@@ -1008,6 +1044,9 @@ packages/app-mobile/utils/setupNotifications.js.map
 packages/app-mobile/utils/shareHandler.d.ts
 packages/app-mobile/utils/shareHandler.js
 packages/app-mobile/utils/shareHandler.js.map
+packages/app-mobile/utils/types.d.ts
+packages/app-mobile/utils/types.js
+packages/app-mobile/utils/types.js.map
 packages/fork-htmlparser2/src/CollectingHandler.d.ts
 packages/fork-htmlparser2/src/CollectingHandler.js
 packages/fork-htmlparser2/src/CollectingHandler.js.map
@@ -1683,6 +1722,12 @@ packages/lib/services/plugins/api/JoplinWorkspace.js.map
 packages/lib/services/plugins/api/types.d.ts
 packages/lib/services/plugins/api/types.js
 packages/lib/services/plugins/api/types.js.map
+packages/lib/services/plugins/defaultPlugins/defaultPluginsUtils.d.ts
+packages/lib/services/plugins/defaultPlugins/defaultPluginsUtils.js
+packages/lib/services/plugins/defaultPlugins/defaultPluginsUtils.js.map
+packages/lib/services/plugins/defaultPlugins/desktopDefaultPluginsInfo.d.ts
+packages/lib/services/plugins/defaultPlugins/desktopDefaultPluginsInfo.js
+packages/lib/services/plugins/defaultPlugins/desktopDefaultPluginsInfo.js.map
 packages/lib/services/plugins/reducer.d.ts
 packages/lib/services/plugins/reducer.js
 packages/lib/services/plugins/reducer.js.map
@@ -1989,9 +2034,15 @@ packages/lib/uuid.js.map
 packages/lib/versionInfo.d.ts
 packages/lib/versionInfo.js
 packages/lib/versionInfo.js.map
+packages/pdf-viewer/FullViewer.d.ts
+packages/pdf-viewer/FullViewer.js
+packages/pdf-viewer/FullViewer.js.map
 packages/pdf-viewer/Page.d.ts
 packages/pdf-viewer/Page.js
 packages/pdf-viewer/Page.js.map
+packages/pdf-viewer/PdfDocument.d.ts
+packages/pdf-viewer/PdfDocument.js
+packages/pdf-viewer/PdfDocument.js.map
 packages/pdf-viewer/VerticalPages.d.ts
 packages/pdf-viewer/VerticalPages.js
 packages/pdf-viewer/VerticalPages.js.map
@@ -2001,27 +2052,39 @@ packages/pdf-viewer/hooks/useIsFocused.js.map
 packages/pdf-viewer/hooks/useIsVisible.d.ts
 packages/pdf-viewer/hooks/useIsVisible.js
 packages/pdf-viewer/hooks/useIsVisible.js.map
-packages/pdf-viewer/hooks/usePdfData.d.ts
-packages/pdf-viewer/hooks/usePdfData.js
-packages/pdf-viewer/hooks/usePdfData.js.map
+packages/pdf-viewer/hooks/usePdfDocument.d.ts
+packages/pdf-viewer/hooks/usePdfDocument.js
+packages/pdf-viewer/hooks/usePdfDocument.js.map
 packages/pdf-viewer/hooks/useScaledSize.d.ts
 packages/pdf-viewer/hooks/useScaledSize.js
 packages/pdf-viewer/hooks/useScaledSize.js.map
 packages/pdf-viewer/hooks/useScrollSaver.d.ts
 packages/pdf-viewer/hooks/useScrollSaver.js
 packages/pdf-viewer/hooks/useScrollSaver.js.map
+packages/pdf-viewer/hooks/useVisibleOnSelect.d.ts
+packages/pdf-viewer/hooks/useVisibleOnSelect.js
+packages/pdf-viewer/hooks/useVisibleOnSelect.js.map
 packages/pdf-viewer/main.d.ts
 packages/pdf-viewer/main.js
 packages/pdf-viewer/main.js.map
+packages/pdf-viewer/messageService.d.ts
+packages/pdf-viewer/messageService.js
+packages/pdf-viewer/messageService.js.map
 packages/pdf-viewer/miniViewer.d.ts
 packages/pdf-viewer/miniViewer.js
 packages/pdf-viewer/miniViewer.js.map
-packages/pdf-viewer/pdfSource.d.ts
-packages/pdf-viewer/pdfSource.js
-packages/pdf-viewer/pdfSource.js.map
 packages/pdf-viewer/pdfSource.test.d.ts
 packages/pdf-viewer/pdfSource.test.js
 packages/pdf-viewer/pdfSource.test.js.map
+packages/pdf-viewer/types.d.ts
+packages/pdf-viewer/types.js
+packages/pdf-viewer/types.js.map
+packages/pdf-viewer/ui/GotoPage.d.ts
+packages/pdf-viewer/ui/GotoPage.js
+packages/pdf-viewer/ui/GotoPage.js.map
+packages/pdf-viewer/ui/IconButtons.d.ts
+packages/pdf-viewer/ui/IconButtons.js
+packages/pdf-viewer/ui/IconButtons.js.map
 packages/pdf-viewer/ui/ZoomControls.d.ts
 packages/pdf-viewer/ui/ZoomControls.js
 packages/pdf-viewer/ui/ZoomControls.js.map
@@ -2175,6 +2238,12 @@ packages/tools/buildServerDocker.js.map
 packages/tools/buildServerDocker.test.d.ts
 packages/tools/buildServerDocker.test.js
 packages/tools/buildServerDocker.test.js.map
+packages/tools/bundleDefaultPlugins.d.ts
+packages/tools/bundleDefaultPlugins.js
+packages/tools/bundleDefaultPlugins.js.map
+packages/tools/bundleDefaultPlugins.test.d.ts
+packages/tools/bundleDefaultPlugins.test.js
+packages/tools/bundleDefaultPlugins.test.js.map
 packages/tools/checkLibPaths.d.ts
 packages/tools/checkLibPaths.js
 packages/tools/checkLibPaths.js.map
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -90,6 +90,8 @@ module.exports = {
 		// Disable because of this: https://github.com/facebook/react/issues/16265
 		// "react-hooks/exhaustive-deps": "warn",

+		'promise/prefer-await-to-then': 'error',
+
 		// -------------------------------
 		// Formatting
 		// -------------------------------
@@ -141,6 +143,7 @@ module.exports = {
 		'@seiyab/eslint-plugin-react-hooks',
 		// 'react-hooks',
 		'import',
+		'promise',
 	],
 	'overrides': [
 		{
--- a/.github/scripts/run_ci.sh
+++ b/.github/scripts/run_ci.sh
@@ -130,12 +130,11 @@ fi
 # =============================================================================
 # Check that we didn't lose any string due to gettext not being able to parse
 # newly modified or added scripts. This is convenient to quickly view on GitHub
-# what commit may have broken translation building. We run this on macOS because
-# we need the latest version of gettext (and stable Ubuntu doesn't have it).
+# what commit may have broken translation building.
 # =============================================================================

 if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
-	if [ "$IS_MACOS" == "1" ]; then
+	if [ "$IS_LINUX" == "1" ]; then
 		echo "Step: Checking for lost translation strings..."

 		xgettext --version
@@ -175,6 +174,9 @@ cd "$ROOT_DIR/packages/app-desktop"

 if [[ $GIT_TAG_NAME = v* ]]; then
 	echo "Step: Building and publishing desktop application..."
+	# cd "$ROOT_DIR/packages/tools"
+	# node bundleDefaultPlugins.js
+	cd "$ROOT_DIR/packages/app-desktop"
 	USE_HARD_LINKS=false yarn run dist
 elif [[ $IS_LINUX = 1 ]] && [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
 	echo "Step: Building Docker Image..."
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -0,0 +1,44 @@
+# The goal of this action is to compile the Android debug build. That should
+# tell us automatically if something got broken when a dependency was changed.
+
+name: react-native-android-build-apk
+on: [push, pull_request]
+
+jobs:
+  pre_job:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'same_content_newer'
+
+  BuildAndroidDebug:
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Linux dependencies
+        run: |
+          sudo apt-get update || true
+          sudo apt-get install -y libsecret-1-dev
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '18'
+
+      - name: Install Yarn
+        run: |
+          corepack enable
+
+      - uses: actions/checkout@v2
+
+      - name: Install
+        run:  yarn install
+
+      - name: Build Android Release
+        run: |
+          cd packages/app-mobile/android && ./gradlew assembleDebug
+          
--- a/.github/workflows/github-actions-main.yml
+++ b/.github/workflows/github-actions-main.yml
@@ -1,14 +1,41 @@
 name: Joplin Continuous Integration
 on: [push, pull_request]
 jobs:
+  pre_job:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'same_content_newer'
+
  Main:
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        # Removed windows-2016 for now - discontinued by GitHub
        os: [macos-latest, ubuntu-latest, windows-2019]
    steps:

+      # Trying to fix random networking issues on Windows
+      # https://github.com/actions/runner-images/issues/1187#issuecomment-686735760
+      - name: Disable TCP/UDP offload on Windows
+        if: runner.os == 'Windows'
+        run: Disable-NetAdapterChecksumOffload -Name * -TcpIPv4 -UdpIPv4 -TcpIPv6 -UdpIPv6
+
+      - name: Disable TCP/UDP offload on Linux
+        if: runner.os == 'Linux'
+        run: sudo ethtool -K eth0 tx off rx off
+
+      - name: Disable TCP/UDP offload on macOS
+        if: runner.os == 'macOS'
+        run: |
+          sudo sysctl -w net.link.generic.system.hwcksum_tx=0
+          sudo sysctl -w net.link.generic.system.hwcksum_rx=0
+
      # Silence apt-get update errors (for example when a module doesn't
      # exist) since otherwise it will make the whole build fails, even though
      # it might work without update. libsecret-1-dev is required for keytar -
@@ -22,12 +49,12 @@ jobs:
          sudo apt-get install -y libsecret-1-dev
          sudo apt-get install -y translate-toolkit

-      - name: Install macOS dependencies
-        if: runner.os == 'macOS'
-        run: |
-          brew update
-          brew install gettext
-          brew install translate-toolkit
+      # - name: Install macOS dependencies
+      #   if: runner.os == 'macOS'
+      #   run: |
+      #     brew update
+      #     brew install gettext
+      #     brew install translate-toolkit

      - name: Install Docker Engine
        # if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
@@ -49,7 +76,7 @@ jobs:
      - uses: olegtarasov/get-tag@v2.1
      - uses: actions/setup-node@v2
        with:
-          node-version: '16'
+          node-version: '18'

      - name: Install Yarn
        run: |
@@ -76,6 +103,8 @@ jobs:
          GH_TOKEN: ${{ secrets.GH_TOKEN }}
          IS_CONTINUOUS_INTEGRATION: 1
          BUILD_SEQUENCIAL: 1
+          SERVER_REPOSITORY: joplin/server
+          SERVER_TAG_PREFIX: server
        run: |
          "${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"

@@ -105,6 +134,8 @@ jobs:
          yarn install && cd packages/app-desktop && yarn run dist --publish=never

  ServerDockerImage:
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
@@ -129,7 +160,7 @@ jobs:

      - uses: actions/setup-node@v2
        with:
-          node-version: '16'
+          node-version: '18'

      - name: Install Yarn
        run: |
@@ -142,4 +173,7 @@ jobs:
        run: |
          yarn install
          yarn run buildServerDocker --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.
+          docker run joplin/server:0.0.0-beta node dist/app.js migrate list
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,12 @@ docs/**/*.mustache
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/LinkSelector.js.map
+packages/app-cli/app/base-command.d.ts
+packages/app-cli/app/base-command.js
+packages/app-cli/app/base-command.js.map
+packages/app-cli/app/command-done.test.d.ts
+packages/app-cli/app/command-done.test.js
+packages/app-cli/app/command-done.test.js.map
 packages/app-cli/app/command-e2ee.d.ts
 packages/app-cli/app/command-e2ee.js
 packages/app-cli/app/command-e2ee.js.map
@@ -81,6 +87,12 @@ packages/app-cli/app/command-testing.js.map
 packages/app-cli/app/services/plugins/PluginRunner.d.ts
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/services/plugins/PluginRunner.js.map
+packages/app-cli/app/setupCommand.d.ts
+packages/app-cli/app/setupCommand.js
+packages/app-cli/app/setupCommand.js.map
+packages/app-cli/app/utils/testUtils.d.ts
+packages/app-cli/app/utils/testUtils.js
+packages/app-cli/app/utils/testUtils.js.map
 packages/app-cli/tests/HtmlToMd.d.ts
 packages/app-cli/tests/HtmlToMd.js
 packages/app-cli/tests/HtmlToMd.js.map
@@ -105,6 +117,9 @@ packages/app-cli/tests/services/plugins/api/JoplinViewMenuItem.js.map
 packages/app-cli/tests/services/plugins/api/JoplinWorkspace.d.ts
 packages/app-cli/tests/services/plugins/api/JoplinWorkspace.js
 packages/app-cli/tests/services/plugins/api/JoplinWorkspace.js.map
+packages/app-cli/tests/services/plugins/defaultPluginsUtils.d.ts
+packages/app-cli/tests/services/plugins/defaultPluginsUtils.js
+packages/app-cli/tests/services/plugins/defaultPluginsUtils.js.map
 packages/app-cli/tests/services/plugins/sandboxProxy.d.ts
 packages/app-cli/tests/services/plugins/sandboxProxy.js
 packages/app-cli/tests/services/plugins/sandboxProxy.js.map
@@ -237,6 +252,9 @@ packages/app-desktop/gui/EditFolderDialog/Dialog.js.map
 packages/app-desktop/gui/EditFolderDialog/IconSelector.d.ts
 packages/app-desktop/gui/EditFolderDialog/IconSelector.js
 packages/app-desktop/gui/EditFolderDialog/IconSelector.js.map
+packages/app-desktop/gui/EmojiBox.d.ts
+packages/app-desktop/gui/EmojiBox.js
+packages/app-desktop/gui/EmojiBox.js.map
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.d.ts
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js.map
@@ -318,6 +336,9 @@ packages/app-desktop/gui/MainScreen/commands/openItem.js.map
 packages/app-desktop/gui/MainScreen/commands/openNote.d.ts
 packages/app-desktop/gui/MainScreen/commands/openNote.js
 packages/app-desktop/gui/MainScreen/commands/openNote.js.map
+packages/app-desktop/gui/MainScreen/commands/openPdfViewer.d.ts
+packages/app-desktop/gui/MainScreen/commands/openPdfViewer.js
+packages/app-desktop/gui/MainScreen/commands/openPdfViewer.js.map
 packages/app-desktop/gui/MainScreen/commands/openTag.d.ts
 packages/app-desktop/gui/MainScreen/commands/openTag.js
 packages/app-desktop/gui/MainScreen/commands/openTag.js.map
@@ -582,6 +603,9 @@ packages/app-desktop/gui/OneDriveLoginScreen.js.map
 packages/app-desktop/gui/PasswordInput/PasswordInput.d.ts
 packages/app-desktop/gui/PasswordInput/PasswordInput.js
 packages/app-desktop/gui/PasswordInput/PasswordInput.js.map
+packages/app-desktop/gui/PdfViewer.d.ts
+packages/app-desktop/gui/PdfViewer.js
+packages/app-desktop/gui/PdfViewer.js.map
 packages/app-desktop/gui/ResizableLayout/MoveButtons.d.ts
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js.map
@@ -837,6 +861,9 @@ packages/app-mobile/components/CustomButton.js.map
 packages/app-mobile/components/Dropdown.d.ts
 packages/app-mobile/components/Dropdown.js
 packages/app-mobile/components/Dropdown.js.map
+packages/app-mobile/components/ExtendedWebView.d.ts
+packages/app-mobile/components/ExtendedWebView.js
+packages/app-mobile/components/ExtendedWebView.js.map
 packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.d.ts
 packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.js
 packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.js.map
@@ -903,6 +930,9 @@ packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.js.map
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.d.ts
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.js.map
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleSpaceButton.d.ts
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleSpaceButton.js
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleSpaceButton.js.map
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.d.ts
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.js.map
@@ -954,6 +984,9 @@ packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js.map
 packages/app-mobile/components/screens/encryption-config.d.ts
 packages/app-mobile/components/screens/encryption-config.js
 packages/app-mobile/components/screens/encryption-config.js.map
+packages/app-mobile/components/side-menu-content.d.ts
+packages/app-mobile/components/side-menu-content.js
+packages/app-mobile/components/side-menu-content.js.map
 packages/app-mobile/gulpfile.d.ts
 packages/app-mobile/gulpfile.js
 packages/app-mobile/gulpfile.js.map
@@ -987,6 +1020,9 @@ packages/app-mobile/utils/TlsUtils.js.map
 packages/app-mobile/utils/checkPermissions.d.ts
 packages/app-mobile/utils/checkPermissions.js
 packages/app-mobile/utils/checkPermissions.js.map
+packages/app-mobile/utils/debounce.d.ts
+packages/app-mobile/utils/debounce.js
+packages/app-mobile/utils/debounce.js.map
 packages/app-mobile/utils/fs-driver-rn.d.ts
 packages/app-mobile/utils/fs-driver-rn.js
 packages/app-mobile/utils/fs-driver-rn.js.map
@@ -996,6 +1032,9 @@ packages/app-mobile/utils/setupNotifications.js.map
 packages/app-mobile/utils/shareHandler.d.ts
 packages/app-mobile/utils/shareHandler.js
 packages/app-mobile/utils/shareHandler.js.map
+packages/app-mobile/utils/types.d.ts
+packages/app-mobile/utils/types.js
+packages/app-mobile/utils/types.js.map
 packages/fork-htmlparser2/src/CollectingHandler.d.ts
 packages/fork-htmlparser2/src/CollectingHandler.js
 packages/fork-htmlparser2/src/CollectingHandler.js.map
@@ -1671,6 +1710,12 @@ packages/lib/services/plugins/api/JoplinWorkspace.js.map
 packages/lib/services/plugins/api/types.d.ts
 packages/lib/services/plugins/api/types.js
 packages/lib/services/plugins/api/types.js.map
+packages/lib/services/plugins/defaultPlugins/defaultPluginsUtils.d.ts
+packages/lib/services/plugins/defaultPlugins/defaultPluginsUtils.js
+packages/lib/services/plugins/defaultPlugins/defaultPluginsUtils.js.map
+packages/lib/services/plugins/defaultPlugins/desktopDefaultPluginsInfo.d.ts
+packages/lib/services/plugins/defaultPlugins/desktopDefaultPluginsInfo.js
+packages/lib/services/plugins/defaultPlugins/desktopDefaultPluginsInfo.js.map
 packages/lib/services/plugins/reducer.d.ts
 packages/lib/services/plugins/reducer.js
 packages/lib/services/plugins/reducer.js.map
@@ -1977,9 +2022,15 @@ packages/lib/uuid.js.map
 packages/lib/versionInfo.d.ts
 packages/lib/versionInfo.js
 packages/lib/versionInfo.js.map
+packages/pdf-viewer/FullViewer.d.ts
+packages/pdf-viewer/FullViewer.js
+packages/pdf-viewer/FullViewer.js.map
 packages/pdf-viewer/Page.d.ts
 packages/pdf-viewer/Page.js
 packages/pdf-viewer/Page.js.map
+packages/pdf-viewer/PdfDocument.d.ts
+packages/pdf-viewer/PdfDocument.js
+packages/pdf-viewer/PdfDocument.js.map
 packages/pdf-viewer/VerticalPages.d.ts
 packages/pdf-viewer/VerticalPages.js
 packages/pdf-viewer/VerticalPages.js.map
@@ -1989,27 +2040,39 @@ packages/pdf-viewer/hooks/useIsFocused.js.map
 packages/pdf-viewer/hooks/useIsVisible.d.ts
 packages/pdf-viewer/hooks/useIsVisible.js
 packages/pdf-viewer/hooks/useIsVisible.js.map
-packages/pdf-viewer/hooks/usePdfData.d.ts
-packages/pdf-viewer/hooks/usePdfData.js
-packages/pdf-viewer/hooks/usePdfData.js.map
+packages/pdf-viewer/hooks/usePdfDocument.d.ts
+packages/pdf-viewer/hooks/usePdfDocument.js
+packages/pdf-viewer/hooks/usePdfDocument.js.map
 packages/pdf-viewer/hooks/useScaledSize.d.ts
 packages/pdf-viewer/hooks/useScaledSize.js
 packages/pdf-viewer/hooks/useScaledSize.js.map
 packages/pdf-viewer/hooks/useScrollSaver.d.ts
 packages/pdf-viewer/hooks/useScrollSaver.js
 packages/pdf-viewer/hooks/useScrollSaver.js.map
+packages/pdf-viewer/hooks/useVisibleOnSelect.d.ts
+packages/pdf-viewer/hooks/useVisibleOnSelect.js
+packages/pdf-viewer/hooks/useVisibleOnSelect.js.map
 packages/pdf-viewer/main.d.ts
 packages/pdf-viewer/main.js
 packages/pdf-viewer/main.js.map
+packages/pdf-viewer/messageService.d.ts
+packages/pdf-viewer/messageService.js
+packages/pdf-viewer/messageService.js.map
 packages/pdf-viewer/miniViewer.d.ts
 packages/pdf-viewer/miniViewer.js
 packages/pdf-viewer/miniViewer.js.map
-packages/pdf-viewer/pdfSource.d.ts
-packages/pdf-viewer/pdfSource.js
-packages/pdf-viewer/pdfSource.js.map
 packages/pdf-viewer/pdfSource.test.d.ts
 packages/pdf-viewer/pdfSource.test.js
 packages/pdf-viewer/pdfSource.test.js.map
+packages/pdf-viewer/types.d.ts
+packages/pdf-viewer/types.js
+packages/pdf-viewer/types.js.map
+packages/pdf-viewer/ui/GotoPage.d.ts
+packages/pdf-viewer/ui/GotoPage.js
+packages/pdf-viewer/ui/GotoPage.js.map
+packages/pdf-viewer/ui/IconButtons.d.ts
+packages/pdf-viewer/ui/IconButtons.js
+packages/pdf-viewer/ui/IconButtons.js.map
 packages/pdf-viewer/ui/ZoomControls.d.ts
 packages/pdf-viewer/ui/ZoomControls.js
 packages/pdf-viewer/ui/ZoomControls.js.map
@@ -2163,6 +2226,12 @@ packages/tools/buildServerDocker.js.map
 packages/tools/buildServerDocker.test.d.ts
 packages/tools/buildServerDocker.test.js
 packages/tools/buildServerDocker.test.js.map
+packages/tools/bundleDefaultPlugins.d.ts
+packages/tools/bundleDefaultPlugins.js
+packages/tools/bundleDefaultPlugins.js.map
+packages/tools/bundleDefaultPlugins.test.d.ts
+packages/tools/bundleDefaultPlugins.test.js
+packages/tools/bundleDefaultPlugins.test.js.map
 packages/tools/checkLibPaths.d.ts
 packages/tools/checkLibPaths.js
 packages/tools/checkLibPaths.js.map
--- a/.yarn/patches/joplin-rn-alarm-notification-npm-1.0.5-662e871c03
+++ b/.yarn/patches/joplin-rn-alarm-notification-npm-1.0.5-662e871c03
@@ -0,0 +1,33 @@
+diff --git a/android/build.gradle b/android/build.gradle
+index 1ae415331855895ed6c65d72e155ff91d02b4b39..a7548535a7fb08800fb4731c1d8e36efa8afa1ae 100644
+--- a/android/build.gradle
+++ b/android/build.gradle
+@@ -22,7 +22,7 @@ def safeExtGet(prop, fallback) {
+ }
+ 
+ apply plugin: 'com.android.library'
+-apply plugin: 'maven'
+apply plugin: 'maven-publish'
+ 
+ buildscript {
+     // The Android Gradle plugin is only required when opening the android folder stand-alone.
+@@ -41,7 +41,7 @@ buildscript {
+ }
+ 
+ apply plugin: 'com.android.library'
+-apply plugin: 'maven'
+apply plugin: 'maven-publish'
+ 
+ android {
+     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
+@@ -140,10 +140,5 @@ afterEvaluate { project ->
+ 
+     task installArchives(type: Upload) {
+         configuration = configurations.archives
+-        repositories.mavenDeployer {
+-            // Deploy to react-native-event-bridge/maven, ready to publish to npm
+-            repository url: "file://${projectDir}/../android/maven"
+-            configureReactNativePom pom
+-        }
+     }
+ }
--- a/Assets/TinyMCE/IconPack/package.json
+++ b/Assets/TinyMCE/IconPack/package.json
@@ -10,9 +10,9 @@
  "license": "ISC",
  "devDependencies": {
    "@ephox/oxide-icons-tools": "^2.1.1",
-    "gulp": "^4.0.2",
+    "gulp": "4.0.2",
    "gulp-clean": "^0.4.0",
    "prompts": "^2.2.1"
  },
  "iconPackName": "Joplin"
-}
+}
--- a/Assets/WebsiteAssets/rss.xml
+++ b/Assets/WebsiteAssets/rss.xml
@@ -1,4 +1,16 @@
-<?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, 08 Aug 2022 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Mon, 08 Aug 2022 00:00:00 GMT</pubDate><item><title><![CDATA[Joplin first meetup on 30 August!]]></title><description><![CDATA[<p>We are glad to announce <a href="https://www.meetup.com/joplin/events/287611873/">the first Joplin Meetup</a> that will take place on 30 August 2022 in London!</p>
+<?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>Wed, 12 Oct 2022 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Wed, 12 Oct 2022 00:00:00 GMT</pubDate><item><title><![CDATA[Joplin Cloud is now part of the Joplin company]]></title><description><![CDATA[<p>As some of you may know Joplin Cloud so far has been operating under my own single-person limited company in the UK. This was mostly for convenience since it meant I could get things going quickly without having to setup a special structure for it.</p>
+<p>Now that Joplin Cloud is becoming more mature however a proper company, simply called Joplin, has been created. This company will be based in France, and will be used mainly to handle the commercial part of the project, which currently is mostly Joplin Cloud. I'm still heading the company so there won't be any major change to the way the project is managed.</p>
+<h2>What does it mean for Joplin Cloud?<a name="what-does-it-mean-for-joplin-cloud" href="#what-does-it-mean-for-joplin-cloud" class="heading-anchor">🔗</a></h2>
+<p>There will be no significant change - the website ownership simply moves from one company in the UK to one in France. The new company is still owned by myself so I will keep following the same roadmap.</p>
+<h2>What does it mean for the open source apps?<a name="what-does-it-mean-for-the-open-source-apps" href="#what-does-it-mean-for-the-open-source-apps" class="heading-anchor">🔗</a></h2>
+<p>On the short term, the only visible change will be moving the non-open source assets, such as logo or trademark from the UK company to the French one. So expect a few changes in copyright notices here and there.</p>
+<p>In the medium to long term, I would like to hire one or two software developers to help me with the Joplin Cloud development, because we reached a point where managing the whole project is difficult for a single person, so some help is needed. Some of their work might also touch the open source apps since both are quite related - but of course that work will remain open source too.</p>
+<p>As a general rule, there will be a permanent commitment to keep the apps open source and to derive value from Joplin Cloud/Server.</p>
+<p>Longer term I would like to create a non-profit organisation to handle the open source applications and to make decisions about the project, as well as to decide how to allocate any funding we receive (for example from GSoC).</p>
+<h2>Looking forward<a name="looking-forward" href="#looking-forward" class="heading-anchor">🔗</a></h2>
+<p>Those past 6 years of developing Joplin have been an exciting and rewarding experience, thank you to all of you of the friendly and vibrant Joplin community for your contribution toward making Joplin the software it is today, and looking forward to continuing the journey together!</p>
+]]></description><link>https://joplinapp.org/news/20221012-Joplin-Company/</link><guid isPermaLink="false">20221012-Joplin-Company</guid><pubDate>Wed, 12 Oct 2022 00:00:00 GMT</pubDate><twitter-text>Joplin Cloud is now operated by the Joplin company! More info on the announcement post.</twitter-text></item><item><title><![CDATA[Joplin interview on Website Planet]]></title><description><![CDATA[<p>Website Planet has recently conducted an interview about Joplin - it may give you some insight on the current status of the project, our priorities, and future plans! More on the article page - <a href="https://www.websiteplanet.com/blog/interview-joplin/">Organise Your Thoughts with Open Source Note-Taking App, Joplin</a></p>
+]]></description><link>https://joplinapp.org/news/20220906-interview-websiteplanet/</link><guid isPermaLink="false">20220906-interview-websiteplanet</guid><pubDate>Tue, 06 Sep 2022 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Joplin first meetup on 30 August!]]></title><description><![CDATA[<p>We are glad to announce <a href="https://www.meetup.com/joplin/events/287611873/">the first Joplin Meetup</a> that will take place on 30 August 2022 in London!</p>
 <p>This is an opportunity to meet other Joplin users as well as some of the main contributors, to discuss the apps, or to ask questions and exchange tips and tricks on how to use the app, develop plugins or contribute to the application. Everybody, technical or not, is welcome!</p>
 <p>We will meet at the Old Thameside Inn next to London Bridge. If the weather allows we will be on the terrace outside, if not inside.</p>
 <p>More information on the official Meetup page:</p>
@@ -256,9 +268,4 @@
 </li>
 </ul>
 <p>Also many thanks to everyone who voted and contributed to the tagline discussion! It helped narrow down what the tagline should be, along with the equally important description below. If you have any question or notice any issue with the website let me know!</p>
-]]></description><link>https://joplinapp.org/news/20210711-095626/</link><guid isPermaLink="false">20210711-095626</guid><pubDate>Sun, 11 Jul 2021 09:56:26 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Poll: What should Joplin tagline be?]]></title><description><![CDATA[<p>Thanks everyone for your tagline suggestions - there were lots of good ideas in there. I've compiled a few of them and create a poll in the forum, so please cast your vote! And if you have any other suggestions on what would make a good tagline, feel free to post over there or here.</p>
-<p><a href="https://discourse.joplinapp.org/t/poll-what-should-joplin-tagline-be/18487">https://discourse.joplinapp.org/t/poll-what-should-joplin-tagline-be/18487</a></p>
-]]></description><link>https://joplinapp.org/news/20210706-140228/</link><guid isPermaLink="false">20210706-140228</guid><pubDate>Tue, 06 Jul 2021 14:02:28 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Any ideas for a Joplin tagline?]]></title><description><![CDATA[<p>I'm going to update the website front page to better showcase the application. I have most of the sections right, but the part I'm still not sure about is the top tagline, so I'm wondering if anyone had any suggestion about it?</p>
-<p>From what I can see on Google Keep or Evernote for example it should be something like &quot;Use our app to get X or Y benefit&quot;, it should be a sentence that directly speaks to the user essentially.</p>
-<p>So far I have &quot;Your notes, anywhere you are&quot; but I'm not certain that's particularly inspiring. Any other idea about what tagline could be used?</p>
-]]></description><link>https://joplinapp.org/news/20210705-094247/</link><guid isPermaLink="false">20210705-094247</guid><pubDate>Mon, 05 Jul 2021 09:42:47 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>
+]]></description><link>https://joplinapp.org/news/20210711-095626/</link><guid isPermaLink="false">20210711-095626</guid><pubDate>Sun, 11 Jul 2021 09:56:26 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,7 @@ Joplin is available in multiple languages thanks to the help of its users. You c

 If you want to start contributing to the project's code, please follow these guidelines before creating a pull request: 

- Explain WHY you want to add this change. Explain it inside the pull request and you may link to an issue for additional information, but the PR should give a clear overview of why you want to add this.
+- The top post of the pull request should contain a full, self-contained explanation of the feature: what it does, how it does it, with examples of usage and screenshots. Also explain why you want to add this - what problem does it solve. Do not simply add a text `Implement feature #4345` or link to forum posts, because the information there will most likely be outdated or confusing (multiple discussions and opinions). The pull request needs to be self-contained.
 - Bug fixes are always welcome. Start by reviewing the [list of bugs](https://github.com/laurent22/joplin/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
 - A good way to easily start contributing is to pick and work on a [good first issue](https://github.com/laurent22/joplin/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22). We try to make these issues as clear as possible and provide basic info on how the code should be changed, and if something is unclear feel free to ask for more information on the issue.
 - Before adding a new feature, ask about it in the [Github Issue Tracker](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue) or the [Joplin Forum](https://discourse.joplinapp.org/), or check if existing discussions exist to make sure the new functionality is desired.
--- a/Dockerfile.server
+++ b/Dockerfile.server
@@ -2,7 +2,7 @@
 # Build stage
 # =============================================================================

-FROM node:16-bullseye AS builder
+FROM node:18-bullseye AS builder

 RUN apt-get update \
    && apt-get install -y \
@@ -51,7 +51,7 @@ RUN BUILD_SEQUENCIAL=1 yarn install --inline-builds \
 # from a smaller base image.
 # =============================================================================

-FROM node:16-bullseye-slim
+FROM node:18-bullseye-slim

 ARG user=joplin
 RUN useradd --create-home --shell /bin/bash $user
--- a/2
+++ b/2
@@ -10,7 +10,7 @@ under that directory is licensed under the default license, which is MIT.

 * * *

-Joplin® is a trademark of Cozic Ltd registered in the European Union, with
+Joplin® is a trademark of JOPLIN SAS registered in the European Union, with
 filing number 018544315.

 * * *
--- a/README.md
+++ b/README.md
@@ -2,16 +2,6 @@
 [![Donate using PayPal](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) [![Sponsor on GitHub](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg)](https://github.com/sponsors/laurent22/) [![Become a patron](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Donate using IBAN](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg)](https://joplinapp.org/donate/#donations)
 <!-- DONATELINKS -->

-* * *
-
-Joplin will have [its first Meetup on 30 August 2022](https://discourse.joplinapp.org/t/joplin-first-meetup-on-30-august/26808)! Come and join us at the Old Thameside Inn next to London Bridge!
-
-* * *
-
-🌞 Joplin participates in **Google Summer of Code 2022**! More info on [the announcement post](https://github.com/laurent22/joplin/blob/dev/readme/news/20220308-gsoc2022-start.md). 🌞
-
-* * *
-
 <img width="64" src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/LinuxIcons/256x256.png" align="left" /> **Joplin** is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in [Markdown format](#markdown).

 Notes exported from Evernote [can be imported](#importing) into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.
@@ -85,11 +75,11 @@ A community maintained list of these distributions can be found here: [Unofficia
 | <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/3061769?s=96&v=4"/></br>[c-nagy](https://github.com/c-nagy) | <img width="50" src="https://avatars2.githubusercontent.com/u/70780798?s=96&v=4"/></br>[cabottech](https://github.com/cabottech) | <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/4862947?s=96&v=4"/></br>[chrootlogin](https://github.com/chrootlogin) | <img width="50" src="https://avatars2.githubusercontent.com/u/82579431?s=96&v=4"/></br>[clmntsl](https://github.com/clmntsl) | <img width="50" src="https://avatars2.githubusercontent.com/u/808091?s=96&v=4"/></br>[cuongtransc](https://github.com/cuongtransc) | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[dbrandonjohnson](https://github.com/dbrandonjohnson) |
 | <img width="50" src="https://avatars2.githubusercontent.com/u/1439535?s=96&v=4"/></br>[fbloise](https://github.com/fbloise) | <img width="50" src="https://avatars2.githubusercontent.com/u/49439044?s=96&v=4"/></br>[fourstepper](https://github.com/fourstepper) | <img width="50" src="https://avatars2.githubusercontent.com/u/38898566?s=96&v=4"/></br>[h4sh5](https://github.com/h4sh5) | <img width="50" src="https://avatars2.githubusercontent.com/u/3266447?s=96&v=4"/></br>[iamwillbar](https://github.com/iamwillbar) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/37297218?s=96&v=4"/></br>[Jesssullivan](https://github.com/Jesssullivan) | <img width="50" src="https://avatars2.githubusercontent.com/u/1248504?s=96&v=4"/></br>[joesfer](https://github.com/joesfer) | <img width="50" src="https://avatars2.githubusercontent.com/u/5588131?s=96&v=4"/></br>[kianenigma](https://github.com/kianenigma) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) |
-| <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/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp) | <img width="50" src="https://avatars2.githubusercontent.com/u/1168659?s=96&v=4"/></br>[nicholashead](https://github.com/nicholashead) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/5782817?s=96&v=4"/></br>[piccobit](https://github.com/piccobit) | <img width="50" src="https://avatars2.githubusercontent.com/u/77214738?s=96&v=4"/></br>[Polymathic-Company](https://github.com/Polymathic-Company) | <img width="50" src="https://avatars2.githubusercontent.com/u/47742?s=96&v=4"/></br>[ravenscroftj](https://github.com/ravenscroftj) | <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/54626606?s=96&v=4"/></br>[skyrunner15](https://github.com/skyrunner15) | <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/73081837?s=96&v=4"/></br>[thismarty](https://github.com/thismarty) | <img width="50" src="https://avatars2.githubusercontent.com/u/15859362?s=96&v=4"/></br>[thomasbroussard](https://github.com/thomasbroussard) |
-|       |       |       |       |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/37297218?s=96&v=4"/></br>[Jesssullivan](https://github.com/Jesssullivan) | <img width="50" src="https://avatars2.githubusercontent.com/u/1310474?s=96&v=4"/></br>[jknowles](https://github.com/jknowles) | <img width="50" src="https://avatars2.githubusercontent.com/u/1248504?s=96&v=4"/></br>[joesfer](https://github.com/joesfer) | <img width="50" src="https://avatars2.githubusercontent.com/u/5588131?s=96&v=4"/></br>[kianenigma](https://github.com/kianenigma) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) | <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/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/1168659?s=96&v=4"/></br>[nicholashead](https://github.com/nicholashead) | <img width="50" src="https://avatars2.githubusercontent.com/u/5782817?s=96&v=4"/></br>[piccobit](https://github.com/piccobit) | <img width="50" src="https://avatars2.githubusercontent.com/u/77214738?s=96&v=4"/></br>[Polymathic-Company](https://github.com/Polymathic-Company) | <img width="50" src="https://avatars2.githubusercontent.com/u/47742?s=96&v=4"/></br>[ravenscroftj](https://github.com/ravenscroftj) |
+| <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/54626606?s=96&v=4"/></br>[skyrunner15](https://github.com/skyrunner15) | <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/73081837?s=96&v=4"/></br>[thismarty](https://github.com/thismarty) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/15859362?s=96&v=4"/></br>[thomasbroussard](https://github.com/thomasbroussard) |       |       |       |
 <!-- SPONSORS-GITHUB -->

 <!-- TOC -->
@@ -301,7 +291,7 @@ As of Joplin 2.x.x, Joplin supports multiple S3 providers. We expose some option
 In the **desktop application** or **mobile application**, select "S3 (Beta)" as the synchronisation target in the [Configuration screen](https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md).

 - **S3 Bucket:** The name of your Bucket, such as `joplin-bucket`
- **S3 URL:** Fully qualified URL; For AWS this should be `https://s3.amazonaws.com/`
+- **S3 URL:** Fully qualified URL; For AWS this should be `https://s3.<regionName>.amazonaws.com/`
 - **S3 Access Key & S3 Secret Key:**  The User's programmatic access key.  To create a new key & secret on AWS, visit [IAM Security Credentials](https://console.aws.amazon.com/iam/home#/security_credentials). For other providers follow their documentation.
 - **S3 Region:** Some providers require you to provide the region of your bucket. This is usually in the form of "eu-west1" or something similar depending on your region. For providers that do not require a region, you can leave it blank.
 - **Force Path Style**: This setting enables Joplin to talk to S3 providers using an older style S3 Path. Depending on your provider you may need to try with this on and off.
@@ -341,17 +331,17 @@ All providers will require a bucket, Access Key, and Secret Key.
 If you provide a configuration and you receive "success!" on the "check config" then your S3 sync should work for your provider. If you do not receive success, you may need to adjust your settings, or save them, restart the app, and attempt a sync. This may reveal more clear error messaging that will help you deduce the problem.

 ### AWS
- URL: https://s3.amazonaws.com
+- URL: `https://s3.<region>.amazonaws.com/` (fill in your region, a complete list of endpoint adresses can be found [here](https://docs.aws.amazon.com/general/latest/gr/s3.html))
 - Region: required
 - Force Path Style: unchecked

 ### Linode
- URL: https://<region>.linodeobjects.com
- Region: empty
+- URL: `https://<region>.linodeobjects.com` (region is in the URL provided by Linode; this URL is also the same as the URL provided by Linode with the bucket name removed)
+- Region: Anything you want to type, can't be left empty
 - Force Path Style: unchecked

 ### UpCloud
- URL: https://<account>.<region>.upcloudobjects.com (They will provide you with multiple URLs, the one that follows this pattern should work.)
+- URL: `https://<account>.<region>.upcloudobjects.com` (They will provide you with multiple URLs, the one that follows this pattern should work.)
 - Region: required
 - Force Path Style: unchecked

@@ -540,47 +530,47 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  89%
-<img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/>  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  25%
-<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  64%
-<img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  50%
-<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  [Xavi Ivars](mailto:xavi.ivars@gmail.com)  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/>  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  100%
-<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  86%
-<img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  ERYpTION  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [MrKanister](mailto:pueblos_spatulas@aleeas.com)  |  100%
-<img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  49%
+<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  84%
+<img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/>  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  24%
+<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  60%
+<img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  47%
+<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  [Xavi Ivars](mailto:xavi.ivars@gmail.com)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/>  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  81%
+<img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  ERYpTION  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [MrKanister](mailto:pueblos_spatulas@aleeas.com)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  46%
 <img src="https://joplinapp.org/images/flags/country-4x3/gb.png" width="16px"/>  |  English (United Kingdom)  |  [en_GB](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_GB.po)  |    |  100%
 <img src="https://joplinapp.org/images/flags/country-4x3/us.png" width="16px"/>  |  English (United States of America)  |  [en_US](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_US.po)  |    |  100%
-<img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Mora](mailto:francisco.m.collao@gmail.com)  |  98%
-<img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  28%
-<img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato0  |  98%
+<img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Mora](mailto:francisco.m.collao@gmail.com)  |  92%
+<img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  27%
+<img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato0  |  94%
 <img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  100%
-<img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/>  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  32%
-<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [eresytter](mailto:42007357+eresytter@users.noreply.github.com)  |  88%
-<img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Albano Battistella](mailto:albano_battistella@hotmail.com)  |  86%
-<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  86%
-<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  88%
-<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MHolkamp](mailto:mholkamp@users.noreply.github.com)  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  62%
-<img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [konhi](mailto:hello.konhi@gmail.com)  |  81%
-<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Renato Nunes Bastos](mailto:rnbastos@gmail.com)  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  81%
-<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  57%
-<img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  90%
-<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  41%
-<img src="https://joplinapp.org/images/flags/country-4x3/vn.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  87%
-<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  96%
-<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  80%
-<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  89%
-<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  72%
-<img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [horaceyoung](mailto:paventyang@gmail.com)  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [SiderealArt](mailto:nelson22768384@gmail.com)  |  87%
-<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  100%
-<img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  86%
+<img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/>  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  30%
+<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [Wisnu Adi Santoso](mailto:waditos@gmail.com)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Albano Battistella](mailto:albano_battistella@hotmail.com)  |  81%
+<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  81%
+<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  82%
+<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MHolkamp](mailto:mholkamp@users.noreply.github.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  58%
+<img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [X3NO](mailto:X3NO@disroot.org)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Renato Nunes Bastos](mailto:rnbastos@gmail.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  76%
+<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  53%
+<img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  84%
+<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  38%
+<img src="https://joplinapp.org/images/flags/country-4x3/vn.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  82%
+<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  76%
+<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  84%
+<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  68%
+<img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [KaneGreen](mailto:737445366KG@Gmail.com)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Kevin Hsu](mailto:kevin.hsu.hws@gmail.com)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  94%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->

 # Contributors
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,3 +9,7 @@ Only the latest version is supported with security updates.
 Please [contact support](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/AdresseSupport.png) **with a proof of concept** that shows the security vulnerability. Please do not contact us without this proof of concept, as we cannot fix anything without this.

 For general opinions on what makes an app more or less secure, please use the forum.
+
+## Bounty
+
+We **do not** offer a bounty for discovering vulnerabilities, please do not ask. We can however credit you and link to your website in the changelog and release announcement.
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,6 @@
  "packages": [
    "packages/*"
  ],
-  "version": "independent"
+  "version": "independent",
+  "useWorkspaces": true
 }
--- a/package.json
+++ b/package.json
@@ -62,29 +62,33 @@
    }
  },
  "devDependencies": {
-    "@seiyab/eslint-plugin-react-hooks": "^4.5.1-alpha.5",
-    "@typescript-eslint/eslint-plugin": "^5.33.1",
-    "@typescript-eslint/parser": "^5.33.1",
-    "cspell": "^5.20.0",
-    "eslint": "^8.22.0",
-    "eslint-interactive": "^10.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-react": "^7.30.1",
-    "fs-extra": "^8.1.0",
-    "glob": "^7.1.6",
-    "gulp": "^4.0.2",
-    "husky": "^3.0.2",
-    "lerna": "^3.22.1",
-    "lint-staged": "^9.2.1",
-    "madge": "^4.0.2",
-    "typedoc": "^0.17.8",
+    "@seiyab/eslint-plugin-react-hooks": "4.5.1-alpha.5",
+    "@typescript-eslint/eslint-plugin": "5.42.1",
+    "@typescript-eslint/parser": "5.42.1",
+    "cspell": "5.21.2",
+    "eslint": "8.27.0",
+    "eslint-interactive": "10.2.0",
+    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-promise": "6.1.1",
+    "eslint-plugin-react": "7.31.10",
+    "fs-extra": "8.1.0",
+    "glob": "7.2.3",
+    "gulp": "4.0.2",
+    "husky": "3.1.0",
+    "lerna": "3.22.1",
+    "lint-staged": "9.5.0",
+    "madge": "4.0.2",
+    "typedoc": "0.17.8",
    "typescript": "4.7.4"
  },
  "dependencies": {
-    "@types/fs-extra": "^9.0.13",
-    "http-server": "^0.12.3",
-    "node-gyp": "^8.4.1",
-    "nodemon": "^2.0.9"
+    "@types/fs-extra": "9.0.13",
+    "http-server": "0.13.0",
+    "node-gyp": "8.4.1",
+    "nodemon": "2.0.20"
  },
-  "packageManager": "yarn@3.1.1"
+  "packageManager": "yarn@3.2.4",
+  "resolutions": {
+    "joplin-rn-alarm-notification@1.0.5": "patch:joplin-rn-alarm-notification@npm:1.0.5#.yarn/patches/joplin-rn-alarm-notification-npm-1.0.5-662e871c03"
+  }
 }
--- a/packages/app-cli/app/app-gui.js
+++ b/packages/app-cli/app/app-gui.js
@@ -375,6 +375,11 @@ class AppGui {
 		this.showNoteMetadata(!this.widget('noteMetadata').shown);
 	}

+	toggleFolderIds() {
+		this.widget('folderList').toggleShowIds();
+		this.widget('noteList').toggleShowIds();
+	}
+
 	widget(name) {
 		if (name === 'root') return this.rootWidget_;
 		return this.rootWidget_.childByName(name);
@@ -498,6 +503,8 @@ class AppGui {
 			}
 		} else if (cmd === 'toggle_metadata') {
 			this.toggleNoteMetadata();
+		} else if (cmd === 'toggle_ids') {
+			this.toggleFolderIds();
 		} else if (cmd === 'enter_command_line_mode') {
 			const cmd = await this.widget('statusBar').prompt();
 			if (!cmd) return;
--- a/packages/app-cli/app/app.js
+++ b/packages/app-cli/app/app.js
@@ -16,6 +16,7 @@ const { cliUtils } = require('./cli-utils.js');
 const Cache = require('@joplin/lib/Cache');
 const RevisionService = require('@joplin/lib/services/RevisionService').default;
 const shim = require('@joplin/lib/shim').default;
+const setupCommand = require('./setupCommand').default;

 class Application extends BaseApplication {
 	constructor() {
@@ -114,46 +115,12 @@ class Application extends BaseApplication {
 		return [];
 	}

-	stdout(text) {
-		return this.gui().stdout(text);
+	setupCommand(cmd) {
+		return setupCommand(cmd, t => this.stdout(t), () => this.store(), () => this.gui());
 	}

-	setupCommand(cmd) {
-		cmd.setStdout(text => {
-			return this.stdout(text);
-		});
-
-		cmd.setDispatcher(action => {
-			if (this.store()) {
-				return this.store().dispatch(action);
-			} else {
-				return () => {};
-			}
-		});
-
-		cmd.setPrompt(async (message, options) => {
-			if (!options) options = {};
-			if (!options.type) options.type = 'boolean';
-			if (!options.booleanAnswerDefault) options.booleanAnswerDefault = 'y';
-			if (!options.answers) options.answers = options.booleanAnswerDefault === 'y' ? [_('Y'), _('n')] : [_('N'), _('y')];
-
-			if (options.type === 'boolean') {
-				message += ` (${options.answers.join('/')})`;
-			}
-
-			let answer = await this.gui().prompt('', `${message} `, options);
-
-			if (options.type === 'boolean') {
-				if (answer === null) return false; // Pressed ESCAPE
-				if (!answer) answer = options.answers[0];
-				const positiveIndex = options.booleanAnswerDefault === 'y' ? 0 : 1;
-				return answer.toLowerCase() === options.answers[positiveIndex].toLowerCase();
-			} else {
-				return answer;
-			}
-		});
-
-		return cmd;
+	stdout(text) {
+		return this.gui().stdout(text);
 	}

 	async exit(code = 0) {
@@ -180,6 +147,7 @@ class Application extends BaseApplication {
 		if (!this.allCommandsLoaded_) {
 			fs.readdirSync(__dirname).forEach(path => {
 				if (path.indexOf('command-') !== 0) return;
+				if (path.endsWith('.test.js')) return;
 				const ext = fileExtension(path);
 				if (ext !== 'js') return;

@@ -332,6 +300,7 @@ class Application extends BaseApplication {
 			{ keys: [' '], command: 'todo toggle $n' },
 			{ keys: ['tc'], type: 'function', command: 'toggle_console' },
 			{ keys: ['tm'], type: 'function', command: 'toggle_metadata' },
+			{ keys: ['ti'], type: 'function', command: 'toggle_ids' },
 			{ keys: ['/'], type: 'prompt', command: 'search ""', cursorPosition: -2 },
 			{ keys: ['mn'], type: 'prompt', command: 'mknote ""', cursorPosition: -2 },
 			{ keys: ['mt'], type: 'prompt', command: 'mktodo ""', cursorPosition: -2 },
--- a/packages/app-cli/app/autocompletion.js
+++ b/packages/app-cli/app/autocompletion.js
@@ -124,6 +124,7 @@ async function handleAutocompletionPromise(line) {
 	return line;
 }
 function handleAutocompletion(str, callback) {
+// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
 	handleAutocompletionPromise(str).then(function(res) {
 		callback(undefined, res);
 	});
--- a/packages/app-cli/app/base-command.js
+++ b/packages/app-cli/app/base-command.js
@@ -1,97 +1,97 @@
-const { _ } = require('@joplin/lib/locale');
-const { reg } = require('@joplin/lib/registry.js');
-
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const locale_1 = require("@joplin/lib/locale");
+const registry_js_1 = require("@joplin/lib/registry.js");
 class BaseCommand {
-	constructor() {
-		this.stdout_ = null;
-		this.prompt_ = null;
-	}
-
-	usage() {
-		throw new Error('Usage not defined');
-	}
-
-	encryptionCheck(item) {
-		if (item && item.encryption_applied) throw new Error(_('Cannot change encrypted item'));
-	}
-
-	description() {
-		throw new Error('Description not defined');
-	}
-
-	async action() {
-		throw new Error('Action not defined');
-	}
-
-	compatibleUis() {
-		return ['cli', 'gui'];
-	}
-
-	supportsUi(ui) {
-		return this.compatibleUis().indexOf(ui) >= 0;
-	}
-
-	options() {
-		return [];
-	}
-
-	hidden() {
-		return false;
-	}
-
-	enabled() {
-		return true;
-	}
-
-	cancellable() {
-		return false;
-	}
-
-	async cancel() {}
-
-	name() {
-		const r = this.usage().split(' ');
-		return r[0];
-	}
-
-	setDispatcher(fn) {
-		this.dispatcher_ = fn;
-	}
-
-	dispatch(action) {
-		if (!this.dispatcher_) throw new Error('Dispatcher not defined');
-		return this.dispatcher_(action);
-	}
-
-	setStdout(fn) {
-		this.stdout_ = fn;
-	}
-
-	stdout(text) {
-		if (this.stdout_) this.stdout_(text);
-	}
-
-	setPrompt(fn) {
-		this.prompt_ = fn;
-	}
-
-	async prompt(message, options = null) {
-		if (!this.prompt_) throw new Error('Prompt is undefined');
-		return await this.prompt_(message, options);
-	}
-
-	metadata() {
-		return {
-			name: this.name(),
-			usage: this.usage(),
-			options: this.options(),
-			hidden: this.hidden(),
-		};
-	}
-
-	logger() {
-		return reg.logger();
-	}
+    constructor() {
+        this.stdout_ = null;
+        this.prompt_ = null;
+    }
+    usage() {
+        throw new Error('Usage not defined');
+    }
+    encryptionCheck(item) {
+        if (item && item.encryption_applied)
+            throw new Error((0, locale_1._)('Cannot change encrypted item'));
+    }
+    description() {
+        throw new Error('Description not defined');
+    }
+    action(_args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('Action not defined');
+        });
+    }
+    compatibleUis() {
+        return ['cli', 'gui'];
+    }
+    supportsUi(ui) {
+        return this.compatibleUis().indexOf(ui) >= 0;
+    }
+    options() {
+        return [];
+    }
+    hidden() {
+        return false;
+    }
+    enabled() {
+        return true;
+    }
+    cancellable() {
+        return false;
+    }
+    cancel() {
+        return __awaiter(this, void 0, void 0, function* () { });
+    }
+    name() {
+        const r = this.usage().split(' ');
+        return r[0];
+    }
+    setDispatcher(fn) {
+        this.dispatcher_ = fn;
+    }
+    dispatch(action) {
+        if (!this.dispatcher_)
+            throw new Error('Dispatcher not defined');
+        return this.dispatcher_(action);
+    }
+    setStdout(fn) {
+        this.stdout_ = fn;
+    }
+    stdout(text) {
+        if (this.stdout_)
+            this.stdout_(text);
+    }
+    setPrompt(fn) {
+        this.prompt_ = fn;
+    }
+    prompt(message, options = null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.prompt_)
+                throw new Error('Prompt is undefined');
+            return yield this.prompt_(message, options);
+        });
+    }
+    metadata() {
+        return {
+            name: this.name(),
+            usage: this.usage(),
+            options: this.options(),
+            hidden: this.hidden(),
+        };
+    }
+    logger() {
+        return registry_js_1.reg.logger();
+    }
 }
-
-module.exports = { BaseCommand };
+exports.default = BaseCommand;
+//# sourceMappingURL=base-command.js.map
--- a/packages/app-cli/app/base-command.ts
+++ b/packages/app-cli/app/base-command.ts
@@ -0,0 +1,95 @@
+import { _ } from '@joplin/lib/locale';
+import { reg } from '@joplin/lib/registry.js';
+
+export default class BaseCommand {
+
+	protected stdout_: any = null;
+	protected prompt_: any = null;
+	protected dispatcher_: any;
+
+	usage(): string {
+		throw new Error('Usage not defined');
+	}
+
+	encryptionCheck(item: any) {
+		if (item && item.encryption_applied) throw new Error(_('Cannot change encrypted item'));
+	}
+
+	description() {
+		throw new Error('Description not defined');
+	}
+
+	async action(_args: any) {
+		throw new Error('Action not defined');
+	}
+
+	compatibleUis() {
+		return ['cli', 'gui'];
+	}
+
+	supportsUi(ui: string) {
+		return this.compatibleUis().indexOf(ui) >= 0;
+	}
+
+	options(): any[] {
+		return [];
+	}
+
+	hidden() {
+		return false;
+	}
+
+	enabled() {
+		return true;
+	}
+
+	cancellable() {
+		return false;
+	}
+
+	async cancel() {}
+
+	name() {
+		const r = this.usage().split(' ');
+		return r[0];
+	}
+
+	setDispatcher(fn: Function) {
+		this.dispatcher_ = fn;
+	}
+
+	dispatch(action: any) {
+		if (!this.dispatcher_) throw new Error('Dispatcher not defined');
+		return this.dispatcher_(action);
+	}
+
+	setStdout(fn: Function) {
+		this.stdout_ = fn;
+	}
+
+	stdout(text: string) {
+		if (this.stdout_) this.stdout_(text);
+	}
+
+	setPrompt(fn: Function) {
+		this.prompt_ = fn;
+	}
+
+	async prompt(message: string, options: any = null) {
+		if (!this.prompt_) throw new Error('Prompt is undefined');
+		return await this.prompt_(message, options);
+	}
+
+	metadata() {
+		return {
+			name: this.name(),
+			usage: this.usage(),
+			options: this.options(),
+			hidden: this.hidden(),
+		};
+	}
+
+	logger() {
+		return reg.logger();
+	}
+}
--- a/packages/app-cli/app/command-apidoc.js
+++ b/packages/app-cli/app/command-apidoc.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const BaseItem = require('@joplin/lib/models/BaseItem').default;
 const BaseModel = require('@joplin/lib/BaseModel').default;
 const { toTitleCase } = require('@joplin/lib/string-utils.js');
--- a/packages/app-cli/app/command-attach.js
+++ b/packages/app-cli/app/command-attach.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/app/command-batch.js
+++ b/packages/app-cli/app/command-batch.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { _ } = require('@joplin/lib/locale');

 class Command extends BaseCommand {
--- a/packages/app-cli/app/command-cat.js
+++ b/packages/app-cli/app/command-cat.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/app/command-config.js
+++ b/packages/app-cli/app/command-config.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { _, setLocale } = require('@joplin/lib/locale');
 const { app } = require('./app.js');
 const fs = require('fs-extra');
--- a/packages/app-cli/app/command-cp.js
+++ b/packages/app-cli/app/command-cp.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/app/command-done.js
+++ b/packages/app-cli/app/command-done.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/app/command-done.test.ts
+++ b/packages/app-cli/app/command-done.test.ts
@@ -0,0 +1,27 @@
+import Note from '@joplin/lib/models/Note';
+import { NoteEntity } from '@joplin/lib/services/database/types';
+import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
+import { setupCommandForTesting, setupApplication } from './utils/testUtils';
+const Command = require('./command-done');
+
+describe('command-done', () => {
+
+	beforeEach(async () => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		await setupApplication();
+	});
+
+	it('should make a note as "done"', async () => {
+		const note = await Note.save({ title: 'hello', is_todo: 1, todo_completed: 0 });
+
+		const command = setupCommandForTesting(Command);
+
+		const now = Date.now();
+		await command.action({ note: note.id });
+
+		const checkNote: NoteEntity = await Note.load(note.id);
+		expect(checkNote.todo_completed).toBeGreaterThanOrEqual(now);
+	});
+
+});
--- a/packages/app-cli/app/command-dump.js
+++ b/packages/app-cli/app/command-dump.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const Folder = require('@joplin/lib/models/Folder').default;
 const Note = require('@joplin/lib/models/Note').default;
 const Tag = require('@joplin/lib/models/Tag').default;
--- a/packages/app-cli/app/command-e2ee.ts
+++ b/packages/app-cli/app/command-e2ee.ts
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 import { _ } from '@joplin/lib/locale';
 import EncryptionService from '@joplin/lib/services/e2ee/EncryptionService';
 import DecryptionWorker from '@joplin/lib/services/DecryptionWorker';
--- a/packages/app-cli/app/command-edit.js
+++ b/packages/app-cli/app/command-edit.js
@@ -1,5 +1,5 @@
 const fs = require('fs-extra');
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { splitCommandString } = require('@joplin/lib/string-utils.js');
 const uuid = require('@joplin/lib/uuid').default;
 const { app } = require('./app.js');
--- a/packages/app-cli/app/command-exit.js
+++ b/packages/app-cli/app/command-exit.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');

--- a/packages/app-cli/app/command-export-sync-status.js
+++ b/packages/app-cli/app/command-export-sync-status.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const Setting = require('@joplin/lib/models/Setting').default;
 const ReportService = require('@joplin/lib/services/ReportService').default;
--- a/packages/app-cli/app/command-export.js
+++ b/packages/app-cli/app/command-export.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const InteropService = require('@joplin/lib/services/interop/InteropService').default;
 const BaseModel = require('@joplin/lib/BaseModel').default;
 const { app } = require('./app.js');
--- a/packages/app-cli/app/command-geoloc.js
+++ b/packages/app-cli/app/command-geoloc.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/app/command-help.js
+++ b/packages/app-cli/app/command-help.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { renderCommandHelp } = require('./help-utils.js');
 const { _ } = require('@joplin/lib/locale');
--- a/packages/app-cli/app/command-import.js
+++ b/packages/app-cli/app/command-import.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const InteropService = require('@joplin/lib/services/interop/InteropService').default;
 const BaseModel = require('@joplin/lib/BaseModel').default;
 const { cliUtils } = require('./cli-utils.js');
--- a/packages/app-cli/app/command-ls.js
+++ b/packages/app-cli/app/command-ls.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/app/command-mkbook.js
+++ b/packages/app-cli/app/command-mkbook.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const Folder = require('@joplin/lib/models/Folder').default;
--- a/packages/app-cli/app/command-mknote.js
+++ b/packages/app-cli/app/command-mknote.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const Note = require('@joplin/lib/models/Note').default;
--- a/packages/app-cli/app/command-mktodo.js
+++ b/packages/app-cli/app/command-mktodo.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const Note = require('@joplin/lib/models/Note').default;
--- a/packages/app-cli/app/command-mv.js
+++ b/packages/app-cli/app/command-mv.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
@@ -7,25 +7,45 @@ const Note = require('@joplin/lib/models/Note').default;

 class Command extends BaseCommand {
 	usage() {
-		return 'mv <note> [notebook]';
+		return 'mv <item> [notebook]';
 	}

 	description() {
-		return _('Moves the notes matching <note> to [notebook].');
+		return _('Moves the given <item> to [notebook]');
 	}

 	async action(args) {
-		const pattern = args['note'];
+		const pattern = args['item'];
 		const destination = args['notebook'];
+		let folder = null;

-		const folder = await Folder.loadByField('title', destination);
-		if (!folder) throw new Error(_('Cannot find "%s".', destination));
+		if (destination !== 'root') {
+			folder = await app().loadItem(BaseModel.TYPE_FOLDER, destination);
+			if (!folder) throw new Error(_('Cannot find "%s".', destination));
+		}

-		const notes = await app().loadItems(BaseModel.TYPE_NOTE, pattern);
-		if (!notes.length) throw new Error(_('Cannot find "%s".', pattern));
+		const destinationDuplicates = await Folder.search({ titlePattern: destination, limit: 2 });
+		if (destinationDuplicates.length > 1) {
+			throw new Error(_('Ambiguous notebook "%s". Please use short notebook id instead - press "ti" to see the short notebook id' , destination));
+		}

-		for (let i = 0; i < notes.length; i++) {
-			await Note.moveToFolder(notes[i].id, folder.id);
+		const itemFolder = await app().loadItem(BaseModel.TYPE_FOLDER, pattern);
+		if (itemFolder) {
+			const sourceDuplicates = await Folder.search({ titlePattern: pattern, limit: 2 });
+			if (sourceDuplicates.length > 1) {
+				throw new Error(_('Ambiguous notebook "%s". Please use notebook id instead - press "ti" to see the short notebook id or use $b for current selected notebook', pattern));
+			}
+			if (destination === 'root') {
+				await Folder.moveToFolder(itemFolder.id, '');
+			} else {
+				await Folder.moveToFolder(itemFolder.id, folder.id);
+			}
+		} else {
+			const notes = await app().loadItems(BaseModel.TYPE_NOTE, pattern);
+			if (notes.length === 0) throw new Error(_('Cannot find "%s".', pattern));
+			for (let i = 0; i < notes.length; i++) {
+				await Note.moveToFolder(notes[i].id, folder.id);
+			}
 		}
 	}
 }
--- a/packages/app-cli/app/command-ren.js
+++ b/packages/app-cli/app/command-ren.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/app/command-rmbook.js
+++ b/packages/app-cli/app/command-rmbook.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const Folder = require('@joplin/lib/models/Folder').default;
--- a/packages/app-cli/app/command-rmnote.js
+++ b/packages/app-cli/app/command-rmnote.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const Note = require('@joplin/lib/models/Note').default;
--- a/packages/app-cli/app/command-search.js
+++ b/packages/app-cli/app/command-search.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
 const Folder = require('@joplin/lib/models/Folder').default;
--- a/packages/app-cli/app/command-server.js
+++ b/packages/app-cli/app/command-server.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { _ } = require('@joplin/lib/locale');
 const Setting = require('@joplin/lib/models/Setting').default;
 const Logger = require('@joplin/lib/Logger').default;
--- a/packages/app-cli/app/command-set.js
+++ b/packages/app-cli/app/command-set.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/app/command-settingschema.ts
+++ b/packages/app-cli/app/command-settingschema.ts
@@ -2,7 +2,7 @@ import Setting, { SettingStorage } from '@joplin/lib/models/Setting';
 import { SettingItemType } from '@joplin/lib/services/plugins/api/types';
 import shim from '@joplin/lib/shim';

-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;

 function settingTypeToSchemaType(type: SettingItemType): string {
 	const map: Record<SettingItemType, string> = {
--- a/packages/app-cli/app/command-status.js
+++ b/packages/app-cli/app/command-status.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const Setting = require('@joplin/lib/models/Setting').default;
 const { _ } = require('@joplin/lib/locale');
--- a/packages/app-cli/app/command-sync.ts
+++ b/packages/app-cli/app/command-sync.ts
@@ -6,7 +6,7 @@ import ResourceFetcher from '@joplin/lib/services/ResourceFetcher';
 import Synchronizer from '@joplin/lib/Synchronizer';
 import { masterKeysWithoutPassword } from '@joplin/lib/services/e2ee/utils';
 import { appTypeToLockType } from '@joplin/lib/services/synchronizer/LockHandler';
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { OneDriveApiNodeUtils } = require('@joplin/lib/onedrive-api-node-utils.js');
 const { reg } = require('@joplin/lib/registry.js');
--- a/packages/app-cli/app/command-tag.js
+++ b/packages/app-cli/app/command-tag.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const Tag = require('@joplin/lib/models/Tag').default;
--- a/packages/app-cli/app/command-testing.ts
+++ b/packages/app-cli/app/command-testing.ts
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 import { reg } from '@joplin/lib/registry';
 import Note from '@joplin/lib/models/Note';
 import uuid from '@joplin/lib/uuid';
--- a/packages/app-cli/app/command-todo.js
+++ b/packages/app-cli/app/command-todo.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/app/command-undone.js
+++ b/packages/app-cli/app/command-undone.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { _ } = require('@joplin/lib/locale');

 const CommandDone = require('./command-done.js');
--- a/packages/app-cli/app/command-use.js
+++ b/packages/app-cli/app/command-use.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/app/command-version.js
+++ b/packages/app-cli/app/command-version.js
@@ -1,4 +1,4 @@
-const { BaseCommand } = require('./base-command.js');
+const BaseCommand = require('./base-command').default;
 const { _ } = require('@joplin/lib/locale');
 const versionInfo = require('@joplin/lib/versionInfo').default;

--- a/packages/app-cli/app/fuzzing.js
+++ b/packages/app-cli/app/fuzzing.js
@@ -36,6 +36,7 @@ async function createClients() {
 		const client = createClient(clientId);
 		promises.push(fs.remove(client.profileDir));
 		promises.push(
+			// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
 			execCommand(client, 'config sync.target 2').then(() => {
 				return execCommand(client, `config sync.2.path ${syncDir}`);
 			})
@@ -2324,10 +2325,12 @@ async function main() {
 		clients[clientId].activeCommandCount++;

 		execRandomCommand(clients[clientId])
+		// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
 			.catch(error => {
 				logger.info(`Client ${clientId}:`);
 				logger.error(error);
 			})
+		// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
 			.then(r => {
 				if (r) {
 					logger.info(`Client ${clientId}:\n${r.trim()}`);
--- a/packages/app-cli/app/gui/FolderListWidget.js
+++ b/packages/app-cli/app/gui/FolderListWidget.js
@@ -19,13 +19,20 @@ class FolderListWidget extends ListWidget {
 		this.updateIndexFromSelectedFolderId_ = false;
 		this.updateItems_ = false;
 		this.trimItemTitle = false;
+		this.showIds = false;

 		this.itemRenderer = item => {
 			const output = [];
 			if (item === '-') {
 				output.push('-'.repeat(this.innerWidth));
 			} else if (item.type_ === Folder.modelType()) {
-				output.push(' '.repeat(this.folderDepth(this.folders, item.id)) + Folder.displayTitle(item));
+				output.push(' '.repeat(this.folderDepth(this.folders, item.id)));
+
+				if (this.showIds) {
+					output.push(Folder.shortId(item.id));
+				}
+				output.push(Folder.displayTitle(item));
+
 				if (Setting.value('showNoteCounts')) {
 					let noteCount = item.note_count;
 					// Subtract children note_count from parent folder.
@@ -132,6 +139,11 @@ class FolderListWidget extends ListWidget {
 		this.invalidate();
 	}

+	toggleShowIds() {
+		this.showIds = !this.showIds;
+		this.invalidate();
+	}
+
 	folderHasChildren_(folders, folderId) {
 		for (let i = 0; i < folders.length; i++) {
 			const folder = folders[i];
--- a/packages/app-cli/app/gui/NoteListWidget.js
+++ b/packages/app-cli/app/gui/NoteListWidget.js
@@ -5,11 +5,15 @@ class NoteListWidget extends ListWidget {
 	constructor() {
 		super();
 		this.selectedNoteId_ = 0;
+		this.showIds = false;

 		this.updateIndexFromSelectedNoteId_ = false;

 		this.itemRenderer = note => {
-			let label = Note.displayTitle(note); // + ' ' + note.id;
+			let label = Note.displayTitle(note);
+			if (this.showIds) {
+				label = `${Note.shortId(note.id)} ${Note.displayTitle(note)}`;
+			}
 			if (note.is_todo) {
 				label = `[${note.todo_completed ? 'X' : ' '}] ${label}`;
 			}
@@ -22,6 +26,11 @@ class NoteListWidget extends ListWidget {
 		this.selectedNoteId_ = v;
 	}

+	toggleShowIds() {
+		this.showIds = !this.showIds;
+		this.invalidate();
+	}
+
 	render() {
 		if (this.updateIndexFromSelectedNoteId_) {
 			const index = this.itemIndexByKey('id', this.selectedNoteId_);
--- a/packages/app-cli/app/services/plugins/PluginRunner.ts
+++ b/packages/app-cli/app/services/plugins/PluginRunner.ts
@@ -50,6 +50,7 @@ export default class PluginRunner extends BasePluginRunner {
 			const callId = `${pluginId}::${path}::${uuid.createNano()}`;
 			this.activeSandboxCalls_[callId] = true;
 			const promise = executeSandboxCall(pluginId, sandbox, `joplin.${path}`, mapEventHandlersToIds(args, this.eventHandlers_), this.eventHandler);
+			// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
 			promise.finally(() => {
 				delete this.activeSandboxCalls_[callId];
 			});
--- a/packages/app-cli/app/setupCommand.ts
+++ b/packages/app-cli/app/setupCommand.ts
@@ -0,0 +1,39 @@
+import { _ } from '@joplin/lib/locale';
+
+export default (cmd: any, stdout: Function, store: Function, gui: Function) => {
+	cmd.setStdout((text: string) => {
+		return stdout(text);
+	});
+
+	cmd.setDispatcher((action: any) => {
+		if (store()) {
+			return store().dispatch(action);
+		} else {
+			return () => {};
+		}
+	});
+
+	cmd.setPrompt(async (message: string, options: any) => {
+		if (!options) options = {};
+		if (!options.type) options.type = 'boolean';
+		if (!options.booleanAnswerDefault) options.booleanAnswerDefault = 'y';
+		if (!options.answers) options.answers = options.booleanAnswerDefault === 'y' ? [_('Y'), _('n')] : [_('N'), _('y')];
+
+		if (options.type === 'boolean') {
+			message += ` (${options.answers.join('/')})`;
+		}
+
+		let answer = await gui().prompt('', `${message} `, options);
+
+		if (options.type === 'boolean') {
+			if (answer === null) return false; // Pressed ESCAPE
+			if (!answer) answer = options.answers[0];
+			const positiveIndex = options.booleanAnswerDefault === 'y' ? 0 : 1;
+			return answer.toLowerCase() === options.answers[positiveIndex].toLowerCase();
+		} else {
+			return answer;
+		}
+	});
+
+	return cmd;
+};
--- a/packages/app-cli/app/utils/testUtils.ts
+++ b/packages/app-cli/app/utils/testUtils.ts
@@ -0,0 +1,17 @@
+const { app } = require('../app');
+import Folder from '@joplin/lib/models/Folder';
+import BaseCommand from '../base-command';
+import setupCommand from '../setupCommand';
+
+export const setupCommandForTesting = (CommandClass: any, stdout: Function = null): BaseCommand => {
+	const command = new CommandClass();
+	setupCommand(command, stdout, null, null);
+	return command;
+};
+
+export const setupApplication = async () => {
+	// We create a notebook and set it as default since most commands require
+	// such notebook.
+	await Folder.save({ title: 'default' });
+	await app().refreshCurrentFolder();
+};
--- a/packages/app-cli/jest.config.js
+++ b/packages/app-cli/jest.config.js
@@ -27,6 +27,7 @@
 module.exports = {
 	testMatch: [
 		'**/tests/**/*.js',
+		'**/*.test.js',
 	],

 	testPathIgnorePatterns: [
--- a/packages/app-cli/package.json
+++ b/packages/app-cli/package.json
@@ -29,11 +29,12 @@
      2018,
      2019,
      2020,
-      2021
+      2021,
+      2022
    ],
    "owner": "Laurent Cozic"
  },
-  "version": "2.9.0",
+  "version": "2.9.1",
  "bin": "./main.js",
  "engines": {
    "node": ">=10.0.0"
@@ -41,39 +42,39 @@
  "dependencies": {
    "@joplin/lib": "~2.9",
    "@joplin/renderer": "~2.9",
-    "aws-sdk": "^2.588.0",
-    "chalk": "^4.1.0",
-    "compare-version": "^0.1.2",
-    "fs-extra": "^5.0.0",
-    "html-entities": "^1.2.1",
-    "image-type": "^3.0.0",
-    "keytar": "^7.0.0",
-    "md5": "^2.2.1",
-    "node-rsa": "^1.1.1",
-    "open": "^7.0.4",
-    "proper-lockfile": "^2.0.1",
-    "read-chunk": "^2.1.0",
-    "server-destroy": "^1.0.1",
-    "sharp": "^0.26.2",
-    "sprintf-js": "^1.1.2",
-    "sqlite3": "^5.0.2",
-    "string-padding": "^1.0.2",
-    "strip-ansi": "^4.0.0",
-    "tcp-port-used": "^1.0.2",
-    "terminal-kit": "^1.30.0",
+    "aws-sdk": "2.1251.0",
+    "chalk": "4.1.2",
+    "compare-version": "0.1.2",
+    "fs-extra": "5.0.0",
+    "html-entities": "1.4.0",
+    "image-type": "3.1.0",
+    "keytar": "7.9.0",
+    "md5": "2.3.0",
+    "node-rsa": "1.1.1",
+    "open": "7.4.2",
+    "proper-lockfile": "2.0.1",
+    "read-chunk": "2.1.0",
+    "server-destroy": "1.0.1",
+    "sharp": "0.31.2",
+    "sprintf-js": "1.1.2",
+    "sqlite3": "5.0.2",
+    "string-padding": "1.0.2",
+    "strip-ansi": "4.0.0",
+    "tcp-port-used": "1.0.2",
+    "terminal-kit": "1.49.4",
    "tkwidgets": "0.5.27",
-    "url-parse": "^1.4.7",
-    "word-wrap": "^1.2.3",
-    "yargs-parser": "^7.0.0"
+    "url-parse": "1.5.10",
+    "word-wrap": "1.2.3",
+    "yargs-parser": "7.0.0"
  },
  "devDependencies": {
    "@joplin/tools": "~2.9",
-    "@types/fs-extra": "^9.0.6",
-    "@types/jest": "^26.0.15",
-    "@types/node": "^14.14.6",
-    "gulp": "^4.0.2",
-    "jest": "^26.6.3",
-    "temp": "^0.9.1",
-    "typescript": "^4.0.5"
+    "@types/fs-extra": "9.0.13",
+    "@types/jest": "26.0.24",
+    "@types/node": "18.11.9",
+    "gulp": "4.0.2",
+    "jest": "26.6.3",
+    "temp": "0.9.4",
+    "typescript": "4.5.2"
  }
 }
--- a/packages/app-cli/tests/services/plugins/defaultPluginsUtils.ts
+++ b/packages/app-cli/tests/services/plugins/defaultPluginsUtils.ts
@@ -0,0 +1,269 @@
+import { installDefaultPlugins, getDefaultPluginsInstallState, setSettingsForDefaultPlugins, checkPreInstalledDefaultPlugins } from '@joplin/lib/services/plugins/defaultPlugins/defaultPluginsUtils';
+import PluginRunner from '../../../app/services/plugins/PluginRunner';
+import { pathExists } from 'fs-extra';
+import { checkThrow, setupDatabaseAndSynchronizer, supportDir, switchClient } from '@joplin/lib/testing/test-utils';
+import PluginService, { defaultPluginSetting, DefaultPluginsInfo, PluginSettings } from '@joplin/lib/services/plugins/PluginService';
+import Setting from '@joplin/lib/models/Setting';
+
+const testPluginDir = `${supportDir}/plugins`;
+
+function newPluginService(appVersion: string = '1.4') {
+	const runner = new PluginRunner();
+	const service = new PluginService();
+	service.initialize(
+		appVersion,
+		{
+			joplin: {},
+		},
+		runner,
+		{
+			dispatch: () => {},
+			getState: () => {},
+		}
+	);
+	return service;
+}
+
+describe('defaultPluginsUtils', function() {
+
+	const pluginsId = ['joplin.plugin.ambrt.backlinksToNote', 'org.joplinapp.plugins.ToggleSidebars'];
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should install default plugins with no previous default plugins installed', (async () => {
+		const testPluginDir = `${supportDir}/pluginRepo/plugins`;
+		Setting.setValue('installedDefaultPlugins', []);
+
+		const service = newPluginService('2.1');
+
+		const pluginSettings = service.unserializePluginSettings(Setting.value('plugins.states'));
+
+		const newPluginsSettings = await installDefaultPlugins(service, testPluginDir, pluginsId, pluginSettings);
+
+		const installedPluginPath1 = `${Setting.value('pluginDir')}/${pluginsId[0]}.jpl`;
+		const installedPluginPath2 = `${Setting.value('pluginDir')}/${pluginsId[1]}.jpl`;
+
+		expect(await pathExists(installedPluginPath1)).toBe(true);
+		expect(await pathExists(installedPluginPath2)).toBe(true);
+
+		expect(newPluginsSettings[pluginsId[0]]).toMatchObject(defaultPluginSetting());
+		expect(newPluginsSettings[pluginsId[1]]).toMatchObject(defaultPluginSetting());
+
+	}));
+
+	it('should install default plugins with previous default plugins installed', (async () => {
+
+		const testPluginDir = `${supportDir}/pluginRepo/plugins`;
+		Setting.setValue('installedDefaultPlugins', ['org.joplinapp.plugins.ToggleSidebars']);
+
+		const service = newPluginService('2.1');
+
+		const pluginSettings = service.unserializePluginSettings(Setting.value('plugins.states'));
+
+		const newPluginsSettings = await installDefaultPlugins(service, testPluginDir, pluginsId, pluginSettings);
+
+		const installedPluginPath1 = `${Setting.value('pluginDir')}/${pluginsId[0]}.jpl`;
+		const installedPluginPath2 = `${Setting.value('pluginDir')}/${pluginsId[1]}.jpl`;
+
+		expect(await pathExists(installedPluginPath1)).toBe(true);
+		expect(await pathExists(installedPluginPath2)).toBe(false);
+
+		expect(newPluginsSettings[pluginsId[0]]).toMatchObject(defaultPluginSetting());
+		expect(newPluginsSettings[pluginsId[1]]).toBeUndefined();
+	}));
+
+	it('should get default plugins install state', (async () => {
+		const testCases = [
+			{
+				'installedDefaultPlugins': [''],
+				'loadingPlugins': [`${testPluginDir}/simple`, `${testPluginDir}/jpl_test/org.joplinapp.FirstJplPlugin.jpl`],
+				'plugin1DefaultState': defaultPluginSetting(),
+				'plugin2DefaultState': defaultPluginSetting(),
+				'installedDefaultPlugins1': true,
+				'installedDefaultPlugins2': true,
+			},
+			{
+				'installedDefaultPlugins': [''],
+				'loadingPlugins': [`${testPluginDir}/simple`],
+				'plugin1DefaultState': defaultPluginSetting(),
+				'plugin2DefaultState': undefined,
+				'installedDefaultPlugins1': true,
+				'installedDefaultPlugins2': false,
+			},
+			{
+				'installedDefaultPlugins': ['org.joplinapp.plugins.Simple'],
+				'loadingPlugins': [`${testPluginDir}/simple`, `${testPluginDir}/jpl_test/org.joplinapp.FirstJplPlugin.jpl`],
+				'plugin1DefaultState': undefined,
+				'plugin2DefaultState': defaultPluginSetting(),
+				'installedDefaultPlugins1': true,
+				'installedDefaultPlugins2': true,
+			},
+			{
+				'installedDefaultPlugins': ['org.joplinapp.plugins.Simple'],
+				'loadingPlugins': [`${testPluginDir}/simple`],
+				'plugin1DefaultState': undefined,
+				'plugin2DefaultState': undefined,
+				'installedDefaultPlugins1': true,
+				'installedDefaultPlugins2': false,
+			},
+		];
+
+		for (const testCase of testCases) {
+			const service = newPluginService();
+			const pluginsId = ['org.joplinapp.plugins.Simple', 'org.joplinapp.FirstJplPlugin'];
+
+			Setting.setValue('installedDefaultPlugins', testCase.installedDefaultPlugins);
+			await service.loadAndRunPlugins(testCase.loadingPlugins, {});
+
+			// setting installedDefaultPlugins state
+			const defaultInstallStates: PluginSettings = getDefaultPluginsInstallState(service, pluginsId);
+
+			expect(defaultInstallStates[pluginsId[0]]).toStrictEqual(testCase.plugin1DefaultState);
+			expect(defaultInstallStates[pluginsId[1]]).toStrictEqual(testCase.plugin2DefaultState);
+
+
+			const installedDefaultPlugins = Setting.value('installedDefaultPlugins');
+			expect(installedDefaultPlugins.includes(pluginsId[0])).toBe(testCase.installedDefaultPlugins1);
+			expect(installedDefaultPlugins.includes(pluginsId[1])).toBe(testCase.installedDefaultPlugins2);
+
+		}
+
+	}));
+
+	it('should check pre-installed default plugins', (async () => {
+		// with previous pre-installed default plugins
+		Setting.setValue('installedDefaultPlugins', ['']);
+		let pluginSettings, installedDefaultPlugins;
+
+		pluginSettings = { [pluginsId[0]]: defaultPluginSetting() };
+		checkPreInstalledDefaultPlugins(pluginsId, pluginSettings);
+
+		installedDefaultPlugins = Setting.value('installedDefaultPlugins');
+		expect(installedDefaultPlugins.includes(pluginsId[0])).toBe(true);
+		expect(installedDefaultPlugins.includes(pluginsId[1])).toBe(false);
+
+
+		// with no previous pre-installed default plugins
+		Setting.setValue('installedDefaultPlugins', ['not-a-default-plugin']);
+		pluginSettings = {};
+		checkPreInstalledDefaultPlugins(pluginsId, pluginSettings);
+
+		installedDefaultPlugins = Setting.value('installedDefaultPlugins');
+		expect(installedDefaultPlugins.includes(pluginsId[0])).toBe(false);
+		expect(installedDefaultPlugins.includes(pluginsId[1])).toBe(false);
+
+	}));
+
+	it('should set initial settings for default plugins', async () => {
+		const service = newPluginService();
+
+		const pluginScript = `
+		/* joplin-manifest:
+		{
+			"id": "io.github.jackgruber.backup",
+			"manifest_version": 1,
+			"app_min_version": "1.4",
+			"name": "JS Bundle test",
+			"version": "1.0.0"
+		}
+		*/
+		joplin.plugins.register({
+			onStart: async function() {
+				await joplin.settings.registerSettings({
+					path: {
+						value: "initial-path",
+						type: 2,
+						section: "backupSection",
+						public: true,
+						label: "Backup path",
+					  },
+				})
+			},
+		});`;
+
+		const plugin = await service.loadPluginFromJsBundle('', pluginScript);
+		await service.runPlugin(plugin);
+
+		const defaultPluginsInfo: DefaultPluginsInfo = {
+			'io.github.jackgruber.backup': {
+				version: '1.0.2',
+				settings: {
+					'path': `${Setting.value('profileDir')}`,
+				},
+			},
+			'plugin.calebjohn.rich-markdown': {
+				version: '0.8.3',
+			},
+		};
+
+		// with pre-installed default plugin
+		Setting.setValue('installedDefaultPlugins', ['io.github.jackgruber.backup']);
+		setSettingsForDefaultPlugins(defaultPluginsInfo);
+		expect(Setting.value('plugin-io.github.jackgruber.backup.path')).toBe('initial-path');
+		await service.destroy();
+
+		// with no pre-installed default plugin
+		Setting.setValue('installedDefaultPlugins', ['']);
+		setSettingsForDefaultPlugins(defaultPluginsInfo);
+		expect(Setting.value('plugin-io.github.jackgruber.backup.path')).toBe(`${Setting.value('profileDir')}`);
+		await service.destroy();
+	});
+
+	it('should not throw error on missing setting key', async () => {
+
+		const service = newPluginService();
+
+		const pluginScript = `
+		/* joplin-manifest:
+		{
+			"id": "io.github.jackgruber.backup",
+			"manifest_version": 1,
+			"app_min_version": "1.4",
+			"name": "JS Bundle test",
+			"version": "1.0.0"
+		}
+		*/
+		joplin.plugins.register({
+			onStart: async function() {
+				await joplin.settings.registerSettings({
+					path: {
+						value: "initial-path",
+						type: 2,
+						section: "backupSection",
+						public: true,
+						label: "Backup path",
+					  },
+				})
+			},
+		});`;
+
+		const plugin = await service.loadPluginFromJsBundle('', pluginScript);
+		await service.runPlugin(plugin);
+
+		const defaultPluginsInfo: DefaultPluginsInfo = {
+			'io.github.jackgruber.backup': {
+				version: '1.0.2',
+				settings: {
+					'path': `${Setting.value('profileDir')}`,
+					'missing-key1': 'someValue',
+				},
+			},
+			'plugin.calebjohn.rich-markdown': {
+				version: '0.8.3',
+				settings: {
+					'missing-key2': 'someValue',
+				},
+			},
+		};
+
+		Setting.setValue('installedDefaultPlugins', ['']);
+		expect(checkThrow(() => setSettingsForDefaultPlugins(defaultPluginsInfo))).toBe(false);
+		expect(Setting.value('plugin-io.github.jackgruber.backup.path')).toBe(`${Setting.value('profileDir')}`);
+		await service.destroy();
+	});
+
+});
--- a/packages/app-cli/tests/services/plugins/mockData/mockPlugin.tgz
+++ b/packages/app-cli/tests/services/plugins/mockData/mockPlugin.tgz
--- a/packages/app-cli/tests/support/plugins/clipboard/package.json
+++ b/packages/app-cli/tests/support/plugins/clipboard/package.json
@@ -12,16 +12,16 @@
  ],
  "devDependencies": {
    "@types/node": "^14.0.14",
-    "chalk": "^4.1.0",
+    "chalk": "4.1.2",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "yargs": "^16.2.0"
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/package.json
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/content_script/package.json
+++ b/packages/app-cli/tests/support/plugins/content_script/package.json
@@ -14,18 +14,18 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  },
  "dependencies": {
-    "left-pad": "^1.3.0"
+    "left-pad": "1.3.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/dialog/package.json
+++ b/packages/app-cli/tests/support/plugins/dialog/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/editor_context_menu/package.json
+++ b/packages/app-cli/tests/support/plugins/editor_context_menu/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/events/package.json
+++ b/packages/app-cli/tests/support/plugins/events/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/external_assets/package.json
+++ b/packages/app-cli/tests/support/plugins/external_assets/package.json
@@ -12,16 +12,16 @@
  ],
  "devDependencies": {
    "@types/node": "^14.0.14",
-    "chalk": "^4.1.0",
+    "chalk": "4.1.2",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "yargs": "^16.2.0"
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/jpl_test/package.json
+++ b/packages/app-cli/tests/support/plugins/jpl_test/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/json_export/package.json
+++ b/packages/app-cli/tests/support/plugins/json_export/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/load_css/package.json
+++ b/packages/app-cli/tests/support/plugins/load_css/package.json
@@ -12,16 +12,16 @@
  ],
  "devDependencies": {
    "@types/node": "^14.0.14",
-    "chalk": "^4.1.0",
+    "chalk": "4.1.2",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "yargs": "^16.2.0"
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/menu/package.json
+++ b/packages/app-cli/tests/support/plugins/menu/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/multi_selection/package.json
+++ b/packages/app-cli/tests/support/plugins/multi_selection/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/nativeModule/package.json
+++ b/packages/app-cli/tests/support/plugins/nativeModule/package.json
@@ -12,16 +12,16 @@
  ],
  "devDependencies": {
    "@types/node": "^14.0.14",
-    "chalk": "^4.1.0",
+    "chalk": "4.1.2",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "yargs": "^16.2.0"
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/post_messages/package.json
+++ b/packages/app-cli/tests/support/plugins/post_messages/package.json
@@ -12,16 +12,16 @@
  ],
  "devDependencies": {
    "@types/node": "^14.0.14",
-    "chalk": "^4.1.0",
+    "chalk": "4.1.2",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "yargs": "^16.2.0"
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/register_command/package.json
+++ b/packages/app-cli/tests/support/plugins/register_command/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/selected_text/package.json
+++ b/packages/app-cli/tests/support/plugins/selected_text/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/settings/package.json
+++ b/packages/app-cli/tests/support/plugins/settings/package.json
@@ -14,15 +14,15 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/toc/package.json
+++ b/packages/app-cli/tests/support/plugins/toc/package.json
@@ -14,18 +14,18 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  },
  "dependencies": {
    "uslug": "^1.0.4"
  }
-}
+}
--- a/packages/app-cli/tests/support/plugins/withExternalModules/package.json
+++ b/packages/app-cli/tests/support/plugins/withExternalModules/package.json
@@ -14,18 +14,18 @@
  "devDependencies": {
    "@types/node": "^14.0.14",
    "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
+    "fs-extra": "9.1.0",
+    "glob": "7.2.0",
    "on-build-webpack": "^0.1.0",
-    "tar": "^6.0.5",
+    "tar": "6.1.11",
    "ts-loader": "^7.0.5",
    "typescript": "^3.9.3",
    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.11",
-    "chalk": "^4.1.0",
-    "yargs": "^16.2.0"
+    "chalk": "4.1.2",
+    "yargs": "16.2.0"
  },
  "dependencies": {
-    "left-pad": "^1.3.0"
+    "left-pad": "1.3.0"
  }
-}
+}
--- a/packages/app-clipper/popup/config/webpack.config.js
+++ b/packages/app-clipper/popup/config/webpack.config.js
@@ -24,6 +24,19 @@ const getClientEnvironment = require('./env');
 const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
 const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
 const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
+const md5 = require('md5');
+
+class HashGen {
+
+  update(data) {
+    this.data_ = data;
+  }
+
+  digest() {
+    return md5(escape(this.data_));
+  }
+
+}

 const postcssNormalize = require('postcss-normalize');

@@ -166,6 +179,8 @@ module.exports = function(webpackEnv) {
      // changing JS code would still trigger a refresh.
    ].filter(Boolean),
    output: {
+      // Needed to fix this: https://www.reddit.com/r/webdev/comments/qd14bm/node_17_currently_breaks_most_webpack/
+      hashFunction: HashGen,
      // The build folder.
      path: isEnvProduction ? paths.appBuild : undefined,
      // Add /* filename */ comments to generated require()s in the output.
--- a/packages/app-clipper/popup/package-lock.json
+++ b/packages/app-clipper/popup/package-lock.json
--- a/packages/app-clipper/popup/package.json
+++ b/packages/app-clipper/popup/package.json
@@ -13,13 +13,13 @@
    "babel-loader": "8.0.6",
    "babel-plugin-named-asset-import": "^0.3.6",
    "babel-preset-react-app": "^9.1.1",
-    "camelcase": "^5.3.1",
+    "camelcase": "5.3.1",
    "case-sensitive-paths-webpack-plugin": "2.3.0",
-    "css-loader": "3.4.2",
-    "dotenv": "8.2.0",
+    "css-loader": "3.6.0",
+    "dotenv": "8.6.0",
    "dotenv-expand": "5.1.0",
    "file-loader": "4.3.0",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "8.1.0",
    "html-webpack-plugin": "4.0.0-beta.11",
    "identity-obj-proxy": "3.0.0",
    "jest": "24.9.0",
@@ -27,25 +27,25 @@
    "jest-resolve": "24.9.0",
    "jest-watch-typeahead": "0.4.2",
    "mini-css-extract-plugin": "0.9.0",
-    "optimize-css-assets-webpack-plugin": "5.0.3",
+    "optimize-css-assets-webpack-plugin": "5.0.8",
    "pnp-webpack-plugin": "1.6.0",
    "postcss-flexbugs-fixes": "4.1.0",
    "postcss-loader": "3.0.0",
    "postcss-normalize": "8.0.1",
-    "postcss-preset-env": "6.7.0",
-    "postcss-safe-parser": "4.0.1",
+    "postcss-preset-env": "6.7.1",
+    "postcss-safe-parser": "4.0.2",
    "react": "^16.12.0",
    "react-app-polyfill": "^1.0.6",
    "react-dev-utils": "^10.1.0",
    "react-dom": "^16.12.0",
    "react-redux": "^5.0.7",
-    "redux": "^4.0.0",
-    "resolve": "1.15.0",
+    "redux": "4.1.2",
+    "resolve": "1.22.1",
    "resolve-url-loader": "^3.1.3",
    "sass-loader": "8.0.2",
    "semver": "6.3.0",
    "style-loader": "1.1.3",
-    "terser-webpack-plugin": "2.3.4",
+    "terser-webpack-plugin": "2.3.8",
    "ts-pnp": "1.1.5",
    "url-loader": "2.3.0",
    "webpack": "4.41.5",
@@ -55,7 +55,8 @@
  },
  "scripts": {
    "start": "node scripts/start.js",
-    "build": "node scripts/build.js SKIP_PREFLIGHT_CHECK",
+    "build": "echo 'Clipper build is disabled due to disabled due to ERR_OSSL_EVP_UNSUPPORTED error on CI'",
+    "build_DISABLED": "node scripts/build.js SKIP_PREFLIGHT_CHECK",
    "test": "node scripts/test.js --env=jsdom",
    "watch": "cra-build-watch",
    "postinstall": "node postinstall.js && npm run build"
@@ -63,6 +64,7 @@
  "devDependencies": {
    "cra-build-watch": "^3.4.0",
    "fs-extra": "^6.0.1",
+    "md5": "^2.3.0",
    "react-scripts": "^3.3.1"
  },
  "browserslist": [
@@ -124,4 +126,4 @@
      "react-app"
    ]
  }
-}
+}
--- a/packages/app-desktop/app.ts
+++ b/packages/app-desktop/app.ts
@@ -43,6 +43,7 @@ import sidebarCommands from './gui/Sidebar/commands/index';
 import appCommands from './commands/index';
 import libCommands from '@joplin/lib/commands/index';
 import { homedir } from 'os';
+import getDefaultPluginsInfo from '@joplin/lib/services/plugins/defaultPlugins/desktopDefaultPluginsInfo';
 const electronContextMenu = require('./services/electron-context-menu');
 // import  populateDatabase from '@joplin/lib/services/debug/populateDatabase';

@@ -63,6 +64,8 @@ import checkForUpdates from './checkForUpdates';
 import { AppState } from './app.reducer';
 import syncDebugLog from '@joplin/lib/services/synchronizer/syncDebugLog';
 import eventManager from '@joplin/lib/eventManager';
+import path = require('path');
+import { checkPreInstalledDefaultPlugins, installDefaultPlugins, setSettingsForDefaultPlugins } from '@joplin/lib/services/plugins/defaultPlugins/defaultPluginsUtils';
 // import { runIntegrationTests } from '@joplin/lib/services/e2ee/ppkTestUtils';

 const pluginClasses = [
@@ -260,9 +263,9 @@ class Application extends BaseApplication {
 		const pluginRunner = new PluginRunner();
 		service.initialize(packageInfo.version, PlatformImplementation.instance(), pluginRunner, this.store());
 		service.isSafeMode = Setting.value('isSafeMode');
+		const defaultPluginsId = Object.keys(getDefaultPluginsInfo());

-		const pluginSettings = service.unserializePluginSettings(Setting.value('plugins.states'));
-
+		let pluginSettings = service.unserializePluginSettings(Setting.value('plugins.states'));
 		{
 			// Users can add and remove plugins from the config screen at any
 			// time, however we only effectively uninstall the plugin the next
@@ -272,7 +275,11 @@ class Application extends BaseApplication {
 			Setting.setValue('plugins.states', newSettings);
 		}

+		checkPreInstalledDefaultPlugins(defaultPluginsId, pluginSettings);
+
 		try {
+			const defaultPluginsDir = path.join(bridge().buildDir(), 'defaultPlugins');
+			pluginSettings = await installDefaultPlugins(service, defaultPluginsDir, defaultPluginsId, pluginSettings);
 			if (await shim.fsDriver().exists(Setting.value('pluginDir'))) {
 				await service.loadAndRunPlugins(Setting.value('pluginDir'), pluginSettings);
 			}
@@ -320,6 +327,7 @@ class Application extends BaseApplication {
 					type: 'STARTUP_PLUGINS_LOADED',
 					value: true,
 				});
+				setSettingsForDefaultPlugins(getDefaultPluginsInfo());
 			}
 		}, 500);
 	}
@@ -494,6 +502,7 @@ class Application extends BaseApplication {
 		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.
--- a/packages/app-desktop/bridge.ts
+++ b/packages/app-desktop/bridge.ts
@@ -246,7 +246,7 @@ export class Bridge {
 	}

 	async openItem(fullPath: string) {
-		return require('electron').shell.openPath(fullPath);
+		return require('electron').shell.openPath(toSystemSlashes(fullPath));
 	}

 	screen() {
--- a/packages/app-desktop/gui/ClipperConfigScreen.tsx
+++ b/packages/app-desktop/gui/ClipperConfigScreen.tsx
@@ -45,6 +45,7 @@ class ClipperConfigScreenComponent extends React.Component {
 		if (confirm(_('Are you sure you want to renew the authorisation token?'))) {
 			void EncryptionService.instance()
 				.generateApiToken()
+			// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
 				.then((token) => {
 					Setting.setValue('api.token', token);
 				});
--- a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx
+++ b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx
@@ -15,6 +15,9 @@ import SyncTargetRegistry from '@joplin/lib/SyncTargetRegistry';
 const shared = require('@joplin/lib/components/shared/config-shared.js');
 import ClipperConfigScreen from '../ClipperConfigScreen';
 import restart from '../../services/restart';
+import PluginService from '@joplin/lib/services/plugins/PluginService';
+import { getDefaultPluginsInstallState, updateDefaultPluginsInstallState } from '@joplin/lib/services/plugins/defaultPlugins/defaultPluginsUtils';
+import getDefaultPluginsInfo from '@joplin/lib/services/plugins/defaultPlugins/desktopDefaultPluginsInfo';
 const { KeymapConfigScreen } = require('../KeymapConfig/KeymapConfigScreen');

 const settingKeyToControl: any = {
@@ -66,6 +69,7 @@ class ConfigScreenComponent extends React.Component<any, any> {
 				this.switchSection(this.props.defaultSection);
 			});
 		}
+		updateDefaultPluginsInstallState(getDefaultPluginsInstallState(PluginService.instance(), Object.keys(getDefaultPluginsInfo())), this);
 	}

 	private async handleSettingButton(key: string) {
--- a/packages/app-desktop/gui/EmojiBox.tsx
+++ b/packages/app-desktop/gui/EmojiBox.tsx
@@ -0,0 +1,48 @@
+import { useMemo, useRef, useState } from 'react';
+
+interface Props {
+	width: number;
+	height: number;
+	emoji: string;
+}
+
+const fontSizeCache_: Record<string, number> = {};
+
+export default (props: Props) => {
+	const containerRef = useRef(null);
+	const [containerReady, setContainerReady] = useState(false);
+
+	const fontSize = useMemo(() => {
+		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`;
+		containerRef.current.appendChild(span);
+
+		let rect = span.getBoundingClientRect();
+
+		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, containerRef]);
+
+	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>;
+};
--- a/packages/app-desktop/gui/FolderIconBox.tsx
+++ b/packages/app-desktop/gui/FolderIconBox.tsx
@@ -1,16 +1,23 @@
 import { FolderIcon, FolderIconType } from '@joplin/lib/services/database/types';
+import EmojiBox from './EmojiBox';

 interface Props {
 	folderIcon: FolderIcon;
+	opacity?: number;
 }

 export default function(props: Props) {
 	const folderIcon = props.folderIcon;
+	const opacity = 'opacity' in props ? props.opacity : 1;
+	const width = 20;
+	const height = 20;

 	if (folderIcon.type === FolderIconType.Emoji) {
-		return <span style={{ fontSize: 20 }}>{folderIcon.emoji}</span>;
+		return <EmojiBox width={width} height={height} emoji={folderIcon.emoji}/>;
 	} else if (folderIcon.type === FolderIconType.DataUrl) {
-		return <img style={{ width: 20, height: 20 }} src={folderIcon.dataUrl} />;
+		return <img style={{ width, height, opacity }} src={folderIcon.dataUrl} />;
+	} else if (folderIcon.type === FolderIconType.FontAwesome) {
+		return <i style={{ fontSize: 18, width, opacity }} className={folderIcon.name}></i>;
 	} else {
 		throw new Error(`Unsupported folder icon type: ${folderIcon.type}`);
 	}
--- a/packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx
+++ b/packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx
@@ -56,7 +56,7 @@ export const KeymapConfigScreen = ({ themeId }: KeymapConfigScreenProps) => {
 			filters: [{ name: 'Joplin Keymaps (keymap-desktop.json)', extensions: ['json'] }],
 		});

-		if (filePath) {
+		if (filePath && filePath.length !== 0) {
 			const actualFilePath = filePath[0];
 			try {
 				const keymapFile = await shim.fsDriver().readFile(actualFilePath, 'utf-8');
--- a/packages/app-desktop/gui/MainScreen/commands/index.ts
+++ b/packages/app-desktop/gui/MainScreen/commands/index.ts
@@ -15,6 +15,7 @@ import * as openFolder from './openFolder';
 import * as openFolderDialog from './openFolderDialog';
 import * as openItem from './openItem';
 import * as openNote from './openNote';
+import * as openPdfViewer from './openPdfViewer';
 import * as openTag from './openTag';
 import * as print from './print';
 import * as renameFolder from './renameFolder';
@@ -55,6 +56,7 @@ const index:any[] = [
 	openFolderDialog,
 	openItem,
 	openNote,
+	openPdfViewer,
 	openTag,
 	print,
 	renameFolder,
--- a/packages/app-desktop/gui/MainScreen/commands/openPdfViewer.ts
+++ b/packages/app-desktop/gui/MainScreen/commands/openPdfViewer.ts
@@ -0,0 +1,28 @@
+import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
+import { _ } from '@joplin/lib/locale';
+import Resource from '@joplin/lib/models/Resource';
+
+export const declaration: CommandDeclaration = {
+	name: 'openPdfViewer',
+	label: () => _('Open PDF viewer'),
+};
+
+export const runtime = (): CommandRuntime => {
+	return {
+		execute: async (context: CommandContext, resourceId: string, pageNo: number) => {
+
+			const resource = await Resource.load(resourceId);
+			if (!resource) throw new Error(`No such resource: ${resourceId}`);
+			if (resource.mime !== 'application/pdf') throw new Error(`Not a PDF: ${resource.mime}`);
+			console.log('Opening PDF', resource);
+			context.dispatch({
+				type: 'DIALOG_OPEN',
+				name: 'pdfViewer',
+				props: {
+					resource,
+					pageNo: pageNo,
+				},
+			});
+		},
+	};
+};
--- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx
+++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx
@@ -848,6 +848,8 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {

 	function renderEditor() {

+		const matchBracesOptions = Setting.value('editor.autoMatchingBraces') ? { override: true, pairs: '<>()[]{}\'\'""‘’“”（）《》「」『』【】〔〕〖〗〘〙〚〛' } : false;
+
 		return (
 			<div style={cellEditorStyle}>
 				<Editor
@@ -858,7 +860,7 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
 					codeMirrorTheme={styles.editor.codeMirrorTheme}
 					style={styles.editor}
 					readOnly={props.visiblePanes.indexOf('editor') < 0}
-					autoMatchBraces={Setting.value('editor.autoMatchingBraces')}
+					autoMatchBraces={matchBracesOptions}
 					keyMap={props.keyboardMode}
 					plugins={props.plugins}
 					onChange={codeMirror_change}
--- a/Show More
+++ b/Show More