chore: arrow function for coding style

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

.eslintrc.js

@@ -77,6 +77,7 @@ module.exports = {
 		'no-array-constructor': ['error'],
 		'radix': ['error'],
 		'eqeqeq': ['error', 'always'],
+		'no-console': ['error', { 'allow': ['warn', 'error'] }],
 
 		// Warn only for now because fixing everything would take too much
 		// refactoring, but new code should try to stick to it.
@@ -90,7 +91,12 @@ module.exports = {
 		// Disable because of this: https://github.com/facebook/react/issues/16265
 		// "react-hooks/exhaustive-deps": "warn",
 
+		'jest/require-top-level-describe': ['error', { 'maxNumberOfTopLevelDescribes': 1 }],
+		'jest/no-identical-title': ['error'],
+		'jest/prefer-lowercase-title': ['error', { 'ignoreTopLevelDescribe': true }],
+
 		'promise/prefer-await-to-then': 'error',
+		'no-unneeded-ternary': 'error',
 
 		// -------------------------------
 		// Formatting
@@ -109,6 +115,7 @@ module.exports = {
 			'exports': 'always-multiline',
 			'functions': 'never',
 		}],
+		'comma-spacing': ['error', { 'before': false, 'after': true }],
 		'no-trailing-spaces': 'error',
 		'linebreak-style': ['error', 'unix'],
 		'prefer-template': ['error'],
@@ -134,6 +141,14 @@ module.exports = {
 		'spaced-comment': ['error', 'always'],
 		'keyword-spacing': ['error', { 'before': true, 'after': true }],
 		'no-multi-spaces': ['error'],
+
+		// Regarding the keyword blacklist:
+		// - err: We generally avoid using too many abbreviations, so it should
+		//   be "error", not "err"
+		// - notebook: In code, it should always be "folder" (not "notebook").
+		//   In user-facing text, it should be "notebook".
+		'id-denylist': ['error', 'err', 'notebook', 'notebooks'],
+		'prefer-arrow-callback': ['error'],
 	},
 	'plugins': [
 		'react',
@@ -144,8 +159,19 @@ module.exports = {
 		// 'react-hooks',
 		'import',
 		'promise',
+		'jest',
 	],
 	'overrides': [
+		{
+			'files': [
+				'packages/tools/**',
+				'packages/app-mobile/tools/**',
+				'packages/app-desktop/tools/**',
+			],
+			'rules': {
+				'no-console': 'off',
+			},
+		},
 		{
 			// enable the rule specifically for TypeScript files
 			'files': ['*.ts', '*.tsx'],
@@ -154,10 +180,9 @@ module.exports = {
 				'project': './tsconfig.eslint.json',
 			},
 			'rules': {
-				// Warn only because it would make it difficult to convert JS classes to TypeScript, unless we
-				// make everything public which is not great. New code however should specify member accessibility.
-				'@typescript-eslint/explicit-member-accessibility': ['warn'],
+				'@typescript-eslint/explicit-member-accessibility': ['error'],
 				'@typescript-eslint/type-annotation-spacing': ['error', { 'before': false, 'after': true }],
+				'@typescript-eslint/no-inferrable-types': ['error', { 'ignoreParameters': true, 'ignoreProperties': true }],
 				'@typescript-eslint/comma-dangle': ['error', {
 					'arrays': 'always-multiline',
 					'objects': 'always-multiline',
@@ -168,6 +193,7 @@ module.exports = {
 					'tuples': 'always-multiline',
 					'functions': 'never',
 				}],
+				'@typescript-eslint/object-curly-spacing': ['error', 'always'],
 				'@typescript-eslint/semi': ['error', 'always'],
 				'@typescript-eslint/member-delimiter-style': ['error', {
 					'multiline': {

.github/scripts/run_ci.sh

@@ -180,9 +180,6 @@ cd "$ROOT_DIR/packages/app-desktop"
 
 if [[ $GIT_TAG_NAME = v* ]]; then
 	echo "Step: Building and publishing desktop application..."
-	# cd "$ROOT_DIR/packages/tools"
-	# node bundleDefaultPlugins.js
-	cd "$ROOT_DIR/packages/app-desktop"
 	USE_HARD_LINKS=false yarn run dist
 elif [[ $IS_LINUX = 1 ]] && [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
 	echo "Step: Building Docker Image..."

.github/workflows/build-android.yml

@@ -6,6 +6,7 @@ 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 }}
@@ -16,6 +17,7 @@ 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,12 +7,13 @@ on:
 
 jobs:
   CLAAssistant:
+    if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
     steps:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         # Beta Release
-        uses: contributor-assistant/github-action@v2.2.1
+        uses: contributor-assistant/github-action@v2.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret

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

@@ -6,6 +6,7 @@ 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,6 +2,7 @@ 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 }}
@@ -14,7 +15,7 @@ jobs:
   Main:
     needs: pre_job
     # We always process server or desktop release tags, because they also publish the release
-    if: needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/v')
+    if: github.repository == 'laurent22/joplin' && (needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/v'))
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -92,6 +93,7 @@ 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 }}
@@ -129,7 +131,7 @@ jobs:
 
   ServerDockerImage:
     needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
+    if: github.repository == 'laurent22/joplin' && needs.pre_job.outputs.should_skip != 'true'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:

.npmpackagejsonlintrc.json

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

.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch

@@ -0,0 +1,20 @@
+diff --git a/src/RNCamera.js b/src/RNCamera.js
+index b7a271ad64771c0f654dbd5fe3c0d9e0d2e2c4ef..1182a40ace081a32fbaefe2bc4a499b79c2e7dac 100644
+--- a/src/RNCamera.js
++++ b/src/RNCamera.js
+@@ -5,7 +5,6 @@ import {
+   findNodeHandle,
+   Platform,
+   NativeModules,
+-  ViewPropTypes,
+   requireNativeComponent,
+   View,
+   ActivityIndicator,
+@@ -14,6 +13,7 @@ import {
+   PermissionsAndroid,
+ } from 'react-native';
+ 
++import ViewPropTypes from 'deprecated-react-native-prop-types';
+ import type { FaceFeature } from './FaceDetector';
+ 
+ const Rationale = PropTypes.shape({

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

@@ -0,0 +1,30 @@
+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

@@ -728,6 +728,16 @@ footer .bottom-links-row p {
 	}
 }
 
+/*****************************************************************
+ LARGE VIEW
+*****************************************************************/
+
+@media (max-width: 1200px) {
+	#nav-section a {
+		margin-left: 10px;
+	}
+}
+
 /*****************************************************************
  MEDIUM VIEW
  - Make menu bar elements smaller and closer to each others
@@ -770,6 +780,7 @@ footer .bottom-links-row p {
 
 	#menu-mobile .social-links .social-link-mastodon,
 	#menu-mobile .social-links .social-link-reddit,
+	#menu-mobile .social-links .social-link-linkedin,
 	#menu-mobile .social-links .social-link-patreon {
 		display: none;
 	}
@@ -937,6 +948,41 @@ footer .bottom-links-row p {
 	}
 }
 
+/*****************************************************************
+ MORE NARROW VIEW
+ eg for Galaxy S9
+*****************************************************************/
+
+@media (max-width: 580px) {
+
+	#nav-section .plans-button {
+		display: none;
+	}
+
+}
+
+/*****************************************************************
+ MORE NARROW VIEW
+ eg for Galaxy S9
+*****************************************************************/
+
+@media (max-width: 400px) {
+
+	#nav-section .navbar-mobile-content a.sponsor-button .sponsor-button-label {
+		font-size: 12px;
+	}
+
+	#nav-section .navbar-mobile-content a.sponsor-button {
+		padding: 2px 6px;
+		margin-right: 0.2em;
+	}
+
+	#nav-section a {
+		margin-left: 5px;
+	}
+
+}
+
 /*****************************************************************
  VERY NARROW VIEW
  eg for Galaxy Fold
@@ -958,6 +1004,15 @@ footer .bottom-links-row p {
 		margin-left: 4px;
 	}
 
+	div.navbar-mobile-content a.sponsor-button {
+		margin-right: 10px;
+	}
+
+	#nav-section .button-link {
+		padding-left: 0;
+		padding-right: 0;
+	}
+
 }
 
 /*****************************************************************

Assets/WebsiteAssets/rss.xml

@@ -1,4 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Wed, 21 Dec 2022 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Wed, 21 Dec 2022 00:00:00 GMT</pubDate><item><title><![CDATA[Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0)]]></title><description><![CDATA[<p>As was <a href="https://discourse.joplinapp.org/t/rfc-switch-to-agpl-license-for-joplin-server/16529">discussed last year</a>, Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0) for the desktop, mobile and CLI applications, as well as the web clipper.</p>
+<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Thu, 02 Mar 2023 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Thu, 02 Mar 2023 00:00:00 GMT</pubDate><item><title><![CDATA[Joplin will participate in JdLL 2023!]]></title><description><![CDATA[<p>On 1 and 2 April 2023, we will have a stand for Joplin at the <a href="https://www.jdll.org/">Journées du Logiciel Libre</a> in Lyon, France. The JdLL has been taking place in Lyon for 24 years and is a popular open source conference in France. We had a stand in 2020 and 2021 but that was cancelled due to Covid, so this year is a first for Joplin!</p>
+<p>Admission is free, so don't hesitate to come and meet us, exchange ideas and learn more about Joplin!</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20230202-jdll.jpg" alt="Joplin at JdLL 2023"></p>
+]]></description><link>https://joplinapp.org/news/20230302-jdll-2023/</link><guid isPermaLink="false">20230302-jdll-2023</guid><pubDate>Thu, 02 Mar 2023 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Introducing the "GitHub Actions Raw Log Viewer" extension for Chrome]]></title><description><![CDATA[<p>If you've ever used GitHub Actions, you will find that they provide by default a nice coloured output for the log. It looks good and it's even interactive! (You can click to collapse/expand blocks of text) But unfortunately it doesn't scale to large workflows, like we have for Joplin - the log can freeze and it will take forever to search for something. Indeed searching is done in &quot;real time&quot;... which mostly means it will freeze for a minute or two for each letter you type in the search box. Not great.</p>
+<p>Thankfully GitHub provides an alternative access: the raw logs. This is much better because they will open as plain text, without any styling or JS magic, which means you can use the browser native search and it will be fast.</p>
+<p>But now the problem is that raw logs look like this:</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20230116-ga-raw-log.png" alt="Raw log without extension"></p>
+<p>While it's not impossible to read, all colours that would display nicely in a terminal are gone and replaced by <a href="https://en.wikipedia.org/wiki/ANSI_escape_code">ANSI codes</a>. You can find what you need in there but it's not particularly easy.</p>
+<p>This is where the new <strong>GitHub Action Raw Log Viewer</strong> extension for Chrome can help. It will parse your raw log and convert the ANSI codes to proper colours. This results in a much more readable rendering:</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20230116-ga-raw-log-colored.png" alt="Raw log with extension"></p>
+<p>The extension is fast even for very large logs and it's of course easy to search for text since it simply works with your browser built-in search.</p>
+<p>The extension is open source, with the code available here: <a href="https://github.com/laurent22/github-actions-logs-extension">https://github.com/laurent22/github-actions-logs-extension</a></p>
+<p>And to install it, follow this link:</p>
+<p><a href="https://chrome.google.com/webstore/detail/github-action-raw-log-vie/lgejlnoopmcdglhfjblaeldbcfnmjddf"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20230116-extension-get-it-now.png" alt="Download GitHub Action Raw Log Viewer extension"></a></p>
+]]></description><link>https://joplinapp.org/news/20230116-github-actions-log-viewer/</link><guid isPermaLink="false">20230116-github-actions-log-viewer</guid><pubDate>Mon, 16 Jan 2023 00:00:00 GMT</pubDate><twitter-text>Introducing the &quot;GitHub Action Raw Log Viewer&quot; extension for Chrome</twitter-text></item><item><title><![CDATA[Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0)]]></title><description><![CDATA[<p>As was <a href="https://discourse.joplinapp.org/t/rfc-switch-to-agpl-license-for-joplin-server/16529">discussed last year</a>, Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0) for the desktop, mobile and CLI applications, as well as the web clipper.</p>
 <p>Any open source or commercial fork of Joplin will have to license any changes they make under AGPL, and share these changes back with the community. This is the main reason we switch to this license. It allows us to continue releasing the project as open source while ensuring that those who benefit commercially (or not) from it share back their changes.</p>
 <h2>What is the GPL license?<a name="what-is-the-gpl-license" href="#what-is-the-gpl-license" class="heading-anchor">🔗</a></h2>
 <p>The AGPL license is based on the GPL license. This is what tldr;Legal has to say about the GPL license:</p>
@@ -283,14 +297,4 @@
 <p>This release also includes about 30 various bug fixes and improvements.</p>
 <p>A notable one is a fix for GotoAnything, which recently wasn't working on first try.</p>
 <p>The plugin screen has also been improved so that search works even when GitHub is down or blocked, as it is in China in particular.</p>
-]]></description><link>https://joplinapp.org/news/20210929-144036/</link><guid isPermaLink="false">20210929-144036</guid><pubDate>Wed, 29 Sep 2021 14:40:36 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Introducing recommended plugins in the next Joplin version]]></title><description><![CDATA[<p>A common request from new users is how to know which plugin is safe to install or not. In fact probably all of them are safe but as a new user that's not necessarily easy to know. So to help with this, the next version of Joplin will support recommended plugins - those will be plugins that meet our standards of quality and performance, and they will be indicated by a small crown tag inside the plugin box. Recommended plugins will also appear on top when searching.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20210901-113415_0.png" alt=""></p>
-<p>For now, since we don't have a review process, the recommended plugins are those developed by the Joplin team and frequent contributors, because we know those are safe to use.</p>
-<p>Later we might have a review process and add more recommended plugins. That being said, in the meantime even if a plugin is not marked as recommended, there's a good chance it is still safe and have good performance too. Often you can search for it on the forum and if it's active with many users commenting, you're most likely good to go.</p>
-<p>But if there's any doubt, the recommended tag is a good way to be sure.</p>
-]]></description><link>https://joplinapp.org/news/20210901-113415/</link><guid isPermaLink="false">20210901-113415</guid><pubDate>Wed, 01 Sep 2021 11:34:15 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Joplin Cloud is officially production ready!]]></title><description><![CDATA[<p><a href="https://joplinapp.org/plans/">Joplin Cloud</a> has been out of beta for a few weeks now and since then it has been quietly running without any troubles. There is no known bugs and the service is running smoothly so it's now safe to say that it is production ready!</p>
-<p>As a reminder, Joplin Cloud is meant to provide a more seamless Joplin experience - if you want to quickly get started, it's as easy as downloading the app and getting a Joplin Cloud account. Besides improved sync performance, that will give you the ability to collaborate on notebooks with others, as well as publishing and sharing notes.</p>
-<p>Of course Joplin still supports other sync options such as Nextcloud, Dropbox and OneDrive or AWS S3. You can also self host using Joplin Server. The advantage of Joplin Cloud being that you don't need to maintain a server yourself - for a small fee you'll get that taken care of.</p>
-<p>Additionally, subscribing to Joplin Cloud is a great way to support the project as a whole, including the open source applications. Such support is needed in the long term to provide bug and security fixes, add new features, and provide support.</p>
-<p>At some level it is also an experiment, to see if such a service is financially viable and can allow me to work full time on the project. This is certainly something I would like, and perhaps Joplin Cloud combined with your donations will allow that.</p>
-]]></description><link>https://joplinapp.org/news/20210831-154354/</link><guid isPermaLink="false">20210831-154354</guid><pubDate>Tue, 31 Aug 2021 15:43:54 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>
+]]></description><link>https://joplinapp.org/news/20210929-144036/</link><guid isPermaLink="false">20210929-144036</guid><pubDate>Wed, 29 Sep 2021 14:40:36 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>

Assets/WebsiteAssets/templates/partials/navbar.mustache

@@ -24,7 +24,8 @@
 			</div>
 			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
 				{{> twitterLink}}
-				<a href="{{baseUrl}}/cn/" class="fw500">中文</a>
+				<a href="{{baseUrl}}/cn/" class="fw500 chinese-page-link">中文</a>
+				{{> joplinCloudButton}}
 				{{> supportButton}}
 
 				<span class="pointer"

Assets/WebsiteAssets/templates/partials/socialFeeds.mustache

@@ -4,6 +4,7 @@
 		<a class="social-link-mastodon" href="https://mastodon.social/@joplinapp" title="Joplin Mastodon feed"><i class="fab fa-mastodon"></i></a>
 		<a class="social-link-patreon" href="https://www.patreon.com/joplin" title="Joplin Patreon"><i class="fab fa-patreon"></i></a>
 		<a class="social-link-discord" href="https://discord.gg/VSj7AFHvpq" title="Joplin Discord chat"><i class="fab fa-discord"></i></a>
+		<a class="social-link-linkedin" href="https://www.linkedin.com/company/joplin" title="Joplin LinkedIn Feed"><i class="fab fa-linkedin"></i></a>
 		<a class="social-link-reddit" href="https://www.reddit.com/r/joplinapp/" title="Joplin Subreddit"><i class="fab fa-reddit"></i></a>
 		<a class="social-link-github" href="https://github.com/laurent22/joplin/" title="Joplin GitHub repository"><i class="fab fa-github"></i></a>
 	</div>

Assets/WebsiteAssets/templates/partials/twitterLink.mustache

@@ -1 +1 @@
-<a href="https://twitter.com/joplinapp" title="Joplin Twitter feed" class="fw500"><i class="fab fa-twitter"></i></a>
+<a href="https://twitter.com/joplinapp" title="Joplin Twitter feed" class="fw500 twitter-link"><i class="fab fa-twitter"></i></a>

Assets/WebsiteAssets/templates/plans.mustache

@@ -130,7 +130,11 @@
 			});
 
 			setupBetaHandling(urlQuery);
-			applyPeriod('yearly');
+			if (urlQuery.get('period') === 'monthly') {
+				// Nothing - this is the default
+			} else {
+				applyPeriod('yearly');
+			}
 		});
 	</script>
 </div>

Dockerfile.server

@@ -30,6 +30,7 @@ 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

@@ -36,7 +36,7 @@ Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/J
 
 Operating System | Download | Alt. Download
 ---|---|---
-Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.8.1/joplin-v2.8.1.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.8.1/joplin-v2.8.1-32bit.apk)
+Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.9.8/joplin-v2.9.8.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.9.8/joplin-v2.9.8-32bit.apk)
 iOS | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application
@@ -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://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://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>
 <!-- SPONSORS-ORG -->
 
 * * *
@@ -72,14 +72,11 @@ A community maintained list of these distributions can be found here: [Unofficia
 <!-- SPONSORS-GITHUB -->
 |       |       |       |       |
 | :---: | :---: | :---: | :---: |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[avanderberg](https://github.com/avanderberg) | <img width="50" src="https://avatars2.githubusercontent.com/u/3061769?s=96&v=4"/></br>[c-nagy](https://github.com/c-nagy) | <img width="50" src="https://avatars2.githubusercontent.com/u/70780798?s=96&v=4"/></br>[cabottech](https://github.com/cabottech) | <img width="50" src="https://avatars2.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/4862947?s=96&v=4"/></br>[chrootlogin](https://github.com/chrootlogin) | <img width="50" src="https://avatars2.githubusercontent.com/u/82579431?s=96&v=4"/></br>[clmntsl](https://github.com/clmntsl) | <img width="50" src="https://avatars2.githubusercontent.com/u/808091?s=96&v=4"/></br>[cuongtransc](https://github.com/cuongtransc) | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[dbrandonjohnson](https://github.com/dbrandonjohnson) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/1439535?s=96&v=4"/></br>[fbloise](https://github.com/fbloise) | <img width="50" src="https://avatars2.githubusercontent.com/u/49439044?s=96&v=4"/></br>[fourstepper](https://github.com/fourstepper) | <img width="50" src="https://avatars2.githubusercontent.com/u/38898566?s=96&v=4"/></br>[h4sh5](https://github.com/h4sh5) | <img width="50" src="https://avatars2.githubusercontent.com/u/3266447?s=96&v=4"/></br>[iamwillbar](https://github.com/iamwillbar) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/37297218?s=96&v=4"/></br>[Jesssullivan](https://github.com/Jesssullivan) | <img width="50" src="https://avatars2.githubusercontent.com/u/1310474?s=96&v=4"/></br>[jknowles](https://github.com/jknowles) | <img width="50" src="https://avatars2.githubusercontent.com/u/1248504?s=96&v=4"/></br>[joesfer](https://github.com/joesfer) | <img width="50" src="https://avatars2.githubusercontent.com/u/5588131?s=96&v=4"/></br>[kianenigma](https://github.com/kianenigma) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) | <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) | <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) | <img width="50" src="https://avatars2.githubusercontent.com/u/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/1168659?s=96&v=4"/></br>[nicholashead](https://github.com/nicholashead) | <img width="50" src="https://avatars2.githubusercontent.com/u/5782817?s=96&v=4"/></br>[piccobit](https://github.com/piccobit) | <img width="50" src="https://avatars2.githubusercontent.com/u/77214738?s=96&v=4"/></br>[Polymathic-Company](https://github.com/Polymathic-Company) | <img width="50" src="https://avatars2.githubusercontent.com/u/47742?s=96&v=4"/></br>[ravenscroftj](https://github.com/ravenscroftj) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/327998?s=96&v=4"/></br>[sif](https://github.com/sif) | <img width="50" src="https://avatars2.githubusercontent.com/u/54626606?s=96&v=4"/></br>[skyrunner15](https://github.com/skyrunner15) | <img width="50" src="https://avatars2.githubusercontent.com/u/765564?s=96&v=4"/></br>[taskcruncher](https://github.com/taskcruncher) | <img width="50" src="https://avatars2.githubusercontent.com/u/73081837?s=96&v=4"/></br>[thismarty](https://github.com/thismarty) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/15859362?s=96&v=4"/></br>[thomasbroussard](https://github.com/thomasbroussard) |       |       |       |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[avanderberg](https://github.com/avanderberg) | <img width="50" src="https://avatars2.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m) | <img width="50" src="https://avatars2.githubusercontent.com/u/2793530?s=96&v=4"/></br>[CyberXZT](https://github.com/CyberXZT) | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[dbrandonjohnson](https://github.com/dbrandonjohnson) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/49439044?s=96&v=4"/></br>[fourstepper](https://github.com/fourstepper) | <img width="50" src="https://avatars2.githubusercontent.com/u/64712218?s=96&v=4"/></br>[Hegghammer](https://github.com/Hegghammer) | <img width="50" src="https://avatars2.githubusercontent.com/u/3266447?s=96&v=4"/></br>[iamwillbar](https://github.com/iamwillbar) | <img width="50" src="https://avatars2.githubusercontent.com/u/1310474?s=96&v=4"/></br>[jknowles](https://github.com/jknowles) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/11947658?s=96&v=4"/></br>[KentBrockman](https://github.com/KentBrockman) | <img width="50" src="https://avatars2.githubusercontent.com/u/5588131?s=96&v=4"/></br>[kianenigma](https://github.com/kianenigma) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) | <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/126279083?s=96&v=4"/></br>[matmoly](https://github.com/matmoly) | <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) | <img width="50" src="https://avatars2.githubusercontent.com/u/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp) | <img width="50" src="https://avatars2.githubusercontent.com/u/31054972?s=96&v=4"/></br>[saarantras](https://github.com/saarantras) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/327998?s=96&v=4"/></br>[sif](https://github.com/sif) | <img width="50" src="https://avatars2.githubusercontent.com/u/765564?s=96&v=4"/></br>[taskcruncher](https://github.com/taskcruncher) | <img width="50" src="https://avatars2.githubusercontent.com/u/333944?s=96&v=4"/></br>[tateisu](https://github.com/tateisu) |       |
 <!-- SPONSORS-GITHUB -->
 
 <!-- TOC -->
@@ -129,6 +126,7 @@ 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)
@@ -505,6 +503,7 @@ Name | Description
 [Mastodon feed](https://mastodon.social/@joplinapp) | Follow us on Mastodon
 [Patreon page](https://www.patreon.com/joplin) |The latest news are often posted there
 [Discord server](https://discord.gg/VSj7AFHvpq) | Our chat server
+[LinkedIn](https://www.linkedin.com/company/joplin) | Our LinkedIn page
 [Sub-reddit](https://www.reddit.com/r/joplinapp/) | Also a good place to get help
 
 # Contributing
@@ -530,47 +529,47 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  82%
+<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  80%
 <img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/>  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  23%
-<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  59%
-<img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  46%
-<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  [Xavi Ivars](mailto:xavi.ivars@gmail.com)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/>  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  79%
+<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  58%
+<img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  45%
+<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  [Xavi Ivars](mailto:xavi.ivars@gmail.com)  |  89%
+<img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/>  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  89%
+<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  77%
 <img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  ERYpTION  |  99%
 <img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [MrKanister](mailto:pueblos_spatulas@aleeas.com)  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  45%
+<img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  44%
 <img src="https://joplinapp.org/images/flags/country-4x3/gb.png" width="16px"/>  |  English (United Kingdom)  |  [en_GB](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_GB.po)  |    |  100%
 <img src="https://joplinapp.org/images/flags/country-4x3/us.png" width="16px"/>  |  English (United States of America)  |  [en_US](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_US.po)  |    |  100%
-<img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Mora](mailto:francisco.m.collao@gmail.com)  |  91%
-<img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  26%
-<img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato0  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  98%
-<img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/>  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  30%
-<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [Wisnu Adi Santoso](mailto:waditos@gmail.com)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Albano Battistella](mailto:albano_battistella@hotmail.com)  |  80%
-<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  80%
-<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  81%
-<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MHolkamp](mailto:mholkamp@users.noreply.github.com)  |  91%
-<img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  91%
-<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  57%
-<img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [X3NO](mailto:X3NO@disroot.org)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Renato Nunes Bastos](mailto:rnbastos@gmail.com)  |  91%
-<img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  75%
-<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  52%
-<img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  83%
-<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  38%
-<img src="https://joplinapp.org/images/flags/country-4x3/vn.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  80%
-<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  75%
-<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  91%
-<img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  83%
-<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  67%
-<img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [KaneGreen](mailto:737445366KG@Gmail.com)  |  97%
-<img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Kevin Hsu](mailto:kevin.hsu.hws@gmail.com)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Villaverde](mailto:teko.gr@gmail.com)  |  99%
+<img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  25%
+<img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato0  |  95%
+<img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  99%
+<img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/>  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  29%
+<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [Wisnu Adi Santoso](mailto:waditos@gmail.com)  |  89%
+<img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Manuel Tassi](mailto:mannivuwiki@gmail.com)  |  81%
+<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  78%
+<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  79%
+<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MHolkamp](mailto:mholkamp@users.noreply.github.com)  |  88%
+<img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  88%
+<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  55%
+<img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [X3NO](mailto:X3NO@disroot.org)  |  91%
+<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Renato Nunes Bastos](mailto:rnbastos@gmail.com)  |  88%
+<img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  73%
+<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  51%
+<img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  80%
+<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  36%
+<img src="https://joplinapp.org/images/flags/country-4x3/vn.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  78%
+<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  89%
+<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  72%
+<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  88%
+<img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Dmitriy Q](mailto:krotesk@mail.ru)  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  65%
+<img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [wh201906](mailto:wh201906@yandex.com)  |  97%
+<img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Kevin Hsu](mailto:kevin.hsu.hws@gmail.com)  |  89%
+<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  89%
+<img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  89%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Contributors

gulpfile.js

@@ -1,23 +1,52 @@
 const gulp = require('gulp');
-const utils = require('./packages/tools/gulp/utils');
+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 tasks = {
-	updateIgnoredTypeScriptBuild: require('./packages/tools/gulp/tasks/updateIgnoredTypeScriptBuild'),
-	buildCommandIndex: require('./packages/tools/gulp/tasks/buildCommandIndex'),
 	completePublishAll: {
 		fn: async () => {
-
-			await utils.execCommandVerbose('git', ['add', '-A']);
-			await utils.execCommandVerbose('git', ['commit', '-m', 'Releasing sub-packages']);
+			await execCommand('git', ['add', '-A']);
+			await execCommand('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 utils.execCommandVerbose('lerna', ['publish', 'from-package', '-y', '--no-verify-access']);
+			await execCommand('lerna', ['publish', 'from-package', '-y', '--no-verify-access']);
 
-			await utils.execCommandVerbose('git', ['push']);
+			await execCommand('yarn', ['install']);
+			await execCommand('git', ['add', '-A']);
+			await execCommand('git', ['commit', '-m', 'Lock file']);
+
+			await execCommand('git', ['push']);
 		},
 	},
 	build: {
@@ -30,12 +59,14 @@ const tasks = {
 			// faster, especially when having to rebuild after adding a
 			// dependency.
 			if (process.env.BUILD_SEQUENCIAL === '1') {
-				await utils.execCommandVerbose('yarn', ['run', 'buildSequential']);
+				await execCommand('yarn', ['run', 'buildSequential']);
 			} else {
-				await utils.execCommandVerbose('yarn', ['run', 'buildParallel']);
+				await execCommand('yarn', ['run', 'buildParallel']);
 			}
 		},
 	},
 };
 
-utils.registerGulpTasks(gulp, tasks);
+for (const taskName in tasks) {
+	gulp.task(taskName, tasks[taskName].fn);
+}

joplin.code-workspace

@@ -317,6 +317,9 @@
 			"packages/app-tools/github_oauth_token.txt": true,
 			"packages/generator-joplin/generators/app/templates/api/": true,
 			"packages/htmlpack/dist/": true,
+			"packages/react-native-alarm-notification/android/build": true,
+			"packages/react-native-saf-x/android/build": true,
+			"packages/react-native-saf-x/android/wrapper": true,
 			"packages/renderer/**/.vscode/": true,
 			"packages/renderer/**/copyLib.bat": true,
 			"packages/renderer/**/node_modules/": true,
@@ -326,6 +329,7 @@
 			"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": "gulp buildCommandIndex",
+    "buildCommandIndex": "node packages/tools/gulp/tasks/buildCommandIndexRun.js",
     "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": "gulp updateIgnoredTypeScriptBuild",
+    "updateIgnored": "node packages/tools/gulp/tasks/updateIgnoredTypeScriptBuildRun.js",
     "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,22 +64,25 @@
     }
   },
   "devDependencies": {
+    "@joplin/utils": "~2.11",
     "@seiyab/eslint-plugin-react-hooks": "4.5.1-beta.0",
-    "@typescript-eslint/eslint-plugin": "5.47.1",
-    "@typescript-eslint/parser": "5.47.1",
+    "@typescript-eslint/eslint-plugin": "5.48.2",
+    "@typescript-eslint/parser": "5.48.2",
     "cspell": "5.21.2",
-    "eslint": "8.30.0",
+    "eslint": "8.31.0",
     "eslint-interactive": "10.3.0",
-    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-import": "2.27.4",
+    "eslint-plugin-jest": "27.2.1",
     "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-react": "7.31.11",
-    "fs-extra": "11.1.0",
-    "glob": "8.0.3",
+    "eslint-plugin-react": "7.32.0",
+    "execa": "5.1.1",
+    "fs-extra": "11.1.1",
+    "glob": "8.1.0",
     "gulp": "4.0.2",
     "husky": "3.1.0",
     "lerna": "3.22.1",
-    "lint-staged": "13.1.0",
-    "madge": "5.0.1",
+    "lint-staged": "13.2.0",
+    "madge": "6.0.0",
     "npm-package-json-lint": "6.4.0",
     "typedoc": "0.17.8",
     "typescript": "4.9.4"
@@ -88,7 +91,11 @@
     "@types/fs-extra": "9.0.13",
     "http-server": "14.1.1",
     "node-gyp": "9.3.1",
-    "nodemon": "2.0.20"
+    "nodemon": "2.0.22"
   },
