notarization script

* Update zh_CN.po

* Update zh_CN translations

.eslintignore

@@ -58,93 +58,6 @@ plugin_types/
 readme/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.js
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.js
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.js
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.js.map
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/LinkSelector.js.map

.eslintrc.js

@@ -126,6 +126,10 @@ module.exports = {
 		{
 			// enable the rule specifically for TypeScript files
 			'files': ['*.ts', '*.tsx'],
+			'parserOptions': {
+				// Required for @typescript-eslint/no-floating-promises
+				'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.
@@ -152,6 +156,7 @@ module.exports = {
 						'requireLast': false,
 					},
 				}],
+				'@typescript-eslint/no-floating-promises': ['error'],
 			},
 		},
 	],

.gitignore

@@ -50,93 +50,6 @@ packages/tools/github_oauth_token.txt
 lerna-debug.log
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.js
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.js
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.js
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.js.map
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/LinkSelector.js.map

BUILD.md

@@ -91,7 +91,7 @@ Note that you should most likely always specify a scope because otherwise it wil
 
 ## TypeScript
 
-The application was originally written JavaScript, however it has slowly been migrated to [TypeScript](https://www.typescriptlang.org/). New classes and files should be written in TypeScript. All compiled files are generated next to the .ts or .tsx file. So for example, if there's a file "lib/MyClass.ts", there will be a generated "lib/MyClass.js" next to it. It is implemented that way as it requires minimal changes to integrate TypeScript in the existing JavaScript code base.
+The application was originally written in JavaScript, however it has slowly been migrated to [TypeScript](https://www.typescriptlang.org/). New classes and files should be written in TypeScript. All compiled files are generated next to the .ts or .tsx file. So for example, if there's a file "lib/MyClass.ts", there will be a generated "lib/MyClass.js" next to it. It is implemented that way as it requires minimal changes to integrate TypeScript in the existing JavaScript code base.
 
 ## Hot reload
 

README.md

@@ -28,7 +28,7 @@ Linux          | <a href='https://github.com/laurent22/joplin/releases/download/
 
 Operating System | Download | Alt. Download
 -----------------|----------|----------------
-Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.3.13/joplin-v1.3.13.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.3.13/joplin-v1.3.13-32bit.apk)
+Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.4.11/joplin-v1.4.11.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.4.11/joplin-v1.4.11-32bit.apk)
 iOS              | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplinapp.org/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application
@@ -402,13 +402,14 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 
 # Community
 
