update

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.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

.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

.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
+          

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

@@ -1,13 +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:
         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 -
@@ -21,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')
@@ -48,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: |
@@ -106,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:
@@ -130,7 +160,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Install Yarn
         run: |
@@ -143,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

.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

.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
+-        }
+     }
+ }

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"
-}
+}

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

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 -->
@@ -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

lerna.json

@@ -2,5 +2,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "independent"
+  "version": "independent",
+  "useWorkspaces": true
 }

package.json

@@ -62,30 +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-promise": "^6.0.1",
-    "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"
+  }
 }

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;
 

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

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();
+	}
+}

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');

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;

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 {

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;

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');

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;

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;

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);
+	});
+
+});

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;

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';

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');

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');
 

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;

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');

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;

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');

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');

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;

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;

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;

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;

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;
@@ -11,7 +11,7 @@ class Command extends BaseCommand {
 	}
 
 	description() {
-		return _('Moves the given <item> (notes matching pattern in current notebook or one notebook) to [notebook]. If <item> is subnotebook and [notebook] is "root", will make <item> parent notebook');
+		return _('Moves the given <item> to [notebook]');
 	}
 
 	async action(args) {

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;

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;

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;

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;

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;

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;

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> = {

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');

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');

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;

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';

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;

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');

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;

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;
 

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;
+};

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();
+};

packages/app-cli/jest.config.js

@@ -27,6 +27,7 @@
 module.exports = {
 	testMatch: [
 		'**/tests/**/*.js',
+		'**/*.test.js',
 	],
 
 	testPathIgnorePatterns: [

packages/app-cli/package.json

@@ -42,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"
   }
 }

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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"
   }
-}
+}

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.

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"
     ]
   }
-}
+}

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');

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

@@ -7,22 +7,16 @@ import uuid from '@joplin/lib/uuid';
 
 import { reg } from '@joplin/lib/registry';
 
