update

.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,17 +2,23 @@ _mydocs/
 _releases/
 .git/
 .github/
-.yarn/
 *.min.js
-**/commands/index.ts
 **/node_modules/
 Assets/
 docs/
+packages/plugins/**/dist
+packages/plugins/**/api
+packages/server/dist/
 highlight.pack.js
 Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/JoplinLists/
 Modules/TinyMCE/langs/
+packages/turndown/
+packages/turndown-plugin-gfm/
 node_modules/
+packages/lib/lib/lib.js
+packages/lib/locales/index.js
+packages/lib/services/database/types.ts
 packages/app-cli/build
 packages/app-cli/build/
 packages/app-cli/locales
@@ -24,7 +30,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,41 +41,30 @@ 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
 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
-packages/app-mobile/lib/rnInjectedJs/
 packages/app-mobile/locales
 packages/app-mobile/node_modules
 packages/app-mobile/pluginAssets/
-packages/fork-*
-packages/htmlpack/dist/
+packages/app-mobile/lib/rnInjectedJs/
+packages/app-mobile/components/NoteEditor/CodeMirror.bundle.js
 packages/lib/assets/
-packages/lib/lib/lib.js
-packages/lib/locales/index.js
 packages/lib/rnInjectedJs/
-packages/lib/services/database/types.ts
 packages/lib/vendor/
 packages/lib/vendor/fountain.min.js
 packages/lib/welcomeAssets.js
-packages/plugins/**/api
-packages/plugins/**/dist
-packages/server/dist/
 packages/tools/node_modules
 packages/tools/PortableAppsLauncher
-packages/turndown-plugin-gfm/
-packages/turndown/
+packages/fork-*
 plugin_types/
 readme/
+**/commands/index.ts
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.d.ts
@@ -82,12 +76,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
 packages/app-cli/app/services/plugins/PluginRunner.d.ts
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/services/plugins/PluginRunner.js.map
@@ -121,9 +109,6 @@ packages/app-cli/tests/services/plugins/sandboxProxy.js.map
 packages/app-cli/tests/testUtils.d.ts
 packages/app-cli/tests/testUtils.js
 packages/app-cli/tests/testUtils.js.map
-packages/app-cli/tools/populateDatabase.d.ts
-packages/app-cli/tools/populateDatabase.js
-packages/app-cli/tools/populateDatabase.js.map
 packages/app-desktop/ElectronAppWrapper.d.ts
 packages/app-desktop/ElectronAppWrapper.js
 packages/app-desktop/ElectronAppWrapper.js.map
@@ -223,15 +208,9 @@ 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/EncryptionConfigScreen.d.ts
+packages/app-desktop/gui/EncryptionConfigScreen.js
+packages/app-desktop/gui/EncryptionConfigScreen.js.map
 packages/app-desktop/gui/ErrorBoundary.d.ts
 packages/app-desktop/gui/ErrorBoundary.js
 packages/app-desktop/gui/ErrorBoundary.js.map
@@ -274,9 +253,6 @@ packages/app-desktop/gui/MainScreen/commands/hideModalMessage.js.map
 packages/app-desktop/gui/MainScreen/commands/index.d.ts
 packages/app-desktop/gui/MainScreen/commands/index.js
 packages/app-desktop/gui/MainScreen/commands/index.js.map
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.d.ts
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.js
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.js.map
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.js
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.js.map
@@ -295,12 +271,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
@@ -316,9 +286,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
@@ -355,15 +322,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
@@ -427,9 +385,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js.map
@@ -556,9 +511,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
@@ -718,9 +670,6 @@ packages/app-desktop/gui/utils/NoteListUtils.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/plugins/GotoAnything.d.ts
 packages/app-desktop/plugins/GotoAnything.js
 packages/app-desktop/plugins/GotoAnything.js.map
@@ -733,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
@@ -772,21 +718,6 @@ 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/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
@@ -844,9 +775,6 @@ packages/app-mobile/services/AlarmServiceDriver.android.js.map
 packages/app-mobile/services/AlarmServiceDriver.ios.d.ts
 packages/app-mobile/services/AlarmServiceDriver.ios.js
 packages/app-mobile/services/AlarmServiceDriver.ios.js.map
