Android release v1.3.2

* Weight search results by most recently updated

As discussed here: https://github.com/laurent22/joplin/pull/3777#issuecomment-696491859
Before this commit, results were rarely sorted by date. Content weights and fuzziness were
determined, and then the first criteria to differ would win in sort order (and user_updated_time
was the last criteria checked).

Now the weight score itself will also include age of user_updated_time, surfacing fresh content.
At the current alpha level, results are weighted logarithmically, prioritizing mostly within the
last 30 days, and especially heavily within the past week.

* Updated unit tests to weight search results by last updated date

* Updated unit test title

* Fixed issue with weighted search engine test, and made it more deterministic using mock date

Date was being calculated only at the start of the test suite. It also wasn't using a set mock date, so the milliseconds between the real search engine calculations and the test calculation caused differences in results

* Added initial Search Engine spec

* Added Search Engine spec to README.md

* Renamed Search Sorting spec per laurent22's mentioned naming

* Revised copy in search sorting spec

Co-authored-by: Laurent <laurent22@users.noreply.github.com>

.eslintignore

@@ -59,18 +59,34 @@ Tools/node_modules
 Tools/PortableAppsLauncher
 Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/langs/
+CliClient/build/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
-CliClient/build/LinkSelector.js
+CliClient/app/services/plugins/PluginRunner.js
+CliClient/tests/models_Setting.js
+CliClient/tests/services_CommandService.js
+CliClient/tests/services_InteropService.js
+CliClient/tests/services_PluginService.js
+CliClient/tests/services_rest_Api.js
+CliClient/tests/services/plugins/sandboxProxy.js
 CliClient/tests/synchronizer_LockHandler.js
 CliClient/tests/synchronizer_MigrationHandler.js
+ElectronClient/app.js
+ElectronClient/bridge.js
+ElectronClient/commands/copyDevCommand.js
 ElectronClient/commands/focusElement.js
 ElectronClient/commands/startExternalEditing.js
 ElectronClient/commands/stopExternalEditing.js
+ElectronClient/commands/toggleExternalEditing.js
+ElectronClient/ElectronAppWrapper.js
 ElectronClient/global.d.js
+ElectronClient/gui/Button/Button.js
+ElectronClient/gui/ConfigScreen/ButtonBar.js
+ElectronClient/gui/ConfigScreen/ConfigScreen.js
+ElectronClient/gui/ConfigScreen/SideBar.js
+ElectronClient/gui/DropboxLoginScreen.js
 ElectronClient/gui/ErrorBoundary.js
-ElectronClient/gui/Header/commands/focusSearch.js
 ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js
 ElectronClient/gui/KeymapConfig/ShortcutRecorder.js
 ElectronClient/gui/KeymapConfig/styles/index.js
@@ -81,8 +97,8 @@ ElectronClient/gui/MainScreen/commands/editAlarm.js
 ElectronClient/gui/MainScreen/commands/exportPdf.js
 ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
+ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
-ElectronClient/gui/MainScreen/commands/newNotebook.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
@@ -94,9 +110,12 @@ ElectronClient/gui/MainScreen/commands/showModalMessage.js
 ElectronClient/gui/MainScreen/commands/showNoteContentProperties.js
 ElectronClient/gui/MainScreen/commands/showNoteProperties.js
 ElectronClient/gui/MainScreen/commands/showShareNoteDialog.js
+ElectronClient/gui/MainScreen/commands/toggleEditors.js
 ElectronClient/gui/MainScreen/commands/toggleNoteList.js
 ElectronClient/gui/MainScreen/commands/toggleSidebar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
+ElectronClient/gui/MainScreen/MainScreen.js
+ElectronClient/gui/MenuBar.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
@@ -113,9 +132,11 @@ ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useKeymap.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
 ElectronClient/gui/NoteEditor/NoteEditor.js
@@ -125,44 +146,146 @@ ElectronClient/gui/NoteEditor/utils/index.js
 ElectronClient/gui/NoteEditor/utils/resourceHandling.js
 ElectronClient/gui/NoteEditor/utils/types.js
 ElectronClient/gui/NoteEditor/utils/useDropHandler.js
+ElectronClient/gui/NoteEditor/utils/useFolder.js
 ElectronClient/gui/NoteEditor/utils/useFormNote.js
 ElectronClient/gui/NoteEditor/utils/useMarkupToHtml.js
 ElectronClient/gui/NoteEditor/utils/useMessageHandler.js
 ElectronClient/gui/NoteEditor/utils/useNoteSearchBar.js
+ElectronClient/gui/NoteEditor/utils/usePluginServiceRegistration.js
 ElectronClient/gui/NoteEditor/utils/useSearchMarkers.js
 ElectronClient/gui/NoteEditor/utils/useWindowCommandHandler.js
 ElectronClient/gui/NoteList/commands/focusElementNoteList.js
+ElectronClient/gui/NoteList/NoteList.js
+ElectronClient/gui/NoteListControls/commands/focusSearch.js
+ElectronClient/gui/NoteListControls/NoteListControls.js
 ElectronClient/gui/NoteListItem.js
+ElectronClient/gui/NoteTextViewer.js
 ElectronClient/gui/NoteToolbar/NoteToolbar.js
+ElectronClient/gui/OneDriveLoginScreen.js
+ElectronClient/gui/ResizableLayout/hooks/useLayoutItemSizes.js
+ElectronClient/gui/ResizableLayout/hooks/useWindowResizeEvent.js
+ElectronClient/gui/ResizableLayout/ResizableLayout.js
 ElectronClient/gui/ResourceScreen.js
 ElectronClient/gui/Root_UpgradeSyncTarget.js
+ElectronClient/gui/Root.js
+ElectronClient/gui/SearchBar/hooks/useSearch.js
+ElectronClient/gui/SearchBar/SearchBar.js
+ElectronClient/gui/SearchBar/styles/index.js
 ElectronClient/gui/ShareNoteDialog.js
 ElectronClient/gui/SideBar/commands/focusElementSideBar.js
