Merge branch 'dev' into plugin_editor_context_menu

.eslintignore

@@ -58,15 +58,105 @@ 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
 packages/app-cli/app/services/plugins/PluginRunner.d.ts
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/services/plugins/PluginRunner.js.map
-packages/app-cli/tests/EnexToMd.d.ts
-packages/app-cli/tests/EnexToMd.js
-packages/app-cli/tests/EnexToMd.js.map
+packages/app-cli/build/LinkSelector.d.ts
+packages/app-cli/build/LinkSelector.js
+packages/app-cli/build/LinkSelector.js.map
+packages/app-cli/build/services/plugins/PluginRunner.d.ts
+packages/app-cli/build/services/plugins/PluginRunner.js
+packages/app-cli/build/services/plugins/PluginRunner.js.map
 packages/app-cli/tests/InMemoryCache.d.ts
 packages/app-cli/tests/InMemoryCache.js
 packages/app-cli/tests/InMemoryCache.js.map
@@ -76,12 +166,6 @@ packages/app-cli/tests/MdToHtml.js.map
 packages/app-cli/tests/fsDriver.d.ts
 packages/app-cli/tests/fsDriver.js
 packages/app-cli/tests/fsDriver.js.map
-packages/app-cli/tests/models_Folder.d.ts
-packages/app-cli/tests/models_Folder.js
-packages/app-cli/tests/models_Folder.js.map
-packages/app-cli/tests/models_Note.d.ts
-packages/app-cli/tests/models_Note.js
-packages/app-cli/tests/models_Note.js.map
 packages/app-cli/tests/models_Setting.d.ts
 packages/app-cli/tests/models_Setting.js
 packages/app-cli/tests/models_Setting.js.map
@@ -106,15 +190,6 @@ packages/app-cli/tests/services_keychainService.js.map
 packages/app-cli/tests/services_rest_Api.d.ts
 packages/app-cli/tests/services_rest_Api.js
 packages/app-cli/tests/services_rest_Api.js.map
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.d.ts
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js.map
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.d.ts
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js.map
-packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.d.ts
-packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js
-packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js.map
 packages/app-cli/tests/support/plugins/content_script/api/index.d.ts
 packages/app-cli/tests/support/plugins/content_script/api/index.js
 packages/app-cli/tests/support/plugins/content_script/api/index.js.map
@@ -133,15 +208,6 @@ packages/app-cli/tests/support/plugins/dialog/api/types.js.map
 packages/app-cli/tests/support/plugins/dialog/src/index.d.ts
 packages/app-cli/tests/support/plugins/dialog/src/index.js
 packages/app-cli/tests/support/plugins/dialog/src/index.js.map
-packages/app-cli/tests/support/plugins/editor_context_menu/api/index.d.ts
-packages/app-cli/tests/support/plugins/editor_context_menu/api/index.js
-packages/app-cli/tests/support/plugins/editor_context_menu/api/index.js.map
-packages/app-cli/tests/support/plugins/editor_context_menu/api/types.d.ts
-packages/app-cli/tests/support/plugins/editor_context_menu/api/types.js
-packages/app-cli/tests/support/plugins/editor_context_menu/api/types.js.map
-packages/app-cli/tests/support/plugins/editor_context_menu/src/index.d.ts
-packages/app-cli/tests/support/plugins/editor_context_menu/src/index.js
-packages/app-cli/tests/support/plugins/editor_context_menu/src/index.js.map
 packages/app-cli/tests/support/plugins/events/api/index.d.ts
 packages/app-cli/tests/support/plugins/events/api/index.js
 packages/app-cli/tests/support/plugins/events/api/index.js.map
@@ -151,15 +217,6 @@ packages/app-cli/tests/support/plugins/events/api/types.js.map
 packages/app-cli/tests/support/plugins/events/src/index.d.ts
 packages/app-cli/tests/support/plugins/events/src/index.js
 packages/app-cli/tests/support/plugins/events/src/index.js.map
-packages/app-cli/tests/support/plugins/jpl_test/api/index.d.ts
-packages/app-cli/tests/support/plugins/jpl_test/api/index.js
-packages/app-cli/tests/support/plugins/jpl_test/api/index.js.map
-packages/app-cli/tests/support/plugins/jpl_test/api/types.d.ts
-packages/app-cli/tests/support/plugins/jpl_test/api/types.js
-packages/app-cli/tests/support/plugins/jpl_test/api/types.js.map
-packages/app-cli/tests/support/plugins/jpl_test/src/index.d.ts
-packages/app-cli/tests/support/plugins/jpl_test/src/index.js
-packages/app-cli/tests/support/plugins/jpl_test/src/index.js.map
 packages/app-cli/tests/support/plugins/json_export/api/index.d.ts
 packages/app-cli/tests/support/plugins/json_export/api/index.js
 packages/app-cli/tests/support/plugins/json_export/api/index.js.map
@@ -253,12 +310,6 @@ packages/app-desktop/bridge.js.map
 packages/app-desktop/commands/copyDevCommand.d.ts
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyDevCommand.js.map
-packages/app-desktop/commands/exportFolders.d.ts
-packages/app-desktop/commands/exportFolders.js
-packages/app-desktop/commands/exportFolders.js.map
-packages/app-desktop/commands/exportNotes.d.ts
-packages/app-desktop/commands/exportNotes.js
-packages/app-desktop/commands/exportNotes.js.map
 packages/app-desktop/commands/focusElement.d.ts
 packages/app-desktop/commands/focusElement.js
 packages/app-desktop/commands/focusElement.js.map
@@ -286,9 +337,6 @@ packages/app-desktop/gui/ConfigScreen/ConfigScreen.js.map
 packages/app-desktop/gui/ConfigScreen/SideBar.d.ts
 packages/app-desktop/gui/ConfigScreen/SideBar.js
 packages/app-desktop/gui/ConfigScreen/SideBar.js.map
-packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.d.ts
-packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.js
-packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
@@ -430,9 +478,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js.map
@@ -454,6 +499,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.js
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.js.map
@@ -652,9 +700,6 @@ packages/app-desktop/gui/ToolbarButton/ToolbarButton.js.map
 packages/app-desktop/gui/ToolbarButton/styles/index.d.ts
 packages/app-desktop/gui/ToolbarButton/styles/index.js
 packages/app-desktop/gui/ToolbarButton/styles/index.js.map
-packages/app-desktop/gui/dialogs.d.ts
-packages/app-desktop/gui/dialogs.js
-packages/app-desktop/gui/dialogs.js.map
 packages/app-desktop/gui/hooks/useEffectDebugger.d.ts
 packages/app-desktop/gui/hooks/useEffectDebugger.js
 packages/app-desktop/gui/hooks/useEffectDebugger.js.map
@@ -667,9 +712,6 @@ packages/app-desktop/gui/hooks/usePrevious.js.map
 packages/app-desktop/gui/hooks/usePropsDebugger.d.ts
 packages/app-desktop/gui/hooks/usePropsDebugger.js
 packages/app-desktop/gui/hooks/usePropsDebugger.js.map
-packages/app-desktop/gui/lib/ToggleButton/ToggleButton.d.ts
-packages/app-desktop/gui/lib/ToggleButton/ToggleButton.js
-packages/app-desktop/gui/lib/ToggleButton/ToggleButton.js.map
 packages/app-desktop/gui/menuCommandNames.d.ts
 packages/app-desktop/gui/menuCommandNames.js
 packages/app-desktop/gui/menuCommandNames.js.map
@@ -709,27 +751,12 @@ packages/app-desktop/services/plugins/UserWebviewDialog.js.map
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.d.ts
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.js
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.js.map
-packages/app-desktop/services/plugins/hooks/useContentSize.d.ts
-packages/app-desktop/services/plugins/hooks/useContentSize.js
-packages/app-desktop/services/plugins/hooks/useContentSize.js.map
-packages/app-desktop/services/plugins/hooks/useHtmlLoader.d.ts
-packages/app-desktop/services/plugins/hooks/useHtmlLoader.js
-packages/app-desktop/services/plugins/hooks/useHtmlLoader.js.map
-packages/app-desktop/services/plugins/hooks/useScriptLoader.d.ts
-packages/app-desktop/services/plugins/hooks/useScriptLoader.js
-packages/app-desktop/services/plugins/hooks/useScriptLoader.js.map
-packages/app-desktop/services/plugins/hooks/useSubmitHandler.d.ts
-packages/app-desktop/services/plugins/hooks/useSubmitHandler.js
-packages/app-desktop/services/plugins/hooks/useSubmitHandler.js.map
 packages/app-desktop/services/plugins/hooks/useThemeCss.d.ts
 packages/app-desktop/services/plugins/hooks/useThemeCss.js
 packages/app-desktop/services/plugins/hooks/useThemeCss.js.map
 packages/app-desktop/services/plugins/hooks/useViewIsReady.d.ts
 packages/app-desktop/services/plugins/hooks/useViewIsReady.js
 packages/app-desktop/services/plugins/hooks/useViewIsReady.js.map
-packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.d.ts
-packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js
-packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -823,18 +850,6 @@ packages/fork-htmlparser2/src/index.js.map
 packages/fork-htmlparser2/src/index.spec.d.ts
 packages/fork-htmlparser2/src/index.spec.js
 packages/fork-htmlparser2/src/index.spec.js.map
-packages/generator-joplin/generators/app/templates/api/index.d.ts
-packages/generator-joplin/generators/app/templates/api/index.js
-packages/generator-joplin/generators/app/templates/api/index.js.map
-packages/generator-joplin/generators/app/templates/api/types.d.ts
-packages/generator-joplin/generators/app/templates/api/types.js
-packages/generator-joplin/generators/app/templates/api/types.js.map
-packages/generator-joplin/generators/app/templates/api_index.d.ts
-packages/generator-joplin/generators/app/templates/api_index.js
-packages/generator-joplin/generators/app/templates/api_index.js.map
-packages/generator-joplin/generators/app/templates/src/index.d.ts
-packages/generator-joplin/generators/app/templates/src/index.js
-packages/generator-joplin/generators/app/templates/src/index.js.map
 packages/lib/AsyncActionQueue.d.ts
 packages/lib/AsyncActionQueue.js
 packages/lib/AsyncActionQueue.js.map
@@ -925,9 +940,6 @@ packages/lib/services/BaseService.js.map
 packages/lib/services/CommandService.d.ts
 packages/lib/services/CommandService.js
 packages/lib/services/CommandService.js.map
-packages/lib/services/ExternalEditWatcher.d.ts
-packages/lib/services/ExternalEditWatcher.js
-packages/lib/services/ExternalEditWatcher.js.map
 packages/lib/services/KeymapService.d.ts
 packages/lib/services/KeymapService.js
 packages/lib/services/KeymapService.js.map
@@ -1114,15 +1126,15 @@ packages/lib/services/plugins/reducer.js.map
 packages/lib/services/plugins/sandboxProxy.d.ts
 packages/lib/services/plugins/sandboxProxy.js
 packages/lib/services/plugins/sandboxProxy.js.map
+packages/lib/services/plugins/utils/contentScriptsToRendererRules.d.ts
+packages/lib/services/plugins/utils/contentScriptsToRendererRules.js
+packages/lib/services/plugins/utils/contentScriptsToRendererRules.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
 packages/lib/services/plugins/utils/executeSandboxCall.d.ts
 packages/lib/services/plugins/utils/executeSandboxCall.js
 packages/lib/services/plugins/utils/executeSandboxCall.js.map
-packages/lib/services/plugins/utils/loadContentScripts.d.ts
-packages/lib/services/plugins/utils/loadContentScripts.js
-packages/lib/services/plugins/utils/loadContentScripts.js.map
 packages/lib/services/plugins/utils/manifestFromObject.d.ts
 packages/lib/services/plugins/utils/manifestFromObject.js
 packages/lib/services/plugins/utils/manifestFromObject.js.map
@@ -1261,9 +1273,6 @@ packages/lib/uuid.js.map
 packages/lib/versionInfo.d.ts
 packages/lib/versionInfo.js
 packages/lib/versionInfo.js.map
-packages/renderer/HtmlToHtml.d.ts
-packages/renderer/HtmlToHtml.js
-packages/renderer/HtmlToHtml.js.map
 packages/renderer/InMemoryCache.d.ts
 packages/renderer/InMemoryCache.js
 packages/renderer/InMemoryCache.js.map
@@ -1273,12 +1282,6 @@ packages/renderer/MarkupToHtml.js.map
 packages/renderer/MdToHtml.d.ts
 packages/renderer/MdToHtml.js
 packages/renderer/MdToHtml.js.map
-packages/renderer/MdToHtml/linkReplacement.d.ts
-packages/renderer/MdToHtml/linkReplacement.js
-packages/renderer/MdToHtml/linkReplacement.js.map
-packages/renderer/MdToHtml/linkReplacement.test.d.ts
-packages/renderer/MdToHtml/linkReplacement.test.js
-packages/renderer/MdToHtml/linkReplacement.test.js.map
 packages/renderer/MdToHtml/rules/checkbox.d.ts
 packages/renderer/MdToHtml/rules/checkbox.js
 packages/renderer/MdToHtml/rules/checkbox.js.map
@@ -1312,9 +1315,6 @@ packages/renderer/MdToHtml/rules/mermaid.js.map
 packages/renderer/MdToHtml/rules/sanitize_html.d.ts
 packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/sanitize_html.js.map
-packages/renderer/htmlUtils.d.ts
-packages/renderer/htmlUtils.js
-packages/renderer/htmlUtils.js.map
 packages/renderer/index.d.ts
 packages/renderer/index.js
 packages/renderer/index.js.map
@@ -1324,7 +1324,4 @@ packages/renderer/noteStyle.js.map
 packages/renderer/pathUtils.d.ts
 packages/renderer/pathUtils.js
 packages/renderer/pathUtils.js.map
-packages/renderer/utils.d.ts
-packages/renderer/utils.js
-packages/renderer/utils.js.map
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD

.eslintrc.js

@@ -15,8 +15,7 @@ module.exports = {
 		'Atomics': 'readonly',
 		'SharedArrayBuffer': 'readonly',
 
-		// Jest variables
-		'test': 'readonly',
+		// Jasmine variables
 		'expect': 'readonly',
 		'describe': 'readonly',
 		'it': 'readonly',
@@ -24,6 +23,10 @@ module.exports = {
 		'afterAll': 'readonly',
 		'beforeEach': 'readonly',
 		'afterEach': 'readonly',
+		'jasmine': 'readonly',
+
+		// Jest variables
+		'test': 'readonly',
 
 		// React Native variables
 		'__DEV__': 'readonly',
@@ -126,10 +129,6 @@ 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.
@@ -156,7 +155,6 @@ module.exports = {
 						'requireLast': false,
 					},
 				}],
-				'@typescript-eslint/no-floating-promises': ['error'],
 			},
 		},
 	],

.gitignore

@@ -50,15 +50,105 @@ 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
 packages/app-cli/app/services/plugins/PluginRunner.d.ts
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/services/plugins/PluginRunner.js.map
-packages/app-cli/tests/EnexToMd.d.ts
-packages/app-cli/tests/EnexToMd.js
-packages/app-cli/tests/EnexToMd.js.map
+packages/app-cli/build/LinkSelector.d.ts
+packages/app-cli/build/LinkSelector.js
+packages/app-cli/build/LinkSelector.js.map
+packages/app-cli/build/services/plugins/PluginRunner.d.ts
+packages/app-cli/build/services/plugins/PluginRunner.js
+packages/app-cli/build/services/plugins/PluginRunner.js.map
 packages/app-cli/tests/InMemoryCache.d.ts
 packages/app-cli/tests/InMemoryCache.js
 packages/app-cli/tests/InMemoryCache.js.map
