Merge branch 'dev' into server_content_drivers

.dockerignore

@@ -1,19 +1,12 @@
-_mydocs/
-_releases/
-.git/
-.yarn/cache/
-**/.DS_Store
 **/node_modules
 Assets/
-docs/
-lerna-debug.log
-packages/app-cli/
-packages/app-clipper/
-packages/app-desktop/
-packages/app-mobile/
-packages/generator-joplin/
-packages/plugin-repo-cli/
+.git/
+_releases/
+packages/app-desktop
+packages/app-cli
+packages/app-mobile
+packages/app-clipper
+packages/generator-joplin
+packages/plugin-repo-cli
 packages/server/db-*.sqlite
-packages/server/dist/
-packages/server/logs/
-packages/server/temp/
+packages/server/temp

.eslintignore

@@ -2,7 +2,6 @@ _mydocs/
 _releases/
 .git/
 .github/
-.yarn/
 *.min.js
 **/commands/index.ts
 **/node_modules/
@@ -24,7 +23,6 @@ packages/app-cli/tests/html_to_md
 packages/app-cli/tests/logs
 packages/app-cli/tests/support
 packages/app-cli/tests/sync
-packages/app-cli/tests/test data/
 packages/app-cli/tests/tmp
 packages/app-clipper/content_scripts/JSDOMParser.js
 packages/app-clipper/content_scripts/Readability-readerable.js
@@ -36,7 +34,6 @@ packages/app-clipper/popup/config/webpack_config_at_eject_time.js
 packages/app-clipper/popup/config/webpack.config.js
 packages/app-clipper/popup/node_modules
 packages/app-clipper/popup/scripts/build.js
-packages/app-desktop/build/
 packages/app-desktop/dist
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/plugins/lists.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/supportedLocales.js
@@ -44,7 +41,6 @@ packages/app-desktop/locales
 packages/app-desktop/node_modules
 packages/app-desktop/packageInfo.js
 packages/app-desktop/services/electron-context-menu.js
-packages/app-desktop/vendor/lib/
 packages/app-mobile/android
 packages/app-mobile/components/NoteEditor/CodeMirror.bundle.js
 packages/app-mobile/ios
@@ -82,9 +78,6 @@ packages/app-cli/app/command-e2ee.js.map
 packages/app-cli/app/command-settingschema.d.ts
 packages/app-cli/app/command-settingschema.js
 packages/app-cli/app/command-settingschema.js.map
-packages/app-cli/app/command-sync.d.ts
-packages/app-cli/app/command-sync.js
-packages/app-cli/app/command-sync.js.map
 packages/app-cli/app/command-testing.d.ts
 packages/app-cli/app/command-testing.js
 packages/app-cli/app/command-testing.js.map
@@ -148,9 +141,6 @@ packages/app-desktop/checkForUpdates.js.map
 packages/app-desktop/commands/copyDevCommand.d.ts
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyDevCommand.js.map
-packages/app-desktop/commands/editProfileConfig.d.ts
-packages/app-desktop/commands/editProfileConfig.js
-packages/app-desktop/commands/editProfileConfig.js.map
 packages/app-desktop/commands/exportFolders.d.ts
 packages/app-desktop/commands/exportFolders.js
 packages/app-desktop/commands/exportFolders.js.map
@@ -178,18 +168,6 @@ packages/app-desktop/commands/startExternalEditing.js.map
 packages/app-desktop/commands/stopExternalEditing.d.ts
 packages/app-desktop/commands/stopExternalEditing.js
 packages/app-desktop/commands/stopExternalEditing.js.map
-packages/app-desktop/commands/switchProfile.d.ts
-packages/app-desktop/commands/switchProfile.js
-packages/app-desktop/commands/switchProfile.js.map
-packages/app-desktop/commands/switchProfile1.d.ts
-packages/app-desktop/commands/switchProfile1.js
-packages/app-desktop/commands/switchProfile1.js.map
-packages/app-desktop/commands/switchProfile2.d.ts
-packages/app-desktop/commands/switchProfile2.js
-packages/app-desktop/commands/switchProfile2.js.map
-packages/app-desktop/commands/switchProfile3.d.ts
-packages/app-desktop/commands/switchProfile3.js
-packages/app-desktop/commands/switchProfile3.js.map
 packages/app-desktop/commands/toggleExternalEditing.d.ts
 packages/app-desktop/commands/toggleExternalEditing.js
 packages/app-desktop/commands/toggleExternalEditing.js.map
@@ -232,30 +210,18 @@ packages/app-desktop/gui/Dialog.js.map
 packages/app-desktop/gui/DialogButtonRow.d.ts
 packages/app-desktop/gui/DialogButtonRow.js
 packages/app-desktop/gui/DialogButtonRow.js.map
-packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.d.ts
-packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.js
-packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.js.map
 packages/app-desktop/gui/DialogTitle.d.ts
 packages/app-desktop/gui/DialogTitle.js
 packages/app-desktop/gui/DialogTitle.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
-packages/app-desktop/gui/EditFolderDialog/Dialog.d.ts
-packages/app-desktop/gui/EditFolderDialog/Dialog.js
-packages/app-desktop/gui/EditFolderDialog/Dialog.js.map
-packages/app-desktop/gui/EditFolderDialog/IconSelector.d.ts
-packages/app-desktop/gui/EditFolderDialog/IconSelector.js
-packages/app-desktop/gui/EditFolderDialog/IconSelector.js.map
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.d.ts
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js.map
 packages/app-desktop/gui/ErrorBoundary.d.ts
 packages/app-desktop/gui/ErrorBoundary.js
 packages/app-desktop/gui/ErrorBoundary.js.map
-packages/app-desktop/gui/FolderIconBox.d.ts
-packages/app-desktop/gui/FolderIconBox.js
-packages/app-desktop/gui/FolderIconBox.js.map
 packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.d.ts
 packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.js
 packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.js.map
@@ -277,9 +243,6 @@ packages/app-desktop/gui/KeymapConfig/utils/useKeymap.js.map
 packages/app-desktop/gui/MainScreen/MainScreen.d.ts
 packages/app-desktop/gui/MainScreen/MainScreen.js
 packages/app-desktop/gui/MainScreen/MainScreen.js.map
-packages/app-desktop/gui/MainScreen/commands/addProfile.d.ts
-packages/app-desktop/gui/MainScreen/commands/addProfile.js
-packages/app-desktop/gui/MainScreen/commands/addProfile.js.map
 packages/app-desktop/gui/MainScreen/commands/commandPalette.d.ts
 packages/app-desktop/gui/MainScreen/commands/commandPalette.js
 packages/app-desktop/gui/MainScreen/commands/commandPalette.js.map
@@ -319,12 +282,6 @@ packages/app-desktop/gui/MainScreen/commands/newTodo.js.map
 packages/app-desktop/gui/MainScreen/commands/openFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/openFolder.js
 packages/app-desktop/gui/MainScreen/commands/openFolder.js.map
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.d.ts
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js.map
-packages/app-desktop/gui/MainScreen/commands/openItem.d.ts
-packages/app-desktop/gui/MainScreen/commands/openItem.js
-packages/app-desktop/gui/MainScreen/commands/openItem.js.map
 packages/app-desktop/gui/MainScreen/commands/openNote.d.ts
 packages/app-desktop/gui/MainScreen/commands/openNote.js
 packages/app-desktop/gui/MainScreen/commands/openNote.js.map
@@ -340,9 +297,6 @@ packages/app-desktop/gui/MainScreen/commands/renameFolder.js.map
 packages/app-desktop/gui/MainScreen/commands/renameTag.d.ts
 packages/app-desktop/gui/MainScreen/commands/renameTag.js
 packages/app-desktop/gui/MainScreen/commands/renameTag.js.map
-packages/app-desktop/gui/MainScreen/commands/revealResourceFile.d.ts
-packages/app-desktop/gui/MainScreen/commands/revealResourceFile.js
-packages/app-desktop/gui/MainScreen/commands/revealResourceFile.js.map
 packages/app-desktop/gui/MainScreen/commands/search.d.ts
 packages/app-desktop/gui/MainScreen/commands/search.js
 packages/app-desktop/gui/MainScreen/commands/search.js.map
@@ -379,15 +333,6 @@ packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.d.ts
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js.map
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.d.ts
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js.map
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.d.ts
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js.map
@@ -511,12 +456,6 @@ packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js.map
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.d.ts
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js.map
-packages/app-desktop/gui/NoteEditor/utils/contextMenu.test.d.ts
-packages/app-desktop/gui/NoteEditor/utils/contextMenu.test.js
-packages/app-desktop/gui/NoteEditor/utils/contextMenu.test.js.map
-packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.d.ts
-packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js
-packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js.map
 packages/app-desktop/gui/NoteEditor/utils/index.d.ts
 packages/app-desktop/gui/NoteEditor/utils/index.js
 packages/app-desktop/gui/NoteEditor/utils/index.js.map
@@ -562,9 +501,6 @@ packages/app-desktop/gui/NoteList/commands/focusElementNoteList.js.map
 packages/app-desktop/gui/NoteList/commands/index.d.ts
 packages/app-desktop/gui/NoteList/commands/index.js
 packages/app-desktop/gui/NoteList/commands/index.js.map
-packages/app-desktop/gui/NoteList/types.d.ts
-packages/app-desktop/gui/NoteList/types.js
-packages/app-desktop/gui/NoteList/types.js.map
 packages/app-desktop/gui/NoteListControls/NoteListControls.d.ts
 packages/app-desktop/gui/NoteListControls/NoteListControls.js
 packages/app-desktop/gui/NoteListControls/NoteListControls.js.map
@@ -589,9 +525,6 @@ packages/app-desktop/gui/NoteToolbar/NoteToolbar.js.map
 packages/app-desktop/gui/OneDriveLoginScreen.d.ts
 packages/app-desktop/gui/OneDriveLoginScreen.js
 packages/app-desktop/gui/OneDriveLoginScreen.js.map
-packages/app-desktop/gui/PasswordInput/PasswordInput.d.ts
-packages/app-desktop/gui/PasswordInput/PasswordInput.js
-packages/app-desktop/gui/PasswordInput/PasswordInput.js.map
 packages/app-desktop/gui/ResizableLayout/MoveButtons.d.ts
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js.map
@@ -748,15 +681,12 @@ packages/app-desktop/gui/style/StyledTextInput.js.map
 packages/app-desktop/gui/utils/NoteListUtils.d.ts
 packages/app-desktop/gui/utils/NoteListUtils.js
 packages/app-desktop/gui/utils/NoteListUtils.js.map