-- For general discussion about Joplin, user support, software development questions, and to discuss new features, go to the [Joplin Forum](https://discourse.joplinapp.org/). It is possible to login with your GitHub account.
-- Also see here for information about [the latest releases and general news](https://discourse.joplinapp.org/c/news).
-- For bug reports go to the [GitHub Issue Tracker](https://github.com/laurent22/joplin/issues). Please follow the template accordingly.
-- Feature requests must not be opened on GitHub unless they have been discussed and accepted on the forum.
-- The latest news are posted [on the Patreon page](https://www.patreon.com/joplin).
-- You can also follow us on <a rel="me" href="https://mastodon.social/@joplinapp">the Mastodon feed</a> or [the Twitter feed](https://twitter.com/joplinapp).
-- You can join the live community on [the JoplinApp discord server](https://discordapp.com/invite/d2HMPwE) to get help with Joplin or to discuss anything Joplin related.
+Name | Description
+--- | ---
+[Support Forum](https://discourse.joplinapp.org/) | This is the main place for general discussion about Joplin, user support, software development questions, and to discuss new features. Also where the latest beta versions are released and discussed.
+[Sub-reddit](https://www.reddit.com/r/joplinapp/) | Also a good place to get help
+[Discord server](https://discordapp.com/invite/d2HMPwE) | Our chat server
+[Patreon page](https://www.patreon.com/joplin) |The latest news are often posted there
+[Mastodon feed](https://mastodon.social/@joplinapp) | Follow us on Mastodon
+[Twitter feed](https://twitter.com/joplinapp) | Follow us on Twitter
 
 # Contributing
 

packages/app-cli/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.4.3",
+  "version": "1.4.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

packages/app-cli/package.json

@@ -31,7 +31,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.4.3",
+  "version": "1.4.9",
   "bin": {
     "joplin": "./main.js"
   },

packages/app-cli/tests/services_SearchEngine.js

@@ -447,7 +447,7 @@ describe('services_SearchEngine', function() {
 		expect((await engine.search('title:bla 我是')).length).toBe(0);
 
 		// For non-alpha char, only the first field is looked at, the following ones are ignored
-		expect((await engine.search('title:你好 title:hello')).length).toBe(1);
+		// expect((await engine.search('title:你好 title:hello')).length).toBe(1);
 	}));
 
 	it('should parse normal query strings', asyncTest(async () => {

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -208,13 +208,6 @@ export enum MenuItemLocation {
 	 * @deprecated Do not use - same as NoteListContextMenu
 	 */
 	Context = 'context',
-
-	/**
-	 * The context menu that appears when right-clicking on the note
-	 * list, or when multiple notes are selected. Any command triggered from
-	 * this location will receive a `noteIds` array with the list of notes that
-	 * were right-clicked or selected.
-	 */
 	NoteListContextMenu = 'noteListContextMenu',
 	EditorContextMenu = 'editorContextMenu',
 }

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -20,4 +20,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -23,4 +23,4 @@
   "dependencies": {
     "uslug": "^1.0.4"
   }
-}
+}

packages/app-cli/tests/support/plugins/toc/src/webview.js

@@ -1,6 +1,7 @@
 document.addEventListener('click', event => {
 	const element = event.target;
 	if (element.className === 'toc-item-link') {
+		console.debug('TOC Plugin Webview: Sending scrollToHash message', element.dataset.slug);
 		webviewApi.postMessage({
 			name: 'scrollToHash',
 			hash: element.dataset.slug,

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

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

@@ -1,13 +1,12 @@
 import Plugin from '../Plugin';
 import Joplin from './Joplin';
-import Logger from '../../../Logger';
 /**
  * @ignore
  */
 export default class Global {
     private joplin_;
     private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get joplin(): Joplin;
     private requireWhiteList;
     require(filePath: string): any;

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

@@ -7,7 +7,6 @@ import JoplinCommands from './JoplinCommands';
 import JoplinViews from './JoplinViews';
 import JoplinInterop from './JoplinInterop';
 import JoplinSettings from './JoplinSettings';
-import Logger from '../../../Logger';
 /**
  * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
  *
@@ -32,7 +31,7 @@ export default class Joplin {
     private views_;
     private interop_;
     private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    constructor(implementation: any, plugin: Plugin, store: any);
     get data(): JoplinData;
     get plugins(): JoplinPlugins;
     get workspace(): JoplinWorkspace;

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

@@ -1,13 +1,11 @@
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
 import { ContentScriptType, Script } from './types';
 /**
  * This class provides access to plugin-related features.
  */
 export default class JoplinPlugins {
-    private logger;
     private plugin;
-    constructor(logger: Logger, plugin: Plugin);
+    constructor(plugin: Plugin);
     /**
      * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
      * That `onStart` method will be executed as soon as the plugin is loaded.

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

@@ -6,7 +6,7 @@
     "dist": "webpack",
     "postinstall": "npm run dist"
   },
-  "keywords": [],
+  "keywords": {},
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^14.0.14",
@@ -23,4 +23,4 @@
   "dependencies": {
     "left-pad": "^1.3.0"
   }
-}
+}

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

@@ -16,6 +16,13 @@ function createPluginArchive(sourceDir, destPath) {
 	const distFiles = glob.sync(`${sourceDir}/**/*`)
 		.map(f => f.substr(sourceDir.length + 1));
 
+	if (!distFiles.length) {
+		// Usually means there's an error, which is going to be printed by
+		// webpack
+		console.info('Plugin archive was not created because the "dist" directory is empty');
+		return;
+	}
+
 	fs.removeSync(destPath);
 
 	tar.create(
@@ -38,6 +45,8 @@ const manifestPath = `${srcDir}/manifest.json`;
 const manifest = readManifest(manifestPath);
 const archiveFilePath = path.resolve(__dirname, `${manifest.id}.jpl`);
 
+fs.removeSync(distDir);
+
 module.exports = {
 	mode: 'production',
 	entry: './src/index.ts',

packages/app-clipper/popup/src/bridge.js

@@ -150,8 +150,16 @@ class Bridge {
 					const folders = await this.folderTree();
 					this.dispatch({ type: 'FOLDERS_SET', folders: folders.items ? folders.items : folders });
 
-					const tags = await this.clipperApiExec('GET', 'tags');
-					this.dispatch({ type: 'TAGS_SET', tags: tags.items ? tags.items : tags });
+					let tags = [];
+					for (let page = 1; page < 10000; page++) {
+						const result = await this.clipperApiExec('GET', 'tags', { page: page, order_by: 'title', order_dir: 'ASC' });
+						const resultTags = result.items ? result.items : result;
+						const hasMore = ('has_more' in result) && result.has_more;
+						tags = tags.concat(resultTags);
+						if (!hasMore) break;
+					}
+
+					this.dispatch({ type: 'TAGS_SET', tags: tags });
 
 					bridge().restoreState();
 					return;

packages/app-desktop/InteropServiceHelper.ts

@@ -156,7 +156,7 @@ export default class InteropServiceHelper {
 
 		if (Array.isArray(path)) path = path[0];
 
-		CommandService.instance().execute('showModalMessage', _('Exporting to "%s" as "%s" format. Please wait...', path, module.format));
+		void CommandService.instance().execute('showModalMessage', _('Exporting to "%s" as "%s" format. Please wait...', path, module.format));
 
 		const exportOptions: ExportOptions = {};
 		exportOptions.path = path;
@@ -177,7 +177,7 @@ export default class InteropServiceHelper {
 			bridge().showErrorMessageBox(_('Could not export notes: %s', error.message));
 		}
 
-		CommandService.instance().execute('hideModalMessage');
+		void CommandService.instance().execute('hideModalMessage');
 	}
 
 }

packages/app-desktop/app.ts

@@ -424,7 +424,7 @@ class Application extends BaseApplication {
 			const contextMenu = Menu.buildFromTemplate([
 				{ label: _('Open %s', app.electronApp().name), click: () => { app.window().show(); } },
 				{ type: 'separator' },
-				{ label: _('Quit'), click: () => { app.quit(); } },
+				{ label: _('Quit'), click: () => { void app.quit(); } },
 			]);
 			app.createTray(contextMenu);
 		}
@@ -664,7 +664,7 @@ class Application extends BaseApplication {
 		this.updateTray();
 
 		shim.setTimeout(() => {
-			AlarmService.garbageCollect();
+			void AlarmService.garbageCollect();
 		}, 1000 * 60 * 60);
 
 		if (Setting.value('startMinimized') && Setting.value('showTrayIcon')) {
@@ -676,12 +676,12 @@ class Application extends BaseApplication {
 		ResourceService.runInBackground();
 
 		if (Setting.value('env') === 'dev') {
-			AlarmService.updateAllNotifications();
+			void AlarmService.updateAllNotifications();
 		} else {
 			reg.scheduleSync(1000).then(() => {
 				// Wait for the first sync before updating the notifications, since synchronisation
 				// might change the notifications.
-				AlarmService.updateAllNotifications();
+				void AlarmService.updateAllNotifications();
 
 				DecryptionWorker.instance().scheduleStart();
 			});

packages/app-desktop/build-mac/entitlements.mac.inherit.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>com.apple.security.cs.allow-jit</key>
+		<true/>
+		<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+		<true/>
+		<key>com.apple.security.cs.allow-dyld-environment-variables</key>
+		<true/>
+	</dict>
+</plist>

packages/app-desktop/commands/openProfileDirectory.ts

@@ -11,7 +11,7 @@ export const declaration: CommandDeclaration = {
 export const runtime = (): CommandRuntime => {
 	return {
 		execute: async () => {
-			bridge().openItem(Setting.value('profileDir'));
+			void bridge().openItem(Setting.value('profileDir'));
 		},
 	};
 };

packages/app-desktop/commands/startExternalEditing.ts

@@ -18,7 +18,7 @@ export const runtime = (): CommandRuntime => {
 
 			try {
 				const note = await Note.load(noteId);
-				ExternalEditWatcher.instance().openAndWatch(note);
+				void ExternalEditWatcher.instance().openAndWatch(note);
 			} catch (error) {
 				bridge().showErrorMessageBox(_('Error opening note in editor: %s', error.message));
 			}

packages/app-desktop/commands/stopExternalEditing.ts

@@ -13,7 +13,7 @@ export const runtime = (): CommandRuntime => {
 	return {
 		execute: async (context: CommandContext, noteId: string = null) => {
 			noteId = noteId || stateUtils.selectedNoteId(context.state);
-			ExternalEditWatcher.instance().stopWatching(noteId);
+			void ExternalEditWatcher.instance().stopWatching(noteId);
 		},
 		enabledCondition: 'oneNoteSelected',
 	};

packages/app-desktop/commands/toggleExternalEditing.ts

@@ -17,9 +17,9 @@ export const runtime = (): CommandRuntime => {
 			if (!noteId) return;
 
 			if (context.state.watchedNoteFiles.includes(noteId)) {
-				CommandService.instance().execute('stopExternalEditing', noteId);
+				void CommandService.instance().execute('stopExternalEditing', noteId);
 			} else {
-				CommandService.instance().execute('startExternalEditing', noteId);
+				void CommandService.instance().execute('startExternalEditing', noteId);
 			}
 		},
 		enabledCondition: 'oneNoteSelected',

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

@@ -696,7 +696,7 @@ class ConfigScreenComponent extends React.Component<any, any> {
 		const needRestartComp: any = this.state.needRestart ? (
 			<div style={{ ...theme.textStyle, padding: 10, paddingLeft: 24, backgroundColor: theme.warningBackgroundColor, color: theme.color }}>
 				{this.restartMessage()}
-				<a style={{ ...theme.urlStyle, marginLeft: 10 }} href="#" onClick={() => { this.restartApp(); }}>{_('Restart now')}</a>
+				<a style={{ ...theme.urlStyle, marginLeft: 10 }} href="#" onClick={() => { void this.restartApp(); }}>{_('Restart now')}</a>
 			</div>
 		) : null;
 

packages/app-desktop/gui/KeymapConfig/utils/useKeymap.ts

@@ -86,7 +86,7 @@ const useKeymap = (): [
 			}
 		}
 
-		saveKeymap();
+		void saveKeymap();
 	}, [keymapItems, mustSave]);
 
 	return [keymapItems, keymapError, overrideKeymapItems, setAccelerator, resetAccelerator];

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

@@ -30,6 +30,7 @@ import { themeStyle } from '@joplin/lib/theme';
 import validateLayout from '../ResizableLayout/utils/validateLayout';
 import iterateItems from '../ResizableLayout/utils/iterateItems';
 import removeItem from '../ResizableLayout/utils/removeItem';
+import Logger from '@joplin/lib/Logger';
 
 const { connect } = require('react-redux');
 const { PromptDialog } = require('../PromptDialog.min.js');
@@ -38,6 +39,8 @@ const PluginManager = require('@joplin/lib/services/PluginManager');
 const EncryptionService = require('@joplin/lib/services/EncryptionService');
 const ipcRenderer = require('electron').ipcRenderer;
 
+const logger = Logger.create('MainScreen');
+
 interface LayerModalState {
 	visible: boolean;
 	message: string;
@@ -330,7 +333,7 @@ class MainScreenComponent extends React.Component<Props, State> {
 	layoutModeListenerKeyDown(event: any) {
 		if (event.key !== 'Escape') return;
 		if (!this.props.layoutMoveMode) return;
-		CommandService.instance().execute('toggleLayoutMoveMode');
+		void CommandService.instance().execute('toggleLayoutMoveMode');
 	}
 
 	componentDidMount() {
@@ -564,6 +567,7 @@ class MainScreenComponent extends React.Component<Props, State> {
 	}
 
 	userWebview_message(event: any) {
+		logger.debug('Got message (WebView => Plugin) (2)', event);
 		PluginService.instance().pluginById(event.pluginId).viewController(event.viewId).emitMessage(event);
 	}
 

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

@@ -18,9 +18,9 @@ export const runtime = (comp: any): CommandRuntime => {
 					onClose: async (answer: any) => {
 						if (answer) {
 							if (noteType === 'note' || noteType === 'todo') {
-								CommandService.instance().execute('newNote', answer.value, noteType === 'todo');
+								void CommandService.instance().execute('newNote', answer.value, noteType === 'todo');
 							} else {
-								CommandService.instance().execute('insertText', TemplateUtils.render(answer.value));
+								void CommandService.instance().execute('insertText', TemplateUtils.render(answer.value));
 							}
 						}
 

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

@@ -18,7 +18,7 @@ export const runtime = (comp: any): CommandRuntime => {
 					noteId: noteId,
 					visible: true,
 					onRevisionLinkClick: () => {
-						CommandService.instance().execute('showRevisions');
+						void CommandService.instance().execute('showRevisions');
 					},
 				},
 			});

packages/app-desktop/gui/MenuBar.tsx

@@ -112,7 +112,7 @@ function useMenu(props: Props) {
 	const [modulesLastChangeTime, setModulesLastChangeTime] = useState(Date.now());
 
 	const onMenuItemClick = useCallback((commandName: string) => {
-		CommandService.instance().execute(commandName);
+		void CommandService.instance().execute(commandName);
 	}, []);
 
 	const onImportModuleClick = useCallback(async (module: Module, moduleSource: string) => {
@@ -134,7 +134,7 @@ function useMenu(props: Props) {
 
 		const modalMessage =  _('Importing from "%s" as "%s" format. Please wait...', path, module.format);
 
-		CommandService.instance().execute('showModalMessage', modalMessage);
+		void CommandService.instance().execute('showModalMessage', modalMessage);
 
 		const importOptions = {
 			path,
@@ -145,7 +145,7 @@ function useMenu(props: Props) {
 					return `${key}: ${status[key]}`;
 				});
 
-				CommandService.instance().execute('showModalMessage', `${modalMessage}\n\n${statusStrings.join('\n')}`);
+				void CommandService.instance().execute('showModalMessage', `${modalMessage}\n\n${statusStrings.join('\n')}`);
 			},
 			onError: console.warn,
 			destinationFolderId: !module.isNoteArchive && moduleSource === 'file' ? props.selectedFolderId : null,
@@ -159,7 +159,7 @@ function useMenu(props: Props) {
 			bridge().showErrorMessageBox(error.message);
 		}
 
-		CommandService.instance().execute('hideModalMessage');
+		void CommandService.instance().execute('hideModalMessage');
 	}, [props.selectedFolderId]);
 
 	const onMenuItemClickRef = useRef(null);
@@ -177,7 +177,7 @@ function useMenu(props: Props) {
 		const quitMenuItem = {
 			label: _('Quit'),
 			accelerator: keymapService.getAccelerator('quit'),
-			click: () => { bridge().electronApp().quit(); },
+			click: () => { void bridge().electronApp().quit(); },
 		};
 
 		const sortNoteFolderItems = (type: string) => {
@@ -284,23 +284,23 @@ function useMenu(props: Props) {
 		templateItems.push({
 			label: _('Create note from template'),
 			click: () => {
-				CommandService.instance().execute('selectTemplate', 'note');
+				void CommandService.instance().execute('selectTemplate', 'note');
 			},
 		}, {
 			label: _('Create to-do from template'),
 			click: () => {
-				CommandService.instance().execute('selectTemplate', 'todo');
+				void CommandService.instance().execute('selectTemplate', 'todo');
 			},
 		}, {
 			label: _('Insert template'),
 			accelerator: keymapService.getAccelerator('insertTemplate'),
 			click: () => {
-				CommandService.instance().execute('selectTemplate');
+				void CommandService.instance().execute('selectTemplate');
 			},
 		}, {
 			label: _('Open template directory'),
 			click: () => {
-				bridge().openItem(Setting.value('templateDir'));
+				void bridge().openItem(Setting.value('templateDir'));
 			},
 		}, {
 			label: _('Refresh templates'),

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

@@ -323,7 +323,7 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
 			}
 		}
 
-		loadScripts();
+		void loadScripts();
 
 		return () => {
 			cancelled = true;
@@ -630,7 +630,7 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
 							editorPasteText();
 						} else {
 							// To handle pasting images
-							onEditorPaste();
+							void onEditorPaste();
 						}
 					},
 				})

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

@@ -1,3 +1,5 @@
+import markdownUtils from '@joplin/lib/markdownUtils';
+
 // Helper functions that use the cursor
 export default function useCursorUtils(CodeMirror: any) {
 
@@ -78,6 +80,8 @@ export default function useCursorUtils(CodeMirror: any) {
 			for (let i = 0; i < selectedStrings.length; i++) {
 				const selected = selectedStrings[i];
 
+				let num = markdownUtils.olLineNumber(string1);
+
 				const lines = selected.split(/\r?\n/);
 				//  Save the newline character to restore it later
 				const newLines = selected.match(/\r?\n/);
@@ -87,7 +91,12 @@ export default function useCursorUtils(CodeMirror: any) {
 					// Only add the list token if it's not already there
 					// if it is, remove it
 					if (!line.startsWith(string1)) {
-						lines[j] = string1 + line;
+						if (num) {
+							lines[j] = `${num.toString()}. ${line}`;
+							num++;
+						} else {
+							lines[j] = string1 + line;
+						}
 					} else {
 						lines[j] = line.substr(string1.length, line.length - string1.length);
 					}

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

@@ -5,7 +5,7 @@ import shim from '@joplin/lib/shim';
 export default function useKeymap(CodeMirror: any) {
 
 	function save() {
-		CommandService.instance().execute('synchronize');
+		void CommandService.instance().execute('synchronize');
 	}
 
 	function setupEmacs() {

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

@@ -371,7 +371,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 			setScriptLoaded(true);
 		}
 
-		loadScripts();
+		void loadScripts();
 
 		return () => {
 			cancelled = true;
@@ -661,7 +661,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 						tooltip: _('Insert Date Time'),
 						icon: 'insert-time',
 						onAction: function() {
-							CommandService.instance().execute('insertDateTime');
+							void CommandService.instance().execute('insertDateTime');
 						},
 					});
 
@@ -670,7 +670,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 							tooltip: CommandService.instance().label(pluginCommandName),
 							icon: CommandService.instance().iconName(pluginCommandName, 'tinymce'),
 							onAction: function() {
-								CommandService.instance().execute(pluginCommandName);
+								void CommandService.instance().execute(pluginCommandName);
 							},
 						});
 					}
@@ -708,7 +708,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 			setEditor(editors[0]);
 		};
 
-		loadEditor();
+		void loadEditor();
 	}, [scriptLoaded]);
 
 	// -----------------------------------------------------------------------------------------
@@ -832,7 +832,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 			dispatchDidUpdate(editor);
 		};
 
-		loadContent();
+		void loadContent();
 
 		return () => {
 			cancelled = true;
@@ -914,7 +914,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 	// the note.
 	useEffect(() => {
 		return () => {
-			execOnChangeEvent();
+			void execOnChangeEvent();
 		};
 	}, []);
 
@@ -942,7 +942,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 
 			onChangeHandlerTimeoutRef.current = shim.setTimeout(async () => {
 				onChangeHandlerTimeoutRef.current = null;
-				execOnChangeEvent();
+				void execOnChangeEvent();
 			}, 1000);
 		}
 

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

@@ -113,7 +113,7 @@ function NoteEditor(props: NoteEditorProps) {
 					return { ...prev, user_updated_time: savedNote.user_updated_time };
 				});
 
-				ExternalEditWatcher.instance().updateNoteFile(savedNote);
+				void ExternalEditWatcher.instance().updateNoteFile(savedNote);
 
 				props.dispatch({
 					type: 'EDITOR_NOTE_STATUS_REMOVE',
@@ -141,7 +141,7 @@ function NoteEditor(props: NoteEditorProps) {
 	}
 
 	async function saveNoteAndWait(formNote: FormNote) {
-		saveNoteIfWillChange(formNote);
+		await saveNoteIfWillChange(formNote);
 		return formNote.saveActionQueue.waitForAllDone();
 	}
 
@@ -184,7 +184,7 @@ function NoteEditor(props: NoteEditorProps) {
 			value: props.selectedNoteHash ? props.selectedNoteHash : props.lastEditorScrollPercents[props.noteId] || 0,
 		});
 
-		ResourceEditWatcher.instance().stopWatchingAll();
+		void ResourceEditWatcher.instance().stopWatchingAll();
 	}, [formNote.id, previousNoteId]);
 
 	const onFieldChange = useCallback((field: string, value: any, changeId = 0) => {
@@ -365,7 +365,7 @@ function NoteEditor(props: NoteEditorProps) {
 	function renderTagBar() {
 		const theme = themeStyle(props.themeId);
 		const noteIds = [formNote.id];
-		const instructions = <span onClick={() => { CommandService.instance().execute('setTags', noteIds); }} style={{ ...theme.clickableTextStyle, whiteSpace: 'nowrap' }}>Click to add tags...</span>;
+		const instructions = <span onClick={() => { void CommandService.instance().execute('setTags', noteIds); }} style={{ ...theme.clickableTextStyle, whiteSpace: 'nowrap' }}>Click to add tags...</span>;
 		const tagList = props.selectedNoteTags.length ? <TagList items={props.selectedNoteTags} /> : null;
 
 		return (

packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx

@@ -82,9 +82,9 @@ export default function NoteTitleBar(props: Props) {
 			event.preventDefault();
 
 			if (event.shiftKey) {
-				CommandService.instance().execute('focusElement', 'noteList');
+				void CommandService.instance().execute('focusElement', 'noteList');
 			} else {
-				CommandService.instance().execute('focusElement', 'noteBody');
+				void CommandService.instance().execute('focusElement', 'noteBody');
 			}
 		}
 	}, []);