-packages/app-mobile/services/e2ee/RSA.react-native.d.ts
-packages/app-mobile/services/e2ee/RSA.react-native.js
-packages/app-mobile/services/e2ee/RSA.react-native.js.map
 packages/app-mobile/setupQuickActions.d.ts
 packages/app-mobile/setupQuickActions.js
 packages/app-mobile/setupQuickActions.js.map
@@ -925,9 +853,6 @@ packages/generator-joplin/generators/app/templates/api_index.js.map
 packages/generator-joplin/generators/app/templates/src/index.d.ts
 packages/generator-joplin/generators/app/templates/src/index.js
 packages/generator-joplin/generators/app/templates/src/index.js.map
-packages/htmlpack/src/index.d.ts
-packages/htmlpack/src/index.js
-packages/htmlpack/src/index.js.map
 packages/lib/AsyncActionQueue.d.ts
 packages/lib/AsyncActionQueue.js
 packages/lib/AsyncActionQueue.js.map
@@ -997,12 +922,6 @@ packages/lib/TaskQueue.js.map
 packages/lib/array.d.ts
 packages/lib/array.js
 packages/lib/array.js.map
-packages/lib/callbackUrlUtils.d.ts
-packages/lib/callbackUrlUtils.js
-packages/lib/callbackUrlUtils.js.map
-packages/lib/callbackUrlUtils.test.d.ts
-packages/lib/callbackUrlUtils.test.js
-packages/lib/callbackUrlUtils.test.js.map
 packages/lib/commands/historyBackward.d.ts
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyBackward.js.map
@@ -1018,12 +937,9 @@ packages/lib/commands/openMasterPasswordDialog.js.map
 packages/lib/commands/synchronize.d.ts
 packages/lib/commands/synchronize.js
 packages/lib/commands/synchronize.js.map
-packages/lib/components/EncryptionConfigScreen/utils.d.ts
-packages/lib/components/EncryptionConfigScreen/utils.js
-packages/lib/components/EncryptionConfigScreen/utils.js.map
-packages/lib/database-driver-better-sqlite.d.ts
-packages/lib/database-driver-better-sqlite.js
-packages/lib/database-driver-better-sqlite.js.map
+packages/lib/components/shared/encryption-config-shared.d.ts
+packages/lib/components/shared/encryption-config-shared.js
+packages/lib/components/shared/encryption-config-shared.js.map
 packages/lib/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -1084,9 +1000,6 @@ packages/lib/import-enex-md-gen.js.map
 packages/lib/import-enex-md-gen.test.d.ts
 packages/lib/import-enex-md-gen.test.js
 packages/lib/import-enex-md-gen.test.js.map
-packages/lib/import-enex.d.ts
-packages/lib/import-enex.js
-packages/lib/import-enex.js.map
 packages/lib/locale.d.ts
 packages/lib/locale.js
 packages/lib/locale.js.map
@@ -1189,12 +1102,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
@@ -1327,18 +1237,12 @@ packages/lib/services/e2ee/EncryptionService.js.map
 packages/lib/services/e2ee/EncryptionService.test.d.ts
 packages/lib/services/e2ee/EncryptionService.test.js
 packages/lib/services/e2ee/EncryptionService.test.js.map
-packages/lib/services/e2ee/RSA.node.d.ts
-packages/lib/services/e2ee/RSA.node.js
-packages/lib/services/e2ee/RSA.node.js.map
 packages/lib/services/e2ee/ppk.d.ts
 packages/lib/services/e2ee/ppk.js
 packages/lib/services/e2ee/ppk.js.map
 packages/lib/services/e2ee/ppk.test.d.ts
 packages/lib/services/e2ee/ppk.test.js
 packages/lib/services/e2ee/ppk.test.js.map
-packages/lib/services/e2ee/ppkTestUtils.d.ts
-packages/lib/services/e2ee/ppkTestUtils.js
-packages/lib/services/e2ee/ppkTestUtils.js.map
 packages/lib/services/e2ee/types.d.ts
 packages/lib/services/e2ee/types.js
 packages/lib/services/e2ee/types.js.map
@@ -1372,15 +1276,6 @@ packages/lib/services/interop/InteropService_Exporter_Jex.js.map
 packages/lib/services/interop/InteropService_Exporter_Md.d.ts
 packages/lib/services/interop/InteropService_Exporter_Md.js
 packages/lib/services/interop/InteropService_Exporter_Md.js.map