+packages/app-desktop/gui/utils/SyncScrollMap.d.ts
+packages/app-desktop/gui/utils/SyncScrollMap.js
+packages/app-desktop/gui/utils/SyncScrollMap.js.map
 packages/app-desktop/gui/utils/convertToScreenCoordinates.d.ts
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js.map
-packages/app-desktop/gui/utils/loadScript.d.ts
-packages/app-desktop/gui/utils/loadScript.js
-packages/app-desktop/gui/utils/loadScript.js.map
-packages/app-desktop/loadResources.testEnv.d.ts
-packages/app-desktop/loadResources.testEnv.js
-packages/app-desktop/loadResources.testEnv.js.map
 packages/app-desktop/plugins/GotoAnything.d.ts
 packages/app-desktop/plugins/GotoAnything.js
 packages/app-desktop/plugins/GotoAnything.js.map
@@ -769,9 +699,6 @@ packages/app-desktop/services/commands/stateToWhenClauseContext.js.map
 packages/app-desktop/services/commands/types.d.ts
 packages/app-desktop/services/commands/types.js
 packages/app-desktop/services/commands/types.js.map
-packages/app-desktop/services/plugins/BackOffHandler.d.ts
-packages/app-desktop/services/plugins/BackOffHandler.js
-packages/app-desktop/services/plugins/BackOffHandler.js.map
 packages/app-desktop/services/plugins/PlatformImplementation.d.ts
 packages/app-desktop/services/plugins/PlatformImplementation.js
 packages/app-desktop/services/plugins/PlatformImplementation.js.map
@@ -808,24 +735,9 @@ packages/app-desktop/services/plugins/hooks/useViewIsReady.js.map
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.d.ts
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
-packages/app-desktop/services/restart.d.ts
-packages/app-desktop/services/restart.js
-packages/app-desktop/services/restart.js.map
 packages/app-desktop/services/share/invitationRespond.d.ts
 packages/app-desktop/services/share/invitationRespond.js
 packages/app-desktop/services/share/invitationRespond.js.map
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.d.ts
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js.map
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.d.ts
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js.map
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.d.ts
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.js
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.js.map
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.d.ts
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -1069,9 +981,6 @@ packages/lib/database.js.map
 packages/lib/debug/DebugService.d.ts
 packages/lib/debug/DebugService.js
 packages/lib/debug/DebugService.js.map
-packages/lib/dom.d.ts
-packages/lib/dom.js
-packages/lib/dom.js.map
 packages/lib/dummy.test.d.ts
 packages/lib/dummy.test.js
 packages/lib/dummy.test.js.map
@@ -1102,9 +1011,6 @@ packages/lib/fs-driver-node.js.map
 packages/lib/fsDriver.test.d.ts
 packages/lib/fsDriver.test.js
 packages/lib/fsDriver.test.js.map
-packages/lib/geolocation-node.d.ts
-packages/lib/geolocation-node.js
-packages/lib/geolocation-node.js.map
 packages/lib/hooks/useAsyncEffect.d.ts
 packages/lib/hooks/useAsyncEffect.js
 packages/lib/hooks/useAsyncEffect.js.map
@@ -1192,9 +1098,6 @@ packages/lib/models/NoteTag.js.map
 packages/lib/models/Resource.d.ts
 packages/lib/models/Resource.js
 packages/lib/models/Resource.js.map
-packages/lib/models/Resource.test.d.ts
-packages/lib/models/Resource.test.js
-packages/lib/models/Resource.test.js.map
 packages/lib/models/ResourceLocalState.d.ts
 packages/lib/models/ResourceLocalState.js
 packages/lib/models/ResourceLocalState.js.map
@@ -1237,12 +1140,9 @@ packages/lib/models/utils/paginationToSql.js.map
 packages/lib/models/utils/types.d.ts
 packages/lib/models/utils/types.js
 packages/lib/models/utils/types.js.map
-packages/lib/net-utils.d.ts
-packages/lib/net-utils.js
-packages/lib/net-utils.js.map
-packages/lib/ntp.d.ts
-packages/lib/ntp.js
-packages/lib/ntp.js.map
+packages/lib/ntpDate.d.ts
+packages/lib/ntpDate.js
+packages/lib/ntpDate.js.map
 packages/lib/onedrive-api.d.ts
 packages/lib/onedrive-api.js
 packages/lib/onedrive-api.js.map
@@ -1279,9 +1179,6 @@ packages/lib/services/DecryptionWorker.js.map
 packages/lib/services/ExternalEditWatcher.d.ts
 packages/lib/services/ExternalEditWatcher.js
 packages/lib/services/ExternalEditWatcher.js.map
-packages/lib/services/ExternalEditWatcher/utils.d.ts
-packages/lib/services/ExternalEditWatcher/utils.js
-packages/lib/services/ExternalEditWatcher/utils.js.map
 packages/lib/services/ItemChangeUtils.d.ts
 packages/lib/services/ItemChangeUtils.js
 packages/lib/services/ItemChangeUtils.js.map
@@ -1573,6 +1470,9 @@ packages/lib/services/plugins/api/types.js.map
 packages/lib/services/plugins/reducer.d.ts
 packages/lib/services/plugins/reducer.js
 packages/lib/services/plugins/reducer.js.map
+packages/lib/services/plugins/sandboxProxy.d.ts
+packages/lib/services/plugins/sandboxProxy.js
+packages/lib/services/plugins/sandboxProxy.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
@@ -1600,30 +1500,6 @@ packages/lib/services/plugins/utils/validatePluginId.js.map
 packages/lib/services/plugins/utils/validatePluginId.test.d.ts
 packages/lib/services/plugins/utils/validatePluginId.test.js
 packages/lib/services/plugins/utils/validatePluginId.test.js.map
-packages/lib/services/plugins/utils/validatePluginVersion.d.ts
-packages/lib/services/plugins/utils/validatePluginVersion.js
-packages/lib/services/plugins/utils/validatePluginVersion.js.map
-packages/lib/services/plugins/utils/validatePluginVersion.test.d.ts
-packages/lib/services/plugins/utils/validatePluginVersion.test.js
-packages/lib/services/plugins/utils/validatePluginVersion.test.js.map
-packages/lib/services/profileConfig/index.d.ts
-packages/lib/services/profileConfig/index.js
-packages/lib/services/profileConfig/index.js.map
-packages/lib/services/profileConfig/index.test.d.ts
-packages/lib/services/profileConfig/index.test.js
-packages/lib/services/profileConfig/index.test.js.map
-packages/lib/services/profileConfig/initProfile.d.ts
-packages/lib/services/profileConfig/initProfile.js
-packages/lib/services/profileConfig/initProfile.js.map
-packages/lib/services/profileConfig/mergeGlobalAndLocalSettings.d.ts
-packages/lib/services/profileConfig/mergeGlobalAndLocalSettings.js
-packages/lib/services/profileConfig/mergeGlobalAndLocalSettings.js.map
-packages/lib/services/profileConfig/splitGlobalAndLocalSettings.d.ts
-packages/lib/services/profileConfig/splitGlobalAndLocalSettings.js
-packages/lib/services/profileConfig/splitGlobalAndLocalSettings.js.map
-packages/lib/services/profileConfig/types.d.ts
-packages/lib/services/profileConfig/types.js
-packages/lib/services/profileConfig/types.js.map
 packages/lib/services/rest/Api.d.ts
 packages/lib/services/rest/Api.js
 packages/lib/services/rest/Api.js.map
@@ -1702,9 +1578,6 @@ packages/lib/services/searchengine/SearchEngineUtils.js.map
 packages/lib/services/searchengine/SearchEngineUtils.test.d.ts
 packages/lib/services/searchengine/SearchEngineUtils.test.js
 packages/lib/services/searchengine/SearchEngineUtils.test.js.map
-packages/lib/services/searchengine/SearchFilter.test.d.ts
-packages/lib/services/searchengine/SearchFilter.test.js
-packages/lib/services/searchengine/SearchFilter.test.js.map
 packages/lib/services/searchengine/filterParser.d.ts
 packages/lib/services/searchengine/filterParser.js
 packages/lib/services/searchengine/filterParser.js.map
@@ -1999,9 +1872,6 @@ packages/renderer/headerAnchor.js.map
 packages/renderer/htmlUtils.d.ts
 packages/renderer/htmlUtils.js
 packages/renderer/htmlUtils.js.map
-packages/renderer/htmlUtils.test.d.ts
-packages/renderer/htmlUtils.test.js
-packages/renderer/htmlUtils.test.js.map
 packages/renderer/index.d.ts
 packages/renderer/index.js
 packages/renderer/index.js.map
@@ -2020,12 +1890,6 @@ packages/tools/buildServerDocker.js.map
 packages/tools/buildServerDocker.test.d.ts
 packages/tools/buildServerDocker.test.js
 packages/tools/buildServerDocker.test.js.map
-packages/tools/checkLibPaths.d.ts
-packages/tools/checkLibPaths.js
-packages/tools/checkLibPaths.js.map
-packages/tools/checkLibPaths.test.d.ts
-packages/tools/checkLibPaths.test.js
-packages/tools/checkLibPaths.test.js.map
 packages/tools/convertThemesToCss.d.ts
 packages/tools/convertThemesToCss.js
 packages/tools/convertThemesToCss.js.map
@@ -2038,9 +1902,9 @@ packages/tools/generate-images.js.map
 packages/tools/git-changelog.d.ts
 packages/tools/git-changelog.js
 packages/tools/git-changelog.js.map
-packages/tools/licenseChecker.d.ts
-packages/tools/licenseChecker.js
-packages/tools/licenseChecker.js.map
+packages/tools/lerna-add.d.ts
+packages/tools/lerna-add.js
+packages/tools/lerna-add.js.map
 packages/tools/release-android.d.ts
 packages/tools/release-android.js
 packages/tools/release-android.js.map
@@ -2053,9 +1917,6 @@ packages/tools/release-electron.js.map
 packages/tools/release-ios.d.ts
 packages/tools/release-ios.js
 packages/tools/release-ios.js.map
-packages/tools/release-plugin-repo-cli.d.ts
-packages/tools/release-plugin-repo-cli.js
-packages/tools/release-plugin-repo-cli.js.map
 packages/tools/release-server.d.ts
 packages/tools/release-server.js
 packages/tools/release-server.js.map
