update

.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,19 +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',
-
-		// ServiceWorker
-		'ExtendableEvent': 'readonly',
-		'WindowClient': 'readonly',
-		'FetchEvent': 'readonly',
 
 		// Jest variables
 		'test': 'readonly',
@@ -83,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
@@ -119,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
 		// -------------------------------
@@ -188,8 +157,6 @@ module.exports = {
 		//   In user-facing text, it should be "notebook".
 		'id-denylist': ['error', 'err', 'notebook', 'notebooks'],
 		'prefer-arrow-callback': ['error'],
-
-		'no-constant-binary-expression': ['error'],
 	},
 	'plugins': [
 		'react',
@@ -284,15 +251,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,
 						},
 					},

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -1,62 +0,0 @@
-name: Bug Report
-description: Report a reproducible bug or regression in Joplin.
-labels: ['bug']
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-  - type: dropdown
-    id: os
-    attributes:
-      label: "Operating system"
-      multiple: false
-      options:
-        - "Windows"
-        - "macOS"
-        - "Linux"
-        - "Android"
-        - "iOS"
-    validations:
-      required: true
-      
-  - type: input
-    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.
-    validations:
-      required: true
-      
-  - type: textarea
-    id: desktop-about-content
-    attributes:
-      label: "Desktop version info"
-      description: "If this issue is about the **desktop app**, please open the \"About\" dialog under the \"Help\" or \"Joplin\" menu and copy its content here."
-      placeholder: "Joplin 2.13.5 (dev, darwin)\n\nClient ID: ..."
-  
-  - type: textarea
-    id: current
-    attributes:
-      label: Current behaviour
-      description: What did Joplin do? Include screenshots and video recordings for UI problems if needed. If you are reporting a clipper bug, please include an example URL that shows the issue.
-      placeholder: |
-        1. This
-        2. Then that
-        3. Then this
-        4. Etc.
-
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behaviour
-      description: What did you expect Joplin to do?
-
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs
-      description: "If relevant, please provide a log file as described here: https://joplinapp.org/help/apps/debugging"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,52 @@
+---
+name: "\U0001F41B Bug Report"
+about: Report a reproducible bug or regression in Joplin.
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!--
+  Please provide a clear and concise description of what the bug is. (In the section Steps To Reproduce.)
+  Include screenshots for UI problems if needed.
+  DO NOT create screenshots of text !!! Copy and paste the text into a code block.
+  Please test using the latest Joplin release to make sure your issue has not already been fixed.
+-->
+
+<!--
+  IMPORTANT: If you are reporting a clipper bug, please include an example URL that shows the issue.
+  Without the URL the issue is likely to be closed.
+-->
+
+## Environment
+
+Joplin version: 
+Platform: 
+OS specifics: 
+
+<!--
+  Platform can be one of: macOS, Linux, Windows, Android, iOS, terminal (or a combination)
+  OS specifics: e.g. OS version, Linux distribution, Android/iOS version...
+-->
+
+## Steps to reproduce
+
+1. 
+2. 
+3. 
+
+<!--
+  Issues without reproduction steps are likely to stall.
+-->
+
+## Describe what you expected to happen
+
+
+
+## Logfile
+
+<!--
+  Please attach a debug log. Issues without a debug log are likely to stall.
+  For information on how to collect a log file: https://joplinapp.org/debugging/
+-->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 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
+    - name: "\U0001F914 Feature requests and support"
+      url: https://discourse.joplinapp.org/
+      about: I have a question or feature request …

.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/run_ci.sh

@@ -8,23 +8,16 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 ROOT_DIR="$SCRIPT_DIR/../.."
 
 IS_PULL_REQUEST=0
-IS_DESKTOP_RELEASE=0
-IS_SERVER_RELEASE=0
+IS_DEV_BRANCH=0
 IS_LINUX=0
 IS_MACOS=0
 
-# If pull requests are coming from a branch of the main repository,
-# IS_PULL_REQUEST will be zero.
 if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
 	IS_PULL_REQUEST=1
 fi
 