-packages/lib/services/interop/InteropService_Exporter_Md.test.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md.test.js
-packages/lib/services/interop/InteropService_Exporter_Md.test.js.map
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js.map
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.js
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.js.map
 packages/lib/services/interop/InteropService_Exporter_Raw.d.ts
 packages/lib/services/interop/InteropService_Exporter_Raw.js
 packages/lib/services/interop/InteropService_Exporter_Raw.js.map
@@ -1405,12 +1300,6 @@ packages/lib/services/interop/InteropService_Importer_Md.js.map
 packages/lib/services/interop/InteropService_Importer_Md.test.d.ts
 packages/lib/services/interop/InteropService_Importer_Md.test.js
 packages/lib/services/interop/InteropService_Importer_Md.test.js.map
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.d.ts
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js.map
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.d.ts
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js.map
 packages/lib/services/interop/InteropService_Importer_Raw.d.ts
 packages/lib/services/interop/InteropService_Importer_Raw.js
 packages/lib/services/interop/InteropService_Importer_Raw.js.map
@@ -1522,6 +1411,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
@@ -1549,12 +1441,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/rest/Api.d.ts
 packages/lib/services/rest/Api.js
 packages/lib/services/rest/Api.js.map
@@ -1723,9 +1609,6 @@ packages/lib/services/synchronizer/migrations/2.js.map
 packages/lib/services/synchronizer/migrations/3.d.ts
 packages/lib/services/synchronizer/migrations/3.js
 packages/lib/services/synchronizer/migrations/3.js.map
-packages/lib/services/synchronizer/syncDebugLog.d.ts
-packages/lib/services/synchronizer/syncDebugLog.js
-packages/lib/services/synchronizer/syncDebugLog.js.map
 packages/lib/services/synchronizer/syncInfoUtils.d.ts
 packages/lib/services/synchronizer/syncInfoUtils.js
 packages/lib/services/synchronizer/syncInfoUtils.js.map
@@ -1912,9 +1795,6 @@ packages/renderer/MdToHtml/rules/mermaid.js.map
 packages/renderer/MdToHtml/rules/sanitize_html.d.ts
 packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/sanitize_html.js.map
-packages/renderer/MdToHtml/rules/source_map.d.ts
-packages/renderer/MdToHtml/rules/source_map.js
-packages/renderer/MdToHtml/rules/source_map.js.map
 packages/renderer/MdToHtml/setupLinkify.d.ts
 packages/renderer/MdToHtml/setupLinkify.js
 packages/renderer/MdToHtml/setupLinkify.js.map
@@ -1942,9 +1822,6 @@ packages/renderer/utils.js.map
 packages/tools/buildServerDocker.d.ts
 packages/tools/buildServerDocker.js
 packages/tools/buildServerDocker.js.map
-packages/tools/buildServerDocker.test.d.ts
-packages/tools/buildServerDocker.test.js
-packages/tools/buildServerDocker.test.js.map
 packages/tools/convertThemesToCss.d.ts
 packages/tools/convertThemesToCss.js
 packages/tools/convertThemesToCss.js.map
@@ -1957,6 +1834,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/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
@@ -1969,18 +1849,12 @@ 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
 packages/tools/setupNewRelease.d.ts
 packages/tools/setupNewRelease.js
 packages/tools/setupNewRelease.js.map
-packages/tools/tagServerLatest.d.ts
-packages/tools/tagServerLatest.js
-packages/tools/tagServerLatest.js.map
 packages/tools/tool-utils.d.ts
 packages/tools/tool-utils.js
 packages/tools/tool-utils.js.map
@@ -1990,18 +1864,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/utils/frontMatter.d.ts
-packages/tools/website/utils/frontMatter.js
-packages/tools/website/utils/frontMatter.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map

.eslintrc.js

@@ -182,14 +182,6 @@ module.exports = {
 					// 	leadingUnderscore: 'allow',
 					// 	trailingUnderscore: 'allow',
 					// },
-
-					// Each rule below is made of two blocks: first the rule we
-					// actually want, and below exceptions to the rule.
-
-					// -----------------------------------
-					// ENUM
-					// -----------------------------------
-
 					{
 						selector: 'enumMember',
 						format: ['StrictPascalCase'],
@@ -202,23 +194,10 @@ module.exports = {
 							'match': true,
 						},
 					},
-
-					// -----------------------------------
-					// INTERFACE
-					// -----------------------------------
-
 					{
 						selector: 'interface',
 						format: ['StrictPascalCase'],
 					},
-					{
-						selector: 'interface',
-						format: null,
-						'filter': {
-							'regex': '^(RSA|RSAKeyPair)$',
-							'match': true,
-						},
-					},
 				],
 			},
 		},

