Merge branch 'dev' into check-pr-title

.env-sample

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

.env-transcribe-sample

@@ -1,32 +0,0 @@
-# =============================================================================
-# Required
-# -----------------------------------------------------------------------------
-# =============================================================================
-
-SERVER_PORT=4567
-
-API_KEY=random-string
-QUEUE_TTL=900000
-QUEUE_RETRY_COUNT=2
-QUEUE_MAINTENANCE_INTERVAL=30000
-
-HTR_CLI_DOCKER_IMAGE=joplin/htr-cli:0.0.2
-# Fullpath to images folder e.g.:
-#HTR_CLI_IMAGES_FOLDER=/home/user/joplin/packages/transcribe/images
-HTR_CLI_IMAGES_FOLDER=
-
-QUEUE_DRIVER=pg
-# QUEUE_DRIVER=sqlite
-
-
-# =============================================================================
-# Queue driver
-# -----------------------------------------------------------------------------
-# =============================================================================
-#
-# QUEUE_DATABASE_NAME=./queue.sqlite3
-QUEUE_DATABASE_NAME=transcribe
-QUEUE_DATABASE_USER=transcribe
-QUEUE_DATABASE_PASSWORD=transcribe
-QUEUE_DATABASE_PORT=5432
-QUEUE_DATABASE_HOST=localhost

.envrc

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Automatically sets up your devbox environment whenever you cd into this
-# directory via our direnv integration:
-
-eval "$(devbox generate direnv --print-envrc)"
-
-# check out https://www.jetpack.io/devbox/docs/ide_configuration/direnv/
-# for more details

.eslintrc.js