-if [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
-	IS_SERVER_RELEASE=1
-fi
-
-if [[ $GIT_TAG_NAME = v* ]]; then
-	IS_DESKTOP_RELEASE=1
+if [ "$GITHUB_REF" == "refs/heads/dev" ]; then
+	IS_DEV_BRANCH=1
 fi
 
 if [ "$RUNNER_OS" == "Linux" ]; then
@@ -35,14 +28,6 @@ else
 	IS_MACOS=1
 fi
 
-# 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 ]; then
-	RUN_TESTS=1
-fi
-
 # =============================================================================
 # Print environment
 # =============================================================================
@@ -58,16 +43,13 @@ echo "SERVER_TAG_PREFIX=$SERVER_TAG_PREFIX"
 
 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 "RUN_TESTS=$RUN_TESTS"
+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 )"
 echo "Yarn $( yarn -v )"
-echo "Rust $( rustc --version )"
 
 # =============================================================================
 # Install packages
@@ -82,20 +64,17 @@ if [ $testResult -ne 0 ]; then
 fi
 
 # =============================================================================
-# Run test units
+# 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 [ "$RUN_TESTS" == "1" ]; then
+if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running tests..."
 
 	# 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 --file docker-compose.db-dev.yml up -d
-		cmdResult=$?
-		if [ $cmdResult -ne 0 ]; then
-			exit $cmdResult
-		fi
+		sudo docker-compose --file docker-compose.db-dev.yml up -d
 		export JOPLIN_TESTS_SERVER_DB=pg
 	else
 		echo "Running Joplin Server tests using SQLite..."
@@ -108,7 +87,7 @@ 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
@@ -120,16 +99,16 @@ fi
 # release randomly fail.
 # =============================================================================
 
-if [ "$RUN_TESTS" == "1" ]; then
+if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "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
@@ -142,13 +121,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
 
@@ -158,7 +139,7 @@ fi
 # what commit may have broken translation building.
 # =============================================================================
 
-if [ "$RUN_TESTS" == "1" ]; then
+if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	if [ "$IS_LINUX" == "1" ]; then
 		echo "Step: Checking for lost translation strings..."
 
@@ -174,35 +155,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
@@ -211,13 +172,14 @@ if [ "$RUN_TESTS" == "1" ]; then
 fi
 
 # =============================================================================
-# Spellchecking
+# Check that the website still builds
 # =============================================================================
 
-if [ "$IS_LINUX" == "1" ]; then
-	echo "Step: Spellchecking..."
+if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "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
@@ -249,7 +211,7 @@ fi
 
 cd "$ROOT_DIR/packages/app-desktop"
 
-if [ "$IS_DESKTOP_RELEASE" == "1" ]; then
+if [[ $GIT_TAG_NAME = v* ]]; then
 	echo "Step: Building and publishing desktop application..."
 	# cd "$ROOT_DIR/packages/tools"
 	# node bundleDefaultPlugins.js
@@ -270,14 +232,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
+elif [[ $IS_LINUX = 1 ]] && [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
 	echo "Step: Building Docker Image..."
 	cd "$ROOT_DIR"
-	yarn buildServerDocker --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
+	yarn run buildServerDocker --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
 else
 	echo "Step: Building but *not* publishing desktop application..."
 	
@@ -291,8 +253,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.3"
-        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,15 +1,27 @@
 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.3
-      - 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
@@ -21,25 +33,6 @@ 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
-        with:
-          python-version: '3.11'
-
-      - 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
-
       - name: Build macOS M1 app
         env:
           APPLE_ASC_PROVIDER: ${{ secrets.APPLE_ASC_PROVIDER }}
@@ -52,23 +45,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 +69,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

@@ -1,9 +0,0 @@
-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]+: .+"

.github/workflows/cla.yml

@@ -13,7 +13,7 @@ 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
@@ -22,7 +22,7 @@ jobs:
           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/comment-on-failure.yml