@@ -68,12 +158,6 @@ packages/app-cli/tests/MdToHtml.js.map
 packages/app-cli/tests/fsDriver.d.ts
 packages/app-cli/tests/fsDriver.js
 packages/app-cli/tests/fsDriver.js.map
-packages/app-cli/tests/models_Folder.d.ts
-packages/app-cli/tests/models_Folder.js
-packages/app-cli/tests/models_Folder.js.map
-packages/app-cli/tests/models_Note.d.ts
-packages/app-cli/tests/models_Note.js
-packages/app-cli/tests/models_Note.js.map
 packages/app-cli/tests/models_Setting.d.ts
 packages/app-cli/tests/models_Setting.js
 packages/app-cli/tests/models_Setting.js.map
@@ -98,15 +182,6 @@ packages/app-cli/tests/services_keychainService.js.map
 packages/app-cli/tests/services_rest_Api.d.ts
 packages/app-cli/tests/services_rest_Api.js
 packages/app-cli/tests/services_rest_Api.js.map
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.d.ts
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js.map
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.d.ts
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js
-packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js.map
-packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.d.ts
-packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js
-packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js.map
 packages/app-cli/tests/support/plugins/content_script/api/index.d.ts
 packages/app-cli/tests/support/plugins/content_script/api/index.js
 packages/app-cli/tests/support/plugins/content_script/api/index.js.map
@@ -125,15 +200,6 @@ packages/app-cli/tests/support/plugins/dialog/api/types.js.map
 packages/app-cli/tests/support/plugins/dialog/src/index.d.ts
 packages/app-cli/tests/support/plugins/dialog/src/index.js
 packages/app-cli/tests/support/plugins/dialog/src/index.js.map
-packages/app-cli/tests/support/plugins/editor_context_menu/api/index.d.ts
-packages/app-cli/tests/support/plugins/editor_context_menu/api/index.js
-packages/app-cli/tests/support/plugins/editor_context_menu/api/index.js.map
-packages/app-cli/tests/support/plugins/editor_context_menu/api/types.d.ts
-packages/app-cli/tests/support/plugins/editor_context_menu/api/types.js
-packages/app-cli/tests/support/plugins/editor_context_menu/api/types.js.map
-packages/app-cli/tests/support/plugins/editor_context_menu/src/index.d.ts
-packages/app-cli/tests/support/plugins/editor_context_menu/src/index.js
-packages/app-cli/tests/support/plugins/editor_context_menu/src/index.js.map
 packages/app-cli/tests/support/plugins/events/api/index.d.ts
 packages/app-cli/tests/support/plugins/events/api/index.js
 packages/app-cli/tests/support/plugins/events/api/index.js.map
@@ -143,15 +209,6 @@ packages/app-cli/tests/support/plugins/events/api/types.js.map
 packages/app-cli/tests/support/plugins/events/src/index.d.ts
 packages/app-cli/tests/support/plugins/events/src/index.js
 packages/app-cli/tests/support/plugins/events/src/index.js.map
-packages/app-cli/tests/support/plugins/jpl_test/api/index.d.ts
-packages/app-cli/tests/support/plugins/jpl_test/api/index.js
-packages/app-cli/tests/support/plugins/jpl_test/api/index.js.map
-packages/app-cli/tests/support/plugins/jpl_test/api/types.d.ts
-packages/app-cli/tests/support/plugins/jpl_test/api/types.js
-packages/app-cli/tests/support/plugins/jpl_test/api/types.js.map
-packages/app-cli/tests/support/plugins/jpl_test/src/index.d.ts
-packages/app-cli/tests/support/plugins/jpl_test/src/index.js
-packages/app-cli/tests/support/plugins/jpl_test/src/index.js.map
 packages/app-cli/tests/support/plugins/json_export/api/index.d.ts
 packages/app-cli/tests/support/plugins/json_export/api/index.js
 packages/app-cli/tests/support/plugins/json_export/api/index.js.map
@@ -245,12 +302,6 @@ packages/app-desktop/bridge.js.map
 packages/app-desktop/commands/copyDevCommand.d.ts
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyDevCommand.js.map
-packages/app-desktop/commands/exportFolders.d.ts
-packages/app-desktop/commands/exportFolders.js
-packages/app-desktop/commands/exportFolders.js.map
-packages/app-desktop/commands/exportNotes.d.ts
-packages/app-desktop/commands/exportNotes.js
-packages/app-desktop/commands/exportNotes.js.map
 packages/app-desktop/commands/focusElement.d.ts
 packages/app-desktop/commands/focusElement.js
 packages/app-desktop/commands/focusElement.js.map
@@ -278,9 +329,6 @@ packages/app-desktop/gui/ConfigScreen/ConfigScreen.js.map
 packages/app-desktop/gui/ConfigScreen/SideBar.d.ts
 packages/app-desktop/gui/ConfigScreen/SideBar.js
 packages/app-desktop/gui/ConfigScreen/SideBar.js.map
-packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.d.ts
-packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.js
-packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
@@ -422,9 +470,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js.map
@@ -446,6 +491,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.js
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.js.map
@@ -644,9 +692,6 @@ packages/app-desktop/gui/ToolbarButton/ToolbarButton.js.map
 packages/app-desktop/gui/ToolbarButton/styles/index.d.ts
 packages/app-desktop/gui/ToolbarButton/styles/index.js
 packages/app-desktop/gui/ToolbarButton/styles/index.js.map
-packages/app-desktop/gui/dialogs.d.ts
-packages/app-desktop/gui/dialogs.js
-packages/app-desktop/gui/dialogs.js.map
 packages/app-desktop/gui/hooks/useEffectDebugger.d.ts
 packages/app-desktop/gui/hooks/useEffectDebugger.js
 packages/app-desktop/gui/hooks/useEffectDebugger.js.map
@@ -659,9 +704,6 @@ packages/app-desktop/gui/hooks/usePrevious.js.map
 packages/app-desktop/gui/hooks/usePropsDebugger.d.ts
 packages/app-desktop/gui/hooks/usePropsDebugger.js
 packages/app-desktop/gui/hooks/usePropsDebugger.js.map
-packages/app-desktop/gui/lib/ToggleButton/ToggleButton.d.ts
-packages/app-desktop/gui/lib/ToggleButton/ToggleButton.js
-packages/app-desktop/gui/lib/ToggleButton/ToggleButton.js.map
 packages/app-desktop/gui/menuCommandNames.d.ts
 packages/app-desktop/gui/menuCommandNames.js
 packages/app-desktop/gui/menuCommandNames.js.map
@@ -701,27 +743,12 @@ packages/app-desktop/services/plugins/UserWebviewDialog.js.map
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.d.ts
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.js
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.js.map
-packages/app-desktop/services/plugins/hooks/useContentSize.d.ts
-packages/app-desktop/services/plugins/hooks/useContentSize.js
-packages/app-desktop/services/plugins/hooks/useContentSize.js.map
-packages/app-desktop/services/plugins/hooks/useHtmlLoader.d.ts
-packages/app-desktop/services/plugins/hooks/useHtmlLoader.js
-packages/app-desktop/services/plugins/hooks/useHtmlLoader.js.map
-packages/app-desktop/services/plugins/hooks/useScriptLoader.d.ts
-packages/app-desktop/services/plugins/hooks/useScriptLoader.js
-packages/app-desktop/services/plugins/hooks/useScriptLoader.js.map
-packages/app-desktop/services/plugins/hooks/useSubmitHandler.d.ts
-packages/app-desktop/services/plugins/hooks/useSubmitHandler.js
-packages/app-desktop/services/plugins/hooks/useSubmitHandler.js.map
 packages/app-desktop/services/plugins/hooks/useThemeCss.d.ts
 packages/app-desktop/services/plugins/hooks/useThemeCss.js
 packages/app-desktop/services/plugins/hooks/useThemeCss.js.map
 packages/app-desktop/services/plugins/hooks/useViewIsReady.d.ts
 packages/app-desktop/services/plugins/hooks/useViewIsReady.js
 packages/app-desktop/services/plugins/hooks/useViewIsReady.js.map
-packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.d.ts
-packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js
-packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -815,18 +842,6 @@ packages/fork-htmlparser2/src/index.js.map
 packages/fork-htmlparser2/src/index.spec.d.ts
 packages/fork-htmlparser2/src/index.spec.js
 packages/fork-htmlparser2/src/index.spec.js.map
-packages/generator-joplin/generators/app/templates/api/index.d.ts
-packages/generator-joplin/generators/app/templates/api/index.js
-packages/generator-joplin/generators/app/templates/api/index.js.map
-packages/generator-joplin/generators/app/templates/api/types.d.ts
-packages/generator-joplin/generators/app/templates/api/types.js
-packages/generator-joplin/generators/app/templates/api/types.js.map
-packages/generator-joplin/generators/app/templates/api_index.d.ts
-packages/generator-joplin/generators/app/templates/api_index.js
-packages/generator-joplin/generators/app/templates/api_index.js.map
-packages/generator-joplin/generators/app/templates/src/index.d.ts
-packages/generator-joplin/generators/app/templates/src/index.js
-packages/generator-joplin/generators/app/templates/src/index.js.map
 packages/lib/AsyncActionQueue.d.ts
 packages/lib/AsyncActionQueue.js
 packages/lib/AsyncActionQueue.js.map
@@ -917,9 +932,6 @@ packages/lib/services/BaseService.js.map
 packages/lib/services/CommandService.d.ts
 packages/lib/services/CommandService.js
 packages/lib/services/CommandService.js.map
-packages/lib/services/ExternalEditWatcher.d.ts
-packages/lib/services/ExternalEditWatcher.js
-packages/lib/services/ExternalEditWatcher.js.map
 packages/lib/services/KeymapService.d.ts
 packages/lib/services/KeymapService.js
 packages/lib/services/KeymapService.js.map
@@ -1106,15 +1118,15 @@ packages/lib/services/plugins/reducer.js.map
 packages/lib/services/plugins/sandboxProxy.d.ts
 packages/lib/services/plugins/sandboxProxy.js
 packages/lib/services/plugins/sandboxProxy.js.map
+packages/lib/services/plugins/utils/contentScriptsToRendererRules.d.ts
+packages/lib/services/plugins/utils/contentScriptsToRendererRules.js
+packages/lib/services/plugins/utils/contentScriptsToRendererRules.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
 packages/lib/services/plugins/utils/executeSandboxCall.d.ts
 packages/lib/services/plugins/utils/executeSandboxCall.js
 packages/lib/services/plugins/utils/executeSandboxCall.js.map
-packages/lib/services/plugins/utils/loadContentScripts.d.ts
-packages/lib/services/plugins/utils/loadContentScripts.js
-packages/lib/services/plugins/utils/loadContentScripts.js.map
 packages/lib/services/plugins/utils/manifestFromObject.d.ts
 packages/lib/services/plugins/utils/manifestFromObject.js
 packages/lib/services/plugins/utils/manifestFromObject.js.map
@@ -1253,9 +1265,6 @@ packages/lib/uuid.js.map
 packages/lib/versionInfo.d.ts
 packages/lib/versionInfo.js
 packages/lib/versionInfo.js.map
-packages/renderer/HtmlToHtml.d.ts
-packages/renderer/HtmlToHtml.js
-packages/renderer/HtmlToHtml.js.map
 packages/renderer/InMemoryCache.d.ts
 packages/renderer/InMemoryCache.js
 packages/renderer/InMemoryCache.js.map
@@ -1265,12 +1274,6 @@ packages/renderer/MarkupToHtml.js.map
 packages/renderer/MdToHtml.d.ts
 packages/renderer/MdToHtml.js
 packages/renderer/MdToHtml.js.map
-packages/renderer/MdToHtml/linkReplacement.d.ts
-packages/renderer/MdToHtml/linkReplacement.js
-packages/renderer/MdToHtml/linkReplacement.js.map
-packages/renderer/MdToHtml/linkReplacement.test.d.ts
-packages/renderer/MdToHtml/linkReplacement.test.js
-packages/renderer/MdToHtml/linkReplacement.test.js.map
 packages/renderer/MdToHtml/rules/checkbox.d.ts
 packages/renderer/MdToHtml/rules/checkbox.js
 packages/renderer/MdToHtml/rules/checkbox.js.map
@@ -1304,9 +1307,6 @@ packages/renderer/MdToHtml/rules/mermaid.js.map
 packages/renderer/MdToHtml/rules/sanitize_html.d.ts
 packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/sanitize_html.js.map
-packages/renderer/htmlUtils.d.ts
-packages/renderer/htmlUtils.js
-packages/renderer/htmlUtils.js.map
 packages/renderer/index.d.ts
 packages/renderer/index.js
 packages/renderer/index.js.map
@@ -1316,7 +1316,4 @@ packages/renderer/noteStyle.js.map
 packages/renderer/pathUtils.d.ts
 packages/renderer/pathUtils.js
 packages/renderer/pathUtils.js.map
-packages/renderer/utils.d.ts
-packages/renderer/utils.js
-packages/renderer/utils.js.map
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD

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 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.
+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.
 
 ## Hot reload
 

Joplin_install_and_update.sh

@@ -162,7 +162,7 @@ DESKTOP=${DESKTOP,,}  # convert to lower case
 
 #-----------------------------------------------------
 echo 'Create Desktop icon...'
-if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.*|.*i3.* ]]
+if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.* ]]
 then
     : "${TMPDIR:=$TEMP_DIR}"
     # This command extracts to squashfs-root by default and can't be changed...

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.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)
+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)
 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