+ElectronClient/gui/SideBar/SideBar.js
+ElectronClient/gui/SideBar/styles/index.js
+ElectronClient/gui/StatusScreen/StatusScreen.js
+ElectronClient/gui/style/StyledInput.js
+ElectronClient/gui/style/StyledTextInput.js
+ElectronClient/gui/ToggleEditorsButton/styles/index.js
+ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.js
+ElectronClient/gui/ToolbarBase.js
+ElectronClient/gui/ToolbarButton/styles/index.js
+ElectronClient/gui/ToolbarButton/ToolbarButton.js
+ElectronClient/gui/utils/NoteListUtils.js
+ElectronClient/InteropServiceHelper.js
+ElectronClient/services/bridge.js
+ElectronClient/services/plugins/hooks/useThemeCss.js
+ElectronClient/services/plugins/hooks/useViewIsReady.js
+ElectronClient/services/plugins/PlatformImplementation.js
+ElectronClient/services/plugins/PluginRunner.js
+ElectronClient/services/plugins/UserWebview.js
+ElectronClient/services/plugins/UserWebviewDialog.js
+ElectronClient/services/plugins/UserWebviewDialogButtonBar.js
 ReactNativeClient/lib/AsyncActionQueue.js
+ReactNativeClient/lib/BaseApplication.js
 ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
 ReactNativeClient/lib/commands/synchronize.js
 ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
+ReactNativeClient/lib/components/SelectDateTimeDialog.js
+ReactNativeClient/lib/errorUtils.js
+ReactNativeClient/lib/eventManager.js
 ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
+ReactNativeClient/lib/hooks/usePropsDebugger.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
 ReactNativeClient/lib/JoplinServerApi.js
+ReactNativeClient/lib/locale.js
+ReactNativeClient/lib/Logger.js
+ReactNativeClient/lib/markdownUtils.js
+ReactNativeClient/lib/models/Alarm.js
+ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
+ReactNativeClient/lib/PoorManIntervals.js
+ReactNativeClient/lib/reducer.js
+ReactNativeClient/lib/services/AlarmService.js
+ReactNativeClient/lib/services/AlarmServiceDriver.android.js
+ReactNativeClient/lib/services/AlarmServiceDriver.ios.js
+ReactNativeClient/lib/services/AlarmServiceDriverNode.js
+ReactNativeClient/lib/services/BaseService.js
+ReactNativeClient/lib/services/BooleanExpression.js
+ReactNativeClient/lib/services/commands/MenuUtils.js
+ReactNativeClient/lib/services/commands/propsHaveChanged.js
+ReactNativeClient/lib/services/commands/ToolbarButtonUtils.js
 ReactNativeClient/lib/services/CommandService.js
+ReactNativeClient/lib/services/contextkey/contextkey.js
+ReactNativeClient/lib/services/debug/populateDatabase.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Base.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Custom.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Html.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Jex.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Md.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Raw.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Base.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Custom.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_EnexToHtml.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_EnexToMd.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Jex.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Md.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Raw.js
+ReactNativeClient/lib/services/interop/InteropService.js
+ReactNativeClient/lib/services/interop/types.js
 ReactNativeClient/lib/services/keychain/KeychainService.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriver.node.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js
 ReactNativeClient/lib/services/KeymapService.js
+ReactNativeClient/lib/services/plugins/api/Global.js
+ReactNativeClient/lib/services/plugins/api/Joplin.js
+ReactNativeClient/lib/services/plugins/api/JoplinCommands.js
+ReactNativeClient/lib/services/plugins/api/JoplinData.js
+ReactNativeClient/lib/services/plugins/api/JoplinFilters.js
+ReactNativeClient/lib/services/plugins/api/JoplinInterop.js
+ReactNativeClient/lib/services/plugins/api/JoplinPlugins.js
+ReactNativeClient/lib/services/plugins/api/JoplinSettings.js
+ReactNativeClient/lib/services/plugins/api/JoplinViews.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsDialogs.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsMenuItems.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsPanels.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsToolbarButtons.js
+ReactNativeClient/lib/services/plugins/api/JoplinWorkspace.js
+ReactNativeClient/lib/services/plugins/api/types.js
+ReactNativeClient/lib/services/plugins/BasePluginRunner.js
+ReactNativeClient/lib/services/plugins/MenuItemController.js
+ReactNativeClient/lib/services/plugins/Plugin.js
+ReactNativeClient/lib/services/plugins/PluginService.js
+ReactNativeClient/lib/services/plugins/reducer.js
+ReactNativeClient/lib/services/plugins/sandboxProxy.js
+ReactNativeClient/lib/services/plugins/ToolbarButtonController.js
+ReactNativeClient/lib/services/plugins/utils/createViewHandle.js
+ReactNativeClient/lib/services/plugins/utils/executeSandboxCall.js
+ReactNativeClient/lib/services/plugins/utils/manifestFromObject.js
+ReactNativeClient/lib/services/plugins/utils/mapEventHandlersToIds.js
+ReactNativeClient/lib/services/plugins/utils/types.js
+ReactNativeClient/lib/services/plugins/ViewController.js
+ReactNativeClient/lib/services/plugins/WebviewController.js
 ReactNativeClient/lib/services/ResourceEditWatcher/index.js
 ReactNativeClient/lib/services/ResourceEditWatcher/reducer.js
 ReactNativeClient/lib/services/rest/actionApi.desktop.js
+ReactNativeClient/lib/services/rest/Api.js
 ReactNativeClient/lib/services/rest/errors.js
 ReactNativeClient/lib/services/searchengine/filterParser.js
 ReactNativeClient/lib/services/searchengine/queryBuilder.js
@@ -176,6 +299,19 @@ ReactNativeClient/lib/services/synchronizer/utils/types.js
 ReactNativeClient/lib/services/UndoRedoService.js
 ReactNativeClient/lib/ShareExtension.js
 ReactNativeClient/lib/shareHandler.js
+ReactNativeClient/lib/shim.js
+ReactNativeClient/lib/Synchronizer.js
+ReactNativeClient/lib/theme.js
+ReactNativeClient/lib/themes/aritimDark.js
+ReactNativeClient/lib/themes/dark.js
+ReactNativeClient/lib/themes/dracula.js
+ReactNativeClient/lib/themes/light.js
+ReactNativeClient/lib/themes/nord.js
+ReactNativeClient/lib/themes/oledDark.js
+ReactNativeClient/lib/themes/solarizedDark.js
+ReactNativeClient/lib/themes/solarizedLight.js
+ReactNativeClient/lib/themes/type.js
+ReactNativeClient/lib/uuid.js
 ReactNativeClient/lib/versionInfo.js
 ReactNativeClient/PluginAssetsLoader.js
 ReactNativeClient/setUpQuickActions.js

.eslintrc.js