@@ -2074,30 +1935,9 @@ packages/tools/update-readme-download.js.map
 packages/tools/update-readme-sponsors.d.ts
 packages/tools/update-readme-sponsors.js
 packages/tools/update-readme-sponsors.js.map
-packages/tools/updateMarkdownDoc.d.ts
-packages/tools/updateMarkdownDoc.js
-packages/tools/updateMarkdownDoc.js.map
 packages/tools/website/build.d.ts
 packages/tools/website/build.js
 packages/tools/website/build.js.map
-packages/tools/website/updateDownloadPage.d.ts
-packages/tools/website/updateDownloadPage.js
-packages/tools/website/updateDownloadPage.js.map
-packages/tools/website/updateNews.d.ts
-packages/tools/website/updateNews.js
-packages/tools/website/updateNews.js.map
-packages/tools/website/utils/frontMatter.d.ts
-packages/tools/website/utils/frontMatter.js
-packages/tools/website/utils/frontMatter.js.map
-packages/tools/website/utils/openGraph.d.ts
-packages/tools/website/utils/openGraph.js
-packages/tools/website/utils/openGraph.js.map
-packages/tools/website/utils/openGraph.test.d.ts
-packages/tools/website/utils/openGraph.test.js
-packages/tools/website/utils/openGraph.test.js.map
-packages/tools/website/utils/parser.d.ts
-packages/tools/website/utils/parser.js
-packages/tools/website/utils/parser.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,8 +9,7 @@ assignees: ''
 
 <!--
   Please provide a clear and concise description of what the bug is. (In the section Steps To Reproduce.)
-  Include screenshots for UI problems if needed.
-  DO NOT create screenshots of text !!! Copy and paste the text into a code block.
+  Include screenshots if needed.
   Please test using the latest Joplin release to make sure your issue has not already been fixed.
 -->
 

.github/scripts/run_ci.sh

@@ -37,9 +37,6 @@ echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"
 echo "GITHUB_REF=$GITHUB_REF"
 echo "RUNNER_OS=$RUNNER_OS"
 echo "GIT_TAG_NAME=$GIT_TAG_NAME"
-echo "BUILD_SEQUENCIAL=$BUILD_SEQUENCIAL"
-echo "SERVER_REPOSITORY=$SERVER_REPOSITORY"
-echo "SERVER_TAG_PREFIX=$SERVER_TAG_PREFIX"
 
 echo "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION"
 echo "IS_PULL_REQUEST=$IS_PULL_REQUEST"
@@ -49,14 +46,13 @@ echo "IS_MACOS=$IS_MACOS"
 
 echo "Node $( node -v )"
 echo "Npm $( npm -v )"
-echo "Yarn $( yarn -v )"
 
 # =============================================================================
 # Install packages
 # =============================================================================
 
 cd "$ROOT_DIR"
-yarn install
+npm install
 
 # =============================================================================
 # Run test units. Only do it for pull requests and dev branch because we don't
@@ -66,15 +62,6 @@ yarn install
 if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running tests..."
 
-	# On Linux, we run the Joplin Server tests using PostgreSQL
-	if [ "$IS_LINUX" == "1" ]; then
-		echo "Running Joplin Server tests using PostgreSQL..."
-		sudo docker-compose --file docker-compose.db-dev.yml up -d
-		export JOPLIN_TESTS_SERVER_DB=pg
-	else
-		echo "Running Joplin Server tests using SQLite..."
-	fi
-
 	# Need this because we're getting this error:
 	#
 	# @joplin/lib: FATAL ERROR: Ineffective mark-compacts near heap limit
@@ -82,7 +69,7 @@ if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	#
 	# https://stackoverflow.com/questions/38558989
 	export NODE_OPTIONS="--max-old-space-size=4096"
-	yarn run test-ci
+	npm run test-ci
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -97,7 +84,7 @@ fi
 if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running linter..."
 
-	yarn run linter-ci ./
+	npm run linter-ci ./
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -170,12 +157,12 @@ cd "$ROOT_DIR/packages/app-desktop"
 
 if [[ $GIT_TAG_NAME = v* ]]; then
 	echo "Step: Building and publishing desktop application..."