@@ -85,19 +85,13 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 	- [How to enable debug mode](https://github.com/laurent22/joplin/blob/dev/readme/debugging.md)
 	- [FAQ](https://github.com/laurent22/joplin/blob/dev/readme/faq.md)
 
-- Joplin API - Get Started
+- Joplin API
 
 	- [Joplin API Overview](https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md)
 	- [Plugin development](https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md)
 	- [Plugin tutorial](https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md)
-	
-
-- Joplin API - References
-
 	- [Plugin API](https://joplinapp.org/api/references/plugin_api/classes/joplin.html)
-	- [Data API](https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md)
-	- [Plugin manifest](https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manifest.md)
-	- [Plugin loading rules](https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loading_rules.md)
+	- [Data API documentation](https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md)
 
 - Development
 
@@ -402,14 +396,13 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 
 # Community
 
-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
+- 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.
 
 # Contributing
 

docs/api/get_started/plugins/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/api/overview/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>
@@ -401,12 +394,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <h1>Extending Joplin<a name="extending-joplin" href="#extending-joplin" class="heading-anchor">🔗</a></h1>
 <p>Joplin provides a number of extension points to allow third-party applications to access its data, or to develop plugins.</p>
 <p>The two main extension points are:</p>
-<h2>Data API<a name="data-api" href="#data-api" class="heading-anchor">🔗</a></h2>
-<p>The <a href="https://joplinapp.org/api/references/rest_api/">data API</a> provides access to Joplin data to external applications. It is possible, using standard HTTP calls, to create, modify or delete notes, notebooks, tags, etc. as well as attach files to notes and retrieve these files.</p>
-<p>This is for example how the web clipper communicates with Joplin, and this is most likely what you will need if you have an external application that needs access to Joplin data.</p>
-<p>To get started with the data API, <a href="https://joplinapp.org/api/references/rest_api/">check the documentation</a>.</p>
-<h2>Plugin API<a name="plugin-api" href="#plugin-api" class="heading-anchor">🔗</a></h2>
-<p>With plugins you can directly modify Joplin by adding new features to the application. Using this API, you can:</p>
+<ul>
+<li>
+<p>The <a href="https://joplinapp.org/api/references/rest_api/">data API</a>, which is a server that provides access to Joplin data to external applications. It is possible, using standard HTTP calls, to create, modify or delete notes, notebooks, tags, etc. as well as attach files to notes and retrieve these files. This is for example how the web clipper communicates with Joplin.</p>
+</li>
+<li>
+<p>The <a href="https://joplinapp.org/api/get_started/plugins/">plugin API</a>, which allows directly modifying Joplin by adding new features to the application. Using this API, you can:</p>
 <ul>
 <li>Access notes, folders, etc. via the data API</li>
 <li>Add a view to display custom data using HTML/CSS/JS</li>
@@ -417,11 +410,9 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <li>Hook into the application to set additional options and customise Joplin's behaviour</li>
 <li>Create a module to export or import data into Joplin</li>
 <li>Define new settings and setting sections, and get/set them from the plugin</li>
-<li>Create a new Markdown plugin to render custom markup.</li>
-<li>Create an editor plugin to modify low-level the behaviour of the Markdown editor (CodeMirror)</li>
 </ul>
-<p>To get started with the plugin API, check the <a href="https://joplinapp.org/api/get_started/plugins/">Get Started</a> page or have a look at the <a href="https://joplinapp.org/api/tutorials/toc_plugin/">TOC tutorial</a>.</p>
-<p>Once you are familiar with the API, you can have a look at the <a href="https://joplinapp.org/api/get_started/plugins/">plugin API reference</a> for a detailed documentation about each supported feature.</p>
+</li>
+</ul>
 
 		<div class="bottom-links">
 			<a href="https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md">

docs/api/references/development_mode/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/api/references/plugin_api/classes/joplinviewsdialogs.html

@@ -67,33 +67,12 @@
 			<section class="tsd-panel tsd-comment">
 				<div class="tsd-comment tsd-typography">
 					<div class="lead">
-						<p>Allows creating and managing dialogs. A dialog is modal window that
-							contains a webview and a row of buttons. You can update the update the
-							webview using the <code>setHtml</code> method. Dialogs are hidden by default and
-							you need to call <code>open()</code> to open them. Once the user clicks on a
-							button, the <code>open</code> call will return an object indicating what button was
-						clicked on.</p>
+						<p>Allows creating and managing dialogs. A dialog is modal window that contains a webview and a row of buttons. You can update the update the webview using the <code>setHtml</code> method.
+							Dialogs are hidden by default and you need to call <code>open()</code> to open them. Once the user clicks on a button, the <code>open</code> call will return an object indicating what button was clicked
+							on. If your HTML content included one or more form, a <code>formData</code> object will also be included with the key/value for each form.
+						There is currently no &quot;close&quot; method since the dialog should be thought as a modal one and thus can only be closed by clicking on one of the buttons.</p>
 					</div>
-					<a href="#retrieving-form-values" id="retrieving-form-values" style="color: inherit; text-decoration: none;">
-						<h2>Retrieving form values</h2>
-					</a>
-					<p>If your HTML content included one or more forms, a <code>formData</code> object
-					will also be included with the key/value for each form.</p>
-					<a href="#special-button-ids" id="special-button-ids" style="color: inherit; text-decoration: none;">
-						<h2>Special button IDs</h2>
-					</a>
-					<p>The following buttons IDs have a special meaning:</p>
-					<ul>
-						<li><code>ok</code>, <code>yes</code>, <code>submit</code>, <code>confirm</code>: They are considered &quot;submit&quot; buttons</li>
-						<li><code>cancel</code>, <code>no</code>, <code>reject</code>: They are considered &quot;dismiss&quot; buttons</li>
-					</ul>
-					<p>This information is used by the application to determine what action
-						should be done when the user presses &quot;Enter&quot; or &quot;Escape&quot; within the
-						dialog. If they press &quot;Enter&quot;, the first &quot;submit&quot; button will be
-						automatically clicked. If they press &quot;Escape&quot; the first &quot;dismiss&quot; button
-					will be automatically clicked.</p>
-					<p><a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/dialog">View the demo
-					plugin</a></p>
+					<p><a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/dialog">View the demo plugin</a></p>
 				</div>
 			</section>
 			<!--
@@ -135,7 +114,7 @@
 					<a name="create" class="tsd-anchor"></a>
 					<h3>create</h3>
 					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
-						<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span>id<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><a href="../globals.html#viewhandle" class="tsd-signature-type">ViewHandle</a><span class="tsd-signature-symbol">&gt;</span></li>
+						<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><a href="../globals.html#viewhandle" class="tsd-signature-type">ViewHandle</a><span class="tsd-signature-symbol">&gt;</span></li>
 					</ul>
 					<ul class="tsd-descriptions">
 						<li class="tsd-description">
@@ -146,12 +125,6 @@
 									<p>Creates a new dialog</p>
 								</div>
 							</div>
-							<h4 class="tsd-parameters-title">Parameters</h4>
-							<ul class="tsd-parameters">
-								<li>
-									<h5>id: <span class="tsd-signature-type">string</span></h5>
-								</li>
-							</ul>
 							<!-- JOPLINCHANGE
     <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><a href="../globals.html#viewhandle" class="tsd-signature-type">ViewHandle</a><span class="tsd-signature-symbol">&gt;</span></h4>
 

docs/api/references/plugin_api/classes/joplinviewsmenuitems.html

@@ -107,7 +107,7 @@
 					<a name="create" class="tsd-anchor"></a>
 					<h3>create</h3>
 					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
-						<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span>id<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, commandName<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, location<span class="tsd-signature-symbol">?: </span><a href="../enums/menuitemlocation.html" class="tsd-signature-type">MenuItemLocation</a>, options<span class="tsd-signature-symbol">?: </span><a href="../interfaces/createmenuitemoptions.html" class="tsd-signature-type">CreateMenuItemOptions</a><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></li>
+						<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span>commandName<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, location<span class="tsd-signature-symbol">?: </span><a href="../enums/menuitemlocation.html" class="tsd-signature-type">MenuItemLocation</a>, options<span class="tsd-signature-symbol">?: </span><a href="../interfaces/createmenuitemoptions.html" class="tsd-signature-type">CreateMenuItemOptions</a><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></li>
 					</ul>
 					<ul class="tsd-descriptions">
 						<li class="tsd-description">
@@ -120,9 +120,6 @@
 							</div>
 							<h4 class="tsd-parameters-title">Parameters</h4>
 							<ul class="tsd-parameters">
-								<li>
-									<h5>id: <span class="tsd-signature-type">string</span></h5>
-								</li>
 								<li>
 									<h5>commandName: <span class="tsd-signature-type">string</span></h5>
 								</li>

docs/api/references/plugin_api/classes/joplinviewsmenus.html

@@ -107,7 +107,7 @@
 					<a name="create" class="tsd-anchor"></a>
 					<h3>create</h3>
 					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
-						<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span>id<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, label<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, menuItems<span class="tsd-signature-symbol">: </span><a href="../interfaces/menuitem.html" class="tsd-signature-type">MenuItem</a><span class="tsd-signature-symbol">[]</span>, location<span class="tsd-signature-symbol">?: </span><a href="../enums/menuitemlocation.html" class="tsd-signature-type">MenuItemLocation</a><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></li>
+						<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span>label<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, menuItems<span class="tsd-signature-symbol">: </span><a href="../interfaces/menuitem.html" class="tsd-signature-type">MenuItem</a><span class="tsd-signature-symbol">[]</span>, location<span class="tsd-signature-symbol">?: </span><a href="../enums/menuitemlocation.html" class="tsd-signature-type">MenuItemLocation</a><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></li>
 					</ul>
 					<ul class="tsd-descriptions">
 						<li class="tsd-description">
@@ -121,9 +121,6 @@
 							</div>
 							<h4 class="tsd-parameters-title">Parameters</h4>
 							<ul class="tsd-parameters">
-								<li>
-									<h5>id: <span class="tsd-signature-type">string</span></h5>
-								</li>
 								<li>
 									<h5>label: <span class="tsd-signature-type">string</span></h5>
 								</li>

docs/api/references/plugin_api/classes/joplinviewspanels.html

@@ -67,11 +67,8 @@
 			<section class="tsd-panel tsd-comment">
 				<div class="tsd-comment tsd-typography">
 					<div class="lead">
-						<p>Allows creating and managing view panels. View panels currently are
-							displayed at the right of the sidebar and allows displaying any HTML
-							content (within a webview) and update it in real-time. For example it
-							could be used to display a table of content for the active note, or
-						display various metadata or graph.</p>
+						<p>Allows creating and managing view panels. View panels currently are displayed at the right of the sidebar and allows displaying any HTML content (within a webview) and update it in real-time. For example
+						it could be used to display a table of content for the active note, or display various metadata or graph.</p>
 					</div>
 					<p><a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/toc">View the demo plugin</a></p>
 				</div>
@@ -146,7 +143,7 @@
 					<a name="create" class="tsd-anchor"></a>
 					<h3>create</h3>
 					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
-						<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span>id<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><a href="../globals.html#viewhandle" class="tsd-signature-type">ViewHandle</a><span class="tsd-signature-symbol">&gt;</span></li>
+						<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><a href="../globals.html#viewhandle" class="tsd-signature-type">ViewHandle</a><span class="tsd-signature-symbol">&gt;</span></li>
 					</ul>
 					<ul class="tsd-descriptions">
 						<li class="tsd-description">
@@ -157,12 +154,6 @@
 									<p>Creates a new panel</p>
 								</div>
 							</div>
-							<h4 class="tsd-parameters-title">Parameters</h4>
-							<ul class="tsd-parameters">
-								<li>
-									<h5>id: <span class="tsd-signature-type">string</span></h5>
-								</li>
-							</ul>
 							<!-- JOPLINCHANGE
     <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><a href="../globals.html#viewhandle" class="tsd-signature-type">ViewHandle</a><span class="tsd-signature-symbol">&gt;</span></h4>
 

docs/api/references/plugin_api/classes/joplinviewstoolbarbuttons.html

@@ -107,7 +107,7 @@
 					<a name="create" class="tsd-anchor"></a>
 					<h3>create</h3>
 					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
-						<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span>id<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, commandName<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, location<span class="tsd-signature-symbol">: </span><a href="../enums/toolbarbuttonlocation.html" class="tsd-signature-type">ToolbarButtonLocation</a><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></li>
+						<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span>commandName<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, location<span class="tsd-signature-symbol">: </span><a href="../enums/toolbarbuttonlocation.html" class="tsd-signature-type">ToolbarButtonLocation</a><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></li>
 					</ul>
 					<ul class="tsd-descriptions">
 						<li class="tsd-description">
@@ -120,9 +120,6 @@
 							</div>
 							<h4 class="tsd-parameters-title">Parameters</h4>
 							<ul class="tsd-parameters">
-								<li>
-									<h5>id: <span class="tsd-signature-type">string</span></h5>
-								</li>
 								<li>
 									<h5>commandName: <span class="tsd-signature-type">string</span></h5>
 								</li>

docs/api/references/plugin_api/enums/menuitemlocation.html

@@ -73,11 +73,9 @@
 							<ul class="tsd-index-list">
 								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="menuitemlocation.html#context" class="tsd-kind-icon">Context</a></li>
 								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="menuitemlocation.html#edit" class="tsd-kind-icon">Edit</a></li>
-								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="menuitemlocation.html#editorcontextmenu" class="tsd-kind-icon">Editor<wbr>Context<wbr>Menu</a></li>
 								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="menuitemlocation.html#file" class="tsd-kind-icon">File</a></li>
 								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="menuitemlocation.html#help" class="tsd-kind-icon">Help</a></li>
 								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="menuitemlocation.html#note" class="tsd-kind-icon">Note</a></li>
-								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="menuitemlocation.html#notelistcontextmenu" class="tsd-kind-icon">Note<wbr>List<wbr>Context<wbr>Menu</a></li>
 								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="menuitemlocation.html#tools" class="tsd-kind-icon">Tools</a></li>
 								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="menuitemlocation.html#view" class="tsd-kind-icon">View</a></li>
 							</ul>
@@ -93,13 +91,6 @@
 					<div class="tsd-signature tsd-kind-icon">Context<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> = &quot;context&quot;</span></div>
 					<aside class="tsd-sources">
 					</aside>
-					<div class="tsd-comment tsd-typography">
-						<dl class="tsd-comment-tags">
-							<dt>deprecated</dt>
-							<dd><p>Do not use - same as NoteListContextMenu</p>
-							</dd>
-						</dl>
-					</div>
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
 					<a name="edit" class="tsd-anchor"></a>
@@ -108,13 +99,6 @@
 					<aside class="tsd-sources">
 					</aside>
 				</section>
-				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
-					<a name="editorcontextmenu" class="tsd-anchor"></a>
-					<h3>Editor<wbr>Context<wbr>Menu</h3>
-					<div class="tsd-signature tsd-kind-icon">Editor<wbr>Context<wbr>Menu<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> = &quot;editorContextMenu&quot;</span></div>
-					<aside class="tsd-sources">
-					</aside>
-				</section>
 				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
 					<a name="file" class="tsd-anchor"></a>
 					<h3>File</h3>
@@ -136,13 +120,6 @@
 					<aside class="tsd-sources">
 					</aside>
 				</section>
-				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
-					<a name="notelistcontextmenu" class="tsd-anchor"></a>
-					<h3>Note<wbr>List<wbr>Context<wbr>Menu</h3>
-					<div class="tsd-signature tsd-kind-icon">Note<wbr>List<wbr>Context<wbr>Menu<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> = &quot;noteListContextMenu&quot;</span></div>
-					<aside class="tsd-sources">
-					</aside>
-				</section>
 				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
 					<a name="tools" class="tsd-anchor"></a>
 					<h3>Tools</h3>
@@ -191,9 +168,6 @@
 							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
 								<a href="menuitemlocation.html#edit" class="tsd-kind-icon">Edit</a>
 							</li>
-							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
-								<a href="menuitemlocation.html#editorcontextmenu" class="tsd-kind-icon">Editor<wbr>Context<wbr>Menu</a>
-							</li>
 							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
 								<a href="menuitemlocation.html#file" class="tsd-kind-icon">File</a>
 							</li>
@@ -203,9 +177,6 @@
 							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
 								<a href="menuitemlocation.html#note" class="tsd-kind-icon">Note</a>
 							</li>
-							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
-								<a href="menuitemlocation.html#notelistcontextmenu" class="tsd-kind-icon">Note<wbr>List<wbr>Context<wbr>Menu</a>
-							</li>
 							<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
 								<a href="menuitemlocation.html#tools" class="tsd-kind-icon">Tools</a>
 							</li>

docs/api/references/plugin_loading_rules/index.html

@@ -1,452 +0,0 @@
-<!doctype html>
-<html>
-
-<!--
-
-!!! WARNING !!!
-
-This file was auto-generated from readme/api/references/plugin_loading_rules.md and any manual change
-made to it will be overwritten. To make a change to this file please modify
-the source Markdown file:
-
-https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loading_rules.md
-
--->
-
-<head>
-	<title>Plugin Loading Rules | Joplin</title>
-	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
-	<link rel="shortcut icon" type="image/x-icon" href="https://joplinapp.org/favicon.ico">
-	<!-- <link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css">  -->
-	<link rel="stylesheet" href="https://joplinapp.org/css/fork-awesome.min.css"> 
-	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
-	<style>
-	body {
-		background-color: #F1F1F1;
-		color: #333333;
-	}
-
-	.root {
-		overflow: hidden;
-	}
-
-	a[href^="mailto:"] {
-		word-break: break-all;
-	}
-
-	table {
-		margin-bottom: 1em;
-	}
-	td, th {
-		padding: .8em;
-		border: 1px solid #ccc;
-	}
-
-	.page-markdown table pre,
-	.page-markdown table blockquote {
-		margin-bottom: 0;
-	}
-
-	.page-markdown table pre,
-	.page-markdown table blockquote {
-		margin-bottom: 0;
-	}
-
-	.page-markdown table pre {
-		background-color: rgba(0,0,0,0);
-		border: none;
-		margin: 0;
-		padding: 0;
-	}
-
-	h1, h2 {
-		border-bottom: 1px solid #eaecef;
-		padding-bottom: 0.3em;
-		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-		font-weight: 600;
-		font-size: 2em;
-		margin-bottom: 16px;
-	}
-	h2 {
-		font-size: 1.6em;
-	}
-	h3 {
-		font-size: 1.3em;
-	}
-	code {
-		color: black;
-		background-color: #eee;
-		border: 1px solid #ccc;
-		font-size: .85em;
-		word-break: break-all;
-	}
-	pre code {
-		border: none;
-	}
-	pre {
-		font-size: .85em;
-	}
-	blockquote {
-		font-size: 1em;
-		color: #555;
-	};
-	#toc ul {
-		margin-bottom: 10px;
-	}
-	#toc > ul > li {
-		margin-bottom: 10px;
-	}
-	#toc {
-		padding-bottom: 1em;
-	}
-	.title {
-		display: flex;
-		align-items: center;
-	}
-	.title-icon {
-		display: flex;
-		height: 1em;
-	}
-	.title-text {
-		display: flex;
-		font-weight: normal;
-		margin-bottom: .2em;
-		margin-left: .5em;
-	}
-	.sub-title {
-		font-weight: normal;
-	}
-	.container {
-		background-color: white;
-		padding: 0;
-		box-shadow: 0 10px 20px #888888;
-	}
-	table.screenshots {
-		margin-top: 2em;
-		margin-bottom: 2em;
-	}
-	table.screenshots th {
-		height: 3em;
-		text-align: center;
-	}
-	table.screenshots th, 
-	table.screenshots td {
-		border: 1px solid #C2C2C2;
-	}
-	img[align="left"] {
-		margin-right: 10px;
-		margin-bottom: 10px;
-	}
-	.mobile-screenshot {
-		height: 40em;
-		padding: 1em;
-	}
-	.cli-screenshot-wrapper {
-		background-color: black;
-		vertical-align: top;
-		padding: 1em 2em 1em 1em;
-	}
-	.cli-screenshot {
-		font-family: "Monaco", "Inconsolata", "CONSOLAS", "Deja Vu Sans Mono", "Droid Sans Mono", "Andale Mono", monospace;
-		background-color: black;
-		color: white;
-		border: none;
-	}
-	.cli-screenshot .prompt {
-		color: #48C2F0;
-	}
-	.top-screenshot {
-		margin-top: 2em;
-		text-align: center;
-	}
-	.header {
-		position: relative;
-		padding-left: 2em;
-		padding-right: 2em;
-		padding-top: 1em;
-		padding-bottom: 1em;
-		color: white;
-		background-color: #2B2B3D;
-	}
-	.header a h1 {
-		color: white;
-	}
-	.header a:hover {
-		text-decoration: none;
-	}
-	.content {
-		padding-left: 2em;
-		padding-right: 2em;
-		padding-bottom: 2em;
-		padding-top: 2em;
-	}
-	.forkme {
-		position: absolute;
-		right: 0;
-		top:0;
-	}
-	.nav-wrapper {
-		position: relative;
-		width: inherit;
-	}
-	.nav {
-		background-color: black;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.nav.sticky {
-		position:fixed;
-		top: 0;
-		width: inherit;
-		box-shadow: 0 0 10px #000000;
-	}
-	.nav a {
-		color: white;
-		display: inline-block;
-		padding: .6em .9em .6em .9em;
-	}
-	.nav ul {
-		padding-left: 2em;
-		margin-bottom: 0;
-		display: table-cell;
-		display: flex;
-		width: 100%;
-	}
-	.nav ul li {
-		display: inline-block;
-		padding: 0;
-	}
-	.nav li.selected {
-		background-color: #222;
-		font-weight: bold;
-	}
-	.nav-right {
-		display: flex;
-		text-align: right;
-		vertical-align: middle;
-		line-height: 0;
-		margin-right: 10px;
-	}
-	.nav-right .share-btn {
-		display: none;
-	}
-	.nav-right .small-share-btn {
-		display: none;
-	}
-	.footer {
-		padding: 2em;
-		border-top: 1px solid #d4d4d4;
-		margin-top: 2em;
-		color: gray;
-		font-size: .9em;
-	}
-	a.heading-anchor {
-		display: inline-block;
-		opacity: 0;
-		width: 1.3em;
-		font-size: 0.7em;
-		margin-left: 0.4em;
-		line-height: 1em;
-		text-decoration: none;
-		transition: opacity 0.3s;
-	}
-	a.heading-anchor:hover,
-	h1:hover a.heading-anchor,
-	h2:hover a.heading-anchor,
-	h3:hover a.heading-anchor,
-	h4:hover a.heading-anchor,
-	h5:hover a.heading-anchor,
-	h6:hover a.heading-anchor {
-		opacity: 1;
-	}
-
-	@media (min-width: 992px) {
-		.content{
-			display: flex;
-		}
-
-		#toc{
-			display: block!important;
-			align-self: flex-start;
-			width: 300px;
-			position: sticky; top: 20px; left: 0;            
-		}
-
-		.main{
-			width: calc(100% - 300px);
-		}
-	}
-
-	.bottom-links {
-		display: flex;
-		justify-content: center;
-		border-top: 1px solid #d4d4d4;
-		margin-top: 30px;
-		padding-top: 25px;
-	}
-
-	@media all and (min-width: 400px) {
-		.nav-right .share-btn {
-			display: inline-block;
-		}
-		.nav-right .small-share-btn {
-			display: none;
-		}
-	}
-</style>
-</head>
-
-<body>
-
-<div class="container root page-plugin_loading_rules">
-
-<div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
-	<a href="https://joplinapp.org"><h1 class="title"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png"><span class="title-text">Joplin</span></h1></a>
-	<p class="sub-title">An open source note taking and to-do application with synchronisation capabilities</p>
-</div>
-
-<div class="nav-wrapper">
-	<div class="nav">
-		<ul>
-			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
-			<li><a href="https://discourse.joplinapp.org" title="Forum">Forum</a></li>
-			<li><a class="help" href="#" title="Menu">Menu</a></li>
-			<!-- <li><a class="gsod" href="https://joplinapp.org/gsod2020/" title="Google Season of Docs 2020">GSoD 2020</a></li> -->
-		</ul>
-		<div class="nav-right">
-			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
-			-->
-			<iframe class="share-btn share-btn-github" src="https://ghbtns.com/github-btn.html?user=laurent22&repo=joplin&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
-		</div>
-	</div>
-</div>
-
-<div class="content">
-	<div id="toc"><ul>
-<li>
-<p>Applications</p>
-<ul>
-<li><a href="https://joplinapp.org/desktop/">Desktop application</a></li>
-<li><a href="https://joplinapp.org/mobile/">Mobile applications</a></li>
-<li><a href="https://joplinapp.org/terminal/">Terminal application</a></li>
-<li><a href="https://joplinapp.org/clipper/">Web Clipper</a></li>
-</ul>
-</li>
-<li>
-<p>Support</p>
-<ul>
-<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
-<li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
-<li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
-<li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
-<li><a href="https://joplinapp.org/faq/">FAQ</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - Get Started</p>
-<ul>
-<li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
-<li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
-<li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
-<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
-</ul>
-</li>
-<li>
-<p>Development</p>
-<ul>
-<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
-<li><a href="https://joplinapp.org/spec/e2ee/">End-to-end encryption spec</a></li>
-<li><a href="https://joplinapp.org/spec/history/">Note History spec</a></li>
-<li><a href="https://joplinapp.org/spec/sync_lock/">Sync Lock spec</a></li>
-<li><a href="https://joplinapp.org/spec/plugins/">Plugin Architecture spec</a></li>
-<li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
-</ul>
-</li>
-<li>
-<p>Google Summer of Code 2020</p>
-<ul>
-<li><a href="https://joplinapp.org/gsoc2020/index/">Google Summer of Code 2020</a></li>
-<li><a href="https://joplinapp.org/gsoc2020/ideas/">Project Ideas</a></li>
-</ul>
-</li>
-<li>
-<p>About</p>
-<ul>
-<li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
-<li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
-<li><a href="https://joplinapp.org/stats/">Stats</a></li>
-<li><a href="https://joplinapp.org/donate/">Donate</a></li>
-</ul>
-</li>
-</ul>
-</div>
-
-	<div class="main">
-<h1>Plugin Loading Rules<a name="plugin-loading-rules" href="#plugin-loading-rules" class="heading-anchor">🔗</a></h1>
-<p>When loading plugins from the profile <code>plugins</code> directory, Joplin will look at the following locations:</p>
-<ul>
-<li><code>plugins/PLUGIN_ID.js</code></li>
-<li><code>plugins/PLUGIN_ID/index.js</code></li>
-<li><code>plugins/PLUGIN_ID/dist/index.js</code></li>
-<li>Any directory or file that starts with &quot;_&quot; will be excluded. This can be used to disable a plugin without having to delete it from the directory.</li>
-</ul>
-<p><code>PLUGIN_ID</code> can be any string but it must be unique.</p>
-
-		<div class="bottom-links">
-			<a href="https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loading_rules.md">
-				<i class="fa fa-github"></i> Improve this doc
-			</a>
-		</div>
-<script>
-	function stickyHeader() { 
-		return; // Disabled
-
-		if ($(window).scrollTop() > 179) {
-			$('.nav').addClass('sticky'); 
-		} else {
-			$('.nav').removeClass('sticky');
-		}
-	}
-
-	$('#toc').hide();
-
-	$('.help').click(function(event) {
-		event.preventDefault();
-		$('#toc').show();
-	});
-
-	$(window).scroll(function() {
-		stickyHeader();
-	});
-
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
-</script>
-
-</div></div>
-
-<div class="footer">
-Copyright (C) 2016-2020 Laurent Cozic
-</div>
-</body>
-</html>