-const loadedPluginIdSet = new Set<string>();
-
 export default function useExternalPlugins(CodeMirror: any, plugins: PluginStates) {
-
 	const [options, setOptions] = useState({});
 	useEffect(() => {
 		let newOptions = {};
 
 		const contentScripts = contentScriptsToCodeMirrorPlugin(plugins);
+		const addedElements: HTMLElement[] = [];
 
 		for (const contentScript of contentScripts) {
 			try {
-				if (loadedPluginIdSet.has(contentScript.id)) {
-					continue;
-				}
-
 				const mod = contentScript.module;
 
 				if (mod.codeMirrorResources) {
@@ -58,33 +52,37 @@ export default function useExternalPlugins(CodeMirror: any, plugins: PluginState
 						if (asset.inline) {
 							cssStrings.push(asset.text);
 						} else {
-							addScript(shim.fsDriver().resolveRelativePathWithinDir(contentScript.assetPath, asset.name), contentScript.id);
+							addedElements.push(addScript(shim.fsDriver().resolveRelativePathWithinDir(contentScript.assetPath, asset.name), contentScript.id));
 						}
 					}
 
 					if (cssStrings.length > 0) {
-						addInlineCss(cssStrings, contentScript.id);
+						addedElements.push(addInlineCss(cssStrings, contentScript.id));
 					}
 				}
 
 				if (mod.plugin) {
 					mod.plugin(CodeMirror);
 				}
-
-				loadedPluginIdSet.add(contentScript.id);
 			} catch (error) {
 				reg.logger().error(error.toString());
 			}
 		}
 		setOptions(newOptions);
-		// eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied
-	}, [plugins]);
+
+		return () => {
+			for (const element of addedElements) {
+				element.remove();
+			}
+		};
+	}, [plugins, CodeMirror]);
 
 	function addInlineCss(cssStrings: string[], id: string) {
 		const element = document.createElement('style');
 		element.setAttribute('id', `content-script-${id}-inline-${uuid.createNano()}`);
 		document.head.appendChild(element);
 		element.appendChild(document.createTextNode(cssStrings.join('\n')));
+		return element;
 	}
 
 	function addScript(path: string, id: string) {
@@ -93,6 +91,7 @@ export default function useExternalPlugins(CodeMirror: any, plugins: PluginState
 		element.setAttribute('rel', 'stylesheet');
 		element.setAttribute('href', path);
 		document.head.appendChild(element);
+		return element;
 	}
 
 	return options;

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

@@ -622,7 +622,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 					});
 
 					editor.ui.registry.addButton('joplinInsertDateTime', {
-						tooltip: _('Insert Date Time'),
+						tooltip: _('Insert time'),
 						icon: 'insert-time',
 						onAction: function() {
 							void CommandService.instance().execute('insertDateTime');

packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts

@@ -80,7 +80,7 @@ const declarations: CommandDeclaration[] = [
 	},
 	{
 		name: 'insertDateTime',
-		label: () => _('Insert Date Time'),
+		label: () => _('Insert time'),
 		iconName: 'icon-add-date',
 	},
 	{

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

@@ -442,8 +442,8 @@ const SidebarComponent = (props: Props) => {
 	}, [props.dispatch]);
 
 	const onHeaderClick_ = useCallback((key: string) => {
-		const isExpanded = key === 'tag' ? props.tagHeaderIsExpanded : props.folderHeaderIsExpanded;
-		Setting.setValue(key === 'tag' ? 'tagHeaderIsExpanded' : 'folderHeaderIsExpanded', !isExpanded);
+		const isExpanded = key === 'tagHeader' ? props.tagHeaderIsExpanded : props.folderHeaderIsExpanded;
+		Setting.setValue(key === 'tagHeader' ? 'tagHeaderIsExpanded' : 'folderHeaderIsExpanded', !isExpanded);
 	}, [props.folderHeaderIsExpanded, props.tagHeaderIsExpanded]);
 
 	const onAllNotesClick_ = () => {

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.9.10",
+  "version": "2.9.12",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,
@@ -107,26 +107,24 @@
   "homepage": "https://github.com/laurent22/joplin#readme",
   "devDependencies": {
     "@joplin/tools": "~2.9",
-    "@testing-library/react-hooks": "^3.4.2",
-    "@types/jest": "^26.0.15",
-    "@types/node": "^14.14.6",
-    "@types/react": "16.9.55",
-    "@types/react-redux": "7.1.9",
-    "@types/styled-components": "5.1.4",
-    "ajv": "^6.5.0",
-    "app-builder-bin": "^1.9.11",
-    "babel-cli": "^6.26.0",
-    "babel-preset-react": "^6.24.1",
-    "electron": "19.0.10",
-    "electron-builder": "^23.0.3",
-    "electron-notarize": "^1.2.1",
-    "electron-rebuild": "^3.2.7",
-    "glob": "^7.1.6",
-    "gulp": "^4.0.2",
-    "jest": "^26.6.3",
-    "js-sha512": "^0.8.0",
-    "nan": "2.14.2",
-    "react-test-renderer": "^16.14.0",
+    "@testing-library/react-hooks": "8.0.1",
+    "@types/jest": "26.0.24",
+    "@types/node": "18.11.9",
+    "@types/react": "16.14.34",
+    "@types/react-redux": "7.1.24",
+    "@types/styled-components": "5.1.26",
+    "babel-cli": "6.26.0",
+    "babel-preset-react": "6.24.1",
+    "electron": "19.1.4",
+    "electron-builder": "23.6.0",
+    "electron-notarize": "1.2.2",
+    "electron-rebuild": "3.2.9",
+    "glob": "7.2.3",
+    "gulp": "4.0.2",
+    "jest": "26.6.3",
+    "js-sha512": "0.8.0",
+    "nan": "2.17.0",
+    "react-test-renderer": "16.14.0",
     "typescript": "4.0.5"
   },
   "optionalDependencies": {
@@ -135,47 +133,47 @@
     "7zip-bin-win": "^2.1.1"
   },
   "dependencies": {
-    "@electron/remote": "^2.0.1",
-    "@fortawesome/fontawesome-free": "^5.13.0",
-    "@joeattardi/emoji-button": "^4.6.0",
+    "@electron/remote": "2.0.8",
+    "@fortawesome/fontawesome-free": "5.15.4",
+    "@joeattardi/emoji-button": "4.6.4",
     "@joplin/lib": "~2.9",
     "@joplin/pdf-viewer": "~2.9",
     "@joplin/renderer": "~2.9",
-    "async-mutex": "^0.1.3",
-    "codemirror": "^5.56.0",
-    "color": "^3.1.2",
-    "compare-versions": "^3.2.1",
-    "countable": "^3.0.1",
-    "debounce": "^1.2.0",
-    "electron-window-state": "^5.0.3",
-    "formatcoords": "^1.1.3",
+    "async-mutex": "0.4.0",
+    "codemirror": "5.65.9",
+    "color": "3.2.1",
+    "compare-versions": "3.6.0",
+    "countable": "3.0.1",
+    "debounce": "1.2.1",
+    "electron-window-state": "5.0.3",
+    "formatcoords": "1.1.3",
     "fs-extra": "10.0.0",
-    "highlight.js": "^10.2.1",
-    "immer": "^7.0.5",
-    "keytar": "^7.0.0",
-    "mark.js": "^8.11.1",
-    "md5": "^2.2.1",
-    "moment": "^2.22.2",
-    "node-fetch": "^1.7.3",
-    "node-notifier": "^8.0.0",
-    "node-rsa": "^1.1.1",
-    "pretty-bytes": "^5.3.0",
-    "re-resizable": "^6.5.4",
-    "react": "16.13.1",
-    "react-datetime": "^2.14.0",
-    "react-dom": "16.9.0",
-    "react-redux": "5.0.7",
-    "react-select": "^2.4.3",
-    "react-toggle-button": "^2.2.0",
-    "react-tooltip": "^3.10.0",
+    "highlight.js": "10.7.3",
+    "immer": "7.0.15",
+    "keytar": "7.9.0",
+    "mark.js": "8.11.1",
+    "md5": "2.3.0",
+    "moment": "2.29.4",
+    "node-fetch": "1.7.3",
+    "node-notifier": "8.0.2",
+    "node-rsa": "1.1.1",
+    "pretty-bytes": "5.6.0",
+    "re-resizable": "6.9.9",
+    "react": "16.14.0",
+    "react-datetime": "2.16.3",
+    "react-dom": "16.14.0",
+    "react-redux": "5.1.2",
+    "react-select": "2.4.4",
+    "react-toggle-button": "2.2.0",
+    "react-tooltip": "3.11.6",
     "redux": "3.7.2",
-    "reselect": "^4.0.0",
-    "roboto-fontface": "^0.10.0",
-    "smalltalk": "^2.5.1",
-    "sqlite3": "^5.0.2",
-    "styled-components": "5.1.1",
+    "reselect": "4.1.7",
+    "roboto-fontface": "0.10.0",
+    "smalltalk": "2.5.1",
+    "sqlite3": "5.0.2",
+    "styled-components": "5.3.6",
     "styled-system": "5.1.5",
-    "taboverride": "^4.0.3",
-    "tinymce": "^5.2.0"
+    "taboverride": "4.0.3",
+    "tinymce": "5.10.6"
   }
 }

packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.ts

@@ -3,6 +3,7 @@
 import SpellCheckerServiceDriverBase from '@joplin/lib/services/spellChecker/SpellCheckerServiceDriverBase';
 import bridge from '../bridge';
 import Logger from '@joplin/lib/Logger';
+import { languageCodeOnly, localesFromLanguageCode } from '@joplin/lib/locale';
 
 const logger = Logger.create('SpellCheckerServiceDriverNative');
 
@@ -18,15 +19,45 @@ export default class SpellCheckerServiceDriverNative extends SpellCheckerService
 
 	// Language can be set to [] to disable spell-checking
 	public setLanguages(v: string[]) {
+
+		// Note that in order to validate the language we need ot set it on the
+		// session and check if Electron has thrown an exception or not. This is
+		// fine because the actual languages will be set below after the calls
+		// to this functions.
+		const validateLanguage = (v: string) => {
+			const languagesToTry = [
+				v,
+				languageCodeOnly(v),
+			].concat(localesFromLanguageCode(languageCodeOnly(v), this.availableLanguages));
+
+			for (const toTry of languagesToTry) {
+				try {
+					this.session().setSpellCheckerLanguages([toTry]);
+					return toTry;
+				} catch (error) {
+					logger.warn(`Failed to set language to "${toTry}". Will try the next one in this list: ${JSON.stringify(languagesToTry)}`);
+					logger.warn('Error was:', error);
+				}
+			}
+
+			return null;
+		};
+
+		const effectiveLanguages: string[] = [];
+		for (const language of v) {
+			const effectiveLanguage = validateLanguage(language);
+			if (effectiveLanguage) effectiveLanguages.push(effectiveLanguage);
+		}
+
 		// If we pass an empty array, it disables spell checking
 		// https://github.com/electron/electron/issues/25228
-		if (v.length === 0) {
+		if (effectiveLanguages.length === 0) {
 			this.session().setSpellCheckerLanguages([]);
 			return;
 		}
 
-		this.session().setSpellCheckerLanguages(v);
-		logger.info(`Set effective languages to "${v}"`);
+		this.session().setSpellCheckerLanguages(effectiveLanguages);
+		logger.info(`Set effective languages to "${effectiveLanguages}"`);
 	}
 
 	public get language(): string {

packages/app-mobile/.ruby-version

@@ -0,0 +1 @@
+2.7.4

packages/app-mobile/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby '2.7.4'
+gem 'cocoapods', '~> 1.11', '>= 1.11.2'

packages/app-mobile/Gemfile.lock

@@ -0,0 +1,96 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.5)
+      rexml
+    activesupport (6.1.4.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    claide (1.1.0)
+    cocoapods (1.11.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.2)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.5.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.9)
+    escape (0.0.4)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.5)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (1.9.1)
+      concurrent-ruby (~> 1.0)
+    json (2.6.1)
+    minitest (5.15.0)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    public_suffix (4.0.6)
+    rexml (3.2.5)
+    ruby-macho (2.5.1)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.21.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.5.4)
+PLATFORMS
+  ruby
+DEPENDENCIES
+  cocoapods (~> 1.11, >= 1.11.2)
+RUBY VERSION
+   ruby 2.7.4p191
+BUNDLED WITH
+   2.2.27

packages/app-mobile/android/app/build.gradle

@@ -117,7 +117,7 @@ def jscFlavor = 'org.webkit:android-jsc-intl:+'
 /**
  * Whether to enable the Hermes VM.
  *
- * This should be set on project.ext.react and mirrored here.  If it is not set
+ * This should be set on project.ext.react and that value will be read here. If it is not set
  * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
  * and the benefits of using Hermes will therefore be sharply reduced.
  */
@@ -146,8 +146,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097673
-		versionName "2.9.5"
+		versionCode 2097676
+		versionName "2.9.8"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}

packages/app-mobile/android/app/src/main/res/drawable/rn_edit_text_material.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
+       android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
+       android:insetTop="@dimen/abc_edit_text_inset_top_material"
+       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
+    <selector>
+        <!-- 
+          This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
+          The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
+          NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
+          <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
+          For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
+        -->
+        <item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
+        <item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
+    </selector>
+</inset>

packages/app-mobile/android/app/src/main/res/values/styles.xml

@@ -3,6 +3,7 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
+        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
     </style>
 
 </resources>

packages/app-mobile/android/build.gradle

@@ -21,8 +21,6 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenCentral()
-        mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url("$rootDir/../node_modules/react-native/android")
@@ -31,7 +29,13 @@ allprojects {
             // Android JSC is installed from npm
             url("$rootDir/../node_modules/jsc-android/dist")
         }
-
+        mavenCentral {
+            // We don't want to fetch react-native from Maven Central as there are
+            // older versions over there.
+            content {
+                excludeGroup "com.facebook.react"
+            }
+        }
         google()
         maven { url 'https://www.jitpack.io' }
     }

