Update run_ci.sh

.eslintignore

@@ -5,7 +5,6 @@ _releases/
 *.min.js
 **/commands/index.ts
 **/node_modules/
-.yarn/
 Assets/
 docs/
 highlight.pack.js
@@ -13,8 +12,6 @@ Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/JoplinLists/
 Modules/TinyMCE/langs/
 node_modules/
-packages/app-desktop/build/
-packages/app-cli/tests/test data/
 packages/app-cli/build
 packages/app-cli/build/
 packages/app-cli/locales
@@ -81,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
@@ -222,12 +216,6 @@ 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
@@ -273,9 +261,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
@@ -294,9 +279,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/openNote.d.ts
 packages/app-desktop/gui/MainScreen/commands/openNote.js
 packages/app-desktop/gui/MainScreen/commands/openNote.js.map
@@ -348,15 +330,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
@@ -420,9 +393,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
@@ -549,9 +519,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
@@ -711,9 +678,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
@@ -726,6 +690,9 @@ 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/e2ee.d.ts
+packages/app-desktop/services/e2ee.js
+packages/app-desktop/services/e2ee.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 +729,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
@@ -987,12 +939,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
@@ -1011,9 +957,6 @@ 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/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -1179,12 +1122,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/ntpDate.d.ts
-packages/lib/net-utils.js
+packages/lib/ntpDate.js
-packages/lib/net-utils.js.map
+packages/lib/ntpDate.js.map
-packages/lib/ntp.d.ts
-packages/lib/ntp.js
-packages/lib/ntp.js.map
 packages/lib/onedrive-api.d.ts
 packages/lib/onedrive-api.js
 packages/lib/onedrive-api.js.map
@@ -1362,15 +1302,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 +1326,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 +1437,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 +1467,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 +1635,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 +1821,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
@@ -1947,6 +1863,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,9 +1878,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
@@ -1980,18 +1896,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

.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.
+  Include screenshots if needed.
-  DO NOT create screenshots of text !!! Copy and paste the text into a code block.
   Please test using the latest Joplin release to make sure your issue has not already been fixed.
 -->
 

.github/scripts/run_ci.sh

@@ -46,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
@@ -63,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
@@ -79,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
@@ -91,10 +81,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
@@ -119,27 +109,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
@@ -155,24 +124,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
+# "v1.4.7"), we build and publish to github
-# publish to GitHub. It helps finding out any issue in pull requests and dev
+#
-# branch.
+# 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/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' && startsWith(github.ref, 'refs/tags/server-v')
-        if: runner.os == 'Linux'
         run: |
           sudo apt-get install -y apt-transport-https
           sudo apt-get install -y ca-certificates
@@ -49,11 +40,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
@@ -85,44 +71,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           IS_CONTINUOUS_INTEGRATION: 1
         run: |
-          yarn install
+          npm install
           cd packages/app-desktop
-          yarn run dist
+          npm 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
-        run: |
-          yarn install
-          yarn run buildServerDocker --tag-name server-v0.0.0
-          

.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
@@ -213,12 +199,6 @@ 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
@@ -264,9 +244,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,9 +262,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/openNote.d.ts
 packages/app-desktop/gui/MainScreen/commands/openNote.js
 packages/app-desktop/gui/MainScreen/commands/openNote.js.map
@@ -339,15 +313,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
@@ -411,9 +376,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
@@ -540,9 +502,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
@@ -702,9 +661,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
@@ -717,6 +673,9 @@ 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/e2ee.d.ts
+packages/app-desktop/services/e2ee.js
+packages/app-desktop/services/e2ee.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
@@ -753,21 +712,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
@@ -978,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
@@ -1002,9 +940,6 @@ 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/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -1170,12 +1105,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/ntpDate.d.ts
-packages/lib/net-utils.js
+packages/lib/ntpDate.js
-packages/lib/net-utils.js.map
+packages/lib/ntpDate.js.map
-packages/lib/ntp.d.ts
-packages/lib/ntp.js
-packages/lib/ntp.js.map
 packages/lib/onedrive-api.d.ts
 packages/lib/onedrive-api.js
 packages/lib/onedrive-api.js.map
@@ -1353,15 +1285,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
@@ -1386,12 +1309,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
@@ -1503,6 +1420,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
@@ -1530,12 +1450,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
@@ -1704,9 +1618,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
@@ -1893,9 +1804,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
@@ -1938,6 +1846,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
@@ -1950,9 +1861,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
@@ -1971,18 +1879,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

.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

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 href="https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}">
-										<a class="bottom-link" href="{{{discussOnForumLink}}}">
+										<i class="fab fa-github"></i> Improve this doc
-											<i class="fab fa-discourse"></i></i> Discuss on the forum
+									</a>
-										</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}}
 								</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

@@ -2,12 +2,11 @@
 	<div class="container">
 		<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://twitter.com/joplinapp" title="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://github.com/laurent22/joplin/" title="GitHub repository"><i class="fab fa-github"></i></a>
-				<a href="https://www.patreon.com/joplin" title="Joplin Patreon"><i class="fab fa-patreon"></i></a>
+				<a href="https://www.patreon.com/joplin" title="Patreon blog"><i class="fab fa-patreon"></i></a>
-				<a href="https://discord.gg/VSj7AFHvpq" title="Joplin Discord chat"><i class="fab fa-discord"></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="Joplin Subreddit"><i class="fab fa-reddit"></i></a>
+				<a href="https://www.reddit.com/r/joplinapp/" title="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>
 

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,7 +12,6 @@
 				</a>
 			</div>
 			<div class="col-9 text-right d-none d-md-block">
-				<a href="{{baseUrl}}/news/" class="fw500">What's New</a>
 				<a href="{{baseUrl}}/help/" class="fw500">Help</a>
 				<a href="{{forumUrl}}" class="fw500">Forum</a>
 				{{#showJoplinCloudLinks}}
@@ -43,9 +42,8 @@
 						</div>
 
 						<div class="text-center menu-mobile-top">
-							<a href="{{baseUrl}}/news/" class="fw500 mobile-menu-link">What's New</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">