docs/api/references/plugin_manifest/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>
@@ -400,60 +393,19 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 	<div class="main">
 <h1>Plugin Manifest<a name="plugin-manifest" href="#plugin-manifest" class="heading-anchor">🔗</a></h1>
 <p>The manifest file is a JSON file that describes various properties of the plugin. If you use the Yeoman generator, it should be automatically generated based on the answers you've provided. The supported properties are:</p>
-<table>
-<thead>
-<tr>
-<th>Name</th>
-<th>Required?</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><code>manifest_version</code></td>
-<td><strong>Yes</strong></td>
-<td>For now should always be &quot;1&quot;.</td>
-</tr>
-<tr>
-<td><code>name</code></td>
-<td><strong>Yes</strong></td>
-<td>Name of the plugin. Should be a user-friendly string, as it will be displayed in the UI.</td>
-</tr>
-<tr>
-<td><code>version</code></td>
-<td><strong>Yes</strong></td>
-<td>Version number such as &quot;1.0.0&quot;.</td>
-</tr>
-<tr>
-<td><code>app_min_version</code></td>
-<td><strong>Yes</strong></td>
-<td>Minimum version of Joplin that the plugin is compatible with. In general it should be whatever version you are using to develop the plugin.</td>
-</tr>
-<tr>
-<td><code>description</code></td>
-<td>No</td>
-<td>Detailed description of the plugin.</td>
-</tr>
-<tr>
-<td><code>author</code></td>
-<td>No</td>
-<td>Plugin author name.</td>
-</tr>
-<tr>
-<td><code>homepage_url</code></td>
-<td>No</td>
-<td>Homepage URL of the plugin. It can also be, for example, a link to a GitHub repository.</td>
-</tr>
-</tbody>
-</table>
+<ul>
+<li><code>manifest_version</code>: For now should always be &quot;1&quot;</li>
+<li><code>name</code>: Name of the plugin</li>
+<li><code>description</code>: Additional information about the plugin</li>
+<li><code>version</code>: Version number such as &quot;1.0.0&quot;</li>
+<li><code>homepage_url</code>: Homepage URL of the plugin (can also be, for example, a link to a GitHub repository)</li>
+</ul>
 <p>Here's a complete example:</p>
 <pre><code class="language-json">{
     &quot;manifest_version&quot;: 1,
     &quot;name&quot;: &quot;Joplin Simple Plugin&quot;,
-    &quot;description&quot;: &quot;To test loading and running a plugin&quot;,
     &quot;version&quot;: &quot;1.0.0&quot;,
-    &quot;author&quot;: &quot;John Smith&quot;,
-    &quot;app_min_version&quot;: &quot;1.4&quot;,
+    &quot;description&quot;: &quot;To test loading and running a plugin&quot;,
     &quot;homepage_url&quot;: &quot;https://joplinapp.org&quot;
 }
 </code></pre>

