Merge branch 'dev' into server_stripe

.eslintignore

@@ -140,9 +140,6 @@ packages/app-desktop/commands/openProfileDirectory.js.map
 packages/app-desktop/commands/replaceMisspelling.d.ts
 packages/app-desktop/commands/replaceMisspelling.js
 packages/app-desktop/commands/replaceMisspelling.js.map
-packages/app-desktop/commands/restoreNoteRevision.d.ts
-packages/app-desktop/commands/restoreNoteRevision.js
-packages/app-desktop/commands/restoreNoteRevision.js.map
 packages/app-desktop/commands/startExternalEditing.d.ts
 packages/app-desktop/commands/startExternalEditing.js
 packages/app-desktop/commands/startExternalEditing.js.map
@@ -278,9 +275,6 @@ packages/app-desktop/gui/MainScreen/commands/showNoteContentProperties.js.map
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.d.ts
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js.map
-packages/app-desktop/gui/MainScreen/commands/showPrompt.d.ts
-packages/app-desktop/gui/MainScreen/commands/showPrompt.js
-packages/app-desktop/gui/MainScreen/commands/showPrompt.js.map
 packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.d.ts
 packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js
 packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js.map
@@ -344,9 +338,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinCommands.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinCommands.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinCommands.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js.map
@@ -830,9 +821,6 @@ packages/lib/Logger.js.map
 packages/lib/PoorManIntervals.d.ts
 packages/lib/PoorManIntervals.js
 packages/lib/PoorManIntervals.js.map
-packages/lib/SyncTargetJoplinCloud.d.ts
-packages/lib/SyncTargetJoplinCloud.js
-packages/lib/SyncTargetJoplinCloud.js.map
 packages/lib/SyncTargetJoplinServer.d.ts
 packages/lib/SyncTargetJoplinServer.js
 packages/lib/SyncTargetJoplinServer.js.map
@@ -842,9 +830,6 @@ packages/lib/SyncTargetOneDrive.js.map
 packages/lib/Synchronizer.d.ts
 packages/lib/Synchronizer.js
 packages/lib/Synchronizer.js.map
-packages/lib/TaskQueue.d.ts
-packages/lib/TaskQueue.js
-packages/lib/TaskQueue.js.map
 packages/lib/commands/historyBackward.d.ts
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyBackward.js.map
@@ -983,9 +968,6 @@ packages/lib/models/dateTimeFormats.test.js.map
 packages/lib/models/settings/FileHandler.d.ts
 packages/lib/models/settings/FileHandler.js
 packages/lib/models/settings/FileHandler.js.map
-packages/lib/models/utils/itemCanBeEncrypted.d.ts
-packages/lib/models/utils/itemCanBeEncrypted.js
-packages/lib/models/utils/itemCanBeEncrypted.js.map
 packages/lib/models/utils/paginatedFeed.d.ts
 packages/lib/models/utils/paginatedFeed.js
 packages/lib/models/utils/paginatedFeed.js.map
@@ -1175,9 +1157,6 @@ packages/lib/services/interop/InteropService_Importer_Raw.js.map
 packages/lib/services/interop/types.d.ts
 packages/lib/services/interop/types.js
 packages/lib/services/interop/types.js.map
-packages/lib/services/joplinServer/personalizedUserContentBaseUrl.d.ts
-packages/lib/services/joplinServer/personalizedUserContentBaseUrl.js
-packages/lib/services/joplinServer/personalizedUserContentBaseUrl.js.map
 packages/lib/services/keychain/KeychainService.d.ts
 packages/lib/services/keychain/KeychainService.js
 packages/lib/services/keychain/KeychainService.js.map
@@ -1613,9 +1592,6 @@ packages/renderer/pathUtils.js.map
 packages/renderer/utils.d.ts
 packages/renderer/utils.js
 packages/renderer/utils.js.map
-packages/tools/buildServerDocker.d.ts
-packages/tools/buildServerDocker.js
-packages/tools/buildServerDocker.js.map
 packages/tools/generate-database-types.d.ts
 packages/tools/generate-database-types.js
 packages/tools/generate-database-types.js.map

.github/scripts/run_ci.sh

@@ -1,134 +0,0 @@
-#!/bin/bash
-
-# =============================================================================
-# Setup environment variables
-# =============================================================================
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-ROOT_DIR="$SCRIPT_DIR/../.."
-
-IS_PULL_REQUEST=0
-IS_DEV_BRANCH=0
-IS_LINUX=0
-IS_MACOS=0
-
-if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
-	IS_PULL_REQUEST=1
-fi
-
-if [ "$GITHUB_REF" == "refs/heads/dev" ]; then
-	IS_DEV_BRANCH=1
-fi
-
-if [ "$RUNNER_OS" == "Linux" ]; then
-	IS_LINUX=1
-	IS_MACOS=0
-else
-	IS_LINUX=0
-	IS_MACOS=1
-fi
-
-# =============================================================================
-# Print environment
-# =============================================================================
-
-echo "GITHUB_WORKFLOW=$GITHUB_WORKFLOW"
-echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"
-echo "GITHUB_REF=$GITHUB_REF"
-echo "RUNNER_OS=$RUNNER_OS"
-echo "GIT_TAG_NAME=$GIT_TAG_NAME"
-
-echo "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION"
-echo "IS_PULL_REQUEST=$IS_PULL_REQUEST"
-echo "IS_DEV_BRANCH=$IS_DEV_BRANCH"
-echo "IS_LINUX=$IS_LINUX"
-echo "IS_MACOS=$IS_MACOS"
-
-echo "Node $( node -v )"
-echo "Npm $( npm -v )"
-
-# =============================================================================
-# Install packages
-# =============================================================================
-
-cd "$ROOT_DIR"
-npm install
-
-# =============================================================================
-# Run test units. Only do it for pull requests and dev branch because we don't
-# want it to randomly fail when trying to create a desktop release.
-# =============================================================================
-
-if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
-	npm run test-ci
-	testResult=$?
-	if [ $testResult -ne 0 ]; then
-		exit $testResult
-	fi
-fi
-
-# =============================================================================
-# Run linter for pull requests only. We also don't want this to make the desktop
-# release randomly fail.
-# =============================================================================
-
-if [ "$IS_PULL_REQUEST" != "1" ]; then
-	npm run linter-ci ./
-	testResult=$?
-	if [ $testResult -ne 0 ]; then
-		exit $testResult
-	fi
-fi
-
-# =============================================================================
-# Validate translations - this is needed as some users manually edit .po files
-# (and often make mistakes) instead of using a proper tool like poedit. Doing it
-# for Linux only is sufficient.
-# =============================================================================
-
-if [ "$IS_PULL_REQUEST" == "1" ]; then
-	if [ "$IS_LINUX" == "1" ]; then
-		node packages/tools/validate-translation.js
-		testResult=$?
-		if [ $testResult -ne 0 ]; then
-			exit $testResult
-		fi
-	fi
-fi
-
-# =============================================================================
-# Find out if we should run the build or not. Electron-builder gets stuck when
-# building PRs so we disable it in this case. The Linux build should provide
-# enough info if the app builds or not.
-# https://github.com/electron-userland/electron-builder/issues/4263
-# =============================================================================
-
-if [ "$IS_PULL_REQUEST" == "1" ]; then
-	if [ "$IS_MACOS" == "1" ]; then
-		exit 0
-	fi
-fi
-
-# =============================================================================
-# Prepare the Electron app and build it
-#
-# If the current tag is a desktop release tag (starts with "v", such as
-# "v1.4.7"), we build and publish to github
-#
-# Otherwise we only build but don't publish to GitHub. It helps finding
-# out any issue in pull requests and dev branch.
-# =============================================================================
-
-cd "$ROOT_DIR/packages/app-desktop"
-
-if [[ $GIT_TAG_NAME = v* ]]; then
-	echo "Building and publishing desktop application..."
-	USE_HARD_LINKS=false npm run dist
-elif [[ $GIT_TAG_NAME = server-v* ]] && [[ $IS_LINUX = 1 ]]; then
-	echo "Building Docker Image..."
-	cd "$ROOT_DIR"
-	npm run buildServerDocker -- --tag-name $GIT_TAG_NAME
-else
-	echo "Building but *not* publishing desktop application..."
-	USE_HARD_LINKS=false npm run dist -- --publish=never
-fi

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

