Update BaseApplication.ts

.eslintignore

@@ -66,7 +66,6 @@ packages/lib/welcomeAssets.js
 packages/plugins/**/api
 packages/plugins/**/dist
 packages/server/dist/
-packages/utils/dist/
 packages/tools/node_modules
 packages/tools/PortableAppsLauncher
 packages/turndown-plugin-gfm/
@@ -396,7 +395,6 @@ packages/app-mobile/components/NoteEditor/NoteEditor.js
 packages/app-mobile/components/NoteEditor/SearchPanel.js
 packages/app-mobile/components/NoteEditor/SelectionFormatting.js
 packages/app-mobile/components/NoteEditor/types.js
-packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
 packages/app-mobile/components/ProfileSwitcher/ProfileSwitcher.js
 packages/app-mobile/components/ProfileSwitcher/useProfileConfig.js
@@ -406,11 +404,9 @@ packages/app-mobile/components/SideMenu.js
 packages/app-mobile/components/TextInput.js
 packages/app-mobile/components/app-nav.js
 packages/app-mobile/components/biometrics/BiometricPopup.js
-packages/app-mobile/components/biometrics/biometricAuthenticate.js
 packages/app-mobile/components/biometrics/sensorInfo.js
 packages/app-mobile/components/getResponsiveValue.js
 packages/app-mobile/components/getResponsiveValue.test.js
-packages/app-mobile/components/screens/VoskScreen.js
 packages/app-mobile/components/screens/ConfigScreen.js
 packages/app-mobile/components/screens/Note.js
 packages/app-mobile/components/screens/Notes.js
@@ -713,7 +709,6 @@ packages/lib/services/searchengine/SearchFilter.test.js
 packages/lib/services/searchengine/filterParser.js
 packages/lib/services/searchengine/filterParser.test.js
 packages/lib/services/searchengine/gotoAnythingStyleQuery.js
-packages/lib/services/searchengine/gotoAnythingStyleQuery.test.js
 packages/lib/services/searchengine/queryBuilder.js
 packages/lib/services/share/ShareService.js
 packages/lib/services/share/ShareService.test.js
@@ -867,7 +862,6 @@ packages/tools/update-readme-download.js
 packages/tools/update-readme-sponsors.js
 packages/tools/updateMarkdownDoc.js
 packages/tools/utils/discourse.js
-packages/tools/utils/loadSponsors.js
 packages/tools/utils/translation.js
 packages/tools/website/build.js
 packages/tools/website/buildTranslations.js
@@ -875,8 +869,6 @@ packages/tools/website/updateDownloadPage.js
 packages/tools/website/updateNews.js
 packages/tools/website/utils/applyTranslations.js
 packages/tools/website/utils/applyTranslations.test.js
-packages/tools/website/utils/convertLinksToLocale.js
-packages/tools/website/utils/convertLinksToLocale.test.js
 packages/tools/website/utils/frontMatter.js
 packages/tools/website/utils/news.js
 packages/tools/website/utils/openGraph.js

.github/workflows/build-android.yml

@@ -6,7 +6,6 @@ on: [push, pull_request]
 
 jobs:
   pre_job:
-    if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
@@ -17,7 +16,6 @@ jobs:
           concurrent_skipping: 'same_content_newer'
 
   BuildAndroidDebug:
-    if: github.repository == 'laurent22/joplin'
     needs: pre_job
     if: needs.pre_job.outputs.should_skip != 'true'
     runs-on: ubuntu-latest

.github/workflows/cla.yml

@@ -7,7 +7,6 @@ on:
 
 jobs:
   CLAAssistant:
-    if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
     steps:
       - name: "CLA Assistant"

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

@@ -6,7 +6,6 @@ permissions:
   issues: write
 jobs:
   ProcessStaleIssues:
-    if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/stale@v4

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

@@ -2,7 +2,6 @@ name: Joplin Continuous Integration
 on: [push, pull_request]
 jobs:
   pre_job:
-    if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
@@ -15,7 +14,7 @@ jobs:
   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'))
+    if: 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:
@@ -71,9 +70,7 @@ jobs:
       - 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'
+          node-version: '18'
 
       - name: Install Yarn
         run: |
@@ -95,7 +92,6 @@ jobs:
           APPLE_ASC_PROVIDER: ${{ secrets.APPLE_ASC_PROVIDER }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
           CSC_KEY_PASSWORD: ${{ secrets.APPLE_CSC_KEY_PASSWORD }}
           CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -133,7 +129,7 @@ jobs:
 
   ServerDockerImage:
     needs: pre_job
-    if: github.repository == 'laurent22/joplin' && needs.pre_job.outputs.should_skip != 'true'
+    if: needs.pre_job.outputs.should_skip != 'true'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:

.gitignore

@@ -383,7 +383,6 @@ packages/app-mobile/components/NoteEditor/NoteEditor.js
 packages/app-mobile/components/NoteEditor/SearchPanel.js
 packages/app-mobile/components/NoteEditor/SelectionFormatting.js
 packages/app-mobile/components/NoteEditor/types.js
-packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
 packages/app-mobile/components/ProfileSwitcher/ProfileSwitcher.js
 packages/app-mobile/components/ProfileSwitcher/useProfileConfig.js
@@ -393,11 +392,9 @@ packages/app-mobile/components/SideMenu.js
 packages/app-mobile/components/TextInput.js
 packages/app-mobile/components/app-nav.js
 packages/app-mobile/components/biometrics/BiometricPopup.js
-packages/app-mobile/components/biometrics/biometricAuthenticate.js
 packages/app-mobile/components/biometrics/sensorInfo.js
 packages/app-mobile/components/getResponsiveValue.js
 packages/app-mobile/components/getResponsiveValue.test.js
-packages/app-mobile/components/screens/VoskScreen.js
 packages/app-mobile/components/screens/ConfigScreen.js
 packages/app-mobile/components/screens/Note.js
 packages/app-mobile/components/screens/Notes.js
@@ -700,7 +697,6 @@ packages/lib/services/searchengine/SearchFilter.test.js
 packages/lib/services/searchengine/filterParser.js
 packages/lib/services/searchengine/filterParser.test.js
 packages/lib/services/searchengine/gotoAnythingStyleQuery.js
-packages/lib/services/searchengine/gotoAnythingStyleQuery.test.js
 packages/lib/services/searchengine/queryBuilder.js
 packages/lib/services/share/ShareService.js
 packages/lib/services/share/ShareService.test.js
@@ -854,7 +850,6 @@ packages/tools/update-readme-download.js
 packages/tools/update-readme-sponsors.js
 packages/tools/updateMarkdownDoc.js
 packages/tools/utils/discourse.js
-packages/tools/utils/loadSponsors.js
 packages/tools/utils/translation.js
 packages/tools/website/build.js
 packages/tools/website/buildTranslations.js
@@ -862,8 +857,6 @@ packages/tools/website/updateDownloadPage.js
 packages/tools/website/updateNews.js
 packages/tools/website/utils/applyTranslations.js
 packages/tools/website/utils/applyTranslations.test.js
-packages/tools/website/utils/convertLinksToLocale.js
-packages/tools/website/utils/convertLinksToLocale.test.js
 packages/tools/website/utils/frontMatter.js
 packages/tools/website/utils/news.js
 packages/tools/website/utils/openGraph.js

.npmpackagejsonlintrc.json

@@ -14,8 +14,7 @@
 					"@joplin/turndown-plugin-gfm",
 					"@joplin/tools",
 					"@joplin/react-native-saf-x",
-					"@joplin/react-native-alarm-notification",
-					"@joplin/utils"
+					"@joplin/react-native-alarm-notification"
 				]
 		  	}
 		]

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