docs/api/references/rest_api/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>
@@ -440,7 +433,7 @@ for (let portToTest = 41184; portToTest &lt;= 41194; portToTest++) {
 </code></pre>
 <p>By default API results will contain the following fields: <strong>id</strong>, <strong>parent_id</strong>, <strong>title</strong></p>
 <h1>Pagination<a name="pagination" href="#pagination" class="heading-anchor">🔗</a></h1>
-<p>All API calls that return multiple results will be paginated and will return the following structure:</p>
+<p>All API calls that return multiple results will be paginated and will have the following structure:</p>
 <table>
 <thead>
 <tr>
@@ -462,7 +455,7 @@ for (let portToTest = 41184; portToTest &lt;= 41194; portToTest++) {
 </tr>
 </tbody>
 </table>
-<p>You can specify how the results should be sorted using the <code>order_by</code> and <code>order_dir</code> query parameters, and which page to retrieve using the <code>page</code> parameter (starts at and defaults to 1). You can specify the number of items to be returned using the <code>limit</code> parameter (the maximum being 100 items).</p>
+<p>You can specify how the results should be sorted using the <code>order_by</code> and <code>order_dir</code> query parameters, and you can specify the number of items to be returned using the <code>limit</code> parameter (the maximum being 100 items).</p>
 <p>The following call for example will initiate a request to fetch all the notes, 10 at a time, and sorted by &quot;updated_time&quot; ascending:</p>
 <pre><code>curl http://localhost:41184/notes?order_by=updated_time&amp;order_dir=ASC&amp;limit=10
 </code></pre>

docs/api/tutorials/toc_plugin/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180621-182112/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180906-111039/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180916-210431/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180929-121053/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20181004-091123/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20181101-174335/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20181213-173459/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190130-230218/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190404-074157/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190424-112410/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190523-231026/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190611-000711/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190613-202613/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190814-225957/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190925-000254/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190929-152834/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191012-233121/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191014-165136/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191101-131852/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191117-183855/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191118-072700/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200220-190804/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200301-125055/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200314-001555/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200406-224254/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/build_troubleshooting/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/changelog/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/changelog_cli/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/clipper/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/conflict/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/debugging/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/desktop/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/donate/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/e2ee/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/faq/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/gsoc2020/ideas/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/gsoc2020/index/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/gsod2020/ideas/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/gsod2020/index/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/markdown/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/mobile/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/nextcloud_app/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/plugins/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/prereleases/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/privacy/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/spec/e2ee/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/spec/history/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/spec/plugins/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/spec/search_sorting/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/spec/sync_lock/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/stats/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>
@@ -409,15 +402,15 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tbody>
 <tr>
 <td>Total Windows downloads</td>
-<td>1,096,772</td>
+<td>1,093,355</td>
 </tr>
 <tr>
 <td>Total macOs downloads</td>
-<td>425,802</td>
+<td>424,314</td>
 </tr>
 <tr>
 <td>Total Linux downloads</td>
-<td>310,292</td>
+<td>308,866</td>
 </tr>
 <tr>
 <td>Windows %</td>
@@ -448,114 +441,114 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.3.18">v1.3.18</a></td>
 <td>2020-11-06T12:07:02Z</td>
-<td>14,764</td>
-<td>6,490</td>
-<td>5,476</td>
-<td>26,730</td>
+<td>11,553</td>
+<td>5,028</td>
+<td>4,072</td>
+<td>20,653</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.3.15">v1.3.15</a></td>
 <td>2020-11-04T12:22:50Z</td>
-<td>2,133</td>
-<td>1,260</td>
-<td>824</td>
-<td>4,217</td>
+<td>2,130</td>
+<td>1,257</td>
+<td>822</td>
+<td>4,209</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.2.6">v1.2.6</a></td>
 <td>2020-10-09T13:56:59Z</td>
-<td>43,408</td>
-<td>17,645</td>
-<td>13,992</td>
-<td>75,045</td>
+<td>43,344</td>
+<td>17,636</td>
+<td>13,990</td>
+<td>74,970</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.1.4">v1.1.4</a></td>
 <td>2020-09-21T11:20:09Z</td>
-<td>27,403</td>
-<td>13,458</td>
-<td>7,694</td>
-<td>48,555</td>
+<td>27,401</td>
+<td>13,457</td>
+<td>7,692</td>
+<td>48,550</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.245">v1.0.245</a></td>
 <td>2020-09-09T12:56:10Z</td>
-<td>20,771</td>
-<td>9,961</td>
+<td>20,766</td>
+<td>9,959</td>
 <td>5,617</td>
-<td>36,349</td>
+<td>36,342</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.242">v1.0.242</a></td>
 <td>2020-09-04T22:00:34Z</td>
-<td>12,301</td>
-<td>6,394</td>
-<td>3,007</td>
-<td>21,702</td>
+<td>12,299</td>
+<td>6,393</td>
+<td>3,004</td>
+<td>21,696</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.241">v1.0.241</a></td>
 <td>2020-09-04T18:06:00Z</td>
-<td>23,069</td>
+<td>23,066</td>
 <td>5,684</td>
 <td>4,959</td>
-<td>33,712</td>
+<td>33,709</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.233">v1.0.233</a></td>
 <td>2020-08-01T14:51:15Z</td>
-<td>42,195</td>
-<td>18,151</td>
+<td>42,177</td>
+<td>18,149</td>
 <td>12,344</td>
-<td>72,690</td>
+<td>72,670</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.227">v1.0.227</a></td>
 <td>2020-07-07T20:44:54Z</td>
-<td>40,135</td>
+<td>40,132</td>
 <td>15,235</td>
 <td>9,610</td>
-<td>64,980</td>
+<td>64,977</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.224">v1.0.224</a></td>
 <td>2020-06-20T22:26:08Z</td>
 <td>24,705</td>
-<td>10,977</td>
+<td>10,976</td>
 <td>5,999</td>
-<td>41,681</td>
+<td>41,680</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.220">v1.0.220</a></td>
 <td>2020-06-13T18:26:22Z</td>
-<td>31,510</td>
+<td>31,507</td>
 <td>9,887</td>
 <td>6,407</td>
-<td>47,804</td>
+<td>47,801</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.218">v1.0.218</a></td>
 <td>2020-06-07T10:43:34Z</td>
-<td>14,488</td>
+<td>14,485</td>
 <td>6,946</td>
 <td>2,950</td>
-<td>24,384</td>
+<td>24,381</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.216">v1.0.216</a></td>
 <td>2020-05-24T14:21:01Z</td>
-<td>36,371</td>
+<td>36,341</td>
 <td>14,235</td>
 <td>10,169</td>
-<td>60,775</td>
+<td>60,745</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.201">v1.0.201</a></td>
 <td>2020-04-15T22:55:13Z</td>
-<td>52,378</td>
+<td>52,351</td>
 <td>20,032</td>
 <td>18,167</td>
-<td>90,577</td>
+<td>90,550</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.200">v1.0.200</a></td>
@@ -568,18 +561,18 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.199">v1.0.199</a></td>
 <td>2020-04-10T18:41:58Z</td>
-<td>19,239</td>
+<td>19,237</td>
 <td>5,878</td>
 <td>3,783</td>
-<td>28,900</td>
+<td>28,898</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.197">v1.0.197</a></td>
 <td>2020-03-30T17:21:22Z</td>
-<td>22,062</td>
+<td>22,061</td>
 <td>9,506</td>
 <td>5,610</td>
-<td>37,178</td>
+<td>37,177</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.195">v1.0.195</a></td>
@@ -592,34 +585,34 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.193">v1.0.193</a></td>
 <td>2020-03-08T08:58:53Z</td>
-<td>28,595</td>
+<td>28,594</td>
 <td>10,895</td>
 <td>7,356</td>
-<td>46,846</td>
+<td>46,845</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.179">v1.0.179</a></td>
 <td>2020-01-24T22:42:41Z</td>
-<td>70,959</td>
-<td>28,467</td>
-<td>22,491</td>
-<td>121,917</td>
+<td>70,935</td>
+<td>28,466</td>
+<td>22,490</td>
+<td>121,891</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.178">v1.0.178</a></td>
 <td>2020-01-20T19:06:45Z</td>
-<td>17,526</td>
+<td>17,525</td>
 <td>5,956</td>
-<td>2,579</td>
-<td>26,061</td>
+<td>2,578</td>
+<td>26,059</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.175">v1.0.175</a></td>
 <td>2019-12-08T11:48:47Z</td>
-<td>71,981</td>
+<td>71,976</td>
 <td>16,855</td>
-<td>16,478</td>
-<td>105,314</td>
+<td>16,476</td>
+<td>105,307</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.174">v1.0.174</a></td>
@@ -634,8 +627,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2019-11-11T08:33:35Z</td>
 <td>5,058</td>
 <td>2,071</td>
-<td>740</td>
-<td>7,869</td>
+<td>739</td>
+<td>7,868</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.170">v1.0.170</a></td>
@@ -682,8 +675,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2019-08-14T21:46:29Z</td>
 <td>18,875</td>
 <td>6,968</td>
-<td>5,460</td>
-<td>31,303</td>
+<td>5,459</td>
+<td>31,302</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.161">v1.0.161</a></td>
@@ -696,18 +689,18 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.160">v1.0.160</a></td>
 <td>2019-06-15T00:21:40Z</td>
-<td>30,459</td>
+<td>30,457</td>
 <td>7,742</td>
 <td>8,098</td>
-<td>46,299</td>
+<td>46,297</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.159">v1.0.159</a></td>
 <td>2019-06-08T00:00:19Z</td>
-<td>5,189</td>
+<td>5,188</td>
 <td>2,174</td>
 <td>1,105</td>
-<td>8,468</td>
+<td>8,467</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.158">v1.0.158</a></td>
@@ -721,17 +714,17 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.157">v1.0.157</a></td>
 <td>2019-05-26T17:55:53Z</td>
 <td>2,173</td>
-<td>841</td>
+<td>840</td>
 <td>289</td>
-<td>3,303</td>
+<td>3,302</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.152">v1.0.152</a></td>
 <td>2019-05-13T09:08:07Z</td>
 <td>13,861</td>
 <td>4,423</td>
-<td>4,060</td>
-<td>22,344</td>
+<td>4,059</td>
+<td>22,343</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.151">v1.0.151</a></td>
@@ -753,9 +746,9 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.145">v1.0.145</a></td>
 <td>2019-05-03T09:16:53Z</td>
 <td>7,000</td>
-<td>2,858</td>
+<td>2,857</td>
 <td>1,434</td>
-<td>11,292</td>
+<td>11,291</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.143">v1.0.143</a></td>
@@ -768,26 +761,26 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.142">v1.0.142</a></td>
 <td>2019-04-02T16:44:51Z</td>
-<td>14,649</td>
+<td>14,648</td>
 <td>4,557</td>
 <td>4,724</td>
-<td>23,930</td>
+<td>23,929</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.140">v1.0.140</a></td>
 <td>2019-03-10T20:59:58Z</td>
-<td>13,622</td>
+<td>13,621</td>
 <td>4,166</td>
 <td>3,172</td>
-<td>20,960</td>
+<td>20,959</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.135">v1.0.135</a></td>
 <td>2019-02-27T23:36:57Z</td>
 <td>12,484</td>
 <td>3,953</td>
-<td>4,073</td>
-<td>20,510</td>
+<td>4,072</td>
+<td>20,509</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.134">v1.0.134</a></td>
@@ -865,17 +858,17 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.115">v1.0.115</a></td>
 <td>2018-11-16T16:52:02Z</td>
 <td>3,652</td>
-<td>1,299</td>
+<td>1,298</td>
 <td>797</td>
-<td>5,748</td>
+<td>5,747</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.114">v1.0.114</a></td>
 <td>2018-10-24T20:14:10Z</td>
-<td>11,393</td>
+<td>11,391</td>
 <td>3,492</td>
 <td>3,828</td>
-<td>18,713</td>
+<td>18,711</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.111">v1.0.111</a></td>
@@ -889,9 +882,9 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.110">v1.0.110</a></td>
 <td>2018-09-29T12:29:21Z</td>
 <td>956</td>
-<td>405</td>
+<td>404</td>
 <td>116</td>
-<td>1,477</td>
+<td>1,476</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.109">v1.0.109</a></td>
@@ -930,16 +923,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2018-06-28T20:25:36Z</td>
 <td>15,038</td>
 <td>4,696</td>
-<td>7,327</td>
-<td>27,061</td>
+<td>7,326</td>
+<td>27,060</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.103">v1.0.103</a></td>
 <td>2018-06-21T19:38:13Z</td>
-<td>2,049</td>
+<td>2,048</td>
 <td>882</td>
 <td>679</td>
-<td>3,610</td>
+<td>3,609</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.101">v1.0.101</a></td>
@@ -962,8 +955,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2018-06-10T13:18:23Z</td>
 <td>1,250</td>
 <td>593</td>
-<td>379</td>
-<td>2,222</td>
+<td>378</td>
+<td>2,221</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.97">v1.0.97</a></td>
@@ -994,16 +987,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2018-05-21T20:52:59Z</td>
 <td>1,128</td>
 <td>580</td>
-<td>395</td>
-<td>2,103</td>
+<td>394</td>
+<td>2,102</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.93">v1.0.93</a></td>
 <td>2018-05-14T11:36:01Z</td>
 <td>1,786</td>
-<td>1,081</td>
+<td>1,080</td>
 <td>755</td>
-<td>3,622</td>
+<td>3,621</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.91">v1.0.91</a></td>
@@ -1032,10 +1025,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.83">v1.0.83</a></td>
 <td>2018-04-04T19:43:58Z</td>
-<td>4,809</td>
+<td>4,808</td>
 <td>2,529</td>
 <td>2,656</td>
-<td>9,994</td>
+<td>9,993</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.82">v1.0.82</a></td>
@@ -1225,9 +1218,9 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.39">v0.10.39</a></td>
 <td>2017-12-11T21:19:44Z</td>
 <td>5,784</td>
-<td>4,258</td>
-<td>3,160</td>
-<td>13,202</td>
+<td>4,257</td>
+<td>3,159</td>
+<td>13,200</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.38">v0.10.38</a></td>
@@ -1314,8 +1307,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2017-11-24T14:27:49Z</td>
 <td>148</td>
 <td>694</td>
-<td>6,378</td>
-<td>7,220</td>
+<td>6,377</td>
+<td>7,219</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.23">v0.10.23</a></td>

docs/terminal/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/terminal.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/welcome/1_welcome_to_joplin/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/1_welcome_to_joplin.
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/welcome/2_importing_and_exporting_notes/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/2_importing_and_expo
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/welcome/3_synchronising_your_notes/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/3_synchronising_your
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/welcome/4_tips/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/4_tips.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

docs/welcome/5_privacy/index.html

@@ -351,20 +351,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/5_privacy.md
 </ul>
 </li>
 <li>
-<p>Joplin API - Get Started</p>
+<p>Joplin API</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
 </ul>
 </li>
 <li>

joplin.code-workspace

@@ -13,7 +13,6 @@
 			"_vieux/": true,
 			".gitignore": true,
 			".eslintignore": true,
-			"**/*.jpl": true,
 			"./packages/app-cli/**/*.*~": true,
 			"./packages/app-cli/**/*.mo": true,
 			"./packages/app-cli/**/build/": true,
@@ -56,6 +55,7 @@
 			"./packages/app-desktop/**/*.min.js": true,
 			"./packages/app-desktop/**/dist/": true,
 			"./packages/app-desktop/**/gui/note-viewer/pluginAssets/": true,
+			"./packages/app-desktop/**/lib/": true,
 			"./packages/app-desktop/**/node_modules/": true,
 			"./packages/app-desktop/**/packageInfo.js": true,
 			"./packages/app-desktop/**/pluginAssets/": true,
@@ -242,6 +242,7 @@
 			"packages/app-desktop/**/*.min.js": true,
 			"packages/app-desktop/**/dist/": true,
 			"packages/app-desktop/**/gui/note-viewer/pluginAssets/": true,
+			"packages/app-desktop/**/lib/": true,
 			"packages/app-desktop/**/node_modules/": true,
 			"packages/app-desktop/**/packageInfo.js": true,
 			"packages/app-desktop/**/pluginAssets/": true,
@@ -309,7 +310,6 @@
 			"packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js": true,
 			"packages/app-mobile/lib/rnInjectedJs/": true,
 			"packages/app-mobile/lib/sql-extensions/spellfix.so": true,
-			"packages/generator-joplin/generators/app/templates/api/": true,
 			"packages/app-mobile/node_modules/": true,
 			"phpunit.xml": true,
 			"Server/db*.sqlite/": true,
@@ -335,6 +335,6 @@
 			"web/env.php": true,
 			"**/*.js": {"when": "$(basename).ts"},
 			"**/*?.js": { "when": "$(basename).tsx"},
-		}
+		},
 	}
 }

package-lock.json

@@ -1227,6 +1227,12 @@
         "@types/node": "*"
       }
     },
+    "@types/jasmine": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.6.0.tgz",
+      "integrity": "sha512-CPT4r0a63e5wpNj5ejMnconM7a+0Hdx6/APsyw8AQOHk0/Mxp3xYrym1ZabWJiYuQkgKB3MonYoN04mxtvAvRA==",
+      "dev": true
+    },
     "@types/json-schema": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
@@ -6433,6 +6439,22 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
+    "jasmine": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.6.3.tgz",
+      "integrity": "sha512-Th91zHsbsALWjDUIiU5d/W5zaYQsZFMPTdeNmi8GivZPmAaUAK8MblSG3yQI4VMGC/abF2us7ex60NH1AAIMTA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.6",
+        "jasmine-core": "~3.6.0"
+      }
+    },
+    "jasmine-core": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz",
+      "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==",
+      "dev": true
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

package.json