@@ -1,63 +0,0 @@
-name: Joplin Continuous Integration
-on: [push, pull_request]
-jobs:
-  Main:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest]
-    steps:
-
-      # 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 -
-      # https://github.com/atom/node-keytar
-
-      - name: Install Linux dependencies
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update || true
-          sudo apt-get install -y gettext
-          sudo apt-get install -y libsecret-1-dev
-
-      - name: Install Docker Engine
-        if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
-        run: |
-          sudo apt-get install -y apt-transport-https
-          sudo apt-get install -y ca-certificates
-          sudo apt-get install -y curl
-          sudo apt-get install -y gnupg
-          sudo apt-get install -y lsb-release
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-          echo \
-              "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
-              $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-          sudo apt-get update || true
-          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-
-      - uses: actions/checkout@v2
-      - uses: olegtarasov/get-tag@v2.1
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '12'
-      
-      # Login to Docker only if we're on a server release tag. If we run this on
-      # a pull request it will fail because the PR doesn't have access to
-      # secrets
-      - uses: docker/login-action@v1
-        if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Run script...
-        env:
-          APPLE_ASC_PROVIDER: ${{ secrets.APPLE_ASC_PROVIDER }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          CSC_LINK: ${{ secrets.CSC_LINK }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          IS_CONTINUOUS_INTEGRATION: 1
-        run: |
-          "${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"

.gitignore

@@ -126,9 +126,6 @@ packages/app-desktop/commands/openProfileDirectory.js.map
 packages/app-desktop/commands/replaceMisspelling.d.ts
 packages/app-desktop/commands/replaceMisspelling.js
 packages/app-desktop/commands/replaceMisspelling.js.map
-packages/app-desktop/commands/restoreNoteRevision.d.ts
-packages/app-desktop/commands/restoreNoteRevision.js
-packages/app-desktop/commands/restoreNoteRevision.js.map
 packages/app-desktop/commands/startExternalEditing.d.ts
 packages/app-desktop/commands/startExternalEditing.js
 packages/app-desktop/commands/startExternalEditing.js.map
@@ -264,9 +261,6 @@ packages/app-desktop/gui/MainScreen/commands/showNoteContentProperties.js.map
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.d.ts
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js.map
-packages/app-desktop/gui/MainScreen/commands/showPrompt.d.ts
-packages/app-desktop/gui/MainScreen/commands/showPrompt.js
-packages/app-desktop/gui/MainScreen/commands/showPrompt.js.map
 packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.d.ts
 packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js
 packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js.map
@@ -330,9 +324,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinCommands.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinCommands.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinCommands.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js.map
@@ -816,9 +807,6 @@ packages/lib/Logger.js.map
 packages/lib/PoorManIntervals.d.ts
 packages/lib/PoorManIntervals.js
 packages/lib/PoorManIntervals.js.map
-packages/lib/SyncTargetJoplinCloud.d.ts
-packages/lib/SyncTargetJoplinCloud.js
-packages/lib/SyncTargetJoplinCloud.js.map
 packages/lib/SyncTargetJoplinServer.d.ts
 packages/lib/SyncTargetJoplinServer.js
 packages/lib/SyncTargetJoplinServer.js.map
@@ -828,9 +816,6 @@ packages/lib/SyncTargetOneDrive.js.map
 packages/lib/Synchronizer.d.ts
 packages/lib/Synchronizer.js
 packages/lib/Synchronizer.js.map
-packages/lib/TaskQueue.d.ts
-packages/lib/TaskQueue.js
-packages/lib/TaskQueue.js.map
 packages/lib/commands/historyBackward.d.ts
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyBackward.js.map
@@ -969,9 +954,6 @@ packages/lib/models/dateTimeFormats.test.js.map
 packages/lib/models/settings/FileHandler.d.ts
 packages/lib/models/settings/FileHandler.js
 packages/lib/models/settings/FileHandler.js.map
-packages/lib/models/utils/itemCanBeEncrypted.d.ts
-packages/lib/models/utils/itemCanBeEncrypted.js
-packages/lib/models/utils/itemCanBeEncrypted.js.map
 packages/lib/models/utils/paginatedFeed.d.ts
 packages/lib/models/utils/paginatedFeed.js
 packages/lib/models/utils/paginatedFeed.js.map
@@ -1161,9 +1143,6 @@ packages/lib/services/interop/InteropService_Importer_Raw.js.map
 packages/lib/services/interop/types.d.ts
 packages/lib/services/interop/types.js
 packages/lib/services/interop/types.js.map
-packages/lib/services/joplinServer/personalizedUserContentBaseUrl.d.ts
-packages/lib/services/joplinServer/personalizedUserContentBaseUrl.js
-packages/lib/services/joplinServer/personalizedUserContentBaseUrl.js.map
 packages/lib/services/keychain/KeychainService.d.ts
 packages/lib/services/keychain/KeychainService.js
 packages/lib/services/keychain/KeychainService.js.map
@@ -1599,9 +1578,6 @@ packages/renderer/pathUtils.js.map
 packages/renderer/utils.d.ts
 packages/renderer/utils.js
 packages/renderer/utils.js.map
-packages/tools/buildServerDocker.d.ts
-packages/tools/buildServerDocker.js
-packages/tools/buildServerDocker.js.map
 packages/tools/generate-database-types.d.ts
 packages/tools/generate-database-types.js
 packages/tools/generate-database-types.js.map

.travis.yml

@@ -0,0 +1,138 @@
+# Only build tags (Doesn't work - doesn't build anything)
+if: tag IS present OR type = pull_request OR branch = dev
+
+rvm: 2.3.3
+
+# It's important to only build production branches otherwise Electron Builder
+# might take assets from dev branches and overwrite those of production.
+# https://docs.travis-ci.com/user/customizing-the-build/#Building-Specific-Branches
+branches:
+  only:
+    - master
+    - dev
+    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode12
+      language: node_js
+      node_js: "12"
+      cache:
+        npm: false
+      # Cache was disabled because when changing from node_js 10 to node_js 12
+      # it was still using build files from Node 10 when building SQLite which
+      # was making it fail. Might be ok to re-enable later on, although it doesn't
+      # make build that much faster.
+      #
+      # env:
+      #   - ELECTRON_CACHE=$HOME/.cache/electron
+      #   - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+
+    - os: linux
+      sudo: required
+      dist: trusty
+      language: node_js
+      node_js: "12"
+      cache:
+        npm: false
+      # env:
+      #   - ELECTRON_CACHE=$HOME/.cache/electron
+      #   - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+
+# cache:
+#   directories:
+#   - node_modules
+#   - $HOME/.cache/electron
+#   - $HOME/.cache/electron-builder
+ 
+before_install:
+  # HOMEBREW_NO_AUTO_UPDATE needed so that Homebrew doesn't upgrade to the next
+  # version, which requires Ruby 2.3, which is not available on the Travis VM.
+
+  # Silence apt-get update errors (for example when a module doesn't exist) since
+  # otherwise it will make the whole build fails, even though all we need is yarn.
+
+  # libsecret-1-dev is required for keytar - https://github.com/atom/node-keytar
+  - |
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install yarn
+    else
+      curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+      echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+      sudo apt-get update || true
+      sudo apt-get install -y yarn
+      sudo apt-get install -y gettext
+      sudo apt-get install -y libsecret-1-dev
+    fi
+
+script:
+  - |
+    # Prints some env variables
+    echo "TRAVIS_OS_NAME=$TRAVIS_OS_NAME"
+    echo "TRAVIS_BRANCH=$TRAVIS_BRANCH"
+    echo "TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
+    echo "TRAVIS_TAG=$TRAVIS_TAG"
+
+    # Install tools
+    npm install
+
+    # Run test units.
+    # Only do it for pull requests because Travis randomly fails to run them
+    # and that would break the desktop release.
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "$TRAVIS_BRANCH" = "dev" ]; then
+      npm run test-ci
+      testResult=$?
+      if [ $testResult -ne 0 ]; then
+        exit $testResult
+      fi
+    fi
+
+    # Run linter for pull requests only - this is so that
+    # bypassing eslint is allowed for urgent fixes.
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      npm run linter-ci ./
+      testResult=$?
+      if [ $testResult -ne 0 ]; then
+        exit $testResult
+      fi
+    fi
+
+    # Validate translations - this is needed as some users manually
+    # edit .po files (and often make mistakes) instead of using a proper
+    # tool like poedit. Doing it for Linux only is sufficient.
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      if [ "$TRAVIS_OS_NAME" != "osx" ]; then
+        node packages/tools/validate-translation.js
+        testResult=$?
+        if [ $testResult -ne 0 ]; then
+          exit $testResult
+        fi
+      fi
+    fi
+
+    # Find out if we should run the build or not. Electron-builder gets stuck when
+    # building PRs so we disable it in this case. The Linux build should provide
+    # enough info if the app builds or not.
+    # https://github.com/electron-userland/electron-builder/issues/4263
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+        exit 0
+      fi
+    fi
+
+    # Prepare the Electron app and build it
+    #
+    # If the current tag is a desktop release tag (starts with "v", such as
+    # "v1.4.7"), we build and publish to github
+    #
+    # Otherwise we only build but don't publish to GitHub. It helps finding
+    # out any issue in pull requests and dev branch.
+    
+    cd packages/app-desktop
+
+    if [[ $TRAVIS_TAG = v* ]]; then
+      USE_HARD_LINKS=false npm run dist
+    else
+      USE_HARD_LINKS=false npm run dist -- --publish=never
+    fi

BUILD.md

@@ -1,3 +1,5 @@
+ [![Travis Build Status](https://travis-ci.com/laurent22/joplin.svg?branch=master)](https://travis-ci.com/laurent22/joplin) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/laurent22/joplin?branch=master&passingText=master%20-%20OK&svg=true)](https://ci.appveyor.com/project/laurent22/joplin)
+
 # Building the applications
 
 The Joplin source code is hosted on a [monorepo](https://en.wikipedia.org/wiki/Monorepo) managed by Lerna. The usage of Lerna is mostly transparent as the needed commands have been moved to the root package.json and thus are invoked for example when running `npm install` or `npm run watch`. The main thing to know about Lerna is that it links the packages in the monorepo using `npm link`, so if you check the node_modules directory you will see links instead of actual directories for certain packages. This is something to keep in mind as these links can cause issues in some cases.

README.md

@@ -22,11 +22,11 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
 
 Operating System | Download
 ---|---
-Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v2.0.11/Joplin-Setup-2.0.11.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a>
-macOS | <a href='https://github.com/laurent22/joplin/releases/download/v2.0.11/Joplin-2.0.11.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a>
-Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.0.11/Joplin-2.0.11.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a>
+Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.8.5/Joplin-Setup-1.8.5.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a>
+macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.8.5/Joplin-1.8.5.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a>
+Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.8.5/Joplin-1.8.5.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a>
 
-**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.0.11/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
+**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v1.8.5/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
 
 **On Linux**, the recommended way is to use the following installation script as it will handle the desktop icon too:
 
@@ -36,7 +36,7 @@ Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.0.11/J
 
 Operating System | Download | Alt. Download
 ---|---|---
-Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.0.4/joplin-v2.0.4.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.0.4/joplin-v2.0.4-32bit.apk)
+Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.7.5/joplin-v1.7.5.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.7.5/joplin-v1.7.5-32bit.apk)
 iOS | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplinapp.org/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application
@@ -64,7 +64,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 
 # Sponsors
 
-<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a> <a href=" https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a>
+<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a>
 
 * * *
 
@@ -409,12 +409,6 @@ For more information see [Plugins](https://github.com/laurent22/joplin/blob/dev/
 
 Joplin implements the SQLite Full Text Search (FTS4) extension. It means the content of all the notes is indexed in real time and search queries return results very fast. Both [Simple FTS Queries](https://www.sqlite.org/fts3.html#simple_fts_queries) and [Full-Text Index Queries](https://www.sqlite.org/fts3.html#full_text_index_queries) are supported. See below for the list of supported queries:
 
-One caveat of SQLite FTS is that it does not support languages which do not use Latin word boundaries (spaces, tabs, punctuation). To solve this issue, Joplin has a custom search mode, that does not use FTS, but still has all of its features (multi term search, filters, etc.). One of its drawbacks is that it can get slow on larger note collections. Also, the sorting of the results will be less accurate, as the ranking algorithm (BM25) is, for now, only implemented for FTS. Finally, in this mode there are no restrictions on using the `*` wildcard (`swim*`, `*swim` and `ast*rix` all work). This search mode is currently enabled if one of the following languages are detected:
- - Chinese
- - Japanese
- - Korean
- - Thai
-
 ## Supported queries
 
 Search type | Description | Example
@@ -522,44 +516,44 @@ Current translations:
 <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)  |  95%
 <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  |  30%
 <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)  |  74%
-<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)  |    |  57%
+<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)  |    |  58%
 <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)  |  jmontane, 2019  |  82%
