Merge branch 'dev' into ui_update

The note draging was not taking into account the scroll distance.
This caused the notes to be dragged to a different location than the mouse.
This scroll offset should fix that issue.

.eslintignore

@@ -59,33 +59,15 @@ 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/app/services/plugins/PluginRunner.js
-CliClient/tests/fsDriver.js
-CliClient/tests/InMemoryCache.js
-CliClient/tests/MdToHtml.js
-CliClient/tests/models_Setting.js
-CliClient/tests/services_CommandService.js
-CliClient/tests/services_InteropService.js
-CliClient/tests/services_keychainService.js
-CliClient/tests/services_PluginService.js
-CliClient/tests/services_rest_Api.js
-CliClient/tests/services/plugins/api/JoplinSetting.js
-CliClient/tests/services/plugins/sandboxProxy.js
+CliClient/build/LinkSelector.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/openProfileDirectory.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
@@ -105,11 +87,7 @@ 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/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
-ElectronClient/gui/MainScreen/commands/openFolder.js
-ElectronClient/gui/MainScreen/commands/openNote.js
-ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js
@@ -122,10 +100,9 @@ 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/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
@@ -142,7 +119,6 @@ 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
@@ -161,7 +137,7 @@ 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/useNoteToolbarButtons.js
 ElectronClient/gui/NoteEditor/utils/useSearchMarkers.js
 ElectronClient/gui/NoteEditor/utils/useWindowCommandHandler.js
 ElectronClient/gui/NoteList/commands/focusElementNoteList.js
@@ -169,7 +145,6 @@ 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
@@ -177,7 +152,6 @@ 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
@@ -188,143 +162,35 @@ ElectronClient/gui/SideBar/styles/index.js
 ElectronClient/gui/StatusScreen/StatusScreen.js
 ElectronClient/gui/style/StyledInput.js
 ElectronClient/gui/style/StyledTextInput.js
-ElectronClient/gui/TagList.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/plugins/GotoAnything.js
-ElectronClient/services/bridge.js
-ElectronClient/services/commands/types.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/BackButtonDialogBox.js
-ReactNativeClient/lib/components/CameraView.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnMessage.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useSource.js
-ReactNativeClient/lib/components/NoteBodyViewer/NoteBodyViewer.js
-ReactNativeClient/lib/components/screens/Note.js
 ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
-ReactNativeClient/lib/components/SelectDateTimeDialog.js
-ReactNativeClient/lib/errorUtils.js
-ReactNativeClient/lib/eventManager.js
-ReactNativeClient/lib/fs-driver-node.js
 ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
-ReactNativeClient/lib/hooks/usePropsDebugger.js
-ReactNativeClient/lib/InMemoryCache.js
-ReactNativeClient/lib/joplin-renderer/MarkupToHtml.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/code_inline.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fountain.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/highlight_keywords.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/html_image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/katex.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/link_open.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
-ReactNativeClient/lib/joplin-renderer/noteStyle.js
-ReactNativeClient/lib/joplin-renderer/pathUtils.js
 ReactNativeClient/lib/JoplinServerApi.js
-ReactNativeClient/lib/locale.js
-ReactNativeClient/lib/Logger.js
-ReactNativeClient/lib/markdownUtils.js
-ReactNativeClient/lib/markupLanguageUtils.js
-ReactNativeClient/lib/models/Alarm.js
-ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
-ReactNativeClient/lib/path-utils.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/commands/commandsToMarkdownTable.js
-ReactNativeClient/lib/services/commands/MenuUtils.js
-ReactNativeClient/lib/services/commands/propsHaveChanged.js
-ReactNativeClient/lib/services/commands/stateToWhenClauseContext.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/JoplinViewsMenus.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/MenuController.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/contentScriptsToRendererRules.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
@@ -336,11 +202,8 @@ ReactNativeClient/lib/services/synchronizer/migrations/1.js
 ReactNativeClient/lib/services/synchronizer/migrations/2.js
 ReactNativeClient/lib/services/synchronizer/utils/types.js
 ReactNativeClient/lib/services/UndoRedoService.js