.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,7 +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 "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION"
 echo "IS_PULL_REQUEST=$IS_PULL_REQUEST"
@@ -47,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
@@ -64,23 +62,7 @@ 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
-	# Allocation failed - JavaScript heap out of memory
-	#
-	# 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
@@ -92,10 +74,10 @@ fi
 # release randomly fail.
 # =============================================================================
 
-if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
+if [ "$IS_PULL_REQUEST" == "1" ]; then
 	echo "Step: Running linter..."
 
-	yarn run linter-ci ./
+	npm run linter-ci ./
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -120,27 +102,6 @@ if [ "$IS_PULL_REQUEST" == "1" ]; then
 	fi
 fi
 
-# =============================================================================
-# Check that we didn't lose any string due to gettext not being able to parse
-# newly modified or added scripts. This is convenient to quickly view on GitHub
-# what commit may have broken translation building. We run this on macOS because
-# we need the latest version of gettext (and stable Ubuntu doesn't have it).
-# =============================================================================
-
-if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
-	if [ "$IS_MACOS" == "1" ]; then
-		echo "Step: Checking for lost translation strings..."
-
-		xgettext --version
-
-		node packages/tools/build-translation.js --missing-strings-check-only
-		testResult=$?
-		if [ $testResult -ne 0 ]; then
-			exit $testResult
-		fi
-	fi
-fi
-
 # =============================================================================
 # Find out if we should run the build or not. Electron-builder gets stuck when
 # building PRs so we disable it in this case. The Linux build should provide
@@ -156,24 +117,25 @@ if [ "$IS_PULL_REQUEST" == "1" ]; then
 fi
 
 # =============================================================================
-# Build the Electron app or Docker image depending on the current tag.
+# Prepare the Electron app and build it
 #
 # If the current tag is a desktop release tag (starts with "v", such as
-# "v1.4.7"), we build and publish to GitHub. Otherwise we only build but don't
-# publish to GitHub. It helps finding out any issue in pull requests and dev
-# branch.
+# "v1.4.7"), we build and publish to github
+#
+# Otherwise we only build but don't publish to GitHub. It helps finding
+# out any issue in pull requests and dev branch.
 # =============================================================================
 
 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
+	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
+	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'
-          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

@@ -19,18 +19,9 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y gettext
           sudo apt-get install -y libsecret-1-dev
-          sudo apt-get install -y translate-toolkit
-
-      - name: Install macOS dependencies
-        if: runner.os == 'macOS'
-        run: |
-          brew update
-          brew install gettext
-          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
@@ -44,16 +35,19 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y docker-ce docker-ce-cli containerd.io
 
+          # the next line enables multi-architecture support for docker, it basically makes it use qemu for non native platforms
+          # See https://hub.docker.com/r/tonistiigi/binfmt for more info
+          docker run --privileged --rm tonistiigi/binfmt --install all
+
+          # this just prints the info about what platforms are supported in the builder (can help debugging if something isn't working right)
+          # and also proves the above worked properly
+          sudo docker buildx ls
+
       - uses: actions/checkout@v2
       - uses: olegtarasov/get-tag@v2.1
       - 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
@@ -74,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"
 
@@ -85,48 +78,7 @@ jobs:
           CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           IS_CONTINUOUS_INTEGRATION: 1
-          BUILD_SEQUENCIAL: 1
         run: |
-          yarn install
+          npm install
           cd packages/app-desktop
-          yarn run dist
-
-  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
-          
+          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,12 +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
 packages/app-cli/app/services/plugins/PluginRunner.d.ts
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/services/plugins/PluginRunner.js.map
@@ -111,9 +94,6 @@ packages/app-cli/tests/services/plugins/sandboxProxy.js.map
 packages/app-cli/tests/testUtils.d.ts
 packages/app-cli/tests/testUtils.js
 packages/app-cli/tests/testUtils.js.map
-packages/app-cli/tools/populateDatabase.d.ts
-packages/app-cli/tools/populateDatabase.js
-packages/app-cli/tools/populateDatabase.js.map
 packages/app-desktop/ElectronAppWrapper.d.ts
 packages/app-desktop/ElectronAppWrapper.js
 packages/app-desktop/ElectronAppWrapper.js.map