-<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)  |  100%
-<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)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  99%
+<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)  |  95%
+<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)  |  [Lukas Helebrandt](mailto:lukas@aiya.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)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  95%
 <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)  |  [Atalanttore](mailto:atalanttore@googlemail.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)  |    |  56%
 <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)  |  [Mario Campo](mailto:mario.campo@gmail.com)  |  94%
+<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)  |  [Mario Campo](mailto:mario.campo@gmail.com)  |  93%
 <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  |  32%
-<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)  |  mrkaato  |  94%
+<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)  |  mrkaato  |  93%
 <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  |  98%
 <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)  |  38%
 <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)  |  92%
-<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)  |  [Manuel Tassi](mailto:mannivuwiki@gmail.com)  |  99%
-<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)  |  [Szőke Sándor](mailto:mail@szokesandor.hu)  |  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)  |  [Alberto Pasqualetto](mailto:39854348+albertopasqualetto@users.)  |  98%
+<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)  |  [Szőke Sándor](mailto:mail@szokesandor.hu)  |  87%
 <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)  |    |  91%
 <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)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  94%
-<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)  |  75%
+<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)  |  76%
 <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)  |  71%
-<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)  |  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)  |  [Nicolas Suzuki](mailto:nicolas.suzuki@pm.me)  |  94%
-<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)  |  94%
+<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)  |  93%
+<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)  |  [Nicolas Suzuki](mailto:nicolas.suzuki@pm.me)  |  93%
+<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)  |  93%
 <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)  |  66%
 <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)  |  95%
 <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)  |  61%
 <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)  |    |  45%
 <img src="https://joplinapp.org/images/flags/country-4x3/vi.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  73%
-<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)  |  94%
+<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)  |  93%
+<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)  |  93%
 <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)  |  96%
-<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)  |  94%
+<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)  |  93%
 <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)  |    |  71%
-<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)  |  [南宫小骏](mailto:jackytsu@vip.qq.com)  |  99%
-<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)  |  [Po-Chiang Chao](mailto:BobChao%29%20%28bobchao@gmail.com)  |  99%
+<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)  |  [南宫小骏](mailto:jackytsu@vip.qq.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)  |  [Yaoze Ye](mailto:yaozeye@yahoo.co.jp)  |  92%
 <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)  |  96%
-<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)  |  99%
+<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)  |  98%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Contributors
@@ -654,7 +648,7 @@ Thank you to everyone who've contributed to Joplin's source code!
 
 MIT License
 
-Copyright (c) 2016-2021 Laurent Cozic
+Copyright (c) 2016-2020 Laurent Cozic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

docker-compose.db-dev.yml

@@ -13,11 +13,3 @@ services:
             - POSTGRES_PASSWORD=joplin
             - POSTGRES_USER=joplin
             - POSTGRES_DB=joplin
-        
-        # Use this to specify additional Postgres
-        # config parameters:
-        #
-        # command:
-        #     - "postgres"
-        #     - "-c"
-        #     - "log_min_duration_statement=0"

docs/api/references/plugin_api/classes/joplincommands.html

@@ -86,28 +86,6 @@
 					</ul>
 					<p>To view what arguments are supported, you can open any of these files
 					and look at the <code>execute()</code> command.</p>
-					<a href="#executing-editor-commands" id="executing-editor-commands" style="color: inherit; text-decoration: none;">
-						<h2>Executing editor commands</h2>
-					</a>
-					<p>There might be a situation where you want to invoke editor commands
-						without using a <a href="joplincontentscripts.html">contentScript</a>. For this
-					reason Joplin provides the built in <code>editor.execCommand</code> command.</p>
-					<p><code>editor.execCommand</code>  should work with any core command in both the
-						<a href="https://codemirror.net/doc/manual.html#execCommand">CodeMirror</a> and
-						<a href="https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand">TinyMCE</a> editors,
-					as well as most functions calls directly on a CodeMirror editor object (extensions).</p>
-					<ul>
-						<li><a href="https://codemirror.net/doc/manual.html#commands">CodeMirror commands</a></li>
-						<li><a href="https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands">TinyMCE core editor commands</a></li>
-					</ul>
-					<p><code>editor.execCommand</code> supports adding arguments for the commands.</p>
-					<pre><code class="language-typescript"><span class="hljs-keyword">await</span> joplin.commands.execute(<span class="hljs-string">&#x27;editor.execCommand&#x27;</span>, {
-    <span class="hljs-attr">name</span>: <span class="hljs-string">&#x27;madeUpCommand&#x27;</span>, <span class="hljs-comment">// CodeMirror and TinyMCE</span>
-    <span class="hljs-attr">args</span>: [], <span class="hljs-comment">// CodeMirror and TinyMCE</span>
-    <span class="hljs-attr">ui</span>: <span class="hljs-literal">false</span>, <span class="hljs-comment">// TinyMCE only</span>
-    <span class="hljs-attr">value</span>: <span class="hljs-string">&#x27;&#x27;</span>, <span class="hljs-comment">// TinyMCE only</span>
-});</code></pre>
-					<p><a href="https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts">View the example using the CodeMirror editor</a></p>
 				</div>
 			</section>
 			<!--

docs/api/references/plugin_api/interfaces/command.html

@@ -149,8 +149,10 @@
 						<p>Currently the supported context variables aren&#39;t documented, but you can
 						find the list below:</p>
 						<ul>
-							<li><a href="https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts">Global When Clauses</a></li>
-							<li><a href="https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts">Desktop app When Clauses</a></li>
+							<li>[Global When
+							Clauses](<a href="https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts">https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts</a>).</li>
+							<li>[Desktop app When
+							Clauses](<a href="https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts">https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts</a>).</li>
 						</ul>
 						<p>Note: Commands are enabled by default unless you use this property.</p>
 					</div>

docs/api/references/rest_api/index.html