@@ -7,12 +7,6 @@
   },
   "license": "MIT",
   "scripts": {
-    "addPackageCli": "lerna add --scope joplin",
-    "addPackageCliD": "lerna add --scope joplin -D",
-    "addPackageDesktop": "lerna add --scope @joplin/app-desktop",
-    "addPackageDesktopD": "lerna add --scope @joplin/app-desktop -D",
-    "addPackageMobile": "lerna add --scope @joplin/app-mobile",
-    "addPackageMobileD": "lerna add --scope @joplin/app-mobile -D",
     "buildApiDoc": "npm start --prefix=packages/app-cli -- apidoc ../../readme/api/references/rest_api.md",
     "buildDoc": "./packages/tools/build-all.sh",
     "buildPluginDoc": "typedoc --name 'Joplin Plugin API Documentation' --mode file -theme './Assets/PluginDocTheme/' --readme './Assets/PluginDocTheme/index.md' --excludeNotExported --excludeExternals --excludePrivate --excludeProtected --out docs/api/references/plugin_api packages/lib/services/plugins/api/",
@@ -30,13 +24,11 @@
     "releaseCli": "node packages/tools/release-cli.js",
     "releaseClipper": "node packages/tools/release-clipper.js",
     "releaseDesktop": "node packages/tools/release-electron.js",
-    "releasePluginGenerator": "node packages/tools/release-plugin-generator.js",
     "setupNewRelease": "node ./packages/tools/setupNewRelease",
-    "test-ci": "lerna run test-ci --stream",
-    "test": "lerna run test --stream",
     "tsc": "lerna run tsc --stream --parallel",
+    "test": "lerna run test --stream",
+    "test-ci": "lerna run test-ci --stream",
     "updateIgnored": "gulp updateIgnoredTypeScriptBuild",
-    "updatePluginTypes": "./packages/generator-joplin/updateTypes.sh",
     "watch": "lerna run watch --stream --parallel"
   },
   "husky": {
@@ -45,6 +37,7 @@
     }
   },
   "devDependencies": {
+    "@types/jasmine": "^3.6.0",
     "@typescript-eslint/eslint-plugin": "^4.6.0",
     "@typescript-eslint/parser": "^4.6.0",
     "eslint": "^7.6.0",
@@ -55,6 +48,7 @@
     "glob": "^7.1.6",
     "gulp": "^4.0.2",
     "husky": "^3.0.2",
+    "jasmine": "^3.5.0",
     "lerna": "^3.22.1",
     "lint-staged": "^9.2.1",
     "typedoc": "^0.17.8",

packages/app-cli/app/app.js

@@ -426,7 +426,7 @@ class Application extends BaseApplication {
 
 			const AppGui = require('./app-gui.js');
 			this.gui_ = new AppGui(this, this.store(), keymap);
-			this.gui_.setLogger(this.logger());
+			this.gui_.setLogger(this.logger_);
 			await this.gui_.start();
 
 			// Since the settings need to be loaded before the store is created, it will never

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

@@ -117,14 +117,14 @@ class Command extends BaseCommand {
 
 		lines.push('# Pagination');
 		lines.push('');
-		lines.push('All API calls that return multiple results will be paginated and will return the following structure:');
+		lines.push('All API calls that return multiple results will be paginated and will have the following structure:');
 		lines.push('');
 		lines.push('Key | Always present? | Description');
 		lines.push('--- | --- | ---');
 		lines.push('`items` | Yes | The array of items you have requested.');
 		lines.push('`has_more` | Yes | If `true`, there are more items after this page. If `false`, it means you have reached the end of the data set.');
 		lines.push('');
-		lines.push('You can specify how the results should be sorted using the `order_by` and `order_dir` query parameters, and which page to retrieve using the `page` parameter (starts at and defaults to 1). You can specify the number of items to be returned using the `limit` parameter (the maximum being 100 items).');
+		lines.push('You can specify how the results should be sorted using the `order_by` and `order_dir` query parameters, and you can specify the number of items to be returned using the `limit` parameter (the maximum being 100 items).');
 		lines.push('');
 		lines.push('The following call for example will initiate a request to fetch all the notes, 10 at a time, and sorted by "updated_time" ascending:');
 		lines.push('');

packages/app-cli/jest.config.js

@@ -1,56 +1,47 @@
-// When there's an async error in a test (for example due to an async call
-// that wasn't waited for in a previous test), do the following:
-//
-// 1. Get the list of test units up to the point it fails. For example:
-//
-//     PASS  tests/urlUtils.js
-//     PASS  tests/models_BaseItem.js
-//     PASS  tests/markdownUtils.js
-//     (node:15679) UnhandledPromiseRejectionWarning: Error: {"title":"folder1"}: Fields have not been loaded yet
-//     (node:15679) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To termi$ate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https://nodejs.org/api/cli.html#cli_unhandled_rejections_mode). (rejection id: 31)
-//     FAIL  tests/models_Resource.js
-//
-// 2. Replace the `testMatch` pattern with these specific files only:
-//
-//     testMatch: [
-//         '**/tests/urlUtils.js',
-//         '**/tests/models_BaseItem.js',
-//         '**/tests/markdownUtils.js',
-//         '**/tests/models_Resource.js',
-//     ],
-//
-// 3. Run the tests and check it still happens.
-//
-// 4. Remove tests one by one to narrow it down to the one with the async
-//    call that's causing problem.
-
 module.exports = {
 	testMatch: [
 		'**/tests/**/*.js',
+		// '**/tests/services_keychainService.js',
+		// '**/tests/urlUtils.js',
+		// '**/tests/models_BaseItem.js',
+		// '**/tests/markdownUtils.js',
+		// '**/tests/models_Resource.js',
 	],
-
 	testPathIgnorePatterns: [
-		'<rootDir>/node_modules/',
-		'<rootDir>/tests/support/',
-		'<rootDir>/build/',
-		'<rootDir>/tests/test-utils.js',
-		'<rootDir>/tests/file_api_driver.js',
-		'<rootDir>/tests/tmp/',
+		'/node_modules/',
+		'/tests\\/support/',
+		'/build/',
+		'test-utils.js',
+		'file_api_driver.js',
 	],
-
-	// To avoid this warning:
-	//
-	// jest-haste-map: Haste module naming collision: test_plugin
-	// The following files share their name; please adjust your hasteImpl:
-	//   * <rootDir>/tests/support/plugins/json_export/package.json
-	//   * <rootDir>/tests/support/plugins/package.json
-	//
-	// https://github.com/facebook/jest/issues/8114#issuecomment-475068766
-	modulePathIgnorePatterns: [
-		'<rootDir>/tests/support',
-		'<rootDir>/build',
-	],
-
 	testEnvironment: 'node',
-	setupFilesAfterEnv: [`${__dirname}/jest.setup.js`],
+	setupFilesAfterEnv: ['./jest.setup.js'],
 };
+
+
+
+// PASS  tests/services_rest_Api.js (14.705 s)
+// PASS  tests/services_SearchFilter.js (21.203 s)
+// PASS  tests/services_InteropService.js (10.807 s)
+// PASS  tests/reducer.js (17.398 s)
+// PASS  tests/services_Revision.js (17.642 s)
+// PASS  tests/feature_NoteHistory.js (31.448 s)
+// PASS  tests/services_KeymapService.js
+// PASS  tests/services_EncryptionService.js (9.258 s)
+// PASS  tests/models_Note.js (10.59 s)
+// PASS  tests/services_ResourceService.js (13.177 s)
+// PASS  tests/models_Folder.js (11.468 s)
+// PASS  tests/MdToHtml.js (5.242 s)
+// PASS  tests/services_PluginService.js (5.456 s)
+// PASS  tests/models_Note_CustomSortOrder.js (5.52 s)
+// PASS  tests/feature_ShowAllNotes.js (13.567 s)
+// PASS  tests/models_Setting.js
+// PASS  tests/models_Tag.js (6.324 s)
+// PASS  tests/services_keychainService.js
+// PASS  tests/urlUtils.js
+// PASS  tests/models_BaseItem.js
+// PASS  tests/markdownUtils.js
+// (node:15679) UnhandledPromiseRejectionWarning: Error: {"title":"folder1"}: Fields have not been loaded yet
+// (node:15679) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To termi$ate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https://nodejs.org/api/cli.html#cli_unhandled_rejections_mode). (rejection id: 31)
+// (node:15679) [DEP0018] DeprecationWarning: Unhandled promise rejections are deprecated. In the future, promise rejections that are not handled will terminate the Node.js process with a non-zero exit code.
+// FAIL  tests/models_Resource.js

packages/app-cli/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.4.7",
+  "version": "1.4.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -898,15 +898,11 @@
         "@types/istanbul-lib-report": "*"
       }
     },
-    "@types/jest": {
-      "version": "26.0.15",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.15.tgz",
-      "integrity": "sha512-s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog==",
-      "dev": true,
-      "requires": {
-        "jest-diff": "^26.0.0",
-        "pretty-format": "^26.0.0"
-      }
+    "@types/jasmine": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.6.0.tgz",
+      "integrity": "sha512-CPT4r0a63e5wpNj5ejMnconM7a+0Hdx6/APsyw8AQOHk0/Mxp3xYrym1ZabWJiYuQkgKB3MonYoN04mxtvAvRA==",
+      "dev": true
     },
     "@types/node": {
       "version": "14.14.6",
@@ -4515,6 +4511,38 @@
         "istanbul-lib-report": "^3.0.0"
       }
     },
+    "jasmine": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.5.0.tgz",
+      "integrity": "sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.4",
+        "jasmine-core": "~3.5.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.5",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz",
+          "integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "jasmine-core": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz",
+      "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
+      "dev": true
+    },
     "jest": {
       "version": "26.6.3",
       "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",

packages/app-cli/package.json

@@ -6,7 +6,6 @@
   "private": true,
   "scripts": {
     "test": "jest --config=jest.config.js --runInBand --bail --forceExit",
-    "test-one": "jest --verbose=false --config=jest.config.js --runInBand --bail --forceExit",
     "test-ci": "jest --config=jest.config.js --runInBand --forceExit",
     "build": "gulp build",
     "start": "gulp build -L && node \"build/main.js\" --stack-trace-enabled --log-level debug --env dev",
@@ -31,7 +30,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.4.9",
+  "version": "1.4.3",
   "bin": {
     "joplin": "./main.js"
   },
@@ -66,9 +65,10 @@
   },
   "devDependencies": {
     "@joplin/tools": "^1.0.9",
-    "@types/jest": "^26.0.15",
+    "@types/jasmine": "^3.6.0",
     "@types/node": "^14.14.6",
     "gulp": "^4.0.2",
+    "jasmine": "^3.5.0",
     "jest": "^26.6.3",
     "temp": "^0.9.1",
     "typescript": "^4.0.5"

packages/app-cli/tests/EnexToMd.js

@@ -0,0 +1,67 @@
+/* eslint-disable no-unused-vars */
+
+
+const os = require('os');
+const time = require('@joplin/lib/time').default;
+const { filename } = require('@joplin/lib/path-utils');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
+const Folder = require('@joplin/lib/models/Folder.js');
+const Note = require('@joplin/lib/models/Note.js');
+const BaseModel = require('@joplin/lib/BaseModel').default;
+const shim = require('@joplin/lib/shim').default;
+const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('EnexToMd', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should convert from Enex to Markdown', asyncTest(async () => {
+		const basePath = `${__dirname}/enex_to_md`;
+		const files = await shim.fsDriver().readDirStats(basePath);
+
+		for (let i = 0; i < files.length; i++) {
+			const htmlFilename = files[i].path;
+			if (htmlFilename.indexOf('.html') < 0) continue;
+
+			const htmlPath = `${basePath}/${htmlFilename}`;
+			const mdPath = `${basePath}/${filename(htmlFilename)}.md`;
+
+			// if (htmlFilename !== 'multiline_inner_text.html') continue;
+
+			const html = await shim.fsDriver().readFile(htmlPath);
+			let expectedMd = await shim.fsDriver().readFile(mdPath);
+
+			let actualMd = await enexXmlToMd(`<div>${html}</div>`, []);
+
+			if (os.EOL === '\r\n') {
+				expectedMd = expectedMd.replace(/\r\n/g, '\n');
+				actualMd = actualMd.replace(/\r\n/g, '\n');
+			}
+
+			if (actualMd !== expectedMd) {
+				console.info('');
+				console.info(`Error converting file: ${htmlFilename}`);
+				console.info('--------------------------------- Got:');
+				console.info(actualMd.split('\n'));
+				console.info('--------------------------------- Expected:');
+				console.info(expectedMd.split('\n'));
+				console.info('--------------------------------------------');
+				console.info('');
+
+				expect(false).toBe(true);
+				// return;
+			} else {
+				expect(true).toBe(true);
+			}
+		}
+	}));
+
+});

packages/app-cli/tests/EnexToMd.ts

@@ -1,99 +0,0 @@
-import { NoteEntity, ResourceEntity, TagEntity } from '@joplin/lib/services/database/types';
-import shim from '@joplin/lib/shim';
-
-const fs = require('fs-extra');
-const os = require('os');
-const { filename } = require('@joplin/lib/path-utils');
-const { setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js');
-const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js');
-const { importEnex } = require('@joplin/lib/import-enex');
-const Note = require('@joplin/lib/models/Note');
-const Tag = require('@joplin/lib/models/Tag');
-const Resource = require('@joplin/lib/models/Resource');
-
-const enexSampleBaseDir = `${__dirname}/enex_to_md`;
-
-describe('EnexToMd', function() {
-
-	beforeEach(async (done) => {
-		await setupDatabaseAndSynchronizer(1);
-		await switchClient(1);
-		done();
-	});
-
-	it('should convert ENEX content to Markdown', async () => {
-		const files = await shim.fsDriver().readDirStats(enexSampleBaseDir);
-
-		for (let i = 0; i < files.length; i++) {
-			const htmlFilename = files[i].path;
-			if (htmlFilename.indexOf('.html') < 0) continue;
-
-			const htmlPath = `${enexSampleBaseDir}/${htmlFilename}`;
-			const mdPath = `${enexSampleBaseDir}/${filename(htmlFilename)}.md`;
-
-			// if (htmlFilename !== 'multiline_inner_text.html') continue;
-
-			const html = await shim.fsDriver().readFile(htmlPath);
-			let expectedMd = await shim.fsDriver().readFile(mdPath);
-
-			let actualMd = await enexXmlToMd(`<div>${html}</div>`, []);
-
-			if (os.EOL === '\r\n') {
-				expectedMd = expectedMd.replace(/\r\n/g, '\n');
-				actualMd = actualMd.replace(/\r\n/g, '\n');
-			}
-
-			if (actualMd !== expectedMd) {
-				console.info('');
-				console.info(`Error converting file: ${htmlFilename}`);
-				console.info('--------------------------------- Got:');
-				console.info(actualMd.split('\n'));
-				console.info('--------------------------------- Expected:');
-				console.info(expectedMd.split('\n'));
-				console.info('--------------------------------------------');
-				console.info('');
-
-				expect(false).toBe(true);
-				// return;
-			} else {
-				expect(true).toBe(true);
-			}
-		}
-	});
-
-	it('should import ENEX metadata', async () => {
-		const filePath = `${enexSampleBaseDir}/sample-enex.xml`;
-		await importEnex('', filePath);
-
-		const note: NoteEntity = (await Note.all())[0];
-		expect(note.title).toBe('Test Note for Export');
-		expect(note.body).toBe([
-			'    Hello, World.',
-			'',
-			'![snapshot-DAE9FC15-88E3-46CF-B744-DA9B1B56EB57.jpg](:/3d0f4d01abc02cf8c4dc1c796df8c4b2)',
-		].join('\n'));
-		expect(note.created_time).toBe(1375217524000);
-		expect(note.updated_time).toBe(1376560800000);
-		expect(note.latitude).toBe('33.88394692');
-		expect(note.longitude).toBe('-117.91913551');
-		expect(note.altitude).toBe('96.0000');
-		expect(note.author).toBe('Brett Kelly');
-
-		const tag: TagEntity = (await Tag.tagsByNoteId(note.id))[0];
-		expect(tag.title).toBe('fake-tag');
-
-		const resource: ResourceEntity = (await Resource.all())[0];
-		expect(resource.id).toBe('3d0f4d01abc02cf8c4dc1c796df8c4b2');
-		const stat = await fs.stat(Resource.fullPath(resource));
-		expect(stat.size).toBe(277);
-	});
-
-	it('should handle invalid dates', async () => {
-		const filePath = `${enexSampleBaseDir}/invalid_date.enex`;
-		await importEnex('', filePath);
-		const note: NoteEntity = (await Note.all())[0];
-		expect(note.created_time).toBe(1521822724000); // 20180323T163204Z
-		expect(note.updated_time).toBe(1521822724000); // Because this date was invalid, it is set to the created time instead
-	});
-
-});

packages/app-cli/tests/HtmlToHtml.js

@@ -9,7 +9,7 @@ const Folder = require('@joplin/lib/models/Folder.js');
 const Note = require('@joplin/lib/models/Note.js');
 const BaseModel = require('@joplin/lib/BaseModel').default;
 const shim = require('@joplin/lib/shim').default;
-const HtmlToHtml = require('@joplin/renderer/HtmlToHtml').default;
+const HtmlToHtml = require('@joplin/renderer/HtmlToHtml');
 const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js');
 
 process.on('unhandledRejection', (reason, p) => {

packages/app-cli/tests/MdToHtml.ts

@@ -147,27 +147,27 @@ describe('MdToHtml', function() {
 		expect(result.html.trim()).toBe('<div id="rendered-md"><p>just <strong>testing</strong></p>\n</div>');
 	}));
 
-	// it('should render links correctly', asyncTest(async () => {
-	// 	const mdToHtml = newTestMdToHtml();
+	it('should render links correctly', asyncTest(async () => {
+		const mdToHtml = newTestMdToHtml();
 
-	// 	const testCases = [
-	// 		// None of these should result in a link
-	// 		['https://example.com', 'https://example.com'],
-	// 		['file://C:\\AUTOEXEC.BAT', 'file://C:\\AUTOEXEC.BAT'],
-	// 		['example.com', 'example.com'],
-	// 		['oo.ps', 'oo.ps'],
-	// 		['test@example.com', 'test@example.com'],
+		const testCases = [
+			// None of these should result in a link
+			['https://example.com', 'https://example.com'],
+			['file://C:\\AUTOEXEC.BAT', 'file://C:\\AUTOEXEC.BAT'],
+			['example.com', 'example.com'],
+			['oo.ps', 'oo.ps'],
+			['test@example.com', 'test@example.com'],
 
-	// 		// Those should be converted to links
-	// 		['<https://example.com>', '<a data-from-md title=\'https://example.com\' href=\'https://example.com\'>https://example.com</a>'],
-	// 		['[ok](https://example.com)', '<a data-from-md title=\'https://example.com\' href=\'https://example.com\'>ok</a>'],
-	// 	];
+			// Those should be converted to links
+			['<https://example.com>', '<a data-from-md title=\'https://example.com\' href=\'https://example.com\'>https://example.com</a>'],
+			['[ok](https://example.com)', '<a data-from-md title=\'https://example.com\' href=\'https://example.com\'>ok</a>'],
+		];
 
-	// 	for (const testCase of testCases) {
-	// 		const [input, expected] = testCase;
-	// 		const actual = await mdToHtml.render(input, null, { bodyOnly: true, plainResourceRendering: true });
-	// 		expect(actual.html).toBe(expected);
-	// 	}
-	// }));
+		for (const testCase of testCases) {
+			const [input, expected] = testCase;
+			const actual = await mdToHtml.render(input, null, { bodyOnly: true, plainResourceRendering: true });
+			expect(actual.html).toBe(expected);
+		}
+	}));
 
 });