-  "packageManager": "yarn@3.3.1"
+  "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"
+  }
 }

packages/app-cli/app/LinkSelector.ts

@@ -6,14 +6,14 @@ interface LinkStoreEntry {
 }
 
 class LinkSelector {
-	noteId_: string;
-	scrollTop_: number;
-	renderedText_: string;
-	currentLinkIndex_: number;
-	linkStore_: LinkStoreEntry[];
-	linkRegex_: RegExp;
+	private noteId_: string;
+	private scrollTop_: number;
+	private renderedText_: string;
+	private currentLinkIndex_: number;
+	private linkStore_: LinkStoreEntry[];
+	private linkRegex_: RegExp;
 
-	constructor() {
+	public constructor() {
 		this.noteId_ = null;
 		this.scrollTop_ = null; // used so 'o' won't open unhighlighted link after scrolling
 		this.renderedText_ = null;
@@ -22,22 +22,22 @@ class LinkSelector {
 		this.linkRegex_ = /http:\/\/[0-9.]+:[0-9]+\/[0-9]+/g;
 	}
 
-	get link(): string | null {
+	public get link(): string | null {
 		if (this.currentLinkIndex_ === null) return null;
 		return this.linkStore_[this.currentLinkIndex_].link;
 	}
 
-	get noteX(): number | null {
+	public get noteX(): number | null {
 		if (this.currentLinkIndex_ === null) return null;
 		return this.linkStore_[this.currentLinkIndex_].noteX;
 	}
 
-	get noteY(): number | null {
+	public get noteY(): number | null {
 		if (this.currentLinkIndex_ === null) return null;
 		return this.linkStore_[this.currentLinkIndex_].noteY;
 	}
 
-	findLinks(renderedText: string): LinkStoreEntry[] {
+	public findLinks(renderedText: string): LinkStoreEntry[] {
 		const newLinkStore: LinkStoreEntry[] = [];
 		const lines: string[] = renderedText.split('\n');
 		for (let i = 0; i < lines.length; i++) {
@@ -56,19 +56,19 @@ class LinkSelector {
 		return newLinkStore;
 	}
 
-	updateText(renderedText: string): void {
+	public updateText(renderedText: string): void {
 		this.currentLinkIndex_ = null;
 		this.renderedText_ = renderedText;
 		this.linkStore_ = this.findLinks(this.renderedText_);
 	}
 
-	updateNote(textWidget: any): void {
+	public updateNote(textWidget: any): void {
 		this.noteId_ = textWidget.noteId;
 		this.scrollTop_ = textWidget.scrollTop_;
 		this.updateText(textWidget.renderedText_);
 	}
 
-	scrollWidget(textWidget: any): void {
+	public scrollWidget(textWidget: any): void {
 		if (this.currentLinkIndex_ === null) return;
 
 		const noteY = this.linkStore_[this.currentLinkIndex_].noteY;
@@ -93,7 +93,7 @@ class LinkSelector {
 		return;
 	}
 
-	changeLink(textWidget: any, offset: number): void | null {
+	public changeLink(textWidget: any, offset: number): void | null {
 		if (textWidget.noteId !== this.noteId_) {
 			this.updateNote(textWidget);
 			this.changeLink(textWidget, offset);
@@ -123,7 +123,7 @@ class LinkSelector {
 		return;
 	}
 
-	openLink(textWidget: any): void {
+	public openLink(textWidget: any): void {
 		if (textWidget.noteId !== this.noteId_) return;
 		if (textWidget.renderedText_ !== this.renderedText_) return;
 		if (textWidget.scrollTop_ !== this.scrollTop_) return;

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/lib/string-utils.js');
+const { splitCommandString } = require('@joplin/utils');
 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,7 +9,8 @@ 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, splitCommandBatch } = require('@joplin/lib/string-utils');
+const { splitCommandString } = require('@joplin/utils');
+const { splitCommandBatch } = require('@joplin/lib/string-utils');
 const { _ } = require('@joplin/lib/locale');
 const fs = require('fs-extra');
 const { cliUtils } = require('./cli-utils.js');
@@ -246,6 +247,7 @@ class Application extends BaseApplication {
 			showConsole: () => {},
 			maximizeConsole: () => {},
 			stdout: text => {
+				// eslint-disable-next-line no-console
 				console.info(text);
 			},
 			fullScreen: () => {},
@@ -407,6 +409,7 @@ class Application extends BaseApplication {
 				if (this.showStackTraces_) {
 					console.error(error);
 				} else {
+					// eslint-disable-next-line no-console
 					console.info(error.message);
 				}
 				process.exit(1);

packages/app-cli/app/autocompletion.js

@@ -125,14 +125,14 @@ async function handleAutocompletionPromise(line) {
 }
 function handleAutocompletion(str, callback) {
 // eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
-	handleAutocompletionPromise(str).then(function(res) {
+	handleAutocompletionPromise(str).then((res) => {
 		callback(undefined, res);
 	});
 }
 function toCommandLine(args) {
 	if (Array.isArray(args)) {
 		return args
-			.map(function(a) {
+			.map((a) => {
 				if (a.indexOf('"') !== -1 || a.indexOf(' ') !== -1) {
 					return `'${a}'`;
 				} else if (a.indexOf('\'') !== -1) {

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

@@ -1,97 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const locale_1 = require("@joplin/lib/locale");
-const registry_js_1 = require("@joplin/lib/registry.js");
-class BaseCommand {
-    constructor() {
-        this.stdout_ = null;
-        this.prompt_ = null;
-    }
-    usage() {
-        throw new Error('Usage not defined');
-    }
-    encryptionCheck(item) {
-        if (item && item.encryption_applied)
-            throw new Error((0, locale_1._)('Cannot change encrypted item'));
-    }
-    description() {
-        throw new Error('Description not defined');
-    }
-    action(_args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('Action not defined');
-        });
-    }
-    compatibleUis() {
-        return ['cli', 'gui'];
-    }
-    supportsUi(ui) {
-        return this.compatibleUis().indexOf(ui) >= 0;
-    }
-    options() {
-        return [];
-    }
-    hidden() {
-        return false;
-    }
-    enabled() {
-        return true;
-    }
-    cancellable() {
-        return false;
-    }
-    cancel() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    name() {
-        const r = this.usage().split(' ');
-        return r[0];
-    }
-    setDispatcher(fn) {
-        this.dispatcher_ = fn;
-    }
-    dispatch(action) {
-        if (!this.dispatcher_)
-            throw new Error('Dispatcher not defined');
-        return this.dispatcher_(action);
-    }
-    setStdout(fn) {
-        this.stdout_ = fn;
-    }
-    stdout(text) {
-        if (this.stdout_)
-            this.stdout_(text);
-    }
-    setPrompt(fn) {
-        this.prompt_ = fn;
-    }
-    prompt(message, options = null) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.prompt_)
-                throw new Error('Prompt is undefined');
-            return yield this.prompt_(message, options);
-        });
-    }
-    metadata() {
-        return {
-            name: this.name(),
-            usage: this.usage(),
-            options: this.options(),
-            hidden: this.hidden(),
-        };
-    }
-    logger() {
-        return registry_js_1.reg.logger();
-    }
-}
-exports.default = BaseCommand;
-//# sourceMappingURL=base-command.js.map

packages/app-cli/app/base-command.ts

@@ -7,80 +7,80 @@ export default class BaseCommand {
 	protected prompt_: any = null;
 	protected dispatcher_: any;
 
-	usage(): string {
+	public usage(): string {
 		throw new Error('Usage not defined');
 	}
 
-	encryptionCheck(item: any) {
+	public encryptionCheck(item: any) {
 		if (item && item.encryption_applied) throw new Error(_('Cannot change encrypted item'));
 	}
 
-	description() {
+	public description() {
 		throw new Error('Description not defined');
 	}
 
-	async action(_args: any) {
+	public async action(_args: any) {
 		throw new Error('Action not defined');
 	}
 
-	compatibleUis() {
+	public compatibleUis() {
 		return ['cli', 'gui'];
 	}
 
-	supportsUi(ui: string) {
+	public supportsUi(ui: string) {
 		return this.compatibleUis().indexOf(ui) >= 0;
 	}
 
-	options(): any[] {
+	public options(): any[] {
 		return [];
 	}
 
-	hidden() {
+	public hidden() {
 		return false;
 	}
 
-	enabled() {
+	public enabled() {
 		return true;
 	}
 
-	cancellable() {
+	public cancellable() {
 		return false;
 	}
 
-	async cancel() {}
+	public async cancel() {}
 
-	name() {
+	public name() {
 		const r = this.usage().split(' ');
 		return r[0];
 	}
 
-	setDispatcher(fn: Function) {
+	public setDispatcher(fn: Function) {
 		this.dispatcher_ = fn;
 	}
 
-	dispatch(action: any) {
+	public dispatch(action: any) {
 		if (!this.dispatcher_) throw new Error('Dispatcher not defined');
 		return this.dispatcher_(action);
 	}
 
-	setStdout(fn: Function) {
+	public setStdout(fn: Function) {
 		this.stdout_ = fn;
 	}
 
-	stdout(text: string) {
+	public stdout(text: string) {
 		if (this.stdout_) this.stdout_(text);
 	}
 
-	setPrompt(fn: Function) {
+	public setPrompt(fn: Function) {
 		this.prompt_ = fn;
 	}
 
-	async prompt(message: string, options: any = null) {
+	public async prompt(message: string, options: any = null) {
 		if (!this.prompt_) throw new Error('Prompt is undefined');
 		return await this.prompt_(message, options);
 	}
 
-	metadata() {
+	public metadata() {
 		return {
 			name: this.name(),
 			usage: this.usage(),
@@ -89,7 +89,7 @@ export default class BaseCommand {
 		};
 	}
 
-	logger() {
+	public logger() {
 		return reg.logger();
 	}
 }

packages/app-cli/app/build-doc.js

@@ -131,6 +131,7 @@ async function main() {
 	const commandsText = commandBlocks.join('\n\n');
 	const footerText = getFooter();
 
+	// eslint-disable-next-line no-console
 	console.info(`${headerText}\n\n` + 'USAGE' + `\n\n${commandsText}\n\n${footerText}`);
 }
 

packages/app-cli/app/cli-integration-tests.js

@@ -1,5 +1,7 @@
 'use strict';
 
+/* eslint-disable no-console */
+
 const fs = require('fs-extra');
 const Logger = require('@joplin/lib/Logger').default;
 const { dirname } = require('@joplin/lib/path-utils');

packages/app-cli/app/cli-utils.js

@@ -82,6 +82,7 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
 	const options = cmd.options();
 	const booleanFlags = [];
 	const aliases = {};
+	const flagSpecs = [];
 	for (let i = 0; i < options.length; i++) {
 		if (options[i].length !== 2) throw new Error(`Invalid options: ${options[i]}`);
 		let flags = options[i][0];
@@ -96,6 +97,8 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
 		if (flags.short && flags.long) {
 			aliases[flags.long] = [flags.short];
 		}
+
+		flagSpecs.push(flags);
 	}
 
 	const args = yargParser(argv, {
@@ -121,6 +124,19 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
 		argOptions[key] = args[key];
 	}
 
+	for (const [key, value] of Object.entries(argOptions)) {
+		const flagSpec = flagSpecs.find(s => {
+			return s.short === key || s.long === key;
+		});
+		if (flagSpec?.arg?.required) {
+			// If a flag is required, and no value is provided for it, Yargs
+			// sets the value to `true`.
+			if (value === true) {
+				throw new Error(_('Missing required flag value: %s', `-${flagSpec.short} <${flagSpec.arg.name}>`));
+			}
+		}
+	}
+
 	output.options = argOptions;
 
 	return output;

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

@@ -39,9 +39,9 @@ class Command extends BaseCommand {
 				let settingsObj;
 				try {
 					settingsObj = JSON.parse(json);
-				} catch (err) {
+				} catch (error) {
 					isSettled = true;
-					return reject(new Error(`Invalid JSON passed to config --import: \n${err.message}.`));
+					return reject(new Error(`Invalid JSON passed to config --import: \n${error.message}.`));
 				}
 				if (settingsObj) {
 					Object.entries(settingsObj)

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

@@ -12,15 +12,15 @@ const imageType = require('image-type');
 const readChunk = require('read-chunk');
 
 class Command extends BaseCommand {
-	usage() {
+	public usage() {
 		return 'e2ee <command> [path]';
 	}
 
-	description() {
+	public description() {
 		return _('Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, `status`, `decrypt-file`, and `target-status`.'); // `generate-ppk`
 	}
 
-	options() {
+	public options() {
 		return [
 			// This is here mostly for testing - shouldn't be used
 			['-p, --password <password>', 'Use this password as master password (For security reasons, it is not recommended to use this option).'],
@@ -30,7 +30,7 @@ class Command extends BaseCommand {
 		];
 	}
 
-	async action(args: any) {
+	public async action(args: any) {
 		const options = args.options;
 
 		const askForMasterKey = async (error: any) => {

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/lib/string-utils.js');
+const { splitCommandString } = require('@joplin/utils');
 const uuid = require('@joplin/lib/uuid').default;
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');

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

@@ -1,21 +0,0 @@
-const BaseCommand = require('./base-command').default;
-const { app } = require('./app.js');
-const { _ } = require('@joplin/lib/locale');
-const Folder = require('@joplin/lib/models/Folder').default;
-
-class Command extends BaseCommand {
-	usage() {
-		return 'mkbook <new-notebook>';
-	}
-
-	description() {
-		return _('Creates a new notebook.');
-	}
-
-	async action(args) {
-		const folder = await Folder.save({ title: args['new-notebook'] }, { userSideValidation: true });
-		app().switchCurrentFolder(folder);
-	}
-}
-
-module.exports = Command;

packages/app-cli/app/command-mkbook.test.ts

@@ -0,0 +1,50 @@
+import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
+import { setupCommandForTesting, setupApplication } from './utils/testUtils';
+import Folder from '@joplin/lib/models/Folder';
+const Command = require('./command-mkbook');
+
+
+describe('command-mkbook', () => {
+
+	beforeEach(async () => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		await setupApplication();
+	});
+
+
+	it('should create a subfolder in first folder', async () => {
+		const command = setupCommandForTesting(Command);
+		await command.action({ 'new-notebook': 'folder1', options: {} });
+		await command.action({ 'new-notebook': 'folder1_1', options: { parent: 'folder1' } });
+
+		const folder1 = await Folder.loadByTitle('folder1');
+		const folder1_1 = await Folder.loadByTitle('folder1_1');
+
+		expect(folder1.title).toBe('folder1');
+		expect(folder1_1.parent_id).toBe(folder1.id);
+	});
+
+	it('should not be possible to create a subfolder without an argument.', async () => {
+		const command = setupCommandForTesting(Command);
+		await command.action({ 'new-notebook': 'folder2', options: {} });
+		await expect(command.action({ 'new-notebook': 'folder2_1', options: { parent: true } })).rejects.toThrowError();
+	});
+
+	it('should not be possible to create subfolder in ambiguous destination folder', async () => {
+		const command = setupCommandForTesting(Command);
+		await command.action({ 'new-notebook': 'folder3', options: {} });
+		await command.action({ 'new-notebook': 'folder3', options: {} });	// ambiguous folder
+		await expect(command.action({ 'new-notebook': 'folder3_1', options: { parent: 'folder3' } })).rejects.toThrowError();
+
+		// check if duplicate entries have been created.
+		const folderAll = await Folder.all();
+		const folders3 = folderAll.filter(x => x.title === 'folder3');
+		expect(folders3.length).toBe(2);
+
+		// check if something has been created in one of the duplicate entries.
+		expect(await Folder.childrenIds(folders3[0].id)).toEqual([]);
+		expect(await Folder.childrenIds(folders3[1].id)).toEqual([]);
+	});
+});
+

packages/app-cli/app/command-mkbook.ts

@@ -0,0 +1,65 @@
+const BaseCommand = require('./base-command').default;
+const { app } = require('./app.js');
+import { _ } from '@joplin/lib/locale';
+import BaseModel from '@joplin/lib/BaseModel';
+import Folder from '@joplin/lib/models/Folder';
+import { FolderEntity } from '@joplin/lib/services/database/types';
+
+class Command extends BaseCommand {
+	public usage() {
+		return 'mkbook <new-notebook>';
+	}
+
+	public description() {
+		return _('Creates a new notebook.');
+	}
+
+	public options() {
+		return [
+			['-p, --parent <parent-notebook>', _('Create a new notebook under a parent notebook.')],
+		];
+	}
+
+	// validDestinationFolder check for presents and ambiguous folders
+	public async validDestinationFolder(targetFolder: string) {
+
+		const destinationFolder = await app().loadItem(BaseModel.TYPE_FOLDER, targetFolder);
+		if (!destinationFolder) {
+			throw new Error(_('Cannot find: "%s"', targetFolder));
+		}
+
+		const destinationDups = await Folder.search({ titlePattern: targetFolder, limit: 2 });
+		if (destinationDups.length > 1) {
+			throw new Error(_('Ambiguous notebook "%s". Please use short notebook id instead - press "ti" to see the short notebook id', targetFolder));
+		}
+
+		return destinationFolder;
+	}
+
+	public async saveAndSwitchFolder(newFolder: FolderEntity) {
+
+		const folder = await Folder.save(newFolder, { userSideValidation: true });
+		app().switchCurrentFolder(folder);
+
+	}
+
+	public async action(args: any) {
+		const targetFolder = args.options.parent;
+
+		const newFolder: FolderEntity = {
+			title: args['new-notebook'],
+		};
+
+		if (targetFolder) {
+
+			const destinationFolder = await this.validDestinationFolder(targetFolder);
+			newFolder.parent_id = destinationFolder.id;
+			await this.saveAndSwitchFolder(newFolder);
+
+		} else {
+			await this.saveAndSwitchFolder(newFolder);
+		}
+	}
+}
+
+module.exports = Command;

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

@@ -26,7 +26,7 @@ class Command extends BaseCommand {
 
 		const destinationDuplicates = await Folder.search({ titlePattern: destination, limit: 2 });
 		if (destinationDuplicates.length > 1) {
-			throw new Error(_('Ambiguous notebook "%s". Please use short notebook id instead - press "ti" to see the short notebook id' , destination));
+			throw new Error(_('Ambiguous notebook "%s". Please use short notebook id instead - press "ti" to see the short notebook id', destination));
 		}
 
 		const itemFolder = await app().loadItem(BaseModel.TYPE_FOLDER, pattern);

packages/app-cli/app/command-settingschema.ts

@@ -23,19 +23,19 @@ function settingTypeToSchemaType(type: SettingItemType): string {
 }
 
 class Command extends BaseCommand {
-	usage() {
+	public usage() {
 		return 'settingschema <file>';
 	}
 
-	description() {
+	public description() {
 		return 'Build the setting schema file';
 	}
 
-	enabled() {
+	public enabled() {
 		return false;
 	}
 
-	async action(args: any) {
+	public async action(args: any) {
 		const schema: Record<string, any> = {
 			title: 'JSON schema for Joplin setting files',
 			'$id': Setting.schemaUrl,

packages/app-cli/app/command-sync.ts

@@ -9,11 +9,11 @@ import { appTypeToLockType } from '@joplin/lib/services/synchronizer/LockHandler
 const BaseCommand = require('./base-command').default;
 const { app } = require('./app.js');
 const { OneDriveApiNodeUtils } = require('@joplin/lib/onedrive-api-node-utils.js');
-const { reg } = require('@joplin/lib/registry.js');
+import { reg } from '@joplin/lib/registry';
 const { cliUtils } = require('./cli-utils.js');
 const md5 = require('md5');
-const locker = require('proper-lockfile');
-const fs = require('fs-extra');
+import * as locker from 'proper-lockfile';
+import { pathExists, writeFile } from 'fs-extra';
 
 class Command extends BaseCommand {
 
@@ -21,15 +21,15 @@ class Command extends BaseCommand {
 	private releaseLockFn_: Function = null;
 	private oneDriveApiUtils_: any = null;
 
-	usage() {
+	public usage() {
 		return 'sync';
 	}
 
-	description() {
+	public description() {
 		return _('Synchronises with remote storage.');
 	}
 
-	options() {
+	public options() {
 		return [
 			['--target <target>', _('Sync to provided target (defaults to sync.target config value)')],
 			['--upgrade', _('Upgrade the sync target to the latest version.')],
@@ -37,24 +37,15 @@ class Command extends BaseCommand {
 		];
 	}
 
-	static async lockFile(filePath: string): Promise<Function> {
+	private static async lockFile(filePath: string) {
 		return locker.lock(filePath, { stale: 1000 * 60 * 5 });
 	}
 
-	static isLocked(filePath: string) {
-		return new Promise((resolve, reject) => {
-			locker.check(filePath, (error: any, isLocked: boolean) => {
-				if (error) {
-					reject(error);
-					return;
-				}
-
-				resolve(isLocked);
-			});
-		});
+	private static async isLocked(filePath: string) {
+		return locker.check(filePath);
 	}
 
-	async doAuth() {
+	public async doAuth() {
 		const syncTarget = reg.syncTarget(this.syncTargetId_);
 		const syncTargetMd = SyncTargetRegistry.idToMetadata(this.syncTargetId_);
 
@@ -98,23 +89,23 @@ class Command extends BaseCommand {
 		return false;
 	}
 
-	cancelAuth() {
+	public cancelAuth() {
 		if (this.oneDriveApiUtils_) {
 			this.oneDriveApiUtils_.cancelOAuthDance();
 			return;
 		}
 	}
 
-	doingAuth() {
+	public doingAuth() {
 		return !!this.oneDriveApiUtils_;
 	}
 
-	async action(args: any) {
+	public async action(args: any) {
 		this.releaseLockFn_ = null;
 
 		// Lock is unique per profile/database
 		const lockFilePath = `${require('os').tmpdir()}/synclock_${md5(escape(Setting.value('profileDir')))}`; // https://github.com/pvorb/node-md5/issues/41
-		if (!(await fs.pathExists(lockFilePath))) await fs.writeFile(lockFilePath, 'synclock');
+		if (!(await pathExists(lockFilePath))) await writeFile(lockFilePath, 'synclock');
 
 		const useLock = args.options.useLock !== 0;
 
@@ -247,7 +238,7 @@ class Command extends BaseCommand {
 		cleanUp();
 	}
 
-	async cancel() {
+	public async cancel() {
 		if (this.doingAuth()) {
 			this.cancelAuth();
 			return;
@@ -272,7 +263,7 @@ class Command extends BaseCommand {
 		this.syncTargetId_ = null;
 	}
 
-	cancellable() {
+	public cancellable() {
 		return true;
 	}
 }

packages/app-cli/app/command-testing.ts

@@ -18,19 +18,19 @@ function itemCount(args: any) {
 }
 
 class Command extends BaseCommand {
-	usage() {
+	public usage() {
 		return 'testing <command> [arg0]';
 	}
 
-	description() {
+	public description() {
 		return 'testing';
 	}
 
-	enabled() {
+	public enabled() {
 		return false;
 	}
 
-	options(): any[] {
+	public options(): any[] {
 		return [
 			['--folder-count <count>', 'Folders to create'],
 			['--note-count <count>', 'Notes to create'],
@@ -40,7 +40,7 @@ class Command extends BaseCommand {
 		];
 	}
 
-	async action(args: any) {
+	public async action(args: any) {
 		const { command, options } = args;
 
 		if (command === 'populate') {
@@ -118,6 +118,7 @@ class Command extends BaseCommand {
 			}
 			await Promise.all(promises);
 
+			// eslint-disable-next-line no-console
 			console.info(await api.exec('GET', 'api/items/root:/testing:'));
 		}
 

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

@@ -12,7 +12,7 @@ class Command extends BaseCommand {
 	}
 
 	async action() {
-		this.stdout(versionInfo(require('./package.json')).message);
+		this.stdout(versionInfo(require('./package.json'), {}).message);
 	}
 }
 

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

@@ -36,7 +36,7 @@ class FolderListWidget extends ListWidget {
 				if (Setting.value('showNoteCounts')) {
 					let noteCount = item.note_count;
 					// Subtract children note_count from parent folder.
-					if (this.folderHasChildren_(this.folders,item.id)) {
+					if (this.folderHasChildren_(this.folders, item.id)) {
 						for (let i = 0; i < this.folders.length; i++) {
 							if (this.folders[i].parent_id === item.id) {
 								noteCount -= this.folders[i].note_count;

packages/app-cli/app/gui/StatusBarWidget.ts

@@ -5,7 +5,7 @@ const stripAnsi = require('strip-ansi');
 const { handleAutocompletion } = require('../autocompletion.js');
 
 export default class StatusBarWidget extends BaseWidget {
-	constructor() {
+	public constructor() {
 		super();
 
 		this.promptState_ = null;
@@ -14,20 +14,20 @@ export default class StatusBarWidget extends BaseWidget {
 		this.items_ = [];
 	}
 
-	get name() {
+	public get name() {
 		return 'statusBar';
 	}
 
-	get canHaveFocus() {
+	public get canHaveFocus() {
 		return false;
 	}
 
-	setItemAt(index: number, text: string) {
+	public setItemAt(index: number, text: string) {
 		this.items_[index] = stripAnsi(text).trim();
 		this.invalidate();
 	}
 
-	async prompt(initialText = '', promptString: any = null, options: any = null) {
+	public async prompt(initialText = '', promptString: any = null, options: any = null) {
 		if (this.promptState_) throw new Error('Another prompt already active');
 		if (promptString === null) promptString = ':';
 		if (options === null) options = {};
@@ -53,15 +53,15 @@ export default class StatusBarWidget extends BaseWidget {
 		return this.promptState_.promise;
 	}
 
-	get promptActive() {
+	public get promptActive() {
 		return !!this.promptState_;
 	}
 
-	get history() {
+	public get history() {
 		return this.history_;
 	}
 
-	resetCursor() {
+	public resetCursor() {
 		if (!this.promptActive) return;
 		if (!this.inputEventEmitter_) return;
 
@@ -70,7 +70,7 @@ export default class StatusBarWidget extends BaseWidget {
 		this.term.moveTo(this.absoluteInnerX + termutils.textLength(this.promptState_.promptString) + this.inputEventEmitter_.getInput().length, this.absoluteInnerY);
 	}
 
-	render() {
+	public render() {
 		super.render();
 
 		const doSaveCursor = !this.promptActive;

packages/app-cli/app/main.js

@@ -75,14 +75,14 @@ if (process.platform === 'win32') {
 		output: process.stdout,
 	});
 
-	rl.on('SIGINT', function() {
+	rl.on('SIGINT', () => {
 		process.emit('SIGINT');
 	});
 }
 
-process.stdout.on('error', function(err) {
+process.stdout.on('error', (error) => {
 	// https://stackoverflow.com/questions/12329816/error-write-epipe-when-piping-node-output-to-head#15884508
-	if (err.code === 'EPIPE') {
+	if (error.code === 'EPIPE') {
 		process.exit(0);
 	}
 });

packages/app-cli/app/services/plugins/PluginRunner.ts

@@ -11,6 +11,7 @@ function createConsoleWrapper(pluginId: string) {
 	const wrapper: any = {};
 
 	for (const n in console) {
+		// eslint-disable-next-line no-console
 		if (!console.hasOwnProperty(n)) continue;
 		wrapper[n] = (...args: any[]) => {
 			const newArgs = args.slice();
@@ -34,7 +35,7 @@ export default class PluginRunner extends BasePluginRunner {
 	private eventHandlers_: EventHandlers = {};
 	private activeSandboxCalls_: any = {};
 
-	constructor() {
+	public constructor() {
 		super();
 
 		this.eventHandler = this.eventHandler.bind(this);
@@ -63,7 +64,7 @@ export default class PluginRunner extends BasePluginRunner {
 		};
 	}
 
-	async run(plugin: Plugin, sandbox: Global): Promise<void> {
+	public async run(plugin: Plugin, sandbox: Global): Promise<void> {
 		return new Promise((resolve: Function, reject: Function) => {
 			const onStarted = () => {
 				plugin.off('started', onStarted);

packages/app-cli/package.json

@@ -30,34 +30,36 @@
       2019,
       2020,
       2021,
-      2022
+      2022,
+      2023
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "2.10.0",
+  "version": "2.11.0",
   "bin": "./main.js",
   "engines": {
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@joplin/lib": "~2.10",
-    "@joplin/renderer": "~2.10",
-    "aws-sdk": "2.1285.0",
+    "@joplin/lib": "~2.11",
+    "@joplin/renderer": "~2.11",
+    "@joplin/utils": "~2.11",
+    "aws-sdk": "2.1290.0",
     "chalk": "4.1.2",
     "compare-version": "0.1.2",
-    "fs-extra": "11.1.0",
+    "fs-extra": "11.1.1",
     "html-entities": "1.4.0",
     "image-type": "3.1.0",
     "keytar": "7.9.0",
     "md5": "2.3.0",
     "node-rsa": "1.1.1",
-    "open": "8.4.0",
+    "open": "8.4.2",
     "proper-lockfile": "4.1.2",
     "read-chunk": "2.1.0",
     "server-destroy": "1.0.1",
     "sharp": "0.31.3",
     "sprintf-js": "1.1.2",
-    "sqlite3": "5.1.4",
+    "sqlite3": "5.1.6",
     "string-padding": "1.0.2",
     "strip-ansi": "6.0.1",
     "tcp-port-used": "1.0.2",
@@ -68,12 +70,13 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@joplin/tools": "~2.10",
+    "@joplin/tools": "~2.11",
     "@types/fs-extra": "9.0.13",
-    "@types/jest": "29.2.4",
+    "@types/jest": "29.2.6",
     "@types/node": "18.11.18",
+    "@types/proper-lockfile": "^4.1.2",
     "gulp": "4.0.2",
-    "jest": "29.3.1",
+    "jest": "29.4.3",
     "temp": "0.9.4",
     "typescript": "4.9.4"
   }

packages/app-cli/tests/HtmlToHtml.js

@@ -12,7 +12,7 @@ const shim = require('@joplin/lib/shim').default;
 const HtmlToHtml = require('@joplin/renderer/HtmlToHtml').default;
 const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js');
 
-describe('HtmlToHtml', function() {
+describe('HtmlToHtml', () => {
 
 	beforeEach(async () => {
 		await setupDatabaseAndSynchronizer(1);
@@ -49,6 +49,7 @@ describe('HtmlToHtml', function() {
 			}
 
 			if (actualHtml !== expectedHtml) {
+				/* eslint-disable no-console */
 				console.info('');
 				console.info(`Error converting file: ${htmlSourceFilename}`);
 				console.info('--------------------------------- Got:');
@@ -59,6 +60,7 @@ describe('HtmlToHtml', function() {
 				console.info(expectedHtml.split('\n'));
 				console.info('--------------------------------------------');
 				console.info('');
+				/* eslint-enable */
 
 				expect(false).toBe(true);
 				// return;

packages/app-cli/tests/HtmlToMd.ts

@@ -3,7 +3,7 @@ const os = require('os');
 const { filename } = require('@joplin/lib/path-utils');
 import HtmlToMd from '@joplin/lib/HtmlToMd';
 
-describe('HtmlToMd', function() {
+describe('HtmlToMd', () => {
 
 	it('should convert from Html to Markdown', (async () => {
 		const basePath = `${__dirname}/html_to_md`;
@@ -57,6 +57,7 @@ describe('HtmlToMd', function() {
 				result.push('--------------------------------------------');
 				result.push('');
 
+				// eslint-disable-next-line no-console
 				console.info(result.join('\n'));
 
 				// console.info('');

packages/app-cli/tests/MarkupToHtml.js

@@ -1,7 +1,7 @@
 
 const MarkupToHtml = require('@joplin/renderer/MarkupToHtml').default;
 
-describe('MarkupToHtml', function() {
+describe('MarkupToHtml', () => {
 
 	it('should strip markup', (async () => {
 		const service = new MarkupToHtml();

packages/app-cli/tests/MdToHtml.ts

@@ -16,7 +16,7 @@ function newTestMdToHtml(options: any = null) {
 	return new MdToHtml(options);
 }
 
-describe('MdToHtml', function() {
+describe('MdToHtml', () => {
 
 	beforeEach(async () => {
 		await setupDatabaseAndSynchronizer(1);
@@ -72,6 +72,7 @@ describe('MdToHtml', function() {
 					'',
 				];
 
+				// eslint-disable-next-line no-console
 				console.info(msg.join('\n'));
 
 				expect(false).toBe(true);

packages/app-cli/tests/feature_NoteHistory.js

@@ -22,7 +22,7 @@ const goToNote = (testApp, note) => {
 	testApp.dispatch({ type: 'NOTE_SELECT', id: note.id });
 };
 
-describe('feature_NoteHistory', function() {
+describe('feature_NoteHistory', () => {
 	beforeEach(async () => {
 		testApp = new TestApp();
 		await testApp.start(['--no-welcome']);

packages/app-cli/tests/feature_NoteList.js

@@ -8,7 +8,7 @@ const time = require('@joplin/lib/time').default;
 
 let testApp = null;
 
-describe('integration_NoteList', function() {
+describe('integration_NoteList', () => {
 
 	beforeEach(async () => {
 		testApp = new TestApp();

packages/app-cli/tests/feature_ShowAllNotes.js

@@ -22,7 +22,7 @@ const { ALL_NOTES_FILTER_ID } = require('@joplin/lib/reserved-ids.js');
 
 let testApp = null;
 
-describe('integration_ShowAllNotes', function() {
+describe('integration_ShowAllNotes', () => {
 
 	beforeEach(async () => {
 		testApp = new TestApp();

packages/app-cli/tests/feature_TagList.js

@@ -8,7 +8,7 @@ const time = require('@joplin/lib/time').default;
 
 let testApp = null;
 
-describe('integration_TagList', function() {
+describe('integration_TagList', () => {
 
 	beforeEach(async () => {
 		testApp = new TestApp();

packages/app-cli/tests/services/keychain/KeychainService.ts

@@ -1,3 +1,5 @@
+/* eslint-disable jest/require-top-level-describe */
+
 import KeychainService from '@joplin/lib/services/keychain/KeychainService';
 import shim from '@joplin/lib/shim';
 import Setting from '@joplin/lib/models/Setting';
@@ -11,7 +13,7 @@ function describeIfCompatible(name: string, fn: any, elseFn: any) {
 	}
 }
 
-describeIfCompatible('services_KeychainService', function() {
+describeIfCompatible('services_KeychainService', () => {
 
 	beforeEach(async () => {
 		await setupDatabaseAndSynchronizer(1, { keychainEnabled: true });

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

@@ -29,7 +29,7 @@ function newPluginService(appVersion: string = '1.4') {
 	return service;
 }
 
-describe('services_PluginService', function() {
+describe('services_PluginService', () => {
 
 	beforeEach(async () => {
 		await setupDatabaseAndSynchronizer(1);

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

@@ -8,7 +8,7 @@ async function newRepoApi(): Promise<RepositoryApi> {
 	return repo;
 }
 
-describe('services_plugins_RepositoryApi', function() {
+describe('services_plugins_RepositoryApi', () => {
 
 	beforeEach(async () => {
 		await setupDatabaseAndSynchronizer(1);
@@ -47,9 +47,11 @@ describe('services_plugins_RepositoryApi', function() {
 
 	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')).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);
+
+		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);
 	}));
 
 });

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

@@ -24,7 +24,7 @@ function newPluginService(appVersion: string = '1.4') {
 	return service;
 }
 
-describe('defaultPluginsUtils', function() {
+describe('defaultPluginsUtils', () => {
 
 	const pluginsId = ['joplin.plugin.ambrt.backlinksToNote', 'org.joplinapp.plugins.ToggleSidebars'];
 

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

@@ -1,7 +1,7 @@
 const sandboxProxy = require('@joplin/lib/services/plugins/sandboxProxy');
 import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
 
-describe('services_plugins_sandboxProxy', function() {
+describe('services_plugins_sandboxProxy', () => {
 
 	beforeEach(async () => {
 		await setupDatabaseAndSynchronizer(1);

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

@@ -13,17 +13,14 @@ import JoplinWindow from './JoplinWindow';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
- * **This is a beta API**
+ * The API is now relatively stable and in general maintaining backward compatibility is a top priority, so you shouldn't except much breakages.
  *
- * Please note that the plugin API is relatively new and should be considered Beta state. Besides possible bugs, what it means is that there might be necessary breaking changes from one version to the next. Whenever such change is needed, best effort will be done to:
+ * If a breaking change ever becomes needed, best effort will be done to:
  *
- * - Maintain backward compatibility;
- * - When possible, deprecate features instead of removing them;
+ * - Deprecate features instead of removing them, so as to give you time to fix the issue;
  * - Document breaking changes in the changelog;
  *
- * So if you are developing a plugin, please keep an eye on the changelog as everything will be in there with information about how to update your code. There won't be any major API rewrite or architecture changes, but possibly small tweaks like function signature change, type change, etc.
- *
- * Eventually, the plugin API will be versioned to make this process smoother.
+ * So if you are developing a plugin, please keep an eye on the changelog as everything will be in there with information about how to update your code.
  */
 export default class Joplin {
     private data_;

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

@@ -15,7 +15,7 @@ import { Command } from './types';
  *
  * * [Main screen commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/MainScreen/commands)
  * * [Global commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/commands)
- * * [Editor commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.ts)
+ * * [Editor commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts)
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
@@ -49,7 +49,7 @@ import { Command } from './types';
  *
  */
 export default class JoplinCommands {
-	/**
+    /**
      * <span class="platform-desktop">desktop</span> Executes the given
      * command.
      *
@@ -68,8 +68,8 @@ export default class JoplinCommands {
      * await joplin.commands.execute('newFolder', "SOME_FOLDER_ID");
      * ```
      */
-	execute(commandName: string, ...args: any[]): Promise<any | void>;
-	/**
+    execute(commandName: string, ...args: any[]): Promise<any | void>;
+    /**
      * <span class="platform-desktop">desktop</span> Registers a new command.
      *
      * ```typescript
@@ -85,5 +85,5 @@ export default class JoplinCommands {
      * });
      * ```
      */
-	register(command: Command): Promise<void>;
+    register(command: Command): Promise<void>;
 }

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

@@ -1,3 +1,4 @@
+import { ModelType } from '../../../BaseModel';
 import { Path } from './types';
 /**
  * This module provides access to the Joplin data API: https://joplinapp.org/api/references/rest_api/
@@ -44,4 +45,6 @@ export default class JoplinData {
     post(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
     put(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
     delete(path: Path, query?: any): Promise<any>;
+    itemType(itemId: string): Promise<ModelType>;
+    resourcePath(resourceId: string): Promise<string>;
 }

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

@@ -5,6 +5,6 @@
  * so for now disable filters.
  */
 export default class JoplinFilters {
-	on(name: string, callback: Function): Promise<void>;
-	off(name: string, callback: Function): Promise<void>;
+    on(name: string, callback: Function): Promise<void>;
+    off(name: string, callback: Function): Promise<void>;
 }

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

@@ -12,6 +12,6 @@ import { ExportModule, ImportModule } from './types';
  * You may also want to refer to the Joplin API documentation to see the list of properties for each item (note, notebook, etc.) - https://joplinapp.org/api/references/rest_api/
  */
 export default class JoplinInterop {
-	registerExportModule(module: ExportModule): Promise<void>;
-	registerImportModule(module: ImportModule): Promise<void>;
+    registerExportModule(module: ExportModule): Promise<void>;
+    registerImportModule(module: ImportModule): Promise<void>;
 }

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

@@ -6,7 +6,7 @@ export interface ChangeEvent {
      */
     keys: string[];
 }
-export declare type ChangeHandler = (event: ChangeEvent)=> void;
+export declare type ChangeHandler = (event: ChangeEvent) => void;
 /**
  * This API allows registering new settings and setting sections, as well as getting and setting settings. Once a setting has been registered it will appear in the config screen and be editable by the user.
  *

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

@@ -61,8 +61,7 @@ export default class JoplinViewsDialogs {
     open(handle: ViewHandle): Promise<DialogResult>;
     /**
      * Toggle on whether to fit the dialog size to the content or not.
-     * When set to false, the dialog stretches to fill the application
-     * window.
+     * When set to false, the dialog is set to 90vw and 80vh
      * @default true
      */
     setFitToContent(handle: ViewHandle, status: boolean): Promise<boolean>;

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

@@ -46,6 +46,23 @@ export default class JoplinViewsPanels {
      *
      */
     onMessage(handle: ViewHandle, callback: Function): Promise<void>;
+    /**
+     * Sends a message to the webview.
+     *
+     * The webview must have registered a message handler prior, otherwise the message is ignored. Use;
+     *
+     * ```javascript
+     * webviewApi.onMessage((message) => { ... });
+     * ```
+     *
+     *  - `message` can be any JavaScript object, string or number
+     *
+     * The view API may have only one onMessage handler defined.
+     * This method is fire and forget so no response is returned.
+     *
+     * It is particularly useful when the webview needs to react to events emitted by the plugin or the joplin api.
+     */
+    postMessage(handle: ViewHandle, message: any): void;
     /**
      * Shows the panel
      */

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

@@ -1,9 +1,13 @@
 import { FolderEntity } from '../../database/types';
-import { Disposable } from './types';
+import { Disposable, MenuItem } from './types';
+export interface EditContextMenuFilterObject {
+    items: MenuItem[];
+}
+declare type FilterHandler<T> = (object: T) => Promise<void>;
 declare enum ItemChangeEventType {
     Create = 1,
     Update = 2,
-    Delete = 3,
+    Delete = 3
 }
 interface ItemChangeEvent {
     id: string;
@@ -12,8 +16,12 @@ interface ItemChangeEvent {
 interface SyncStartEvent {
     withErrors: boolean;
 }
-declare type ItemChangeHandler = (event: ItemChangeEvent)=> void;
-declare type SyncStartHandler = (event: SyncStartEvent)=> void;
+interface ResourceChangeEvent {
+    id: string;
+}
+declare type ItemChangeHandler = (event: ItemChangeEvent) => void;
+declare type SyncStartHandler = (event: SyncStartEvent) => void;
+declare type ResourceChangeHandler = (event: ResourceChangeEvent) => void;
 /**
  * The workspace service provides access to all the parts of Joplin that
  * are being worked on - i.e. the currently selected notes or notebooks as
@@ -38,6 +46,11 @@ export default class JoplinWorkspace {
      * Called when the content of the current note changes.
      */
     onNoteChange(handler: ItemChangeHandler): Promise<Disposable>;
+    /**
+     * Called when a resource is changed. Currently this handled will not be
+     * called when a resource is added or deleted.
+     */
+    onResourceChange(handler: ResourceChangeHandler): Promise<void>;
     /**
      * Called when an alarm associated with a to-do is triggered.
      */
@@ -50,6 +63,11 @@ export default class JoplinWorkspace {
      * Called when the synchronisation process has finished.
      */
     onSyncComplete(callback: Function): Promise<Disposable>;
+    /**
+     * Called just before the editor context menu is about to open. Allows
+     * adding items to it.
+     */
+    filterEditorContextMenu(handler: FilterHandler<EditContextMenuFilterObject>): void;
     /**
      * Gets the currently selected note
      */

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

@@ -202,6 +202,25 @@ export interface Disposable {
 	// dispose():void;
 }
 
+export enum ModelType {
+	Note = 1,
+	Folder = 2,
+	Setting = 3,
+	Resource = 4,
+	Tag = 5,
+	NoteTag = 6,
+	Search = 7,
+	Alarm = 8,
+	MasterKey = 9,
+	ItemChange = 10,
+	NoteResource = 11,
+	ResourceLocalState = 12,
+	Revision = 13,
+	Migration = 14,
+	SmartFilter = 15,
+	Command = 16,
+}
+
 // =================================================================
 // Menu types
 // =================================================================
@@ -269,6 +288,17 @@ export interface MenuItem {
 	 */
 	commandName?: string;
 
+	/**
+	 * Arguments that should be passed to the command. They will be as rest
+	 * parameters.
+	 */
+	commandArgs?: any[];
+
+	/**
+	 * Set to "separator" to create a divider line
+	 */
+	type?: ('normal' | 'separator' | 'submenu' | 'checkbox' | 'radio');
+
 	/**
 	 * Accelerator associated with the menu item
 	 */
@@ -334,6 +364,12 @@ export enum SettingItemType {
 	Button = 6,
 }
 
+export enum SettingItemSubType {
+	FilePathAndArgs = 'file_path_and_args',
+	FilePath = 'file_path', // Not supported on mobile!
+	DirectoryPath = 'directory_path', // Not supported on mobile!
+}
+
 export enum AppType {
 	Desktop = 'desktop',
 	Mobile = 'mobile',
@@ -351,6 +387,12 @@ export interface SettingItem {
 	value: any;
 	type: SettingItemType;
 
+	/**
+	 * Currently only used to display a file or directory selector. Always set
+	 * `type` to `SettingItemType.String` when using this property.
+	 */
+	subType?: SettingItemSubType;
+
 	label: string;
 	description?: string;
 

packages/app-cli/tests/support/plugins/codemirror_content_script/package.json

@@ -14,15 +14,18 @@
   "devDependencies": {
     "@types/node": "^14.0.14",
     "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "9.1.0",
-    "glob": "7.2.0",
+    "fs-extra": "^9.0.1",
+    "glob": "^7.1.6",
     "on-build-webpack": "^0.1.0",
-    "tar": "6.1.11",
+    "tar": "^6.0.5",
     "ts-loader": "^7.0.5",
     "typescript": "^3.9.3",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11",
-    "chalk": "4.1.2",
-    "yargs": "16.2.0"
-  }
-}
+    "chalk": "^4.1.0",
+    "yargs": "^16.2.0"
+  },
+  "files": [
+    "publish"
+  ]
+}

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

@@ -29,6 +29,7 @@ const userConfig = Object.assign({}, {
 
 const manifestPath = `${srcDir}/manifest.json`;
 const packageJsonPath = `${rootDir}/package.json`;
+const allPossibleCategories = ['appearance', 'developer tools', 'productivity', 'themes', 'integrations', 'viewer', 'search', 'tags', 'editor', 'files', 'personal knowledge management'];
 const manifest = readManifest(manifestPath);
 const pluginArchiveFilePath = path.resolve(publishDir, `${manifest.id}.jpl`);
 const pluginInfoFilePath = path.resolve(publishDir, `${manifest.id}.json`);
@@ -67,10 +68,19 @@ function currentGitInfo() {
 	}
 }
 
+function validateCategories(categories) {
+	if (!categories) return null;
+	if ((categories.length !== new Set(categories).size)) throw new Error('Repeated categories are not allowed');
+	categories.forEach(category => {
+		if (!allPossibleCategories.includes(category)) throw new Error(`${category} is not a valid category. Please make sure that the category name is lowercase. Valid Categories are: \n${allPossibleCategories}\n`);
+	});
+}
+
 function readManifest(manifestPath) {
 	const content = fs.readFileSync(manifestPath, 'utf8');
 	const output = JSON.parse(content);
 	if (!output.id) throw new Error(`Manifest plugin ID is not set in ${manifestPath}`);
+	validateCategories(output.categories);
 	return output;
 }
 
@@ -137,7 +147,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		},
 		// JSON files can also be required from scripts so we include this.
 		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.js', '.tsx', '.ts', '.json'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +179,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.js', '.tsx', '.ts', '.json'],
 	},
 });
 

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

@@ -13,17 +13,14 @@ import JoplinWindow from './JoplinWindow';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
- * **This is a beta API**
+ * The API is now relatively stable and in general maintaining backward compatibility is a top priority, so you shouldn't except much breakages.
  *
- * Please note that the plugin API is relatively new and should be considered Beta state. Besides possible bugs, what it means is that there might be necessary breaking changes from one version to the next. Whenever such change is needed, best effort will be done to:
+ * If a breaking change ever becomes needed, best effort will be done to:
  *
- * - Maintain backward compatibility;
- * - When possible, deprecate features instead of removing them;
+ * - Deprecate features instead of removing them, so as to give you time to fix the issue;
  * - Document breaking changes in the changelog;
  *
- * So if you are developing a plugin, please keep an eye on the changelog as everything will be in there with information about how to update your code. There won't be any major API rewrite or architecture changes, but possibly small tweaks like function signature change, type change, etc.
- *
- * Eventually, the plugin API will be versioned to make this process smoother.
+ * So if you are developing a plugin, please keep an eye on the changelog as everything will be in there with information about how to update your code.
  */
 export default class Joplin {
     private data_;

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

@@ -15,7 +15,7 @@ import { Command } from './types';
  *
  * * [Main screen commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/MainScreen/commands)
  * * [Global commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/commands)
- * * [Editor commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.ts)
+ * * [Editor commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts)
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
@@ -49,7 +49,7 @@ import { Command } from './types';
  *
  */
 export default class JoplinCommands {
-	/**
+    /**
      * <span class="platform-desktop">desktop</span> Executes the given
      * command.
      *
@@ -68,8 +68,8 @@ export default class JoplinCommands {
      * await joplin.commands.execute('newFolder', "SOME_FOLDER_ID");
      * ```
      */
-	execute(commandName: string, ...args: any[]): Promise<any | void>;
-	/**
+    execute(commandName: string, ...args: any[]): Promise<any | void>;
+    /**
      * <span class="platform-desktop">desktop</span> Registers a new command.
      *
      * ```typescript
@@ -85,5 +85,5 @@ export default class JoplinCommands {
      * });
      * ```
      */
-	register(command: Command): Promise<void>;
+    register(command: Command): Promise<void>;
 }

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

@@ -1,3 +1,4 @@
+import { ModelType } from '../../../BaseModel';
 import { Path } from './types';
 /**
  * This module provides access to the Joplin data API: https://joplinapp.org/api/references/rest_api/
@@ -44,4 +45,6 @@ export default class JoplinData {
     post(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
     put(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
     delete(path: Path, query?: any): Promise<any>;
+    itemType(itemId: string): Promise<ModelType>;
+    resourcePath(resourceId: string): Promise<string>;
 }

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

@@ -5,6 +5,6 @@
  * so for now disable filters.
  */
 export default class JoplinFilters {
-	on(name: string, callback: Function): Promise<void>;
-	off(name: string, callback: Function): Promise<void>;
+    on(name: string, callback: Function): Promise<void>;
+    off(name: string, callback: Function): Promise<void>;
 }

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

@@ -12,6 +12,6 @@ import { ExportModule, ImportModule } from './types';
  * You may also want to refer to the Joplin API documentation to see the list of properties for each item (note, notebook, etc.) - https://joplinapp.org/api/references/rest_api/
  */
 export default class JoplinInterop {
-	registerExportModule(module: ExportModule): Promise<void>;
-	registerImportModule(module: ImportModule): Promise<void>;
+    registerExportModule(module: ExportModule): Promise<void>;
+    registerImportModule(module: ImportModule): Promise<void>;
 }

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

@@ -6,7 +6,7 @@ export interface ChangeEvent {
      */
     keys: string[];
 }
-export declare type ChangeHandler = (event: ChangeEvent)=> void;
+export declare type ChangeHandler = (event: ChangeEvent) => void;
 /**
  * This API allows registering new settings and setting sections, as well as getting and setting settings. Once a setting has been registered it will appear in the config screen and be editable by the user.
  *

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

@@ -61,8 +61,7 @@ export default class JoplinViewsDialogs {
     open(handle: ViewHandle): Promise<DialogResult>;
     /**
      * Toggle on whether to fit the dialog size to the content or not.
-     * When set to false, the dialog stretches to fill the application
-     * window.
+     * When set to false, the dialog is set to 90vw and 80vh
      * @default true
      */
     setFitToContent(handle: ViewHandle, status: boolean): Promise<boolean>;

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

@@ -46,6 +46,23 @@ export default class JoplinViewsPanels {
      *
      */
     onMessage(handle: ViewHandle, callback: Function): Promise<void>;
+    /**
+     * Sends a message to the webview.
+     *
+     * The webview must have registered a message handler prior, otherwise the message is ignored. Use;
+     *
+     * ```javascript
+     * webviewApi.onMessage((message) => { ... });
+     * ```
+     *
+     *  - `message` can be any JavaScript object, string or number
+     *
+     * The view API may have only one onMessage handler defined.
+     * This method is fire and forget so no response is returned.
+     *
+     * It is particularly useful when the webview needs to react to events emitted by the plugin or the joplin api.
+     */
+    postMessage(handle: ViewHandle, message: any): void;
     /**
      * Shows the panel
      */

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

@@ -1,9 +1,13 @@
 import { FolderEntity } from '../../database/types';
-import { Disposable } from './types';
+import { Disposable, MenuItem } from './types';
+export interface EditContextMenuFilterObject {
+    items: MenuItem[];
+}
+declare type FilterHandler<T> = (object: T) => Promise<void>;
 declare enum ItemChangeEventType {
     Create = 1,
     Update = 2,
-    Delete = 3,
+    Delete = 3
 }
 interface ItemChangeEvent {
     id: string;
@@ -12,8 +16,12 @@ interface ItemChangeEvent {
 interface SyncStartEvent {
     withErrors: boolean;
 }
-declare type ItemChangeHandler = (event: ItemChangeEvent)=> void;
-declare type SyncStartHandler = (event: SyncStartEvent)=> void;
+interface ResourceChangeEvent {
+    id: string;
+}
+declare type ItemChangeHandler = (event: ItemChangeEvent) => void;
+declare type SyncStartHandler = (event: SyncStartEvent) => void;
+declare type ResourceChangeHandler = (event: ResourceChangeEvent) => void;
 /**
  * The workspace service provides access to all the parts of Joplin that
  * are being worked on - i.e. the currently selected notes or notebooks as
@@ -38,6 +46,11 @@ export default class JoplinWorkspace {
      * Called when the content of the current note changes.
      */
     onNoteChange(handler: ItemChangeHandler): Promise<Disposable>;
+    /**
+     * Called when a resource is changed. Currently this handled will not be
+     * called when a resource is added or deleted.
+     */
+    onResourceChange(handler: ResourceChangeHandler): Promise<void>;
     /**
      * Called when an alarm associated with a to-do is triggered.
      */
@@ -50,6 +63,11 @@ export default class JoplinWorkspace {
      * Called when the synchronisation process has finished.
      */
     onSyncComplete(callback: Function): Promise<Disposable>;
+    /**
+     * Called just before the editor context menu is about to open. Allows
+     * adding items to it.
+     */
+    filterEditorContextMenu(handler: FilterHandler<EditContextMenuFilterObject>): void;
     /**
      * Gets the currently selected note
      */

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

@@ -202,6 +202,25 @@ export interface Disposable {
 	// dispose():void;
 }
 
+export enum ModelType {
+	Note = 1,
+	Folder = 2,
+	Setting = 3,
+	Resource = 4,
+	Tag = 5,
+	NoteTag = 6,
+	Search = 7,
+	Alarm = 8,
+	MasterKey = 9,
+	ItemChange = 10,
+	NoteResource = 11,
+	ResourceLocalState = 12,
+	Revision = 13,
+	Migration = 14,
+	SmartFilter = 15,
+	Command = 16,
+}
+
 // =================================================================
 // Menu types
 // =================================================================
@@ -269,6 +288,17 @@ export interface MenuItem {
 	 */
 	commandName?: string;
 
+	/**
+	 * Arguments that should be passed to the command. They will be as rest
+	 * parameters.
+	 */
+	commandArgs?: any[];
+
+	/**
+	 * Set to "separator" to create a divider line
+	 */
+	type?: ('normal' | 'separator' | 'submenu' | 'checkbox' | 'radio');
+
 	/**
 	 * Accelerator associated with the menu item
 	 */
@@ -334,6 +364,12 @@ export enum SettingItemType {
 	Button = 6,
 }
 
+export enum SettingItemSubType {
+	FilePathAndArgs = 'file_path_and_args',
+	FilePath = 'file_path', // Not supported on mobile!
+	DirectoryPath = 'directory_path', // Not supported on mobile!
+}
+
 export enum AppType {
 	Desktop = 'desktop',
 	Mobile = 'mobile',
@@ -351,6 +387,12 @@ export interface SettingItem {
 	value: any;
 	type: SettingItemType;
 
+	/**
+	 * Currently only used to display a file or directory selector. Always set
+	 * `type` to `SettingItemType.String` when using this property.
+	 */
+	subType?: SettingItemSubType;
+
 	label: string;
 	description?: string;
 

packages/app-cli/tests/support/plugins/content_script/package.json

@@ -14,18 +14,21 @@
   "devDependencies": {
     "@types/node": "^14.0.14",
     "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "9.1.0",
-    "glob": "7.2.0",
+    "fs-extra": "^9.0.1",
+    "glob": "^7.1.6",
     "on-build-webpack": "^0.1.0",
-    "tar": "6.1.11",
+    "tar": "^6.0.5",
     "ts-loader": "^7.0.5",
     "typescript": "^3.9.3",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11",
-    "chalk": "4.1.2",
-    "yargs": "16.2.0"
+    "chalk": "^4.1.0",
+    "yargs": "^16.2.0"
   },
   "dependencies": {
     "left-pad": "1.3.0"
-  }
-}
+  },
+  "files": [
+    "publish"
+  ]
+}

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

@@ -29,6 +29,7 @@ const userConfig = Object.assign({}, {
 
 const manifestPath = `${srcDir}/manifest.json`;
 const packageJsonPath = `${rootDir}/package.json`;
+const allPossibleCategories = ['appearance', 'developer tools', 'productivity', 'themes', 'integrations', 'viewer', 'search', 'tags', 'editor', 'files', 'personal knowledge management'];
 const manifest = readManifest(manifestPath);
 const pluginArchiveFilePath = path.resolve(publishDir, `${manifest.id}.jpl`);
 const pluginInfoFilePath = path.resolve(publishDir, `${manifest.id}.json`);
@@ -67,10 +68,19 @@ function currentGitInfo() {
 	}
 }
 
+function validateCategories(categories) {
+	if (!categories) return null;
+	if ((categories.length !== new Set(categories).size)) throw new Error('Repeated categories are not allowed');
+	categories.forEach(category => {
+		if (!allPossibleCategories.includes(category)) throw new Error(`${category} is not a valid category. Please make sure that the category name is lowercase. Valid Categories are: \n${allPossibleCategories}\n`);
+	});
+}
+
 function readManifest(manifestPath) {
 	const content = fs.readFileSync(manifestPath, 'utf8');
 	const output = JSON.parse(content);
 	if (!output.id) throw new Error(`Manifest plugin ID is not set in ${manifestPath}`);
+	validateCategories(output.categories);
 	return output;
 }
 
@@ -137,7 +147,7 @@ const pluginConfig = Object.assign({}, baseConfig, {
 		},
 		// JSON files can also be required from scripts so we include this.
 		// https://github.com/joplin/plugin-bibtex/pull/2
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.js', '.tsx', '.ts', '.json'],
 	},
 	output: {
 		filename: 'index.js',
@@ -169,7 +179,7 @@ const extraScriptConfig = Object.assign({}, baseConfig, {
 		alias: {
 			api: path.resolve(__dirname, 'api'),
 		},
-		extensions: ['.tsx', '.ts', '.js', '.json'],
+		extensions: ['.js', '.tsx', '.ts', '.json'],
 	},
 });
 

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

@@ -13,17 +13,14 @@ import JoplinWindow from './JoplinWindow';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
- * **This is a beta API**
+ * The API is now relatively stable and in general maintaining backward compatibility is a top priority, so you shouldn't except much breakages.
  *
- * Please note that the plugin API is relatively new and should be considered Beta state. Besides possible bugs, what it means is that there might be necessary breaking changes from one version to the next. Whenever such change is needed, best effort will be done to:
+ * If a breaking change ever becomes needed, best effort will be done to:
  *
- * - Maintain backward compatibility;
- * - When possible, deprecate features instead of removing them;
+ * - Deprecate features instead of removing them, so as to give you time to fix the issue;
  * - Document breaking changes in the changelog;
  *
- * So if you are developing a plugin, please keep an eye on the changelog as everything will be in there with information about how to update your code. There won't be any major API rewrite or architecture changes, but possibly small tweaks like function signature change, type change, etc.
- *
- * Eventually, the plugin API will be versioned to make this process smoother.
+ * So if you are developing a plugin, please keep an eye on the changelog as everything will be in there with information about how to update your code.
  */
 export default class Joplin {
     private data_;

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

@@ -15,7 +15,7 @@ import { Command } from './types';
  *
  * * [Main screen commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/MainScreen/commands)
  * * [Global commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/commands)
- * * [Editor commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.ts)
+ * * [Editor commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts)
  *
  * To view what arguments are supported, you can open any of these files
  * and look at the `execute()` command.
@@ -49,7 +49,7 @@ import { Command } from './types';
  *
  */
 export default class JoplinCommands {
-	/**
+    /**
      * <span class="platform-desktop">desktop</span> Executes the given
      * command.
      *
@@ -68,8 +68,8 @@ export default class JoplinCommands {
      * await joplin.commands.execute('newFolder', "SOME_FOLDER_ID");
      * ```
      */
-	execute(commandName: string, ...args: any[]): Promise<any | void>;
-	/**
+    execute(commandName: string, ...args: any[]): Promise<any | void>;
+    /**
      * <span class="platform-desktop">desktop</span> Registers a new command.
      *
      * ```typescript
@@ -85,5 +85,5 @@ export default class JoplinCommands {
      * });
      * ```
      */
-	register(command: Command): Promise<void>;
+    register(command: Command): Promise<void>;
 }

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

@@ -1,3 +1,4 @@
+import { ModelType } from '../../../BaseModel';
 import { Path } from './types';
 /**
  * This module provides access to the Joplin data API: https://joplinapp.org/api/references/rest_api/
@@ -44,4 +45,6 @@ export default class JoplinData {
     post(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
     put(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
     delete(path: Path, query?: any): Promise<any>;
+    itemType(itemId: string): Promise<ModelType>;
+    resourcePath(resourceId: string): Promise<string>;
 }

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

@@ -5,6 +5,6 @@
  * so for now disable filters.
  */
 export default class JoplinFilters {
-	on(name: string, callback: Function): Promise<void>;
-	off(name: string, callback: Function): Promise<void>;
+    on(name: string, callback: Function): Promise<void>;
+    off(name: string, callback: Function): Promise<void>;
 }

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

@@ -12,6 +12,6 @@ import { ExportModule, ImportModule } from './types';
  * You may also want to refer to the Joplin API documentation to see the list of properties for each item (note, notebook, etc.) - https://joplinapp.org/api/references/rest_api/
  */
 export default class JoplinInterop {
-	registerExportModule(module: ExportModule): Promise<void>;
-	registerImportModule(module: ImportModule): Promise<void>;
+    registerExportModule(module: ExportModule): Promise<void>;
+    registerImportModule(module: ImportModule): Promise<void>;
 }

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

@@ -6,7 +6,7 @@ export interface ChangeEvent {
      */
     keys: string[];
 }
-export declare type ChangeHandler = (event: ChangeEvent)=> void;
+export declare type ChangeHandler = (event: ChangeEvent) => void;
 /**
  * This API allows registering new settings and setting sections, as well as getting and setting settings. Once a setting has been registered it will appear in the config screen and be editable by the user.
  *

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

@@ -61,8 +61,7 @@ export default class JoplinViewsDialogs {
     open(handle: ViewHandle): Promise<DialogResult>;
     /**
      * Toggle on whether to fit the dialog size to the content or not.
-     * When set to false, the dialog stretches to fill the application
-     * window.
+     * When set to false, the dialog is set to 90vw and 80vh
      * @default true
      */
     setFitToContent(handle: ViewHandle, status: boolean): Promise<boolean>;

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

@@ -46,6 +46,23 @@ export default class JoplinViewsPanels {
      *
      */
     onMessage(handle: ViewHandle, callback: Function): Promise<void>;
+    /**
+     * Sends a message to the webview.
+     *
+     * The webview must have registered a message handler prior, otherwise the message is ignored. Use;
+     *
+     * ```javascript
+     * webviewApi.onMessage((message) => { ... });
+     * ```
+     *
+     *  - `message` can be any JavaScript object, string or number
+     *
+     * The view API may have only one onMessage handler defined.
+     * This method is fire and forget so no response is returned.
+     *
+     * It is particularly useful when the webview needs to react to events emitted by the plugin or the joplin api.
+     */
+    postMessage(handle: ViewHandle, message: any): void;
     /**
      * Shows the panel
      */

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

@@ -1,9 +1,13 @@
 import { FolderEntity } from '../../database/types';
-import { Disposable } from './types';
+import { Disposable, MenuItem } from './types';
+export interface EditContextMenuFilterObject {
+    items: MenuItem[];
+}
+declare type FilterHandler<T> = (object: T) => Promise<void>;
 declare enum ItemChangeEventType {
     Create = 1,
     Update = 2,
-    Delete = 3,
+    Delete = 3
 }
 interface ItemChangeEvent {
     id: string;
@@ -12,8 +16,12 @@ interface ItemChangeEvent {
 interface SyncStartEvent {
     withErrors: boolean;
 }
-declare type ItemChangeHandler = (event: ItemChangeEvent)=> void;
-declare type SyncStartHandler = (event: SyncStartEvent)=> void;
+interface ResourceChangeEvent {
+    id: string;
+}
+declare type ItemChangeHandler = (event: ItemChangeEvent) => void;
+declare type SyncStartHandler = (event: SyncStartEvent) => void;
+declare type ResourceChangeHandler = (event: ResourceChangeEvent) => void;
 /**
  * The workspace service provides access to all the parts of Joplin that
  * are being worked on - i.e. the currently selected notes or notebooks as
@@ -38,6 +46,11 @@ export default class JoplinWorkspace {
      * Called when the content of the current note changes.
      */
     onNoteChange(handler: ItemChangeHandler): Promise<Disposable>;
+    /**
+     * Called when a resource is changed. Currently this handled will not be
+     * called when a resource is added or deleted.
+     */
+    onResourceChange(handler: ResourceChangeHandler): Promise<void>;
     /**
      * Called when an alarm associated with a to-do is triggered.
      */
@@ -50,6 +63,11 @@ export default class JoplinWorkspace {
      * Called when the synchronisation process has finished.
      */
     onSyncComplete(callback: Function): Promise<Disposable>;
+    /**
+     * Called just before the editor context menu is about to open. Allows
+     * adding items to it.
+     */
+    filterEditorContextMenu(handler: FilterHandler<EditContextMenuFilterObject>): void;
     /**
      * Gets the currently selected note
      */

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

@@ -202,6 +202,25 @@ export interface Disposable {
 	// dispose():void;
 }
 
+export enum ModelType {
+	Note = 1,
+	Folder = 2,
+	Setting = 3,
+	Resource = 4,
+	Tag = 5,
+	NoteTag = 6,
+	Search = 7,
+	Alarm = 8,
+	MasterKey = 9,
+	ItemChange = 10,
+	NoteResource = 11,
+	ResourceLocalState = 12,
+	Revision = 13,
+	Migration = 14,
+	SmartFilter = 15,
+	Command = 16,
+}
+
 // =================================================================
 // Menu types
 // =================================================================
@@ -269,6 +288,17 @@ export interface MenuItem {
 	 */
 	commandName?: string;
 
+	/**
+	 * Arguments that should be passed to the command. They will be as rest
+	 * parameters.
+	 */
+	commandArgs?: any[];
+
+	/**
+	 * Set to "separator" to create a divider line
+	 */
+	type?: ('normal' | 'separator' | 'submenu' | 'checkbox' | 'radio');
+
 	/**
 	 * Accelerator associated with the menu item
 	 */
@@ -334,6 +364,12 @@ export enum SettingItemType {
 	Button = 6,
 }
 
+export enum SettingItemSubType {
+	FilePathAndArgs = 'file_path_and_args',
+	FilePath = 'file_path', // Not supported on mobile!
+	DirectoryPath = 'directory_path', // Not supported on mobile!
+}
+
 export enum AppType {
 	Desktop = 'desktop',
 	Mobile = 'mobile',
@@ -351,6 +387,12 @@ export interface SettingItem {
 	value: any;
 	type: SettingItemType;
 
+	/**
+	 * Currently only used to display a file or directory selector. Always set
+	 * `type` to `SettingItemType.String` when using this property.
+	 */
+	subType?: SettingItemSubType;
+
 	label: string;
 	description?: string;
 

packages/app-cli/tests/support/plugins/dialog/package.json

@@ -14,15 +14,18 @@
   "devDependencies": {
     "@types/node": "^14.0.14",
     "copy-webpack-plugin": "^6.1.0",
-    "fs-extra": "9.1.0",
-    "glob": "7.2.0",
+    "fs-extra": "^9.0.1",
+    "glob": "^7.1.6",
     "on-build-webpack": "^0.1.0",
-    "tar": "6.1.11",
+    "tar": "^6.0.5",
     "ts-loader": "^7.0.5",
     "typescript": "^3.9.3",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11",
-    "chalk": "4.1.2",
-    "yargs": "16.2.0"
-  }
-}
+    "chalk": "^4.1.0",
+    "yargs": "^16.2.0"
+  },
+  "files": [
+    "publish"
+  ]
+}