@@ -726,11 +726,6 @@ async function fetchAllNotes() {
 <td></td>
 </tr>
 <tr>
-<td>conflict_original_id</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
 <td>body_html</td>
 <td>text</td>
 <td>Note body, in HTML format</td>

docs/changelog/index.html

@@ -405,46 +405,6 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://joplinapp.org/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 <hr>
 <h1>Joplin changelog<a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a></h1>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.0.11">v2.0.11</a> - 2021-06-16T17:55:49Z<a name="v2-0-11-https-github-com-laurent22-joplin-releases-tag-v2-0-11-2021-06-16t17-55-49z" href="#v2-0-11-https-github-com-laurent22-joplin-releases-tag-v2-0-11-2021-06-16t17-55-49z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Improved: Prevent sync process from being stuck when the download state of a resource is invalid (5c6fd93)</li>
-<li>Fixed: Prevent app from crashing when loading a setting value that has been removed (<a href="https://github.com/laurent22/joplin/issues/5086">#5086</a>)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.0.10">v2.0.10</a> - 2021-06-16T07:58:29Z<a name="v2-0-10-https-github-com-laurent22-joplin-releases-tag-v2-0-10-2021-06-16t07-58-29z" href="#v2-0-10-https-github-com-laurent22-joplin-releases-tag-v2-0-10-2021-06-16t07-58-29z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Fixed: Ensure resources are decrypted when sharing a notebook with Joplin Server (<a href="https://github.com/laurent22/joplin/issues/5080">#5080</a>)</li>
-<li>Fixed: Fixed user content URLs when sharing note via Joplin Server (2cf7067)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.0.9">v2.0.9</a> (Pre-release) - 2021-06-12T09:30:30Z<a name="v2-0-9-https-github-com-laurent22-joplin-releases-tag-v2-0-9-pre-release-2021-06-12t09-30-30z" href="#v2-0-9-https-github-com-laurent22-joplin-releases-tag-v2-0-9-pre-release-2021-06-12t09-30-30z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Improved: Conflict notes will now populate a new field with the ID of the conflict note. (<a href="https://github.com/laurent22/joplin/issues/5049">#5049</a> by <a href="https://github.com/Ahmad45123">@Ahmad45123</a>)</li>
-<li>Improved: Expose prompt to plugins as a command (<a href="https://github.com/laurent22/joplin/issues/5058">#5058</a> by Nishant Mittal)</li>
-<li>Improved: Filter out form elements from note body to prevent potential XSS (thanks to <a href="https://github.com/chinskiy">@chinskiy</a> for the PoC) (feaecf7)</li>
-<li>Fixed: Wrong field removed in API search (<a href="https://github.com/laurent22/joplin/issues/5066">#5066</a> by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.0.8">v2.0.8</a> (Pre-release) - 2021-06-10T16:15:08Z<a name="v2-0-8-https-github-com-laurent22-joplin-releases-tag-v2-0-8-pre-release-2021-06-10t16-15-08z" href="#v2-0-8-https-github-com-laurent22-joplin-releases-tag-v2-0-8-pre-release-2021-06-10t16-15-08z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>New: Add &quot;Retry all&quot; button to sync status screen for items that could not be uploaded (ca487ad)</li>
-<li>New: Add Joplin Cloud sync target (21ea325)</li>
-<li>New: MacOS: add 'Hide Others' and 'Show All' menu items (<a href="https://github.com/laurent22/joplin/issues/5024">#5024</a> by Helmut K. C. Tessarek)</li>
-<li>Improved: Allow passing arguments to commands in command palette (00dc1d8)</li>
-<li>Improved: Allow restoring a deleted note from note history using command palette (5fd6571)</li>
-<li>Improved: Improve search with Asian scripts (<a href="https://github.com/laurent22/joplin/issues/5018">#5018</a>) (<a href="https://github.com/laurent22/joplin/issues/4613">#4613</a> by <a href="https://github.com/mablin7">@mablin7</a>)</li>
-<li>Improved: Improved Joplin Server error handling (95d7ccc)</li>
-<li>Improved: Plugins: Support executing CodeMirror commands from plugins when using execCommand (<a href="https://github.com/laurent22/joplin/issues/5012">#5012</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
-<li>Improved: Recreate http agent when the protocol changes (<a href="https://github.com/laurent22/joplin/issues/5016">#5016</a> by Roman Musin)</li>
-<li>Fixed: Certain resource paths could be corrupted when saved from the Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/5034">#5034</a>)</li>
-<li>Fixed: Ctrl+Clicking links in Rich Text editor was broken (regression) (e8a02c2)</li>
-<li>Fixed: Incorrect list renumbering (<a href="https://github.com/laurent22/joplin/issues/4914">#4914</a>) (<a href="https://github.com/laurent22/joplin/issues/4877">#4877</a> by Austin Doupnik)</li>
-<li>Fixed: Inline Katex gets broken when editing in Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/5052">#5052</a>) (<a href="https://github.com/laurent22/joplin/issues/5025">#5025</a> by <a href="https://github.com/Subhra264">@Subhra264</a>)</li>
-<li>Fixed: Items are filtered in the API search (<a href="https://github.com/laurent22/joplin/issues/5017">#5017</a>) (<a href="https://github.com/laurent22/joplin/issues/5007">#5007</a> by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.0.4">v2.0.4</a> (Pre-release) - 2021-06-02T12:54:17Z<a name="v2-0-4-https-github-com-laurent22-joplin-releases-tag-v2-0-4-pre-release-2021-06-02t12-54-17z" href="#v2-0-4-https-github-com-laurent22-joplin-releases-tag-v2-0-4-pre-release-2021-06-02t12-54-17z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Improved: Download plugins from GitHub release (8f6a475)</li>
-<li>Fixed: Count tags based on showCompletedTodos setting (<a href="https://github.com/laurent22/joplin/issues/4957">#4957</a>) (<a href="https://github.com/laurent22/joplin/issues/4411">#4411</a> by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
-<li>Fixed: Fixes panels overflowing window (<a href="https://github.com/laurent22/joplin/issues/4991">#4991</a>) (<a href="https://github.com/laurent22/joplin/issues/4864">#4864</a> by <a href="https://github.com/mablin7">@mablin7</a>)</li>
-</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.0.2">v2.0.2</a> (Pre-release) - 2021-05-21T18:07:48Z<a name="v2-0-2-https-github-com-laurent22-joplin-releases-tag-v2-0-2-pre-release-2021-05-21t18-07-48z" href="#v2-0-2-https-github-com-laurent22-joplin-releases-tag-v2-0-2-pre-release-2021-05-21t18-07-48z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add Share Notebook menu item (6f2f241)</li>

docs/changelog_android/index.html

@@ -405,27 +405,6 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://joplinapp.org/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 <hr>
 <h1>Joplin Android app changelog<a name="joplin-android-app-changelog" href="#joplin-android-app-changelog" class="heading-anchor">🔗</a></h1>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.0.4">android-v2.0.4</a> - 2021-06-16T12:15:56Z<a name="android-v2-0-4-https-github-com-laurent22-joplin-releases-tag-android-v2-0-4-2021-06-16t12-15-56z" href="#android-v2-0-4-https-github-com-laurent22-joplin-releases-tag-android-v2-0-4-2021-06-16t12-15-56z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Improved: Prevent sync process from being stuck when the download state of a resource is invalid (5c6fd93)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.0.3">android-v2.0.3</a> (Pre-release) - 2021-06-16T09:48:58Z<a name="android-v2-0-3-https-github-com-laurent22-joplin-releases-tag-android-v2-0-3-pre-release-2021-06-16t09-48-58z" href="#android-v2-0-3-https-github-com-laurent22-joplin-releases-tag-android-v2-0-3-pre-release-2021-06-16t09-48-58z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Improved: Verbose mode for synchronizer (4bbb3d1)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.0.2">android-v2.0.2</a> - 2021-06-15T20:03:21Z<a name="android-v2-0-2-https-github-com-laurent22-joplin-releases-tag-android-v2-0-2-2021-06-15t20-03-21z" href="#android-v2-0-2-https-github-com-laurent22-joplin-releases-tag-android-v2-0-2-2021-06-15t20-03-21z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Improved: Conflict notes will now populate a new field with the ID of the conflict note. (#5049 by <a href="https://github.com/Ahmad45123">@Ahmad45123</a>)</li>
-<li>Improved: Filter out form elements from note body to prevent potential XSS (thanks to Dmytro Vdovychinskiy for the PoC) (feaecf7)</li>
-<li>Improved: Focus note editor where tapped instead of scrolling to the end (#4998) (#4216 by Roman Musin)</li>
-<li>Improved: Improve search with Asian scripts (#5018) (#4613 by <a href="https://github.com/mablin7">@mablin7</a>)</li>
-<li>Fixed: Fixed and improved alarm notifications (#4984) (#4912 by Roman Musin)</li>
-<li>Fixed: Fixed opening URLs that contain non-alphabetical characters (#4494)</li>
-<li>Fixed: Fixed user content URLs when sharing note via Joplin Server (2cf7067)</li>
-<li>Fixed: Inline Katex gets broken when editing in Rich Text editor (#5052) (#5025 by <a href="https://github.com/Subhra264">@Subhra264</a>)</li>
-<li>Fixed: Items are filtered in the API search (#5017) (#5007 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
-<li>Fixed: Wrong field removed in API search (#5066 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
-</ul>
 
 		<div class="bottom-links">
 			<a href="https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md">

docs/changelog_server/index.html

@@ -405,74 +405,6 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://joplinapp.org/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 <hr>
 <h1>Joplin Server Changelog<a name="joplin-server-changelog" href="#joplin-server-changelog" class="heading-anchor">🔗</a></h1>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.13">server-v2.0.13</a> - 2021-06-16T14:28:20Z<a name="server-v2-0-13-https-github-com-laurent22-joplin-releases-tag-server-v2-0-13-2021-06-16t14-28-20z" href="#server-v2-0-13-https-github-com-laurent22-joplin-releases-tag-server-v2-0-13-2021-06-16t14-28-20z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Improved: Allow creating a new user with no password, which must be set via email confirmation (1896549)</li>
-<li>Improved: Allow creating a user with a specific account type from admin UI (ecd1602)</li>
-<li>Fixed: Fixed error message when item is over the limit (ea65313)</li>
-<li>Fixed: Fixed issue with user not being able to modify own profile (3c18190)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.12">server-v2.0.12</a> - 2021-06-15T16:24:42Z<a name="server-v2-0-12-https-github-com-laurent22-joplin-releases-tag-server-v2-0-12-2021-06-15t16-24-42z" href="#server-v2-0-12-https-github-com-laurent22-joplin-releases-tag-server-v2-0-12-2021-06-15t16-24-42z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Fixed: Fixed handling of user content URL (31121c8)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.11">server-v2.0.11</a> - 2021-06-15T11:41:41Z<a name="server-v2-0-11-https-github-com-laurent22-joplin-releases-tag-server-v2-0-11-2021-06-15t11-41-41z" href="#server-v2-0-11-https-github-com-laurent22-joplin-releases-tag-server-v2-0-11-2021-06-15t11-41-41z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>New: Add navbar on login and sign up page (7a3a208)</li>
-<li>New: Added option to enable or disable stack traces (5614eb9)</li>
-<li>Improved: Handle custom user content URLs (a36b13d)</li>
-<li>Fixed: Fixed error when creating user (594084e)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.9-beta">server-v2.0.9-beta</a> (Pre-release) - 2021-06-11T16:49:05Z<a name="server-v2-0-9-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-0-9-beta-pre-release-2021-06-11t16-49-05z" href="#server-v2-0-9-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-0-9-beta-pre-release-2021-06-11t16-49-05z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>New: Add navbar on login and sign up page (7a3a208)</li>
-<li>New: Added option to enable or disable stack traces (5614eb9)</li>
-<li>Improved: Handle custom user content URLs (a36b13d)</li>
-<li>Fixed: Fixed error when creating user (594084e)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.6">server-v2.0.6</a> (Pre-release) - 2021-06-07T17:27:27Z<a name="server-v2-0-6-https-github-com-laurent22-joplin-releases-tag-server-v2-0-6-pre-release-2021-06-07t17-27-27z" href="#server-v2-0-6-https-github-com-laurent22-joplin-releases-tag-server-v2-0-6-pre-release-2021-06-07t17-27-27z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>New: Add Stripe integration (770af6a)</li>
-<li>New: Add request duration to log (c8d7ecb)</li>
-<li>New: Add terms and privacy page (db7b802)</li>
-<li>New: Added way to disable signup page, and added links between signup and login pages (75d79f3)</li>
-<li>Improved: Check share ID when uploading a note (3c41b45)</li>
-<li>Improved: Load shared user content from correct domain (de45740)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.5">server-v2.0.5</a> (Pre-release) - 2021-06-02T08:14:47Z<a name="server-v2-0-5-https-github-com-laurent22-joplin-releases-tag-server-v2-0-5-pre-release-2021-06-02t08-14-47z" href="#server-v2-0-5-https-github-com-laurent22-joplin-releases-tag-server-v2-0-5-pre-release-2021-06-02t08-14-47z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>New: Add version number on website (0ef7e98)</li>
-<li>New: Added signup pages (41ed66d)</li>
-<li>Improved: Allow disabling item upload for a user (f8a26cf)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.4">server-v2.0.4</a> (Pre-release) - 2021-05-25T18:33:11Z<a name="server-v2-0-4-https-github-com-laurent22-joplin-releases-tag-server-v2-0-4-pre-release-2021-05-25t18-33-11z" href="#server-v2-0-4-https-github-com-laurent22-joplin-releases-tag-server-v2-0-4-pre-release-2021-05-25t18-33-11z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Fixed: Fixed Item and Log page when using Postgres (ee0f237)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.3">server-v2.0.3</a> (Pre-release) - 2021-05-25T18:08:46Z<a name="server-v2-0-3-https-github-com-laurent22-joplin-releases-tag-server-v2-0-3-pre-release-2021-05-25t18-08-46z" href="#server-v2-0-3-https-github-com-laurent22-joplin-releases-tag-server-v2-0-3-pre-release-2021-05-25t18-08-46z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>Fixed: Fixed handling of request origin (12a6634)</li>
-</ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.2">server-v2.0.2</a> (Pre-release) - 2021-05-25T19:15:50Z<a name="server-v2-0-2-https-github-com-laurent22-joplin-releases-tag-server-v2-0-2-pre-release-2021-05-25t19-15-50z" href="#server-v2-0-2-https-github-com-laurent22-joplin-releases-tag-server-v2-0-2-pre-release-2021-05-25t19-15-50z" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>New: Add mailer service (ed8ee67)</li>
-<li>New: Add support for item size limit (6afde54)</li>
-<li>New: Added API end points to manage users (77b284f)</li>
-<li>Improved: Allow enabling or disabling the sharing feature per user (daaaa13)</li>
-<li>Improved: Allow setting the path to the SQLite database using SQLITE_DATABASE env variable (68e79f1)</li>
-<li>Improved: Allow using a different domain for API, main website and user content (83cef7a)</li>
-<li>Improved: Generate only one share link per note (e156ee1)</li>
-<li>Improved: Go back to home page when there is an error and user is logged in (a24b009)</li>
-<li>Improved: Improved Items table and added item size to it (7f05420)</li>
-<li>Improved: Improved log table too and made it sortable (ec7f0f4)</li>
-<li>Improved: Make it more difficult to delete all data (b01aa7e)</li>
-<li>Improved: Redirect to correct page when trying to access the root (51051e0)</li>
-<li>Improved: Use external directory to store Postgres data in Docker-compose config (71a7fc0)</li>
-<li>Fixed: Fixed /items page when using Postgres (2d0580f)</li>
-<li>Fixed: Fixed bug when unsharing a notebook that has no recipients (6ddb69e)</li>
-<li>Fixed: Fixed deleting a note that has been shared (489995d)</li>
-<li>Fixed: Make sure temp files are deleted after upload is done (#4540)</li>
-</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.1">server-v2.0.1</a> (Pre-release) - 2021-05-14T13:55:45Z<a name="server-v2-0-1-https-github-com-laurent22-joplin-releases-tag-server-v2-0-1-pre-release-2021-05-14t13-55-45z" href="#server-v2-0-1-https-github-com-laurent22-joplin-releases-tag-server-v2-0-1-pre-release-2021-05-14t13-55-45z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add support for sharing notes via a link (ccbc329)</li>

docs/schema/settings.json

@@ -25,8 +25,7 @@
 				6,
 				7,
 				8,
-				9,
-				10
+				9
 			]
 		},
 		"sync.upgradeState": {
@@ -102,11 +101,6 @@
 			"default": "",
 			"description": "Joplin Server URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
-		"sync.9.userContentPath": {
-			"type": "string",
-			"default": "",
-			"$comment": "private"
-		},
 		"sync.9.username": {
 			"type": "string",
 			"default": "",
@@ -118,27 +112,6 @@
 			"description": "Joplin Server password",
 			"$comment": "private"
 		},
-		"sync.10.path": {
-			"type": "string",
-			"default": "https://api.joplincloud.com",
-			"$comment": "private"
-		},
-		"sync.10.userContentPath": {
-			"type": "string",
-			"default": "https://joplinusercontent.com",
-			"$comment": "private"
-		},
-		"sync.10.username": {
-			"type": "string",
-			"default": "",
-			"description": "Joplin Cloud email"
-		},
-		"sync.10.password": {
-			"type": "string",
-			"default": "",
-			"description": "Joplin Cloud password",
-			"$comment": "private"
-		},
 		"sync.5.syncTargets": {
 			"type": "object",
 			"default": {},
@@ -174,11 +147,6 @@
 			"default": "",
 			"$comment": "private"
 		},
-		"sync.10.auth": {
-			"type": "string",
-			"default": "",
-			"$comment": "private"
-		},
 		"sync.1.context": {
 			"type": "string",
 			"default": "",
@@ -224,11 +192,6 @@
 			"default": "",
 			"$comment": "private"
 		},
-		"sync.10.context": {
-			"type": "string",
-			"default": "",
-			"$comment": "private"
-		},
 		"sync.maxConcurrentConnections": {
 			"type": "integer",
 			"default": 5,

package.json

@@ -36,7 +36,6 @@
     "releaseIOS": "node packages/tools/release-ios.js",
     "releasePluginGenerator": "node packages/tools/release-plugin-generator.js",
     "releaseServer": "node packages/tools/release-server.js",
-    "buildServerDocker": "node packages/tools/buildServerDocker.js",
     "setupNewRelease": "node ./packages/tools/setupNewRelease",
     "test-ci": "lerna run test-ci --stream",
     "test": "lerna run test --stream",

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

@@ -71,28 +71,20 @@ class Command extends BaseCommand {
 		};
 
 		if (args.command === 'enable') {
-			const argPassword = options.password ? options.password.toString() : '';
-			const password = argPassword ? argPassword : await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
+			const password = options.password ? options.password.toString() : await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
 			if (!password) {
 				this.stdout(_('Operation cancelled'));
 				return;
 			}
-
-			// If the password was passed via command line, we don't ask for
-			// confirmation. This is to allow setting up E2EE entirely from the
-			// command line.
-			if (!argPassword) {
-				const password2 = await this.prompt(_('Confirm password:'), { type: 'string', secure: true });
-				if (!password2) {
-					this.stdout(_('Operation cancelled'));
-					return;
-				}
-				if (password !== password2) {
-					this.stdout(_('Passwords do not match!'));
-					return;
-				}
+			const password2 = await this.prompt(_('Confirm password:'), { type: 'string', secure: true });
+			if (!password2) {
+				this.stdout(_('Operation cancelled'));
+				return;
+			}
+			if (password !== password2) {
+				this.stdout(_('Passwords do not match!'));
+				return;
 			}
-
 			await EncryptionService.instance().generateMasterKeyAndEnableEncryption(password);
 			return;
 		}

packages/app-cli/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "2.0.1",
+  "version": "1.8.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1806,6 +1806,80 @@
         }
       }
     },
+    "clean-html": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/clean-html/-/clean-html-1.5.0.tgz",
+      "integrity": "sha512-eDu0vN44ZBvoEU0oRIKwWPIccGWXtdnUNmKJuTukZ1de00Uoqavb5pfIMKiC7/r+knQ5RbvAjGuVZiN3JwJL4Q==",
+      "requires": {
+        "htmlparser2": "^3.8.2",
+        "minimist": "^1.1.1"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+          "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+        },
+        "domhandler": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+          "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+          "requires": {
+            "domelementtype": "1"
+          }
+        },
+        "domutils": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+          "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+          "requires": {
+            "dom-serializer": "0",
+            "domelementtype": "1"
+          }
+        },
+        "htmlparser2": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+          "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+          "requires": {
+            "domelementtype": "^1.3.1",
+            "domhandler": "^2.3.0",
+            "domutils": "^1.5.1",
+            "entities": "^1.1.1",
+            "inherits": "^2.0.1",
+            "readable-stream": "^3.1.1"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        }
+      }
+    },
     "cliui": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
@@ -2329,6 +2403,27 @@
       "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true
     },
+    "dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+          "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw=="
+        }
+      }
+    },
+    "domelementtype": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+      "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="
+    },
     "domexception": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
@@ -2450,6 +2545,11 @@
         "once": "^1.4.0"
       }
     },
+    "entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
+    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -4566,8 +4666,7 @@
         },
         "y18n": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "resolved": "",
           "dev": true
         },
         "yargs": {

packages/app-cli/package.json

@@ -27,12 +27,11 @@
       2017,
       2018,
       2019,
-      2020,
-      2021
+      2020
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "2.1.0",
+  "version": "2.0.0",
   "bin": {
     "joplin": "./main.js"
   },
@@ -40,8 +39,8 @@
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@joplin/lib": "2.0",
-    "@joplin/renderer": "2.0",
+    "@joplin/lib": "1.8",
+    "@joplin/renderer": "1.8",
     "aws-sdk": "^2.588.0",
     "chalk": "^4.1.0",
     "compare-version": "^0.1.2",
@@ -65,7 +64,7 @@
     "yargs-parser": "^7.0.0"
   },
   "devDependencies": {
-    "@joplin/tools": "2.0",
+    "@joplin/tools": "1.8",
     "@types/fs-extra": "^9.0.6",
     "@types/jest": "^26.0.15",
     "@types/node": "^14.14.6",

packages/app-cli/tests/.gitignore

@@ -1,3 +1,2 @@
 test data/
-export/
-support/serverPerformances/testPerfCommands.txt
+export/

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

@@ -1 +1 @@
-Hello World:$katexcode$
+$katexcode$

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

@@ -1,5 +1,3 @@
-Hello World :
-
 $$
-\sqrt{3x}
+katexcode
 $$

packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/codemirror_content_script/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/content_script/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/content_script/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/content_script/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/dialog/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/dialog/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/dialog/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/editor_context_menu/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/editor_context_menu/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/editor_context_menu/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/events/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/events/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/events/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/external_assets/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/external_assets/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/external_assets/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/jpl_test/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/jpl_test/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/jpl_test/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/json_export/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/json_export/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/json_export/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/menu/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/menu/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/menu/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/multi_selection/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/multi_selection/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/multi_selection/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/nativeModule/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/nativeModule/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/nativeModule/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/post_messages/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/post_messages/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/post_messages/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/register_command/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/register_command/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/register_command/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/selected_text/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/selected_text/api/JoplinInterop.d.ts

@@ -1,17 +0,0 @@
-import { ExportModule, ImportModule } from './types';
-/**
- * Provides a way to create modules to import external data into Joplin or to export notes into any arbitrary format.
- *
- * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/json_export)
- *
- * To implement an import or export module, you would simply define an object with various event handlers that are called
- * by the application during the import/export process.
- *
- * See the documentation of the [[ExportModule]] and [[ImportModule]] for more information.
- *
- * You may also want to refer to the Joplin API documentation to see the list of properties for each item (note, notebook, etc.) - https://joplinapp.org/api/references/rest_api/
- */
-export default class JoplinInterop {
-    registerExportModule(module: ExportModule): Promise<void>;
-    registerImportModule(module: ImportModule): Promise<void>;
-}

packages/app-cli/tests/support/plugins/selected_text/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/selected_text/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/settings/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/settings/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/settings/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/toc/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/toc/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/toc/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/plugins/withExternalModules/api/JoplinCommands.d.ts

@@ -19,34 +19,6 @@ import { Command } from './types';
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
- *
- * ## Executing editor commands
- *
- * There might be a situation where you want to invoke editor commands
- * without using a {@link JoplinContentScripts | contentScript}. For this
- * reason Joplin provides the built in `editor.execCommand` command.
- *
- * `editor.execCommand`  should work with any core command in both the
- * [CodeMirror](https://codemirror.net/doc/manual.html#execCommand) and
- * [TinyMCE](https://www.tiny.cloud/docs/api/tinymce/tinymce.editorcommands/#execcommand) editors,
- * as well as most functions calls directly on a CodeMirror editor object (extensions).
- *
- * * [CodeMirror commands](https://codemirror.net/doc/manual.html#commands)
- * * [TinyMCE core editor commands](https://www.tiny.cloud/docs/advanced/editor-command-identifiers/#coreeditorcommands)
- *
- * `editor.execCommand` supports adding arguments for the commands.
- *
- * ```typescript
- * await joplin.commands.execute('editor.execCommand', {
- *     name: 'madeUpCommand', // CodeMirror and TinyMCE
- *     args: [], // CodeMirror and TinyMCE
- *     ui: false, // TinyMCE only
- *     value: '', // TinyMCE only
- * });
- * ```
- *
- * [View the example using the CodeMirror editor](https://github.com/laurent22/joplin/blob/dev/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts)
- *
  */
 export default class JoplinCommands {
     /**

packages/app-cli/tests/support/plugins/withExternalModules/api/types.ts

@@ -27,12 +27,11 @@ export interface Command {
 	execute(...args: any[]): Promise<any | void>;
 
 	/**
-	 * Defines whether the command should be enabled or disabled, which in turns
-	 * affects the enabled state of any associated button or menu item.
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
 	 *
-	 * The condition should be expressed as a "when-clause" (as in Visual Studio
-	 * Code). It's a simple boolean expression that evaluates to `true` or
-	 * `false`. It supports the following operators:
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
 	 *
 	 * Operator | Symbol | Example
 	 * -- | -- | --
@@ -41,15 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Joplin, unlike VSCode, also supports parenthesis, which allows creating
-	 * more complex expressions such as `cond1 || (cond2 && cond3)`. Only one
-	 * level of parenthesis is possible (nested ones aren't supported).
-	 *
-	 * Currently the supported context variables aren't documented, but you can
-	 * find the list below:
-	 *
-	 * - [Global When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts)
-	 * - [Desktop app When Clauses](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts)
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */

packages/app-cli/tests/support/plugins/withExternalModules/webpack.config.js

@@ -135,9 +135,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		// JSON files can also be required from scripts so we include this.
-		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +167,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.tsx', '.ts', '.js'],
 	},
 });
 

packages/app-cli/tests/support/serverPerformances/testPerf.sh

@@ -1,55 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-ROOT_DIR="$SCRIPT_DIR/../../../../.."
-
-COMMANDS=($(echo $1 | tr "," "\n"))
-PROFILE_DIR=~/.config/joplindev-testperf
-
-CMD_FILE="$SCRIPT_DIR/testPerfCommands.txt"
-rm -f "$CMD_FILE"
-touch "$CMD_FILE"
-
-for CMD in "${COMMANDS[@]}"
-do
-    if [[ $CMD == "createUsers" ]]; then
-
-		curl --data '{"action": "createTestUsers"}' -H 'Content-Type: application/json' http://api.joplincloud.local:22300/api/debug
-
-	# elif [[ $CMD == "createData" ]]; then
-		
-	# 	echo 'mkbook "shared"' >> "$CMD_FILE"
-	# 	echo 'mkbook "other"' >> "$CMD_FILE"
-	# 	echo 'use "shared"' >> "$CMD_FILE"
-	# 	echo 'mknote "note 1"' >> "$CMD_FILE"
-	# 	echo 'mknote "note 2"' >> "$CMD_FILE"
-	
-	elif [[ $CMD == "reset" ]]; then
-	
-		USER_EMAIL="user1@example.com"
-		rm -rf "$PROFILE_DIR"
-		echo "config keychain.supported 0" >> "$CMD_FILE" 
-		echo "config sync.target 9" >> "$CMD_FILE" 
-		echo "config sync.9.path http://api.joplincloud.local:22300" >> "$CMD_FILE" 
-		echo "config sync.9.username $USER_EMAIL" >> "$CMD_FILE" 
-		echo "config sync.9.password 123456" >> "$CMD_FILE" 
-	
-	# elif [[ $CMD == "e2ee" ]]; then
-	
-	# 	echo "e2ee enable --password 111111" >> "$CMD_FILE" 
-	
-	else
-	
-		echo "Unknown command: $CMD"
-		exit 1
-	
-	fi
-done
-
-cd "$ROOT_DIR/packages/app-cli"
-npm start -- --profile "$PROFILE_DIR" batch "$CMD_FILE"
-npm start -- --profile "$PROFILE_DIR" import ~/Desktop/Joplin_17_06_2021.jex
-npm start -- --profile "$PROFILE_DIR" sync
-

packages/app-clipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "2.1.0",
+    "version": "2.0.0",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": "script-src 'self'; object-src 'self'",

packages/app-desktop/app.ts

@@ -74,7 +74,6 @@ const commands = [
 	require('./gui/MainScreen/commands/toggleNoteList'),
 	require('./gui/MainScreen/commands/toggleSideBar'),
 	require('./gui/MainScreen/commands/toggleVisiblePanes'),
-	require('./gui/MainScreen/commands/showPrompt'),
 	require('./gui/NoteEditor/commands/focusElementNoteBody'),
 	require('./gui/NoteEditor/commands/focusElementNoteTitle'),
 	require('./gui/NoteEditor/commands/showLocalSearch'),
@@ -97,7 +96,6 @@ const globalCommands = [
 	require('./commands/stopExternalEditing'),
 	require('./commands/toggleExternalEditing'),
 	require('./commands/toggleSafeMode'),
-	require('./commands/restoreNoteRevision'),
 	require('@joplin/lib/commands/historyBackward'),
 	require('@joplin/lib/commands/historyForward'),
 	require('@joplin/lib/commands/synchronize'),

packages/app-desktop/commands/restoreNoteRevision.ts

@@ -1,20 +0,0 @@
-import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
-import RevisionService from '@joplin/lib/services/RevisionService';
-
-export const declaration: CommandDeclaration = {
-	name: 'restoreNoteRevision',
-	label: 'Restore a note from history',
-};
-
-export const runtime = (): CommandRuntime => {
-	return {
-		execute: async (_context: CommandContext, noteId: string, reverseRevIndex: number = 0) => {
-			try {
-				const note = await RevisionService.instance().restoreNoteById(noteId, reverseRevIndex);
-				alert(RevisionService.instance().restoreSuccessMessage(note));
-			} catch (error) {
-				alert(error.message);
-			}
-		},
-	};
-};

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

@@ -135,7 +135,6 @@ const commands = [
 	require('./commands/openNote'),
 	require('./commands/openFolder'),
 	require('./commands/openTag'),
-	require('./commands/showPrompt'),
 ];
 
 class MainScreenComponent extends React.Component<Props, State> {

packages/app-desktop/gui/MainScreen/commands/showPrompt.ts

@@ -1,41 +0,0 @@
-import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
-
-export const declaration: CommandDeclaration = {
-	name: 'showPrompt',
-};
-
-enum PromptInputType {
-	Dropdown = 'dropdown',
-	Datetime = 'datetime',
-	Tags = 'tags',
-	Text = 'text',
-}
-
-interface PromptConfig {
-	label: string;
-	inputType?: PromptInputType;
-	value?: any;
-	autocomplete?: any[];
-	buttons?: string[];
-}
-
-export const runtime = (comp: any): CommandRuntime => {
-	return {
-		execute: async (_context: CommandContext, config: PromptConfig) => {
-			return new Promise((resolve) => {
-				comp.setState({
-					promptOptions: {
-						...config,
-						onClose: async (answer: any, buttonType: string) => {
-							comp.setState({ promptOptions: null });
-							resolve({
-								answer: answer,
-								buttonType: buttonType,
-							});
-						},
-					},
-				});
-			});
-		},
-	};
-};

packages/app-desktop/gui/MenuBar.tsx

@@ -526,14 +526,6 @@ function useMenu(props: Props) {
 					click: () => { bridge().electronApp().hide(); },
 				} : noItem,
 
-				shim.isMac() ? {
-					role: 'hideothers',
-				} : noItem,
-
-				shim.isMac() ? {
-					role: 'unhide',
-				} : noItem,
-
 				{
 					type: 'separator',
 				},

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

@@ -224,12 +224,10 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
 						textHeading: () => addListItem('## ', ''),
 						textHorizontalRule: () => addListItem('* * *'),
 						'editor.execCommand': (value: CommandValue) => {
-							if (!('args' in value)) value.args = [];
-
 							if (editorRef.current[value.name]) {
+								if (!('args' in value)) value.args = [];
+
 								editorRef.current[value.name](...value.args);
-							} else if (editorRef.current.commandExists(value.name)) {
-								editorRef.current.execCommand(value.name);
 							} else {
 								reg.logger().warn('CodeMirror execCommand: unsupported command: ', value.name);
 							}

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

@@ -20,7 +20,6 @@ import useEditorSearch from './utils/useEditorSearch';
 import useJoplinMode from './utils/useJoplinMode';
 import useKeymap from './utils/useKeymap';
 import useExternalPlugins from './utils/useExternalPlugins';
-import useJoplinCommands from './utils/useJoplinCommands';
 
 import 'codemirror/keymap/emacs';
 import 'codemirror/keymap/vim';
@@ -108,7 +107,6 @@ function Editor(props: EditorProps, ref: any) {
 	useJoplinMode(CodeMirror);
 	const pluginOptions: any = useExternalPlugins(CodeMirror, props.plugins);
 	useKeymap(CodeMirror);
-	useJoplinCommands(CodeMirror);
 
 	useImperativeHandle(ref, () => {
 		return editor;

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

@@ -2,76 +2,19 @@ import { modifyListLines } from './useCursorUtils';
 
 describe('useCursorUtils', () => {
 
-	const listWithDashes = [
-		'- item1',
-		'- item2',
-		'- item3',
-	];
+	const listWithDashes = `- item1
+- item2
+- item3`;
 
-	const listWithNoPrefixes = [
-		'item1',
-		'item2',
-		'item3',
-	];
+	const listNoDashes = `item1
+item2
+item3`;
 
-	const listWithNumbers = [
-		'1. item1',
-		'2. item2',
-		'3. item3',
-	];
-
-	const listWithOnes = [
-		'1. item1',
-		'1. item2',
-		'1. item3',
-	];
-
-	const listWithSomeNumbers = [
-		'1. item1',
-		'item2',
-		'2. item3',
-	];
-
-	const numberedListWithEmptyLines = [
-		'1. item1',
-		'2. item2',
-		'3. ' ,
-		'4. item3',
-	];
-
-	const noPrefixListWithEmptyLines = [
-		'item1',
-		'item2',
-		'' ,
-		'item3',
-	];
-
-	test('should remove "- " from beginning of each line of input string', () => {
-		expect(modifyListLines([...listWithDashes], NaN, '- ')).toStrictEqual(listWithNoPrefixes);
+	test('should remove "- " from beggining of each line of input string', () => {
+		expect(JSON.stringify(modifyListLines(listWithDashes.split('\n'), 0, '- '))).toBe(JSON.stringify(listNoDashes.split('\n')));
 	});
 
-	test('should add "- " at the beginning of each line of the input string', () => {
-		expect(modifyListLines([...listWithNoPrefixes], NaN, '- ')).toStrictEqual(listWithDashes);
-	});
-
-	test('should remove "n. " at the beginning of each line of the input string', () => {
-		expect(modifyListLines([...listWithNumbers], 4, '1. ')).toStrictEqual(listWithNoPrefixes);
-	});
-
-	test('should add "n. " at the beginning of each line of the input string', () => {
-		expect(modifyListLines([...listWithNoPrefixes], 1, '1. ')).toStrictEqual(listWithNumbers);
-	});
-
-	test('should remove "1. " at the beginning of each line of the input string', () => {
-		expect(modifyListLines([...listWithOnes], 2, '1. ')).toStrictEqual(listWithNoPrefixes);
-	});
-
-	test('should remove "n. " from each line that has it, and ignore' +
-        ' lines which do not', () => {
-		expect(modifyListLines([...listWithSomeNumbers], 2, '2. ')).toStrictEqual(listWithNoPrefixes);
-	});
-
-	test('should add numbers to each line including empty one', () => {
-		expect(modifyListLines(noPrefixListWithEmptyLines, 1, '1. ')).toStrictEqual(numberedListWithEmptyLines);
+	test('should add "- " at the beggining of each line of the input string', () => {
+		expect(JSON.stringify(modifyListLines(listNoDashes.split('\n'), 0, '- '))).toBe(JSON.stringify(listWithDashes.split('\n')));
 	});
 });

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

@@ -1,27 +1,20 @@
 import markdownUtils from '@joplin/lib/markdownUtils';
 import Setting from '@joplin/lib/models/Setting';
-export function modifyListLines(lines: string[], num: number, listSymbol: string) {
-	const isNotNumbered = num === 1;
+export function modifyListLines(lines: string[],num: number,listSymbol: string) {
 	for (let j = 0; j < lines.length; j++) {
 		const line = lines[j];
 		if (!line && j === lines.length - 1) continue;
 		// Only add the list token if it's not already there
 		// if it is, remove it
-		if (num) {
-			const lineNum = markdownUtils.olLineNumber(line);
-			if (!lineNum && isNotNumbered) {
+		if (!line.startsWith(listSymbol)) {
+			if (num) {
 				lines[j] = `${num.toString()}. ${line}`;
 				num++;
 			} else {
-				const listToken = markdownUtils.extractListToken(line);
-				lines[j] = line.substr(listToken.length, line.length - listToken.length);
+				lines[j] = listSymbol + line;
 			}
 		} else {
-			if (!line.startsWith(listSymbol)) {
-				lines[j] = listSymbol + line;
-			} else {
-				lines[j] = line.substr(listSymbol.length, line.length - listSymbol.length);
-			}
+			lines[j] = line.substr(listSymbol.length, line.length - listSymbol.length);
 		}
 	}
 	return lines;

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

@@ -1,7 +0,0 @@
-// Helper commands added to the the CodeMirror instance
-export default function useJoplinCommands(CodeMirror: any) {
-
-	CodeMirror.defineExtension('commandExists', function(name: string) {
-		return !!CodeMirror.commands[name];
-	});
-}

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

@@ -9,7 +9,6 @@ const { urlDecode } = require('@joplin/lib/string-utils');
 const urlUtils = require('@joplin/lib/urlUtils');
 import ResourceFetcher from '@joplin/lib/services/ResourceFetcher';
 import { reg } from '@joplin/lib/registry';
-const uri2path = require('file-uri-to-path');
 
 export default function useMessageHandler(scrollWhenReady: any, setScrollWhenReady: Function, editorRef: any, setLocalSearchResultCount: Function, dispatch: Function, formNote: FormNote) {
 	return useCallback(async (event: any) => {
@@ -52,14 +51,8 @@ export default function useMessageHandler(scrollWhenReady: any, setScrollWhenRea
 
 		} else if (urlUtils.urlProtocol(msg)) {
 			if (msg.indexOf('file://') === 0) {
-				// When using the file:// protocol, openPath doesn't work (does
-				// nothing) with URL-encoded paths.
-				//
-				// shell.openPath seems to work with file:// urls on Windows,
-				// but doesn't on macOS, so we need to convert it to a path
-				// before passing it to openPath.
-				const decodedPath = uri2path(urlDecode(msg));
-				require('electron').shell.openPath(decodedPath);
+				// When using the file:// protocol, openPath doesn't work (does nothing) with URL-encoded paths
+				require('electron').shell.openPath(urlDecode(msg));
 			} else {
 				require('electron').shell.openExternal(msg);
 			}

packages/app-desktop/gui/NoteRevisionViewer.jsx

@@ -13,7 +13,7 @@ const shared = require('@joplin/lib/components/shared/note-screen-shared.js');
 const { MarkupToHtml } = require('@joplin/renderer');
 const time = require('@joplin/lib/time').default;
 const ReactTooltip = require('react-tooltip');
-const { urlDecode } = require('@joplin/lib/string-utils');
+const { urlDecode, substrWithEllipsis } = require('@joplin/lib/string-utils');
 const bridge = require('electron').remote.require('./bridge').default;
 const markupLanguageUtils = require('../utils/markupLanguageUtils').default;
 
@@ -75,7 +75,7 @@ class NoteRevisionViewerComponent extends React.PureComponent {
 		this.setState({ restoring: true });
 		await RevisionService.instance().importRevisionNote(this.state.note);
 		this.setState({ restoring: false });
-		alert(RevisionService.instance().restoreSuccessMessage(this.state.note));
+		alert(_('The note "%s" has been successfully restored to the notebook "%s".', substrWithEllipsis(this.state.note.title, 0, 32), RevisionService.instance().restoreFolderTitle()));
 	}
 
 	backButton_click() {

packages/app-desktop/gui/ShareNoteDialog.tsx

@@ -95,7 +95,7 @@ export function ShareNoteDialog(props: Props) {
 
 	const copyLinksToClipboard = (shares: StateShare[]) => {
 		const links = [];
-		for (const share of shares) links.push(ShareService.instance().shareUrl(ShareService.instance().userId, share));
+		for (const share of shares) links.push(ShareService.instance().shareUrl(share));
 		clipboard.writeText(links.join('\n'));
 	};
 

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

@@ -147,10 +147,7 @@ function StatusScreen(props: Props) {
 		}
 
 		if (section.canRetryAll) {
-			itemsHtml.push(renderSectionRetryAllHtml(section.title, async () => {
-				await section.retryAllHandler();
-				void resfreshScreen();
-			}));
+			itemsHtml.push(renderSectionRetryAllHtml(section.title, section.retryAllHandler));
 		}
 
 		return <div key={key}>{itemsHtml}</div>;

packages/app-desktop/gui/utils/NoteListUtils.ts

@@ -1,5 +1,6 @@
 import { utils as pluginUtils, PluginStates } from '@joplin/lib/services/plugins/reducer';
 import CommandService from '@joplin/lib/services/CommandService';
+import SyncTargetJoplinServer from '@joplin/lib/SyncTargetJoplinServer';
 import eventManager from '@joplin/lib/eventManager';
 import InteropService from '@joplin/lib/services/interop/InteropService';
 import MenuUtils from '@joplin/lib/services/commands/MenuUtils';
@@ -133,7 +134,7 @@ export default class NoteListUtils {
 				})
 			);
 
-			if ([9, 10].includes(Setting.value('sync.target'))) {
+			if (Setting.value('sync.target') === SyncTargetJoplinServer.id()) {
 				menu.append(
 					new MenuItem(
 						menuUtils.commandToStatefulMenuItem('showShareNoteDialog', noteIds.slice())

packages/app-desktop/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.0.11",
+  "version": "2.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.1.0",
+  "version": "2.0.4",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,

packages/app-desktop/plugins/GotoAnything.tsx

@@ -47,12 +47,6 @@ interface State {
 	listType: number;
 	showHelp: boolean;
 	resultsInBody: boolean;
-	commandArgs: string[];
-}
-
-interface CommandQuery {
-	name: string;
-	args: string[];
 }
 
 class GotoAnything {
@@ -93,7 +87,6 @@ class Dialog extends React.PureComponent<Props, State> {
 			listType: BaseModel.TYPE_NOTE,
 			showHelp: false,
 			resultsInBody: false,
-			commandArgs: [],
 		};
 
 		this.styles_ = {};
@@ -257,15 +250,6 @@ class Dialog extends React.PureComponent<Props, State> {
 		return this.markupToHtml_;
 	}
 
-	private parseCommandQuery(query: string): CommandQuery {
-		const fullQuery = query;
-		const splitted = fullQuery.split(/\s+/);
-		return {
-			name: splitted.length ? splitted[0] : '',
-			args: splitted.slice(1),
-		};
-	}
-
 	async updateList() {
 		let resultsInBody = false;
 
@@ -276,16 +260,13 @@ class Dialog extends React.PureComponent<Props, State> {
 			let listType = null;
 			let searchQuery = '';
 			let keywords = null;
-			let commandArgs: string[] = [];
 
 			if (this.state.query.indexOf(':') === 0) { // COMMANDS
-				const commandQuery = this.parseCommandQuery(this.state.query.substr(1));
-
+				const query = this.state.query.substr(1);
 				listType = BaseModel.TYPE_COMMAND;
-				keywords = [commandQuery.name];
-				commandArgs = commandQuery.args;
+				keywords = [query];
 
-				const commandResults = CommandService.instance().searchCommands(commandQuery.name, true);
+				const commandResults = CommandService.instance().searchCommands(query, true);
 
 				results = commandResults.map((result: CommandSearchResult) => {
 					return {
@@ -386,7 +367,6 @@ class Dialog extends React.PureComponent<Props, State> {
 				keywords: keywords ? keywords : await this.keywords(searchQuery),
 				selectedItemId: results.length === 0 ? null : results[0].id,
 				resultsInBody: resultsInBody,
-				commandArgs: commandArgs,
 			});
 		}
 	}
@@ -399,7 +379,7 @@ class Dialog extends React.PureComponent<Props, State> {
 		});
 
 		if (item.type === BaseModel.TYPE_COMMAND) {
-			void CommandService.instance().execute(item.id, ...item.commandArgs);
+			void CommandService.instance().execute(item.id);
 			void focusEditorIfEditorCommand(item.id, CommandService.instance());
 			return;
 		}
@@ -446,7 +426,6 @@ class Dialog extends React.PureComponent<Props, State> {
 			id: itemId,
 			parent_id: parentId,
 			type: itemType,
-			commandArgs: this.state.commandArgs,
 		});
 	}
 
@@ -487,7 +466,7 @@ class Dialog extends React.PureComponent<Props, State> {
 	selectedItem() {
 		const index = this.selectedItemIndex();
 		if (index < 0) return null;
-		return { ...this.state.results[index], commandArgs: this.state.commandArgs };
+		return this.state.results[index];
 	}
 
 	input_onKeyDown(event: any) {