packages/app-cli/tests/enex_to_md/invalid_date.enex

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd">
-<en-export export-date="20201223T053642Z" application="Evernote" version="10.4.3">
-  <note>
-    <title>Fruit Tree Assessment</title>
-    <created>20180323T163204Z</created>
-    <updated>10101T000000Z</updated>
-    <content>
-      <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd"
-><en-note>Fruit Tree</en-note>      ]]>
-    </content>
-  </note>
-</en-export>

packages/app-cli/tests/enex_to_md/sample-enex.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd">
-<en-export export-date="20130730T205637Z" application="Evernote" version="Evernote Mac">
-    <note>
-        <title>Test Note for Export</title>
-        <content>
-            <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-            <!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
-            <en-note style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
-                Hello, World.
-                <div>
-                    <br/>
-                </div>
-                <div>
-                    <en-media alt="" type="image/jpeg" hash="dd7b6d285d09ec054e8cd6a3814ce093"/>
-                </div>
-                <div>
-                    <br/>
-                </div>
-            </en-note>
-            ]]>
-        </content>
-        <created>20130730T205204Z</created>
-        <updated>20130815T100000Z</updated>
-        <tag>fake-tag</tag>
-        <note-attributes>
-            <latitude>33.88394692352314</latitude>
-            <longitude>-117.9191355110099</longitude>
-            <altitude>96</altitude>
-            <author>Brett Kelly</author>
-        </note-attributes>
-        <resource>
-            <data encoding="base64">/9j/4AAQSkZJRgABAQAAAQABAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlubwIQAABtbnRyUkdCIFhZ
-            WiAHzgACAAkABgAxAABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQ
-            kfeIGT/+uufk8DpM0gyVjGfmzkgetesnUoTHJ+5Cxn86zmv4/wB75EW+QHAPUH/P9Ky+s1rtrr/wfvOm
-            dBSamnq/xPKp/hpLKmS7x4OBjgn6elee6v4OuLJirRSHb/FtyG9s9u1fR0+oTiIRvGq7W4bpisfUGk1C
-            GVWtkIyM57n1rfDY+uqigtU76ffZkUsA6iajHZ6v/P8A4B//2Q==</data>
-            <mime>image/jpeg</mime>
-            <width>1280</width>
-            <height>720</height>
-            <resource-attributes>
-                <file-name>snapshot-DAE9FC15-88E3-46CF-B744-DA9B1B56EB57.jpg</file-name>
-            </resource-attributes>
-        </resource>
-    </note>
-</en-export>
-

packages/app-cli/tests/models_BaseItem.js

@@ -105,11 +105,7 @@ describe('models_BaseItem', function() {
 	}));
 
 	it('should serialize and unserialize properties that contain new lines', asyncTest(async () => {
-		const sourceUrl = `
-https://joplinapp.org/ \\n
-`;
-
-		const note = await Note.save({ title: 'note', source_url: sourceUrl });
+		const note = await Note.save({ title: 'note', source_url: '\nhttps://joplinapp.org/\n' });
 
 		const noteBefore = await Note.load(note.id);
 		const serialized = await Note.serialize(noteBefore);
@@ -117,18 +113,4 @@ https://joplinapp.org/ \\n
 
 		expect(noteAfter).toEqual(noteBefore);
 	}));
-
-	it('should not serialize the note title and body', asyncTest(async () => {
-		const note = await Note.save({ title: 'my note', body: `one line
-two line
-three line \\n no escape` });
-
-		const noteBefore = await Note.load(note.id);
-		const serialized = await Note.serialize(noteBefore);
-		expect(serialized.indexOf(`my note
-
-one line
-two line
-three line \\n no escape`)).toBe(0);
-	}));
 });

packages/app-cli/tests/models_Folder.js