@@ -213,15 +193,9 @@ 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/EncryptionConfigScreen.d.ts
+packages/app-desktop/gui/EncryptionConfigScreen.js
+packages/app-desktop/gui/EncryptionConfigScreen.js.map
 packages/app-desktop/gui/ErrorBoundary.d.ts
 packages/app-desktop/gui/ErrorBoundary.js
 packages/app-desktop/gui/ErrorBoundary.js.map
@@ -264,9 +238,6 @@ packages/app-desktop/gui/MainScreen/commands/hideModalMessage.js.map
 packages/app-desktop/gui/MainScreen/commands/index.d.ts
 packages/app-desktop/gui/MainScreen/commands/index.js
 packages/app-desktop/gui/MainScreen/commands/index.js.map
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.d.ts
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.js
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.js.map
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.js
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.js.map
@@ -285,12 +256,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
@@ -306,9 +271,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
@@ -345,15 +307,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
@@ -417,9 +370,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js.map
@@ -546,9 +496,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
@@ -708,9 +655,6 @@ packages/app-desktop/gui/utils/NoteListUtils.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/plugins/GotoAnything.d.ts
 packages/app-desktop/plugins/GotoAnything.js
 packages/app-desktop/plugins/GotoAnything.js.map
@@ -723,9 +667,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
@@ -762,21 +703,6 @@ 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/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
@@ -834,9 +760,6 @@ packages/app-mobile/services/AlarmServiceDriver.android.js.map
 packages/app-mobile/services/AlarmServiceDriver.ios.d.ts
 packages/app-mobile/services/AlarmServiceDriver.ios.js
 packages/app-mobile/services/AlarmServiceDriver.ios.js.map
-packages/app-mobile/services/e2ee/RSA.react-native.d.ts
-packages/app-mobile/services/e2ee/RSA.react-native.js
-packages/app-mobile/services/e2ee/RSA.react-native.js.map
 packages/app-mobile/setupQuickActions.d.ts
 packages/app-mobile/setupQuickActions.js
 packages/app-mobile/setupQuickActions.js.map
@@ -915,9 +838,6 @@ packages/generator-joplin/generators/app/templates/api_index.js.map
 packages/generator-joplin/generators/app/templates/src/index.d.ts
 packages/generator-joplin/generators/app/templates/src/index.js
 packages/generator-joplin/generators/app/templates/src/index.js.map
-packages/htmlpack/src/index.d.ts
-packages/htmlpack/src/index.js
-packages/htmlpack/src/index.js.map
 packages/lib/AsyncActionQueue.d.ts
 packages/lib/AsyncActionQueue.js
 packages/lib/AsyncActionQueue.js.map
@@ -987,12 +907,6 @@ packages/lib/TaskQueue.js.map
 packages/lib/array.d.ts
 packages/lib/array.js
 packages/lib/array.js.map
-packages/lib/callbackUrlUtils.d.ts
-packages/lib/callbackUrlUtils.js
-packages/lib/callbackUrlUtils.js.map
-packages/lib/callbackUrlUtils.test.d.ts
-packages/lib/callbackUrlUtils.test.js
-packages/lib/callbackUrlUtils.test.js.map
 packages/lib/commands/historyBackward.d.ts
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyBackward.js.map
@@ -1008,12 +922,9 @@ packages/lib/commands/openMasterPasswordDialog.js.map
 packages/lib/commands/synchronize.d.ts
 packages/lib/commands/synchronize.js
 packages/lib/commands/synchronize.js.map
-packages/lib/components/EncryptionConfigScreen/utils.d.ts
-packages/lib/components/EncryptionConfigScreen/utils.js
-packages/lib/components/EncryptionConfigScreen/utils.js.map
-packages/lib/database-driver-better-sqlite.d.ts
-packages/lib/database-driver-better-sqlite.js
-packages/lib/database-driver-better-sqlite.js.map
+packages/lib/components/shared/encryption-config-shared.d.ts
+packages/lib/components/shared/encryption-config-shared.js
+packages/lib/components/shared/encryption-config-shared.js.map
 packages/lib/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -1074,9 +985,6 @@ packages/lib/import-enex-md-gen.js.map
 packages/lib/import-enex-md-gen.test.d.ts
 packages/lib/import-enex-md-gen.test.js
 packages/lib/import-enex-md-gen.test.js.map