@@ -1,14 +0,0 @@
-name: comment-on-failure
-on:
-  workflow_run:
-    workflows:
-      - Joplin Continuous Integration
-      - react-native-android-build-apk
-      - Build macOS M1
-    types: [ completed ]
-
-jobs:
-  comment-failure:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: quipper/comment-failure-action@v0.1.1

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

@@ -1,15 +1,29 @@
 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-20.04, windows-2019]
+        os: [macos-latest, ubuntu-20.04, windows-2019]
     steps:
 
       # Trying to fix random networking issues on Windows
@@ -45,12 +59,6 @@ jobs:
           # testing.
           sudo apt-get install -y xvfb
 
-      - name: Install macOs dependencies
-        if: runner.os == 'macOS'
-        run: |
-          # Required for building the canvas package
-          brew install pango
-
       - name: Install Docker Engine
         # if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
         if: runner.os == 'Linux'
@@ -67,10 +75,9 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y docker-ce docker-ce-cli containerd.io
 
-      - uses: actions/checkout@v4
-      - uses: olegtarasov/get-tag@v2.1.3
-      - uses: dtolnay/rust-toolchain@stable
-      - 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
@@ -85,21 +92,12 @@ jobs:
       # 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
+      - 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@v5
-        with:
-          python-version: '3.11'
-
       - name: Run tests, build and publish Linux and macOS apps
         if: runner.os == 'Linux' || runner.os == 'macOs'
         env:
@@ -114,7 +112,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"
 
@@ -129,7 +126,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.
@@ -141,10 +138,11 @@ jobs:
           SERVER_REPOSITORY: joplin/server
           SERVER_TAG_PREFIX: server
         run: |
-          yarn install && cd packages/app-desktop && yarn dist --publish=never
+          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:
@@ -167,9 +165,9 @@ jobs:
           sudo apt-get update || true
           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'
@@ -184,7 +182,7 @@ jobs:
           BUILD_SEQUENCIAL: 1
         run: |
           yarn install
-          yarn buildServerDocker --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.

.npmpackagejsonlintignore

@@ -1,5 +1,2 @@
 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/app-cli/tests/support/plugins/

.npmpackagejsonlintrc.json

@@ -3,23 +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/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,3 +0,0 @@
-{
-	"cSpell.enabled": true
-}

.yarn/patches/@react-native-community-slider-npm-4.4.4-d78e472f48.patch