-	USE_HARD_LINKS=false yarn run dist
-elif [[ $IS_LINUX = 1 ]] && [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
+	USE_HARD_LINKS=false npm run dist
+elif [[ $GIT_TAG_NAME = server-v* ]] && [[ $IS_LINUX = 1 ]]; then
 	echo "Step: Building Docker Image..."
 	cd "$ROOT_DIR"
-	yarn run buildServerDocker --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
+	npm run buildServerDocker -- --tag-name $GIT_TAG_NAME --push-images
 else
 	echo "Step: Building but *not* publishing desktop application..."
-	USE_HARD_LINKS=false yarn run dist --publish=never
+	USE_HARD_LINKS=false npm run dist -- --publish=never
 fi

.github/stale.yml

@@ -0,0 +1,25 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "good first issue"
+  - "upstream"
+  - "backlog"
+  - "high"
+  - "medium"
+  - "spec"
+  - "cannot reproduce"
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  Hey there, it looks like there has been no activity on this issue recently. Has the issue been fixed, or does it still require the community's attention? This issue may be closed if no further activity occurs.
+  You may comment on the issue and I will leave it open.
+  Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  Closing this issue after a prolonged period of inactivity. If this issue is still present in the latest release, please feel free to create a new issue with up-to-date information.
+only: issues

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

@@ -1,23 +0,0 @@
-name: 'Close stale issues'
-on:
-  schedule:
-    - cron: '0 16 * * *'
-permissions:
-  issues: write
-jobs:
-  ProcessStaleIssues:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v4
-        with:
-          # Use this to do a dry run from a pull request
-          # debug-only: true
-          stale-issue-message: "Hey there, it looks like there has been no activity on this issue recently. Has the issue been fixed, or does it still require the community's attention? This issue may be closed if no further activity occurs. You may comment on the issue and I will leave it open. Thank you for your contributions."
-          days-before-stale: 30
-          days-before-close: 7
-          operations-per-run: 1000
-          exempt-issue-labels: 'good first issue,upstream,backlog,high,medium,spec,cannot reproduce,enhancement'
-          stale-issue-label: 'stale'
-          close-issue-message: 'Closing this issue after a prolonged period of inactivity. If this issue is still present in the latest release, feel free to create a new issue with up-to-date information.'
-          # Don't process pull requests at all
-          days-before-pr-stale: -1

.github/workflows/github-actions-main.yml

@@ -5,8 +5,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # Removed windows-2016 for now - discontinued by GitHub
-        os: [macos-latest, ubuntu-latest, windows-2019]
+        os: [macos-latest, ubuntu-latest, windows-2016]
     steps:
 
       # Silence apt-get update errors (for example when a module doesn't
@@ -30,8 +29,7 @@ jobs:
           brew install translate-toolkit
 
       - name: Install Docker Engine
-        # if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
         run: |
           sudo apt-get install -y apt-transport-https
           sudo apt-get install -y ca-certificates
@@ -50,11 +48,6 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
-
-      - name: Install Yarn
-        run: |
-          # https://yarnpkg.com/getting-started/install
-          corepack enable
       
       # Login to Docker only if we're on a server release tag. If we run this on
       # a pull request it will fail because the PR doesn't have access to
@@ -75,7 +68,6 @@ jobs:
           CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           IS_CONTINUOUS_INTEGRATION: 1
-          BUILD_SEQUENCIAL: 1
         run: |
           "${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"
 
@@ -86,60 +78,7 @@ jobs:
           CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           IS_CONTINUOUS_INTEGRATION: 1
-          BUILD_SEQUENCIAL: 1
-        # To ensure that the operations stop on failure, all commands
-        # should be on one line with "&&" in between.
         run: |
-          yarn install && cd packages/app-desktop && yarn run dist
-
-      # Build and package the Windows app, without publishing it, just to
-      # verify that the build process hasn't been broken.
-      - name: Build Windows app (no publishing)
-        if: runner.os == 'Windows' && !startsWith(github.ref, 'refs/tags/v')
-        env:
-          IS_CONTINUOUS_INTEGRATION: 1
-          BUILD_SEQUENCIAL: 1
-          SERVER_REPOSITORY: joplin/server
-          SERVER_TAG_PREFIX: server
-        run: |
-          yarn install && cd packages/app-desktop && yarn run dist --publish=never
-
-  ServerDockerImage:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    steps:
-
-      - name: Install Docker Engine
-        run: |
-          sudo apt-get install -y apt-transport-https
-          sudo apt-get install -y ca-certificates
-          sudo apt-get install -y curl
-          sudo apt-get install -y gnupg
-          sudo apt-get install -y lsb-release
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-          echo \
-              "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
-              $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-          sudo apt-get update || true
-          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-
-      - name: Install Yarn
-        run: |
-          # https://yarnpkg.com/getting-started/install
-          corepack enable
-
-      - name: Build Docker Image
-        env:
-          BUILD_SEQUENCIAL: 1
-        run: |
-          yarn install
-          yarn run buildServerDocker --tag-name server-v0.0.0 --repository joplin/server
-          
+          npm install
+          cd packages/app-desktop
+          npm run dist

.gitignore

@@ -51,17 +51,6 @@ lerna-debug.log
 .env
 docs/**/*.mustache
 
-# Yarn stuff
-# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
-
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
@@ -72,9 +61,6 @@ packages/app-cli/app/command-e2ee.js.map
 packages/app-cli/app/command-settingschema.d.ts
 packages/app-cli/app/command-settingschema.js
 packages/app-cli/app/command-settingschema.js.map
-packages/app-cli/app/command-sync.d.ts
-packages/app-cli/app/command-sync.js
-packages/app-cli/app/command-sync.js.map
 packages/app-cli/app/command-testing.d.ts
 packages/app-cli/app/command-testing.js
 packages/app-cli/app/command-testing.js.map
@@ -138,9 +124,6 @@ packages/app-desktop/checkForUpdates.js.map
 packages/app-desktop/commands/copyDevCommand.d.ts
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyDevCommand.js.map
-packages/app-desktop/commands/editProfileConfig.d.ts
-packages/app-desktop/commands/editProfileConfig.js
-packages/app-desktop/commands/editProfileConfig.js.map
 packages/app-desktop/commands/exportFolders.d.ts
 packages/app-desktop/commands/exportFolders.js
 packages/app-desktop/commands/exportFolders.js.map
@@ -168,18 +151,6 @@ packages/app-desktop/commands/startExternalEditing.js.map
 packages/app-desktop/commands/stopExternalEditing.d.ts
 packages/app-desktop/commands/stopExternalEditing.js
 packages/app-desktop/commands/stopExternalEditing.js.map
-packages/app-desktop/commands/switchProfile.d.ts
-packages/app-desktop/commands/switchProfile.js
-packages/app-desktop/commands/switchProfile.js.map
-packages/app-desktop/commands/switchProfile1.d.ts
-packages/app-desktop/commands/switchProfile1.js
-packages/app-desktop/commands/switchProfile1.js.map
-packages/app-desktop/commands/switchProfile2.d.ts
-packages/app-desktop/commands/switchProfile2.js
-packages/app-desktop/commands/switchProfile2.js.map
-packages/app-desktop/commands/switchProfile3.d.ts
-packages/app-desktop/commands/switchProfile3.js
-packages/app-desktop/commands/switchProfile3.js.map
 packages/app-desktop/commands/toggleExternalEditing.d.ts
 packages/app-desktop/commands/toggleExternalEditing.js
 packages/app-desktop/commands/toggleExternalEditing.js.map
@@ -222,30 +193,18 @@ packages/app-desktop/gui/Dialog.js.map
 packages/app-desktop/gui/DialogButtonRow.d.ts
 packages/app-desktop/gui/DialogButtonRow.js
 packages/app-desktop/gui/DialogButtonRow.js.map
-packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.d.ts
-packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.js
-packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.js.map
 packages/app-desktop/gui/DialogTitle.d.ts
 packages/app-desktop/gui/DialogTitle.js
 packages/app-desktop/gui/DialogTitle.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
-packages/app-desktop/gui/EditFolderDialog/Dialog.d.ts
-packages/app-desktop/gui/EditFolderDialog/Dialog.js
-packages/app-desktop/gui/EditFolderDialog/Dialog.js.map
-packages/app-desktop/gui/EditFolderDialog/IconSelector.d.ts
-packages/app-desktop/gui/EditFolderDialog/IconSelector.js
-packages/app-desktop/gui/EditFolderDialog/IconSelector.js.map
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.d.ts
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js.map
 packages/app-desktop/gui/ErrorBoundary.d.ts
 packages/app-desktop/gui/ErrorBoundary.js
 packages/app-desktop/gui/ErrorBoundary.js.map
-packages/app-desktop/gui/FolderIconBox.d.ts
-packages/app-desktop/gui/FolderIconBox.js
-packages/app-desktop/gui/FolderIconBox.js.map
 packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.d.ts
 packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.js
 packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.js.map
@@ -267,9 +226,6 @@ packages/app-desktop/gui/KeymapConfig/utils/useKeymap.js.map
 packages/app-desktop/gui/MainScreen/MainScreen.d.ts
 packages/app-desktop/gui/MainScreen/MainScreen.js
 packages/app-desktop/gui/MainScreen/MainScreen.js.map
-packages/app-desktop/gui/MainScreen/commands/addProfile.d.ts
-packages/app-desktop/gui/MainScreen/commands/addProfile.js
-packages/app-desktop/gui/MainScreen/commands/addProfile.js.map
 packages/app-desktop/gui/MainScreen/commands/commandPalette.d.ts
 packages/app-desktop/gui/MainScreen/commands/commandPalette.js
 packages/app-desktop/gui/MainScreen/commands/commandPalette.js.map
@@ -309,12 +265,6 @@ packages/app-desktop/gui/MainScreen/commands/newTodo.js.map
 packages/app-desktop/gui/MainScreen/commands/openFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/openFolder.js
 packages/app-desktop/gui/MainScreen/commands/openFolder.js.map
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.d.ts
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js.map
-packages/app-desktop/gui/MainScreen/commands/openItem.d.ts
-packages/app-desktop/gui/MainScreen/commands/openItem.js
-packages/app-desktop/gui/MainScreen/commands/openItem.js.map
 packages/app-desktop/gui/MainScreen/commands/openNote.d.ts
 packages/app-desktop/gui/MainScreen/commands/openNote.js
 packages/app-desktop/gui/MainScreen/commands/openNote.js.map
@@ -330,9 +280,6 @@ packages/app-desktop/gui/MainScreen/commands/renameFolder.js.map
 packages/app-desktop/gui/MainScreen/commands/renameTag.d.ts
 packages/app-desktop/gui/MainScreen/commands/renameTag.js
 packages/app-desktop/gui/MainScreen/commands/renameTag.js.map
-packages/app-desktop/gui/MainScreen/commands/revealResourceFile.d.ts
-packages/app-desktop/gui/MainScreen/commands/revealResourceFile.js
-packages/app-desktop/gui/MainScreen/commands/revealResourceFile.js.map
 packages/app-desktop/gui/MainScreen/commands/search.d.ts
 packages/app-desktop/gui/MainScreen/commands/search.js
 packages/app-desktop/gui/MainScreen/commands/search.js.map
@@ -369,15 +316,6 @@ packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.d.ts
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js.map
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.d.ts
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js.map
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.d.ts
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js.map
@@ -501,12 +439,6 @@ packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js.map
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.d.ts
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js.map
-packages/app-desktop/gui/NoteEditor/utils/contextMenu.test.d.ts
-packages/app-desktop/gui/NoteEditor/utils/contextMenu.test.js
-packages/app-desktop/gui/NoteEditor/utils/contextMenu.test.js.map
-packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.d.ts
-packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js
-packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js.map
 packages/app-desktop/gui/NoteEditor/utils/index.d.ts
 packages/app-desktop/gui/NoteEditor/utils/index.js
 packages/app-desktop/gui/NoteEditor/utils/index.js.map
@@ -552,9 +484,6 @@ packages/app-desktop/gui/NoteList/commands/focusElementNoteList.js.map
 packages/app-desktop/gui/NoteList/commands/index.d.ts
 packages/app-desktop/gui/NoteList/commands/index.js
 packages/app-desktop/gui/NoteList/commands/index.js.map
-packages/app-desktop/gui/NoteList/types.d.ts
-packages/app-desktop/gui/NoteList/types.js
-packages/app-desktop/gui/NoteList/types.js.map
 packages/app-desktop/gui/NoteListControls/NoteListControls.d.ts
 packages/app-desktop/gui/NoteListControls/NoteListControls.js
 packages/app-desktop/gui/NoteListControls/NoteListControls.js.map
@@ -579,9 +508,6 @@ packages/app-desktop/gui/NoteToolbar/NoteToolbar.js.map
 packages/app-desktop/gui/OneDriveLoginScreen.d.ts
 packages/app-desktop/gui/OneDriveLoginScreen.js
 packages/app-desktop/gui/OneDriveLoginScreen.js.map
-packages/app-desktop/gui/PasswordInput/PasswordInput.d.ts
-packages/app-desktop/gui/PasswordInput/PasswordInput.js
-packages/app-desktop/gui/PasswordInput/PasswordInput.js.map
 packages/app-desktop/gui/ResizableLayout/MoveButtons.d.ts
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js.map
@@ -738,15 +664,12 @@ packages/app-desktop/gui/style/StyledTextInput.js.map
 packages/app-desktop/gui/utils/NoteListUtils.d.ts
 packages/app-desktop/gui/utils/NoteListUtils.js
 packages/app-desktop/gui/utils/NoteListUtils.js.map
+packages/app-desktop/gui/utils/SyncScrollMap.d.ts
+packages/app-desktop/gui/utils/SyncScrollMap.js
+packages/app-desktop/gui/utils/SyncScrollMap.js.map
 packages/app-desktop/gui/utils/convertToScreenCoordinates.d.ts
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js.map
-packages/app-desktop/gui/utils/loadScript.d.ts
-packages/app-desktop/gui/utils/loadScript.js
-packages/app-desktop/gui/utils/loadScript.js.map
-packages/app-desktop/loadResources.testEnv.d.ts
-packages/app-desktop/loadResources.testEnv.js
-packages/app-desktop/loadResources.testEnv.js.map
 packages/app-desktop/plugins/GotoAnything.d.ts
 packages/app-desktop/plugins/GotoAnything.js
 packages/app-desktop/plugins/GotoAnything.js.map
@@ -759,9 +682,6 @@ packages/app-desktop/services/commands/stateToWhenClauseContext.js.map
 packages/app-desktop/services/commands/types.d.ts
 packages/app-desktop/services/commands/types.js
 packages/app-desktop/services/commands/types.js.map
-packages/app-desktop/services/plugins/BackOffHandler.d.ts
-packages/app-desktop/services/plugins/BackOffHandler.js
-packages/app-desktop/services/plugins/BackOffHandler.js.map
 packages/app-desktop/services/plugins/PlatformImplementation.d.ts
 packages/app-desktop/services/plugins/PlatformImplementation.js
 packages/app-desktop/services/plugins/PlatformImplementation.js.map
@@ -798,24 +718,9 @@ packages/app-desktop/services/plugins/hooks/useViewIsReady.js.map
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.d.ts
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
-packages/app-desktop/services/restart.d.ts
-packages/app-desktop/services/restart.js
-packages/app-desktop/services/restart.js.map
 packages/app-desktop/services/share/invitationRespond.d.ts
 packages/app-desktop/services/share/invitationRespond.js
 packages/app-desktop/services/share/invitationRespond.js.map
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.d.ts
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js.map
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.d.ts
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js.map
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.d.ts
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.js
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.js.map
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.d.ts
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -1059,9 +964,6 @@ packages/lib/database.js.map
 packages/lib/debug/DebugService.d.ts
 packages/lib/debug/DebugService.js
 packages/lib/debug/DebugService.js.map
-packages/lib/dom.d.ts
-packages/lib/dom.js
-packages/lib/dom.js.map
 packages/lib/dummy.test.d.ts
 packages/lib/dummy.test.js
 packages/lib/dummy.test.js.map
@@ -1092,9 +994,6 @@ packages/lib/fs-driver-node.js.map
 packages/lib/fsDriver.test.d.ts
 packages/lib/fsDriver.test.js
 packages/lib/fsDriver.test.js.map
-packages/lib/geolocation-node.d.ts
-packages/lib/geolocation-node.js
-packages/lib/geolocation-node.js.map
 packages/lib/hooks/useAsyncEffect.d.ts
 packages/lib/hooks/useAsyncEffect.js
 packages/lib/hooks/useAsyncEffect.js.map
@@ -1182,9 +1081,6 @@ packages/lib/models/NoteTag.js.map
 packages/lib/models/Resource.d.ts
 packages/lib/models/Resource.js
 packages/lib/models/Resource.js.map
-packages/lib/models/Resource.test.d.ts
-packages/lib/models/Resource.test.js
-packages/lib/models/Resource.test.js.map
 packages/lib/models/ResourceLocalState.d.ts
 packages/lib/models/ResourceLocalState.js
 packages/lib/models/ResourceLocalState.js.map
@@ -1227,12 +1123,9 @@ packages/lib/models/utils/paginationToSql.js.map
 packages/lib/models/utils/types.d.ts
 packages/lib/models/utils/types.js
 packages/lib/models/utils/types.js.map
-packages/lib/net-utils.d.ts
-packages/lib/net-utils.js
-packages/lib/net-utils.js.map
-packages/lib/ntp.d.ts
-packages/lib/ntp.js
-packages/lib/ntp.js.map
+packages/lib/ntpDate.d.ts
+packages/lib/ntpDate.js
+packages/lib/ntpDate.js.map
 packages/lib/onedrive-api.d.ts
 packages/lib/onedrive-api.js
 packages/lib/onedrive-api.js.map
@@ -1269,9 +1162,6 @@ packages/lib/services/DecryptionWorker.js.map
 packages/lib/services/ExternalEditWatcher.d.ts
 packages/lib/services/ExternalEditWatcher.js
 packages/lib/services/ExternalEditWatcher.js.map
-packages/lib/services/ExternalEditWatcher/utils.d.ts
-packages/lib/services/ExternalEditWatcher/utils.js
-packages/lib/services/ExternalEditWatcher/utils.js.map
 packages/lib/services/ItemChangeUtils.d.ts
 packages/lib/services/ItemChangeUtils.js
 packages/lib/services/ItemChangeUtils.js.map
@@ -1563,6 +1453,9 @@ packages/lib/services/plugins/api/types.js.map
 packages/lib/services/plugins/reducer.d.ts
 packages/lib/services/plugins/reducer.js
 packages/lib/services/plugins/reducer.js.map
+packages/lib/services/plugins/sandboxProxy.d.ts
+packages/lib/services/plugins/sandboxProxy.js
+packages/lib/services/plugins/sandboxProxy.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
@@ -1590,30 +1483,6 @@ packages/lib/services/plugins/utils/validatePluginId.js.map
 packages/lib/services/plugins/utils/validatePluginId.test.d.ts
 packages/lib/services/plugins/utils/validatePluginId.test.js
 packages/lib/services/plugins/utils/validatePluginId.test.js.map
-packages/lib/services/plugins/utils/validatePluginVersion.d.ts
-packages/lib/services/plugins/utils/validatePluginVersion.js
-packages/lib/services/plugins/utils/validatePluginVersion.js.map
-packages/lib/services/plugins/utils/validatePluginVersion.test.d.ts
-packages/lib/services/plugins/utils/validatePluginVersion.test.js
-packages/lib/services/plugins/utils/validatePluginVersion.test.js.map
-packages/lib/services/profileConfig/index.d.ts
-packages/lib/services/profileConfig/index.js
-packages/lib/services/profileConfig/index.js.map
-packages/lib/services/profileConfig/index.test.d.ts
-packages/lib/services/profileConfig/index.test.js
-packages/lib/services/profileConfig/index.test.js.map
-packages/lib/services/profileConfig/initProfile.d.ts
-packages/lib/services/profileConfig/initProfile.js
-packages/lib/services/profileConfig/initProfile.js.map
-packages/lib/services/profileConfig/mergeGlobalAndLocalSettings.d.ts
-packages/lib/services/profileConfig/mergeGlobalAndLocalSettings.js
-packages/lib/services/profileConfig/mergeGlobalAndLocalSettings.js.map
-packages/lib/services/profileConfig/splitGlobalAndLocalSettings.d.ts
-packages/lib/services/profileConfig/splitGlobalAndLocalSettings.js
-packages/lib/services/profileConfig/splitGlobalAndLocalSettings.js.map
-packages/lib/services/profileConfig/types.d.ts
-packages/lib/services/profileConfig/types.js
-packages/lib/services/profileConfig/types.js.map
 packages/lib/services/rest/Api.d.ts
 packages/lib/services/rest/Api.js
 packages/lib/services/rest/Api.js.map
@@ -1692,9 +1561,6 @@ packages/lib/services/searchengine/SearchEngineUtils.js.map
 packages/lib/services/searchengine/SearchEngineUtils.test.d.ts
 packages/lib/services/searchengine/SearchEngineUtils.test.js
 packages/lib/services/searchengine/SearchEngineUtils.test.js.map
-packages/lib/services/searchengine/SearchFilter.test.d.ts
-packages/lib/services/searchengine/SearchFilter.test.js
-packages/lib/services/searchengine/SearchFilter.test.js.map
 packages/lib/services/searchengine/filterParser.d.ts
 packages/lib/services/searchengine/filterParser.js
 packages/lib/services/searchengine/filterParser.js.map
@@ -1989,9 +1855,6 @@ packages/renderer/headerAnchor.js.map
 packages/renderer/htmlUtils.d.ts
 packages/renderer/htmlUtils.js
 packages/renderer/htmlUtils.js.map
-packages/renderer/htmlUtils.test.d.ts
-packages/renderer/htmlUtils.test.js
-packages/renderer/htmlUtils.test.js.map
 packages/renderer/index.d.ts
 packages/renderer/index.js
 packages/renderer/index.js.map
@@ -2010,12 +1873,6 @@ packages/tools/buildServerDocker.js.map
 packages/tools/buildServerDocker.test.d.ts
 packages/tools/buildServerDocker.test.js
 packages/tools/buildServerDocker.test.js.map
-packages/tools/checkLibPaths.d.ts
-packages/tools/checkLibPaths.js
-packages/tools/checkLibPaths.js.map
-packages/tools/checkLibPaths.test.d.ts
-packages/tools/checkLibPaths.test.js
-packages/tools/checkLibPaths.test.js.map
 packages/tools/convertThemesToCss.d.ts
 packages/tools/convertThemesToCss.js
 packages/tools/convertThemesToCss.js.map
@@ -2028,9 +1885,9 @@ packages/tools/generate-images.js.map
 packages/tools/git-changelog.d.ts
 packages/tools/git-changelog.js
 packages/tools/git-changelog.js.map
-packages/tools/licenseChecker.d.ts
-packages/tools/licenseChecker.js
-packages/tools/licenseChecker.js.map
+packages/tools/lerna-add.d.ts
+packages/tools/lerna-add.js
+packages/tools/lerna-add.js.map
 packages/tools/release-android.d.ts
 packages/tools/release-android.js
 packages/tools/release-android.js.map
@@ -2043,9 +1900,6 @@ packages/tools/release-electron.js.map
 packages/tools/release-ios.d.ts
 packages/tools/release-ios.js
 packages/tools/release-ios.js.map
-packages/tools/release-plugin-repo-cli.d.ts
-packages/tools/release-plugin-repo-cli.js
-packages/tools/release-plugin-repo-cli.js.map
 packages/tools/release-server.d.ts
 packages/tools/release-server.js
 packages/tools/release-server.js.map
@@ -2064,30 +1918,9 @@ packages/tools/update-readme-download.js.map
 packages/tools/update-readme-sponsors.d.ts
 packages/tools/update-readme-sponsors.js
 packages/tools/update-readme-sponsors.js.map
-packages/tools/updateMarkdownDoc.d.ts
-packages/tools/updateMarkdownDoc.js
-packages/tools/updateMarkdownDoc.js.map
 packages/tools/website/build.d.ts
 packages/tools/website/build.js
 packages/tools/website/build.js.map
-packages/tools/website/updateDownloadPage.d.ts
-packages/tools/website/updateDownloadPage.js
-packages/tools/website/updateDownloadPage.js.map
-packages/tools/website/updateNews.d.ts
-packages/tools/website/updateNews.js
-packages/tools/website/updateNews.js.map
-packages/tools/website/utils/frontMatter.d.ts
-packages/tools/website/utils/frontMatter.js
-packages/tools/website/utils/frontMatter.js.map
-packages/tools/website/utils/openGraph.d.ts
-packages/tools/website/utils/openGraph.js
-packages/tools/website/utils/openGraph.js.map
-packages/tools/website/utils/openGraph.test.d.ts
-packages/tools/website/utils/openGraph.test.js
-packages/tools/website/utils/openGraph.test.js.map
-packages/tools/website/utils/parser.d.ts
-packages/tools/website/utils/parser.js
-packages/tools/website/utils/parser.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map

.yarnrc.yml

@@ -1,9 +0,0 @@
-nmHoistingLimits: workspaces
-
-nodeLinker: node-modules
-
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
-
-yarnPath: .yarn/releases/yarn-3.1.1.cjs

Assets/WebsiteAssets/css/site.css

@@ -307,7 +307,7 @@ p,
 div.navbar-mobile-content a.sponsor-button {
 	padding: 4px 12px;
 	font-size: 0.9em;
-	margin-right: 0.5em;
+	margin-right: 1em;
 }
 
 #nav-section.white-bg a {
@@ -523,17 +523,12 @@ div.navbar-mobile-content a.sponsor-button {
 
 .bottom-links {
 	display: flex;
-	flex-direction: row;
 	justify-content: center;
 	border-top: 1px solid #d4d4d4;
 	margin-top: 30px;
 	padding-top: 25px;
 }
 
-.bottom-links .bottom-link {
-	margin-right: 20px;
-}
-
 /* TOC */
 
 #toc ul {
@@ -657,24 +652,6 @@ footer .bottom-links-row p {
 	font-size: 1.1em;
 }
 
-/*****************************************************************
- WHAT'S NEW PAGE
-*****************************************************************/
-
-.news-page      .container > .content-wrapper,
-.news-item-page .container > .content-wrapper {
-	/* Set the line width so that there's no more than 75 characters per line */
-	/* https://baymard.com/blog/line-length-readability */
-	max-width: 650px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-.news-page .main-content img,
-.news-item-page .main-content img {
-	max-width: 100%;
-}
-
 /*****************************************************************
  IN THE PRESS
  The "In the press" section height needs to be adjusted as the
@@ -728,23 +705,6 @@ footer .bottom-links-row p {
 	}
 }
 
-/*****************************************************************
- MEDIUM VIEW
- - Make menu bar elements smaller and closer to each others
-   so that everything fit.
-*****************************************************************/
-
-@media (max-width: 990px) {
-	#nav-section > .container {
-		max-width: 960px;
-	}
-
-	#nav-section .button-link {
-		padding: 4px 10px;
-		font-size: 15px;
-	}
-}
-
 /*****************************************************************
  NARROW VIEW
  - Top right menu is displayed
@@ -757,23 +717,6 @@ footer .bottom-links-row p {
 		padding-bottom: 130px;
 	}
 
-	#menu-mobile .social-links {
-		display: flex;
-		justify-content: center;
-		margin-top: 20px;
-	}
-
-	#menu-mobile .social-links a {
-		margin-left: 15px;
-		font-size: 20px;
-	}
-
-	#menu-mobile .social-links .social-link-mastodon,
-	#menu-mobile .social-links .social-link-reddit,
-	#menu-mobile .social-links .social-link-patreon {
-		display: none;
-	}
-
 	.front-page h1 {
 		font-size: 2.5em;
 	}
@@ -891,7 +834,7 @@ footer .bottom-links-row p {
 	}
 
 	#menu-mobile .button-link {
-		padding: 4px 12px;
+		padding: 10px 15px;
 		font-size: 16px;
 		margin-left: 0px;
 	}
@@ -937,25 +880,6 @@ footer .bottom-links-row p {
 	}
 }
 
-/*****************************************************************
- VERY NARROW VIEW
- eg for Galaxy Fold
-*****************************************************************/
-
-@media (max-width: 350px) {
-
-	#nav-section .navbar-mobile-content a.sponsor-button {
-		background-color: transparent;
-		color: #0557ba !important;
-		font-size: 18px;
-	}
-
-	#nav-section .navbar-mobile-content a.sponsor-button .sponsor-button-label {
-		display: none;
-	}
-
-}
-
 /*****************************************************************
  PLANS PAGE
 *****************************************************************/