-packages/lib/import-enex.d.ts
-packages/lib/import-enex.js
-packages/lib/import-enex.js.map
 packages/lib/locale.d.ts
 packages/lib/locale.js
 packages/lib/locale.js.map
@@ -1179,12 +1087,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
@@ -1317,18 +1222,12 @@ packages/lib/services/e2ee/EncryptionService.js.map
 packages/lib/services/e2ee/EncryptionService.test.d.ts
 packages/lib/services/e2ee/EncryptionService.test.js
 packages/lib/services/e2ee/EncryptionService.test.js.map
-packages/lib/services/e2ee/RSA.node.d.ts
-packages/lib/services/e2ee/RSA.node.js
-packages/lib/services/e2ee/RSA.node.js.map
 packages/lib/services/e2ee/ppk.d.ts
 packages/lib/services/e2ee/ppk.js
 packages/lib/services/e2ee/ppk.js.map
 packages/lib/services/e2ee/ppk.test.d.ts
 packages/lib/services/e2ee/ppk.test.js
 packages/lib/services/e2ee/ppk.test.js.map
-packages/lib/services/e2ee/ppkTestUtils.d.ts
-packages/lib/services/e2ee/ppkTestUtils.js
-packages/lib/services/e2ee/ppkTestUtils.js.map
 packages/lib/services/e2ee/types.d.ts
 packages/lib/services/e2ee/types.js
 packages/lib/services/e2ee/types.js.map
@@ -1362,15 +1261,6 @@ packages/lib/services/interop/InteropService_Exporter_Jex.js.map
 packages/lib/services/interop/InteropService_Exporter_Md.d.ts
 packages/lib/services/interop/InteropService_Exporter_Md.js
 packages/lib/services/interop/InteropService_Exporter_Md.js.map
-packages/lib/services/interop/InteropService_Exporter_Md.test.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md.test.js
-packages/lib/services/interop/InteropService_Exporter_Md.test.js.map
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js.map
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.js
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.js.map
 packages/lib/services/interop/InteropService_Exporter_Raw.d.ts
 packages/lib/services/interop/InteropService_Exporter_Raw.js
 packages/lib/services/interop/InteropService_Exporter_Raw.js.map
@@ -1395,12 +1285,6 @@ packages/lib/services/interop/InteropService_Importer_Md.js.map
 packages/lib/services/interop/InteropService_Importer_Md.test.d.ts
 packages/lib/services/interop/InteropService_Importer_Md.test.js
 packages/lib/services/interop/InteropService_Importer_Md.test.js.map
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.d.ts
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js.map
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.d.ts
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js.map
 packages/lib/services/interop/InteropService_Importer_Raw.d.ts
 packages/lib/services/interop/InteropService_Importer_Raw.js
 packages/lib/services/interop/InteropService_Importer_Raw.js.map
@@ -1512,6 +1396,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
@@ -1539,12 +1426,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/rest/Api.d.ts
 packages/lib/services/rest/Api.js
 packages/lib/services/rest/Api.js.map
@@ -1713,9 +1594,6 @@ packages/lib/services/synchronizer/migrations/2.js.map
 packages/lib/services/synchronizer/migrations/3.d.ts
 packages/lib/services/synchronizer/migrations/3.js
 packages/lib/services/synchronizer/migrations/3.js.map
-packages/lib/services/synchronizer/syncDebugLog.d.ts
-packages/lib/services/synchronizer/syncDebugLog.js
-packages/lib/services/synchronizer/syncDebugLog.js.map
 packages/lib/services/synchronizer/syncInfoUtils.d.ts
 packages/lib/services/synchronizer/syncInfoUtils.js
 packages/lib/services/synchronizer/syncInfoUtils.js.map
@@ -1902,9 +1780,6 @@ packages/renderer/MdToHtml/rules/mermaid.js.map
 packages/renderer/MdToHtml/rules/sanitize_html.d.ts
 packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/sanitize_html.js.map
-packages/renderer/MdToHtml/rules/source_map.d.ts
-packages/renderer/MdToHtml/rules/source_map.js
-packages/renderer/MdToHtml/rules/source_map.js.map
 packages/renderer/MdToHtml/setupLinkify.d.ts
 packages/renderer/MdToHtml/setupLinkify.js
 packages/renderer/MdToHtml/setupLinkify.js.map
@@ -1932,9 +1807,6 @@ packages/renderer/utils.js.map
 packages/tools/buildServerDocker.d.ts
 packages/tools/buildServerDocker.js
 packages/tools/buildServerDocker.js.map