@@ -1,62 +0,0 @@
-diff --git a/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java b/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
-index a5bb95eec3337b93a2338a2869a2bda176c91cae..87817688eb280c2f702c26dc35558c6a0a4db1ea 100644
---- a/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
-+++ b/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
-@@ -42,12 +42,20 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider> implement
-             public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
-               ReactSlider slider = (ReactSlider)seekbar;
- 
--              if(progress < slider.getLowerLimit()) {
--                progress = slider.getLowerLimit();
--                seekbar.setProgress(progress);
--              } else if (progress > slider.getUpperLimit()) {
--                progress = slider.getUpperLimit();
--                seekbar.setProgress(progress);
-+              // During initialization, lowerLimit can be greater than upperLimit.
-+              //
-+              // If a change event is received during this, we need a check to prevent
-+              // infinite recursion.
-+              //
-+              // Issue: https://github.com/callstack/react-native-slider/issues/571
-+              if (slider.getLowerLimit() <= slider.getUpperLimit()) {
-+                if(progress < slider.getLowerLimit()) {
-+                  progress = slider.getLowerLimit();
-+                  seekbar.setProgress(progress);
-+                } else if (progress > slider.getUpperLimit()) {
-+                  progress = slider.getUpperLimit();
-+                  seekbar.setProgress(progress);
-+                }
-               }
- 
-               ReactContext reactContext = (ReactContext) seekbar.getContext();
-diff --git a/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java b/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
-index 3ff5930f85a3cd92c2549925f41058abb188a57e..ab3681fdfe0b736c97020e1434e450c8183e6f18 100644
---- a/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
-+++ b/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
-@@ -30,12 +30,20 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider> {
-             public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
-               ReactSlider slider = (ReactSlider)seekbar;
- 
--              if(progress < slider.getLowerLimit()) {
--                progress = slider.getLowerLimit();
--                seekbar.setProgress(progress);
--              } else if(progress > slider.getUpperLimit()) {
--                progress = slider.getUpperLimit();
--                seekbar.setProgress(progress);
-+              // During initialization, lowerLimit can be greater than upperLimit.
-+              //
-+              // If a change event is received during this, we need a check to prevent
-+              // infinite recursion.
-+              //
-+              // Issue: https://github.com/callstack/react-native-slider/issues/571
-+              if (slider.getLowerLimit() <= slider.getUpperLimit()) {
-+                if(progress < slider.getLowerLimit()) {
-+                  progress = slider.getLowerLimit();
-+                  seekbar.setProgress(progress);
-+                } else if (progress > slider.getUpperLimit()) {
-+                  progress = slider.getUpperLimit();
-+                  seekbar.setProgress(progress);
-+                }
-               }
- 
-               ReactContext reactContext = (ReactContext) seekbar.getContext();

.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/husky-npm-3.1.0-5cc13e4e34.patch

@@ -1,33 +0,0 @@
-diff --git a/lib/runner/index.js b/lib/runner/index.js
-index 87e3b3957619728e3ed1ca61e2d83df1c49f928f..6d5ab905415da0577341c8f5b67d4806adcf7549 100644
---- a/lib/runner/index.js
-+++ b/lib/runner/index.js
-@@ -68,15 +68,19 @@ function run([, scriptPath, hookName = '', HUSKY_GIT_PARAMS], getStdinFn = get_s
-             return 0;
-         }
-         catch (err) {
--            const noVerifyMessage = [
--                'commit-msg',
--                'pre-commit',
--                'pre-rebase',
--                'pre-push'
--            ].includes(hookName)
--                ? '(add --no-verify to bypass)'
--                : '(cannot be bypassed with --no-verify due to Git specs)';
--            console.log(`husky > ${hookName} hook failed ${noVerifyMessage}`);
-+            // We do not want to print this "add --no-verify to bypass" message because that's
-+            // literally what some developers do instead of trying to fix the errors.
-+
-+            // const noVerifyMessage = [
-+            //     'commit-msg',
-+            //     'pre-commit',
-+            //     'pre-rebase',
-+            //     'pre-push'
-+            // ].includes(hookName)
-+            //     ? '(add --no-verify to bypass)'
-+            //     : '(cannot be bypassed with --no-verify due to Git specs)';
-+            
-+            console.log(`husky > ${hookName} hook failed (Please fix the errors listed above and try again)`);
-             return err.code;
-         }
-     });

.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,15 +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/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

@@ -1,8 +1,8 @@
 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 8a719ca35af1cc3a4192c5c5f8258fd4f7fea990..5f8831f81cd164a4f627423427ead92fa286b115 100644
+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
-@@ -37,7 +37,7 @@ import com.facebook.react.uimanager.common.ViewUtil;
+@@ -38,7 +38,7 @@ import com.facebook.react.uimanager.common.ViewUtil;
  import java.util.ArrayList;
  import java.util.List;
  import java.util.Queue;
@@ -11,7 +11,7 @@ index 8a719ca35af1cc3a4192c5c5f8258fd4f7fea990..5f8831f81cd164a4f627423427ead92f
  import java.util.concurrent.atomic.AtomicReference;
  
  /**
-@@ -149,7 +149,10 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
+@@ -151,7 +151,10 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
    }
  
    private class ConcurrentOperationQueue {

.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

@@ -6,7 +6,7 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-3.8.3.cjs
+yarnPath: .yarn/releases/yarn-3.6.3.cjs
 
 logFilters:
 

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')}`;
 	},