@@ -48,8 +48,9 @@ module.exports = {
 		// -------------------------------
 		'react/jsx-uses-react': 'error',
 		'react/jsx-uses-vars': 'error',
-		'no-unused-vars': 'error',
-		'@typescript-eslint/no-unused-vars': 'error',
+		'no-unused-vars': ['error', { 'argsIgnorePattern': '^_' }],
+		'@typescript-eslint/no-unused-vars': ['error', { 'argsIgnorePattern': '^_' }],
+		'@typescript-eslint/explicit-member-accessibility': 'off',
 		'no-constant-condition': 0,
 		'no-prototype-builtins': 0,
 		// This error is always a false positive so far since it detects
@@ -121,4 +122,15 @@ module.exports = {
 		'react-hooks',
 		'import',
 	],
+	'overrides': [
+		{
+			// enable the rule specifically for TypeScript files
+			'files': ['*.ts', '*.tsx'],
+			'rules': {
+				// Warn only because it would make it difficult to convert JS classes to TypeScript, unless we
+				// make everything public which is not great. New code however should specify member accessibility.
+				'@typescript-eslint/explicit-member-accessibility': ['warn'],
+			},
+		},
+	],
 };

.github/PULL_REQUEST_TEMPLATE

@@ -20,6 +20,6 @@ If it's not related to any platform (such as a translation, change to the docume
 
 Then please append the issue that you've addressed or fixed. Use "Resolves #123" for new features or improvements and "Fixes #123" for bug fixes.
 
-AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md
+AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/dev/CONTRIBUTING.md
 
 -->

.gitignore