@@ -1073,10 +997,6 @@ footer .bottom-links-row p {
 	display: none;
 }
 
-.joplin-cloud-feature-list table {
-	width: 100%;
-}
-
 .price-row .plan-type {
 	display: flex;
 	align-items: center;

Assets/WebsiteAssets/templates/front.mustache

@@ -10,8 +10,8 @@
 		<link rel="icon" href="{{imageBaseUrl}}/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link rel="stylesheet" href="{{{assetUrls.css.fontawesome}}}">
-		{{> openGraphTags}}
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"

Assets/WebsiteAssets/templates/main-new.mustache

@@ -23,7 +23,7 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 		<link rel="icon" href="{{imageBaseUrl}}/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		{{> openGraphTags}}
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
@@ -63,15 +63,13 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 								Running in {{env}} mode!
 							</div>
 							{{{contentHtml}}}
-							{{#showBottomLinks}}
+							{{#showImproveThisDoc}}
 								<div class="bottom-links">
-									{{#showImproveThisDoc}}
-										<a class="bottom-link" href="https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}">
-											<i class="fab fa-github"></i> Improve this doc
-										</a>
-									{{/showImproveThisDoc}}
+									<a href="https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}">
+										<i class="fab fa-github"></i> Improve this doc
+									</a>
 								</div>
-							{{/showBottomLinks}}
+							{{/showImproveThisDoc}}
 						</div>
 					</div>
 				</div>

Assets/WebsiteAssets/templates/partials/footer.mustache

@@ -1,6 +1,15 @@
 <footer class="darkblue-bg">
 	<div class="container">
-		{{> socialFeeds}}
+		<div class="row">
+			<div class="col-12 col-md-12 social-links">
+				<a href="https://twitter.com/joplinapp" title="Joplin Twitter feed"><i class="fab fa-twitter"></i></a>
+				<a href="https://mastodon.social/@joplinapp" title="Joplin Mastodon feed"><i class="fab fa-mastodon"></i></a>
+				<a href="https://www.patreon.com/joplin" title="Joplin Patreon"><i class="fab fa-patreon"></i></a>
+				<a href="https://discordapp.com/invite/d2HMPwE" title="Joplin Discord chat"><i class="fab fa-discord"></i></a>
+				<a href="https://www.reddit.com/r/joplinapp/" title="Joplin Subreddit"><i class="fab fa-reddit"></i></a>
+				<a href="https://github.com/laurent22/joplin/" title="Joplin GitHub repository"><i class="fab fa-github"></i></a>
+			</div>
+		</div>
 
 		<div class="row bottom-links-row">
 			<div class="col-12 col-md-6">

Assets/WebsiteAssets/templates/partials/gaOptimize.mustache

@@ -1,5 +1,2 @@
 <!-- Donate button A/B testing -->
-
-<!--
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
--->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>

Assets/WebsiteAssets/templates/partials/navbar.mustache

@@ -12,8 +12,6 @@
 				</a>
 			</div>
 			<div class="col-9 text-right d-none d-md-block">
-				{{> twitterLink}}
-				<a href="{{baseUrl}}/news/" class="fw500">News</a>
 				<a href="{{baseUrl}}/help/" class="fw500">Help</a>
 				<a href="{{forumUrl}}" class="fw500">Forum</a>
 				{{#showJoplinCloudLinks}}
@@ -22,7 +20,6 @@
 				{{> supportButton}}
 			</div>
 			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
-				{{> twitterLink}}
 				{{> supportButton}}
 
 				<span class="pointer"
@@ -45,9 +42,8 @@
 						</div>
 
 						<div class="text-center menu-mobile-top">
-							<a href="{{baseUrl}}/news/" class="fw500 mobile-menu-link">News</a>
-							<a href="{{baseUrl}}/help/" class="fw500 mobile-menu-link">Help</a>
 							<a href="{{forumUrl}}" class="fw500 mobile-menu-link">Forum</a>
+							<a href="{{baseUrl}}/help/" class="fw500 mobile-menu-link">Help</a>
 						</div>
 
 						<div class="menu-mobile-buttons">
@@ -61,8 +57,6 @@
 					{{#showToc}}
 						<div id="toc-mobile">{{{tocHtml}}}</div>
 					{{/showToc}}
-
-					{{> socialFeeds}}
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">

Assets/WebsiteAssets/templates/partials/openGraphTags.mustache

@@ -1,14 +0,0 @@
-{{#openGraph}}
-	<meta name="description" content="{{openGraph.description}}" />
-	<meta name="twitter:card" content="summary" />
-	<meta name="twitter:site" content="@joplinapp" />
-	<meta property="og:url" content="{{{openGraph.url}}}" />
-	<meta property="og:title" content="{{openGraph.title}}" />
-	<meta property="twitter:title" content="{{openGraph.title}}" />
-	<meta property="og:description" content="{{openGraph.description}}" />
-	<meta property="twitter:description" content="{{openGraph.description}}" />
-	{{#openGraph.image}}
-		<meta property="og:image" content="{{{openGraph.image}}}" />
-		<meta property="twitter:image" content="{{{openGraph.image}}}" />
-	{{/openGraph.image}}
-{{/openGraph}}

Assets/WebsiteAssets/templates/partials/plan.mustache

@@ -6,11 +6,11 @@
 			</div>
 
 			<div class="plan-price plan-price-monthly">
-				{{priceMonthly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;/month{{#footnote}} (*){{/footnote}}</sub>
+				{{priceMonthly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;/month</sub>
 			</div>
 
 			<div class="plan-price plan-price-yearly">
-				{{priceYearly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;/month{{#footnote}} (*){{/footnote}}</sub>
+				{{priceYearly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;/month</sub>
 			</div>
 		</div>
 
@@ -20,19 +20,17 @@
 			</div>
 		</div>
 
-		{{#featureLabelsOn}}
+		{{#featuresOn}}
 			<p><i class="fas fa-check feature feature-on"></i>{{.}}</p>
-		{{/featureLabelsOn}}
+		{{/featuresOn}}
 
-		{{#featureLabelsOff}}
+		{{#featuresOff}}
 			<p class="unchecked-text"><i class="fas fa-times feature feature-off"></i>{{.}}</p>
-		{{/featureLabelsOff}}
+		{{/featuresOff}}
 		
 		<p class="text-center subscribe-wrapper">
 			<a id="subscribeButton-{{name}}" href="{{cfaUrl}}" class="button-link btn-white subscribeButton">{{cfaLabel}}</a>
 		</p>
-
-		{{#footnote}}<sub>(*) {{.}}</sub>{{/footnote}}
 	</div>
 
 	<script>

Assets/WebsiteAssets/templates/partials/socialFeeds.mustache

@@ -1,10 +0,0 @@
-<div class="row">
-	<div class="col-12 col-md-12 social-links">
-		<a class="social-link-twitter" href="https://twitter.com/joplinapp" title="Joplin Twitter feed"><i class="fab fa-twitter"></i></a>
-		<a class="social-link-mastodon" href="https://mastodon.social/@joplinapp" title="Joplin Mastodon feed"><i class="fab fa-mastodon"></i></a>
-		<a class="social-link-patreon" href="https://www.patreon.com/joplin" title="Joplin Patreon"><i class="fab fa-patreon"></i></a>
-		<a class="social-link-discord" href="https://discord.gg/VSj7AFHvpq" title="Joplin Discord chat"><i class="fab fa-discord"></i></a>
-		<a class="social-link-reddit" href="https://www.reddit.com/r/joplinapp/" title="Joplin Subreddit"><i class="fab fa-reddit"></i></a>
-		<a class="social-link-github" href="https://github.com/laurent22/joplin/" title="Joplin GitHub repository"><i class="fab fa-github"></i></a>
-	</div>
-</div>

Assets/WebsiteAssets/templates/partials/supportButton.mustache

@@ -1,3 +1,3 @@
 <a class="button-link btn-blue sponsor-button" href="{{baseUrl}}/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i><span class="sponsor-button-label">&nbsp;Support us</span>
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>

Assets/WebsiteAssets/templates/partials/twitterLink.mustache

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

Assets/WebsiteAssets/templates/plans.mustache

@@ -42,23 +42,13 @@
 				{{> plan}}
 			{{/plans.pro}}
 
-			{{#plans.teams}}
+			{{#plans.business}}
 				{{> plan}}
-			{{/plans.teams}}
+			{{/plans.business}}
 
 			<p class="joplin-cloud-login-info">Already have a Joplin Cloud account? <a href="https://joplincloud.com">Login now</a></p>
 		</div>
 
-		<div class="row">
-			<div>
-				<h1>Feature comparison</h1>
-				<div class="joplin-cloud-feature-list">
-					{{{featureListHtml}}}
-				</div>
-				<p>&nbsp;</p>
-			</div>
-		</div>
-
 		<div class="row">
 			{{{faqHtml}}}
 		</div>

BUILD.md

@@ -1,6 +1,6 @@
 # Building the applications
 
-The Joplin source code is hosted on a [monorepo](https://en.wikipedia.org/wiki/Monorepo) and is managed using Yarn workspaces (as well as Lerna for publishing the packages).
+The Joplin source code is hosted on a [monorepo](https://en.wikipedia.org/wiki/Monorepo) managed by Lerna. The usage of Lerna is mostly transparent as the needed commands have been moved to the root package.json and thus are invoked for example when running `npm install` or `npm run watch`. The main thing to know about Lerna is that it links the packages in the monorepo using `npm link`, so if you check the node_modules directory you will see links instead of actual directories for certain packages. This is something to keep in mind as these links can cause issues in some cases.
 
 The list of the main sub-packages is below:
 
@@ -18,32 +18,30 @@ There are also a few forks of existing packages under the "fork-*" name.
 
 ## Required dependencies
 
-- Install Node 16+. On Windows, also install the build tools - https://nodejs.org/en/
-  - [Enable Yarn](https://yarnpkg.com/getting-started/install): `corepack enable`
-- macOS: Install Cocoapods - `brew install cocoapods`. Apple Silicon [may require libvips](https://github.com/laurent22/joplin/pull/5966#issuecomment-1007158597) - `brew install vips`.
-- Linux: Install dependencies - `sudo apt install build-essential libnss3 libsecret-1-dev python rsync`
+- Install node 14+ - https://nodejs.org/en/
+- macOS: Install Cocoapods - `brew install cocoapods`
+- Windows: Install Windows Build Tools - `npm install -g windows-build-tools --vs2015`
+- Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev python rsync`
 
 ## Building
 
-Make sure the path to the project directory does not contain spaces or the build may fail.
-
 Before doing anything else, from the root of the project, run:
 
-	yarn install
+	npm install
 
 Then you can test the various applications:
 
 ## Testing the desktop application
 
 	cd packages/app-desktop
-	yarn start
+	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 packages/app-cli
-	yarn start
+	npm start
 
 ## Testing the Mobile application
 
@@ -56,11 +54,12 @@ Then, for **Android**:
 
 On **iOS**, open the file `ios/Joplin.xcworkspace` on XCode and run the app from there.
 
-Normally the **bundler** should start automatically with the application. If it doesn't, run `yarn start` from `packages/app-mobile`.
+Normally the **bundler** should start automatically with the application. If it doesn't, run `npm start` from `packages/app-mobile`.
 
 ## Building the clipper
 
 	cd packages/app-clipper/popup
+	npm install
 	npm run watch # To watch for changes
 
 To test the extension please refer to the relevant pages for each browser: [Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Your_first_WebExtension#Trying_it_out) / [Chrome](https://developer.chrome.com/docs/extensions/mv3/getstarted/). Please note that the extension in dev mode will only connect to a dev instance of the desktop app (and vice-versa).
@@ -69,15 +68,23 @@ To test the extension please refer to the relevant pages for each browser: [Fire
 
 To make changes to the application, you'll need to rebuild any TypeScript file you've changed. The simplest way to do this is to watch for changes from the root of the project. Simply run this command, and it should take care of the rest:
 
-	yarn run watch
+	npm run watch
 
-Running `yarn run tsc` would have the same effect, but without watching.
+Running `npm run tsc` would have the same effect, but without watching.
 
 ## Running an application with additional parameters
 
-You can specify additional parameters when running the desktop or CLI application. To do so, add `--` to the `yarn start` command, followed by your flags. For example:
+You can specify additional parameters when running the desktop or CLI application. To do so, add `--` to the `npm start` command, followed by your flags. For example:
 
-	yarn start --debug
+	npm start -- --debug
+
+## Adding a new dependency
+
+Since Joplin uses Lerna, adding a new dependency should not be done using `npm i -s ...`. Instead you should use the `lerna add` command, which will take care of adding the package while handling the linked packages correctly. For example, to add the package "leftpad" to the "app-desktop" sub-package, you would run:
+
+	npx lerna add leftpad --scope=@joplin/app-desktop
+
+Note that you should most likely always specify a scope because otherwise it will add the package to all the sub-packages.
 
 ## TypeScript
 
@@ -89,14 +96,14 @@ If you'd like to auto-reload the desktop app on changes rather than having to qu
 
 ```sh
 cd packages/app-desktop
-watchman-make -p '**/*.js' '**/*.jsx' --run "yarn start"
+watchman-make -p '**/*.js' '**/*.jsx' --run "npm start"
 ```
 
-It still requires you to quit the application each time you want it to rebuild, but at least you don't have to re-run `"yarn start"` each time. Here's what the workflow loop looks like in practice:
+It still requires you to quit the application each time you want it to rebuild, but at least you don't have to re-run `"npm start"` each time. Here's what the workflow loop looks like in practice:
 
 1. Edit and save files in your text editor.
 2. Switch to the Electron app and <kbd>cmd</kbd>+<kbd>Q</kbd> to quit it.
-3. `watchman` immediately restarts the app for you (whereas usually you'd have to switch back to the terminal, type `"yarn start"`, and hit enter).
+3. `watchman` immediately restarts the app for you (whereas usually you'd have to switch back to the terminal, type `"npm start"`, and hit enter).
 
 # Troubleshooting
 

CONTRIBUTING.md

@@ -31,21 +31,20 @@ Joplin is available in multiple languages thanks to the help of its users. You c
 
 If you want to start contributing to the project's code, please follow these guidelines before creating a pull request: 
 
-- Explain WHY you want to add this change. Explain it inside the pull request and you may link to an issue for additional information, but the PR should give a clear overview of why you want to add this.
+- Explain WHY you want to add this change. Explain it inside the pull request and you may link to an issue for additional information, but the PR should gives a clear overview of why you want to add this.
 - Bug fixes are always welcome. Start by reviewing the [list of bugs](https://github.com/laurent22/joplin/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
 - A good way to easily start contributing is to pick and work on a [good first issue](https://github.com/laurent22/joplin/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22). We try to make these issues as clear as possible and provide basic info on how the code should be changed, and if something is unclear feel free to ask for more information on the issue.
 - Before adding a new feature, ask about it in the [Github Issue Tracker](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue) or the [Joplin Forum](https://discourse.joplinapp.org/), or check if existing discussions exist to make sure the new functionality is desired.
-- **Changes that will consist of more than 50 lines of code should be discussed on the [Joplin Forum](https://discourse.joplinapp.org/)**, so that you don't spend too much time implementing something that might not be accepted.
-- 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, make sure it still works in the other apps. Usually it does, but keep this in mind.
+- **Changes that will consist in more than 50 lines of code should be discussed the [Joplin Forum](https://discourse.joplinapp.org/)**, so that you don't spend too much time implementing something that might not be accepted.
+- 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.
-- Pull requests that address multiple issues will most likely stall and eventually be closed. This is because we might be fine with one of the changes but not with others and untangling that kind of pull request is too much hassle both for maintainers and the person who submitted it. So most of the time someone gives up and the PR gets closed. So please keep the pull request focused on one issue.
-- **Do not mark your reviewer's comments as "resolved"**. If you do that, the comments will be hidden and the reviewer will not know what are the pending issues in the pull request. Only the reviewer should resolve the comments.
+- Pull requests that make address multiple issues will most likely stall and eventually be closed. This is because we might be fine with one of the changes but not with others and untangling that kind of pull request is too much hassle both for maintainers and the person who submitted it. So most of the time someone gives up and the PR gets closed. So please keep the pull request focused on one issue.
 
 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
 
-Coding style is enforced by a pre-commit hook that runs eslint. This hook is installed whenever running `yarn install` on any of the application directory. If for some reason the pre-commit hook didn't get installed, you can manually install it by running `yarn install` at the root of the repository.
+Coding style is enforced by a pre-commit hook that runs eslint. This hook is installed whenever running `npm install` on any of the application directory. If for some reason the pre-commit hook didn't get installed, you can manually install it by running `npm install` at the root of the repository.
 
 For new React components, please use [React Hooks](https://reactjs.org/docs/hooks-intro.html). For new code in general, please use TypeScript. Even if you are modifying a file that was originally in JavaScript you should ideally convert it first to TypeScript before modifying it. Doing so is relatively easy and it helps maintain code quality.
 
@@ -53,57 +52,37 @@ For changes made to the Desktop client that affect the user interface, refer to
 
 ## Automated tests
 
-When submitting a pull request for a new feature or a bug fix, please add automated tests. We use [Jest](https://jestjs.io/) as a testing framework so you will need to be familiar with it or go through their documentation.
+When submitting a pull request for a new feature or a bug fix, please add automated tests for your code whenever possible. Tests in Joplin are divided into **unit tests** and **feature tests**.
 
-### Running the tests
+* **Unit tests** are used to test models, services or utility classes - they are relatively low level. Unit tests should be prefixed with the type of class that is being tested - for example "models_Folder" or "services_SearchEngine".
 
-To run all the test units, run from the root:
+* **Feature tests** on the other hand are to test higher level functionalities such as interactions with the GUI and how they affect the underlying model. Often these tests would dispatch Redux actions, and inspect how the application state has been changed. The feature tests should be prefixed with "feature_", for example "feature_TagList". There's a good explanation on what qualifies as a feature test in [this post](https://github.com/laurent22/joplin/pull/2819#issuecomment-603502230).
+
+The tests are under packages/app-cli/tests. To get them running, you first need to build the CLI app:
 
 ```sh
-yarn test
+npm install
+cd packages/app-cli
 ```
 
-Or you can go inside a package folder, and run the tests from there. For example to run all the library tests, go in `packages/lib` and run `yarn test`
+To run all the test units:
+
+```sh
+npm test
+```
 
 To run just one particular file:
 
 ```sh
-# Run all the tests in markdownUtils.test.ts
-yarn test markdownUtils
+npm test -- --filter=markdownUtils # Don't add the .js extension
 ```
 
-To run only a particular test in a file:
+To filter tests. For example, to run all the test units that contain "should handle conflict" in their description:
 
 ```sh
-# Run only the test described as "should handle conflict"
-# inside markdownUtils.test.ts:
-yarn test markdownUtils --filter="should handle conflict"
+npm test -- --filter="should handle conflict"
 ```
 
-### Adding a new test file
-
-To add a test, simply create a new file with an extension `.test.ts` in the same directory. For example if you are working on the file `example.ts`, create a file `example.test.ts` for the unit tests. If this file already exist, simply add your tests directly to it.
-
-### Setting the testing environment
-
-Many utility functions are available under the package `@joplin/lib/testing/test-utils`. Have a look for example at [Note.test.ts](https://github.com/laurent22/joplin/blob/dev/packages/lib/models/Note.test.ts) to see how to setup test units with database support and synchroniser support. Note that this is not needed for all tests - if you just have a simple functions to test you won't need that extra setup.
-
-### Testing React Hooks
-
-To test React Hooks please use the package `@testing-library/react-hooks`. See [useLayoutItemSizes.test.ts](https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.test.ts) for an example.
-
-### If it is not possible to add tests
-
-More often than not, it is actually possible to add tests - just go back to your code and see if it can be refactored and certain functionalities moved to simple functions (with no dependencies). Once you have a simple function, you can easily add unit tests for it.
-
-Additionally, if the unit tests are not sufficient, please provide a **manual testing plan**, which should include detailed steps on:
-
-- How to test that your feature is working. Include at least 5 tests. Try to think of the possible inputs - if it's a list, how does it work with 0 elements, or 1, or 10, or 100,000. If it's a text input, how does it work with an empty string, or a very large string, etc. Basically don't just put one test that check the best case scenario.
-
-- How to verify that related parts of the applications are not broken. For example if you changed the note loading logic, check that the toolbar is still working as expected (and not modifying the previously loaded note for example), check that switching from one note to another still works. Look at the note list and verify that the note title is updated there too, etc.
-
-A reviewer should be able to run the app with your changes, then do the above steps to verify that everything's working as expected.
-
 ## About abandoned pull requests
 
 It happens that a pull request is started but not finished and despite our attempts to contact the contributor, we don't hear from them again.

DEPLOY.md

@@ -6,7 +6,7 @@ Various scripts are provided to deploy the Joplin applications, scripts and tool
 
 Before new releases are created, all version numbers must be updated. This is done using the `setupNewRelease` script and passing it the new major.minor version number. For example:
 
-	yarn run setupNewRelease 1.8
+	npm run setupNewRelease -- 1.8
 
 Patch numbers are going to be incremented automatically when releasing each individual package.
 
@@ -14,13 +14,13 @@ Patch numbers are going to be incremented automatically when releasing each indi
 
 The desktop application is built for Windows, macOS and Linux via continuous integration, by pushing a version tag to GitHub. The process is automated using:
 
-	yarn run releaseDesktop
+	npm run releaseDesktop
 
 ## Android application
 
 The app is built and upload to GitHub using:
 
-	yarn run releaseAndroid --type=prerelease
+	npm run releaseAndroid -- --type=prerelease
 
 The "type" parameter can be either "release" or "prerelease"
 
@@ -32,7 +32,7 @@ It must be built and released manually using XCode.
 
 Unlike the mobile or desktop application, the CLI app doesn't bundle its dependencies and is always installed from source. For that reason, all its `@joplin` dependencies must be deployed publicly first. This is done using:
 
-	yarn run publishAll
+	npm run publishAll
 
 This is going to publish all the Joplin libraries, such as `@joplin/lib`, `@joplin/tools`, etc.
 
@@ -52,28 +52,26 @@ Then in `app-cli/package.json`, all `@joplin` dependencies and devdependencies m
 
 Finally, to release the actual app, run:
 
-	yarn run releaseCli
+	npm run releaseCli
 
 ## Joplin Server
 
 Run:
 
-	yarn run releaseServer
+	npm run releaseServer
 
 ## Web clipper
 
 Run:
 
-	yarn run releaseClipper
+	npm run releaseClipper
 
 ## Plugin generator
 
 First the types should generally be updated, using `./updateTypes.sh`. Then run:
 
-	yarn run releasePluginGenerator
+	npm run releasePluginGenerator
 
 ## Plugin Repo Cli
 
-This tool is packaged using Webpack so it can be released with a single command:
-
-	yarn run releasePluginRepoCli
+Since it has dependencies to the `@joplin` packages, it is released when running `npm run publishAll`

Dockerfile.server

@@ -1,75 +1,84 @@
-# =============================================================================
-# Build stage
-# =============================================================================
+# https://versatile.nl/blog/deploying-lerna-web-apps-with-docker
 
-FROM node:16-bullseye AS builder
+FROM node:16-bullseye
 
 RUN apt-get update \
     && apt-get install -y \
-    python tini \
+    python \
     && rm -rf /var/lib/apt/lists/*
 
-# Enables Yarn
-RUN corepack enable
-
-WORKDIR /build
-
-COPY .yarn/plugins ./.yarn/plugins
-COPY .yarn/releases ./.yarn/releases
-COPY package.json .
-COPY .yarnrc.yml .
-COPY yarn.lock .
-COPY gulpfile.js .
-COPY tsconfig.json .
-COPY packages/turndown ./packages/turndown
-COPY packages/turndown-plugin-gfm ./packages/turndown-plugin-gfm
-COPY packages/fork-htmlparser2 ./packages/fork-htmlparser2
-COPY packages/server/package*.json ./packages/server/
-COPY packages/fork-sax ./packages/fork-sax
-COPY packages/fork-uslug ./packages/fork-uslug
-COPY packages/htmlpack ./packages/htmlpack
-COPY packages/renderer ./packages/renderer
-COPY packages/tools ./packages/tools
-COPY packages/lib ./packages/lib
-COPY packages/server ./packages/server
-
-# For some reason there's both a .yarn/cache and .yarn/berry/cache that are
-# being generated, and both have the same content. Not clear why it does this
-# but we can delete it anyway. We can delete the cache because we use
-# `nodeLinker: node-modules`. If we ever implement Zero Install, we'll need to
-# keep the cache.
-#
-# Note that `yarn install` ignores `NODE_ENV=production` and will install dev
-# dependencies too, but this is fine because we need them to build the app.
-
-RUN BUILD_SEQUENCIAL=1 yarn install --inline-builds \
-    && yarn cache clean \
-    && rm -rf .yarn/berry
-
-# =============================================================================
-# Final stage - we copy only the relevant files from the build stage and start
-# from a smaller base image.
-# =============================================================================
-
-FROM node:16-bullseye-slim
+RUN echo "Node: $(node --version)"
+RUN echo "Npm: $(npm --version)"
 
 ARG user=joplin
-RUN useradd --create-home --shell /bin/bash $user
 
+RUN useradd --create-home --shell /bin/bash $user
 USER $user
 
-COPY --chown=$user:$user --from=builder /build/packages /home/$user/packages
-COPY --chown=$user:$user --from=builder /usr/bin/tini /usr/local/bin/tini
+ENV NODE_ENV development
+
+WORKDIR /home/$user
+
+RUN mkdir /home/$user/logs
+
+# Install the root scripts but don't run postinstall (which would bootstrap
+# and build TypeScript files, but we don't have the TypeScript files at
+# this point)
+
+COPY --chown=$user:$user package*.json ./
+RUN npm install --ignore-scripts
+
+# To take advantage of the Docker cache, we first copy all the package.json
+# and package-lock.json files, as they rarely change, and then bootstrap
+# all the packages.
+#
+# Note that bootstrapping the packages will run all the postinstall
+# scripts, which means that for packages that have such scripts, we need to
+# copy all the files.
+#
+# We can't run boostrap with "--ignore-scripts" because that would
+# prevent certain sub-packages, such as sqlite3, from being built
+
+COPY --chown=$user:$user packages/fork-sax/package*.json ./packages/fork-sax/
+COPY --chown=$user:$user packages/renderer/package*.json ./packages/renderer/
+COPY --chown=$user:$user packages/tools/package*.json ./packages/tools/
+COPY --chown=$user:$user packages/lib/package*.json ./packages/lib/
+COPY --chown=$user:$user lerna.json .
+COPY --chown=$user:$user tsconfig.json .
+
+# The following have postinstall scripts so we need to copy all the files.
+# Since they should rarely change this is not an issue
+
+COPY --chown=$user:$user packages/turndown ./packages/turndown
+COPY --chown=$user:$user packages/turndown-plugin-gfm ./packages/turndown-plugin-gfm
+COPY --chown=$user:$user packages/fork-htmlparser2 ./packages/fork-htmlparser2
+
+# Then bootstrap only, without compiling the TypeScript files
+
+RUN npm run bootstrap
+
+# We have a separate step for the server files because they are more likely to
+# change.
+
+COPY --chown=$user:$user packages/server/package*.json ./packages/server/
+RUN npm run bootstrapServerOnly
+
+# Now copy the source files. Put lib and server last as they are more likely to change.
+
+COPY --chown=$user:$user packages/fork-sax ./packages/fork-sax
+COPY --chown=$user:$user packages/renderer ./packages/renderer
+COPY --chown=$user:$user packages/tools ./packages/tools
+COPY --chown=$user:$user packages/lib ./packages/lib
+COPY --chown=$user:$user packages/server ./packages/server
+
+# Finally build everything, in particular the TypeScript files.
+
+RUN npm run build
 
-ENV NODE_ENV=production
 ENV RUNNING_IN_DOCKER=1
 EXPOSE ${APP_PORT}
 
-# Use Tini to start Joplin Server:
-# https://github.com/nodejs/docker-node/blob/main/docs/BestPractices.md#handling-kernel-signals
-WORKDIR /home/$user/packages/server
-ENTRYPOINT ["tini", "--"]
-CMD ["node", "dist/app.js"]
+CMD [ "npm", "--prefix", "packages/server", "start" ]
 
 # Build-time metadata
 # https://github.com/opencontainers/image-spec/blob/master/annotations.md

Joplin_install_and_update.sh

@@ -213,14 +213,12 @@ then
 	Encoding=UTF-8
 	Name=Joplin
 	Comment=Joplin for Desktop
-	Exec=${HOME}/.joplin/Joplin.AppImage ${SANDBOXPARAM} %u
+	Exec=${HOME}/.joplin/Joplin.AppImage ${SANDBOXPARAM}
 	Icon=joplin
 	StartupWMClass=Joplin
 	Type=Application
 	Categories=Office;
 	MimeType=x-scheme-handler/joplin;
-	X-GNOME-SingleWindow=true // should be removed eventually as it was upstream to be an XDG specification
-	SingleMainWindow=true
 	EOF
     
     # Update application icons