@@ -1,7 +1,12 @@
-import { FolderEntity } from '@joplin/lib/services/database/types';
-const { createNTestNotes, asyncTest, setupDatabaseAndSynchronizer, sleep, switchClient, checkThrowAsync } = require('./test-utils.js');
+/* eslint-disable no-unused-vars */
+
+
+const time = require('@joplin/lib/time').default;
+const { createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
 const Folder = require('@joplin/lib/models/Folder.js');
 const Note = require('@joplin/lib/models/Note.js');
+const BaseModel = require('@joplin/lib/BaseModel').default;
+const shim = require('@joplin/lib/shim').default;
 
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at models_Folder: Promise', p, 'reason:', reason);
@@ -69,7 +74,7 @@ describe('models_Folder', function() {
 		expect(folders[1].id).toBe(f3.id);
 		expect(folders[2].id).toBe(f1.id);
 
-		await Note.save({ title: 'note1', parent_id: f1.id });
+		const n2 = await Note.save({ title: 'note1', parent_id: f1.id });
 
 		folders = await Folder.orderByLastModified(await Folder.all(), 'desc');
 		expect(folders[0].id).toBe(f1.id);
@@ -103,7 +108,7 @@ describe('models_Folder', function() {
 		expect(folders[1].id).toBe(f3.id);
 		expect(folders[2].id).toBe(f2.id);
 
-		await Note.save({ title: 'note2', parent_id: f2.id });
+		const n2 = await Note.save({ title: 'note2', parent_id: f2.id });
 		folders = await Folder.orderByLastModified(await Folder.all(), 'desc');
 
 		expect(folders[0].id).toBe(f2.id);
@@ -118,7 +123,7 @@ describe('models_Folder', function() {
 		expect(folders[2].id).toBe(f2.id);
 
 		const f4 = await Folder.save({ title: 'folder4', parent_id: f1.id }); await sleep(0.1);
-		await Note.save({ title: 'note3', parent_id: f4.id });
+		const n3 = await Note.save({ title: 'note3', parent_id: f4.id });
 
 		folders = await Folder.orderByLastModified(await Folder.all(), 'desc');
 		expect(folders.length).toBe(4);
@@ -134,33 +139,21 @@ describe('models_Folder', function() {
 		const f3 = await Folder.save({ title: 'folder3', parent_id: f2.id });
 		const f4 = await Folder.save({ title: 'folder4' });
 
-		await Note.save({ title: 'note1', parent_id: f3.id });
-		await Note.save({ title: 'note1', parent_id: f3.id });
-		await Note.save({ title: 'note1', parent_id: f1.id });
-		await Note.save({ title: 'conflicted', parent_id: f1.id, is_conflict: 1 });
+		const n1 = await Note.save({ title: 'note1', parent_id: f3.id });
+		const n2 = await Note.save({ title: 'note1', parent_id: f3.id });
+		const n3 = await Note.save({ title: 'note1', parent_id: f1.id });
 
-		{
-			const folders = await Folder.all({ includeConflictFolder: false });
-			await Folder.addNoteCounts(folders);
-			const foldersById: any = {};
-			folders.forEach((f: FolderEntity) => { foldersById[f.id] = f; });
+		const folders = await Folder.all();
+		await Folder.addNoteCounts(folders);
 
-			expect(folders.length).toBe(4);
-			expect(foldersById[f1.id].note_count).toBe(3);
-			expect(foldersById[f2.id].note_count).toBe(2);
-			expect(foldersById[f3.id].note_count).toBe(2);
-			expect(foldersById[f4.id].note_count).toBe(0);
-		}
+		const foldersById = {};
+		folders.forEach((f) => { foldersById[f.id] = f; });
 
-		{
-			const folders = await Folder.all({ includeConflictFolder: true });
-			await Folder.addNoteCounts(folders);
-			const foldersById: any = {};
-			folders.forEach((f: FolderEntity) => { foldersById[f.id] = f; });
-
-			expect(folders.length).toBe(5);
-			expect(foldersById[Folder.conflictFolderId()].note_count).toBe(1);
-		}
+		expect(folders.length).toBe(4);
+		expect(foldersById[f1.id].note_count).toBe(3);
+		expect(foldersById[f2.id].note_count).toBe(2);
+		expect(foldersById[f3.id].note_count).toBe(2);
+		expect(foldersById[f4.id].note_count).toBe(0);
 	}));
 
 	it('should not count completed to-dos', asyncTest(async () => {
@@ -170,18 +163,18 @@ describe('models_Folder', function() {
 		const f3 = await Folder.save({ title: 'folder3', parent_id: f2.id });
 		const f4 = await Folder.save({ title: 'folder4' });
 
-		await Note.save({ title: 'note1', parent_id: f3.id });
-		await Note.save({ title: 'note2', parent_id: f3.id });
-		await Note.save({ title: 'note3', parent_id: f1.id });
-		await Note.save({ title: 'note4', parent_id: f3.id, is_todo: true, todo_completed: 0 });
-		await Note.save({ title: 'note5', parent_id: f3.id, is_todo: true, todo_completed: 999 });
-		await Note.save({ title: 'note6', parent_id: f3.id, is_todo: true, todo_completed: 999 });
+		const n1 = await Note.save({ title: 'note1', parent_id: f3.id });
+		const n2 = await Note.save({ title: 'note2', parent_id: f3.id });
+		const n3 = await Note.save({ title: 'note3', parent_id: f1.id });
+		const n4 = await Note.save({ title: 'note4', parent_id: f3.id, is_todo: true, todo_completed: 0 });
+		const n5 = await Note.save({ title: 'note5', parent_id: f3.id, is_todo: true, todo_completed: 999 });
+		const n6 = await Note.save({ title: 'note6', parent_id: f3.id, is_todo: true, todo_completed: 999 });
 
 		const folders = await Folder.all();
 		await Folder.addNoteCounts(folders, false);
 
-		const foldersById: any = {};
-		folders.forEach((f: FolderEntity) => { foldersById[f.id] = f; });
+		const foldersById = {};
+		folders.forEach((f) => { foldersById[f.id] = f; });
 
 		expect(folders.length).toBe(4);
 		expect(foldersById[f1.id].note_count).toBe(4);

packages/app-cli/tests/models_Note.js

@@ -1,10 +1,14 @@
-import Setting from '@joplin/lib/models/Setting';
-import BaseModel from '@joplin/lib/BaseModel';
-import shim from '@joplin/lib/shim';
-const { sortedIds, createNTestNotes, asyncTest, setupDatabaseAndSynchronizer, switchClient, checkThrowAsync } = require('./test-utils.js');
+/* eslint-disable no-unused-vars */
+
+
+const time = require('@joplin/lib/time').default;
+const { sortedIds, createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
 const Folder = require('@joplin/lib/models/Folder.js');
 const Note = require('@joplin/lib/models/Note.js');
+const Setting = require('@joplin/lib/models/Setting').default;
+const BaseModel = require('@joplin/lib/BaseModel').default;
 const ArrayUtils = require('@joplin/lib/ArrayUtils.js');
+const shim = require('@joplin/lib/shim').default;
 
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at models_Note: Promise', p, 'reason:', reason);
@@ -104,7 +108,9 @@ describe('models_Note', function() {
 		for (let i = 0; i < testCases.length; i++) {
 			const t = testCases[i];
 
-			const input: any = t[0];
+			const input = t[0];
+			const expectedTitle = t[1];
+			const expectedBody = t[1];
 
 			const note1 = await Note.save(input);
 			const serialized = await Note.serialize(note1);
@@ -216,7 +222,6 @@ describe('models_Note', function() {
 		const resourceDir = Setting.value('resourceDir');
 		const r1 = await shim.createResourceFromPath(`${__dirname}/../tests/support/photo.jpg`);
 		const r2 = await shim.createResourceFromPath(`${__dirname}/../tests/support/photo.jpg`);
-		const r3 = await shim.createResourceFromPath(`${__dirname}/../tests/support/welcome.pdf`);
 		const note1 = await Note.save({ title: 'note1' });
 		const t1 = r1.updated_time;
 		const t2 = r2.updated_time;
@@ -252,24 +257,19 @@ describe('models_Note', function() {
 				`![](:/${r1.id}) ![](:/${r1.id}) ![](:/${r2.id})`,
 				`![](file://${resourceDir}/${r1.id}.jpg?t=${t1}) ![](file://${resourceDir}/${r1.id}.jpg?t=${t1}) ![](file://${resourceDir}/${r2.id}.jpg?t=${t2})`,
 			],
-			[
-				true,
-				`![](:/${r3.id})`,
-				`![](file://${resourceDir}/${r3.id}.pdf)`,
-			],
 		];
 
 		for (const testCase of testCases) {
 			const [useAbsolutePaths, input, expected] = testCase;
 			const internalToExternal = await Note.replaceResourceInternalToExternalLinks(input, { useAbsolutePaths });
-			expect(internalToExternal).toBe(expected);
+			expect(internalToExternal).toBe(expected, 'replaceResourceInternalToExternalLinks failed');
 
 			const externalToInternal = await Note.replaceResourceExternalToInternalLinks(internalToExternal, { useAbsolutePaths });
-			expect(externalToInternal).toBe(input);
+			expect(externalToInternal).toBe(input, 'replaceResourceExternalToInternalLinks failed');
 		}
 
 		const result = await Note.replaceResourceExternalToInternalLinks(`[](joplin://${note1.id})`);
-		expect(result).toBe(`[](:/${note1.id})`);
+		expect(result).toBe(`[](:/${note1.id})`, 'replaceResourceExternalToInternalLinks failed (note link)');
 	}));
 
 });

packages/app-cli/tests/services_InteropService.ts

@@ -19,16 +19,10 @@ function exportDir() {
 	return `${__dirname}/export`;
 }
 
-async function recreateExportDir() {
-	const dir = exportDir();
-	await fs.remove(dir);
-	await fs.mkdirp(dir);
-}
-
 function fieldsEqual(model1: any, model2: any, fieldNames: string[]) {
 	for (let i = 0; i < fieldNames.length; i++) {
 		const f = fieldNames[i];
-		expect(model1[f]).toBe(model2[f]);
+		expect(model1[f]).toBe(model2[f], `For key ${f}`);
 	}
 }
 
@@ -37,7 +31,10 @@ describe('services_InteropService', function() {
 	beforeEach(async (done) => {
 		await setupDatabaseAndSynchronizer(1);
 		await switchClient(1);
-		await recreateExportDir();
+
+		const dir = exportDir();
+		await fs.remove(dir);
+		await fs.mkdirp(dir);
 		done();
 	});
 
@@ -419,36 +416,6 @@ describe('services_InteropService', function() {
 		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote2.md`)).toBe(true);
 	}));
 
-	it('should export conflict notes', asyncTest(async () => {
-		const folder1 = await Folder.save({ title: 'testexportfolder' });
-		await Note.save({ title: 'textexportnote1', parent_id: folder1.id, is_conflict: 1 });
-		await Note.save({ title: 'textexportnote2', parent_id: folder1.id });
-
-		const service = InteropService.instance();
-
-		await service.export({
-			path: exportDir(),
-			format: 'md',
-			sourceFolderIds: [folder1.id],
-			includeConflicts: false,
-		});
-
-		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote1.md`)).toBe(false);
-		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote2.md`)).toBe(true);
-
-		await recreateExportDir();
-
-		await service.export({
-			path: exportDir(),
-			format: 'md',
-			sourceFolderIds: [folder1.id],
-			includeConflicts: true,
-		});
-
-		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote1.md`)).toBe(true);
-		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote2.md`)).toBe(true);
-	}));
-
 	it('should not try to export folders with a non-existing parent', asyncTest(async () => {
 		// Handles and edge case where user has a folder but this folder with a parent
 		// that doesn't exist. Can happen for example in this case:

packages/app-cli/tests/services_PluginService.ts

@@ -3,10 +3,8 @@ import PluginService from '@joplin/lib/services/plugins/PluginService';
 import { ContentScriptType } from '@joplin/lib/services/plugins/api/types';
 import MdToHtml from '@joplin/renderer/MdToHtml';
 import shim from '@joplin/lib/shim';
-import Setting from '@joplin/lib/models/Setting';
 
-const fs = require('fs-extra');
-const { asyncTest, expectNotThrow, setupDatabaseAndSynchronizer, switchClient, expectThrow, createTempDir } = require('./test-utils.js');
+const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, createTempDir } = require('./test-utils.js');
 const Note = require('@joplin/lib/models/Note');
 const Folder = require('@joplin/lib/models/Folder');
 
@@ -16,11 +14,10 @@ process.on('unhandledRejection', (reason, p) => {
 
 const testPluginDir = `${__dirname}/../tests/support/plugins`;
 
-function newPluginService(appVersion: string = '1.4') {
+function newPluginService() {
 	const runner = new PluginRunner();
 	const service = new PluginService();
 	service.initialize(
-		appVersion,
 		{
 			joplin: {
 				workspace: {},
@@ -45,9 +42,9 @@ describe('services_PluginService', function() {
 
 	it('should load and run a simple plugin', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins([`${testPluginDir}/simple`], {});
+		await service.loadAndRunPlugins([`${testPluginDir}/simple`]);
 
-		expect(() => service.pluginById('org.joplinapp.plugins.Simple')).not.toThrowError();
+		expect(() => service.pluginById('simple')).not.toThrowError();
 
 		const allFolders = await Folder.all();
 		expect(allFolders.length).toBe(1);
@@ -61,14 +58,15 @@ describe('services_PluginService', function() {
 
 	it('should load and run a simple plugin and handle trailing slash', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins([`${testPluginDir}/simple/`], {});
-		expect(() => service.pluginById('org.joplinapp.plugins.Simple')).not.toThrowError();
+		await service.loadAndRunPlugins([`${testPluginDir}/simple/`]);
+		expect(() => service.pluginById('simple')).not.toThrowError();
 	}));
 
 	it('should load and run a plugin that uses external packages', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins([`${testPluginDir}/withExternalModules`], {});
-		expect(() => service.pluginById('org.joplinapp.plugins.ExternalModuleDemo')).not.toThrowError();
+		await service.loadAndRunPlugins([`${testPluginDir}/withExternalModules`]);
+		const plugin = service.pluginById('withexternalmodules');
+		expect(plugin.id).toBe('withexternalmodules');
 
 		const allFolders = await Folder.all();
 		expect(allFolders.length).toBe(1);
@@ -80,10 +78,10 @@ describe('services_PluginService', function() {
 
 	it('should load multiple plugins from a directory', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins(`${testPluginDir}/multi_plugins`, {});
+		await service.loadAndRunPlugins(`${testPluginDir}/multi_plugins`);
 
-		const plugin1 = service.pluginById('org.joplinapp.plugins.MultiPluginDemo1');
-		const plugin2 = service.pluginById('org.joplinapp.plugins.MultiPluginDemo2');
+		const plugin1 = service.pluginById('simple1');
+		const plugin2 = service.pluginById('simple2');
 		expect(!!plugin1).toBe(true);
 		expect(!!plugin2).toBe(true);
 
@@ -95,12 +93,10 @@ describe('services_PluginService', function() {
 	it('should load plugins from JS bundles', asyncTest(async () => {
 		const service = newPluginService();
 
-		const plugin = await service.loadPluginFromJsBundle('/tmp', `
+		const plugin = await service.loadPluginFromString('example', '/tmp', `
 			/* joplin-manifest:
 			{
-				"id": "org.joplinapp.plugins.JsBundleTest",
 				"manifest_version": 1,
-				"app_min_version": "1.4",
 				"name": "JS Bundle test",
 				"description": "JS Bundle Test plugin",
 				"version": "1.0.0",
@@ -127,15 +123,8 @@ describe('services_PluginService', function() {
 
 	it('should load plugins from JS bundle files', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins(`${testPluginDir}/jsbundles`, {});
-		expect(!!service.pluginById('org.joplinapp.plugins.JsBundleDemo')).toBe(true);
-		expect((await Folder.all()).length).toBe(1);
-	}));
-
-	it('should load plugins from JPL archive', asyncTest(async () => {
-		const service = newPluginService();
-		await service.loadAndRunPlugins([`${testPluginDir}/jpl_test/org.joplinapp.FirstJplPlugin.jpl`], {});
-		expect(!!service.pluginById('org.joplinapp.FirstJplPlugin')).toBe(true);
+		await service.loadAndRunPlugins(`${testPluginDir}/jsbundles`);
+		expect(!!service.pluginById('example')).toBe(true);
 		expect((await Folder.all()).length).toBe(1);
 	}));
 
@@ -168,7 +157,7 @@ describe('services_PluginService', function() {
 		const service = newPluginService();
 
 		for (const jsBundle of invalidJsBundles) {
-			await expectThrow(async () => await service.loadPluginFromJsBundle('/tmp', jsBundle));
+			await expectThrow(async () => await service.loadPluginFromString('example', '/tmp', jsBundle));
 		}
 	}));
 
@@ -180,12 +169,10 @@ describe('services_PluginService', function() {
 
 		const service = newPluginService();
 
-		const plugin = await service.loadPluginFromJsBundle(tempDir, `
+		const plugin = await service.loadPluginFromString('example', tempDir, `
 			/* joplin-manifest:
 			{
-				"id": "org.joplinapp.plugin.MarkdownItPluginTest",
 				"manifest_version": 1,
-				"app_min_version": "1.4",
 				"name": "JS Bundle test",
 				"description": "JS Bundle Test plugin",
 				"version": "1.0.0",
@@ -224,61 +211,4 @@ describe('services_PluginService', function() {
 		await shim.fsDriver().remove(tempDir);
 	}));
 
-	it('should enable and disable plugins depending on what app version they support', asyncTest(async () => {
-		const pluginScript = `
-			/* joplin-manifest:
-			{
-				"id": "org.joplinapp.plugins.PluginTest",
-				"manifest_version": 1,
-				"app_min_version": "1.4",
-				"name": "JS Bundle test",
-				"version": "1.0.0"
-			}
-			*/
-			
-			joplin.plugins.register({
-				onStart: async function() { },
-			});
-		`;
-
-		const testCases = [
-			['1.4', true],
-			['1.5', true],
-			['2.0', true],
-			['1.3', false],
-			['0.9', false],
-		];
-
-		for (const testCase of testCases) {
-			const [appVersion, hasNoError] = testCase;
-			const service = newPluginService(appVersion as string);
-			const plugin = await service.loadPluginFromJsBundle('', pluginScript);
-
-			if (hasNoError) {
-				await expectNotThrow(() => service.runPlugin(plugin));
-			} else {
-				await expectThrow(() => service.runPlugin(plugin));
-			}
-		}
-	}));
-
-	it('should install a plugin', asyncTest(async () => {
-		const service = newPluginService();
-		const pluginPath = `${testPluginDir}/jpl_test/org.joplinapp.FirstJplPlugin.jpl`;
-		await service.installPlugin(pluginPath);
-		const installedPluginPath = `${Setting.value('pluginDir')}/org.joplinapp.FirstJplPlugin.jpl`;
-		expect(await fs.existsSync(installedPluginPath)).toBe(true);
-	}));
-
-	it('should rename the plugin archive to the right name', asyncTest(async () => {
-		const tempDir = await createTempDir();
-		const service = newPluginService();
-		const pluginPath = `${testPluginDir}/jpl_test/org.joplinapp.FirstJplPlugin.jpl`;
-		const tempPath = `${tempDir}/something.jpl`;
-		await shim.fsDriver().copy(pluginPath, tempPath);
-		const installedPluginPath = `${Setting.value('pluginDir')}/org.joplinapp.FirstJplPlugin.jpl`;
-		await service.installPlugin(tempPath);
-		expect(await fs.existsSync(installedPluginPath)).toBe(true);
-	}));
-
 });

packages/app-cli/tests/services_SearchEngine.js

@@ -3,7 +3,7 @@
 
 
 const time = require('@joplin/lib/time').default;
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, restoreDate } = require('./test-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, mockDate, restoreDate } = require('./test-utils.js');
 const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine');
 const Note = require('@joplin/lib/models/Note');
 const ItemChange = require('@joplin/lib/models/ItemChange');
@@ -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/services_SearchFilter.js

@@ -23,6 +23,12 @@ let engine = null;
 
 const ids = (array) => array.map(a => a.id);
 
+// For pretty printing.
+// See https://stackoverflow.com/questions/23676459/karma-jasmine-pretty-printing-object-comparison/26324116
+// jasmine.pp = function(obj) {
+// 	return JSON.stringify(obj, undefined, 2);
+//   };
+
 describe('services_SearchFilter', function() {
 	beforeEach(async (done) => {
 		await setupDatabaseAndSynchronizer(1);

packages/app-cli/tests/services_rest_Api.ts

@@ -27,13 +27,10 @@ const createFolderForPagination = async (num: number, time: number) => {
 	}, { autoTimestamp: false });
 };
 
-const createNoteForPagination = async (numOrTitle: number | string, time: number) => {
-	const title = typeof numOrTitle === 'string' ? numOrTitle : `note${numOrTitle}`;
-	const body = typeof numOrTitle === 'string' ? `Note body ${numOrTitle}` : `noteBody${numOrTitle}`;
-
+const createNoteForPagination = async (num: number, time: number) => {
 	await Note.save({
-		title: title,
-		body: body,
+		title: `note${num}`,
+		body: `noteBody${num}`,
 		updated_time: time,
 		created_time: time,
 	}, { autoTimestamp: false });
@@ -538,7 +535,7 @@ describe('services_rest_Api', function() {
 			const r3 = await api.route(RequestMethod.GET, 'folders', { ...baseQuery, page: 3 });
 
 			expect(r3.items.length).toBe(0);
-			expect(r3.has_more).toBe(false);
+			expect(r3.has_more).toBe(undefined);
 		}
 
 		{
@@ -560,7 +557,7 @@ describe('services_rest_Api', function() {
 
 			expect(r2.items.length).toBe(1);
 			expect(r2.items[0].title).toBe('folder4');
-			expect(r2.has_more).toBe(false);
+			expect(r2.has_more).toBe(undefined);
 		}
 	}));
 
@@ -646,58 +643,6 @@ describe('services_rest_Api', function() {
 		expect(r2.items[0].id).toBe(note3.id);
 	}));
 
-	it('should sort search paginated results', asyncTest(async () => {
-		SearchEngine.instance().setDb(db());
-
-		await createNoteForPagination('note c', 1000);
-		await createNoteForPagination('note e', 1001);
-		await createNoteForPagination('note b', 1002);
-		await createNoteForPagination('note a', 1003);
-		await createNoteForPagination('note d', 1004);
-
-		await SearchEngine.instance().syncTables();
-
-		{
-			const baseQuery = {
-				query: 'note',
-				fields: ['id', 'title', 'updated_time'],
-				limit: 3,
-				order_dir: PaginationOrderDir.ASC,
-				order_by: 'updated_time',
-			};
-
-			const r1 = await api.route(RequestMethod.GET, 'search', baseQuery);
-			expect(r1.items[0].updated_time).toBe(1000);
-			expect(r1.items[1].updated_time).toBe(1001);
-			expect(r1.items[2].updated_time).toBe(1002);
-
-			const r2 = await api.route(RequestMethod.GET, 'search', { ...baseQuery, page: 2 });
-			expect(r2.items[0].updated_time).toBe(1003);
-			expect(r2.items[1].updated_time).toBe(1004);
-		}
-
-		{
-			const baseQuery = {
-				query: 'note',
-				fields: ['id', 'title', 'updated_time'],
-				limit: 2,
-				order_dir: PaginationOrderDir.DESC,
-				order_by: 'title',
-			};
-
-			const r1 = await api.route(RequestMethod.GET, 'search', baseQuery);
-			expect(r1.items[0].title).toBe('note e');
-			expect(r1.items[1].title).toBe('note d');
-
-			const r2 = await api.route(RequestMethod.GET, 'search', { ...baseQuery, page: 2 });
-			expect(r2.items[0].title).toBe('note c');
-			expect(r2.items[1].title).toBe('note b');
-
-			const r3 = await api.route(RequestMethod.GET, 'search', { ...baseQuery, page: 3 });
-			expect(r3.items[0].title).toBe('note a');
-		}
-	}));
-
 	it('should return default fields', asyncTest(async () => {
 		const folder = await Folder.save({ title: 'folder' });
 		const note1 = await Note.save({ title: 'note1', parent_id: folder.id });