@@ -50,20 +50,37 @@ joplin-webclipper-source.zip
 Tools/commit_hook.txt
 .vscode/*
 *.map
-ReactNativeClient/lib/sql-extensions/
-!ReactNativeClient/lib/sql-extensions/spellfix.dll
+ReactNativeClient/lib/sql-extensions/spellfix.so
+ReactNativeClient/lib/sql-extensions/spellfix.dylib
+CliClient/build/
+plugin_types/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
-CliClient/build/LinkSelector.js
+CliClient/app/services/plugins/PluginRunner.js
+CliClient/tests/models_Setting.js
+CliClient/tests/services_CommandService.js
+CliClient/tests/services_InteropService.js
+CliClient/tests/services_PluginService.js
+CliClient/tests/services_rest_Api.js
+CliClient/tests/services/plugins/sandboxProxy.js
 CliClient/tests/synchronizer_LockHandler.js
 CliClient/tests/synchronizer_MigrationHandler.js
+ElectronClient/app.js
+ElectronClient/bridge.js
+ElectronClient/commands/copyDevCommand.js
 ElectronClient/commands/focusElement.js
 ElectronClient/commands/startExternalEditing.js
 ElectronClient/commands/stopExternalEditing.js
+ElectronClient/commands/toggleExternalEditing.js
+ElectronClient/ElectronAppWrapper.js
 ElectronClient/global.d.js
+ElectronClient/gui/Button/Button.js
+ElectronClient/gui/ConfigScreen/ButtonBar.js
+ElectronClient/gui/ConfigScreen/ConfigScreen.js
+ElectronClient/gui/ConfigScreen/SideBar.js
+ElectronClient/gui/DropboxLoginScreen.js
 ElectronClient/gui/ErrorBoundary.js
-ElectronClient/gui/Header/commands/focusSearch.js
 ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js
 ElectronClient/gui/KeymapConfig/ShortcutRecorder.js
 ElectronClient/gui/KeymapConfig/styles/index.js
@@ -74,8 +91,8 @@ ElectronClient/gui/MainScreen/commands/editAlarm.js
 ElectronClient/gui/MainScreen/commands/exportPdf.js
 ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
+ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
-ElectronClient/gui/MainScreen/commands/newNotebook.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
@@ -87,9 +104,12 @@ ElectronClient/gui/MainScreen/commands/showModalMessage.js
 ElectronClient/gui/MainScreen/commands/showNoteContentProperties.js
 ElectronClient/gui/MainScreen/commands/showNoteProperties.js
 ElectronClient/gui/MainScreen/commands/showShareNoteDialog.js
+ElectronClient/gui/MainScreen/commands/toggleEditors.js
 ElectronClient/gui/MainScreen/commands/toggleNoteList.js
 ElectronClient/gui/MainScreen/commands/toggleSidebar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
+ElectronClient/gui/MainScreen/MainScreen.js
+ElectronClient/gui/MenuBar.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
@@ -106,9 +126,11 @@ ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useKeymap.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
 ElectronClient/gui/NoteEditor/NoteEditor.js
@@ -118,44 +140,146 @@ ElectronClient/gui/NoteEditor/utils/index.js
 ElectronClient/gui/NoteEditor/utils/resourceHandling.js
 ElectronClient/gui/NoteEditor/utils/types.js
 ElectronClient/gui/NoteEditor/utils/useDropHandler.js
+ElectronClient/gui/NoteEditor/utils/useFolder.js
 ElectronClient/gui/NoteEditor/utils/useFormNote.js
 ElectronClient/gui/NoteEditor/utils/useMarkupToHtml.js
 ElectronClient/gui/NoteEditor/utils/useMessageHandler.js
 ElectronClient/gui/NoteEditor/utils/useNoteSearchBar.js
+ElectronClient/gui/NoteEditor/utils/usePluginServiceRegistration.js
 ElectronClient/gui/NoteEditor/utils/useSearchMarkers.js
 ElectronClient/gui/NoteEditor/utils/useWindowCommandHandler.js
 ElectronClient/gui/NoteList/commands/focusElementNoteList.js
+ElectronClient/gui/NoteList/NoteList.js
+ElectronClient/gui/NoteListControls/commands/focusSearch.js
+ElectronClient/gui/NoteListControls/NoteListControls.js
 ElectronClient/gui/NoteListItem.js
+ElectronClient/gui/NoteTextViewer.js
 ElectronClient/gui/NoteToolbar/NoteToolbar.js
+ElectronClient/gui/OneDriveLoginScreen.js
+ElectronClient/gui/ResizableLayout/hooks/useLayoutItemSizes.js
+ElectronClient/gui/ResizableLayout/hooks/useWindowResizeEvent.js
+ElectronClient/gui/ResizableLayout/ResizableLayout.js
 ElectronClient/gui/ResourceScreen.js
 ElectronClient/gui/Root_UpgradeSyncTarget.js
+ElectronClient/gui/Root.js
+ElectronClient/gui/SearchBar/hooks/useSearch.js
+ElectronClient/gui/SearchBar/SearchBar.js
+ElectronClient/gui/SearchBar/styles/index.js
 ElectronClient/gui/ShareNoteDialog.js
 ElectronClient/gui/SideBar/commands/focusElementSideBar.js
+ElectronClient/gui/SideBar/SideBar.js
+ElectronClient/gui/SideBar/styles/index.js
+ElectronClient/gui/StatusScreen/StatusScreen.js
+ElectronClient/gui/style/StyledInput.js
+ElectronClient/gui/style/StyledTextInput.js
+ElectronClient/gui/ToggleEditorsButton/styles/index.js
+ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.js
+ElectronClient/gui/ToolbarBase.js
+ElectronClient/gui/ToolbarButton/styles/index.js
+ElectronClient/gui/ToolbarButton/ToolbarButton.js
+ElectronClient/gui/utils/NoteListUtils.js
+ElectronClient/InteropServiceHelper.js
+ElectronClient/services/bridge.js
+ElectronClient/services/plugins/hooks/useThemeCss.js
+ElectronClient/services/plugins/hooks/useViewIsReady.js
+ElectronClient/services/plugins/PlatformImplementation.js
+ElectronClient/services/plugins/PluginRunner.js
+ElectronClient/services/plugins/UserWebview.js
+ElectronClient/services/plugins/UserWebviewDialog.js
+ElectronClient/services/plugins/UserWebviewDialogButtonBar.js
 ReactNativeClient/lib/AsyncActionQueue.js
+ReactNativeClient/lib/BaseApplication.js
 ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
 ReactNativeClient/lib/commands/synchronize.js
 ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
+ReactNativeClient/lib/components/SelectDateTimeDialog.js
+ReactNativeClient/lib/errorUtils.js
+ReactNativeClient/lib/eventManager.js
 ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
+ReactNativeClient/lib/hooks/usePropsDebugger.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
 ReactNativeClient/lib/JoplinServerApi.js
+ReactNativeClient/lib/locale.js
+ReactNativeClient/lib/Logger.js
+ReactNativeClient/lib/markdownUtils.js
+ReactNativeClient/lib/models/Alarm.js
+ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
+ReactNativeClient/lib/PoorManIntervals.js
+ReactNativeClient/lib/reducer.js
+ReactNativeClient/lib/services/AlarmService.js
+ReactNativeClient/lib/services/AlarmServiceDriver.android.js
+ReactNativeClient/lib/services/AlarmServiceDriver.ios.js
+ReactNativeClient/lib/services/AlarmServiceDriverNode.js
+ReactNativeClient/lib/services/BaseService.js
+ReactNativeClient/lib/services/BooleanExpression.js
+ReactNativeClient/lib/services/commands/MenuUtils.js
+ReactNativeClient/lib/services/commands/propsHaveChanged.js
+ReactNativeClient/lib/services/commands/ToolbarButtonUtils.js
 ReactNativeClient/lib/services/CommandService.js
+ReactNativeClient/lib/services/contextkey/contextkey.js
+ReactNativeClient/lib/services/debug/populateDatabase.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Base.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Custom.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Html.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Jex.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Md.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Raw.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Base.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Custom.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_EnexToHtml.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_EnexToMd.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Jex.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Md.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Raw.js
+ReactNativeClient/lib/services/interop/InteropService.js
+ReactNativeClient/lib/services/interop/types.js
 ReactNativeClient/lib/services/keychain/KeychainService.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriver.node.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js
 ReactNativeClient/lib/services/KeymapService.js
+ReactNativeClient/lib/services/plugins/api/Global.js
+ReactNativeClient/lib/services/plugins/api/Joplin.js
+ReactNativeClient/lib/services/plugins/api/JoplinCommands.js
+ReactNativeClient/lib/services/plugins/api/JoplinData.js
+ReactNativeClient/lib/services/plugins/api/JoplinFilters.js
+ReactNativeClient/lib/services/plugins/api/JoplinInterop.js
+ReactNativeClient/lib/services/plugins/api/JoplinPlugins.js
+ReactNativeClient/lib/services/plugins/api/JoplinSettings.js
+ReactNativeClient/lib/services/plugins/api/JoplinViews.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsDialogs.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsMenuItems.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsPanels.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsToolbarButtons.js
+ReactNativeClient/lib/services/plugins/api/JoplinWorkspace.js
+ReactNativeClient/lib/services/plugins/api/types.js
+ReactNativeClient/lib/services/plugins/BasePluginRunner.js
+ReactNativeClient/lib/services/plugins/MenuItemController.js
+ReactNativeClient/lib/services/plugins/Plugin.js
+ReactNativeClient/lib/services/plugins/PluginService.js
+ReactNativeClient/lib/services/plugins/reducer.js
+ReactNativeClient/lib/services/plugins/sandboxProxy.js
+ReactNativeClient/lib/services/plugins/ToolbarButtonController.js
+ReactNativeClient/lib/services/plugins/utils/createViewHandle.js
+ReactNativeClient/lib/services/plugins/utils/executeSandboxCall.js
+ReactNativeClient/lib/services/plugins/utils/manifestFromObject.js
+ReactNativeClient/lib/services/plugins/utils/mapEventHandlersToIds.js
+ReactNativeClient/lib/services/plugins/utils/types.js
+ReactNativeClient/lib/services/plugins/ViewController.js
+ReactNativeClient/lib/services/plugins/WebviewController.js
 ReactNativeClient/lib/services/ResourceEditWatcher/index.js
 ReactNativeClient/lib/services/ResourceEditWatcher/reducer.js
 ReactNativeClient/lib/services/rest/actionApi.desktop.js
+ReactNativeClient/lib/services/rest/Api.js
 ReactNativeClient/lib/services/rest/errors.js
 ReactNativeClient/lib/services/searchengine/filterParser.js
 ReactNativeClient/lib/services/searchengine/queryBuilder.js
@@ -169,6 +293,19 @@ ReactNativeClient/lib/services/synchronizer/utils/types.js
 ReactNativeClient/lib/services/UndoRedoService.js
 ReactNativeClient/lib/ShareExtension.js
 ReactNativeClient/lib/shareHandler.js
+ReactNativeClient/lib/shim.js
+ReactNativeClient/lib/Synchronizer.js
+ReactNativeClient/lib/theme.js
+ReactNativeClient/lib/themes/aritimDark.js
+ReactNativeClient/lib/themes/dark.js
+ReactNativeClient/lib/themes/dracula.js
+ReactNativeClient/lib/themes/light.js
+ReactNativeClient/lib/themes/nord.js
+ReactNativeClient/lib/themes/oledDark.js
+ReactNativeClient/lib/themes/solarizedDark.js
+ReactNativeClient/lib/themes/solarizedLight.js
+ReactNativeClient/lib/themes/type.js
+ReactNativeClient/lib/uuid.js
 ReactNativeClient/lib/versionInfo.js
 ReactNativeClient/PluginAssetsLoader.js
 ReactNativeClient/setUpQuickActions.js

BUILD.md

@@ -11,6 +11,7 @@ Note that all the applications share the same library, which, for historical rea
 - macOS, Linux: Install rsync - https://nodejs.org/en/
 - macOS: Install Cocoapods - `brew install cocoapods`
 - Windows: Install Windows Build Tools - `npm install -g windows-build-tools`
+- Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev`
 
 ## Building
 
@@ -25,6 +26,8 @@ Then you can test the various applications:
 	cd ElectronClient
 	npm start
 
+You can also run it under WSL 2. To do so, [follow these instructions](https://www.beekeeperstudio.io/blog/building-electron-windows-ubuntu-wsl2) to setup your environment.
+
 ## Testing the Terminal application
 
 	cd CliClient
@@ -93,4 +96,4 @@ The Markdown renderer is located under ReactNativeClient/lib/joplin-renderer. Wh
 
 # Troubleshooting
 
-Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/master/readme/build_troubleshooting.md) for various tips on how to get the build working.
+Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md) for various tips on how to get the build working.

CONTRIBUTING.md

@@ -38,7 +38,7 @@ If you want to start contributing to the project's code, please follow these gui
 - All the applications share the same backend (database, synchronisation, settings, models, business logic, etc.) so if you change something in the backend in one app, makes sure it still work in the other apps. Usually it does, but keep this in mind.
 - Pull requests that make many changes using an automated tool, like for spell fixing, styling, etc. will not be accepted. An exception would be if the changes have been discussed in the forum and someone has agreed to review **and test** the pull request.
 
-Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/master/BUILD.md) for more details.
+Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/dev/BUILD.md) for more details.
 
 ## Coding style
 

CliClient/app/ResourceServer.js

@@ -1,4 +1,4 @@
-const { Logger } = require('lib/logger.js');
+const Logger = require('lib/Logger').default;
 const { netUtils } = require('lib/net-utils.js');
 
 const http = require('http');

CliClient/app/app-gui.js

@@ -1,15 +1,17 @@
-const { Logger } = require('lib/logger.js');
+const Logger = require('lib/Logger').default;
 const Folder = require('lib/models/Folder.js');
 const BaseItem = require('lib/models/BaseItem.js');
 const Tag = require('lib/models/Tag.js');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
 const Resource = require('lib/models/Resource.js');
-const Setting = require('lib/models/Setting.js');
-const { reducer, defaultState } = require('lib/reducer.js');
+const Setting = require('lib/models/Setting').default;
+const reducer = require('lib/reducer').default;
+const { defaultState } = require('lib/reducer');
 const { splitCommandString } = require('lib/string-utils.js');
 const { reg } = require('lib/registry.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
+const shim = require('lib/shim').default;
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = new Entities().encode;
 
@@ -477,7 +479,7 @@ class AppGui {
 					this.linkSelector_.noteX + cursorOffsetX,
 					this.linkSelector_.noteY + cursorOffsetY
 				);
-				setTimeout(() => this.term_.term().inverse(this.linkSelector_.link), 50);
+				shim.setTimeout(() => this.term_.term().inverse(this.linkSelector_.link), 50);
 			}
 		} else if (cmd === 'open_link') {
 			if (this.widget('noteText').hasFocus) {

CliClient/app/app.js

@@ -1,4 +1,4 @@
-const { BaseApplication } = require('lib/BaseApplication');
+const BaseApplication = require('lib/BaseApplication').default;
 const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
 const ResourceService = require('lib/services/ResourceService');
 const BaseModel = require('lib/BaseModel.js');
@@ -6,14 +6,15 @@ const Folder = require('lib/models/Folder.js');
 const BaseItem = require('lib/models/BaseItem.js');
 const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
-const Setting = require('lib/models/Setting.js');
+const Setting = require('lib/models/Setting').default;
 const { reg } = require('lib/registry.js');
 const { fileExtension } = require('lib/path-utils.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const fs = require('fs-extra');
 const { cliUtils } = require('./cli-utils.js');
 const Cache = require('lib/Cache');
 const RevisionService = require('lib/services/RevisionService');
+const shim = require('lib/shim').default;
 
 class Application extends BaseApplication {
 	constructor() {
@@ -161,7 +162,7 @@ class Application extends BaseApplication {
 		};
 
 		// Give it a few seconds to cancel otherwise exit anyway
-		setTimeout(async () => {
+		shim.setTimeout(async () => {
 			await doExit();
 		}, 5000);
 

CliClient/app/base-command.js

@@ -1,4 +1,4 @@
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const { reg } = require('lib/registry.js');
 
 class BaseCommand {

CliClient/app/build-doc.js

@@ -1,7 +1,7 @@
 const fs = require('fs-extra');
 const { fileExtension, dirname } = require('lib/path-utils.js');
 const wrap_ = require('word-wrap');
-const { languageCode } = require('lib/locale.js');
+const { languageCode } = require('lib/locale');
 
 const rootDir = dirname(dirname(__dirname));
 const MAX_WIDTH = 78;

CliClient/app/cli-integration-tests.js

@@ -1,14 +1,14 @@
 'use strict';
 
 const fs = require('fs-extra');
-const { Logger } = require('lib/logger.js');
+const Logger = require('lib/Logger').default;
 const { dirname } = require('lib/path-utils.js');
 const { DatabaseDriverNode } = require('lib/database-driver-node.js');
 const { JoplinDatabase } = require('lib/joplin-database.js');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
-const Setting = require('lib/models/Setting.js');
+const Setting = require('lib/models/Setting').default;
 const { sprintf } = require('sprintf-js');
 const exec = require('child_process').exec;
 

CliClient/app/cli-utils.js

@@ -1,8 +1,8 @@
 const yargParser = require('yargs-parser');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const { time } = require('lib/time-utils.js');
 const stringPadding = require('string-padding');
-const { Logger } = require('lib/logger.js');
+const Logger = require('lib/Logger').default;
 
 const cliUtils = {};
 

CliClient/app/command-apidoc.js

@@ -3,7 +3,7 @@ const BaseItem = require('lib/models/BaseItem');
 const BaseModel = require('lib/BaseModel');
 const { toTitleCase } = require('lib/string-utils.js');
 const { reg } = require('lib/registry.js');
-const markdownUtils = require('lib/markdownUtils');
+const markdownUtils = require('lib/markdownUtils').default;
 const { Database } = require('lib/database.js');
 
 class Command extends BaseCommand {
@@ -53,9 +53,9 @@ class Command extends BaseCommand {
 
 		const lines = [];
 
-		lines.push('# Joplin API');
+		lines.push('# Joplin Data API');
 		lines.push('');
-
+		lines.push('This API is available when the clipper server is running. It provides access to the notes, notebooks, tags and other Joplin object via a REST API. Plugins can also access this API even when the clipper server is not running.');
 		lines.push('');
 		lines.push('In order to use it, you\'ll first need to find on which port the service is running. To do so, open the Web Clipper Options in Joplin and if the service is running it should tell you on which port. Normally it runs on port **41184**. If you want to find it programmatically, you may follow this kind of algorithm:');
 		lines.push('');

CliClient/app/command-attach.js

@@ -1,8 +1,8 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
-const { shim } = require('lib/shim.js');
+const shim = require('lib/shim').default;
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/command-cat.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const BaseItem = require('lib/models/BaseItem.js');
 const Note = require('lib/models/Note.js');

CliClient/app/command-config.js

@@ -1,8 +1,8 @@
 const { BaseCommand } = require('./base-command.js');
-const { _, setLocale } = require('lib/locale.js');
+const { _, setLocale } = require('lib/locale');
 const { app } = require('./app.js');
 const fs = require('fs-extra');
-const Setting = require('lib/models/Setting.js');
+const Setting = require('lib/models/Setting').default;
 
 class Command extends BaseCommand {
 	usage() {
@@ -124,7 +124,6 @@ class Command extends BaseCommand {
 
 		if (args.name == 'locale') {
 			setLocale(Setting.value('locale'));
-			app().onLocaleChanged();
 		}
 
 		await Setting.saveAll();

CliClient/app/command-cp.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
 

CliClient/app/command-done.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
 const { time } = require('lib/time-utils.js');

CliClient/app/command-e2ee.js

@@ -1,10 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const EncryptionService = require('lib/services/EncryptionService');
 const DecryptionWorker = require('lib/services/DecryptionWorker');
 const BaseItem = require('lib/models/BaseItem');
-const Setting = require('lib/models/Setting.js');
-const { shim } = require('lib/shim');
+const Setting = require('lib/models/Setting').default;
+const shim = require('lib/shim').default;
 const pathUtils = require('lib/path-utils.js');
 const imageType = require('image-type');
 const readChunk = require('read-chunk');
@@ -38,7 +38,7 @@ class Command extends BaseCommand {
 				this.stdout(_('Operation cancelled'));
 				return false;
 			}
-			Setting.setObjectKey('encryption.passwordCache', masterKeyId, password);
+			Setting.setObjectValue('encryption.passwordCache', masterKeyId, password);
 			await EncryptionService.instance().loadMasterKeysFromSettings();
 			return true;
 		};

CliClient/app/command-edit.js

@@ -1,11 +1,11 @@
 const fs = require('fs-extra');
 const { BaseCommand } = require('./base-command.js');
 const { splitCommandString } = require('lib/string-utils.js');
-const { uuid } = require('lib/uuid.js');
+const uuid = require('lib/uuid').default;
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const Note = require('lib/models/Note.js');
-const Setting = require('lib/models/Setting.js');
+const Setting = require('lib/models/Setting').default;
 const BaseModel = require('lib/BaseModel.js');
 
 class Command extends BaseCommand {

CliClient/app/command-exit.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/command-export-sync-status.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const Setting = require('lib/models/Setting.js');
+const Setting = require('lib/models/Setting').default;
 const { ReportService } = require('lib/services/report.js');
 const fs = require('fs-extra');
 

CliClient/app/command-export.js

@@ -1,8 +1,8 @@
 const { BaseCommand } = require('./base-command.js');
-const InteropService = require('lib/services/InteropService.js');
+const InteropService = require('lib/services/interop/InteropService').default;
 const BaseModel = require('lib/BaseModel.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 
 class Command extends BaseCommand {
 	usage() {
@@ -14,7 +14,7 @@ class Command extends BaseCommand {
 	}
 
 	options() {
-		const service = new InteropService();
+		const service = InteropService.instance();
 		const formats = service
 			.modules()
 			.filter(m => m.type === 'exporter' && m.format !== 'html')
@@ -41,7 +41,7 @@ class Command extends BaseCommand {
 			exportOptions.sourceFolderIds = folders.map(n => n.id);
 		}
 
-		const service = new InteropService();
+		const service = InteropService.instance();
 		const result = await service.export(exportOptions);
 
 		result.warnings.map(w => this.stdout(w));

CliClient/app/command-geoloc.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
 

CliClient/app/command-help.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { renderCommandHelp } = require('./help-utils.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {

CliClient/app/command-import.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
-const InteropService = require('lib/services/InteropService.js');
+const InteropService = require('lib/services/interop/InteropService').default;
 const BaseModel = require('lib/BaseModel.js');
 const { cliUtils } = require('./cli-utils.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 
 class Command extends BaseCommand {
 	usage() {
@@ -15,7 +15,7 @@ class Command extends BaseCommand {
 	}
 
 	options() {
-		const service = new InteropService();
+		const service = InteropService.instance();
 		const formats = service
 			.modules()
 			.filter(m => m.type === 'importer')
@@ -63,7 +63,7 @@ class Command extends BaseCommand {
 
 		app().gui().showConsole();
 		this.stdout(_('Importing notes...'));
-		const service = new InteropService();
+		const service = InteropService.instance();
 		const result = await service.import(importOptions);
 		result.warnings.map(w => this.stdout(w));
 		cliUtils.redrawDone();

CliClient/app/command-ls.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
-const Setting = require('lib/models/Setting.js');
+const Setting = require('lib/models/Setting').default;
 const Note = require('lib/models/Note.js');
 const { sprintf } = require('sprintf-js');
 const { time } = require('lib/time-utils.js');

CliClient/app/command-mkbook.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const Folder = require('lib/models/Folder.js');
 
 class Command extends BaseCommand {

CliClient/app/command-mknote.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {

CliClient/app/command-mktodo.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {

CliClient/app/command-mv.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');

CliClient/app/command-ren.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');

CliClient/app/command-rmbook.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const Folder = require('lib/models/Folder.js');
 const BaseModel = require('lib/BaseModel.js');
 

CliClient/app/command-rmnote.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const Note = require('lib/models/Note.js');
 const BaseModel = require('lib/BaseModel.js');
 

CliClient/app/command-search.js

@@ -1,8 +1,8 @@
 const { BaseCommand } = require('./base-command.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
-const { uuid } = require('lib/uuid.js');
+const uuid = require('lib/uuid').default;
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/command-server.js

@@ -1,8 +1,8 @@
 const { BaseCommand } = require('./base-command.js');
-const { _ } = require('lib/locale.js');
-const Setting = require('lib/models/Setting.js');
-const { Logger } = require('lib/logger.js');
-const { shim } = require('lib/shim');
+const { _ } = require('lib/locale');
+const Setting = require('lib/models/Setting').default;
+const Logger = require('lib/Logger').default;
+const shim = require('lib/shim').default;
 
 class Command extends BaseCommand {
 

CliClient/app/command-set.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const { Database } = require('lib/database.js');
 const Note = require('lib/models/Note.js');

CliClient/app/command-status.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const Setting = require('lib/models/Setting.js');
-const { _ } = require('lib/locale.js');
+const Setting = require('lib/models/Setting').default;
+const { _ } = require('lib/locale');
 const { ReportService } = require('lib/services/report.js');
 
 class Command extends BaseCommand {

CliClient/app/command-sync.js

@@ -1,10 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const { OneDriveApiNodeUtils } = require('lib/onedrive-api-node-utils.js');
-const Setting = require('lib/models/Setting.js');
+const Setting = require('lib/models/Setting').default;
 const ResourceFetcher = require('lib/services/ResourceFetcher');
-const { Synchronizer } = require('lib/synchronizer.js');
+const Synchronizer = require('lib/Synchronizer').default;
 const { reg } = require('lib/registry.js');
 const { cliUtils } = require('./cli-utils.js');
 const md5 = require('md5');

CliClient/app/command-tag.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const Tag = require('lib/models/Tag.js');
 const BaseModel = require('lib/BaseModel.js');
 const { time } = require('lib/time-utils.js');

CliClient/app/command-todo.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
 const { time } = require('lib/time-utils.js');

CliClient/app/command-undone.js

@@ -1,5 +1,5 @@
 const { BaseCommand } = require('./base-command.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 
 const CommandDone = require('./command-done.js');
 

CliClient/app/command-use.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 
 class Command extends BaseCommand {

CliClient/app/command-version.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
-const Setting = require('lib/models/Setting.js');
-const { _ } = require('lib/locale.js');
+const Setting = require('lib/models/Setting').default;
+const { _ } = require('lib/locale');
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/fuzzing.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { time } = require('lib/time-utils.js');
-const { Logger } = require('lib/logger.js');
+const Logger = require('lib/Logger').default;
 const Resource = require('lib/models/Resource.js');
 const { dirname } = require('lib/path-utils.js');
 const { FsDriverNode } = require('./fs-driver-node.js');

CliClient/app/gui/FolderListWidget.js

@@ -2,7 +2,7 @@ const Folder = require('lib/models/Folder.js');
 const Tag = require('lib/models/Tag.js');
 const BaseModel = require('lib/BaseModel.js');
 const ListWidget = require('tkwidgets/ListWidget.js');
-const _ = require('lib/locale.js')._;
+const _ = require('lib/locale')._;
 
 class FolderListWidget extends ListWidget {
 	constructor() {

CliClient/app/gui/NoteWidget.js

@@ -1,6 +1,6 @@
 const Note = require('lib/models/Note.js');
 const TextWidget = require('tkwidgets/TextWidget.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 
 class NoteWidget extends TextWidget {
 	constructor() {

CliClient/app/help-utils.js

@@ -1,6 +1,6 @@
 const { wrap } = require('lib/string-utils.js');
-const Setting = require('lib/models/Setting.js');
-const { _ } = require('lib/locale.js');
+const Setting = require('lib/models/Setting').default;
+const { _ } = require('lib/locale');
 
 const MAX_WIDTH = 78;
 const INDENT = '    ';

CliClient/app/main.js

@@ -21,12 +21,12 @@ const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
 const NoteTag = require('lib/models/NoteTag.js');
 const MasterKey = require('lib/models/MasterKey');
-const Setting = require('lib/models/Setting.js');
+const Setting = require('lib/models/Setting').default;
 const Revision = require('lib/models/Revision.js');
-const { Logger } = require('lib/logger.js');
+const Logger = require('lib/Logger').default;
 const { FsDriverNode } = require('lib/fs-driver-node.js');
 const { shimInit } = require('lib/shim-init-node.js');
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
 const EncryptionService = require('lib/services/EncryptionService');
 const envFromArgs = require('lib/envFromArgs');

CliClient/app/services/plugins/PluginRunner.ts

@@ -0,0 +1,68 @@
+import * as vm from 'vm';
+import Plugin from 'lib/services/plugins/Plugin';
+import sandboxProxy from 'lib/services/plugins/sandboxProxy';
+import BasePluginRunner from 'lib/services/plugins/BasePluginRunner';
+import executeSandboxCall from 'lib/services/plugins/utils/executeSandboxCall';
+import Global from 'lib/services/plugins/api/Global';
+import mapEventHandlersToIds, { EventHandlers } from 'lib/services/plugins/utils/mapEventHandlersToIds';
+
+function createConsoleWrapper(pluginId:string) {
+	const wrapper:any = {};
+
+	for (const n in console) {
+		if (!console.hasOwnProperty(n)) continue;
+		wrapper[n] = (...args:any[]) => {
+			const newArgs = args.slice();
+			newArgs.splice(0, 0, `Plugin "${pluginId}":`);
+			return (console as any)[n](...newArgs);
+		};
+	}
+
+	return wrapper;
+}
+
+// The CLI plugin runner is more complex than it needs to be because it more or less emulates
+// how it would work in a multi-process architecture, as in the desktop app (and probably how
+// it would work in the mobile app too). This is mainly to allow doing integration testing.
+//
+// For example, all plugin calls go through a proxy, however they could made directly since
+// the plugin script is running within the same process as the main app.
+
+export default class PluginRunner extends BasePluginRunner {
+
+	private eventHandlers_:EventHandlers = {};
+
+	constructor() {
+		super();
+
+		this.eventHandler = this.eventHandler.bind(this);
+	}
+
+	private async eventHandler(eventHandlerId:string, args:any[]) {
+		const cb = this.eventHandlers_[eventHandlerId];
+		return cb(...args);
+	}
+
+	private newSandboxProxy(pluginId:string, sandbox:Global) {
+		const target = async (path:string, args:any[]) => {
+			return executeSandboxCall(pluginId, sandbox, `joplin.${path}`, mapEventHandlersToIds(args, this.eventHandlers_), this.eventHandler);
+		};
+
+		return {
+			joplin: sandboxProxy(target),
+			console: createConsoleWrapper(pluginId),
+		};
+	}
+
+	async run(plugin:Plugin, sandbox:Global) {
+		const vmSandbox = vm.createContext(this.newSandboxProxy(plugin.id, sandbox));
+
+		try {
+			vm.runInContext(plugin.scriptText, vmSandbox);
+		} catch (error) {
+			this.logger().error(`In plugin ${plugin.id}:`, error);
+			return;
+		}
+	}
+
+}

CliClient/gulpfile.js

@@ -46,8 +46,14 @@ tasks.prepareTestBuild = {
 			],
 		});
 
-		await utils.copyDir(`${__dirname}/../ReactNativeClient/lib`, `${testBuildDir}/lib`);
-		await utils.copyDir(`${__dirname}/../ReactNativeClient/locales`, `${testBuildDir}/locales`);
+		const rootDir = utils.rootDir();
+
+		await utils.copyDir(`${rootDir}/ReactNativeClient/lib`, `${testBuildDir}/lib`, {
+			excluded: [
+				`${rootDir}/ReactNativeClient/lib/joplin-renderer/node_modules`,
+			],
+		});
+		await utils.copyDir(`${rootDir}/ReactNativeClient/locales`, `${testBuildDir}/locales`);
 		await fs.mkdirp(`${testBuildDir}/data`);
 	},
 };

CliClient/locales-build/index.js

@@ -38,42 +38,42 @@ locales['tr_TR'] = require('./tr_TR.json');
 locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":82};
-stats['eu'] = {"percentDone":35};
-stats['bs_BA'] = {"percentDone":85};
-stats['bg_BG'] = {"percentDone":68};
-stats['ca'] = {"percentDone":54};
-stats['hr_HR'] = {"percentDone":28};
-stats['cs_CZ'] = {"percentDone":84};
-stats['da_DK'] = {"percentDone":76};
-stats['de_DE'] = {"percentDone":99};
-stats['et_EE'] = {"percentDone":68};
+stats['ar'] = {"percentDone":80};
+stats['eu'] = {"percentDone":34};
+stats['bs_BA'] = {"percentDone":83};
+stats['bg_BG'] = {"percentDone":66};
+stats['ca'] = {"percentDone":96};
+stats['hr_HR'] = {"percentDone":27};
+stats['cs_CZ'] = {"percentDone":82};
+stats['da_DK'] = {"percentDone":74};
+stats['de_DE'] = {"percentDone":98};
+stats['et_EE'] = {"percentDone":66};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":91};
-stats['eo'] = {"percentDone":39};
-stats['fr_FR'] = {"percentDone":97};
-stats['gl_ES'] = {"percentDone":44};
-stats['id_ID'] = {"percentDone":95};
-stats['it_IT'] = {"percentDone":93};
-stats['nl_NL'] = {"percentDone":99};
-stats['nl_BE'] = {"percentDone":35};
-stats['nb_NO'] = {"percentDone":91};
-stats['fa'] = {"percentDone":34};
-stats['pl_PL'] = {"percentDone":87};
-stats['pt_PT'] = {"percentDone":91};
-stats['pt_BR'] = {"percentDone":98};
-stats['ro'] = {"percentDone":35};
-stats['sl_SI'] = {"percentDone":44};
-stats['sv'] = {"percentDone":73};
-stats['th_TH'] = {"percentDone":54};
-stats['vi'] = {"percentDone":88};
-stats['tr_TR'] = {"percentDone":99};
-stats['el_GR'] = {"percentDone":93};
-stats['ru_RU'] = {"percentDone":90};
-stats['sr_RS'] = {"percentDone":74};
-stats['zh_CN'] = {"percentDone":99};
-stats['zh_TW'] = {"percentDone":98};
-stats['ja_JP'] = {"percentDone":99};
-stats['ko'] = {"percentDone":89};
+stats['es_ES'] = {"percentDone":95};
+stats['eo'] = {"percentDone":38};
+stats['fr_FR'] = {"percentDone":99};
+stats['gl_ES'] = {"percentDone":43};
+stats['id_ID'] = {"percentDone":93};
+stats['it_IT'] = {"percentDone":90};
+stats['nl_BE'] = {"percentDone":34};
+stats['nl_NL'] = {"percentDone":95};
+stats['nb_NO'] = {"percentDone":88};
+stats['fa'] = {"percentDone":83};
+stats['pl_PL'] = {"percentDone":98};
+stats['pt_PT'] = {"percentDone":88};
+stats['pt_BR'] = {"percentDone":96};
+stats['ro'] = {"percentDone":77};
+stats['sl_SI'] = {"percentDone":42};
+stats['sv'] = {"percentDone":70};
+stats['th_TH'] = {"percentDone":52};
+stats['vi'] = {"percentDone":85};
+stats['tr_TR'] = {"percentDone":98};
+stats['el_GR'] = {"percentDone":96};
+stats['ru_RU'] = {"percentDone":95};
+stats['sr_RS'] = {"percentDone":71};
+stats['zh_CN'] = {"percentDone":96};
+stats['zh_TW'] = {"percentDone":95};
+stats['ja_JP'] = {"percentDone":98};
+stats['ko'] = {"percentDone":98};
 module.exports = { locales: locales, stats: stats };