-ReactNativeClient/lib/services/WhenClause.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
@@ -351,7 +214,6 @@ 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,9 +48,8 @@ module.exports = {
 		// -------------------------------
 		'react/jsx-uses-react': 'error',
 		'react/jsx-uses-vars': 'error',
-		'no-unused-vars': ['error', { 'argsIgnorePattern': '^_' }],
-		'@typescript-eslint/no-unused-vars': ['error', { 'argsIgnorePattern': '^_' }],
-		'@typescript-eslint/explicit-member-accessibility': 'off',
+		'no-unused-vars': 'error',
+		'@typescript-eslint/no-unused-vars': 'error',
 		'no-constant-condition': 0,
 		'no-prototype-builtins': 0,
 		// This error is always a false positive so far since it detects
@@ -122,15 +121,4 @@ 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/dev/CONTRIBUTING.md
+AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md
 
 -->

.gitignore

@@ -50,36 +50,17 @@ joplin-webclipper-source.zip
 Tools/commit_hook.txt
 .vscode/*
 *.map
-ReactNativeClient/lib/sql-extensions/spellfix.so
-ReactNativeClient/lib/sql-extensions/spellfix.dylib
-CliClient/build/
-plugin_types/
+ReactNativeClient/lib/sql-extensions/
+!ReactNativeClient/lib/sql-extensions/spellfix.dll
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
-CliClient/app/services/plugins/PluginRunner.js
-CliClient/tests/fsDriver.js
-CliClient/tests/InMemoryCache.js
-CliClient/tests/MdToHtml.js
-CliClient/tests/models_Setting.js
-CliClient/tests/services_CommandService.js
-CliClient/tests/services_InteropService.js
-CliClient/tests/services_keychainService.js
-CliClient/tests/services_PluginService.js
-CliClient/tests/services_rest_Api.js
-CliClient/tests/services/plugins/api/JoplinSetting.js
-CliClient/tests/services/plugins/sandboxProxy.js
+CliClient/build/LinkSelector.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/openProfileDirectory.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
@@ -99,11 +80,7 @@ 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/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
-ElectronClient/gui/MainScreen/commands/openFolder.js
-ElectronClient/gui/MainScreen/commands/openNote.js
-ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js
@@ -116,10 +93,9 @@ 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/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
@@ -136,7 +112,6 @@ 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
@@ -155,7 +130,7 @@ 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/useNoteToolbarButtons.js
 ElectronClient/gui/NoteEditor/utils/useSearchMarkers.js
 ElectronClient/gui/NoteEditor/utils/useWindowCommandHandler.js
 ElectronClient/gui/NoteList/commands/focusElementNoteList.js
@@ -163,7 +138,6 @@ 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
@@ -171,7 +145,6 @@ 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
@@ -182,143 +155,35 @@ ElectronClient/gui/SideBar/styles/index.js
 ElectronClient/gui/StatusScreen/StatusScreen.js
 ElectronClient/gui/style/StyledInput.js
 ElectronClient/gui/style/StyledTextInput.js
-ElectronClient/gui/TagList.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/plugins/GotoAnything.js
-ElectronClient/services/bridge.js
-ElectronClient/services/commands/types.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/BackButtonDialogBox.js
-ReactNativeClient/lib/components/CameraView.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnMessage.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useSource.js
-ReactNativeClient/lib/components/NoteBodyViewer/NoteBodyViewer.js
-ReactNativeClient/lib/components/screens/Note.js
 ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
-ReactNativeClient/lib/components/SelectDateTimeDialog.js
-ReactNativeClient/lib/errorUtils.js
-ReactNativeClient/lib/eventManager.js
-ReactNativeClient/lib/fs-driver-node.js
 ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
-ReactNativeClient/lib/hooks/usePropsDebugger.js
-ReactNativeClient/lib/InMemoryCache.js
-ReactNativeClient/lib/joplin-renderer/MarkupToHtml.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/code_inline.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fountain.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/highlight_keywords.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/html_image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/katex.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/link_open.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
-ReactNativeClient/lib/joplin-renderer/noteStyle.js
-ReactNativeClient/lib/joplin-renderer/pathUtils.js
 ReactNativeClient/lib/JoplinServerApi.js
-ReactNativeClient/lib/locale.js
-ReactNativeClient/lib/Logger.js
-ReactNativeClient/lib/markdownUtils.js
-ReactNativeClient/lib/markupLanguageUtils.js
-ReactNativeClient/lib/models/Alarm.js
-ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
-ReactNativeClient/lib/path-utils.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/commands/commandsToMarkdownTable.js
-ReactNativeClient/lib/services/commands/MenuUtils.js
-ReactNativeClient/lib/services/commands/propsHaveChanged.js
-ReactNativeClient/lib/services/commands/stateToWhenClauseContext.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/JoplinViewsMenus.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/MenuController.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/contentScriptsToRendererRules.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
@@ -330,11 +195,8 @@ ReactNativeClient/lib/services/synchronizer/migrations/1.js
 ReactNativeClient/lib/services/synchronizer/migrations/2.js
 ReactNativeClient/lib/services/synchronizer/utils/types.js
 ReactNativeClient/lib/services/UndoRedoService.js
-ReactNativeClient/lib/services/WhenClause.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
@@ -345,7 +207,6 @@ 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

.ignore

@@ -1,301 +0,0 @@
-# This is used by VSCode to ignore patterns during search.
-# Before they were in joplin.code-workspace, under the `files.exclude` key
-# but it eventually reached the limit with ENAMETOOLONG error.
-#
-# https://github.com/microsoft/vscode/issues/94718
-
-# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
-CliClient/app/LinkSelector.js
-CliClient/app/services/plugins/PluginRunner.js
-CliClient/tests/fsDriver.js
-CliClient/tests/InMemoryCache.js
-CliClient/tests/MdToHtml.js
-CliClient/tests/models_Setting.js
-CliClient/tests/services_CommandService.js
-CliClient/tests/services_InteropService.js
-CliClient/tests/services_keychainService.js
-CliClient/tests/services_PluginService.js
-CliClient/tests/services_rest_Api.js
-CliClient/tests/services/plugins/api/JoplinSetting.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/openProfileDirectory.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/KeymapConfig/KeymapConfigScreen.js
-ElectronClient/gui/KeymapConfig/ShortcutRecorder.js
-ElectronClient/gui/KeymapConfig/styles/index.js
-ElectronClient/gui/KeymapConfig/utils/getLabel.js
-ElectronClient/gui/KeymapConfig/utils/useCommandStatus.js
-ElectronClient/gui/KeymapConfig/utils/useKeymap.js
-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/newSubFolder.js
-ElectronClient/gui/MainScreen/commands/newTodo.js
-ElectronClient/gui/MainScreen/commands/openFolder.js
-ElectronClient/gui/MainScreen/commands/openNote.js
-ElectronClient/gui/MainScreen/commands/openTag.js
-ElectronClient/gui/MainScreen/commands/print.js
-ElectronClient/gui/MainScreen/commands/renameFolder.js
-ElectronClient/gui/MainScreen/commands/renameTag.js
-ElectronClient/gui/MainScreen/commands/search.js
-ElectronClient/gui/MainScreen/commands/selectTemplate.js
-ElectronClient/gui/MainScreen/commands/setTags.js
-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
-ElectronClient/gui/NoteEditor/commands/focusElementNoteBody.js
-ElectronClient/gui/NoteEditor/commands/focusElementNoteTitle.js
-ElectronClient/gui/NoteEditor/commands/showLocalSearch.js
-ElectronClient/gui/NoteEditor/commands/showRevisions.js
-ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
-ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
-ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js
-ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.js
-ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js
-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
-ElectronClient/gui/NoteEditor/styles/index.js
-ElectronClient/gui/NoteEditor/utils/contextMenu.js
-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/TagList.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/plugins/GotoAnything.js
-ElectronClient/services/bridge.js
-ElectronClient/services/commands/types.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/BackButtonDialogBox.js
-ReactNativeClient/lib/components/CameraView.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnMessage.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useSource.js
-ReactNativeClient/lib/components/NoteBodyViewer/NoteBodyViewer.js
-ReactNativeClient/lib/components/screens/Note.js
-ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
-ReactNativeClient/lib/components/SelectDateTimeDialog.js
-ReactNativeClient/lib/errorUtils.js
-ReactNativeClient/lib/eventManager.js
-ReactNativeClient/lib/fs-driver-node.js
-ReactNativeClient/lib/hooks/useEffectDebugger.js
-ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
-ReactNativeClient/lib/hooks/usePrevious.js
-ReactNativeClient/lib/hooks/usePropsDebugger.js
-ReactNativeClient/lib/InMemoryCache.js
-ReactNativeClient/lib/joplin-renderer/MarkupToHtml.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/code_inline.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fountain.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/highlight_keywords.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/html_image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/katex.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/link_open.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
-ReactNativeClient/lib/joplin-renderer/noteStyle.js
-ReactNativeClient/lib/joplin-renderer/pathUtils.js
-ReactNativeClient/lib/JoplinServerApi.js
-ReactNativeClient/lib/locale.js
-ReactNativeClient/lib/Logger.js
-ReactNativeClient/lib/markdownUtils.js
-ReactNativeClient/lib/markupLanguageUtils.js
-ReactNativeClient/lib/models/Alarm.js
-ReactNativeClient/lib/models/Setting.js
-ReactNativeClient/lib/ntpDate.js
-ReactNativeClient/lib/path-utils.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/commands/commandsToMarkdownTable.js
-ReactNativeClient/lib/services/commands/MenuUtils.js
-ReactNativeClient/lib/services/commands/propsHaveChanged.js
-ReactNativeClient/lib/services/commands/stateToWhenClauseContext.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/JoplinViewsMenus.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/MenuController.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/contentScriptsToRendererRules.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
-ReactNativeClient/lib/services/SettingUtils.js
-ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
-ReactNativeClient/lib/services/synchronizer/LockHandler.js
-ReactNativeClient/lib/services/synchronizer/MigrationHandler.js
-ReactNativeClient/lib/services/synchronizer/migrations/1.js
-ReactNativeClient/lib/services/synchronizer/migrations/2.js
-ReactNativeClient/lib/services/synchronizer/utils/types.js
-ReactNativeClient/lib/services/UndoRedoService.js
-ReactNativeClient/lib/services/WhenClause.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
-# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD

BUILD.md

@@ -96,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/dev/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/master/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/dev/BUILD.md) for more details.
+Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/master/BUILD.md) for more details.
 
 ## Coding style
 

CliClient/.gitignore

@@ -22,5 +22,4 @@ yarn-error.log
 tests/support/dropbox-auth.txt
 tests/support/nextcloud-auth.json
 tests/support/onedrive-auth.txt
-build/
-patches/
+build/

CliClient/app/ResourceServer.js

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

CliClient/app/app-gui.js

@@ -1,17 +1,15 @@
-const Logger = require('lib/Logger').default;
+const { Logger } = require('lib/logger.js');
 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').default;
-const reducer = require('lib/reducer').default;
-const { defaultState } = require('lib/reducer');
+const Setting = require('lib/models/Setting.js');
+const { reducer, defaultState } = require('lib/reducer.js');
 const { splitCommandString } = require('lib/string-utils.js');
 const { reg } = require('lib/registry.js');
-const { _ } = require('lib/locale');
-const shim = require('lib/shim').default;
+const { _ } = require('lib/locale.js');
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = new Entities().encode;
 
@@ -479,7 +477,7 @@ class AppGui {
 					this.linkSelector_.noteX + cursorOffsetX,
 					this.linkSelector_.noteY + cursorOffsetY
 				);
-				shim.setTimeout(() => this.term_.term().inverse(this.linkSelector_.link), 50);
+				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').default;
+const { BaseApplication } = require('lib/BaseApplication');
 const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
 const ResourceService = require('lib/services/ResourceService');
 const BaseModel = require('lib/BaseModel.js');
@@ -6,15 +6,14 @@ 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').default;
+const Setting = require('lib/models/Setting.js');
 const { reg } = require('lib/registry.js');
-const { fileExtension } = require('lib/path-utils');
-const { _ } = require('lib/locale');
+const { fileExtension } = require('lib/path-utils.js');
+const { _ } = require('lib/locale.js');
 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() {
@@ -162,7 +161,7 @@ class Application extends BaseApplication {
 		};
 
 		// Give it a few seconds to cancel otherwise exit anyway
-		shim.setTimeout(async () => {
+		setTimeout(async () => {
 			await doExit();
 		}, 5000);
 

CliClient/app/base-command.js

@@ -1,4 +1,4 @@
-const { _ } = require('lib/locale');
+const { _ } = require('lib/locale.js');
 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');
+const { fileExtension, dirname } = require('lib/path-utils.js');
 const wrap_ = require('word-wrap');
-const { languageCode } = require('lib/locale');
+const { languageCode } = require('lib/locale.js');
 
 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').default;
-const { dirname } = require('lib/path-utils');
+const { Logger } = require('lib/logger.js');
+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').default;
+const Setting = require('lib/models/Setting.js');
 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');
+const { _ } = require('lib/locale.js');
 const { time } = require('lib/time-utils.js');
 const stringPadding = require('string-padding');
-const Logger = require('lib/Logger').default;
+const { Logger } = require('lib/logger.js');
 
 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').default;
+const markdownUtils = require('lib/markdownUtils');
 const { Database } = require('lib/database.js');
 
 class Command extends BaseCommand {
@@ -53,9 +53,9 @@ class Command extends BaseCommand {
 
 		const lines = [];
 
-		lines.push('# Joplin Data API');
+		lines.push('# Joplin 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');
+const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
-const shim = require('lib/shim').default;
+const { shim } = require('lib/shim.js');
 
 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _, setLocale } = require('lib/locale.js');
 const { app } = require('./app.js');
 const fs = require('fs-extra');
-const Setting = require('lib/models/Setting').default;
+const Setting = require('lib/models/Setting.js');
 
 class Command extends BaseCommand {
 	usage() {
@@ -124,6 +124,7 @@ 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 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,11 +1,11 @@
 const { BaseCommand } = require('./base-command.js');
-const { _ } = require('lib/locale');
+const { _ } = require('lib/locale.js');
 const EncryptionService = require('lib/services/EncryptionService');
 const DecryptionWorker = require('lib/services/DecryptionWorker');
 const BaseItem = require('lib/models/BaseItem');
-const Setting = require('lib/models/Setting').default;
-const shim = require('lib/shim').default;
-const pathUtils = require('lib/path-utils');
+const Setting = require('lib/models/Setting.js');
+const { shim } = require('lib/shim');
+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.setObjectValue('encryption.passwordCache', masterKeyId, password);
+			Setting.setObjectKey('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').default;
+const { uuid } = require('lib/uuid.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale');
+const { _ } = require('lib/locale.js');
 const Note = require('lib/models/Note.js');
-const Setting = require('lib/models/Setting').default;
+const Setting = require('lib/models/Setting.js');
 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');
+const { _ } = require('lib/locale.js');
 
 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').default;
+const Setting = require('lib/models/Setting.js');
 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/interop/InteropService').default;
+const InteropService = require('lib/services/InteropService.js');
 const BaseModel = require('lib/BaseModel.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale');
+const { _ } = require('lib/locale.js');
 
 class Command extends BaseCommand {
 	usage() {
@@ -14,7 +14,7 @@ class Command extends BaseCommand {
 	}
 
 	options() {
-		const service = InteropService.instance();
+		const service = new InteropService();
 		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 = InteropService.instance();
+		const service = new InteropService();
 		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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 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/interop/InteropService').default;
+const InteropService = require('lib/services/InteropService.js');
 const BaseModel = require('lib/BaseModel.js');
 const { cliUtils } = require('./cli-utils.js');
 const { app } = require('./app.js');
-const { _ } = require('lib/locale');
+const { _ } = require('lib/locale.js');
 
 class Command extends BaseCommand {
 	usage() {
@@ -15,7 +15,7 @@ class Command extends BaseCommand {
 	}
 
 	options() {
-		const service = InteropService.instance();
+		const service = new InteropService();
 		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 = InteropService.instance();
+		const service = new InteropService();
 		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');
+const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
-const Setting = require('lib/models/Setting').default;
+const Setting = require('lib/models/Setting.js');
 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
-const uuid = require('lib/uuid').default;
+const { uuid } = require('lib/uuid.js');
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/command-server.js

@@ -1,8 +1,8 @@
 const { BaseCommand } = require('./base-command.js');
-const { _ } = require('lib/locale');
-const Setting = require('lib/models/Setting').default;
-const Logger = require('lib/Logger').default;
-const shim = require('lib/shim').default;
+const { _ } = require('lib/locale.js');
+const Setting = require('lib/models/Setting.js');
+const { Logger } = require('lib/logger.js');
+const { shim } = require('lib/shim');
 
 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');
+const { _ } = require('lib/locale.js');
 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').default;
-const { _ } = require('lib/locale');
+const Setting = require('lib/models/Setting.js');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 const { OneDriveApiNodeUtils } = require('lib/onedrive-api-node-utils.js');
-const Setting = require('lib/models/Setting').default;
+const Setting = require('lib/models/Setting.js');
 const ResourceFetcher = require('lib/services/ResourceFetcher');
-const Synchronizer = require('lib/Synchronizer').default;
+const { Synchronizer } = require('lib/synchronizer.js');
 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 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');
+const { _ } = require('lib/locale.js');
 
 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');
+const { _ } = require('lib/locale.js');
 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').default;
-const { _ } = require('lib/locale');
+const Setting = require('lib/models/Setting.js');
+const { _ } = require('lib/locale.js');
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/fuzzing.js

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

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')._;
+const _ = require('lib/locale.js')._;
 
 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');
+const { _ } = require('lib/locale.js');
 
 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').default;
-const { _ } = require('lib/locale');
+const Setting = require('lib/models/Setting.js');
+const { _ } = require('lib/locale.js');
 
 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').default;
+const Setting = require('lib/models/Setting.js');
 const Revision = require('lib/models/Revision.js');
-const Logger = require('lib/Logger').default;
-const FsDriverNode = require('lib/fs-driver-node').default;
+const { Logger } = require('lib/logger.js');
+const { FsDriverNode } = require('lib/fs-driver-node.js');
 const { shimInit } = require('lib/shim-init-node.js');
-const { _ } = require('lib/locale');
+const { _ } = require('lib/locale.js');
 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

@@ -1,78 +0,0 @@
-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):Promise<void> {
-		return new Promise((resolve:Function, reject:Function) => {
-			const onStarted = () => {
-				plugin.off('started', onStarted);
-				resolve();
-			};
-
-			plugin.on('started', onStarted);
-
-			const vmSandbox = vm.createContext(this.newSandboxProxy(plugin.id, sandbox));
-
-			try {
-				vm.runInContext(plugin.scriptText, vmSandbox);
-			} catch (error) {
-				reject(error);
-				// this.logger().error(`In plugin ${plugin.id}:`, error);
-				// return;
-			}
-		});
-	}
-
-}

CliClient/gulpfile.js

@@ -17,23 +17,12 @@ tasks.prepareBuild = {
 			excluded: ['node_modules'],
 		});
 		await utils.copyDir(`${__dirname}/locales-build`, `${buildDir}/locales`);
+		await utils.copyDir(`${__dirname}/../patches`, `${buildDir}/patches`);
 		await tasks.copyLib.fn();
 		await utils.copyFile(`${__dirname}/package.json`, `${buildDir}/package.json`);
 		await utils.copyFile(`${__dirname}/package-lock.json`, `${buildDir}/package-lock.json`);
 		await utils.copyFile(`${__dirname}/gulpfile.js`, `${buildDir}/gulpfile.js`);
 
-		// Import all the patches inside the CliClient directory
-		// and build file. Needs to be in CliClient dir for when running
-		// in dev mode, and in build dir for production.
-		const localPatchDir = `${buildDir}/patches`;
-		await fs.remove(localPatchDir);
-		await fs.mkdirp(localPatchDir);
-		await utils.copyDir(`${__dirname}/../patches/shared`, `${localPatchDir}`, { delete: false });
-		await utils.copyDir(`${__dirname}/../patches/node`, `${localPatchDir}`, { delete: false });
-
-		await fs.remove(`${__dirname}/patches`);
-		await utils.copyDir(`${localPatchDir}`, `${__dirname}/patches`);
-
 		const packageRaw = await fs.readFile(`${buildDir}/package.json`);
 		const package = JSON.parse(packageRaw.toString());
 		package.scripts.postinstall = 'patch-package';
@@ -57,14 +46,8 @@ tasks.prepareTestBuild = {
 			],
 		});
 
-		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 utils.copyDir(`${__dirname}/../ReactNativeClient/lib`, `${testBuildDir}/lib`);
+		await utils.copyDir(`${__dirname}/../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":78};
-stats['eu'] = {"percentDone":33};
-stats['bs_BA'] = {"percentDone":82};
-stats['bg_BG'] = {"percentDone":65};
-stats['ca'] = {"percentDone":95};
-stats['hr_HR'] = {"percentDone":27};
-stats['cs_CZ'] = {"percentDone":98};
-stats['da_DK'] = {"percentDone":72};
-stats['de_DE'] = {"percentDone":97};
-stats['et_EE'] = {"percentDone":65};
+stats['ar'] = {"percentDone":80};
+stats['eu'] = {"percentDone":34};
+stats['bs_BA'] = {"percentDone":83};
+stats['bg_BG'] = {"percentDone":66};
+stats['ca'] = {"percentDone":53};
+stats['hr_HR'] = {"percentDone":28};
+stats['cs_CZ'] = {"percentDone":82};
+stats['da_DK'] = {"percentDone":74};
+stats['de_DE'] = {"percentDone":95};
+stats['et_EE'] = {"percentDone":66};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":98};
-stats['eo'] = {"percentDone":37};
-stats['fr_FR'] = {"percentDone":98};
-stats['gl_ES'] = {"percentDone":42};
-stats['id_ID'] = {"percentDone":92};
-stats['it_IT'] = {"percentDone":98};
-stats['nl_NL'] = {"percentDone":94};
-stats['nl_BE'] = {"percentDone":33};
-stats['nb_NO'] = {"percentDone":87};
-stats['fa'] = {"percentDone":82};
-stats['pl_PL'] = {"percentDone":97};
-stats['pt_PT'] = {"percentDone":98};
+stats['es_ES'] = {"percentDone":95};
+stats['eo'] = {"percentDone":38};
+stats['fr_FR'] = {"percentDone":94};
+stats['gl_ES'] = {"percentDone":43};
+stats['id_ID'] = {"percentDone":93};
+stats['it_IT'] = {"percentDone":91};
+stats['nl_NL'] = {"percentDone":96};
+stats['nl_BE'] = {"percentDone":34};
+stats['nb_NO'] = {"percentDone":88};
+stats['fa'] = {"percentDone":80};
+stats['pl_PL'] = {"percentDone":96};
+stats['pt_PT'] = {"percentDone":89};
 stats['pt_BR'] = {"percentDone":96};
-stats['ro'] = {"percentDone":77};
-stats['sl_SI'] = {"percentDone":41};
-stats['sv'] = {"percentDone":70};
+stats['ro'] = {"percentDone":78};
+stats['sl_SI'] = {"percentDone":42};
+stats['sv'] = {"percentDone":71};
 stats['th_TH'] = {"percentDone":52};
-stats['vi'] = {"percentDone":84};
-stats['tr_TR'] = {"percentDone":97};
-stats['el_GR'] = {"percentDone":95};
-stats['ru_RU'] = {"percentDone":94};
-stats['sr_RS'] = {"percentDone":70};
-stats['zh_CN'] = {"percentDone":95};
-stats['zh_TW'] = {"percentDone":94};
-stats['ja_JP'] = {"percentDone":99};
-stats['ko'] = {"percentDone":99};
+stats['vi'] = {"percentDone":85};
+stats['tr_TR'] = {"percentDone":96};
+stats['el_GR'] = {"percentDone":96};
+stats['ru_RU'] = {"percentDone":95};
+stats['sr_RS'] = {"percentDone":72};
+stats['zh_CN'] = {"percentDone":96};
+stats['zh_TW'] = {"percentDone":95};
+stats['ja_JP'] = {"percentDone":96};
+stats['ko'] = {"percentDone":86};
 module.exports = { locales: locales, stats: stats };