@@ -15,22 +15,6 @@ module.exports = {
 	'globals': {
 		'Atomics': 'readonly',
 		'SharedArrayBuffer': 'readonly',
-		'BufferEncoding': 'readonly',
-		'AsyncIterable': 'readonly',
-		'FileSystemFileHandle': 'readonly',
-		'FileSystemDirectoryHandle': 'readonly',
-		'ReadableStreamDefaultReader': 'readonly',
-		'FileSystemCreateWritableOptions': 'readonly',
-		'FileSystemHandle': 'readonly',
-		'IDBTransactionMode': 'readonly',
-		'FlatArray': 'readonly',
-		'BigInt': 'readonly',
-		'globalThis': 'readonly',
-
-		// ServiceWorker
-		'ExtendableEvent': 'readonly',
-		'WindowClient': 'readonly',
-		'FetchEvent': 'readonly',
 
 		// Jest variables
 		'test': 'readonly',
@@ -60,8 +44,6 @@ module.exports = {
 		'tinymce': 'readonly',
 
 		'JSX': 'readonly',
-
-		'NodeJS': 'readonly',
 	},
 	'parserOptions': {
 		'ecmaVersion': 2018,
@@ -88,11 +70,6 @@ module.exports = {
 		'no-var': ['error'],
 		'no-new-func': ['error'],
 		'import/prefer-default-export': ['error'],
-		'prefer-promise-reject-errors': ['error', {
-			allowEmptyReject: true,
-		}],
-		'no-throw-literal': ['error'],
-		'no-unused-expressions': ['error'],
 
 		// This rule should not be enabled since it matters in what order
 		// imports are done, in particular in relation to the shim.setReact
@@ -124,19 +101,6 @@ module.exports = {
 		'no-unneeded-ternary': 'error',
 		'github/array-foreach': ['error'],
 
-		'no-restricted-properties': ['error',
-			{
-				'property': 'focus',
-				'message': 'Please use focusHandler::focus() instead',
-			},
-			{
-				'property': 'blur',
-				'message': 'Please use focusHandler::blur() instead',
-			},
-		],
-
-		'@typescript-eslint/no-explicit-any': ['error'],
-
 		// -------------------------------
 		// Formatting
 		// -------------------------------
@@ -289,15 +253,7 @@ module.exports = {
 						selector: 'enumMember',
 						format: null,
 						'filter': {
-							'regex': '^(GET|POST|PUT|DELETE|PATCH|HEAD|SQLite|PostgreSQL|ASC|DESC|E2EE|OR|AND|UNION|INTERSECT|EXCLUSION|INCLUSION|EUR|GBP|USD|SJCL.*|iOS)$',
-							'match': true,
-						},
-					},
-					{
-						selector: 'enumMember',
-						format: null,
-						'filter': {
-							'regex': '^(sha1|sha256|sha384|sha512|AES_128_GCM|AES_192_GCM|AES_256_GCM)$',
+							'regex': '^(GET|POST|PUT|DELETE|PATCH|HEAD|SQLite|PostgreSQL|ASC|DESC|E2EE|OR|AND|UNION|INTERSECT|EXCLUSION|INCLUSION|EUR|GBP|USD|SJCL.*)$',
 							'match': true,
 						},
 					},
@@ -314,7 +270,7 @@ module.exports = {
 						selector: 'interface',
 						format: null,
 						'filter': {
-							'regex': '^(RSA|RSAKeyPair|iOS.*)$',
+							'regex': '^(RSA|RSAKeyPair)$',
 							'match': true,
 						},
 					},

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -26,8 +26,8 @@ body:
     id: version
     attributes:
       label: "Joplin version"
-      placeholder: "For example 1.0.5"
-      description: Please note that we will close the issue if the exact version is not provided, as we cannot help without this.
+      placeholder: "For example 2.3.6"
+      description: 
     validations:
       required: true
       

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
     - name: Feature Requests
       url: https://discourse.joplinapp.org/c/features/
       about: Discuss ideas for new features or changes
     - name: Support
       url: https://discourse.joplinapp.org/c/support/
-      about: Please ask for help here
+      about: Please ask for help here

.github/PULL_REQUEST_TEMPLATE

@@ -20,6 +20,6 @@ If it's not related to any platform (such as a translation, change to the docume
 
 Then please append the issue that you've addressed or fixed. Use "Resolves #123" for new features or improvements and "Fixes #123" for bug fixes.
 
-AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/dev/readme/dev/index.md
+AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/dev/CONTRIBUTING.md
 
--->
+-->

.github/scripts/publish_docker_manifest.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-VERSION=$(echo "$GIT_TAG_NAME" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
-
-echo "GIT_TAG_NAME=$GIT_TAG_NAME"
-echo "VERSION=$VERSION"
-echo "SERVER_TAG_PREFIX=$SERVER_TAG_PREFIX"
-echo "SERVER_REPOSITORY=$SERVER_REPOSITORY"
-
-# Check if it's a server release, otherwise exit
-if [[ $GIT_TAG_NAME != $SERVER_TAG_PREFIX-* ]]; then
-	exit 0
-fi
-
-docker manifest inspect $SERVER_REPOSITORY:arm64-$VERSION > /dev/null 2>&1
-if [ $? -ne 0 ]; then
-	echo "Image $SERVER_REPOSITORY:arm64-$VERSION does not exist on the remote registry."
-	exit 0
-fi
-
-docker manifest inspect $SERVER_REPOSITORY:amd64-$VERSION > /dev/null 2>&1
-if [ $? -ne 0 ]; then
-	echo "Image $SERVER_REPOSITORY:amd64-$VERSION does not exist on the remote registry."
-	exit 0
-fi
-
-docker manifest create $SERVER_REPOSITORY:$VERSION \
-	$SERVER_REPOSITORY:arm64-$VERSION \
-	$SERVER_REPOSITORY:amd64-$VERSION
-
-docker manifest annotate $SERVER_REPOSITORY:$VERSION $SERVER_REPOSITORY:arm64-$VERSION --arch arm64
-docker manifest annotate $SERVER_REPOSITORY:$VERSION $SERVER_REPOSITORY:amd64-$VERSION --arch amd64
-
-docker manifest push $SERVER_REPOSITORY:$VERSION

.github/scripts/run_ci.sh

@@ -7,13 +7,9 @@
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 ROOT_DIR="$SCRIPT_DIR/../.."
 
-TRANSCRIBE_TAG_PREFIX=transcribe
-TRANSCRIBE_REPOSITORY=joplin/transcribe
-
 IS_PULL_REQUEST=0
 IS_DESKTOP_RELEASE=0
 IS_SERVER_RELEASE=0
-IS_TRANSCRIBE_RELEASE=0
 IS_LINUX=0
 IS_MACOS=0
 
@@ -27,10 +23,6 @@ if [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
 	IS_SERVER_RELEASE=1
 fi
 
-if [[ $GIT_TAG_NAME = $TRANSCRIBE_TAG_PREFIX-* ]]; then
-	IS_TRANSCRIBE_RELEASE=1
-fi
-
 if [[ $GIT_TAG_NAME = v* ]]; then
 	IS_DESKTOP_RELEASE=1
 fi
@@ -43,45 +35,18 @@ else
 	IS_MACOS=1
 fi
 
-DOCKER_IMAGE_PLATFORM="linux/amd64"
-
 # Tests can randomly fail in some cases, so only run them when not publishing
 # a release
 RUN_TESTS=0
 
-if [ "$IS_SERVER_RELEASE" = 0 ] && [ "$IS_DESKTOP_RELEASE" = 0 ] && [ "$IS_TRANSCRIBE_RELEASE" = 0 ]; then
+if [ "$IS_SERVER_RELEASE" = 0 ] && [ "$IS_DESKTOP_RELEASE" = 0 ]; then
 	RUN_TESTS=1
 fi
 
-if [ "$RUNNER_ARCH" == "ARM64" ]; then
-	if [ "$IS_SERVER_RELEASE" == "0" ] && [ "$IS_TRANSCRIBE_RELEASE" == "0" ]; then
-		# We exit now because nothing works properly with the ARM64 architecture.
-		# We only proceed  if building the server image.
-		echo "Running on ARM64 and not trying to build server image - early exit"
-		exit 0
-	fi
-fi
-
-if [ "$RUNNER_ARCH" == "ARM64" ]; then
-	# Canvas is only needed for tests and it doesn't build in ARM64 so remove it
-	RUN_TESTS=0
-	cd "$ROOT_DIR/packages/lib"
-	yarn remove canvas
-	cd "$ROOT_DIR"
-
-	DOCKER_IMAGE_PLATFORM="linux/arm64"
-
-	# Delete certain directories because `yarn install` will fail on ARM64.
-	rm -rf app-desktop
-	rm -rf app-mobile
-fi
-
 # =============================================================================
 # Print environment
 # =============================================================================
 
-echo "RUNNER_OS=$RUNNER_OS"
-echo "RUNNER_ARCH=$RUNNER_ARCH"
 echo "GITHUB_WORKFLOW=$GITHUB_WORKFLOW"
 echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"
 echo "GITHUB_REF=$GITHUB_REF"
@@ -90,14 +55,11 @@ echo "GIT_TAG_NAME=$GIT_TAG_NAME"
 echo "BUILD_SEQUENCIAL=$BUILD_SEQUENCIAL"
 echo "SERVER_REPOSITORY=$SERVER_REPOSITORY"
 echo "SERVER_TAG_PREFIX=$SERVER_TAG_PREFIX"
-echo "TRANSCRIBE_TAG_PREFIX=$TRANSCRIBE_TAG_PREFIX"
-echo "DOCKER_IMAGE_PLATFORM=$DOCKER_IMAGE_PLATFORM"
 
 echo "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION"
 echo "IS_PULL_REQUEST=$IS_PULL_REQUEST"
 echo "IS_DESKTOP_RELEASE=$IS_DESKTOP_RELEASE"
 echo "IS_SERVER_RELEASE=$IS_SERVER_RELEASE"
-echo "IS_TRANSCRIBE_RELEASE=$IS_TRANSCRIBE_RELEASE"
 echo "RUN_TESTS=$RUN_TESTS"
 echo "IS_LINUX=$IS_LINUX"
 echo "IS_MACOS=$IS_MACOS"
@@ -105,7 +67,6 @@ echo "IS_MACOS=$IS_MACOS"
 echo "Node $( node -v )"
 echo "Npm $( npm -v )"
 echo "Yarn $( yarn -v )"
-echo "Rust $( rustc --version )"
 
 # =============================================================================
 # Install packages
@@ -129,7 +90,7 @@ if [ "$RUN_TESTS" == "1" ]; then
 	# On Linux, we run the Joplin Server tests using PostgreSQL
 	if [ "$IS_LINUX" == "1" ]; then
 		echo "Running Joplin Server tests using PostgreSQL..."
-		sudo docker compose --parallel 1 --file docker-compose.db-dev.yml up -d
+		sudo docker-compose --file docker-compose.db-dev.yml up -d
 		cmdResult=$?
 		if [ $cmdResult -ne 0 ]; then
 			exit $cmdResult
@@ -146,13 +107,24 @@ if [ "$RUN_TESTS" == "1" ]; then
 	#
 	# https://stackoverflow.com/questions/38558989
 	export NODE_OPTIONS="--max-old-space-size=32768"
-	yarn test-ci
+	yarn run test-ci
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
 	fi
 fi
 
+# =============================================================================
+# Check that the website builder can run without errors
+# =============================================================================
+
+if [ "$RUN_TESTS" == "1" ]; then
+	if [ "$IS_LINUX" == "1" ]; then
+		echo "Step: Running website builder..."
+		node packages/tools/website/processDocs.js --env dev
+	fi
+fi
+
 # =============================================================================
 # Run linter for pull requests only. We also don't want this to make the desktop
 # release randomly fail.
@@ -161,13 +133,13 @@ fi
 if [ "$RUN_TESTS" == "1" ]; then
 	echo "Step: Running linter..."
 
-	yarn linter-ci ./
+	yarn run linter-ci ./
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
 	fi
 
-	yarn packageJsonLint
+	yarn run packageJsonLint
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -180,13 +152,15 @@ fi
 # for Linux only is sufficient.
 # =============================================================================
 
-if [ "$IS_LINUX" == "1" ]; then
-	echo "Step: Validating translations..."
+if [ "$IS_PULL_REQUEST" == "1" ]; then
+	if [ "$IS_LINUX" == "1" ]; then
+		echo "Step: Validating translations..."
 
-	node packages/tools/validate-translation.js
-	testResult=$?
-	if [ $testResult -ne 0 ]; then
-		exit $testResult
+		node packages/tools/validate-translation.js
+		testResult=$?
+		if [ $testResult -ne 0 ]; then
+			exit $testResult
+		fi
 	fi
 fi
 
@@ -212,35 +186,15 @@ fi
 
 # =============================================================================
 # Check .gitignore and .eslintignore files - they should be updated when
-# new TypeScript files are added by running `yarn updateIgnored`.
+# new TypeScript files are added by running `yarn run updateIgnored`.
 # See coding_style.md
 # =============================================================================
 
-if [ "$IS_LINUX" == "1" ]; then
-	echo "Step: Checking for files that should have been ignored..."
-
-	# .gitignore and .eslintignore can be modified during yarn install. Reset them
-	# so that checkIgnoredFiles works.
-	git restore .gitignore .eslintignore
-
-	node packages/tools/checkIgnoredFiles.js 
-	testResult=$?
-	if [ $testResult -ne 0 ]; then
-		exit $testResult
-	fi
-fi
-
-# =============================================================================
-# Check that the website still builds
-# =============================================================================
-
-if [ "$RUN_TESTS" == "1" ]; then
+if [ "$IS_PULL_REQUEST" == "1" ]; then
 	if [ "$IS_LINUX" == "1" ]; then
-		echo "Step: Check that the website still builds..."
+		echo "Step: Checking for files that should have been ignored..."
 
-		mkdir -p ../joplin-website/docs
-		CROWDIN_PERSONAL_TOKEN="$CROWDIN_PERSONAL_TOKEN" yarn crowdinDownload
-		SKIP_SPONSOR_PROCESSING=1 yarn buildWebsite
+		node packages/tools/checkIgnoredFiles.js 
 		testResult=$?
 		if [ $testResult -ne 0 ]; then
 			exit $testResult
@@ -249,13 +203,14 @@ if [ "$RUN_TESTS" == "1" ]; then
 fi
 
 # =============================================================================
-# Spellchecking
+# Check that the website still builds
 # =============================================================================
 
-if [ "$IS_LINUX" == "1" ]; then
-	echo "Step: Spellchecking..."
+if [ "$RUN_TESTS" == "1" ]; then
+	echo "Step: Check that the website still builds..."
 
-	yarn spellcheck --all
+	mkdir -p ../joplin-website/docs
+	SKIP_SPONSOR_PROCESSING=1 yarn run buildWebsite
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -308,18 +263,14 @@ if [ "$IS_DESKTOP_RELEASE" == "1" ]; then
 		# "python" and seems to no longer respect the PYTHON_PATH environment variable.
 		# We work around this by aliasing python.
 		alias python=$(which python3)
-		USE_HARD_LINKS=false yarn dist
+		USE_HARD_LINKS=false yarn run dist
 	else
-		USE_HARD_LINKS=false yarn dist
+		USE_HARD_LINKS=false yarn run dist
 	fi	
 elif [[ $IS_LINUX = 1 ]] && [ "$IS_SERVER_RELEASE" == "1" ]; then
-	echo "Step: Building Joplin Server Docker Image..."
+	echo "Step: Building Docker Image..."
 	cd "$ROOT_DIR"
-	yarn buildServerDocker --docker-file Dockerfile.server --platform $DOCKER_IMAGE_PLATFORM --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
-elif [[ $IS_LINUX = 1 ]] && [ "$IS_TRANSCRIBE_RELEASE" == "1" ]; then
-	echo "Step: Building Joplin Transcribe Docker Image..."
-	cd "$ROOT_DIR"
-	yarn buildServerDocker --docker-file Dockerfile.transcribe --platform $DOCKER_IMAGE_PLATFORM --tag-name $GIT_TAG_NAME --push-images --repository $TRANSCRIBE_REPOSITORY
+	yarn run buildServerDocker --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
 else
 	echo "Step: Building but *not* publishing desktop application..."
 	
@@ -333,8 +284,8 @@ else
 		export CSC_IDENTITY_AUTO_DISCOVERY=false
 		npm pkg set 'build.mac.identity'=null --json
 		
-		USE_HARD_LINKS=false yarn dist --publish=never
+		USE_HARD_LINKS=false yarn run dist --publish=never
 	else
-		USE_HARD_LINKS=false yarn dist --publish=never
+		USE_HARD_LINKS=false yarn run dist --publish=never
 	fi
 fi

.github/workflows/automerge.yml

@@ -1,25 +0,0 @@
-name: automerge
-on:
-  schedule:
-    - cron: '*/10 * * * *'
-jobs:
-
-  # This job will make the action fail if any of the checks hasn't passed
-  # https://github.com/marketplace/actions/allcheckspassed
-  # allchecks:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: wechuli/allcheckspassed@v1
-
-  automerge:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - id: automerge
-        name: automerge
-        uses: "pascalgn/automerge-action@v0.16.4"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_METHOD: "squash"
-          LOG: "DEBUG"

.github/workflows/build-android.yml

@@ -5,29 +5,34 @@ name: react-native-android-build-apk
 on: [push, pull_request]
 
 jobs:
-  AssembleRelease:
+  pre_job:
     if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'same_content_newer'
+
+  BuildAndroidDebug:
+    needs: pre_job
+    if: github.repository == 'laurent22/joplin' && needs.pre_job.outputs.should_skip != 'true'
+    runs-on: ubuntu-latest
     steps:
       - name: Install Linux dependencies
         run: |
           sudo apt-get update || true
           sudo apt-get install -y libsecret-1-dev
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '20'
           
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v2
         with:
           node-version: '18'
           cache: 'yarn'
 
-      - uses: dtolnay/rust-toolchain@stable
-
       - name: Install Yarn
         run: |
           corepack enable
@@ -35,9 +40,7 @@ jobs:
       - name: Install
         run:  yarn install
 
-      - name: Assemble Android Release
+      - name: Build Android Release
         run: |
-          cd packages/app-mobile/android
-          sed -i -- 's/signingConfig signingConfigs.release/signingConfig signingConfigs.debug/' app/build.gradle
-          ./gradlew assembleRelease
+          cd packages/app-mobile/android && ./gradlew assembleDebug
           

.github/workflows/build-macos-m1.yml

@@ -1,19 +1,31 @@
 name: Build macOS M1
 on: [push, pull_request]
 jobs:
-  Main:
-    # We always process desktop release tags, because they also publish the release
+  pre_job:
     if: github.repository == 'laurent22/joplin'
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'same_content_newer'
+
+  Main:
+    needs: pre_job
+    # We always process desktop release tags, because they also publish the release
+    if: github.repository == 'laurent22/joplin' && (needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/v'))
     runs-on: macos-latest
     steps:
 
-      - uses: actions/checkout@v4
-      - uses: olegtarasov/get-tag@v2.1.4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v2
+      - uses: olegtarasov/get-tag@v2.1
+      - uses: actions/setup-node@v2
         with:
           # We need to pin the version to 18.15, because 18.16+ fails with this error:
           # https://github.com/facebook/react-native/issues/36440
-          node-version: '18.20.8'
+          node-version: '18.15.0'
           cache: 'yarn'
 
       - name: Install Yarn
@@ -21,24 +33,10 @@ jobs:
           # https://yarnpkg.com/getting-started/install
           corepack enable
 
-      - name: Install macOs dependencies
-        if: runner.os == 'macOS'
-        run: |
-          # Required for building the canvas package
-          brew install pango
-
       # See github-action-main.yml for explanation
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
-          python-version: '3.13'
-
-      - name: Set Publish Flag
-        run: |
-          if [[ $GIT_TAG_NAME = v* ]]; then
-            echo "PUBLISH_ENABLED=true" >> $GITHUB_ENV
-          else
-            echo "PUBLISH_ENABLED=false" >> $GITHUB_ENV
-          fi
+          python-version: '3.11'
 
       - name: Build macOS M1 app
         env:
@@ -52,23 +50,20 @@ jobs:
           GH_REPO: ${{ github.repository }}
           IS_CONTINUOUS_INTEGRATION: 1
           BUILD_SEQUENCIAL: 1
-          PUBLISH_ENABLED: ${{ env.PUBLISH_ENABLED }}
         run: |
           export npm_config_arch=arm64
           export npm_config_target_arch=arm64
           yarn install
           cd packages/app-desktop
           npm pkg set 'build.mac.artifactName'='${productName}-${version}-${arch}.${ext}'
-          npm pkg set 'build.mac.target[0].target'='dmg'
-          npm pkg set 'build.mac.target[0].arch[0]'='arm64'
-          npm pkg set 'build.mac.target[1].target'='zip'
-          npm pkg set 'build.mac.target[1].arch[0]'='arm64'
+          npm pkg set 'build.mac.target.target'='dmg'
+          npm pkg set 'build.mac.target.arch[0]'='arm64'
 
-          if [[ "$PUBLISH_ENABLED" == "true" ]]; then
+          if [[ $GIT_TAG_NAME = v* ]]; then
             echo "Building and publishing desktop application..."
-            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist --mac --arm64
+            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn run dist --mac --arm64
 
-            yarn modifyReleaseAssets --repo="$GH_REPO" --tag="$GIT_TAG_NAME" --token="$GITHUB_TOKEN"
+            yarn renameReleaseAssets --repo="$GH_REPO" --tag="$GIT_TAG_NAME" --token="$GITHUB_TOKEN"
           else
             echo "Building but *not* publishing desktop application..."
 
@@ -79,5 +74,5 @@ jobs:
             export CSC_IDENTITY_AUTO_DISCOVERY=false
             npm pkg set 'build.mac.identity'=null --json
 
-            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist  --mac --arm64 --publish=never
-          fi
+            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn run dist  --mac --arm64 --publish=never
+          fi

.github/workflows/check-pr-title.yml

@@ -2,8 +2,7 @@ name: Check pull request title
 on: [pull_request]
 jobs:
   main:
-    runs-on: ubuntu-latest
     steps:
       - uses: Slashgear/action-check-pr-title@v4.3.0
         with:
-          regexp: "(Desktop|Mobile|All|Cli|Tools|Chore|Clipper|Server|Android|iOS|Plugins|CI|Plugin Repo|Doc): (Fixes|Resolves) #[0-9]+: .+"
+          regexp: "(Desktop|Mobile|All|Cli|Tools|Chore|Clipper|Server|Android|iOS|Plugins): (Fixes|Resolves) #[0-9]+: .+"

.github/workflows/cla.yml

@@ -13,16 +13,16 @@ jobs:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         # Beta Release
-        uses: contributor-assistant/github-action@v2.3.2
+        uses: contributor-assistant/github-action@v2.3.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         with:
-          path-to-signatures: 'readme/cla/signatures.json'
+          path-to-signatures: 'readme/cla_signatures.json'
           path-to-document: 'https://github.com/laurent22/joplin/blob/dev/readme/cla.md' # e.g. a CLA or a DCO document
           # branch should not be protected
-          branch: 'cla_signatures'
+          branch: 'dev'
           allowlist: joplinbot,renovate[bot]
 
          # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken

.github/workflows/close-stale-issues.yml

@@ -9,7 +9,7 @@ jobs:
     if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v4
         with:
           # Use this to do a dry run from a pull request
           # debug-only: true

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

@@ -1,22 +1,66 @@
 name: Joplin Continuous Integration
 on: [push, pull_request]
 jobs:
-  Main:
-    # We always process server or desktop release tags, because they also publish the release
+  pre_job:
     if: github.repository == 'laurent22/joplin'
+    # Do not use unbuntu-latest because it causes `The operation was canceled` failures:
+    # https://github.com/actions/runner-images/issues/6709
+    runs-on: ubuntu-20.04
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'same_content_newer'
+
+  Main:
+    needs: pre_job
+    # We always process server or desktop release tags, because they also publish the release
+    if: github.repository == 'laurent22/joplin' && (needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/v'))
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         # Do not use unbuntu-latest because it causes `The operation was canceled` failures:
         # https://github.com/actions/runner-images/issues/6709
-        os: [macos-13, ubuntu-22.04, windows-2025, ubuntu-22.04-arm]
+        os: [macos-latest, ubuntu-20.04, windows-2019]
     steps:
-      - uses: actions/checkout@v4
 
-      - name: Setup build environment
-        uses: ./.github/workflows/shared/setup-build-environment
+      # Trying to fix random networking issues on Windows
+      # https://github.com/actions/runner-images/issues/1187#issuecomment-686735760
+      - name: Disable TCP/UDP offload on Windows
+        if: runner.os == 'Windows'
+        run: Disable-NetAdapterChecksumOffload -Name * -TcpIPv4 -UdpIPv4 -TcpIPv6 -UdpIPv6
+
+      - name: Disable TCP/UDP offload on Linux
+        if: runner.os == 'Linux'
+        run: sudo ethtool -K eth0 tx off rx off
+
+      - name: Disable TCP/UDP offload on macOS
+        if: runner.os == 'macOS'
+        run: |
+          sudo sysctl -w net.link.generic.system.hwcksum_tx=0
+          sudo sysctl -w net.link.generic.system.hwcksum_rx=0
+
+      # Silence apt-get update errors (for example when a module doesn't
+      # exist) since otherwise it will make the whole build fails, even though
+      # it might work without update. libsecret-1-dev is required for keytar -
+      # 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
+          sudo apt-get install -y translate-toolkit
+          sudo apt-get install -y rsync
+          # Provides a virtual display on Linux. Used for Playwright integration
+          # testing.
+          sudo apt-get install -y xvfb
 
       - name: Install Docker Engine
+        # if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
         if: runner.os == 'Linux'
         run: |
           sudo apt-get install -y apt-transport-https
@@ -26,20 +70,43 @@ jobs:
           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=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
+              "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 docker-buildx-plugin
+          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:
+          # We need to pin the version to 18.15, because 18.16+ fails with this error:
+          # https://github.com/facebook/react-native/issues/36440
+          node-version: '18.15.0'
+          cache: 'yarn'
+
+      - name: Install Yarn
+        run: |
+          # https://yarnpkg.com/getting-started/install
+          corepack enable
+      
       # Login to Docker only if we're on a server release tag. If we run this on
       # a pull request it will fail because the PR doesn't have access to
       # secrets
-      - uses: docker/login-action@v3
-        if: runner.os == 'Linux' && (startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/transcribe-v'))
+      - uses: docker/login-action@v2
+        if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      # macos-latest ships with Python 3.12 by default, but this removes a
+      # utility that's used by electron-builder (distutils) so we need to pin
+      # Python to an earlier version.
+      # Fixes error `ModuleNotFoundError: No module named 'distutils'`
+      # Ref: https://github.com/nodejs/node-gyp/issues/2869
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
       - name: Run tests, build and publish Linux and macOS apps
         if: runner.os == 'Linux' || runner.os == 'macOs'
         env:
@@ -54,7 +121,6 @@ jobs:
           BUILD_SEQUENCIAL: 1
           SERVER_REPOSITORY: joplin/server
           SERVER_TAG_PREFIX: server
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
         run: |
           "${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"
 
@@ -69,7 +135,7 @@ jobs:
         # To ensure that the operations stop on failure, all commands
         # should be on one line with "&&" in between.
         run: |
-          yarn install && cd packages/app-desktop && yarn dist
+          yarn install && cd packages/app-desktop && yarn run dist
 
       # Build and package the Windows app, without publishing it, just to
       # verify that the build process hasn't been broken.
@@ -81,25 +147,17 @@ jobs:
           SERVER_REPOSITORY: joplin/server
           SERVER_TAG_PREFIX: server
         run: |
-          yarn install && cd packages/app-desktop && yarn dist --publish=never
-
-      - name: Publish Docker manifest
-        if: runner.os == 'Linux'
-        env:
-          SERVER_REPOSITORY: joplin/server
-          SERVER_TAG_PREFIX: server
-        run: |
-          chmod 700 "${GITHUB_WORKSPACE}/.github/scripts/publish_docker_manifest.sh"
-          "${GITHUB_WORKSPACE}/.github/scripts/publish_docker_manifest.sh"
+          yarn install && cd packages/app-desktop && yarn run dist --publish=never
 
   ServerDockerImage:
-    if: github.repository == 'laurent22/joplin'
+    needs: pre_job
+    if: github.repository == 'laurent22/joplin' && needs.pre_job.outputs.should_skip != 'true'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         # Do not use unbuntu-latest because it causes `The operation was canceled` failures:
         # https://github.com/actions/runner-images/issues/6709
-        os: [ubuntu-22.04, ubuntu-22.04-arm]
+        os: [ubuntu-20.04]
     steps:
 
       - name: Install Docker Engine
@@ -111,16 +169,17 @@ jobs:
           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=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
+              "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 docker-buildx-plugin
+          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v2
         with:
           node-version: '18'
+          cache: 'yarn'
 
       - name: Install Yarn
         run: |
@@ -131,28 +190,20 @@ jobs:
         env:
           BUILD_SEQUENCIAL: 1
         run: |
-          if [ "$RUNNER_ARCH" == "ARM64" ]; then
-            DOCKER_IMAGE_PLATFORM="linux/arm64"
-          fi
-
-          echo "RUNNER_OS=$RUNNER_OS"
-          echo "RUNNER_ARCH=$RUNNER_ARCH"
-          echo "DOCKER_IMAGE_PLATFORM=$DOCKER_IMAGE_PLATFORM"
-
           yarn install
-          yarn buildServerDocker --docker-file Dockerfile.server --platform $DOCKER_IMAGE_PLATFORM --tag-name server-v0.0.0 --repository joplin/server
+          yarn run buildServerDocker --tag-name server-v0.0.0 --repository joplin/server
 
           # Basic test to ensure that the created build is valid. It should exit with
-          # code 0 if it works.
-          docker run joplin/server:$(dpkg --print-architecture)-0.0.0 node dist/app.js migrate list
+          # code 0  if it works.
+          docker run joplin/server:0.0.0-beta node dist/app.js migrate list
  
       - name: Check HTTP request
         run: |
           # Need to pass environment variables:
-          docker run -p 22300:22300 joplin/server:$(dpkg --print-architecture)-0.0.0 node dist/app.js --env dev &
+          docker run -p 22300:22300 joplin/server:0.0.0-beta node dist/app.js --env dev &
 
           # Wait for server to start
-          sleep 120
+          sleep 30
 
           # Check if status code is correct
           # if the actual_status DOES NOT include the expected_status

.github/workflows/shared/setup-build-environment/action.yml

@@ -1,75 +0,0 @@
-name: 'Setup build environment'
-description: 'Install Joplin build dependencies'
-runs:
-  using: 'composite'
-  steps:
-    # Trying to fix random networking issues on Windows
-    # https://github.com/actions/runner-images/issues/1187#issuecomment-686735760
-    # - name: Disable TCP/UDP offload on Windows
-    #   if: runner.os == 'Windows'
-    #   shell: pwsh
-    #   run: Disable-NetAdapterChecksumOffload -Name * -TcpIPv4 -UdpIPv4 -TcpIPv6 -UdpIPv6
-
-    - name: Disable TCP/UDP offload on Linux
-      if: runner.os == 'Linux'
-      shell: bash
-      run: sudo ethtool -K eth0 tx off rx off
-
-    - name: Disable TCP/UDP offload on macOS
-      if: runner.os == 'macOS'
-      shell: bash
-      run: |
-        sudo sysctl -w net.link.generic.system.hwcksum_tx=0
-        sudo sysctl -w net.link.generic.system.hwcksum_rx=0
-
-    # Silence apt-get update errors (for example when a module doesn't
-    # exist) since otherwise it will make the whole build fails, even though
-    # it might work without update. libsecret-1-dev is required for keytar -
-    # https://github.com/atom/node-keytar
-
-    - name: Install Linux dependencies
-      if: runner.os == 'Linux'
-      shell: bash
-      run: |
-        sudo apt-get update || true
-        sudo apt-get install -y gettext
-        sudo apt-get install -y libsecret-1-dev
-        sudo apt-get install -y translate-toolkit
-        sudo apt-get install -y rsync
-        # Provides a virtual display on Linux. Used for Playwright integration
-        # testing.
-        sudo apt-get install -y xvfb
-
-    - name: Install macOs dependencies
-      if: runner.os == 'macOS'
-      shell: bash
-      run: |
-        # Required for building the canvas package
-        brew install pango
-
-    - uses: olegtarasov/get-tag@v2.1.4
-    - uses: dtolnay/rust-toolchain@stable
-      if: ${{ runner.os != 'Windows' }}
-
-    - uses: actions/setup-node@v4
-      with:
-        node-version: '18.20.8'
-        # Disable the cache on ARM runners. For now, we don't run "yarn install" on these
-        # environments and this breaks actions/setup-node.
-        # See https://github.com/laurent22/joplin/commit/47d0d3eb9e89153a609fb5441344da10904c6308#commitcomment-159577783.
-        # cache: ${{ (!contains(runner.os, 'arm') && 'yarn') || '' }}
-
-    - name: Install Yarn
-      shell: bash
-      run: |
-        # https://yarnpkg.com/getting-started/install
-        corepack enable
-
-    # macos-latest ships with Python 3.12 by default, but this removes a
-    # utility that's used by electron-builder (distutils) so we need to pin
-    # Python to an earlier version.
-    # Fixes error `ModuleNotFoundError: No module named 'distutils'`
-    # Ref: https://github.com/nodejs/node-gyp/issues/2869
-    - uses: actions/setup-python@v5
-      with:
-        python-version: '3.13'

.github/workflows/ui-tests.yml

@@ -1,35 +0,0 @@
-name: Joplin UI tests
-on: [push, pull_request]
-permissions:
-  contents: read
-jobs:
-  Main:
-    # Don't run on forks
-    if: github.repository == 'laurent22/joplin'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-22.04, windows-2025]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup build environment
-        uses: ./.github/workflows/shared/setup-build-environment
-      - name: Build
-        run: yarn install
-        env:
-          # The onenote-converter package uses Rust, which isn't installed on all CI
-          # runners. Since the onenote-converter doesn't have UI tests, it can be excluded
-          # from build:
-          SKIP_ONENOTE_CONVERTER_BUILD: 1
-      - name: Run UI tests
-        shell: bash
-        run: |
-          cd ${GITHUB_WORKSPACE}/packages/app-desktop/
-          bash ./integration-tests/run-ci.sh
-      # See https://playwright.dev/docs/ci-intro#setting-up-github-actions
-      - uses: actions/upload-artifact@v4
-        if: ${{ !cancelled() }}
-        with:
-          name: playwright-report-${{ matrix.os }}
-          path: packages/app-desktop/playwright-report/
-          retention-days: 7

.husky/pre-commit

@@ -1 +0,0 @@
-corepack yarn lint-staged

.npmpackagejsonlintignore

@@ -1,5 +1,3 @@
 packages/app-clipper/popup/
 packages/app-cli/tests/support/plugins/
-packages/doc-builder/
-packages/default-plugins/plugin-base-repo/
-packages/default-plugins/plugin-sources/
+packages/doc-builder/

.npmpackagejsonlintrc.json

@@ -3,24 +3,23 @@
 		"prefer-absolute-version-dependencies": ["error",
 			{
 				"exceptions": [
+					"@joplin/lib",
+					"@joplin/renderer",
 					"@joplin/editor",
+					"@joplin/pdf-viewer",
 					"@joplin/fork-htmlparser2",
 					"@joplin/fork-sax",
 					"@joplin/fork-uslug",
 					"@joplin/htmlpack",
-					"@joplin/transcribe",
-					"@joplin/lib",
-					"@joplin/onenote-converter",
-					"@joplin/pdf-viewer",
-					"@joplin/react-native-alarm-notification",
-					"@joplin/react-native-saf-x",
-					"@joplin/renderer",
-					"@joplin/tools",
-					"@joplin/turndown-plugin-gfm",
 					"@joplin/turndown",
+					"@joplin/turndown-plugin-gfm",
+					"@joplin/tools",
+					"@joplin/react-native-saf-x",
+					"@joplin/react-native-alarm-notification",
 					"@joplin/utils"
 				]
 		  	}
 		]
 	}
 }
+  

.vscode/settings.json

@@ -1,4 +0,0 @@
-{
-	"cSpell.enabled": true,
-	"editor.insertSpaces": false
-}

.yarn/joplin-empty-package/README.md

@@ -1,10 +0,0 @@
-# @joplin/empty
-
-An empty package. This package can be used to exclude certain dependencies from build.
-
-For example, the `canvas` dependency is an optional dependency of `pdfjs-dist`. However, it isn't used by Joplin and can cause build to fail in certain environments. The `@joplin/empty` package can exclude `canvas` from the build by adding a resolution to `resolutions` in the top-level `package.json`. For example, resolving `canvas@npm:^2.11` to `file:./packages/empty/`.
-
-See also:
-- [Yarn docs: Manifest resolutions](https://yarnpkg.com/configuration/manifest#resolutions)
-- [GitHub comment: Yarn: Ignoring packages](https://github.com/yarnpkg/yarn/issues/4611#issuecomment-1370284462)
-

.yarn/joplin-empty-package/package.json

@@ -1,10 +0,0 @@
-{
-	"name": "@joplin/empty",
-	"version": "0.0.0",
-	"description": "An empty package, used as a way to exclude certain packages from build",
-	"private": true,
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/laurent22/joplin.git"
-	}
-}

.yarn/patches/app-builder-lib-npm-24.13.3-86a66c0bf3.patch

@@ -1,90 +0,0 @@
-# This patch's goal is to work around an issue in the NSIS uninstaller on Windows:
-# - For future uninstallers, this patch backports an upstream commit that changes how
-#   running copies of the app are found.
-#  - See https://github.com/electron-userland/electron-builder/pull/8133
-# - If an existing uninstaller fails, gives an option to continue with the installation
-#   despite the failure.
-# - Updates "uninstall failed" error messages to state that uninstallation failed (rather
-#   than incorrectly stating that the issue was with closing the app).
-#
-# See https://github.com/laurent22/joplin/pull/11541
-diff --git a/templates/nsis/include/allowOnlyOneInstallerInstance.nsh b/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
-index fe5d45c730f36c9fe8d8cfea12e242e501b67139..97b27fce6798e30e3e631221435f09b3579e77c3 100644
---- a/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
-+++ b/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
-@@ -42,7 +42,7 @@
-     ${nsProcess::FindProcess} "${_FILE}" ${_ERR}
-   !else
-     # find process owned by current user
--    nsExec::Exec `%SYSTEMROOT%\System32\cmd.exe /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" /FO csv | %SYSTEMROOT%\System32\find.exe "${_FILE}"`
-+    nsExec::Exec `"$SYSDIR\cmd.exe" /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" /FO csv | "$SYSDIR\find.exe" "${_FILE}"`
-     Pop ${_ERR}
-   !endif
- !macroend
-@@ -73,7 +73,7 @@
-       !ifdef INSTALL_MODE_PER_ALL_USERS
-         nsExec::Exec `taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"`
-       !else
--        nsExec::Exec `%SYSTEMROOT%\System32\cmd.exe /c taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
-+        nsExec::Exec `"$SYSDIR\cmd.exe" /c taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
-       !endif
-       # to ensure that files are not "in-use"
-       Sleep 300
-@@ -91,7 +91,7 @@
-           !ifdef INSTALL_MODE_PER_ALL_USERS
-             nsExec::Exec `taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"`
-           !else
--            nsExec::Exec `%SYSTEMROOT%\System32\cmd.exe /c taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
-+            nsExec::Exec `"$SYSDIR\cmd.exe" /c taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
-           !endif
-           !insertmacro FIND_PROCESS "${APP_EXECUTABLE_FILENAME}" $R0
-           ${If} $R0 == 0
-diff --git a/templates/nsis/include/installUtil.nsh b/templates/nsis/include/installUtil.nsh
-index 47367741632726ba0886ac516461dbe98b7aea58..675965762375925a505ca6d8bbb67507ef696c2e 100644
---- a/templates/nsis/include/installUtil.nsh
-+++ b/templates/nsis/include/installUtil.nsh
-@@ -126,10 +126,11 @@ Function handleUninstallResult
-   Return
- 
-   ${if} $R0 != 0
--    MessageBox MB_OK|MB_ICONEXCLAMATION "$(uninstallFailed): $R0"
-+    # MessageBox MB_OK|MB_ICONEXCLAMATION "$(uninstallFailed): $R0"
-     DetailPrint `Uninstall was not successful. Uninstaller error code: $R0.`
--    SetErrorLevel 2
--    Quit
-+    DetailPrint `Continuing anyway. See https://github.com/laurent22/joplin/pull/11612.`
-+    # SetErrorLevel 2
-+    # Quit
-   ${endif}
- FunctionEnd
- 
-@@ -216,11 +217,13 @@ Function uninstallOldVersion
-     IntOp $R5 $R5 + 1
- 
-     ${if} $R5 > 5
--      MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "$(appCannotBeClosed)" /SD IDCANCEL IDRETRY OneMoreAttempt
--      Return
-+      MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "$(appCannotBeUninstalled)" /SD IDCANCEL IDRETRY ContinueWithoutUninstall
-+        Abort ; Exit early
-+      ContinueWithoutUninstall:
-+        Return
-     ${endIf}
- 
--  OneMoreAttempt:
-+#  OneMoreAttempt: ; Commented out because unused
-     ExecWait '"$uninstallerFileNameTemp" /S /KEEP_APP_DATA $0 _?=$installationDir' $R0
-     ifErrors TryInPlace CheckResult
- 
-diff --git a/templates/nsis/messages.yml b/templates/nsis/messages.yml
-index a1c2847fa48d79f835b30b48e999ccaf3c818657..6884c18d1e77dbd6be114401d23cf5caf3e0dd94 100644
---- a/templates/nsis/messages.yml
-+++ b/templates/nsis/messages.yml
-@@ -235,3 +235,8 @@ uninstallFailed:
-   sv: Det gick inte att avinstallera gamla programfiler. Försök att köra installationsprogrammet igen.
-   uk: Не вдалось видалити старі файли застосунку. Будь ласка, спробуйте запустити встановлювач знов.
-   zh_TW: 無法俺安裝舊的應用程式檔案。 請嘗試再次執行安裝程式。
-+
-+
-+appCannotBeUninstalled:
-+  en: "The old version of ${PRODUCT_NAME} could not be removed. \nClick Retry to skip this step."
-+

.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch

@@ -0,0 +1,13 @@
+diff --git a/templates/nsis/include/allowOnlyOneInstallerInstance.nsh b/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
+index a1fd1875d852ff69c087a3103eff827c20d37ca5..5222614ddad3276876857e7a9dde4017a6b9fc85 100644
+--- a/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
++++ b/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
+@@ -42,7 +42,7 @@
+     ${nsProcess::FindProcess} "${_FILE}" ${_ERR}
+   !else
+     # find process owned by current user
+-    nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" | %SYSTEMROOT%\System32\find.exe "${_FILE}"`
++    nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "PID ne $pid" /FI "IMAGENAME eq ${_FILE}" | %SYSTEMROOT%\System32\find.exe "${_FILE}"`
+     Pop ${_ERR}
+   !endif
+ !macroend

.yarn/patches/nanoid-npm-3.3.7-98824ba130.patch

@@ -1,12 +0,0 @@
-diff --git a/package.json b/package.json
-index 4f24d9658ca167733dbe9c3fb3bcfc3f4e6d20c8..15062cc4eb3bc8e14b54b07a9c873e5a5c4b6ab8 100644
---- a/package.json
-+++ b/package.json
-@@ -35,7 +35,6 @@
-   "module": "index.js",
-   "exports": {
-     ".": {
--      "browser": "./index.browser.js",
-       "require": {
-         "types": "./index.d.cts",
-         "default": "./index.cjs"

.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch

@@ -1,31 +0,0 @@
-
-# We remove the `canvas` optional dependency because electron-rebuild fails to build it, and
-# the `canvas` API is already part of Electron
-diff --git a/build/pdf.js b/build/pdf.js
-index 4acf16b1d6f9351bda1a98649ea4f926618fe617..f63dbc6050ca63ca8e8ed982edea134103fa15dd 100644
---- a/build/pdf.js
-+++ b/build/pdf.js
-@@ -6244,8 +6244,9 @@ class NodeFilterFactory extends _base_factory.BaseFilterFactory {}
- exports.NodeFilterFactory = NodeFilterFactory;
- class NodeCanvasFactory extends _base_factory.BaseCanvasFactory {
-   _createCanvas(width, height) {
--    const Canvas = require("canvas");
--    return Canvas.createCanvas(width, height);
-+    throw new Error('Node canvas disabled');
-+    // const Canvas = require("canvas");
-+    // return Canvas.createCanvas(width, height);
-   }
- }
- exports.NodeCanvasFactory = NodeCanvasFactory;
-diff --git a/package.json b/package.json
-index 105811f53d508486e08a60dc1b6e437cd24d7427..dea6a4e6612c4a4006cc482e46ff5270dcfda1e5 100644
---- a/package.json
-+++ b/package.json
-@@ -13,7 +13,6 @@
-   "bugs": "https://github.com/mozilla/pdf.js/issues",
-   "license": "Apache-2.0",
-   "optionalDependencies": {
--    "canvas": "^2.11.2",
-     "path2d-polyfill": "^2.0.1"
-   },
-   "browser": {

.yarn/patches/react-native-animation-fix/react-native-npm-0.71.10-f9c32562d8.patch

@@ -0,0 +1,25 @@
+diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
+index 0f52b73c61625db2a3081c0950b6bdd2b06e3d40..b0fc3de4be0b3a26b638683613c63c783c2739bb 100644
+--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
++++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
+@@ -38,7 +38,7 @@ import com.facebook.react.uimanager.common.ViewUtil;
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Queue;
+-import java.util.concurrent.ConcurrentLinkedQueue;
++import java.util.concurrent.LinkedBlockingQueue;
+ import java.util.concurrent.atomic.AtomicReference;
+ 
+ /**
+@@ -151,7 +151,10 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
+   }
+ 
+   private class ConcurrentOperationQueue {
+-    private final Queue<UIThreadOperation> mQueue = new ConcurrentLinkedQueue<>();
++    // Patch: Use LinkedBlockingQueue instead of ConcurrentLinkedQueue.
++    // In some versions of Android, ConcurrentLinkedQueue is known to drop
++    // items, causing crashing. See https://github.com/laurent22/joplin/issues/8425
++    private final Queue<UIThreadOperation> mQueue = new LinkedBlockingQueue<>();
+     @Nullable private UIThreadOperation mPeekedOperation = null;
+ 
+     @AnyThread

.yarn/patches/react-native-npm-0.79.2-9db13eddfe.patch

@@ -1,205 +0,0 @@
-# This patch fixes two issues:
-# - Updates RCTDeviceInfo.m to match https://github.com/facebook/react-native/commit/0b8db7e5e814cfbf9974cc5b6ceb64e8006d8a3c.
-#   This fixes an issue in which useWindowDimensions returns incorrect
-#   values in landscape mode in iOS.
-#   This should be fixed in React Native 0.80. See https://github.com/facebook/react-native/issues/51086.
-# - Updates NativeAnimatedModule.java to work around an Android 12-specific crash.
-diff --git a/React/CoreModules/RCTDeviceInfo.mm b/React/CoreModules/RCTDeviceInfo.mm
-index 6b4fcef852252e8d4ac2aceb12175fdfafb4def7..8ceab21e8653d429876d10e2d12ed1342780ad7d 100644
---- a/React/CoreModules/RCTDeviceInfo.mm
-+++ b/React/CoreModules/RCTDeviceInfo.mm
-@@ -14,9 +14,7 @@
- #import <React/RCTEventDispatcherProtocol.h>
- #import <React/RCTInitializing.h>
- #import <React/RCTInvalidating.h>
--#import <React/RCTKeyWindowValuesProxy.h>
- #import <React/RCTUtils.h>
--#import <React/RCTWindowSafeAreaProxy.h>
- #import <atomic>
- 
- #import "CoreModulesPlugins.h"
-@@ -31,8 +29,13 @@ using namespace facebook::react;
-   NSDictionary *_currentInterfaceDimensions;
-   BOOL _isFullscreen;
-   std::atomic<BOOL> _invalidated;
-+  NSDictionary *_constants;
-+
-+  __weak UIWindow *_applicationWindow;
- }
- 
-+static NSString *const kFrameKeyPath = @"frame";
-+
- @synthesize moduleRegistry = _moduleRegistry;
- 
- RCT_EXPORT_MODULE()
-@@ -40,14 +43,26 @@ RCT_EXPORT_MODULE()
- - (instancetype)init
- {
-   if (self = [super init]) {
--    [[RCTKeyWindowValuesProxy sharedInstance] startObservingWindowSizeIfNecessary];
-+    _applicationWindow = RCTKeyWindow();
-+    [_applicationWindow addObserver:self forKeyPath:kFrameKeyPath options:NSKeyValueObservingOptionNew context:nil];
-   }
-   return self;
- }
- 
-+- (void)observeValueForKeyPath:(NSString *)keyPath
-+                      ofObject:(id)object
-+                        change:(NSDictionary *)change
-+                       context:(void *)context
-+{
-+  if ([keyPath isEqualToString:kFrameKeyPath]) {
-+    [self interfaceFrameDidChange];
-+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTWindowFrameDidChangeNotification object:self];
-+  }
-+}
-+
- + (BOOL)requiresMainQueueSetup
- {
--  return NO;
-+  return YES;
- }
- 
- - (dispatch_queue_t)methodQueue
-@@ -81,7 +96,7 @@ RCT_EXPORT_MODULE()
- 
- #if TARGET_OS_IOS
- 
--  _currentInterfaceOrientation = [RCTKeyWindowValuesProxy sharedInstance].currentInterfaceOrientation;
-+  _currentInterfaceOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
- 
-   [[NSNotificationCenter defaultCenter] addObserver:self
-                                            selector:@selector(interfaceFrameDidChange)
-@@ -98,6 +113,15 @@ RCT_EXPORT_MODULE()
-                                            selector:@selector(invalidate)
-                                                name:RCTBridgeWillInvalidateModulesNotification
-                                              object:nil];
-+
-+  _constants = @{
-+    @"Dimensions" : [self _exportedDimensions],
-+    // Note:
-+    // This prop is deprecated and will be removed in a future release.
-+    // Please use this only for a quick and temporary solution.
-+    // Use <SafeAreaView> instead.
-+    @"isIPhoneX_deprecated" : @(RCTIsIPhoneNotched()),
-+  };
- }
- 
- - (void)invalidate
-@@ -120,6 +144,8 @@ RCT_EXPORT_MODULE()
- 
-   [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];
- 
-+  [_applicationWindow removeObserver:self forKeyPath:kFrameKeyPath];
-+
- #if TARGET_OS_IOS
-   [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
- #endif
-@@ -132,8 +158,13 @@ static BOOL RCTIsIPhoneNotched()
- 
- #if TARGET_OS_IOS
-   dispatch_once(&onceToken, ^{
-+    RCTAssertMainQueue();
-+
-     // 20pt is the top safeArea value in non-notched devices
--    isIPhoneNotched = [RCTWindowSafeAreaProxy sharedInstance].currentSafeAreaInsets.top > 20;
-+    UIWindow *keyWindow = RCTKeyWindow();
-+    if (keyWindow) {
-+      isIPhoneNotched = keyWindow.safeAreaInsets.top > 20;
-+    }
-   });
- #endif
- 
-@@ -142,11 +173,13 @@ static BOOL RCTIsIPhoneNotched()
- 
- static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
- {
-+  RCTAssertMainQueue();
-   UIScreen *mainScreen = UIScreen.mainScreen;
-   CGSize screenSize = mainScreen.bounds.size;
-+  UIView *mainWindow = RCTKeyWindow();
- 
-   // We fallback to screen size if a key window is not found.
--  CGSize windowSize = [RCTKeyWindowValuesProxy sharedInstance].windowSize;
-+  CGSize windowSize = mainWindow ? mainWindow.bounds.size : screenSize;
- 
-   NSDictionary<NSString *, NSNumber *> *dimsWindow = @{
-     @"width" : @(windowSize.width),
-@@ -170,7 +203,10 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
-   RCTAssert(_moduleRegistry, @"Failed to get exported dimensions: RCTModuleRegistry is nil");
-   RCTAccessibilityManager *accessibilityManager =
-       (RCTAccessibilityManager *)[_moduleRegistry moduleForName:"AccessibilityManager"];
--  RCTAssert(accessibilityManager, @"Failed to get exported dimensions: AccessibilityManager is nil");
-+  // TOOD(T225745315): For some reason, accessibilityManager is nil in some cases.
-+  // We default the fontScale to 1.0 in this case. This should be okay: if we assume
-+  // that accessibilityManager will eventually become available, js will eventually
-+  // be updated with the correct fontScale.
-   CGFloat fontScale = accessibilityManager ? accessibilityManager.multiplier : 1.0;
-   return RCTExportedDimensions(fontScale);
- }
-@@ -182,14 +218,7 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
- 
- - (NSDictionary<NSString *, id> *)getConstants
- {
--  return @{
--    @"Dimensions" : [self _exportedDimensions],
--    // Note:
--    // This prop is deprecated and will be removed in a future release.
--    // Please use this only for a quick and temporary solution.
--    // Use <SafeAreaView> instead.
--    @"isIPhoneX_deprecated" : @(RCTIsIPhoneNotched()),
--  };
-+  return _constants;
- }
- 
- - (void)didReceiveNewContentSizeMultiplier
-@@ -209,10 +238,11 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
- - (void)interfaceOrientationDidChange
- {
- #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
--  UIWindow *keyWindow = RCTKeyWindow();
--  UIInterfaceOrientation nextOrientation = keyWindow.windowScene.interfaceOrientation;
-+  UIApplication *application = RCTSharedApplication();
-+  UIInterfaceOrientation nextOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
- 
--  BOOL isRunningInFullScreen = CGRectEqualToRect(keyWindow.frame, keyWindow.screen.bounds);
-+  BOOL isRunningInFullScreen =
-+      CGRectEqualToRect(application.delegate.window.frame, application.delegate.window.screen.bounds);
-   // We are catching here two situations for multitasking view:
-   // a) The app is in Split View and the container gets resized -> !isRunningInFullScreen
-   // b) The app changes to/from fullscreen example: App runs in slide over mode and goes into fullscreen->
-@@ -276,3 +306,4 @@ Class RCTDeviceInfoCls(void)
- {
-   return RCTDeviceInfo.class;
- }
-+
-diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
-index cf14e51cf5f561b84f1b6ace8410fc77d626758e..abc8c64adf26fbf73429aee7fd4f76877e98849a 100644
---- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
-+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
-@@ -42,6 +42,7 @@ import java.util.List;
- import java.util.Queue;
- import java.util.Set;
- import java.util.concurrent.ConcurrentLinkedQueue;
-+import java.util.concurrent.LinkedBlockingQueue; 
- import java.util.concurrent.atomic.AtomicReference;
- 
- /**
-@@ -155,8 +156,15 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
-   }
- 
-   private class ConcurrentOperationQueue {
--    private final Queue<UIThreadOperation> mQueue = new ConcurrentLinkedQueue<>();
--    @Nullable private UIThreadOperation mPeekedOperation = null;
-+    // Patch: Use LinkedBlockingQueue instead of ConcurrentLinkedQueue.
-+    // In some versions of Android, ConcurrentLinkedQueue is known to drop
-+    // items, causing crashing. See https://github.com/laurent22/joplin/issues/8425
-+    private final Queue<UIThreadOperation> mQueue = (
-+		// The issue exists for Android 12, which corresponds to API levels 31 and 32.
-+		Build.VERSION.SDK_INT == 31 || Build.VERSION.SDK_INT == 32
-+	) ? new LinkedBlockingQueue<>() : new ConcurrentLinkedQueue<>();
-+
-+	@Nullable private UIThreadOperation mPeekedOperation = null;
- 
-     @AnyThread
-     boolean isEmpty() {

.yarn/patches/react-native-paper-npm-5.13.1-f153e542e2.patch

@@ -1,50 +0,0 @@
-# This is a (hopefully temporary) fix for an accessibility issue in the FAB.Group
-# component. See https://github.com/callstack/react-native-paper/pull/4498 for details.
-diff --git a/lib/commonjs/components/FAB/FABGroup.js b/lib/commonjs/components/FAB/FABGroup.js
-index 26933dd7ac6862c0dd95e52b8cd91c8bbd0b6efc..417c91a0257849eb597afb5e339e13b6d1d54486 100644
---- a/lib/commonjs/components/FAB/FABGroup.js
-+++ b/lib/commonjs/components/FAB/FABGroup.js
-@@ -209,8 +209,9 @@ const FABGroup = _ref => {
-       }],
-       pointerEvents: open ? 'box-none' : 'none',
-       accessibilityRole: "button",
--      importantForAccessibility: "yes",
--      accessible: true,
-+      importantForAccessibility: open ? 'yes' : 'no-hide-descendants',
-+      accessibilityElementsHidden: !open,
-+      accessible: open,
-       accessibilityLabel: accessibilityLabel
-     }, it.label && /*#__PURE__*/React.createElement(_reactNative.View, null, /*#__PURE__*/React.createElement(_Card.default, {
-       mode: isV3 ? 'contained' : 'elevated',
-diff --git a/lib/module/components/FAB/FABGroup.js b/lib/module/components/FAB/FABGroup.js
-index ca5c02679539b17b048d4c82f570791dd8b57545..a06902b744b3bfb06b0644930eda0ba2ce2967ca 100644
---- a/lib/module/components/FAB/FABGroup.js
-+++ b/lib/module/components/FAB/FABGroup.js
-@@ -200,8 +200,9 @@ const FABGroup = _ref => {
-       }],
-       pointerEvents: open ? 'box-none' : 'none',
-       accessibilityRole: "button",
--      importantForAccessibility: "yes",
--      accessible: true,
-+      importantForAccessibility: open ? 'yes' : 'no-hide-descendants',
-+      accessibilityElementsHidden: !open,
-+      accessible: open,
-       accessibilityLabel: accessibilityLabel
-     }, it.label && /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(Card, {
-       mode: isV3 ? 'contained' : 'elevated',
-diff --git a/src/components/FAB/FABGroup.tsx b/src/components/FAB/FABGroup.tsx
-index af1e85c4cbabfdd05499f9befb9f851be5911835..d010393975b0b31852efba1b7ce9cb09da4feaec 100644
---- a/src/components/FAB/FABGroup.tsx
-+++ b/src/components/FAB/FABGroup.tsx
-@@ -383,8 +383,9 @@ const FABGroup = ({
-                 ]}
-                 pointerEvents={open ? 'box-none' : 'none'}
-                 accessibilityRole="button"
--                importantForAccessibility="yes"
--                accessible={true}
-+                importantForAccessibility={open ? 'yes' : 'no-hide-descendants'}
-+                accessibilityElementsHidden={!open}
-+                accessible={open}
-                 accessibilityLabel={accessibilityLabel}
-               >
-                 {it.label && (

.yarn/patches/react-native-popup-menu-npm-0.17.0-8b745d88dd.patch

@@ -1,64 +0,0 @@
-# This patch improves the note actions menu (the kebab menu)'s accessibility
-# by labelling its dismiss button.
-diff --git a/build/rnpm.js b/build/rnpm.js
-index 47bc91a88b9e2246a0ce4295f9f932da6a572461..75b5a22bdcbc2594238bcf953df6d54e18cc7793 100644
---- a/build/rnpm.js
-+++ b/build/rnpm.js
-@@ -1267,7 +1267,9 @@
-             onPress = _this$props.onPress,
-             style = _this$props.style;
-         return React__default.createElement(reactNative.TouchableWithoutFeedback, {
--          onPress: onPress
-+          onPress: onPress,
-+          accessibilityLabel: _this$props.accessibilityLabel,
-+          accessibilityRole: 'button',
-         }, React__default.createElement(reactNative.Animated.View, {
-           style: [styles.fullscreen, {
-             opacity: this.fadeAnim
-@@ -1282,7 +1284,8 @@
-   }(React.Component);
- 
-   Backdrop.propTypes = {
--    onPress: propTypes.func.isRequired
-+    onPress: propTypes.func.isRequired,
-+    accessibilityLabel: propTypes.string,
-   };
-   var styles = reactNative.StyleSheet.create({
-     fullscreen: {
-@@ -1352,6 +1355,7 @@
-           style: styles$1.placeholder
-         }, React__default.createElement(Backdrop, {
-           onPress: ctx._onBackdropPress,
-+          accessibilityLabel: this.props.closeButtonLabel,
-           style: backdropStyles,
-           ref: ctx.onBackdropRef
-         }), ctx._makeOptions());
-@@ -1784,6 +1788,7 @@
-         }), React__default.createElement(MenuPlaceholder, {
-           ctx: this,
-           backdropStyles: customStyles.backdrop,
-+          closeButtonLabel: this.props.closeButtonLabel,
-           ref: this._onPlaceholderRef
-         }))));
-       }
-@@ -1854,7 +1859,7 @@
-         var _options$props = options.props,
-             optionsContainerStyle = _options$props.optionsContainerStyle,
-             renderOptionsContainer = _options$props.renderOptionsContainer,
--            customStyles = _options$props.customStyles;
-+            customStyles = _options$props.customStyles || {};
-         var optionsRenderer = renderOptionsContainer || defaultOptionsContainerRenderer;
-         var isOutside = !triggerLayout || !optionsLayout;
- 
-diff --git a/src/index.d.ts b/src/index.d.ts
-index 7e1ef2e441a665e97c304984080399f9646395df..673c4f713757abfb1851cba0d4560020c83e5f50 100644
---- a/src/index.d.ts
-+++ b/src/index.d.ts
-@@ -18,6 +18,7 @@ declare module "react-native-popup-menu" {
-       menuProviderWrapper?: StyleProp<ViewStyle>;
-       backdrop?: StyleProp<ViewStyle>;
-     };
-+    closeButtonLabel: string;
-     backHandler?: boolean | Function;
-     skipInstanceCheck?: boolean;
-     children: React.ReactNode;

.yarn/patches/react-native-sqlite-storage-npm-6.0.1-8369d747bd.patch

@@ -1,37 +0,0 @@
-diff --git a/platforms/android/src/main/java/org/pgsqlite/SQLitePlugin.java b/platforms/android/src/main/java/org/pgsqlite/SQLitePlugin.java
-index 4f2391b..f7cc433 100644
---- a/platforms/android/src/main/java/org/pgsqlite/SQLitePlugin.java
-+++ b/platforms/android/src/main/java/org/pgsqlite/SQLitePlugin.java
-@@ -8,11 +8,14 @@
- package org.pgsqlite;
- 
- import android.annotation.SuppressLint;
-+import android.database.AbstractWindowedCursor;
- import android.database.Cursor;
-+import android.database.CursorWindow;
- import android.database.sqlite.SQLiteDatabase;
- import android.database.sqlite.SQLiteException;
- import android.database.sqlite.SQLiteStatement;
- import android.content.Context;
-+import android.os.Build;
- import android.util.Base64;
- 
- import java.io.Closeable;
-@@ -808,6 +811,17 @@ public class SQLitePlugin extends ReactContextBaseJavaModule {
-                 throw ex;
-             }
- 
-+            // To try to fix the error "Row too big to fit into CursorWindow" when using sqlite binary bundled with the device
-+            // https://github.com/andpor/react-native-sqlite-storage/issues/364#issuecomment-526423153
-+            // https://github.com/laurent22/joplin/issues/1767#issuecomment-515617991
-+
-+            if (cur != null && Build.VERSION.SDK_INT >= 28) {
-+                CursorWindow cw = new CursorWindow(null, 50 * 1024 * 1024);
-+                AbstractWindowedCursor ac = (AbstractWindowedCursor) cur;
-+                ac.setWindow(cw);
-+                cur = ac;
-+            }
-+
-             // If query result has rows
-             if (cur != null && cur.moveToFirst()) {
-                 WritableArray rowsArrayResult = Arguments.createArray();

.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch

@@ -1,118 +0,0 @@
-# Fixes sync issues caused by locale-sensitive lowercasing
-# of HTTP headers.
-# See https://github.com/laurent22/joplin/issues/10681
-diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobConfig.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobConfig.java
-index 8ac9e7a855162cefbf99024eb013c8a3b11de1ec..1c639cf9d84821b6ffc132960e2d1c044bedbd48 100644
---- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobConfig.java
-+++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobConfig.java
-@@ -2,6 +2,7 @@ package com.RNFetchBlob;
- 
- import com.facebook.react.bridge.ReadableArray;
- import com.facebook.react.bridge.ReadableMap;
-+import java.util.Locale;
- 
- class RNFetchBlobConfig {
- 
-@@ -33,7 +34,7 @@ class RNFetchBlobConfig {
-         }
-         if(options.hasKey("binaryContentTypes"))
-             this.binaryContentTypes = options.getArray("binaryContentTypes");
--        if(this.path != null && path.toLowerCase().contains("?append=true")) {
-+        if(this.path != null && path.toLowerCase(Locale.ROOT).contains("?append=true")) {
-             this.overwrite = false;
-         }
-         if(options.hasKey("overwrite"))
-diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
-index a4d70153f41e6c14eec65412b5b59822f1c6750b..d98c439f7b0aeb79afc82ab9f653e9c021086426 100644
---- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
-+++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
-@@ -29,6 +29,7 @@ import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.Map;
- import java.util.UUID;
-+import java.util.Locale;
- 
- class RNFetchBlobFS {
- 
-@@ -210,7 +211,7 @@ class RNFetchBlobFS {
-                 return;
-             }
- 
--            switch (encoding.toLowerCase()) {
-+            switch (encoding.toLowerCase(Locale.ROOT)) {
-                 case "base64" :
-                     promise.resolve(Base64.encodeToString(bytes, Base64.NO_WRAP));
-                     break;
-@@ -1050,7 +1051,7 @@ class RNFetchBlobFS {
-         if(encoding.equalsIgnoreCase("ascii")) {
-             return data.getBytes(Charset.forName("US-ASCII"));
-         }
--        else if(encoding.toLowerCase().contains("base64")) {
-+        else if(encoding.toLowerCase(Locale.ROOT).contains("base64")) {
-             return Base64.decode(data, Base64.NO_WRAP);
- 
-         }
-diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
-index a8abd71833879201e3438b2fa51d712a311c4551..b70cc13c004229f69157de5f82ae5ec3abf4358e 100644
---- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
-+++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
-@@ -49,6 +49,7 @@ import java.security.KeyStore;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.List;
-+import java.util.Locale;
- import java.util.HashMap;
- 
- import java.util.concurrent.TimeUnit;
-@@ -300,14 +301,14 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
-                             responseFormat = ResponseFormat.UTF8;
-                     }
-                     else {
--                        builder.header(key.toLowerCase(), value);
--                        mheaders.put(key.toLowerCase(), value);
-+                        builder.header(key.toLowerCase(Locale.ROOT), value);
-+                        mheaders.put(key.toLowerCase(Locale.ROOT), value);
-                     }
-                 }
-             }
- 
-             if(method.equalsIgnoreCase("post") || method.equalsIgnoreCase("put") || method.equalsIgnoreCase("patch")) {
--                String cType = getHeaderIgnoreCases(mheaders, "Content-Type").toLowerCase();
-+                String cType = getHeaderIgnoreCases(mheaders, "Content-Type").toLowerCase(Locale.ROOT);
- 
-                 if(rawRequestBodyArray != null) {
-                     requestType = RequestType.Form;
-@@ -323,7 +324,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
-                             || rawRequestBody.startsWith(RNFetchBlobConst.CONTENT_PREFIX)) {
-                         requestType = RequestType.SingleFile;
-                     }
--                    else if (cType.toLowerCase().contains(";base64") || cType.toLowerCase().startsWith("application/octet")) {
-+                    else if (cType.toLowerCase(Locale.ROOT).contains(";base64") || cType.toLowerCase(Locale.ROOT).startsWith("application/octet")) {
-                         cType = cType.replace(";base64","").replace(";BASE64","");
-                         if(mheaders.containsKey("content-type"))
-                             mheaders.put("content-type", cType);
-@@ -686,7 +687,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
-         boolean isCustomBinary = false;
-         if(options.binaryContentTypes != null) {
-             for(int i = 0; i< options.binaryContentTypes.size();i++) {
--                if(ctype.toLowerCase().contains(options.binaryContentTypes.getString(i).toLowerCase())) {
-+                if(ctype.toLowerCase(Locale.ROOT).contains(options.binaryContentTypes.getString(i).toLowerCase(Locale.ROOT))) {
-                     isCustomBinary = true;
-                     break;
-                 }
-@@ -698,13 +699,13 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
-     private String getHeaderIgnoreCases(Headers headers, String field) {
-         String val = headers.get(field);
-         if(val != null) return val;
--        return headers.get(field.toLowerCase()) == null ? "" : headers.get(field.toLowerCase());
-+        return headers.get(field.toLowerCase(Locale.ROOT)) == null ? "" : headers.get(field.toLowerCase(Locale.ROOT));
-     }
- 
-     private String getHeaderIgnoreCases(HashMap<String,String> headers, String field) {
-         String val = headers.get(field);
-         if(val != null) return val;
--        String lowerCasedValue = headers.get(field.toLowerCase());
-+        String lowerCasedValue = headers.get(field.toLowerCase(Locale.ROOT));
-         return lowerCasedValue == null ? "" : lowerCasedValue;
-     }
- 

.yarnrc.yml

@@ -2,20 +2,17 @@ nmHoistingLimits: workspaces
 
 nodeLinker: node-modules
 
-compressionLevel: mixed
-enableGlobalCache: false
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-4.9.2.cjs
+yarnPath: .yarn/releases/yarn-3.6.4.cjs
 
 logFilters:
 
   # Disable useless non-actionable warnings.
   # https://github.com/yarnpkg/yarn/issues/4064
 
-  # e.g. "Some peer dependencies are incorrectly met by dependencies; run yarn explain peer-requirements for details."
-  - code: YN0086
-    level: discard
-
   # eg "@joplin/app-desktop@workspace:packages/app-desktop provides react (p87edd) with version 18.2.0, which doesn't satisfy what @testing-library/react-hooks and some of its descendants request"
   - code: YN0060
     level: discard

Assets/JoplinLetterBlue.svg

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 682.66669 682.66669"
-   height="682.66669"
-   width="682.66669"
-   xml:space="preserve"
-   id="svg2"
-   version="1.1"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   sodipodi:docname="JoplinLetterBlue.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
-   id="namedview13"
-   pagecolor="#505050"
-   bordercolor="#ffffff"
-   borderopacity="1"
-   inkscape:pageshadow="0"
-   inkscape:pageopacity="0"
-   inkscape:pagecheckerboard="1"
-   showgrid="false"
-   inkscape:zoom="0.77490232"
-   inkscape:cx="366.49781"
-   inkscape:cy="360.69062"
-   inkscape:window-width="1366"
-   inkscape:window-height="708"
-   inkscape:window-x="0"
-   inkscape:window-y="30"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="svg2" />
-  <defs
-   id="defs6">
-    <linearGradient
-   id="linearGradient26"
-   spreadMethod="pad"
-   gradientTransform="matrix(-4387.91,4387.91,4387.91,4387.91,4753.95,366.05)"
-   gradientUnits="userSpaceOnUse"
-   y2="0"
-   x2="1"
-   y1="0"
-   x1="0">
-      <stop
-   id="stop22"
-   offset="0"
-   style="stop-opacity:1;stop-color:#004caf" />
-      <stop
-   id="stop24"
-   offset="1"
-   style="stop-opacity:1;stop-color:#1f95f8" />
-    </linearGradient>
-  
-    
-  
-      
-      
-    <clipPath
-   clipPathUnits="userSpaceOnUse"
-   id="clipPath829"><path
-     id="path831"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999997"
-     d="M 3961.59,4435.23 H 2570.18 c -13.15,0 -23.78,-10.64 -23.78,-23.77 v -441.84 c 0,-14.87 12.04,-26.92 26.92,-26.92 h 190.77 c 77.16,0 139.73,-59.35 146.43,-134.77 V 3505 3336.23 1728.75 1717.36 h -0.052 c 0.48,-16.84 -0.1898,-33.4 -1.83,-49.71 -0.18,-2.38 -0.5003,-4.73 -0.7902,-7.09 -1.0998,-9.53 -2.3199,-19.01 -4.17,-28.29 -1.0098,-5.29 -2.4399,-10.44 -3.7098,-15.65 -1.71,-6.93 -3.09,-13.97 -5.22,-20.75 -12.5802,-40.27 -32.4702,-77.62 -59.9802,-110.5 -1.0098,-1.17 -2.2599,-2.25 -3.2598,-3.41 -8.3901,-9.72 -17.2002,-19.19 -26.9502,-28.06 -9.84,-8.95 -20.2599,-17.27 -31.2099,-25 -77.8401,-55.14 -182.61,-79.4 -299.67,-68.2 -149.2599,14.03 -297.3399,81.72 -417.03,190.62 -119.6701,108.89 -194.08,243.62 -209.4799,379.41 -13.8501,121.48 22.5498,228.38 102.42,301.05 0.21,0.1598 0.3997,0.3098 0.5602,0.48 3.09,2.77 6.4901,5.2 9.6701,7.87 57.16,47.89 131.6701,76.91 216.7,84.91 0.96,0.09 1.8801,0.24 2.79,0.3203 8.9499,0.79 18.0699,1.15 27.27,1.49 4.8099,0.1598 9.5601,0.5003 14.4399,0.54 1.62,0.023 3.1602,0.1898 4.7802,0.1898 2.8998,0 5.91,-0.3803 8.8098,-0.42 13.4001,-0.21 26.9001,-0.7601 40.6701,-1.9401 1.74,-0.1402 3.3999,-0.08 5.19,-0.24 1.2699,-0.1297 2.5299,-0.4102 3.8001,-0.54 78,-7.82 155.2299,-31.11 228.5199,-66.3999 1.53,-0.068 3.3,-0.54 5.5099,-1.7601 22.34,-12.3399 26.6201,0.9 27.2801,9.6501 v 382.2399 282.8201 c 0,19.05 -13.2501,35.8999 -31.83,39.99 -394.7601,86.88 -782.08,-3.5501 -1055.38,-252.3401 -238.7499,-217.1799 -354.24,-530.5799 -316.8201,-859.7899 33.39,-293.23 183.9102,-574.94 423.88,-793.33 233.8901,-212.79003 531.69,-345.86006 838.8801,-374.80106 42.33,-3.918 84.8601,-5.93797 126.36,-5.93797 293.3799,0 565.6099,100.59802 766.54,283.37903 190.3401,173.3 304.35,411.27 321.0799,670.16 l 1.55,1697.91 h 0.1703 v 453.97 h 0.06 v 7.92 c 1.72,80.1199 67.05,144.58 147.61,144.58 h 190.77 c 14.8599,0 26.9199,12.05 26.9199,26.9199 v 441.84 c 0,13.13 -10.6299,23.77 -23.7799,23.77" /></clipPath></defs>
-  <g
-   id="g14"
-   transform="matrix(0.13333333,0,0,-0.13333333,0,682.66667)"
-   mask="none"
-   clip-path="url(#clipPath829)">
-        <g
-   clip-path="url(#clipPath20)"
-   id="g16">
-          <path
-   id="path28"
-   style="fill:url(#linearGradient26);fill-opacity:1;fill-rule:nonzero;stroke:none"
-   d="M 3873.89,0 H 1246.11 C 560.754,0 0,560.75 0,1246.11 V 3873.88 C 0,4559.25 560.754,5120 1246.11,5120 H 3873.89 C 4559.25,5120 5120,4559.25 5120,3873.88 V 1246.11 C 5120,560.75 4559.25,0 3873.89,0" />
-        </g>
-      </g>
-</svg>

Assets/PluginDocTheme/helpers/index.js

@@ -23,7 +23,6 @@ module.exports = {
 		return `joplin.${camelCaseToDots(p)
 			.replace(/menu\.items/, 'menuItems')
 			.replace(/toolbar\.buttons/, 'toolbarButtons')
-			.replace(/note\.list/, 'noteList')
 			.replace(/content\.scripts/, 'contentScripts')}`;
 	},
 

Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.ts

@@ -48,7 +48,7 @@ const updateListWithDetails = function (dom, el, detail) {
 };
 
 const removeStyles = (dom, element: HTMLElement, styles: string[]) => {
-  Tools.each(styles, (style) => dom.setStyle(element, style, ''));
+  Tools.each(styles, (style) => dom.setStyle(element, { [style]: '' }));
 };
 
 const getEndPointNode = function (editor, rng, start, root) {

Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.ts

@@ -8,6 +8,7 @@
 import { Node } from '@ephox/dom-globals';
 import { Arr, Option } from '@ephox/katamari';
 import { HTMLElement } from '@ephox/sand';
+import DomQuery from 'tinymce/core/api/dom/DomQuery';
 import Editor from 'tinymce/core/api/Editor';
 import Tools from 'tinymce/core/api/util/Tools';
 import * as NodeType from './NodeType';
@@ -48,7 +49,7 @@ const findParentListItemsNodes = function (editor, elms) {
     return parentLi ? parentLi : elm;
   });
 
-  return [...new Set(listItemsElms)];
+  return DomQuery.unique(listItemsElms);
 };
 
 const getSelectedListItems = function (editor) {
@@ -88,7 +89,7 @@ const getSelectedListRoots = (editor: Editor): Node[] => {
 
 const getUniqueListRoots = (editor: Editor, lists: Node[]): Node[] => {
   const listRoots = Arr.map(lists, (list) => findLastParentListNode(editor, list).getOr(list));
-  return [...new Set(listRoots)];
+  return DomQuery.unique(listRoots);
 };
 
 const isList = (editor: Editor): boolean => {

Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.ts

@@ -48,7 +48,8 @@ const listState = function (editor: Editor, listName, options:any = {}) {
 
 const register = function (editor: Editor) {
   const hasPlugin = function (editor, plugin) {
-    return editor.hasPlugin(plugin);
+    const plugins = editor.settings.plugins ? editor.settings.plugins : '';
+    return Tools.inArray(plugins.split(/[ ,]/), plugin) !== -1;
   };
 
   const _ = Settings.getLocalizationFunction(editor);

Assets/WebsiteAssets/css/site.css

@@ -1300,9 +1300,4 @@ footer .bottom-links-row p {
 
 :lang(zh-cn) #plans-section .faq {
 	display: none;
-}
-
-
-.cfa-button {
-	margin-top: 10px;
 }