@@ -1,30 +0,0 @@
-diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
-index a8abd71833879201e3438b2fa51d712a311c4551..ffe9c2c6dfa5c703ba76b65d94d5dd6784102c19 100644
---- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
-+++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
-@@ -591,7 +591,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
- //                    ignored.printStackTrace();
-                 }
- 
--                RNFetchBlobFileResp rnFetchBlobFileResp = (RNFetchBlobFileResp) responseBody;
-+                RNFetchBlobFileResp rnFetchBlobFileResp = new RNFetchBlobFileResp(responseBody);
- 
-                 if(rnFetchBlobFileResp != null && !rnFetchBlobFileResp.isDownloadComplete()){
-                     callback.invoke("Download interrupted.", null);
-diff --git a/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java b/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
-index 2470eef612308c15a89dfea5a1f16937469be29f..965f8becc195965907699182c764ec9e51811450 100644
---- a/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
-+++ b/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
-@@ -35,6 +35,12 @@ public class RNFetchBlobFileResp extends ResponseBody {
-     FileOutputStream ofStream;
-     boolean isEndMarkerReceived;
- 
-+    // ref: https://github.com/joltup/rn-fetch-blob/issues/490#issuecomment-990899440
-+    public RNFetchBlobFileResp(ResponseBody body) {
-+        super();
-+        this.originalBody = body;
-+    }
-+
-     public RNFetchBlobFileResp(ReactApplicationContext ctx, String taskId, ResponseBody body, String path, boolean overwrite) throws IOException {
-         super();
-         this.rctContext = ctx;

Assets/WebsiteAssets/css/site.css

@@ -657,16 +657,6 @@ footer .bottom-links-row p {
 	font-size: 1.1em;
 }
 
-.language-switcher {
-	display: inline;
-}
-
-.language-switcher > button {
-	border: none;
-	background-color: transparent;
-	color: #0557ba;
-}
-
 /*****************************************************************
  WHAT'S NEW PAGE
 *****************************************************************/

Assets/WebsiteAssets/templates/front.mustache

@@ -421,7 +421,7 @@
 		</div>
 
 		<script
-			src="{{jsBaseUrl}}/bootstrap5.0.2.bundle.min.js"
+			src="{{jsBaseUrl}}/bootstrap5.0.2.min.js"
 			rel="preload"
 			as="script"
 		></script>

Assets/WebsiteAssets/templates/main-new.mustache

@@ -85,11 +85,6 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 			{{> footer}}
 		</div>
 
-		<script
-			src="{{jsBaseUrl}}/bootstrap5.0.2.bundle.min.js"
-			rel="preload"
-			as="script"
-		></script>
 		<script src="{{{assetUrls.js.script}}}"></script>
 
 		{{> analytics}}

Assets/WebsiteAssets/templates/partials/navbar.mustache

@@ -17,21 +17,6 @@
 				<a href="{{baseUrl}}/help/" class="fw500">Help</a>
 				<a href="{{forumUrl}}" class="fw500">Forum</a>
 				<a href="{{baseUrl}}/cn/" class="fw500">中文</a>
-
-				<!--
-				<div class="dropdown language-switcher">
-					<button class="fw500" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
-						Language
-					</button>
-					<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
-						<li><a class="dropdown-item" href="#">Action</a></li>
-						<li><a class="dropdown-item" href="#">Another action</a></li>
-						<li><a class="dropdown-item" href="#">Something else here</a></li>
-					</ul>
-				</div>
-				-->
-
-
 				{{#showJoplinCloudLinks}}
 					{{> joplinCloudButton}}
 				{{/showJoplinCloudLinks}}

Dockerfile.server

@@ -30,7 +30,6 @@ COPY packages/fork-uslug ./packages/fork-uslug
 COPY packages/htmlpack ./packages/htmlpack
 COPY packages/renderer ./packages/renderer
 COPY packages/tools ./packages/tools
-COPY packages/utils ./packages/utils
 COPY packages/lib ./packages/lib
 COPY packages/server ./packages/server
 

README.md

@@ -64,7 +64,7 @@ A community maintained list of these distributions can be found here: [Unofficia
 # Sponsors
 
 <!-- SPONSORS-ORG -->
-<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-webseite&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://residence-greece.com/"><img title="Greece Golden Visa" width="256" src="https://joplinapp.org/images/sponsors/ResidenceGreece.jpg"/></a> <a href="https://grundstueckspreise.info/"><img title="SP Software GmbH" width="256" src="https://joplinapp.org/images/sponsors/Grundstueckspreise.png"/></a>
+<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-github&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://residence-greece.com/"><img title="Greece Golden Visa" width="256" src="https://joplinapp.org/images/sponsors/ResidenceGreece.jpg"/></a> <a href="https://grundstueckspreise.info/"><img title="SP Software GmbH" width="256" src="https://joplinapp.org/images/sponsors/Grundstueckspreise.png"/></a>
 <!-- SPONSORS-ORG -->
 
 * * *
@@ -126,7 +126,6 @@ A community maintained list of these distributions can be found here: [Unofficia
 	- [Writing a technical spec](https://github.com/laurent22/joplin/blob/dev/readme/technical_spec.md)
 	- [Desktop application styling](https://github.com/laurent22/joplin/blob/dev/readme/spec/desktop_styling.md)
 	- [Note History spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md)
-	- [Synchronisation spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/sync.md)
 	- [Sync Lock spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md)
 	- [Synchronous Scroll spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_scroll.md)
 	- [Plugin Architecture spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md)

gulpfile.js

@@ -1,52 +1,26 @@
 const gulp = require('gulp');
-const execa = require('execa');
-const { stdout } = require('process');
-
-const execCommand = async (executableName, args, options = null) => {
-	options = {
-		showInput: true,
-		showStdout: true,
-		showStderr: true,
-		quiet: false,
-		...options,
-	};
-
-	if (options.quiet) {
-		options.showInput = false;
-		options.showStdout = false;
-		options.showStderr = false;
-	}
-
-	if (options.showInput) {
-		stdout.write(`> ${executableName} ${args.join(' ')}\n`);
-	}
-
-	const promise = execa(executableName, args);
-	if (options.showStdout && promise.stdout) promise.stdout.pipe(process.stdout);
-	if (options.showStderr && promise.stderr) promise.stderr.pipe(process.stderr);
-	const result = await promise;
-	return result.stdout.trim();
-};
-
+const utils = require('./packages/tools/gulp/utils');
 
 const tasks = {
+	updateIgnoredTypeScriptBuild: require('./packages/tools/gulp/tasks/updateIgnoredTypeScriptBuild'),
+	buildCommandIndex: require('./packages/tools/gulp/tasks/buildCommandIndex'),
 	completePublishAll: {
 		fn: async () => {
-			await execCommand('git', ['add', '-A']);
-			await execCommand('git', ['commit', '-m', 'Releasing sub-packages']);
+			await utils.execCommandVerbose('git', ['add', '-A']);
+			await utils.execCommandVerbose('git', ['commit', '-m', 'Releasing sub-packages']);
 
 			// Lerna does some unnecessary auth check that doesn't work with
 			// automation tokens, thus the --no-verify-access. Automation token
 			// is still used for access when publishing even with this flag
 			// (publishing would fail otherwise).
 			// https://github.com/lerna/lerna/issues/2788
-			await execCommand('lerna', ['publish', 'from-package', '-y', '--no-verify-access']);
+			await utils.execCommandVerbose('lerna', ['publish', 'from-package', '-y', '--no-verify-access']);
 
-			await execCommand('yarn', ['install']);
-			await execCommand('git', ['add', '-A']);
-			await execCommand('git', ['commit', '-m', 'Lock file']);
+			await utils.execCommandVerbose('yarn', ['install']);
+			await utils.execCommandVerbose('git', ['add', '-A']);
+			await utils.execCommandVerbose('git', ['commit', '-m', 'Lock file']);
 
-			await execCommand('git', ['push']);
+			await utils.execCommandVerbose('git', ['push']);
 		},
 	},
 	build: {
@@ -59,14 +33,12 @@ const tasks = {
 			// faster, especially when having to rebuild after adding a
 			// dependency.
 			if (process.env.BUILD_SEQUENCIAL === '1') {
-				await execCommand('yarn', ['run', 'buildSequential']);
+				await utils.execCommandVerbose('yarn', ['run', 'buildSequential']);
 			} else {
-				await execCommand('yarn', ['run', 'buildParallel']);
+				await utils.execCommandVerbose('yarn', ['run', 'buildParallel']);
 			}
 		},
 	},
 };
 
-for (const taskName in tasks) {
-	gulp.task(taskName, tasks[taskName].fn);
-}
+utils.registerGulpTasks(gulp, tasks);

joplin.code-workspace

@@ -329,7 +329,6 @@
 			"packages/renderer/MdToHtml/rules/sanitize_html.js": true,
 			"packages/server/db-*.sqlite": true,
 			"packages/server/dist/": true,
-			"packages/utils/dist/": true,
 			"packages/server/temp": true,
 			"packages/server/test.pid": true,
 			"phpunit.xml": true,

package.json

@@ -15,7 +15,7 @@
     "buildParallel": "yarn workspaces foreach --verbose --interlaced --parallel --jobs 2 --topological run build && yarn run tsc",
     "buildSequential": "yarn workspaces foreach --verbose --interlaced --topological run build && yarn run tsc",
     "buildApiDoc": "yarn workspace joplin start apidoc ../../readme/api/references/rest_api.md",
-    "buildCommandIndex": "node packages/tools/gulp/tasks/buildCommandIndexRun.js",
+    "buildCommandIndex": "gulp buildCommandIndex",
     "buildPluginDoc": "typedoc --name 'Joplin Plugin API Documentation' --mode file -theme './Assets/PluginDocTheme/' --readme './Assets/PluginDocTheme/index.md' --excludeNotExported --excludeExternals --excludePrivate --excludeProtected --out ../joplin-website/docs/api/references/plugin_api packages/lib/services/plugins/api/",
     "updateMarkdownDoc": "node ./packages/tools/updateMarkdownDoc",
     "updateNews": "node ./packages/tools/website/updateNews",
@@ -53,7 +53,7 @@
     "test-ci": "yarn workspaces foreach --parallel --verbose --interlaced --jobs 2 run test-ci",
     "test": "yarn workspaces foreach --parallel --verbose --interlaced --jobs 2 run test",
     "tsc": "yarn workspaces foreach --parallel --verbose --interlaced run tsc",
-    "updateIgnored": "node packages/tools/gulp/tasks/updateIgnoredTypeScriptBuildRun.js",
+    "updateIgnored": "gulp updateIgnoredTypeScriptBuild",
     "updatePluginTypes": "./packages/generator-joplin/updateTypes.sh",
     "watch": "yarn workspaces foreach --parallel --verbose --interlaced --jobs 999 run watch",
     "watchWebsite": "nodemon --verbose --watch Assets/WebsiteAssets --watch packages/tools/website --watch packages/tools/website/utils --ext md,ts,js,mustache,css,tsx,gif,png,svg --exec \"node packages/tools/website/build.js && http-server --port 8077 ../joplin-website/docs -a localhost\""
@@ -64,7 +64,6 @@
     }
   },
   "devDependencies": {
-    "@joplin/utils": "~2.11",
     "@seiyab/eslint-plugin-react-hooks": "4.5.1-beta.0",
     "@typescript-eslint/eslint-plugin": "5.48.2",
     "@typescript-eslint/parser": "5.48.2",
@@ -75,13 +74,12 @@
     "eslint-plugin-jest": "27.2.1",
     "eslint-plugin-promise": "6.1.1",
     "eslint-plugin-react": "7.32.0",
-    "execa": "5.1.1",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.1.0",
     "glob": "8.1.0",
     "gulp": "4.0.2",
     "husky": "3.1.0",
     "lerna": "3.22.1",
-    "lint-staged": "13.2.0",
+    "lint-staged": "13.1.2",
     "madge": "6.0.0",
     "npm-package-json-lint": "6.4.0",
     "typedoc": "0.17.8",
@@ -91,11 +89,10 @@
     "@types/fs-extra": "9.0.13",
     "http-server": "14.1.1",
     "node-gyp": "9.3.1",
-    "nodemon": "2.0.22"
+    "nodemon": "2.0.21"
   },
   "packageManager": "yarn@3.3.1",
   "resolutions": {
-    "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
-    "rn-fetch-blob@0.12.0": "patch:rn-fetch-blob@npm%3A0.12.0#./.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch"
+    "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch"
   }
 }

packages/app-cli/app/app-gui.js

@@ -8,7 +8,7 @@ const Resource = require('@joplin/lib/models/Resource').default;
 const Setting = require('@joplin/lib/models/Setting').default;
 const reducer = require('@joplin/lib/reducer').default;
 const { defaultState } = require('@joplin/lib/reducer');
-const { splitCommandString } = require('@joplin/utils');
+const { splitCommandString } = require('@joplin/lib/string-utils.js');
 const { reg } = require('@joplin/lib/registry.js');
 const { _ } = require('@joplin/lib/locale');
 const shim = require('@joplin/lib/shim').default;

packages/app-cli/app/app.js

@@ -9,8 +9,7 @@ const Tag = require('@joplin/lib/models/Tag').default;
 const Setting = require('@joplin/lib/models/Setting').default;
 const { reg } = require('@joplin/lib/registry.js');
 const { fileExtension } = require('@joplin/lib/path-utils');
-const { splitCommandString } = require('@joplin/utils');
-const { splitCommandBatch } = require('@joplin/lib/string-utils');
+const { splitCommandString, splitCommandBatch } = require('@joplin/lib/string-utils');
 const { _ } = require('@joplin/lib/locale');
 const fs = require('fs-extra');
 const { cliUtils } = require('./cli-utils.js');

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

@@ -1,6 +1,6 @@
 const fs = require('fs-extra');
 const BaseCommand = require('./base-command').default;
-const { splitCommandString } = require('@joplin/utils');
+const { splitCommandString } = require('@joplin/lib/string-utils.js');
 const uuid = require('@joplin/lib/uuid').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');

packages/app-cli/package.json

@@ -30,24 +30,22 @@
       2019,
       2020,
       2021,
-      2022,
-      2023
+      2022
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "2.11.0",
+  "version": "2.10.3",
   "bin": "./main.js",
   "engines": {
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@joplin/lib": "~2.11",
-    "@joplin/renderer": "~2.11",
-    "@joplin/utils": "~2.11",
+    "@joplin/lib": "~2.10",
+    "@joplin/renderer": "~2.10",
     "aws-sdk": "2.1290.0",
     "chalk": "4.1.2",
     "compare-version": "0.1.2",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.1.0",
     "html-entities": "1.4.0",
     "image-type": "3.1.0",
     "keytar": "7.9.0",
@@ -59,7 +57,7 @@
     "server-destroy": "1.0.1",
     "sharp": "0.31.3",
     "sprintf-js": "1.1.2",
-    "sqlite3": "5.1.6",
+    "sqlite3": "5.1.4",
     "string-padding": "1.0.2",
     "strip-ansi": "6.0.1",
     "tcp-port-used": "1.0.2",
@@ -70,7 +68,7 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@joplin/tools": "~2.11",
+    "@joplin/tools": "~2.10",
     "@types/fs-extra": "9.0.13",
     "@types/jest": "29.2.6",
     "@types/node": "18.11.18",

packages/app-cli/tests/services/plugins/RepositoryApi.ts

@@ -47,11 +47,9 @@ describe('services_plugins_RepositoryApi', () => {
 
 	it('should tell if a plugin can be updated', (async () => {
 		const api = await newRepoApi();
-
-		expect(await api.pluginCanBeUpdated('org.joplinapp.plugins.ToggleSidebars', '1.0.0', '3.0.0')).toBe(true);
-		expect(await api.pluginCanBeUpdated('org.joplinapp.plugins.ToggleSidebars', '1.0.0', '1.0.0')).toBe(false);
-		expect(await api.pluginCanBeUpdated('org.joplinapp.plugins.ToggleSidebars', '1.0.2', '3.0.0')).toBe(false);
-		expect(await api.pluginCanBeUpdated('does.not.exist', '1.0.0', '3.0.0')).toBe(false);
+		expect(await api.pluginCanBeUpdated('org.joplinapp.plugins.ToggleSidebars', '1.0.0')).toBe(true);
+		expect(await api.pluginCanBeUpdated('org.joplinapp.plugins.ToggleSidebars', '1.0.2')).toBe(false);
+		expect(await api.pluginCanBeUpdated('does.not.exist', '1.0.0')).toBe(false);
 	}));
 
 });

packages/app-cli/tools/populateDatabase.ts

@@ -19,7 +19,7 @@
 
 import * as fs from 'fs-extra';
 import { homedir } from 'os';
-import { execCommand } from '@joplin/utils';
+import { execCommand2 } from '@joplin/tools/tool-utils';
 import { chdir } from 'process';
 
 const minUserNum = 1;
@@ -66,7 +66,7 @@ const processUser = async (userNum: number) => {
 
 		await chdir(cliDir);
 
-		await execCommand(['yarn', 'run', 'start-no-build', '--', '--profile', profileDir, 'batch', commandFile]);
+		await execCommand2(['yarn', 'run', 'start-no-build', '--', '--profile', profileDir, 'batch', commandFile]);
 	} catch (error) {
 		console.error(`Could not process user ${userNum}:`, error);
 	} finally {
@@ -90,7 +90,7 @@ const main = async () => {
 
 	// Build the app once before starting, because we'll use start-no-build to
 	// run the scripts (faster)
-	await execCommand(['yarn', 'run', 'build']);
+	await execCommand2(['yarn', 'run', 'build']);
 
 	const focusUserNum = 0;
 

packages/app-clipper/manifest.json

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

packages/app-clipper/popup/package.json

@@ -126,4 +126,4 @@
       "react-app"
     ]
   }
-}
+}

packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx

@@ -143,7 +143,7 @@ export default function(props: Props) {
 		let cancelled = false;
 
 		async function fetchPluginIds() {
-			const pluginIds = await repoApi().canBeUpdatedPlugins(pluginItems.map(p => p.manifest), pluginService.appVersion);
+			const pluginIds = await repoApi().canBeUpdatedPlugins(pluginItems.map(p => p.manifest));
 			if (cancelled) return;
 			const conv: Record<string, boolean> = {};
 			pluginIds.forEach(id => conv[id] = true);
@@ -155,7 +155,7 @@ export default function(props: Props) {
 		return () => {
 			cancelled = true;
 		};
-	}, [manifestsLoaded, pluginItems, pluginService.appVersion]);
+	}, [manifestsLoaded, pluginItems]);
 
 	const onDelete = useCallback(async (event: ItemEvent) => {
 		const item = event.item;

packages/app-desktop/gui/MenuBar.tsx

@@ -21,7 +21,7 @@ import checkForUpdates from '../checkForUpdates';
 const { connect } = require('react-redux');
 import { reg } from '@joplin/lib/registry';
 import { ProfileConfig } from '@joplin/lib/services/profileConfig/types';
-import PluginService, { PluginSettings } from '@joplin/lib/services/plugins/PluginService';
+import PluginService from '@joplin/lib/services/plugins/PluginService';
 const packageInfo = require('../packageInfo.js');
 const { clipboard } = require('electron');
 const Menu = bridge().Menu;
@@ -128,7 +128,6 @@ interface Props {
 	customCss: string;
 	locale: string;
 	profileConfig: ProfileConfig;
-	pluginSettings: PluginSettings;
 }
 
 const commandNames: string[] = menuCommandNames();
@@ -488,7 +487,8 @@ function useMenu(props: Props) {
 			}
 
 			function _showAbout() {
-				const v = versionInfo(packageInfo, PluginService.instance().enabledPlugins(props.pluginSettings));
+				const v = versionInfo(packageInfo, PluginService.instance().plugins);
+
 
 				const copyToClipboard = bridge().showMessageBox(v.message, {
 					icon: `${bridge().electronApp().buildDir()}/icons/128x128.png`,
@@ -931,7 +931,6 @@ function useMenu(props: Props) {
 		props['spellChecker.languages'],
 		// eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied
 		props['spellChecker.enabled'],
-		props.pluginSettings,
 		props.customCss,
 		props.locale,
 		props.profileConfig,
@@ -987,7 +986,6 @@ const mapStateToProps = (state: AppState) => {
 		['folders.sortOrder.field']: state.settings['folders.sortOrder.field'],
 		['notes.sortOrder.reverse']: state.settings['notes.sortOrder.reverse'],
 		['folders.sortOrder.reverse']: state.settings['folders.sortOrder.reverse'],
-		pluginSettings: state.settings['plugins.states'],
 		showNoteCounts: state.settings.showNoteCounts,
 		uncompletedTodosOnTop: state.settings.uncompletedTodosOnTop,
 		showCompletedTodos: state.settings.showCompletedTodos,

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

@@ -3,7 +3,6 @@ import { useCallback, useMemo } from 'react';
 import { ResourceInfos } from './types';
 import markupLanguageUtils from '../../../utils/markupLanguageUtils';
 import Setting from '@joplin/lib/models/Setting';
-import shim from '@joplin/lib/shim';
 
 const { themeStyle } = require('@joplin/lib/theme');
 import Note from '@joplin/lib/models/Note';
@@ -24,7 +23,6 @@ export interface MarkupToHtmlOptions {
 	useCustomPdfViewer?: boolean;
 	noteId?: string;
 	vendorDir?: string;
-	platformName?: string;
 }
 
 export default function useMarkupToHtml(deps: HookDependencies) {
@@ -42,7 +40,6 @@ export default function useMarkupToHtml(deps: HookDependencies) {
 		options = {
 			replaceResourceInternalToExternalLinks: false,
 			resourceInfos: {},
-			platformName: shim.platformName(),
 			...options,
 		};
 

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

@@ -241,7 +241,6 @@ const NoteListComponent = (props: Props) => {
 		event.dataTransfer.setDragImage(new Image(), 1, 1);
 		event.dataTransfer.clearData();
 		event.dataTransfer.setData('text/x-jop-note-ids', JSON.stringify(noteIds));
-		event.dataTransfer.effectAllowed = 'move';
 	};
 
 	const renderItem = useCallback((item: any, index: number) => {

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

@@ -12,9 +12,9 @@ const { connect } = require('react-redux');
 const styled = require('styled-components').default;
 
 enum BaseBreakpoint {
-	Sm = 75,
-	Md = 80,
-	Lg = 120,
+	Sm = 160,
+	Md = 190,
+	Lg = 40,
 	Xl = 474,
 }
 
@@ -50,9 +50,7 @@ const StyledButton = styled(Button)`
 	width: auto;
 	height: 26px;
 	min-height: 26px;
-	min-width: 37px;
 	max-width: none;
-	white-space: nowrap;
 
   .fa, .fas {
     font-size: 11px;

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

@@ -48,15 +48,6 @@ const StyledFoldersHolder = styled.div`
 	}}
 	}
 `;
-const TagsHolder = styled.div`
-	// linux bug: https://github.com/laurent22/joplin/issues/8000
-	// solution ref: https://github.com/laurent22/joplin/issues/7506#issuecomment-1447101057
-	& a.list-item {
-		${shim.isLinux() && {
-		opacity: 1,
-	}}
-	}
-`;
 
 interface Props {
 	themeId: number;
@@ -747,9 +738,9 @@ const SidebarComponent = (props: Props) => {
 		tagItemsOrder_.current = result.order;
 
 		items.push(
-			<TagsHolder className="tags" key="tag_items" style={{ display: props.tagHeaderIsExpanded ? 'block' : 'none' }}>
+			<div className="tags" key="tag_items" style={{ display: props.tagHeaderIsExpanded ? 'block' : 'none' }}>
 				{tagItems}
-			</TagsHolder>
+			</div>
 		);
 	}
 

packages/app-desktop/gui/note-viewer/lib.js

@@ -56,19 +56,6 @@ if (typeof module !== 'undefined') {
 
 const markJsUtils = {};
 
-const isInsideContainer = (node, tagName) => {
-	if (!node) return false;
-
-	tagName = tagName.toLowerCase();
-
-	while (node) {
-		if (node.tagName && node.tagName.toLowerCase() === tagName) return true;
-		node = node.parentNode;
-	}
-
-	return false;
-};
-
 markJsUtils.markKeyword = (mark, keyword, stringUtils, extraOptions = null) => {
 	if (typeof keyword === 'string') {
 		keyword = {
@@ -84,13 +71,12 @@ markJsUtils.markKeyword = (mark, keyword, stringUtils, extraOptions = null) => {
 	if (isBasicSearch) accuracy = 'partially';
 	if (keyword.type === 'regex') {
 		accuracy = 'complementary';
-		// Remove the trailing wildcard and "accuracy = complementary" will take
-		// care of highlighting the relevant keywords.
+		// Remove the trailing wildcard and "accuracy = complementary" will take care of
+		// highlighting the relevant keywords.
 
-		// Known bug: it will also highlight word that contain the term as a
-		// suffix for example for "ent*", it will highlight "present" which is
-		// incorrect (it should only highlight what starts with "ent") but for
-		// now will do. Mark.js doesn't have an option to tweak this behaviour.
+		// Known bug: it will also highlight word that contain the term as a suffix for example for "ent*", it will highlight "present"
+		// which is incorrect (it should only highlight what starts with "ent") but for now will do. Mark.js doesn't have an option
+		// to tweak this behaviour.
 		value = keyword.value.substr(0, keyword.value.length - 1);
 	}
 
@@ -100,18 +86,6 @@ markJsUtils.markKeyword = (mark, keyword, stringUtils, extraOptions = null) => {
 			{},
 			{
 				accuracy: accuracy,
-				filter: (node, _term, _totalCounter, _counter) => {
-					// We exclude SVG because it creates a "<mark>" tag inside
-					// the document, which is not a valid SVG tag. As a result
-					// the content within that tag disappears.
-					//
-					// mark.js has an "exclude" parameter, but it doesn't work
-					// so we use "filter" instead.
-					//
-					// https://github.com/joplin/plugin-abc-sheet-music
-					if (isInsideContainer(node, 'SVG')) return false;
-					return true;
-				},
 			},
 			extraOptions
 		)

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.11.1",
+  "version": "2.10.10",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,
@@ -27,7 +27,6 @@
   },
   "build": {
     "appId": "net.cozic.joplin-desktop",
-    "compression": "maximum",
     "productName": "Joplin",
     "npmRebuild": false,
     "afterSign": "./tools/notarizeMacApp.js",
@@ -108,7 +107,7 @@
   },
   "homepage": "https://github.com/laurent22/joplin#readme",
   "devDependencies": {
-    "@joplin/tools": "~2.11",
+    "@joplin/tools": "~2.10",
     "@testing-library/react-hooks": "8.0.1",
     "@types/jest": "29.2.6",
     "@types/node": "18.11.18",
@@ -137,9 +136,9 @@
     "@electron/remote": "2.0.9",
     "@fortawesome/fontawesome-free": "5.15.4",
     "@joeattardi/emoji-button": "4.6.4",
-    "@joplin/lib": "~2.11",
-    "@joplin/pdf-viewer": "~2.11",
-    "@joplin/renderer": "~2.11",
+    "@joplin/lib": "~2.10",
+    "@joplin/pdf-viewer": "~2.10",
+    "@joplin/renderer": "~2.10",
     "async-mutex": "0.4.0",
     "codemirror": "5.65.9",
     "color": "3.2.1",
@@ -148,7 +147,7 @@
     "debounce": "1.2.1",
     "electron-window-state": "5.0.3",
     "formatcoords": "1.1.3",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.1.0",
     "highlight.js": "11.7.0",
     "immer": "7.0.15",
     "keytar": "7.9.0",
@@ -164,15 +163,15 @@
     "react-datetime": "3.2.0",
     "react-dom": "18.2.0",
     "react-redux": "8.0.5",
-    "react-select": "5.7.2",
+    "react-select": "5.7.0",
     "react-toggle-button": "2.2.0",
     "react-tooltip": "4.5.1",
     "redux": "4.2.1",
     "reselect": "4.1.7",
     "roboto-fontface": "0.10.0",
     "smalltalk": "2.5.1",
-    "sqlite3": "5.1.6",
-    "styled-components": "5.3.9",
+    "sqlite3": "5.1.4",
+    "styled-components": "5.3.8",
     "styled-system": "5.1.5",
     "taboverride": "4.0.3",
     "tinymce": "5.10.6"

packages/app-mobile/.prettierrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  bracketSpacing: false,
+  jsxBracketSameLine: true,
+  singleQuote: true,
+  trailingComma: 'all',
+};

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

@@ -150,8 +150,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097687
-		versionName "2.11.2"
+		versionCode 2097684
+		versionName "2.10.8"
 		// ndk {
 		// 	abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		// }

packages/app-mobile/android/app/src/main/assets/vosk-model-small-fr-0.22/README

@@ -1,7 +0,0 @@
-French small model for Vosk
-
-WER
-
-%WER 23.95 [ 37203 / 155330, 5373 ins, 4427 del, 27403 sub ] exp/chain_a/tdnn/decode_test_cv/wer_12_0.0
-%WER 19.30 [ 2975 / 15412, 683 ins, 672 del, 1620 sub ] exp/chain_a/tdnn/decode_test_mtedx/wer_10_0.0
-%WER 27.25 [ 20208 / 74145, 2647 ins, 5852 del, 11709 sub ] exp/chain_a/tdnn/decode_test_podcast_reseg/wer_10_0.0

packages/app-mobile/android/app/src/main/assets/vosk-model-small-fr-0.22/conf/mfcc.conf

@@ -1,8 +0,0 @@
---use-energy=false
---sample-frequency=16000
---num-mel-bins=40
---num-ceps=40
---low-freq=40
---high-freq=-200
---allow-upsample=true
---allow-downsample=true

packages/app-mobile/android/app/src/main/assets/vosk-model-small-fr-0.22/conf/model.conf

@@ -1,10 +0,0 @@
---min-active=200
---max-active=7000
---beam=13.0
---lattice-beam=4.0
---acoustic-scale=1.0
---frame-subsampling-factor=3
---endpoint.silence-phones=1:2:3:4:5:6:7:8:9:10
---endpoint.rule2.min-trailing-silence=0.5
---endpoint.rule3.min-trailing-silence=1.0
---endpoint.rule4.min-trailing-silence=2.0

packages/app-mobile/android/app/src/main/assets/vosk-model-small-fr-0.22/graph/disambig_tid.int

@@ -1,76 +0,0 @@
-9365
-9366
-9367
-9368
-9369
-9370
-9371
-9372
-9373
-9374
-9375
-9376
-9377
-9378
-9379
-9380
-9381
-9382
-9383
-9384
-9385
-9386
-9387
-9388
-9389
-9390
-9391
-9392
-9393
-9394
-9395
-9396
-9397
-9398
-9399
-9400
-9401
-9402
-9403
-9404
-9405
-9406
-9407
-9408
-9409
-9410
-9411
-9412
-9413
-9414
-9415
-9416
-9417
-9418
-9419
-9420
-9421
-9422
-9423
-9424
-9425
-9426
-9427
-9428
-9429
-9430
-9431
-9432
-9433
-9434
-9435
-9436
-9437
-9438
-9439
-9440

packages/app-mobile/android/app/src/main/assets/vosk-model-small-fr-0.22/graph/phones/word_boundary.int

@@ -1,154 +0,0 @@
-1 nonword
-2 begin
-3 end
-4 internal
-5 singleton
-6 nonword
-7 begin
-8 end
-9 internal
-10 singleton
-11 begin
-12 end
-13 internal
-14 singleton
-15 begin
-16 end
-17 internal
-18 singleton
-19 begin
-20 end
-21 internal
-22 singleton
-23 begin
-24 end
-25 internal
-26 singleton
-27 begin
-28 end
-29 internal
-30 singleton
-31 begin
-32 end
-33 internal
-34 singleton
-35 begin
-36 end
-37 internal
-38 singleton
-39 begin
-40 end
-41 internal
-42 singleton
-43 begin
-44 end
-45 internal
-46 singleton
-47 begin
-48 end
-49 internal
-50 singleton
-51 begin
-52 end
-53 internal
-54 singleton
-55 begin
-56 end
-57 internal
-58 singleton
-59 begin
-60 end
-61 internal
-62 singleton
-63 begin
-64 end
-65 internal
-66 singleton
-67 begin
-68 end
-69 internal
-70 singleton
-71 begin
-72 end
-73 internal
-74 singleton
-75 begin
-76 end
-77 internal
-78 singleton
-79 begin
-80 end
-81 internal
-82 singleton
-83 begin
-84 end
-85 internal
-86 singleton
-87 begin
-88 end
-89 internal
-90 singleton
-91 begin
-92 end
-93 internal
-94 singleton
-95 begin
-96 end
-97 internal
-98 singleton
-99 begin
-100 end
-101 internal
-102 singleton
-103 begin
-104 end
-105 internal
-106 singleton
-107 begin
-108 end
-109 internal
-110 singleton
-111 begin
-112 end
-113 internal
-114 singleton
-115 begin
-116 end
-117 internal
-118 singleton
-119 begin
-120 end
-121 internal
-122 singleton
-123 begin
-124 end
-125 internal
-126 singleton
-127 begin
-128 end
-129 internal
-130 singleton
-131 begin
-132 end
-133 internal
-134 singleton
-135 begin
-136 end
-137 internal
-138 singleton
-139 begin
-140 end
-141 internal
-142 singleton
-143 begin
-144 end
-145 internal
-146 singleton
-147 begin
-148 end
-149 internal
-150 singleton
-151 begin
-152 end
-153 internal
-154 singleton

packages/app-mobile/android/app/src/main/assets/vosk-model-small-fr-0.22/ivector/global_cmvn.stats

@@ -1,3 +0,0 @@
- [
-  1.022245e+11 -6.33291e+09 -2.480997e+09 8.290258e+09 -9.084483e+09 -8.092173e+09 -1.4735e+10 -7.041795e+09 -1.171205e+10 -2.976464e+08 -1.009425e+10 -6765179 -7.821326e+09 1.449499e+09 -6.413975e+09 -5.303802e+08 -4.998635e+09 9.521598e+07 -3.073041e+09 1.56756e+08 -1.287956e+09 1.738752e+08 -2.382392e+08 -2.716675e+07 4.404485e+08 -1.913359e+08 7.780919e+08 -4.006922e+08 7.895809e+08 -5.401082e+08 5.17605e+08 -6.227134e+08 6.58271e+08 -6.204593e+07 5.187754e+08 -4.497048e+08 4.219366e+07 -2.78742e+08 -1.797385e+07 -3.604475e+07 1.053647e+09 
-  1.040194e+13 6.245521e+11 4.223293e+11 6.831219e+11 6.078478e+11 6.3425e+11 7.943839e+11 6.013323e+11 6.781652e+11 5.272091e+11 5.810814e+11 4.353831e+11 4.473305e+11 3.42063e+11 3.083377e+11 2.14257e+11 1.892057e+11 1.163827e+11 8.367058e+10 4.203224e+10 2.297476e+10 7.596307e+09 1.099877e+09 2.886651e+08 3.797438e+09 9.372847e+09 1.629059e+10 2.196351e+10 2.747149e+10 3.072878e+10 3.238528e+10 3.330232e+10 3.407238e+10 3.230687e+10 2.676914e+10 2.252055e+10 1.914305e+10 1.565974e+10 1.224627e+10 8.415393e+09 0 ]

packages/app-mobile/android/app/src/main/assets/vosk-model-small-fr-0.22/ivector/splice.conf

@@ -1,2 +0,0 @@
---left-context=3
---right-context=3

packages/app-mobile/android/app/src/main/assets/vosk-model-small-fr-0.22/uuid

@@ -1 +0,0 @@
-b5f9c333-f2d1-4a54-9e87-628814fb747f

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

@@ -2,7 +2,6 @@
  * @jest-environment jsdom
  */
 
-
 import { EditorSettings } from '../types';
 import { initCodeMirror } from './CodeMirror';
 import { themeStyle } from '@joplin/lib/theme';
@@ -10,8 +9,6 @@ import Setting from '@joplin/lib/models/Setting';
 import { forceParsing } from '@codemirror/language';
 import loadLangauges from './testUtil/loadLanguages';
 
-import { expect, describe, it } from '@jest/globals';
-
 
 const createEditorSettings = (themeId: number) => {
 	const themeData = themeStyle(themeId);
@@ -26,14 +23,6 @@ const createEditorSettings = (themeId: number) => {
 };
 
 describe('CodeMirror', () => {
-	// This checks for a regression -- occasionally, when updating packages,
-	// syntax highlighting in the CodeMirror editor stops working. This is usually
-	// fixed by
-	// 1. removing all `@codemirror/` and `@lezer/` dependencies from yarn.lock,
-	// 2. upgrading all CodeMirror packages to the latest versions in package.json, and
-	// 3. re-running `yarn install`.
-	//
-	// See https://github.com/laurent22/joplin/issues/7253
 	it('should give headings a different style', async () => {
 		const headerLineText = '# Testing...';
 		const initialText = `${headerLineText}\nThis is a test.`;

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

@@ -30,7 +30,6 @@ interface Props {
 	initialSelection?: Selection;
 	style: ViewStyle;
 	contentStyle?: ViewStyle;
-	toolbarEnabled: boolean;
 
 	onChange: ChangeEventHandler;
 	onSelectionChange: SelectionChangeEventHandler;
@@ -365,19 +364,6 @@ function NoteEditor(props: Props, ref: any) {
 		console.error('NoteEditor: webview error');
 	}, []);
 
-	const toolbar = <MarkdownToolbar
-		style={{
-			// Don't show the markdown toolbar if there isn't enough space
-			// for it:
-			flexShrink: 1,
-		}}
-		editorSettings={editorSettings}
-		editorControl={editorControl}
-		selectionState={selectionState}
-		searchState={searchState}
-		onAttach={props.onAttach}
-	/>;
-
 	// - `scrollEnabled` prevents iOS from scrolling the document (has no effect on Android)
 	//    when an editable region (e.g. a the full-screen NoteEditor) is focused.
 	return (
@@ -415,7 +401,18 @@ function NoteEditor(props: Props, ref: any) {
 				searchState={searchState}
 			/>
 
-			{props.toolbarEnabled ? toolbar : null}
+			<MarkdownToolbar
+				style={{
+					// Don't show the markdown toolbar if there isn't enough space
+					// for it:
+					flexShrink: 1,
+				}}
+				editorSettings={editorSettings}
+				editorControl={editorControl}
+				selectionState={selectionState}
+				searchState={searchState}
+				onAttach={props.onAttach}
+			/>
 		</View>
 	);
 }

packages/app-mobile/components/biometrics/BiometricPopup.tsx

@@ -2,12 +2,9 @@ const React = require('react');
 import Setting from '@joplin/lib/models/Setting';
 import { useEffect, useMemo, useState } from 'react';
 import { View, Dimensions, Alert, Button } from 'react-native';
+import FingerprintScanner from 'react-native-fingerprint-scanner';
 import { SensorInfo } from './sensorInfo';
 import { _ } from '@joplin/lib/locale';
-import Logger from '@joplin/lib/Logger';
-import biometricAuthenticate from './biometricAuthenticate';
-
-const logger = Logger.create('BiometricPopup');
 
 interface Props {
 	themeId: number;
@@ -16,36 +13,24 @@ interface Props {
 }
 
 export default (props: Props) => {
-	// The initial prompt is there so that the user can choose to opt-in to
-	// biometrics auth the first time the app is launched. However since it
-	// doesn't work properly, we disable it. We only want the user to enable the
-	// feature after they've read the description in the config screen.
-	const [initialPromptDone, setInitialPromptDone] = useState(true); // useState(Setting.value('security.biometricsInitialPromptDone'));
-	const [display, setDisplay] = useState(props.sensorInfo.enabled || !initialPromptDone);
+	const [initialPromptDone, setInitialPromptDone] = useState(Setting.value('security.biometricsInitialPromptDone'));
+	const [display, setDisplay] = useState(!!props.sensorInfo.supportedSensors && (props.sensorInfo.enabled || !initialPromptDone));
 	const [tryBiometricsCheck, setTryBiometricsCheck] = useState(initialPromptDone);
 
-	logger.info('Render start');
-	logger.info('initialPromptDone', initialPromptDone);
-	logger.info('display', display);
-	logger.info('tryBiometricsCheck', tryBiometricsCheck);
-	logger.info('props.sensorInfo', props.sensorInfo);
-
 	useEffect(() => {
 		if (!display || !tryBiometricsCheck) return;
 
 		const biometricsCheck = async () => {
-			logger.info('biometricsCheck: start');
-
 			try {
-				await biometricAuthenticate();
+				await FingerprintScanner.authenticate({ description: _('Verify your identity') });
+				setTryBiometricsCheck(false);
 				setDisplay(false);
 			} catch (error) {
-				Alert.alert(error.message);
+				Alert.alert(_('Could not verify your identify'), error.message);
+				setTryBiometricsCheck(false);
+			} finally {
+				FingerprintScanner.release();
 			}
-
-			setTryBiometricsCheck(false);
-
-			logger.info('biometricsCheck: end');
 		};
 
 		void biometricsCheck();
@@ -56,9 +41,6 @@ export default (props: Props) => {
 		if (!display) return;
 
 		const complete = (enableBiometrics: boolean) => {
-			logger.info('complete: start');
-			logger.info('complete: enableBiometrics:', enableBiometrics);
-
 			setInitialPromptDone(true);
 			Setting.setValue('security.biometricsInitialPromptDone', true);
 			Setting.setValue('security.biometricsEnabled', enableBiometrics);
@@ -73,8 +55,6 @@ export default (props: Props) => {
 				type: 'BIOMETRICS_DONE_SET',
 				value: true,
 			});
-
-			logger.info('complete: end');
 		};
 
 		Alert.alert(
@@ -93,7 +73,7 @@ export default (props: Props) => {
 				},
 			]
 		);
-	}, [initialPromptDone, display, props.dispatch]);
+	}, [initialPromptDone, props.sensorInfo.supportedSensors, display, props.dispatch]);
 
 	const windowSize = useMemo(() => {
 		return {
@@ -103,18 +83,12 @@ export default (props: Props) => {
 	}, []);
 
 	useEffect(() => {
-		logger.info('effect 1: start');
-
 		if (!display) {
-			logger.info('effect 1: display', display);
-
 			props.dispatch({
 				type: 'BIOMETRICS_DONE_SET',
 				value: true,
 			});
 		}
-
-		logger.info('effect 1: end');
 	}, [display, props.dispatch]);
 
 	const renderTryAgainButton = () => {

packages/app-mobile/components/biometrics/biometricAuthenticate.ts

@@ -1,28 +0,0 @@
-import Logger from '@joplin/lib/Logger';
-import FingerprintScanner, { Errors } from 'react-native-fingerprint-scanner';
-import { _ } from '@joplin/lib/locale';
-
-const logger = Logger.create('biometricAuthenticate');
-
-export default async () => {
-	try {
-		logger.info('Authenticate...');
-		await FingerprintScanner.authenticate({ description: _('Verify your identity') });
-		logger.info('Authenticate done');
-	} catch (error) {
-		const errorName = (error as Errors).name;
-
-		let errorMessage = error.message;
-		if (errorName === 'FingerprintScannerNotEnrolled' || errorName === 'FingerprintScannerNotAvailable') {
-			errorMessage = _('Biometric unlock is not setup on the device. Please set it up in order to unlock Joplin. If the device is on lockout, consider switching it off and on to reset biometrics scanning.');
-		}
-
-		error.message = _('Could not verify your identify: %s', errorMessage);
-
-		logger.warn(error);
-
-		throw error;
-	} finally {
-		FingerprintScanner.release();
-	}
-};

packages/app-mobile/components/biometrics/sensorInfo.ts

@@ -1,7 +1,5 @@
-import Logger from '@joplin/lib/Logger';
 import Setting from '@joplin/lib/models/Setting';
 import FingerprintScanner from 'react-native-fingerprint-scanner';
-const logger = Logger.create('sensorInfo');
 
 export interface SensorInfo {
 	enabled: boolean;
@@ -10,40 +8,11 @@ export interface SensorInfo {
 }
 
 export default async (): Promise<SensorInfo> => {
-	// Early exit if the feature is disabled, so that we don't make any
-	// FingerprintScanner scanner calls, since it seems they can fail and freeze
-	// the app.
-
-	logger.info('Start');
-	logger.info('security.biometricsEnabled', Setting.value('security.biometricsEnabled'));
-
-	if (!Setting.value('security.biometricsEnabled')) {
-		return {
-			enabled: false,
-			sensorsHaveChanged: false,
-			supportedSensors: '',
-		};
-	}
-
 	let hasChanged = false;
 	let supportedSensors = '';
 
 	try {
-		logger.info('Getting isSensorAvailable...');
-
-		// Note: If `isSensorAvailable()` doesn't return anything, it seems we
-		// could assume that biometrics are not setup on the device, and thus we
-		// can unlock the app. However that's not always correct - on some
-		// devices (eg Galaxy S22), `isSensorAvailable()` will return nothing if
-		// the device is on lockout - i.e. if the user gave the wrong
-		// fingerprint multiple times.
-		//
-		// So we definitely can't unlock the app in that case, and it means
-		// `isSensorAvailable()` is pretty much useless. Instead we ask for
-		// fingerprint when the user turns on the feature and at that point we
-		// know if the device supports biometrics or not.
 		const result = await FingerprintScanner.isSensorAvailable();
-		logger.info('isSensorAvailable result', result);
 		supportedSensors = result;
 
 		if (result) {
@@ -53,7 +22,7 @@ export default async (): Promise<SensorInfo> => {
 			}
 		}
 	} catch (error) {
-		logger.warn('Could not check for biometrics sensor:', error);
+		console.warn('Could not check for biometrics sensor:', error);
 		Setting.setValue('security.biometricsSupportedSensors', '');
 	}
 

packages/app-mobile/components/note-list.js

@@ -1,32 +1,15 @@
 const React = require('react');
-
-import { Component } from 'react';
-
-import { connect } from 'react-redux';
-import { FlatList, Text, StyleSheet, Button, View } from 'react-native';
-import { FolderEntity, NoteEntity } from '@joplin/lib/services/database/types';
-import { AppState } from '../utils/types';
-
+const Component = React.Component;
+const { connect } = require('react-redux');
+const { FlatList, Text, StyleSheet, Button, View } = require('react-native');
 const { _ } = require('@joplin/lib/locale');
 const { NoteItem } = require('./note-item.js');
+const time = require('@joplin/lib/time').default;
 const { themeStyle } = require('./global-style.js');
 
-interface NoteListProps {
-	themeId: string;
-	dispatch: (action: any)=> void;
-	notesSource: string;
-	items: NoteEntity[];
-	folders: FolderEntity[];
-	noteSelectionEnabled?: boolean;
-	selectedFolderId?: string;
-}
-
-class NoteListComponent extends Component<NoteListProps> {
-	private rootRef_: FlatList;
-	private styles_: Record<string, StyleSheet.NamedStyles<any>>;
-
-	public constructor(props: NoteListProps) {
-		super(props);
+class NoteListComponent extends Component {
+	constructor() {
+		super();
 
 		this.state = {
 			items: [],
@@ -38,7 +21,7 @@ class NoteListComponent extends Component<NoteListProps> {
 		this.createNotebookButton_click = this.createNotebookButton_click.bind(this);
 	}
 
-	private styles() {
+	styles() {
 		const themeId = this.props.themeId;
 		const theme = themeStyle(themeId);
 
@@ -64,7 +47,7 @@ class NoteListComponent extends Component<NoteListProps> {
 		return this.styles_[themeId];
 	}
 
-	private createNotebookButton_click() {
+	createNotebookButton_click() {
 		this.props.dispatch({
 			type: 'NAV_GO',
 			routeName: 'Folder',
@@ -72,14 +55,34 @@ class NoteListComponent extends Component<NoteListProps> {
 		});
 	}
 
-	public UNSAFE_componentWillReceiveProps(newProps: NoteListProps) {
+	filterNotes(notes) {
+		const todoFilter = 'all'; // Setting.value('todoFilter');
+		if (todoFilter === 'all') return notes;
+
+		const now = time.unixMs();
+		const maxInterval = 1000 * 60 * 60 * 24;
+		const notRecentTime = now - maxInterval;
+
+		const output = [];
+		for (let i = 0; i < notes.length; i++) {
+			const note = notes[i];
+			if (note.is_todo) {
+				if (todoFilter === 'recent' && note.user_updated_time < notRecentTime && !!note.todo_completed) continue;
+				if (todoFilter === 'nonCompleted' && !!note.todo_completed) continue;
+			}
+			output.push(note);
+		}
+		return output;
+	}
+
+	UNSAFE_componentWillReceiveProps(newProps) {
 		// Make sure scroll position is reset when switching from one folder to another or to a tag list.
 		if (this.rootRef_ && newProps.notesSource !== this.props.notesSource) {
 			this.rootRef_.scrollToOffset({ offset: 0, animated: false });
 		}
 	}
 
-	public render() {
+	render() {
 		// `enableEmptySections` is to fix this warning: https://github.com/FaridSafi/react-native-gifted-listview/issues/39
 
 		if (this.props.items.length) {
@@ -106,7 +109,7 @@ class NoteListComponent extends Component<NoteListProps> {
 	}
 }
 
-const NoteList = connect((state: AppState) => {
+const NoteList = connect(state => {
 	return {
 		items: state.notes,
 		folders: state.folders,
@@ -116,4 +119,4 @@ const NoteList = connect((state: AppState) => {
 	};
 })(NoteListComponent);
 
-export default NoteList;
+module.exports = { NoteList };

packages/app-mobile/components/screens/ConfigScreen.tsx

@@ -23,7 +23,6 @@ const { themeStyle } = require('../global-style.js');
 const shared = require('@joplin/lib/components/shared/config-shared.js');
 import SyncTargetRegistry from '@joplin/lib/SyncTargetRegistry';
 import { openDocumentTree } from '@joplin/react-native-saf-x';
-import biometricAuthenticate from '../biometrics/biometricAuthenticate';
 
 class ConfigScreenComponent extends BaseScreenComponent {
 	public static navigationOptions(): any {
@@ -464,7 +463,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 					<Text key="label" style={this.styles().switchSettingText}>
 						{label}
 					</Text>
-					<Switch key="control" style={this.styles().switchSettingControl} trackColor={{ false: theme.dividerColor }} value={value} onValueChange={(value: any) => void updateSettingValue(key, value)} />
+					<Switch key="control" style={this.styles().switchSettingControl} trackColor={{ false: theme.dividerColor }} value={value} onValueChange={(value: any) => updateSettingValue(key, value)} />
 				</View>
 				{descriptionComp}
 			</View>
@@ -475,39 +474,13 @@ class ConfigScreenComponent extends BaseScreenComponent {
 		return !hasDescription ? this.styles().settingContainer : this.styles().settingContainerNoBottomBorder;
 	}
 
-	private async handleSetting(key: string, value: any): Promise<boolean> {
-		// When the user tries to enable biometrics unlock, we ask for the
-		// fingerprint or Face ID, and if it's correct we save immediately. If
-		// it's not, we don't turn on the setting.
-		if (key === 'security.biometricsEnabled' && !!value) {
-			try {
-				await biometricAuthenticate();
-				shared.updateSettingValue(this, key, value);
-				await this.saveButton_press();
-			} catch (error) {
-				shared.updateSettingValue(this, key, false);
-				Alert.alert(error.message);
-			}
-			return true;
-		}
-
-		if (key === 'security.biometricsEnabled' && !value) {
-			shared.updateSettingValue(this, key, value);
-			await this.saveButton_press();
-			return true;
-		}
-
-		return false;
-	}
-
 	public settingToComponent(key: string, value: any) {
 		const themeId = this.props.themeId;
 		const theme = themeStyle(themeId);
 		const output: any = null;
 
-		const updateSettingValue = async (key: string, value: any) => {
-			const handled = await this.handleSetting(key, value);
-			if (!handled) shared.updateSettingValue(this, key, value);
+		const updateSettingValue = (key: string, value: any) => {
+			return shared.updateSettingValue(this, key, value);
 		};
 
 		const md = Setting.settingMetadata(key);
@@ -544,7 +517,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 								fontSize: theme.fontSize,
 							}}
 							onValueChange={(itemValue: string) => {
-								void updateSettingValue(key, itemValue);
+								updateSettingValue(key, itemValue);
 							}}
 						/>
 					</View>
@@ -580,7 +553,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 					</Text>
 					<View style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', flex: 1 }}>
 						<Text style={this.styles().sliderUnits}>{unitLabel}</Text>
-						<Slider key="control" style={{ flex: 1 }} step={md.step} minimumValue={minimum} maximumValue={maximum} value={value} onValueChange={value => void updateSettingValue(key, value)} />
+						<Slider key="control" style={{ flex: 1 }} step={md.step} minimumValue={minimum} maximumValue={maximum} value={value} onValueChange={value => updateSettingValue(key, value)} />
 					</View>
 				</View>
 			);
@@ -604,7 +577,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 					<Text key="label" style={this.styles().settingText}>
 						{md.label()}
 					</Text>
-					<TextInput autoCorrect={false} autoComplete="off" selectionColor={theme.textSelectionColor} keyboardAppearance={theme.keyboardAppearance} autoCapitalize="none" key="control" style={this.styles().settingControl} value={value} onChangeText={(value: any) => void updateSettingValue(key, value)} secureTextEntry={!!md.secure} />
+					<TextInput autoCorrect={false} autoComplete="off" selectionColor={theme.textSelectionColor} keyboardAppearance={theme.keyboardAppearance} autoCapitalize="none" key="control" style={this.styles().settingControl} value={value} onChangeText={(value: any) => updateSettingValue(key, value)} secureTextEntry={!!md.secure} />
 				</View>
 			);
 		} else {

packages/app-mobile/components/screens/Note.tsx

@@ -1118,7 +1118,6 @@ class NoteScreenComponent extends BaseScreenComponent {
 
 				bodyComponent = <NoteEditor
 					ref={this.editorRef}
-					toolbarEnabled={this.props.toolbarEnabled}
 					themeId={this.props.themeId}
 					initialText={note.body}
 					initialSelection={this.selection}
@@ -1232,7 +1231,6 @@ const NoteScreen = connect((state: any) => {
 		themeId: state.settings.theme,
 		editorFont: [state.settings['style.editor.fontFamily']],
 		editorFontSize: state.settings['style.editor.fontSize'],
-		toolbarEnabled: state.settings['editor.mobile.toolbarEnabled'],
 		ftsEnabled: state.settings['db.ftsEnabled'],
 		sharedData: state.sharedData,
 		showSideMenu: state.showSideMenu,

packages/app-mobile/components/screens/Notes.tsx

@@ -2,7 +2,7 @@ const React = require('react');
 import { AppState as RNAppState, View, StyleSheet, NativeEventSubscription } from 'react-native';
 import { stateUtils } from '@joplin/lib/reducer';
 import { connect } from 'react-redux';
-import NoteList from '../NoteList';
+const { NoteList } = require('../note-list.js');
 import Folder from '@joplin/lib/models/Folder';
 import Tag from '@joplin/lib/models/Tag';
 import Note from '@joplin/lib/models/Note';
@@ -254,7 +254,7 @@ class NotesScreenComponent extends BaseScreenComponent<any> {
 		return (
 			<View style={rootStyle}>
 				<ScreenHeader title={iconString + title} showBackButton={false} parentComponent={thisComp} sortButton_press={this.sortButton_press} folderPickerOptions={this.folderPickerOptions()} showSearchButton={true} showSideMenuButton={true} />
-				<NoteList />
+				<NoteList style={this.styles().noteList} />
 				{actionButtonComp}
 				<DialogBox
 					ref={(dialogbox: any) => {

packages/app-mobile/components/screens/VoskScreen.tsx

@@ -1,105 +0,0 @@
-/* eslint-disable */
-const React = require('react')
-import { useState, useEffect, useRef, useCallback } from 'react';
-
-import { StyleSheet, View, Text, Button } from 'react-native';
-import Vosk from 'react-native-vosk';
-const { ScreenHeader } = require('../ScreenHeader');
-
-
-function VoskScreen() {
-	const [ready, setReady] = useState<Boolean>(false);
-	const [recognizing, setRecognizing] = useState<Boolean>(false);
-	const [result, setResult] = useState<String | undefined>();
-
-	const vosk = useRef(new Vosk()).current;
-
-	const load = useCallback(() => {
-		vosk
-			.loadModel('vosk-model-small-fr-0.22')
-		// .loadModel('model-en-us')
-			.then(() => setReady(true))
-			.catch((e: any) => console.log(e));
-	}, [vosk]);
-
-	const unload = useCallback(() => {
-		vosk.unload();
-		setReady(false);
-	}, [vosk]);
-
-	useEffect(() => {
-		const resultEvent = vosk.onResult((res: { data: String }) => {
-			console.log(res);
-
-			console.log(`A onResult event has been caught: ${res.data}`);
-		});
-
-		return () => {
-			resultEvent.remove();
-		};
-	}, [vosk]);
-
-	const grammar = ['gauche', 'droite', '[unk]'];
-	// const grammar = ['left', 'right', '[unk]'];
-
-	const record = () => {
-		if (!ready) return;
-		console.log('Starting recognition ...');
-
-		setRecognizing(true);
-
-		vosk
-			.start(grammar)
-			.then((res: String) => {
-				console.log(`Result is: ${res}`);
-				setResult(res);
-			})
-			.catch((e: any) => {
-				console.log(`Error: ${e}`);
-			})
-			.finally(() => {
-				setRecognizing(false);
-			});
-	};
-
-	return (
-		<View style={styles.container}>
-			<ScreenHeader title={"Vosk Test"} parentComponent={null} showSearchButton={false} />
-			<View style={{
-				display: 'flex',
-					alignItems: 'center',
-					justifyContent: 'center',
-					marginVertical: 34
-			}}>
-				<Button
-					onPress={ready ? unload : load}
-					title={ready ? 'Unload model' : 'Load model'}
-					color="blue"
-				/>
-				<Button
-					onPress={record}
-					title="Record"
-					disabled={ready === false || recognizing === true}
-					color="#841584"
-				/>
-				<Text>Recognized word:</Text>
-				<Text>{result}</Text>
-			</View>
-		</View>
-	);
-}
-
-const styles = StyleSheet.create({
-	container: {
-		flex: 1,
-		alignItems: 'center',
-		// justifyContent: 'center',
-	},
-	// box: {
-	// 	width: "100%",
-	// 	height: "100%",
-	// },
-});
-
-// export default VoskScreenWrapper
-export default VoskScreen

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

@@ -237,15 +237,6 @@ const SideMenuContentComponent = (props: Props) => {
 		});
 	};
 
-	const voskButton_press = () => {
-		props.dispatch({ type: 'SIDE_MENU_CLOSE' });
-
-		props.dispatch({
-			type: 'NAV_GO',
-			routeName: 'Vosk',
-		});
-	};
-
 	const performSync = useCallback(async () => {
 		const action = props.syncStarted ? 'cancel' : 'start';
 
@@ -421,7 +412,6 @@ const SideMenuContentComponent = (props: Props) => {
 		items.push(makeDivider('divider_1'));
 
 		items.push(renderSidebarButton('newFolder_button', _('New Notebook'), 'md-folder-open', newFolderButton_press));
-		items.push(renderSidebarButton('vosk_button', 'Vosk', 'md-folder-open', voskButton_press));
 
 		items.push(renderSidebarButton('tag_button', _('Tags'), 'md-pricetag', tagButton_press));
 

packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj

@@ -523,7 +523,7 @@
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.11.0;
+				MARKETING_VERSION = 12.10.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -551,7 +551,7 @@
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.11.0;
+				MARKETING_VERSION = 12.10.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -705,7 +705,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.11.0;
+				MARKETING_VERSION = 12.10.5;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@@ -736,7 +736,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.11.0;
+				MARKETING_VERSION = 12.10.5;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";

packages/app-mobile/ios/Podfile.lock

@@ -306,7 +306,7 @@ PODS:
   - React-jsinspector (0.70.6)
   - React-logger (0.70.6):
     - glog
-  - react-native-alarm-notification (2.11.0):
+  - react-native-alarm-notification (2.10.0):
     - React
   - react-native-camera (4.2.1):
     - React-Core
@@ -316,7 +316,7 @@ PODS:
     - React-Core
   - react-native-camera/RN (4.2.1):
     - React-Core
-  - react-native-document-picker (8.1.4):
+  - react-native-document-picker (8.1.3):
     - React-Core
   - react-native-fingerprint-scanner (6.0.0):
     - React
@@ -324,15 +324,15 @@ PODS:
     - React-Core
   - react-native-get-random-values (1.8.0):
     - React-Core
-  - react-native-image-picker (5.3.1):
+  - react-native-image-picker (5.0.2):
     - React-Core
   - react-native-image-resizer (1.4.5):
     - React-Core
-  - react-native-netinfo (9.3.8):
+  - react-native-netinfo (9.3.7):
     - React-Core
   - react-native-rsa-native (2.0.5):
     - React
-  - react-native-saf-x (2.11.0):
+  - react-native-saf-x (2.10.2):
     - React-Core
   - react-native-safe-area-context (4.5.0):
     - RCT-Folly
@@ -432,7 +432,7 @@ PODS:
     - React
   - RNSecureRandom (1.0.1):
     - React
-  - RNShare (8.2.1):
+  - RNShare (8.2.0):
     - React-Core
   - RNVectorIcons (9.2.0):
     - React-Core
@@ -714,17 +714,17 @@ SPEC CHECKSUMS:
   React-jsiexecutor: b4a65947391c658450151275aa406f2b8263178f
   React-jsinspector: 60769e5a0a6d4b32294a2456077f59d0266f9a8b
   React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0
-  react-native-alarm-notification: 26527410a6162d07a9dc57f4bbc62e94ff48e65d
+  react-native-alarm-notification: 0f58eaa37a4188480536fd7ab62db9b1dfba392f
   react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
-  react-native-document-picker: a9bd26996d1b2e4f412dd186041714c79af381d0
+  react-native-document-picker: 958e2bc82e128be69055be261aeac8d872c8d34c
   react-native-fingerprint-scanner: ac6656f18c8e45a7459302b84da41a44ad96dbbe
   react-native-geolocation: 69f4fd37650b8e7fee91816d395e62dd16f5ab8d
   react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
-  react-native-image-picker: ec9b713e248760bfa0f879f0715391de4651a7cb
+  react-native-image-picker: a5dddebb4d2955ac4712a4ed66b00a85f62a63ac
   react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
-  react-native-netinfo: fbc23bc2fe217155d85f2f7e0644b1654df8029b
+  react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
   react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a
-  react-native-saf-x: 9bd5238d3b43d76bbec64aa82c173ac20a4bce9f
+  react-native-saf-x: db5a33862e7aec0f9f2d4cccfe7264b09b234e2e
   react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc
   react-native-slider: 33b8d190b59d4f67a541061bb91775d53d617d9d
   react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
@@ -751,7 +751,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
   RNSecureRandom: 07efbdf2cd99efe13497433668e54acd7df49fef
-  RNShare: eaee3dd5a06dad397c7d3b14762007035c5de405
+  RNShare: b089c33619bbfb0a32bc4069c858b9274e694187
   RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   Yoga: 99caf8d5ab45e9d637ee6e0174ec16fbbb01bcfc

packages/app-mobile/package.json

@@ -2,7 +2,7 @@
   "name": "@joplin/app-mobile",
   "description": "Joplin for Mobile",
   "license": "AGPL-3.0-or-later",
-  "version": "2.11.0",
+  "version": "2.10.0",
   "private": true,
   "scripts": {
     "start": "react-native start --reset-cache",
@@ -18,14 +18,14 @@
     "postinstall": "jetify && yarn run build"
   },
   "dependencies": {
-    "@joplin/lib": "~2.11",
-    "@joplin/react-native-alarm-notification": "~2.11",
-    "@joplin/react-native-saf-x": "~2.11",
-    "@joplin/renderer": "~2.11",
+    "@joplin/lib": "~2.10",
+    "@joplin/react-native-alarm-notification": "~2.10",
+    "@joplin/react-native-saf-x": "~2.10",
+    "@joplin/renderer": "~2.10",
     "@react-native-community/clipboard": "1.5.1",
     "@react-native-community/datetimepicker": "6.7.5",
     "@react-native-community/geolocation": "2.1.0",
-    "@react-native-community/netinfo": "9.3.8",
+    "@react-native-community/netinfo": "9.3.7",
     "@react-native-community/push-notification-ios": "1.10.1",
     "@react-native-community/slider": "4.4.2",
     "assert-browserify": "2.0.0",
@@ -44,17 +44,17 @@
     "react-native-action-button": "2.8.5",
     "react-native-camera": "4.2.1",
     "react-native-dialogbox": "0.6.10",
-    "react-native-document-picker": "8.1.4",
+    "react-native-document-picker": "8.1.3",
     "react-native-dropdownalert": "4.5.1",
     "react-native-exit-app": "1.1.0",
     "react-native-file-viewer": "2.1.5",
     "react-native-fingerprint-scanner": "6.0.0",
     "react-native-fs": "2.20.0",
     "react-native-get-random-values": "1.8.0",
-    "react-native-image-picker": "5.3.1",
+    "react-native-image-picker": "5.1.0",
     "react-native-image-resizer": "1.4.5",
     "react-native-modal-datetime-picker": "14.0.1",
-    "react-native-paper": "5.5.2",
+    "react-native-paper": "5.2.0",
     "react-native-popup-menu": "0.16.1",
     "react-native-quick-actions": "0.3.13",
     "react-native-rsa-native": "2.0.5",
@@ -66,7 +66,6 @@
     "react-native-url-polyfill": "1.3.0",
     "react-native-vector-icons": "9.2.0",
     "react-native-version-info": "1.1.1",
-    "react-native-vosk": "0.1.12",
     "react-native-webview": "11.26.1",
     "react-redux": "7.2.9",
     "redux": "4.2.1",
@@ -80,36 +79,36 @@
   "devDependencies": {
     "@babel/core": "7.16.0",
     "@babel/runtime": "7.16.3",
-    "@codemirror/commands": "6.2.2",
+    "@codemirror/commands": "6.1.2",
     "@codemirror/lang-cpp": "6.0.2",
-    "@codemirror/lang-html": "6.4.3",
+    "@codemirror/lang-html": "6.4.0",
     "@codemirror/lang-java": "6.0.1",
-    "@codemirror/lang-javascript": "6.1.5",
-    "@codemirror/lang-markdown": "6.1.0",
+    "@codemirror/lang-javascript": "6.1.1",
+    "@codemirror/lang-markdown": "6.0.5",
     "@codemirror/lang-php": "6.0.1",
     "@codemirror/lang-rust": "6.0.1",
-    "@codemirror/language": "6.6.0",
-    "@codemirror/legacy-modes": "6.3.2",
-    "@codemirror/search": "6.3.0",
-    "@codemirror/state": "6.2.0",
-    "@codemirror/view": "6.9.3",
-    "@joplin/tools": "~2.11",
-    "@lezer/highlight": "1.1.4",
+    "@codemirror/language": "6.3.2",
+    "@codemirror/legacy-modes": "6.3.1",
+    "@codemirror/search": "6.2.3",
+    "@codemirror/state": "6.1.4",
+    "@codemirror/view": "6.7.1",
+    "@joplin/tools": "~2.10",
+    "@lezer/highlight": "1.1.3",
     "@types/fs-extra": "9.0.13",
     "@types/jest": "29.2.6",
     "@types/react-native": "0.70.6",
     "@types/react-redux": "7.1.25",
     "babel-plugin-module-resolver": "4.1.0",
     "execa": "4.1.0",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.1.0",
     "gulp": "4.0.2",
     "jest": "29.4.3",
     "jest-environment-jsdom": "29.4.3",
     "jetifier": "2.0.0",
-    "jsdom": "21.1.1",
+    "jsdom": "21.0.0",
     "md5-file": "5.0.0",
     "metro-react-native-babel-preset": "0.72.3",
-    "nodemon": "2.0.22",
+    "nodemon": "2.0.21",
     "ts-jest": "29.0.5",
     "ts-loader": "9.4.2",
     "ts-node": "10.9.1",
@@ -117,4 +116,4 @@
     "uglify-js": "3.17.4",
     "webpack": "5.74.0"
   }
-}
+}

packages/app-mobile/root.tsx

@@ -57,7 +57,6 @@ import RevisionService from '@joplin/lib/services/RevisionService';
 import JoplinDatabase from '@joplin/lib/JoplinDatabase';
 import Database from '@joplin/lib/database';
 import NotesScreen from './components/screens/Notes';
-import VoskScreen from './components/screens/VoskScreen';
 const { TagsScreen } = require('./components/screens/tags.js');
 import ConfigScreen from './components/screens/ConfigScreen';
 const { FolderScreen } = require('./components/screens/folder.js');
@@ -502,7 +501,7 @@ async function initialize(dispatch: Function) {
 		if (Setting.value('env') === 'prod') {
 			await db.open({ name: getDatabaseName(currentProfile, isSubProfile) });
 		} else {
-			await db.open({ name: getDatabaseName(currentProfile, isSubProfile, '-3') });
+			await db.open({ name: getDatabaseName(currentProfile, isSubProfile) });
 
 			// await db.clearForTesting();
 		}
@@ -962,7 +961,6 @@ class AppComponent extends React.Component {
 		}
 
 		const appNavInit = {
-			Vosk: { screen: VoskScreen },
 			Notes: { screen: NotesScreen },
 			Note: { screen: NoteScreen },
 			Tags: { screen: TagsScreen },
@@ -986,10 +984,6 @@ class AppComponent extends React.Component {
 		const biometricIsEnabled = !!this.state.sensorInfo && this.state.sensorInfo.enabled;
 		const shouldShowMainContent = !biometricIsEnabled || this.props.biometricsDone;
 
-		logger.info('root.biometrics: biometricIsEnabled', biometricIsEnabled);
-		logger.info('root.biometrics: shouldShowMainContent', shouldShowMainContent);
-		logger.info('root.biometrics: this.state.sensorInfo', this.state.sensorInfo);
-
 		const mainContent = (
 			<View style={{ flex: 1, backgroundColor: theme.backgroundColor }}>
 				<SideMenu

packages/app-mobile/services/profiles/index.ts

@@ -24,10 +24,9 @@ export const getResourceDir = (profile: Profile, isSubProfile: boolean) => {
 	return `${getProfilesRootDir()}/resources-${profile.id}`;
 };
 
-// The suffix is for debugging only
-export const getDatabaseName = (profile: Profile, isSubProfile: boolean, suffix: string = '') => {
-	if (!isSubProfile) return `joplin${suffix}.sqlite`;
-	return `joplin-${profile.id}${suffix}.sqlite`;
+export const getDatabaseName = (profile: Profile, isSubProfile: boolean) => {
+	if (!isSubProfile) return 'joplin.sqlite';
+	return `joplin-${profile.id}.sqlite`;
 };
 
 export const loadProfileConfig = async () => {

packages/generator-joplin/generators/app/templates/src/manifest.json

@@ -1,7 +1,7 @@
 {
 	"manifest_version": 1,
 	"id": "<%= pluginId %>",
-	"app_min_version": "2.11",
+	"app_min_version": "2.10",
 	"version": "1.0.0",
 	"name": "<%= pluginName %>",
 	"description": "<%= pluginDescription %>",

packages/generator-joplin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-joplin",
-  "version": "2.11.0",
+  "version": "2.10.0",
   "description": "Scaffolds out a new Joplin plugin",
   "homepage": "https://github.com/laurent22/joplin/tree/dev/packages/generator-joplin",
   "author": {
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "chalk": "2.4.2",
-    "slugify": "1.6.6",
+    "slugify": "1.6.5",
     "yeoman-generator": "5.8.0",
     "yosay": "2.0.2"
   },

packages/htmlpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/htmlpack",
-  "version": "2.11.0",
+  "version": "2.10.2",
   "description": "Pack an HTML file and all its linked resources into a single HTML file",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -17,7 +17,7 @@
     "@joplin/fork-htmlparser2": "^4.1.43",
     "css": "3.0.0",
     "datauri": "4.1.0",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.1.0",
     "html-entities": "1.4.0"
   },
   "devDependencies": {

packages/lib/BaseApplication.ts

@@ -20,7 +20,7 @@ import Folder from './models/Folder';
 import BaseItem from './models/BaseItem';
 import Note from './models/Note';
 import Tag from './models/Tag';
-import { splitCommandString } from '@joplin/utils';
+const { splitCommandString } = require('./string-utils.js');
 import { reg } from './registry';
 import time from './time';
 import BaseSyncTarget from './BaseSyncTarget';
@@ -706,7 +706,7 @@ export default class BaseApplication {
 
 		flagContent = flagContent.trim();
 
-		let flags: any = splitCommandString(flagContent);
+		let flags = splitCommandString(flagContent);
 		flags.splice(0, 0, 'cmd');
 		flags.splice(0, 0, 'node');
 

packages/lib/SyncTargetOneDrive.ts

@@ -96,14 +96,12 @@ export default class SyncTargetOneDrive extends BaseSyncTarget {
 		let context = Setting.value(`sync.${this.syncTargetId()}.context`);
 		context = context === '' ? null : JSON.parse(context);
 		let accountProperties = context ? context.accountProperties : null;
-		const api = this.api();
-
 		if (!accountProperties) {
-			accountProperties = await api.execAccountPropertiesRequest();
+			accountProperties = await this.api_.execAccountPropertiesRequest();
 			context ? context.accountProperties = accountProperties : context = { accountProperties: accountProperties };
 			Setting.setValue(`sync.${this.syncTargetId()}.context`, JSON.stringify(context));
 		}
-		api.setAccountProperties(accountProperties);
+		this.api_.setAccountProperties(accountProperties);
 		const appDir = await this.api().appDirectory();
 		// the appDir might contain non-ASCII characters
 		// /[^\u0021-\u00ff]/ is used in Node.js to detect the unescaped characters.

packages/lib/markJsUtils.js

@@ -1,18 +1,5 @@
 const markJsUtils = {};
 
-const isInsideContainer = (node, tagName) => {
-	if (!node) return false;
-
-	tagName = tagName.toLowerCase();
-
-	while (node) {
-		if (node.tagName && node.tagName.toLowerCase() === tagName) return true;
-		node = node.parentNode;
-	}
-
-	return false;
-};
-
 markJsUtils.markKeyword = (mark, keyword, stringUtils, extraOptions = null) => {
 	if (typeof keyword === 'string') {
 		keyword = {
@@ -28,13 +15,12 @@ markJsUtils.markKeyword = (mark, keyword, stringUtils, extraOptions = null) => {
 	if (isBasicSearch) accuracy = 'partially';
 	if (keyword.type === 'regex') {
 		accuracy = 'complementary';
-		// Remove the trailing wildcard and "accuracy = complementary" will take
-		// care of highlighting the relevant keywords.
+		// Remove the trailing wildcard and "accuracy = complementary" will take care of
+		// highlighting the relevant keywords.
 
-		// Known bug: it will also highlight word that contain the term as a
-		// suffix for example for "ent*", it will highlight "present" which is
-		// incorrect (it should only highlight what starts with "ent") but for
-		// now will do. Mark.js doesn't have an option to tweak this behaviour.
+		// Known bug: it will also highlight word that contain the term as a suffix for example for "ent*", it will highlight "present"
+		// which is incorrect (it should only highlight what starts with "ent") but for now will do. Mark.js doesn't have an option
+		// to tweak this behaviour.
 		value = keyword.value.substr(0, keyword.value.length - 1);
 	}
 
@@ -44,18 +30,6 @@ markJsUtils.markKeyword = (mark, keyword, stringUtils, extraOptions = null) => {
 			{},
 			{
 				accuracy: accuracy,
-				filter: (node, _term, _totalCounter, _counter) => {
-					// We exclude SVG because it creates a "<mark>" tag inside
-					// the document, which is not a valid SVG tag. As a result
-					// the content within that tag disappears.
-					//
-					// mark.js has an "exclude" parameter, but it doesn't work
-					// so we use "filter" instead.
-					//
-					// https://github.com/joplin/plugin-abc-sheet-music
-					if (isInsideContainer(node, 'SVG')) return false;
-					return true;
-				},
 			},
 			extraOptions
 		)

packages/lib/models/Setting.ts

@@ -1050,17 +1050,6 @@ class Setting extends BaseModel {
 				isGlobal: true,
 			},
 
-			'editor.mobile.toolbarEnabled': {
-				value: true,
-				type: SettingItemType.Bool,
-				section: 'note',
-				public: true,
-				appTypes: [AppType.Mobile],
-				label: () => _('Enable the Markdown toolbar'),
-				storage: SettingStorage.File,
-				isGlobal: true,
-			},
-
 			// Works around a bug in which additional space is visible beneath the toolbar on some devices.
 			// See https://github.com/laurent22/joplin/pull/6823
 			'editor.mobile.removeSpaceBelowToolbar': {
@@ -1645,17 +1634,10 @@ class Setting extends BaseModel {
 				storage: SettingStorage.Database,
 			},
 
-			// The biometrics feature is disabled by default and marked as beta
-			// because it seems to cause a freeze or slow down startup on
-			// certain devices. May be the reason for:
-			//
-			// - https://discourse.joplinapp.org/t/on-android-when-joplin-gets-started-offline/29951/1
-			// - https://github.com/laurent22/joplin/issues/7956
 			'security.biometricsEnabled': {
 				value: false,
 				type: SettingItemType.Bool,
-				label: () => `${_('Use biometrics to secure access to the app')} (Beta)`,
-				description: () => 'Important: This is a beta feature and it is not compatible with certain devices. If the app no longer starts after enabling this or is very slow to start, please uninstall and reinstall the app.',
+				label: () => _('Use biometrics to secure access to the app'),
 				public: true,
 				appTypes: [AppType.Mobile],
 			},

packages/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/lib",
-  "version": "2.11.0",
+  "version": "2.10.2",
   "description": "Joplin Core library",
   "author": "Laurent Cozic",
   "homepage": "",
@@ -34,11 +34,10 @@
     "@joplin/fork-htmlparser2": "^4.1.43",
     "@joplin/fork-sax": "^1.2.47",
     "@joplin/fork-uslug": "^1.0.8",
-    "@joplin/htmlpack": "~2.11",
-    "@joplin/renderer": "~2.11",
+    "@joplin/htmlpack": "^2.10.2",
+    "@joplin/renderer": "^2.10.2",
     "@joplin/turndown": "^4.0.65",
     "@joplin/turndown-plugin-gfm": "^1.0.47",
-    "@joplin/utils": "~2.11",
     "@types/nanoid": "3.0.0",
     "async-mutex": "0.4.0",
     "base-64": "1.0.0",
@@ -54,7 +53,7 @@
     "fast-xml-parser": "3.21.1",
     "follow-redirects": "1.15.2",
     "form-data": "4.0.0",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.1.0",
     "hpagent": "1.2.0",
     "html-entities": "1.4.0",
     "html-minifier": "4.0.0",
@@ -69,7 +68,7 @@
     "moment": "2.29.4",
     "multiparty": "4.2.3",
     "mustache": "4.2.0",
-    "nanoid": "3.3.6",
+    "nanoid": "3.3.4",
     "node-fetch": "2.6.7",
     "node-notifier": "10.0.1",
     "node-persist": "3.1.3",
@@ -83,7 +82,7 @@
     "reselect": "4.1.7",
     "server-destroy": "1.0.1",
     "sprintf-js": "1.1.2",
-    "sqlite3": "5.1.6",
+    "sqlite3": "5.1.4",
     "string-padding": "1.0.2",
     "string-to-stream": "3.0.1",
     "tar": "6.1.13",

packages/lib/services/ExternalEditWatcher/utils.ts

@@ -1,6 +1,6 @@
 /* eslint-disable import/prefer-default-export */
 
-import { splitCommandString } from '@joplin/utils';
+const { splitCommandString } = require('../../string-utils');
 import { spawn } from 'child_process';
 import Logger from '../../Logger';
 import Setting from '../../models/Setting';

packages/lib/services/ReportService.ts

@@ -110,8 +110,6 @@ export default class ReportService {
 		let syncedCount = 0;
 		for (let i = 0; i < BaseItem.syncItemDefinitions_.length; i++) {
 			const d = BaseItem.syncItemDefinitions_[i];
-			// ref: https://github.com/laurent22/joplin/issues/7940#issuecomment-1473709148
-			if (d.className === 'MasterKey') continue;
 			const ItemClass = BaseItem.getClass(d.className);
 			const o = {
 				total: await ItemClass.count(),

packages/lib/services/plugins/PluginService.ts

@@ -100,11 +100,6 @@ export default class PluginService extends BaseService {
 		return this.plugins_;
 	}
 
-	public enabledPlugins(pluginSettings: PluginSettings): Plugins {
-		const enabledPlugins = Object.fromEntries(Object.entries(this.plugins_).filter((p) => this.pluginEnabled(pluginSettings, p[0])));
-		return enabledPlugins;
-	}
-
 	public get pluginIds(): string[] {
 		return Object.keys(this.plugins_);
 	}
@@ -113,10 +108,6 @@ export default class PluginService extends BaseService {
 		return this.isSafeMode_;
 	}
 
-	public get appVersion(): string {
-		return this.appVersion_;
-	}
-
 	public set isSafeMode(v: boolean) {
 		this.isSafeMode_ = v;
 	}

packages/lib/services/plugins/RepositoryApi.ts

@@ -215,21 +215,21 @@ export default class RepositoryApi {
 		return this.manifests_;
 	}
 
-	public async canBeUpdatedPlugins(installedManifests: PluginManifest[], appVersion: string): Promise<string[]> {
+	public async canBeUpdatedPlugins(installedManifests: PluginManifest[]): Promise<string[]> {
 		const output = [];
 
 		for (const manifest of installedManifests) {
-			const canBe = await this.pluginCanBeUpdated(manifest.id, manifest.version, appVersion);
+			const canBe = await this.pluginCanBeUpdated(manifest.id, manifest.version);
 			if (canBe) output.push(manifest.id);
 		}
 
 		return output;
 	}
 
-	public async pluginCanBeUpdated(pluginId: string, installedVersion: string, appVersion: string): Promise<boolean> {
+	public async pluginCanBeUpdated(pluginId: string, installedVersion: string): Promise<boolean> {
 		const manifest = (await this.manifests()).find(m => m.id === pluginId);
 		if (!manifest) return false;
-		return compareVersions(installedVersion, manifest.version) < 0 && compareVersions(appVersion, manifest.app_min_version) >= 0;
+		return compareVersions(installedVersion, manifest.version) < 0;
 	}
 
 }

packages/lib/services/searchengine/SearchEngine.test.js

@@ -431,7 +431,6 @@ describe('services_SearchEngine', () => {
 			['title:abcd efgh', { _: ['efgh'], title: ['abcd'] }],
 			['title:abcd', { title: ['abcd'] }],
 			['"abcd efgh"', { _: ['abcd efgh'] }],
-			['"abcd efgh" ijkl', { _: ['abcd efgh', 'ijkl'] }],
 			['title:abcd title:efgh', { title: ['abcd', 'efgh'] }],
 		];
 

packages/lib/services/searchengine/SearchEngine.ts

@@ -5,31 +5,20 @@ import Note from '../../models/Note';
 import BaseModel from '../../BaseModel';
 import ItemChangeUtils from '../ItemChangeUtils';
 import shim from '../../shim';
-import filterParser, { Term } from './filterParser';
+import filterParser from './filterParser';
 import queryBuilder from './queryBuilder';
 import { ItemChangeEntity, NoteEntity } from '../database/types';
 const { sprintf } = require('sprintf-js');
 const { pregQuote, scriptType, removeDiacritics } = require('../../string-utils.js');
 
-enum SearchType {
-	Auto = 'auto',
-	Basic = 'basic',
-	Nonlatin = 'nonlatin',
-	Fts = 'fts',
-}
-
-interface SearchOptions {
-	searchType: SearchType;
-}
-
 export default class SearchEngine {
 
 	public static instance_: SearchEngine = null;
 	public static relevantFields = 'id, title, body, user_created_time, user_updated_time, is_todo, todo_completed, todo_due, parent_id, latitude, longitude, altitude, source_url';
-	public static SEARCH_TYPE_AUTO = SearchType.Auto;
-	public static SEARCH_TYPE_BASIC = SearchType.Basic;
-	public static SEARCH_TYPE_NONLATIN_SCRIPT = SearchType.Nonlatin;
-	public static SEARCH_TYPE_FTS = SearchType.Fts;
+	public static SEARCH_TYPE_AUTO = 'auto';
+	public static SEARCH_TYPE_BASIC = 'basic';
+	public static SEARCH_TYPE_NONLATIN_SCRIPT = 'nonlatin';
+	public static SEARCH_TYPE_FTS = 'fts';
 
 	public dispatch: Function = (_o: any) => {};
 	private logger_ = new Logger();
@@ -428,7 +417,7 @@ export default class SearchEngine {
 
 		const trimQuotes = (str: string) => str.startsWith('"') ? str.substr(1, str.length - 2) : str;
 
-		let allTerms: Term[] = [];
+		let allTerms: any[] = [];
 
 		try {
 			allTerms = filterParser(query);
@@ -440,20 +429,7 @@ export default class SearchEngine {
 		const titleTerms = allTerms.filter(x => x.name === 'title' && !x.negated).map(x => trimQuotes(x.value));
 		const bodyTerms = allTerms.filter(x => x.name === 'body' && !x.negated).map(x => trimQuotes(x.value));
 
-		interface ComplexTerm {
-			type: 'regex' | 'text';
-			value: string;
-			scriptType: any;
-			valueRegex?: RegExp;
-		}
-
-		interface Terms {
-			_: (string | ComplexTerm)[];
-			title: (string | ComplexTerm)[];
-			body: (string | ComplexTerm)[];
-		}
-
-		const terms: Terms = { _: textTerms, 'title': titleTerms, 'body': bodyTerms };
+		const terms: any = { _: textTerms, 'title': titleTerms, 'body': bodyTerms };
 
 		// Filter terms:
 		// - Convert wildcards to regex
@@ -462,9 +438,7 @@ export default class SearchEngine {
 
 		let termCount = 0;
 		const keys = [];
-		for (const col2 in terms) {
-			const col = col2 as '_' | 'title' | 'body';
-
+		for (const col in terms) {
 			if (!terms.hasOwnProperty(col)) continue;
 
 			if (!terms[col].length) {
@@ -473,7 +447,7 @@ export default class SearchEngine {
 			}
 
 			for (let i = terms[col].length - 1; i >= 0; i--) {
-				const term = terms[col][i] as string;
+				const term = terms[col][i];
 
 				// SQlLite FTS doesn't allow "*" queries and neither shall we
 				if (term === '*') {
@@ -494,16 +468,12 @@ export default class SearchEngine {
 		}
 
 		//
-		// The object "allTerms" is used for query construction purposes (this
-		// contains all the filter terms) Since this is used for the FTS match
-		// query, we need to normalize text, title and body terms. Note, we're
-		// not normalizing terms like tag because these are matched using SQL
-		// LIKE operator and so we must preserve their diacritics.
+		// The object "allTerms" is used for query construction purposes (this contains all the filter terms)
+		// Since this is used for the FTS match query, we need to normalize text, title and body terms.
+		// Note, we're not normalizing terms like tag because these are matched using SQL LIKE operator and so we must preserve their diacritics.
 		//
-		// The object "terms" only include text, title, body terms and is used
-		// for highlighting. By not normalizing the text, title, body in
-		// "terms", highlighting still works correctly for words with
-		// diacritics.
+		// The object "terms" only include text, title, body terms and is used for highlighting.
+		// By not normalizing the text, title, body in "terms", highlighting still works correctly for words with diacritics.
 		//
 
 		allTerms = allTerms.map(x => {
@@ -551,9 +521,9 @@ export default class SearchEngine {
 		const searchOptions: any = {};
 
 		for (const key of parsedQuery.keys) {
-			if ((parsedQuery.terms as any)[key].length === 0) continue;
+			if (parsedQuery.terms[key].length === 0) continue;
 
-			const term = (parsedQuery.terms as any)[key].map((x: Term) => x.value).join(' ');
+			const term = parsedQuery.terms[key].map((x: any) => x.value).join(' ');
 			if (key === '_') searchOptions.anywherePattern = `*${term}*`;
 			if (key === 'title') searchOptions.titlePattern = `*${term}*`;
 			if (key === 'body') searchOptions.bodyPattern = `*${term}*`;
@@ -591,13 +561,12 @@ export default class SearchEngine {
 		return SearchEngine.SEARCH_TYPE_FTS;
 	}
 
-	public async search(searchString: string, options: SearchOptions = null) {
+	public async search(searchString: string, options: any = null) {
 		if (!searchString) return [];
 
-		options = {
+		options = Object.assign({}, {
 			searchType: SearchEngine.SEARCH_TYPE_AUTO,
-			...options,
-		};
+		}, options);
 
 		const searchType = this.determineSearchType_(searchString, options.searchType);
 		const parsedQuery = await this.parseQuery(searchString);

packages/lib/services/searchengine/filterParser.ts

@@ -1,5 +1,5 @@
 
-export interface Term {
+interface Term {
 	name: string;
 	value: string;
 	negated: boolean;

packages/lib/services/searchengine/gotoAnythingStyleQuery.test.ts

@@ -1,17 +0,0 @@
-import gotoAnythingStyleQuery from './gotoAnythingStyleQuery';
-
-describe('searchengine/gotoAnythingStyleQuery', () => {
-
-	it('should prepare queries', () => {
-		const testCases: [string, string][] = [
-			['hello', 'hello*'],
-			['hello welc', 'hello* welc*'],
-		];
-
-		for (const [input, expected] of testCases) {
-			const actual = gotoAnythingStyleQuery(input);
-			expect(actual).toBe(expected);
-		}
-	});
-
-});

packages/lib/string-utils.js

@@ -138,6 +138,80 @@ function commandArgumentsToString(args) {
 	return output.join(' ');
 }
 
+function splitCommandString(command, options = null) {
+	options = options || {};
+	if (!('handleEscape' in options)) {
+		options.handleEscape = true;
+	}
+
+	const args = [];
+	let state = 'start';
+	let current = '';
+	let quote = '"';
+	let escapeNext = false;
+	for (let i = 0; i < command.length; i++) {
+		const c = command[i];
+
+		if (state === 'quotes') {
+			if (c !== quote) {
+				current += c;
+			} else {
+				args.push(current);
+				current = '';
+				state = 'start';
+			}
+			continue;
+		}
+
+		if (escapeNext) {
+			current += c;
+			escapeNext = false;
+			continue;
+		}
+
+		if (c === '\\' && options.handleEscape) {
+			escapeNext = true;
+			continue;
+		}
+
+		if (c === '"' || c === '\'') {
+			state = 'quotes';
+			quote = c;
+			continue;
+		}
+
+		if (state === 'arg') {
+			if (c === ' ' || c === '\t') {
+				args.push(current);
+				current = '';
+				state = 'start';
+			} else {
+				current += c;
+			}
+			continue;
+		}
+
+		if (c !== ' ' && c !== '\t') {
+			state = 'arg';
+			current += c;
+		}
+	}
+
+	if (state === 'quotes') {
+		throw new Error(`Unclosed quote in command line: ${command}`);
+	}
+
+	if (current !== '') {
+		args.push(current);
+	}
+
+	if (args.length <= 0) {
+		throw new Error('Empty command line');
+	}
+
+	return args;
+}
+
 function splitCommandBatch(commandBatch) {
 	const commandLines = [];
 	const eol = '\n';
@@ -294,4 +368,4 @@ function scriptType(s) {
 	return 'en';
 }
 
-module.exports = Object.assign({ formatCssSize, camelCaseToDash, removeDiacritics, substrWithEllipsis, nextWhitespaceIndex, escapeFilename, wrap, splitCommandBatch, padLeft, toTitleCase, urlDecode, escapeHtml, surroundKeywords, scriptType, commandArgumentsToString }, stringUtilsCommon);
+module.exports = Object.assign({ formatCssSize, camelCaseToDash, removeDiacritics, substrWithEllipsis, nextWhitespaceIndex, escapeFilename, wrap, splitCommandString, splitCommandBatch, padLeft, toTitleCase, urlDecode, escapeHtml, surroundKeywords, scriptType, commandArgumentsToString }, stringUtilsCommon);

packages/lib/utils/credentialFiles.ts

@@ -21,17 +21,6 @@ export function credentialDir() {
 	throw new Error(`Could not find credential directory in any of these paths: ${JSON.stringify(toTry)}`);
 }
 
-export const hasCredentialFile = (filename: string) => {
-	let d = '';
-	try {
-		d = credentialDir();
-	} catch (error) {
-		return false;
-	}
-
-	return pathExistsSync(`${d}/${filename}`);
-};
-
 export function credentialFile(filename: string) {
 	const rootDir = credentialDir();
 	const output = `${rootDir}/${filename}`;

packages/lib/versionInfo.test.ts

@@ -86,7 +86,6 @@ describe('getPluginLists', () => {
 			);
 			plugins[plugin.manifest.id] = plugin;
 		}
-
 		const v = versionInfo(packageInfo, plugins);
 
 		expect(v.body).toMatch(/\n\nPlugin1: 1\nPlugin2: 1\nPlugin3: 1/);
@@ -111,7 +110,6 @@ describe('getPluginLists', () => {
 
 			plugins[plugin.manifest.id] = plugin;
 		}
-
 		const v = versionInfo(packageInfo, plugins);
 
 		const body = '\n';

packages/lib/versionInfo.ts

@@ -16,8 +16,6 @@ function getPluginLists(plugins: Plugins): PluginList {
 		}
 	}
 
-	pluginList.sort(Intl.Collator().compare);
-
 	let completeList = '';
 	let summary = '';
 	if (pluginList.length > 0) {

packages/pdf-viewer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/pdf-viewer",
-  "version": "2.11.0",
+  "version": "2.10.0",
   "description": "Provides embedded PDF viewers for Joplin",
   "main": "dist/main.js",
   "types": "src/main.ts",
@@ -28,7 +28,7 @@
     "css-loader": "6.7.3",
     "jest": "29.4.3",
     "jest-environment-jsdom": "29.4.3",
-    "style-loader": "3.3.2",
+    "style-loader": "3.3.1",
     "ts-jest": "29.0.5",
     "ts-loader": "9.4.2",
     "typescript": "4.9.4",
@@ -39,11 +39,11 @@
     "@fortawesome/fontawesome-svg-core": "6.1.2",
     "@fortawesome/free-solid-svg-icons": "6.1.2",
     "@fortawesome/react-fontawesome": "0.2.0",
-    "@joplin/lib": "~2.11",
+    "@joplin/lib": "~2.10",
     "async-mutex": "0.4.0",
     "pdfjs-dist": "2.16.105",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "styled-components": "5.3.9"
+    "styled-components": "5.3.8"
   }
 }

packages/plugin-repo-cli/index.ts

@@ -9,7 +9,7 @@ import * as path from 'path';
 import * as process from 'process';
 import validatePluginId from '@joplin/lib/services/plugins/utils/validatePluginId';
 import validatePluginVersion from '@joplin/lib/services/plugins/utils/validatePluginVersion';
-import { resolveRelativePathWithinDir, gitPullTry, gitRepoCleanTry, gitRepoClean } from '@joplin/tools/tool-utils.js';
+import { execCommand2, resolveRelativePathWithinDir, gitPullTry, gitRepoCleanTry, gitRepoClean } from '@joplin/tools/tool-utils.js';
 import checkIfPluginCanBeAdded from './lib/checkIfPluginCanBeAdded';
 import updateReadme from './lib/updateReadme';
 import { NpmPackage } from './lib/types';
@@ -17,7 +17,6 @@ import gitCompareUrl from './lib/gitCompareUrl';
 import commandUpdateRelease from './commands/updateRelease';
 import { isJoplinPluginPackage, readJsonFile } from './lib/utils';
 import { applyManifestOverrides, getObsoleteManifests, readManifestOverrides } from './lib/overrideUtils';
-import { execCommand } from '@joplin/utils';
 
 function pluginInfoFromSearchResults(results: any[]): NpmPackage[] {
 	const output: NpmPackage[] = [];
@@ -50,7 +49,7 @@ async function checkPluginRepository(dirPath: string, dryRun: boolean) {
 async function extractPluginFilesFromPackage(existingManifests: any, workDir: string, packageName: string, destDir: string): Promise<any> {
 	const previousDir = chdir(workDir);
 
-	await execCommand(`npm install ${packageName} --save --ignore-scripts`, { showStderr: false, showStdout: false });
+	await execCommand2(`npm install ${packageName} --save --ignore-scripts`, { showStderr: false, showStdout: false });
 
 	const pluginDir = resolveRelativePathWithinDir(workDir, 'node_modules', packageName, 'publish');
 
@@ -155,7 +154,7 @@ async function processNpmPackage(npmPackage: NpmPackage, repoDir: string, dryRun
 
 	await fs.mkdirp(packageTempDir);
 	chdir(packageTempDir);
-	await execCommand('npm init --yes --loglevel silent', { quiet: true });
+	await execCommand2('npm init --yes --loglevel silent', { quiet: true });
 
 	let actionType: ProcessingActionType = ProcessingActionType.Update;
 	let manifests: any = {};
@@ -201,8 +200,8 @@ async function processNpmPackage(npmPackage: NpmPackage, repoDir: string, dryRun
 
 	if (!dryRun) {
 		if (!(await gitRepoClean())) {
-			await execCommand('git add -A', { showStdout: false });
-			await execCommand(['git', 'commit', '-m', commitMessage(actionType, manifest, previousManifest, npmPackage, error)], { showStdout: false });
+			await execCommand2('git add -A', { showStdout: false });
+			await execCommand2(['git', 'commit', '-m', commitMessage(actionType, manifest, previousManifest, npmPackage, error)], { showStdout: false });
 		} else {
 			console.info('Nothing to commit');
 		}
@@ -228,14 +227,14 @@ async function commandBuild(args: CommandBuildArgs) {
 	if (!dryRun) {
 		if (!(await gitRepoClean())) {
 			console.info('Updating README...');
-			await execCommand('git add -A');
-			await execCommand('git commit -m "Update README"');
+			await execCommand2('git add -A');
+			await execCommand2('git commit -m "Update README"');
 		}
 	}
 
 	chdir(previousDir);
 
-	const searchResults = (await execCommand('npm search joplin-plugin --searchlimit 5000 --json', { showStdout: false, showStderr: false })).trim();
+	const searchResults = (await execCommand2('npm search joplin-plugin --searchlimit 5000 --json', { showStdout: false, showStderr: false })).trim();
 	const npmPackages = pluginInfoFromSearchResults(JSON.parse(searchResults));
 
 	for (const npmPackage of npmPackages) {
@@ -246,11 +245,11 @@ async function commandBuild(args: CommandBuildArgs) {
 		await commandUpdateRelease(args);
 
 		if (!(await gitRepoClean())) {
-			await execCommand('git add -A');
-			await execCommand('git commit -m "Update stats"');
+			await execCommand2('git add -A');
+			await execCommand2('git commit -m "Update stats"');
 		}
 
-		await execCommand('git push');
+		await execCommand2('git push');
 	}
 }
 

packages/plugin-repo-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/plugin-repo-cli",
-  "version": "2.11.0",
+  "version": "2.10.2",
   "description": "",
   "main": "index.js",
   "bin": "./dist/index.js",
@@ -18,10 +18,9 @@
   "author": "",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@joplin/lib": "~2.11",
-    "@joplin/tools": "~2.11",
-    "@joplin/utils": "~2.11",
-    "fs-extra": "11.1.1",
+    "@joplin/lib": "^2.10.2",
+    "@joplin/tools": "^2.10.2",
+    "fs-extra": "11.1.0",
     "gh-release-assets": "2.0.1",
     "node-fetch": "2.6.7",
     "source-map-support": "0.5.21",

packages/react-native-alarm-notification/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joplin/react-native-alarm-notification",
   "title": "React Native Alarm Notification for Joplin. Forked from https://github.com/emekalites/react-native-alarm-notification",
-  "version": "2.11.0",
+  "version": "2.10.0",
   "description": "schedule alarm with notification in react-native",
   "main": "index.js",
   "private": true,

packages/react-native-saf-x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/react-native-saf-x",
-  "version": "2.11.0",
+  "version": "2.10.2",
   "description": "a module to help work with scoped storages on android easily",
   "main": "src/index",
   "react-native": "src/index",

packages/renderer/MdToHtml.ts

@@ -179,8 +179,6 @@ export interface RuleOptions {
 	noteId?: string;
 	vendorDir?: string;
 	itemIdToUrl?: ItemIdToUrlHandler;
-
-	platformName?: string;
 }
 
 export default class MdToHtml {

packages/renderer/MdToHtml/rules/mermaid.ts

@@ -1,8 +1,6 @@
-import { RuleOptions } from '../../MdToHtml';
-
 export default {
 
-	assets: function(theme: any) {
+	assets: function() {
 		return [
 			{ name: 'mermaid.min.js' },
 			{ name: 'mermaid_render.js' },
@@ -14,27 +12,14 @@ export default {
 				text: '.mermaid { background-color: white; width: 640px; }',
 				mime: 'text/css',
 			},
-			{
-				inline: true,
-				// Export button in mermaid graph should be shown only on hovering the mermaid graph
-				// ref: https://github.com/laurent22/joplin/issues/6101
-				text: `
-				.mermaid-export-graph { visibility: hidden; } 
-				.joplin-editable:hover .mermaid-export-graph { visibility: visible; }
-				.mermaid-export-graph:hover { background-color: ${theme.backgroundColorHover3} !important; }
-				`.trim(),
-				mime: 'text/css',
-			},
 		];
 	},
 
-	plugin: function(markdownIt: any, ruleOptions: RuleOptions) {
+	plugin: function(markdownIt: any) {
 		const defaultRender: Function = markdownIt.renderer.rules.fence || function(tokens: any[], idx: number, options: any, env: any, self: any) {
 			return self.renderToken(tokens, idx, options, env, self);
 		};
 
-		const exportButtonMarkup = isDesktop(ruleOptions.platformName) ? exportGraphButton(ruleOptions) : '';
-
 		markdownIt.renderer.rules.fence = function(tokens: any[], idx: number, options: {}, env: any, self: any) {
 			const token = tokens[idx];
 			if (token.info !== 'mermaid') return defaultRender(tokens, idx, options, env, self);
@@ -46,49 +31,9 @@ export default {
 			return `
 				<div class="joplin-editable">
 					<pre class="joplin-source" data-joplin-language="mermaid" data-joplin-source-open="\`\`\`mermaid&#10;" data-joplin-source-close="&#10;\`\`\`&#10;">${contentHtml}</pre>
-					${exportButtonMarkup}
 					<pre class="mermaid">${contentHtml}</pre>
 				</div>
 			`;
 		};
 	},
 };
-
-const exportGraphButton = (ruleOptions: RuleOptions) => {
-	const theme = ruleOptions.theme;
-	// Clicking on export button manually triggers a right click context menu event
-	const onClickHandler = `
-		const target = arguments[0].target;
-		const button = target.closest("button.mermaid-export-graph");
-		if (!button) return false;
-		const $mermaid_elem = button.nextElementSibling;
-		const rightClickEvent = new PointerEvent("contextmenu", {bubbles: true});
-		rightClickEvent.target = $mermaid_elem;
-		$mermaid_elem.dispatchEvent(rightClickEvent);
-		return false;
-	`.trim();
-	const style = `
-		display: block;	
-		margin-left: auto;
-		border-radius: ${theme.buttonStyle.borderRadius}px;
-		font-size: ${theme.fontSize}px;
-		color: ${theme.color};
-		background: ${theme.buttonStyle.backgroundColor};
-		border: ${theme.buttonStyle.border};
-	`.trim();
-
-	return `<button class="mermaid-export-graph" onclick='${onClickHandler}' style="${style}" alt="Export mermaid graph">${downloadIcon()}</button>`;
-};
-
-const downloadIcon = () => {
-	// https://www.svgrepo.com/svg/505363/download
-	return '<svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" xmlns="http://www.w3.org/2000/svg"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <path d="M20 15V18C20 19.1046 19.1046 20 18 20H6C4.89543 20 4 19.1046 4 18L4 15M8 11L12 15M12 15L16 11M12 15V3" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></g></svg>';
-};
-
-const isDesktop = (platformName?: string) => {
-	if (!platformName) {
-		return false;
-	}
-
-	return ['darwin', 'linux', 'freebsd', 'win32'].includes(platformName);
-};

packages/renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/renderer",
-  "version": "2.11.0",
+  "version": "2.10.2",
   "description": "The Joplin note renderer, used the mobile and desktop application",
   "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
   "main": "index.js",
@@ -29,7 +29,7 @@
     "@joplin/fork-htmlparser2": "^4.1.43",
     "@joplin/fork-uslug": "^1.0.8",
     "font-awesome-filetypes": "2.1.0",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.1.0",
     "highlight.js": "11.7.0",
     "html-entities": "1.4.0",
     "json-stringify-safe": "5.0.1",
@@ -43,7 +43,7 @@
     "markdown-it-footnote": "3.0.3",
     "markdown-it-ins": "3.0.1",
     "markdown-it-mark": "3.0.1",
-    "markdown-it-multimd-table": "4.2.1",
+    "markdown-it-multimd-table": "4.2.0",
     "markdown-it-sub": "1.0.0",
     "markdown-it-sup": "1.0.0",
     "markdown-it-toc-done-right": "4.2.0",

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "2.11.0",
+  "version": "2.10.10",
   "private": true,
   "scripts": {
     "start-dev": "yarn run build && JOPLIN_IS_TESTING=1 nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev",
@@ -23,8 +23,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "3.241.0",
     "@fortawesome/fontawesome-free": "5.15.4",
-    "@joplin/lib": "~2.11",
-    "@joplin/renderer": "~2.11",
+    "@joplin/lib": "~2.10",
+    "@joplin/renderer": "~2.10",
     "@koa/cors": "3.1.0",
     "@types/uuid": "9.0.0",
     "bcryptjs": "2.4.3",
@@ -33,9 +33,9 @@
     "compare-versions": "3.6.0",
     "dayjs": "1.11.7",
     "formidable": "2.1.1",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.1.0",
     "html-entities": "1.4.0",
-    "jquery": "3.6.4",
+    "jquery": "3.6.3",
     "knex": "2.4.2",
     "koa": "2.14.1",
     "markdown-it": "13.0.1",
@@ -44,21 +44,21 @@
     "node-cron": "3.0.2",
     "node-env-file": "0.1.8",
     "nodemailer": "6.9.1",
-    "nodemon": "2.0.22",
-    "pg": "8.10.0",
+    "nodemon": "2.0.21",
+    "pg": "8.9.0",
     "pretty-bytes": "5.6.0",
     "prettycron": "0.10.0",
     "query-string": "7.1.3",
     "rate-limiter-flexible": "2.4.1",
     "raw-body": "2.5.2",
-    "sqlite3": "5.1.6",
+    "sqlite3": "5.1.4",
     "stripe": "8.222.0",
     "uuid": "9.0.0",
     "yargs": "17.7.1",
     "zxcvbn": "4.4.2"
   },
   "devDependencies": {
-    "@joplin/tools": "~2.11",
+    "@joplin/tools": "~2.10",
     "@rmp135/sql-ts": "1.16.0",
     "@types/formidable": "2.0.5",
     "@types/fs-extra": "9.0.13",
@@ -74,8 +74,8 @@
     "gulp": "4.0.2",
     "jest": "29.4.3",
     "jest-expect-message": "1.1.3",
-    "jsdom": "21.1.1",
-    "node-mocks-http": "1.12.2",
+    "jsdom": "21.0.0",
+    "node-mocks-http": "1.12.1",
     "source-map-support": "0.5.21",
     "typescript": "4.9.4"
   }

packages/tools/buildServerDocker.ts

@@ -1,6 +1,5 @@
-import { rootDir } from './tool-utils';
+import { execCommand2, rootDir } from './tool-utils';
 import * as moment from 'moment';
-import { execCommand } from '@joplin/utils';
 
 interface Argv {
 	dryRun?: boolean;
@@ -36,7 +35,7 @@ async function main() {
 	const buildDate = moment(new Date().getTime()).format('YYYY-MM-DDTHH:mm:ssZ');
 	let revision = '';
 	try {
-		revision = await execCommand('git rev-parse --short HEAD', { showStdout: false });
+		revision = await execCommand2('git rev-parse --short HEAD', { showStdout: false });
 	} catch (error) {
 		console.info('Could not get git commit: metadata revision field will be empty');
 	}
@@ -63,11 +62,11 @@ async function main() {
 		return;
 	}
 
-	await execCommand(dockerCommand);
+	await execCommand2(dockerCommand);
 
 	for (const tag of dockerTags) {
-		await execCommand(`docker tag "${repository}:${imageVersion}" "${repository}:${tag}"`);
-		if (pushImages) await execCommand(`docker push ${repository}:${tag}`);
+		await execCommand2(`docker tag "${repository}:${imageVersion}" "${repository}:${tag}"`);
+		if (pushImages) await execCommand2(`docker push ${repository}:${tag}`);
 	}
 }