packages/app-mobile/android/gradle.properties

@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# DDefault value: -Xmx1024m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 

packages/app-mobile/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.toggleList.test.ts

@@ -102,39 +102,43 @@ describe('markdownCommands.toggleList', () => {
 			'# List test\n * This\n * is\na\ntest\n * of list toggling'
 		);
 
+		// The below test:
+		// `expect(editor.state.doc.toString()).toBe(expectedChecklistPart)`
+		// randomly fails on CI, so disabling it for now.
 
-		// Put the cursor in the middle of the list
-		editor.dispatch({ selection: EditorSelection.cursor(preSubListText.length) });
 
-		// Sublists should be changed
-		toggleList(ListType.CheckList)(editor);
-		const expectedChecklistPart =
-			'# List test\n - [ ] This\n - [ ] is\n - [ ] a\n - [ ] test\n - [ ] of list toggling';
-		expect(editor.state.doc.toString()).toBe(
-			expectedChecklistPart
-		);
+		// // Put the cursor in the middle of the list
+		// editor.dispatch({ selection: EditorSelection.cursor(preSubListText.length) });
 
-		editor.dispatch({ selection: EditorSelection.cursor(editor.state.doc.length) });
-		editor.dispatch(editor.state.replaceSelection('\n\n\n'));
+		// // Sublists should be changed
+		// toggleList(ListType.CheckList)(editor);
+		// const expectedChecklistPart =
+		// 	'# List test\n - [ ] This\n - [ ] is\n - [ ] a\n - [ ] test\n - [ ] of list toggling';
+		// expect(editor.state.doc.toString()).toBe(
+		// 	expectedChecklistPart
+		// );
 
-		// toggleList should also create a new list if the cursor is on an empty line.
-		toggleList(ListType.OrderedList)(editor);
-		editor.dispatch(editor.state.replaceSelection('Test.\n2. Test2\n3. Test3'));
+		// editor.dispatch({ selection: EditorSelection.cursor(editor.state.doc.length) });
+		// editor.dispatch(editor.state.replaceSelection('\n\n\n'));
 
-		expect(editor.state.doc.toString()).toBe(
-			`${expectedChecklistPart}\n\n\n1. Test.\n2. Test2\n3. Test3`
-		);
+		// // toggleList should also create a new list if the cursor is on an empty line.
+		// toggleList(ListType.OrderedList)(editor);
+		// editor.dispatch(editor.state.replaceSelection('Test.\n2. Test2\n3. Test3'));
 
-		toggleList(ListType.CheckList)(editor);
-		expect(editor.state.doc.toString()).toBe(
-			`${expectedChecklistPart}\n\n\n- [ ] Test.\n- [ ] Test2\n- [ ] Test3`
-		);
+		// expect(editor.state.doc.toString()).toBe(
+		// 	`${expectedChecklistPart}\n\n\n1. Test.\n2. Test2\n3. Test3`
+		// );
 
-		// The entire checklist should have been selected (and thus will now be indented)
-		increaseIndent(editor);
-		expect(editor.state.doc.toString()).toBe(
-			`${expectedChecklistPart}\n\n\n\t- [ ] Test.\n\t- [ ] Test2\n\t- [ ] Test3`
-		);
+		// toggleList(ListType.CheckList)(editor);
+		// expect(editor.state.doc.toString()).toBe(
+		// 	`${expectedChecklistPart}\n\n\n- [ ] Test.\n- [ ] Test2\n- [ ] Test3`
+		// );
+
+		// // The entire checklist should have been selected (and thus will now be indented)
+		// increaseIndent(editor);
+		// expect(editor.state.doc.toString()).toBe(
+		// 	`${expectedChecklistPart}\n\n\n\t- [ ] Test.\n\t- [ ] Test2\n\t- [ ] Test3`
+		// );
 	});
 
 	it('should toggle a numbered list without changing its sublists', () => {

packages/app-mobile/components/NoteEditor/EditLinkDialog.tsx

@@ -89,10 +89,10 @@ const EditLinkDialog = (props: LinkDialogProps) => {
 	// for more about creating accessible RN inputs.
 	const linkTextInput = (
 		<View style={styles.inputContainer} accessible>
-			<Text style={styles.text}>{_('Link Text')}</Text>
+			<Text style={styles.text}>{_('Link text')}</Text>
 			<TextInput
 				style={styles.input}
-				placeholder={_('Description of the link')}
+				placeholder={_('Link description')}
 				placeholderTextColor={placeholderColor}
 				value={linkLabel}
 
@@ -138,7 +138,7 @@ const EditLinkDialog = (props: LinkDialogProps) => {
 				props.editorControl.hideLinkDialog();
 			}}>
 			<View style={styles.modalContent}>
-				<Text style={styles.header}>{_('Edit Link')}</Text>
+				<Text style={styles.header}>{_('Edit link')}</Text>
 				<View>
 					{linkTextInput}
 					{linkURLInput}

packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx

@@ -42,16 +42,10 @@ const MarkdownToolbar = (props: MarkdownToolbarProps) => {
 	const headerButtons: ButtonSpec[] = [];
 	for (let level = 1; level <= 5; level++) {
 		const active = selState.headerLevel === level;
-		let label;
-		if (!active) {
-			label = _('Create header level %d', level);
-		} else {
-			label = _('Remove level %d header', level);
-		}
 
 		headerButtons.push({
 			icon: `H${level}`,
-			description: label,
+			description: _('Header %d', level),
 			active,
 
 			// We only call addHeaderButton 5 times and in the same order, so
@@ -72,8 +66,7 @@ const MarkdownToolbar = (props: MarkdownToolbarProps) => {
 		icon: (
 			<FontAwesomeIcon name="list-ul" style={styles.text}/>
 		),
-		description:
-			selState.inUnorderedList ? _('Remove unordered list') : _('Create unordered list'),
+		description: _('Unordered list'),
 		active: selState.inUnorderedList,
 		onPress: useCallback(() => {
 			editorControl.toggleList(ListType.UnorderedList);
@@ -86,8 +79,7 @@ const MarkdownToolbar = (props: MarkdownToolbarProps) => {
 		icon: (
 			<FontAwesomeIcon name="list-ol" style={styles.text}/>
 		),
-		description:
-			selState.inOrderedList ? _('Remove ordered list') : _('Create ordered list'),
+		description: _('Ordered list'),
 		active: selState.inOrderedList,
 		onPress: useCallback(() => {
 			editorControl.toggleList(ListType.OrderedList);
@@ -100,8 +92,7 @@ const MarkdownToolbar = (props: MarkdownToolbarProps) => {
 		icon: (
 			<FontAwesomeIcon name="tasks" style={styles.text}/>
 		),
-		description:
-			selState.inChecklist ? _('Remove task list') : _('Create task list'),
+		description: _('Task list'),
 		active: selState.inChecklist,
 		onPress: useCallback(() => {
 			editorControl.toggleList(ListType.CheckList);
@@ -138,8 +129,7 @@ const MarkdownToolbar = (props: MarkdownToolbarProps) => {
 		icon: (
 			<FontAwesomeIcon name="bold" style={styles.text}/>
 		),
-		description:
-			selState.bolded ? _('Unbold') : _('Bold text'),
+		description: _('Bold'),
 		active: selState.bolded,
 		onPress: editorControl.toggleBolded,
 
@@ -150,8 +140,7 @@ const MarkdownToolbar = (props: MarkdownToolbarProps) => {
 		icon: (
 			<FontAwesomeIcon name="italic" style={styles.text}/>
 		),
-		description:
-			selState.italicized ? _('Unitalicize') : _('Italicize'),
+		description: _('Italic'),
 		active: selState.italicized,
 		onPress: editorControl.toggleItalicized,
 
@@ -160,8 +149,7 @@ const MarkdownToolbar = (props: MarkdownToolbarProps) => {
 
 	inlineFormattingBtns.push({
 		icon: '{;}',
-		description:
-			selState.inCode ? _('Remove code formatting') : _('Format as code'),
+		description: _('Code'),
 		active: selState.inCode,
 		onPress: editorControl.toggleCode,
 
@@ -171,8 +159,7 @@ const MarkdownToolbar = (props: MarkdownToolbarProps) => {
 	if (props.editorSettings.katexEnabled) {
 		inlineFormattingBtns.push({
 			icon: '∑',
-			description:
-				selState.inMath ? _('Remove TeX region') : _('Create TeX region'),
+			description: _('KaTeX'),
 			active: selState.inMath,
 			onPress: editorControl.toggleMath,
 
@@ -184,8 +171,7 @@ const MarkdownToolbar = (props: MarkdownToolbarProps) => {
 		icon: (
 			<FontAwesomeIcon name="link" style={styles.text}/>
 		),
-		description:
-			selState.inLink ? _('Edit link') : _('Create link'),
+		description: _('Link'),
 		active: selState.inLink,
 		onPress: editorControl.showLinkDialog,
 
@@ -229,7 +215,7 @@ const MarkdownToolbar = (props: MarkdownToolbarProps) => {
 			<MaterialIcon name="search" style={styles.text}/>
 		),
 		description: (
-			props.searchState.dialogVisible ? _('Close find and replace') : _('Find and replace')
+			props.searchState.dialogVisible ? _('Close') : _('Find and replace')
 		),
 		active: props.searchState.dialogVisible,
 		onPress: useCallback(() => {

packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.tsx

@@ -1,8 +1,7 @@
 const React = require('react');
 
-import { _ } from '@joplin/lib/locale';
 import { ReactElement, useCallback, useState } from 'react';
-import { AccessibilityInfo, LayoutChangeEvent, ScrollView, View, ViewStyle } from 'react-native';
+import { LayoutChangeEvent, ScrollView, View, ViewStyle } from 'react-native';
 import ToggleOverflowButton from './ToggleOverflowButton';
 import ToolbarButton, { buttonSize } from './ToolbarButton';
 import ToolbarOverflowRows from './ToolbarOverflowRows';
@@ -55,11 +54,6 @@ const Toolbar = (props: ToolbarProps) => {
 	}, [allButtonSpecs.length]);
 
 	const onToggleOverflowVisible = useCallback(() => {
-		AccessibilityInfo.announceForAccessibility(
-			!overflowButtonsVisible
-				? _('Opened toolbar overflow menu')
-				: _('Closed toolbar overflow menu')
-		);
 		setOverflowPopupVisible(!overflowButtonsVisible);
 	}, [overflowButtonsVisible]);
 

packages/app-mobile/components/NoteEditor/SearchPanel.tsx

@@ -195,7 +195,7 @@ export const SearchPanel = (props: SearchPanelProps) => {
 			styles={styles}
 			iconName="close"
 			onPress={control.hideSearch}
-			title={_('Close search')}
+			title={_('Close')}
 		/>
 	);
 

packages/app-mobile/components/ScreenHeader.tsx

@@ -300,7 +300,6 @@ class ScreenHeaderComponent extends PureComponent<ScreenHeaderProps, ScreenHeade
 					disabled={disabled}
 
 					accessibilityLabel={_('Back')}
-					accessibilityHint={_('Navigate to the previous view')}
 					accessibilityRole="button">
 					<View style={disabled ? styles.backButtonDisabled : styles.backButton}>
 						<Icon
@@ -326,7 +325,6 @@ class ScreenHeaderComponent extends PureComponent<ScreenHeaderProps, ScreenHeade
 					style={{ padding: 0 }}
 
 					accessibilityLabel={_('Save changes')}
-					accessibilityHint={disabled ? _('Any changes have been saved') : null}
 					accessibilityRole="button">
 					<View style={disabled ? styles.saveButtonDisabled : styles.saveButton}>{icon}</View>
 				</TouchableOpacity>

packages/app-mobile/components/side-menu-content.tsx

@@ -93,7 +93,7 @@ const SideMenuContentComponent = (props: Props) => {
 		styles.sideButtonSelected = Object.assign({}, styles.sideButton, { backgroundColor: theme.selectedColor });
 		styles.sideButtonText = Object.assign({}, styles.buttonText);
 
-		styles.emptyFolderIcon = { ...styles.sidebarIcon, marginRight: folderIconRightMargin };
+		styles.emptyFolderIcon = { ...styles.sidebarIcon, marginRight: folderIconRightMargin, width: 20 };
 
 		return StyleSheet.create(styles);
 	}, [props.themeId]);
@@ -289,7 +289,7 @@ const SideMenuContentComponent = (props: Props) => {
 		}
 
 		if (folderIcon.type === 1) { // FolderIconType.Emoji
-			return <Text style={{ fontSize: theme.fontSize, marginRight: folderIconRightMargin }}>{folderIcon.emoji}</Text>;
+			return <Text style={{ fontSize: theme.fontSize, marginRight: folderIconRightMargin, width: 20 }}>{folderIcon.emoji}</Text>;
 		} else if (folderIcon.type === 2) { // FolderIconType.DataUrl
 			return <Image style={{ width: 20, height: 20, marginRight: folderIconRightMargin, resizeMode: 'contain' }} source={{ uri: folderIcon.dataUrl }}/>;
 		} else {
@@ -328,7 +328,7 @@ const SideMenuContentComponent = (props: Props) => {
 					if (hasChildren) folder_togglePress(folder);
 				}}
 
-				accessibilityLabel={collapsed ? _('Expand folder') : _('Collapse folder')}
+				accessibilityLabel={collapsed ? _('Expand') : _('Collapse')}
 				accessibilityRole="togglebutton"
 			>
 				{iconComp}