-packages/tools/buildServerDocker.test.d.ts
-packages/tools/buildServerDocker.test.js
-packages/tools/buildServerDocker.test.js.map
 packages/tools/convertThemesToCss.d.ts
 packages/tools/convertThemesToCss.js
 packages/tools/convertThemesToCss.js.map
@@ -1947,6 +1819,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/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
@@ -1959,18 +1834,12 @@ 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
 packages/tools/setupNewRelease.d.ts
 packages/tools/setupNewRelease.js
 packages/tools/setupNewRelease.js.map
-packages/tools/tagServerLatest.d.ts
-packages/tools/tagServerLatest.js
-packages/tools/tagServerLatest.js.map
 packages/tools/tool-utils.d.ts
 packages/tools/tool-utils.js
 packages/tools/tool-utils.js.map
@@ -1980,18 +1849,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/utils/frontMatter.d.ts
-packages/tools/website/utils/frontMatter.js
-packages/tools/website/utils/frontMatter.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map

.yarn/patches/markdown-it-multimd-table-npm-4.1.1-47e334d4bd

@@ -1,43 +0,0 @@
-diff --git a/index.js b/index.js
-index 85d89900d5fe575dd0c19430209fb1703b03554e..5fa68cc9a4bd2b21a7188bd263262fd9b1604ac6 100644
---- a/index.js
-+++ b/index.js
-@@ -145,7 +145,8 @@ module.exports = function multimd_table_plugin(md, options) {
-         colspan, leftToken,
-         rowspan, upTokens = [],
-         tableLines, tgroupLines,
--        tag, text, range, r, c, b;
-+        tag, text, range, r, c, b, t,
-+        blockState;
- 
-     if (startLine + 2 > endLine) { return false; }
- 
-@@ -315,18 +316,26 @@ module.exports = function multimd_table_plugin(md, options) {
- 
-         /* Multiline. Join the text and feed into markdown-it blockParser. */
-         if (options.multiline && trToken.meta.multiline && trToken.meta.mbounds) {
--          text = [ text.trimRight() ];
-+          // Pad the text with empty lines to ensure the line number mapping is correct
-+          text = new Array(trToken.map[0]).fill('').concat([ text.trimRight() ]);
-           for (b = 1; b < trToken.meta.mbounds.length; b++) {
-             /* Line with N bounds has cells indexed from 0 to N-2 */
-             if (c > trToken.meta.mbounds[b].length - 2) { continue; }
-             range = [ trToken.meta.mbounds[b][c] + 1, trToken.meta.mbounds[b][c + 1] ];
-             text.push(state.src.slice.apply(state.src, range).trimRight());
-           }
--          state.md.block.parse(text.join('\n'), state.md, state.env, state.tokens);
-+          blockState = new state.md.block.State(text.join('\n'), state.md, state.env, []);
-+          blockState.level = trToken.level + 1;
-+          // Start tokenizing from the actual content (trToken.map[0])
-+          state.md.block.tokenize(blockState, trToken.map[0], blockState.lineMax);
-+          for (t = 0; t < blockState.tokens.length; t++) {
-+            state.tokens.push(blockState.tokens[t]);
-+          }
-         } else {
-           token          = state.push('inline', '', 0);
-           token.content  = text.trim();
-           token.map      = trToken.map;
-+          token.level    = trToken.level + 1;
-           token.children = [];
-         }
- 

.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

@@ -188,11 +188,6 @@ h2 {
 	padding-bottom: 0.5em;
 }
 
-h3 {
-	font-size: 1.3em;
-	margin-bottom: 0.8rem;
-}
-
 .front-page h1 {
 	font-size: 3em;
 }
@@ -523,17 +518,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 +647,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     img,
-.news-item-page img {
-	max-width: 650px;
-}
-
 /*****************************************************************
  IN THE PRESS
  The "In the press" section height needs to be adjusted as the
@@ -728,23 +700,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 12px;
-		font-size: 15px;
-	}
-}
-
 /*****************************************************************
  NARROW VIEW
  - Top right menu is displayed
@@ -757,23 +712,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 +829,7 @@ footer .bottom-links-row p {
 	}
 
 	#menu-mobile .button-link {
-		padding: 4px 12px;
+		padding: 10px 15px;
 		font-size: 16px;
 		margin-left: 0px;
 	}

Assets/WebsiteAssets/templates/front.mustache

@@ -11,7 +11,7 @@
 		<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}}}">
+		<link rel="stylesheet" href="{{cssBaseUrl}}/fontawesome-all.min.css?t={{buildTime}}">
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
@@ -29,7 +29,7 @@
 			rel="preload"
 			as="script"
 		></script>
-		<link rel="stylesheet" href="{{{assetUrls.css.site}}}" as="style" />
+		<link rel="stylesheet" href="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
 		<title>Joplin</title>
 	</head>
 	<body class="front-page website-env-{{env}}">
@@ -376,7 +376,7 @@
 			rel="preload"
 			as="script"
 		></script>
-		<script src="{{{assetUrls.js.script}}}"></script>
+		<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>
 		{{> analytics}}
 	</body>
 </html>

Assets/WebsiteAssets/templates/main-new.mustache

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="{{{assetUrls.css.fontawesome}}}">
+		<link rel="stylesheet" href="{{cssBaseUrl}}/fontawesome-all.min.css?t={{buildTime}}">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +37,7 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="{{{assetUrls.css.site}}}" as="style" />
+		<link rel="stylesheet" href="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
 		<title>{{pageTitle}}</title>
 
 		<script
@@ -63,20 +63,13 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 								Running in {{env}} mode!
 							</div>
 							{{{contentHtml}}}
-							{{#showBottomLinks}}
+							{{#showImproveThisDoc}}
 								<div class="bottom-links">
-									{{#discussOnForumLink}}
-										<a class="bottom-link" href="{{{discussOnForumLink}}}">
-											<i class="fab fa-discourse"></i></i> Discuss on the forum
-										</a>
-									{{/discussOnForumLink}}
-									{{#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>
@@ -86,7 +79,7 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 			{{> footer}}
 		</div>
 
-		<script src="{{{assetUrls.js.script}}}"></script>
+		<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>
 
 		{{> analytics}}
 	</body>

Assets/WebsiteAssets/templates/partials/footer.mustache

@@ -1,6 +1,14 @@
 <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="Twitter feed"><i class="fab fa-twitter"></i></a>
+				<a href="https://github.com/laurent22/joplin/" title="GitHub repository"><i class="fab fa-github"></i></a>
+				<a href="https://www.patreon.com/joplin" title="Patreon blog"><i class="fab fa-patreon"></i></a>
+				<a href="https://discordapp.com/invite/d2HMPwE" title="Discord chat"><i class="fab fa-discord"></i></a>
+				<a href="https://www.reddit.com/r/joplinapp/" title="Subreddit"><i class="fab fa-reddit"></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">
-				<a href="https://twitter.com/joplinapp" title="Joplin Twitter feed" class="fw500"><i class="fab fa-twitter"></i></a>
-				<a href="{{baseUrl}}/news/" class="fw500">News</a>
 				<a href="{{baseUrl}}/help/" class="fw500">Help</a>
 				<a href="{{forumUrl}}" class="fw500">Forum</a>
 				{{#showJoplinCloudLinks}}
@@ -44,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">
@@ -60,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/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/plans.mustache

@@ -59,7 +59,7 @@
 	<script>
 		const urlQuery = new URLSearchParams(location.search);
 		let subscriptionPeriod = 'monthly';
-		const stripe = Stripe('{{{stripeConfig.publishableKey}}}');
+		var stripe = Stripe('{{{stripeConfig.publishableKey}}}');
 
 		let checkoutSessionUser = null;
 
@@ -82,9 +82,9 @@
 		}
 
 		var createCheckoutSession = function(priceId) {
-			const promotionCode = urlQuery.get('promo') || '';
+			const coupon = urlQuery.get('coupon') || '';
 
-			console.info('Creating Stripe session for price:', priceId, 'Promotion code:', promotionCode);
+			console.info('Creating Stripe session for price:', priceId, 'Coupon:', coupon);
 
 			return fetch("{{{stripeConfig.webhookBaseUrl}}}/stripe/createCheckoutSession", {
 				method: "POST",
@@ -92,8 +92,8 @@
 					"Content-Type": "application/json"
 				},
 				body: JSON.stringify({
-					priceId,
-					promotionCode,
+					priceId: priceId,
+					coupon: coupon,
 					email: checkoutSessionUser ? checkoutSessionUser.email : '',
 				})
 			}).then(async function(result) {