Merge branch 'release-1.3' into plugin_content_scripts

.dockerignore

@@ -1,10 +0,0 @@
-**/node_modules
-Assets/
-.git/
-_releases/
-packages/app-desktop
-packages/app-cli
-packages/app-mobile
-packages/app-clipper
-packages/generator-joplin
-packages/plugin-repo-cli

.env-sample

@@ -1,26 +0,0 @@
-# =============================================================================
-# PRODUCTION CONFIG EXAMPLE
-# -----------------------------------------------------------------------------
-# By default it will use SQLite, but that's mostly to test and evaluate the
-# server. So you'll want to specify db connection settings to use Postgres.
-# =============================================================================
-#
-# APP_BASE_URL=https://example.com/joplin
-# APP_PORT=22300
-# 
-# DB_CLIENT=pg
-# POSTGRES_PASSWORD=joplin
-# POSTGRES_DATABASE=joplin
-# POSTGRES_USER=joplin
-# POSTGRES_PORT=5432
-# POSTGRES_HOST=localhost
-
-# =============================================================================
-# DEV CONFIG EXAMPLE
-# -----------------------------------------------------------------------------
-# Example of local config, for development. In dev mode, you would usually use
-# SQLite so database settings are not needed.
-# =============================================================================
-#
-# APP_BASE_URL=http://localhost:22300
-# APP_PORT=22300

.eslintrc.js

@@ -1,5 +1,4 @@
 module.exports = {
-	'root': true,
 	'env': {
 		'browser': true,
 		'es6': true,
@@ -16,8 +15,7 @@ module.exports = {
 		'Atomics': 'readonly',
 		'SharedArrayBuffer': 'readonly',
 
-		// Jest variables
-		'test': 'readonly',
+		// Jasmine variables
 		'expect': 'readonly',
 		'describe': 'readonly',
 		'it': 'readonly',
@@ -25,7 +23,7 @@ module.exports = {
 		'afterAll': 'readonly',
 		'beforeEach': 'readonly',
 		'afterEach': 'readonly',
-		'jest': 'readonly',
+		'jasmine': 'readonly',
 
 		// React Native variables
 		'__DEV__': 'readonly',
@@ -35,9 +33,6 @@ module.exports = {
 		'chrome': 'readonly',
 		'browser': 'readonly',
 
-		// Server admin UI global variables
-		'onDocumentReady': 'readonly',
-
 		'tinymce': 'readonly',
 	},
 	'parserOptions': {
@@ -65,18 +60,13 @@ module.exports = {
 		'no-var': ['error'],
 		'no-new-func': ['error'],
 		'import/prefer-default-export': ['error'],
-
-		// This rule should not be enabled since it matters in what order
-		// imports are done, in particular in relation to the shim.setReact
-		// call, which should be done first, but this rule might move it down.
-		// 'import/first': ['error'],
-
+		'import/first': ['error'],
 		'no-array-constructor': ['error'],
 		'radix': ['error'],
 
 		// Warn only for now because fixing everything would take too much
 		// refactoring, but new code should try to stick to it.
-		// 'complexity': ['warn', { max: 10 }],
+		'complexity': ['warn', { max: 10 }],
 
 		// Checks rules of Hooks
 		'react-hooks/rules-of-hooks': 'error',
@@ -125,7 +115,6 @@ module.exports = {
 		'space-before-blocks': 'error',
 		'spaced-comment': ['error', 'always'],
 		'keyword-spacing': ['error', { 'before': true, 'after': true }],
-		'no-multi-spaces': ['error'],
 	},
 	'plugins': [
 		'react',
@@ -137,37 +126,10 @@ module.exports = {
 		{
 			// enable the rule specifically for TypeScript files
 			'files': ['*.ts', '*.tsx'],
-			'parserOptions': {
-				// Required for @typescript-eslint/no-floating-promises
-				'project': './tsconfig.eslint.json',
-			},
 			'rules': {
 				// Warn only because it would make it difficult to convert JS classes to TypeScript, unless we
 				// make everything public which is not great. New code however should specify member accessibility.
 				'@typescript-eslint/explicit-member-accessibility': ['warn'],
-				'@typescript-eslint/type-annotation-spacing': ['error', { 'before': false, 'after': true }],
-				'@typescript-eslint/comma-dangle': ['error', {
-					'arrays': 'always-multiline',
-					'objects': 'always-multiline',
-					'imports': 'always-multiline',
-					'exports': 'always-multiline',
-					'enums': 'always-multiline',
-					'generics': 'always-multiline',
-					'tuples': 'always-multiline',
-					'functions': 'never',
-				}],
-				'@typescript-eslint/semi': ['error', 'always'],
-				'@typescript-eslint/member-delimiter-style': ['error', {
-					'multiline': {
-						'delimiter': 'semi',
-						'requireLast': true,
-					},
-					'singleline': {
-						'delimiter': 'semi',
-						'requireLast': false,
-					},
-				}],
-				'@typescript-eslint/no-floating-promises': ['error'],
 			},
 		},
 	],

.github/ISSUE_TEMPLATE/---feature-requests-and-support.md

@@ -0,0 +1,15 @@
+---
+name: "\U0001F914 Feature requests and support"
+about: 'For non-bug issues we recommend using the forum, where you''ll be more likely
+  to get an answer: https://discourse.joplinapp.org/'
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+If this is a feature request or a support query, please note that you'll not get an answer here.
+
+Instead we recommend using the forum where you'll are a lot more likely to get an answer: https://discourse.joplinapp.org/
+
+The forum is also the right place to submit a feature request so that it can be discussed by other users.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-    - name: "\U0001F914 Feature requests and support"
-      url: https://discourse.joplinapp.org/
-      about: I have a question or feature request …

.github/scripts/run_ci.sh

@@ -1,141 +0,0 @@
-#!/bin/bash
-
-# =============================================================================
-# Setup environment variables
-# =============================================================================
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-ROOT_DIR="$SCRIPT_DIR/../.."
-
-IS_PULL_REQUEST=0
-IS_DEV_BRANCH=0
-IS_LINUX=0
-IS_MACOS=0
-
-if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
-	IS_PULL_REQUEST=1
-fi
-
-if [ "$GITHUB_REF" == "refs/heads/dev" ]; then
-	IS_DEV_BRANCH=1
-fi
-
-if [ "$RUNNER_OS" == "Linux" ]; then
-	IS_LINUX=1
-	IS_MACOS=0
-else
-	IS_LINUX=0
-	IS_MACOS=1
-fi
-
-# =============================================================================
-# Print environment
-# =============================================================================
-
-echo "GITHUB_WORKFLOW=$GITHUB_WORKFLOW"
-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 "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION"
-echo "IS_PULL_REQUEST=$IS_PULL_REQUEST"
-echo "IS_DEV_BRANCH=$IS_DEV_BRANCH"
-echo "IS_LINUX=$IS_LINUX"
-echo "IS_MACOS=$IS_MACOS"
-
-echo "Node $( node -v )"
-echo "Npm $( npm -v )"
-
-# =============================================================================
-# Install packages
-# =============================================================================
-
-cd "$ROOT_DIR"
-npm install
-
-# =============================================================================
-# Run test units. Only do it for pull requests and dev branch because we don't
-# want it to randomly fail when trying to create a desktop release.
-# =============================================================================
-
-if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
-	echo "Step: Running tests..."
-
-	npm run test-ci
-	testResult=$?
-	if [ $testResult -ne 0 ]; then
-		exit $testResult
-	fi
-fi
-
-# =============================================================================
-# Run linter for pull requests only. We also don't want this to make the desktop
-# release randomly fail.
-# =============================================================================
-
-if [ "$IS_PULL_REQUEST" == "1" ]; then
-	echo "Step: Running linter..."
-
-	npm run linter-ci ./
-	testResult=$?
-	if [ $testResult -ne 0 ]; then
-		exit $testResult
-	fi
-fi
-
-# =============================================================================
-# Validate translations - this is needed as some users manually edit .po files
-# (and often make mistakes) instead of using a proper tool like poedit. Doing it
-# for Linux only is sufficient.
-# =============================================================================
-
-if [ "$IS_PULL_REQUEST" == "1" ]; then
-	if [ "$IS_LINUX" == "1" ]; then
-		echo "Step: Validating translations..."
-
-		node packages/tools/validate-translation.js
-		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
-# enough info if the app builds or not.
-# https://github.com/electron-userland/electron-builder/issues/4263
-# =============================================================================
-
-if [ "$IS_PULL_REQUEST" == "1" ]; then
-	if [ "$IS_MACOS" == "1" ]; then
-		echo "Step: Not building Electron app"
-		exit 0
-	fi
-fi
-
-# =============================================================================
-# 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.
-# =============================================================================
-
-cd "$ROOT_DIR/packages/app-desktop"
-
-if [[ $GIT_TAG_NAME = v* ]]; then
-	echo "Step: Building and publishing desktop application..."
-	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"
-	npm run buildServerDocker -- --tag-name $GIT_TAG_NAME
-else
-	echo "Step: Building but *not* publishing desktop application..."
-	USE_HARD_LINKS=false npm run dist -- --publish=never
-fi

.github/stale.yml

@@ -9,9 +9,7 @@ exemptLabels:
   - "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

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

@@ -1,76 +0,0 @@
-name: Joplin Continuous Integration
-on: [push, pull_request]
-jobs:
-  Main:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest, windows-2016]
-    steps:
-
-      # Silence apt-get update errors (for example when a module doesn't
-      # exist) since otherwise it will make the whole build fails, even though
-      # it might work without update. libsecret-1-dev is required for keytar -
-      # https://github.com/atom/node-keytar
-
-      - name: Install Linux dependencies
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update || true
-          sudo apt-get install -y gettext
-          sudo apt-get install -y libsecret-1-dev
-
-      - name: Install Docker Engine
-        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
-          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: olegtarasov/get-tag@v2.1
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '12'
-      
-      # 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
-      # secrets
-      - uses: docker/login-action@v1
-        if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Run tests, build and publish Linux and macOS apps
-        if: runner.os == 'Linux' || runner.os == 'macOs'
-        env:
-          APPLE_ASC_PROVIDER: ${{ secrets.APPLE_ASC_PROVIDER }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CSC_KEY_PASSWORD }}
-          CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          IS_CONTINUOUS_INTEGRATION: 1
-        run: |
-          "${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"
-
-      - name: Build and publish Windows app
-        if: runner.os == 'Windows' && startsWith(github.ref, 'refs/tags/v')
-        env:
-          CSC_KEY_PASSWORD: ${{ secrets.WINDOWS_CSC_KEY_PASSWORD }}
-          CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          IS_CONTINUOUS_INTEGRATION: 1
-        run: |
-          npm install
-          cd packages/app-desktop
-          npm run dist

.ignore

@@ -0,0 +1,296 @@
+# This is used by VSCode to ignore patterns during search.
+# Before they were in joplin.code-workspace, under the `files.exclude` key
+# but it eventually reached the limit with ENAMETOOLONG error.
+#
+# https://github.com/microsoft/vscode/issues/94718
+
+# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
+CliClient/app/LinkSelector.js
+CliClient/app/services/plugins/PluginRunner.js
+CliClient/tests/fsDriver.js
+CliClient/tests/InMemoryCache.js
+CliClient/tests/MdToHtml.js
+CliClient/tests/models_Setting.js
+CliClient/tests/services_CommandService.js
+CliClient/tests/services_InteropService.js
+CliClient/tests/services_keychainService.js
+CliClient/tests/services_PluginService.js
+CliClient/tests/services_rest_Api.js
+CliClient/tests/services/plugins/api/JoplinSetting.js
+CliClient/tests/services/plugins/sandboxProxy.js
+CliClient/tests/synchronizer_LockHandler.js
+CliClient/tests/synchronizer_MigrationHandler.js
+ElectronClient/app.js
+ElectronClient/bridge.js
+ElectronClient/commands/copyDevCommand.js
+ElectronClient/commands/focusElement.js
+ElectronClient/commands/startExternalEditing.js
+ElectronClient/commands/stopExternalEditing.js
+ElectronClient/commands/toggleExternalEditing.js
+ElectronClient/ElectronAppWrapper.js
+ElectronClient/global.d.js
+ElectronClient/gui/Button/Button.js
+ElectronClient/gui/ConfigScreen/ButtonBar.js
+ElectronClient/gui/ConfigScreen/ConfigScreen.js
+ElectronClient/gui/ConfigScreen/SideBar.js
+ElectronClient/gui/DropboxLoginScreen.js
+ElectronClient/gui/ErrorBoundary.js
+ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js
+ElectronClient/gui/KeymapConfig/ShortcutRecorder.js
+ElectronClient/gui/KeymapConfig/styles/index.js
+ElectronClient/gui/KeymapConfig/utils/getLabel.js
+ElectronClient/gui/KeymapConfig/utils/useCommandStatus.js
+ElectronClient/gui/KeymapConfig/utils/useKeymap.js
+ElectronClient/gui/MainScreen/commands/editAlarm.js
+ElectronClient/gui/MainScreen/commands/exportPdf.js
+ElectronClient/gui/MainScreen/commands/hideModalMessage.js
+ElectronClient/gui/MainScreen/commands/moveToFolder.js
+ElectronClient/gui/MainScreen/commands/newFolder.js
+ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/print.js
+ElectronClient/gui/MainScreen/commands/renameFolder.js
+ElectronClient/gui/MainScreen/commands/renameTag.js
+ElectronClient/gui/MainScreen/commands/search.js
+ElectronClient/gui/MainScreen/commands/selectTemplate.js
+ElectronClient/gui/MainScreen/commands/setTags.js
+ElectronClient/gui/MainScreen/commands/showModalMessage.js
+ElectronClient/gui/MainScreen/commands/showNoteContentProperties.js
+ElectronClient/gui/MainScreen/commands/showNoteProperties.js
+ElectronClient/gui/MainScreen/commands/showShareNoteDialog.js
+ElectronClient/gui/MainScreen/commands/toggleEditors.js
+ElectronClient/gui/MainScreen/commands/toggleNoteList.js
+ElectronClient/gui/MainScreen/commands/toggleSideBar.js
+ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
+ElectronClient/gui/MainScreen/MainScreen.js
+ElectronClient/gui/MenuBar.js
+ElectronClient/gui/MultiNoteActions.js
+ElectronClient/gui/NoteContentPropertiesDialog.js
+ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
+ElectronClient/gui/NoteEditor/commands/focusElementNoteBody.js
+ElectronClient/gui/NoteEditor/commands/focusElementNoteTitle.js
+ElectronClient/gui/NoteEditor/commands/showLocalSearch.js
+ElectronClient/gui/NoteEditor/commands/showRevisions.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useKeymap.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
+ElectronClient/gui/NoteEditor/NoteEditor.js
+ElectronClient/gui/NoteEditor/styles/index.js
+ElectronClient/gui/NoteEditor/utils/contextMenu.js
+ElectronClient/gui/NoteEditor/utils/index.js
+ElectronClient/gui/NoteEditor/utils/resourceHandling.js
+ElectronClient/gui/NoteEditor/utils/types.js
+ElectronClient/gui/NoteEditor/utils/useDropHandler.js
+ElectronClient/gui/NoteEditor/utils/useFolder.js
+ElectronClient/gui/NoteEditor/utils/useFormNote.js
+ElectronClient/gui/NoteEditor/utils/useMarkupToHtml.js
+ElectronClient/gui/NoteEditor/utils/useMessageHandler.js
+ElectronClient/gui/NoteEditor/utils/useNoteSearchBar.js
+ElectronClient/gui/NoteEditor/utils/usePluginServiceRegistration.js
+ElectronClient/gui/NoteEditor/utils/useSearchMarkers.js
+ElectronClient/gui/NoteEditor/utils/useWindowCommandHandler.js
+ElectronClient/gui/NoteList/commands/focusElementNoteList.js
+ElectronClient/gui/NoteList/NoteList.js
+ElectronClient/gui/NoteListControls/commands/focusSearch.js
+ElectronClient/gui/NoteListControls/NoteListControls.js
+ElectronClient/gui/NoteListItem.js
+ElectronClient/gui/NoteTextViewer.js
+ElectronClient/gui/NoteToolbar/NoteToolbar.js
+ElectronClient/gui/OneDriveLoginScreen.js
+ElectronClient/gui/ResizableLayout/hooks/useLayoutItemSizes.js
+ElectronClient/gui/ResizableLayout/hooks/useWindowResizeEvent.js
+ElectronClient/gui/ResizableLayout/ResizableLayout.js
+ElectronClient/gui/ResourceScreen.js
+ElectronClient/gui/Root_UpgradeSyncTarget.js
+ElectronClient/gui/Root.js
+ElectronClient/gui/SearchBar/hooks/useSearch.js
+ElectronClient/gui/SearchBar/SearchBar.js
+ElectronClient/gui/SearchBar/styles/index.js
+ElectronClient/gui/ShareNoteDialog.js
+ElectronClient/gui/SideBar/commands/focusElementSideBar.js
+ElectronClient/gui/SideBar/SideBar.js
+ElectronClient/gui/SideBar/styles/index.js
+ElectronClient/gui/StatusScreen/StatusScreen.js
+ElectronClient/gui/style/StyledInput.js
+ElectronClient/gui/style/StyledTextInput.js
+ElectronClient/gui/TagList.js
+ElectronClient/gui/ToggleEditorsButton/styles/index.js
+ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.js
+ElectronClient/gui/ToolbarBase.js
+ElectronClient/gui/ToolbarButton/styles/index.js
+ElectronClient/gui/ToolbarButton/ToolbarButton.js
+ElectronClient/gui/utils/NoteListUtils.js
+ElectronClient/InteropServiceHelper.js
+ElectronClient/plugins/GotoAnything.js
+ElectronClient/services/bridge.js
+ElectronClient/services/commands/types.js
+ElectronClient/services/plugins/hooks/useThemeCss.js
+ElectronClient/services/plugins/hooks/useViewIsReady.js
+ElectronClient/services/plugins/PlatformImplementation.js
+ElectronClient/services/plugins/PluginRunner.js
+ElectronClient/services/plugins/UserWebview.js
+ElectronClient/services/plugins/UserWebviewDialog.js
+ElectronClient/services/plugins/UserWebviewDialogButtonBar.js
+ReactNativeClient/lib/AsyncActionQueue.js
+ReactNativeClient/lib/BaseApplication.js
+ReactNativeClient/lib/checkPermissions.js
+ReactNativeClient/lib/commands/historyBackward.js
+ReactNativeClient/lib/commands/historyForward.js
+ReactNativeClient/lib/commands/synchronize.js
+ReactNativeClient/lib/components/BackButtonDialogBox.js
+ReactNativeClient/lib/components/CameraView.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnMessage.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useSource.js
+ReactNativeClient/lib/components/NoteBodyViewer/NoteBodyViewer.js
+ReactNativeClient/lib/components/screens/Note.js
+ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
+ReactNativeClient/lib/components/SelectDateTimeDialog.js
+ReactNativeClient/lib/errorUtils.js
+ReactNativeClient/lib/eventManager.js
+ReactNativeClient/lib/fs-driver-node.js
+ReactNativeClient/lib/hooks/useEffectDebugger.js
+ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
+ReactNativeClient/lib/hooks/usePrevious.js
+ReactNativeClient/lib/hooks/usePropsDebugger.js
+ReactNativeClient/lib/InMemoryCache.js
+ReactNativeClient/lib/joplin-renderer/MarkupToHtml.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/code_inline.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fountain.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/highlight_keywords.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/html_image.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/image.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/katex.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/link_open.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
+ReactNativeClient/lib/joplin-renderer/noteStyle.js
+ReactNativeClient/lib/joplin-renderer/pathUtils.js
+ReactNativeClient/lib/JoplinServerApi.js
+ReactNativeClient/lib/locale.js
+ReactNativeClient/lib/Logger.js
+ReactNativeClient/lib/markdownUtils.js
+ReactNativeClient/lib/markupLanguageUtils.js
+ReactNativeClient/lib/models/Alarm.js
+ReactNativeClient/lib/models/Setting.js
+ReactNativeClient/lib/ntpDate.js
+ReactNativeClient/lib/path-utils.js
+ReactNativeClient/lib/PoorManIntervals.js
+ReactNativeClient/lib/reducer.js
+ReactNativeClient/lib/services/AlarmService.js
+ReactNativeClient/lib/services/AlarmServiceDriver.android.js
+ReactNativeClient/lib/services/AlarmServiceDriver.ios.js
+ReactNativeClient/lib/services/AlarmServiceDriverNode.js
+ReactNativeClient/lib/services/BaseService.js
+ReactNativeClient/lib/services/commands/commandsToMarkdownTable.js
+ReactNativeClient/lib/services/commands/MenuUtils.js
+ReactNativeClient/lib/services/commands/propsHaveChanged.js
+ReactNativeClient/lib/services/commands/stateToWhenClauseContext.js
+ReactNativeClient/lib/services/commands/ToolbarButtonUtils.js
+ReactNativeClient/lib/services/CommandService.js
+ReactNativeClient/lib/services/contextkey/contextkey.js
+ReactNativeClient/lib/services/debug/populateDatabase.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Base.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Custom.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Html.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Jex.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Md.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Raw.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Base.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Custom.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_EnexToHtml.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_EnexToMd.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Jex.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Md.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Raw.js
+ReactNativeClient/lib/services/interop/InteropService.js
+ReactNativeClient/lib/services/interop/types.js
+ReactNativeClient/lib/services/keychain/KeychainService.js
+ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js
+ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js
+ReactNativeClient/lib/services/keychain/KeychainServiceDriver.node.js
+ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js
+ReactNativeClient/lib/services/KeymapService.js
+ReactNativeClient/lib/services/plugins/api/Global.js
+ReactNativeClient/lib/services/plugins/api/Joplin.js
+ReactNativeClient/lib/services/plugins/api/JoplinCommands.js
+ReactNativeClient/lib/services/plugins/api/JoplinData.js
+ReactNativeClient/lib/services/plugins/api/JoplinFilters.js
+ReactNativeClient/lib/services/plugins/api/JoplinInterop.js
+ReactNativeClient/lib/services/plugins/api/JoplinPlugins.js
+ReactNativeClient/lib/services/plugins/api/JoplinSettings.js
+ReactNativeClient/lib/services/plugins/api/JoplinViews.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsDialogs.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsMenuItems.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsMenus.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsPanels.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsToolbarButtons.js
+ReactNativeClient/lib/services/plugins/api/JoplinWorkspace.js
+ReactNativeClient/lib/services/plugins/api/types.js
+ReactNativeClient/lib/services/plugins/BasePluginRunner.js
+ReactNativeClient/lib/services/plugins/MenuController.js
+ReactNativeClient/lib/services/plugins/MenuItemController.js
+ReactNativeClient/lib/services/plugins/Plugin.js
+ReactNativeClient/lib/services/plugins/PluginService.js
+ReactNativeClient/lib/services/plugins/reducer.js
+ReactNativeClient/lib/services/plugins/sandboxProxy.js
+ReactNativeClient/lib/services/plugins/ToolbarButtonController.js
+ReactNativeClient/lib/services/plugins/utils/contentScriptsToRendererRules.js
+ReactNativeClient/lib/services/plugins/utils/createViewHandle.js
+ReactNativeClient/lib/services/plugins/utils/executeSandboxCall.js
+ReactNativeClient/lib/services/plugins/utils/manifestFromObject.js
+ReactNativeClient/lib/services/plugins/utils/mapEventHandlersToIds.js
+ReactNativeClient/lib/services/plugins/utils/types.js
+ReactNativeClient/lib/services/plugins/ViewController.js
+ReactNativeClient/lib/services/plugins/WebviewController.js
+ReactNativeClient/lib/services/ResourceEditWatcher/index.js
+ReactNativeClient/lib/services/ResourceEditWatcher/reducer.js
+ReactNativeClient/lib/services/rest/actionApi.desktop.js
+ReactNativeClient/lib/services/rest/Api.js
+ReactNativeClient/lib/services/rest/errors.js
+ReactNativeClient/lib/services/searchengine/filterParser.js
+ReactNativeClient/lib/services/searchengine/queryBuilder.js
+ReactNativeClient/lib/services/SettingUtils.js
+ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
+ReactNativeClient/lib/services/synchronizer/LockHandler.js
+ReactNativeClient/lib/services/synchronizer/MigrationHandler.js
+ReactNativeClient/lib/services/synchronizer/migrations/1.js
+ReactNativeClient/lib/services/synchronizer/migrations/2.js
+ReactNativeClient/lib/services/synchronizer/utils/types.js
+ReactNativeClient/lib/services/UndoRedoService.js
+ReactNativeClient/lib/services/WhenClause.js
+ReactNativeClient/lib/ShareExtension.js
+ReactNativeClient/lib/shareHandler.js
+ReactNativeClient/lib/shim.js
+ReactNativeClient/lib/Synchronizer.js
+ReactNativeClient/lib/theme.js
+ReactNativeClient/lib/themes/aritimDark.js
+ReactNativeClient/lib/themes/dark.js
+ReactNativeClient/lib/themes/dracula.js
+ReactNativeClient/lib/themes/light.js
+ReactNativeClient/lib/themes/nord.js
+ReactNativeClient/lib/themes/oledDark.js
+ReactNativeClient/lib/themes/solarizedDark.js
+ReactNativeClient/lib/themes/solarizedLight.js
+ReactNativeClient/lib/themes/type.js
+ReactNativeClient/lib/uuid.js
+ReactNativeClient/lib/versionInfo.js
+ReactNativeClient/PluginAssetsLoader.js
+ReactNativeClient/setUpQuickActions.js
+# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD

.travis.yml

@@ -0,0 +1,116 @@
+# Only build tags (Doesn't work - doesn't build anything)
+if: tag IS present OR type = pull_request
+
+rvm: 2.3.3
+
+# It's important to only build production branches otherwise Electron Builder
+# might take assets from dev branches and overwrite those of production.
+# https://docs.travis-ci.com/user/customizing-the-build/#Building-Specific-Branches
+branches:
+  only:
+    - master
+    - dev
+    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode9.0
+      language: node_js
+      node_js: "10"
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+
+    - os: linux
+      sudo: required
+      dist: trusty
+      language: node_js
+      node_js: "10"
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+
+# cache:
+#   directories:
+#   - node_modules
+#   - $HOME/.cache/electron
+#   - $HOME/.cache/electron-builder
+ 
+before_install:
+  # HOMEBREW_NO_AUTO_UPDATE needed so that Homebrew doesn't upgrade to the next
+  # version, which requires Ruby 2.3, which is not available on the Travis VM.
+
+  # Silence apt-get update errors (for example when a module doesn't exist) since
+  # otherwise it will make the whole build fails, even though all we need is yarn.
+
+  # libsecret-1-dev is required for keytar - https://github.com/atom/node-keytar
+  - |
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install yarn
+    else
+      curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+      echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+      sudo apt-get update || true
+      sudo apt-get install -y yarn
+      sudo apt-get install -y gettext
+      sudo apt-get install -y libsecret-1-dev
+    fi
+
+script:
+  - |
+    # Install tools
+    npm install
+    cd Tools
+    npm install
+    cd ..
+
+    # Run test units.
+    # Only do it for pull requests because Travis randomly fails to run them
+    # and that would break the desktop release.
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      cd CliClient
+      npm run test-ci
+      testResult=$?
+      if [ $testResult -ne 0 ]; then
+        exit $testResult
+      fi
+      cd ..
+    fi
+
+    # Run linter for pull requests only - this is so that
+    # bypassing eslint is allowed for urgent fixes.
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      npm run linter-ci ./
+      testResult=$?
+      if [ $testResult -ne 0 ]; then
+        exit $testResult
+      fi
+    fi
+
+    # Validate translations - this is needed as some users manually
+    # edit .po files (and often make mistakes) instead of using a proper
+    # tool like poedit. Doing it for Linux only is sufficient.
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      if [ "$TRAVIS_OS_NAME" != "osx" ]; then
+        node Tools/validate-translation.js
+        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
+    # builing PRs so we disable it in this case. The Linux build should provide
+    # enough info if the app builds or not.
+    # https://github.com/electron-userland/electron-builder/issues/4263
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+        exit 0
+      fi
+    fi
+
+    # Prepare the Electron app and build it
+    cd ElectronClient
+    USE_HARD_LINKS=false npm run dist

Assets/LICENSE

@@ -1,3 +0,0 @@
-All assets in this directory including, but not limited to, logos, icons
-and images are copyright (c) Laurent Cozic, all rights reserved.
-They may not be used without a permission.

Assets/PluginDocTheme/helpers/index.js

@@ -1,37 +0,0 @@
-function camelCaseToDots(s) {
-	const output = [];
-	for (let i = 0; i < s.length; i++) {
-		const c = s[i];
-		if (c === c.toLowerCase() || i === 0) {
-			output.push(c.toLowerCase());
-		} else {
-			output.push('.');
-			output.push(c.toLowerCase());
-		}
-	}
-
-	return output.join('');
-}
-
-module.exports = {
-	jpFormatClassName: function(className) {
-		if (className.indexOf('Joplin') !== 0 || className.indexOf(' ') >= 0) return className;
-
-		const p = className.substr(6);
-		if (p === '') return 'joplin';
-
-		return `joplin.${camelCaseToDots(p)
-			.replace(/menu\.items/, 'menuItems')
-			.replace(/toolbar\.buttons/, 'toolbarButtons')
-			.replace(/content\.scripts/, 'contentScripts')}`;
-	},
-
-	jpIsAllowedGroup: function(name) {
-		return name !== 'Constructors';
-	},
-
-	jsIsNotKindVariable: function(classes) {
-		if (!classes) return true;
-		return classes.indexOf('tsd-kind-variable') < 0;
-	},
-};

Assets/TinyMCE/IconPack/gulpfile.js

@@ -1,27 +0,0 @@
-const iconPackager = require('@ephox/oxide-icons-tools').iconPackager;
-const clean = require('gulp-clean');
-const gulp = require('gulp');
-const fs = require('fs');
-
-gulp.task('icon-packager', function() {
-	const contents = fs.readFileSync('package.json');
-	const name = JSON.parse(contents).iconPackName;
-
-	return gulp.src('src/svg/**/*.svg')
-		.pipe(iconPackager({ name }))
-		.pipe(gulp.dest('dist'));
-});
-
-gulp.task('deploy', function() {
-	fs.copyFileSync(`${__dirname}/dist/icons/Joplin/icons.js`, `${__dirname}/../../../packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/icons.js`);
-	return Promise.resolve();
-});
-
-gulp.task('clean', function() {
-	return gulp.src('./dist', {
-		read: false,
-		allowEmpty: true,
-	}).pipe(clean());
-});
-
-gulp.task('default', gulp.series('clean', 'icon-packager', 'deploy'));

Assets/TinyMCE/JoplinLists/README.md

@@ -1,13 +0,0 @@
-# TinyMCE Joplin Lists Plugin
-
-**As of 2020-11-02 this module no longer builds (a ton of TypeScript errors). No idea why since nothing was changed but should be investigated if modifying this plugin is ever needed.**
-
-This is based on https://github.com/tinymce/tinymce/tree/59748a11303fb7cf00fdb8c9392dcb082ee9d965/modules/tinymce/src/plugins/lists
-
-But with support for Joplin checkboxes.
-
-## Building
-
-Use `npm i && npm run build` to build the plugin, which will also copy the compiled version to the right packages/app-desktop sub-directory.
-
-To test the plugin, use `npm run buildAndStart`, which will build the plugin and start the desktop application.

Assets/TinyMCE/JoplinLists/package.json

@@ -1,54 +0,0 @@
-{
-  "name": "joplin-tinymce-lists",
-  "version": "1.0.0",
-  "description": "",
-  "scripts": {
-    "prepublishOnly": "npm run lint && npm run build",
-    "lint": "tslint src/**/*.ts",
-    "build": "grunt",
-    "test": "bedrock-auto -b phantomjs -d src/test/ts/",
-    "test-manual": "bedrock -d src/test/ts/",
-    "start": "grunt webpack",
-    "buildAndStart": "yarn build && cd .. && cd .. && cd .. && cd packages/app-desktop && npm start"
-  },
-  "keywords": [],
-  "author": "Tiny Technologies Inc.",
-  "devDependencies": {
-    "@ephox/agar": "latest",
-    "@ephox/bedrock": "latest",
-    "@ephox/mcagar": "latest",
-    "@ephox/swag": "latest",
-    "@ephox/tslint-rules": "latest",
-    "awesome-typescript-loader": "^5.2.1",
-    "grunt": "^1.0.4",
-    "grunt-contrib-clean": "^2.0.0",
-    "grunt-contrib-concat": "^1.0.1",
-    "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-uglify": "^4.0.0",
-    "grunt-shell": "^2.1.0",
-    "grunt-tslint": "^5.0.2",
-    "grunt-webpack": "^3.1.3",
-    "load-grunt-tasks": "^4.0.0",
-    "tinymce": "latest",
-    "ts-loader": "^5.3.0",
-    "tslib": "^1.9.3",
-    "tslint": "^5.11.0",
-    "typescript": "^3.1.6",
-    "webpack": "^4.25.1",
-    "webpack-livereload-plugin": "^2.1.1"
-  },
-  "files": [
-    "lib/main",
-    "lib/demo",
-    "lib/test",
-    "src",
-    "tsconfig.json",
-    "readme.md",
-    "LEGAL.txt",
-    "LICENSE.txt"
-  ],
-  "main": "./lib/main/ts/api/Main.js",
-  "module": "./lib/main/ts/api/Main.js",
-  "types": "./lib/main/ts/api/Main.d.ts",
-  "license": "Apache-2.0"
-}

Assets/WebsiteAssets/css/site.css

@@ -1,916 +0,0 @@
-html {
-	/* https://css-tricks.com/fixed-headers-on-page-links-and-overlapping-content-oh-my/ */
-	scroll-padding-top: 110px;
-}
-
-* {
-	outline: none;
-	font-family: "Montserrat", sans-serif;
-}
-
-html,
-body {
-	overflow-x: hidden;
-	font-size: 16px;
-}
-
-a {
-	text-decoration: none;
-}
-
-#main-container {
-	position: relative;
-	min-height: 100vh;
-	padding-bottom: 225px;
-}
-
-.fw400 {
-	font-weight: 400;
-}
-
-.fw500 {
-	font-weight: 500;
-}
-
-.fw600 {
-	font-weight: 600;
-}
-
-.fw700 {
-	font-weight: 700;
-}
-
-.ml-20 {
-	margin-left: 20px !important;
-}
-
-.ml-30 {
-	margin-left: 30px;
-}
-
-.pointer {
-	cursor: pointer;
-}
-
-.blue-bg {
-	background-color: rgb(4, 56, 115);
-}
-
-.blue-bg * {
-	color: #fff;
-}
-
-.white-bg {
-	background-color: #fff;
-}
-
-.darkblue-bg {
-	background-color: #072445;
-}
-
-.gray-bg {
-	background-color: #f7fbff;
-}
-
-.light-blue,
-.light-blue * {
-	color: #90b1d9;
-}
-
-.img-center {
-	display: block;
-	margin: auto;
-}
-
-.text-right {
-	text-align: right;
-}
-
-.text-left {
-	text-align: left;
-}
-
-.small {
-	font-size: 16px !important;
-}
-
-a.heading-anchor {
-	display: inline-block;
-	opacity: 0;
-	width: 1.3em;
-	font-size: 0.7em;
-	margin-left: 0.4em;
-	line-height: 1em;
-	text-decoration: none;
-	transition: opacity 0.3s;
-}
-a.heading-anchor:hover,
-h1:hover a.heading-anchor,
-h2:hover a.heading-anchor,
-h3:hover a.heading-anchor,
-h4:hover a.heading-anchor,
-h5:hover a.heading-anchor,
-h6:hover a.heading-anchor {
-	opacity: 1;
-}
-
-.container-fluid {
-	padding-left: 0px;
-	padding-right: 0px;
-}
-
-.img-fluid {
-	image-rendering: -moz-crisp-edges; /* Firefox */
-	image-rendering: -o-crisp-edges; /* Opera */
-	image-rendering: -webkit-optimize-contrast; /* Webkit (non-standard naming) */
-	image-rendering: crisp-edges;
-	-ms-interpolation-mode: nearest-neighbor; /* IE (non-standard property) */
-}
-
-img[align="left"] {
-	margin-right: 10px;
-	margin-bottom: 10px;
-}
-
-h1 {
-	font-size: 2em;
-	margin-bottom: 0.7em;
-	margin-top: 1.2em;
-	/* line-height: 70.4px;
-	font-weight: 700;
-	margin-bottom: 20px; */
-}
-h2 {
-	font-size: 1.5em;
-	margin-bottom: 0.6em;
-	margin-top: 1.1em;
-	border-bottom: 1px solid #ddd;
-	line-height: 2em;
-	/* line-height: 57.6px;
-	font-weight: 600;
-	margin-bottom: 20px; */
-}
-
-p,
-.button-link {
-	/* font-size: 22px; */
-	line-height: 30.8px;
-	font-weight: 400;
-	text-decoration: none;
-	color: #32363f;
-}
-
-.button-link {
-	text-align: center;
-	min-width: 300px;
-	display: inline-block;
-	font-weight: 500;
-	border: solid 1px #fff;
-	border-radius: 40px;
-	padding: 20px 30px;
-	color: #fff;
-}
-
-.button-link:hover,
-.button-link:focus {
-	color: #fff;
-}
-
-.btn-blue {
-	background-color: #4f9cf9;
-	color: #fff !important;
-	border-color: transparent;
-}
-
-.btn-blue:hover {
-	text-decoration: none !important;
-}
-
-.btn-white {
-	background-color: #fff;
-	border-color: #4f9cf9;
-	color: #4f9cf9;
-}
-
-.btn-white:hover,
-.btn-white:focus {
-	color: #4f9cf9;
-}
-
-.frame-bg {
-	background-size: contain;
-	background-position: bottom;
-	background-repeat: no-repeat;
-	padding-bottom: 15px;
-}
-
-.frame-bg-blue {
-	background-image: url("../images/frame-blue.png");
-}
-.frame-bg-blue-lg {
-	background-image: url("../images/frame-blue-lg.png");
-}
-.frame-bg-yellow {
-	background-image: url("../images/frame-yellow.png");
-}
-.frame-bg-yellow-lg {
-	background-image: url("../images/frame-yellow-lg.png");
-}
-
-/** menu **/
-#nav-section {
-	padding-top: 15px;
-	padding-bottom: 15px;
-	position: fixed;
-	width: 100%;
-	z-index: 9;
-}
-#nav-section a {
-	display: inline-block;
-	margin-left: 50px;
-	text-decoration: none;
-}
-
-#nav-section a:hover,
-#nav-section a:focus {
-	color: #fff;
-	text-decoration: underline;
-}
-
-#nav-section.white-bg a {
-	color: #0557ba;
-}
-
-#nav-section.white-bg a:hover,
-#nav-section.white-bg a:focus {
-	color: #0557ba;
-	text-decoration: underline;
-}
-
-#nav-section .button-link {
-	padding: 15px;
-	min-width: 200px;
-	text-decoration: none;
-}
-
-#nav-section {
-	box-shadow: 0 3px 11px 0 rgba(0,0,0,0.1);
-}
-
-.nav-item .download-btn:hover,
-.nav-item .download-btn:focus {
-	text-decoration: none;
-}
-
-#nav-section .row {
-	align-items: center;
-}
-
-/* top-section  */
-
-#top-section {
-	background-image: url("../images/top-left-bg.png"),
-		url("../images/top-right-bg.png");
-	background-repeat: no-repeat, no-repeat;
-	background-position: left, right bottom;
-	background-size: contain;
-	padding-top: 150px;
-}
-
-#top-section .frame-bg {
-	padding-bottom: 5px;
-}
-
-#logo-logo {
-	width: 180px;
-}
-
-#top-section-text {
-	max-width: 600px;
-	margin: auto;
-}
-
-#top-section-img {
-	margin-bottom: -280px;
-	margin-top: 70px;
-}
-
-.main-content {
-	flex: 1;
-}
-
-/* multimedia-section  */
-#multimedia-notes-section {
-	padding-top: 280px;
-	padding-bottom: 50px;
-	background-image: url("../images/multimedia-note-bg.png");
-	background-repeat: no-repeat;
-	background-position: left;
-	background-size: contain;
-}
-
-#multimedia-title {
-	margin-top: 100px;
-}
-
-#multimedia-text {
-	max-width: 540px;
-}
-
-/* work-together-section  */
-#work-together-section {
-	padding-top: 100px;
-	padding-bottom: 100px;
-	background-image: url("../images/work-together-bg.png");
-	background-position: left;
-	background-repeat: no-repeat;
-	background-size: contain;
-}
-
-/* save-web-section  */
-#save-web-section {
-	padding-top: 80px;
-	padding-bottom: 80px;
-	background-image: url("../images/save-web-bg.png");
-	background-repeat: no-repeat;
-	background-size: cover;
-	background-position: left bottom;
-}
-
-#save-web-title {
-	margin-top: 50px;
-}
-
-/* customise-it-section  */
-#customise-it-section {
-	padding-top: 120px;
-	padding-bottom: 150px;
-	background-image: url("../images/customise-it-bg.png");
-	background-position: 100% 80%;
-	background-repeat: no-repeat;
-	background-size: contain;
-}
-
-#customise-it-title {
-	margin-top: 50px;
-}
-
-/* your-data-section  */
-#your-data-section {
-	padding-top: 180px;
-	padding-bottom: 100px;
-}
-
-/* in-the-press-section  */
-#in-the-press-section {
-	padding-top: 180px;
-	padding-bottom: 100px;
-	background-image: url("../images/in-the-web-bg.png");
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: auto;
-}
-
-#in-the-press-section .carousel-item {
-	min-height: 500px;
-}
-
-#in-the-press-section .carousel-caption {
-	left: 0;
-	right: 0;
-}
-
-#in-the-press-section .carousel-indicators [data-bs-target] {
-	background: #4f9cf9;
-	border-radius: 50px;
-	width: 25px;
-	height: 25px;
-	border: none;
-}
-
-.bottom-links {
-	display: flex;
-	justify-content: center;
-	border-top: 1px solid #d4d4d4;
-	margin-top: 30px;
-	padding-top: 25px;
-}
-
-/* TOC */
-
-#toc ul {
-	margin-bottom: 10px;
-}
-#toc > ul > li {
-	margin-bottom: 10px;
-}
-#toc {
-	padding-bottom: 1em;
-	display: none;
-}
-
-@media (min-width: 767px) {
-	.content-wrapper{
-		display: flex;
-	}
-
-	#toc{
-		display: block!important;
-		align-self: flex-start;
-		width: 300px;
-		position: sticky; top: 20px; left: 0;            
-	}
-
-	.main-content{
-		width: calc(100% - 300px);
-	}
-}
-
-/* your-note-section  */
-#your-note-section {
-	padding-top: 50px;
-	padding-bottom: 0px;
-	background-image: url("../images/your-note-bg.png");
-	background-position: left;
-	background-repeat: no-repeat;
-}
-
-#your-note-text {
-	max-width: 620px;
-	margin: auto;
-}
-
-#your-note-section .button-link {
-	margin-bottom: 10px;
-}
-
-/* price page */
-.page-container {
-	padding-top: 100px;
-	padding-bottom: 50px;
-}
-
-.price-container {
-	border: 1px solid #4f9cf9;
-	box-sizing: border-box;
-	border-radius: 20px;
-	padding: 30px 20px;
-	padding-bottom: 30px;
-	margin-bottom: 50px;
-	margin-top: 60px;
-	min-height: 645px;
-}
-
-.price-container p {
-	font-size: 16px;
-}
-
-.price-container p.plan-type {
-	font-size: 22px;
-}
-
-.price-container .plan-type img {
-	width: 65px;
-}
-
-.price-container p.price {
-	font-size: 30px;
-	margin-top: -10px;
-}
-
-.price-container p.unchecked-text {
-	color: #9db8d9;
-}
-
-.price-container p {
-	font-size: 16px;
-}
-
-.price-container-blue {
-	background: linear-gradient(251.85deg, #0b4f99 -11.85%, #002d61 104.73%);
-	box-shadow: 0px 4px 16px rgba(105, 132, 172, 0.13);
-	margin-top: 30px;
-	min-height: 710px;
-	padding-top: 60px;
-}
-
-.price-container-blue p {
-	color: #fff;
-}
-
-/* footer section  */
-footer {
-	padding-top: 50px;
-	padding-bottom: 30px;
-	position: absolute;
-	bottom: 0;
-	width: 100%;
-}
-
-footer a,
-footer p {
-	color: #90b1d9;
-	text-decoration: none;
-}
-
-footer a:hover {
-	color: #90b1d9;
-	text-decoration: underline;
-}
-
-footer hr {
-	background-color: #0d3562;
-	margin: 25px 0px;
-}
-
-footer .button-link {
-	min-width: inherit;
-	padding: 12px 22px;
-	font-size: 18px;
-	margin-top: -12px;
-}
-
-footer .right-links a {
-	margin-left: 15px;
-}
-
-/* responsive */
-@media (min-width: 1200px) and (max-width: 1799px) {
-	#nav-section a {
-		margin-left: 80px;
-	}
-
-	#your-note-section {
-		background-size: contain;
-		background-position: bottom;
-	}
-}
-
-@media (min-width: 768px) and (max-width: 1199px) {
-	#nav-section a {
-		margin-left: 30px;
-	}
-
-	#nav-section.with-profile a {
-		margin-left: 20px;
-	}
-
-	#nav-section .button-link {
-		padding: 8px;
-		min-width: 160px;
-		text-decoration: none;
-	}
-
-	/* h1 {
-		font-size: 44px;
-	}
-
-	h2 {
-		font-size: 30px;
-		line-height: 40px;
-	} */
-
-	/* p,
-	.button-link {
-		font-size: 16px;
-	} */
-
-	.button-link {
-		min-width: 200px;
-		padding: 15px 22px;
-	}
-
-	#top-section,
-	#save-web-section,
-	#your-note-section {
-		background-image: inherit;
-	}
-
-	#top-section-img {
-		margin-bottom: -154px;
-		margin-top: 30px;
-	}
-
-	#work-together-section,
-	#save-web-section,
-	#customise-it-section,
-	#your-data-section,
-	#in-the-press-section,
-	#your-note-section {
-		padding-top: 50px;
-		padding-bottom: 50px;
-	}
-
-	#your-note-section {
-		padding-bottom: 20px;
-	}
-
-	#save-web-title,
-	#customise-it-title {
-		margin-top: 0px;
-	}
-
-	#multimedia-notes-section {
-		padding-top: 200px;
-	}
-	#multimedia-title {
-		margin-top: 20px;
-	}
-
-	footer .button-link {
-		padding: 10px 15px;
-		font-size: 16px;
-	}
-}
-
-@media (min-width: 1700px) {
-	#price-section {
-		background-image: url("../images/price-bg-left.png"),
-			url("../images/price-bg-right.png");
-		background-repeat: no-repeat, no-repeat;
-		background-position: left, right;
-		background-size: contain;
-	}
-}
-
-@media (min-width: 1400px) {
-	.container {
-		max-width: 1250px;
-	}
-
-	.price-container .plan-type img {
-		width: 85px;
-	}
-
-	.price-container p.price {
-		margin-top: 0px;
-	}
-
-	/* #top-section-img,
-	#multimedia-notes-section-img,
-	#save-web-img {
-		max-width: none;
-	}*/
-}
-
-@media (min-width: 992px) and (max-width: 1200px) {
-	.price-container-blue {
-		min-height: 785px;
-	}
-
-	.price-container .plan-type img {
-		width: 55px;
-	}
-
-	.price-container p.plan-type {
-		font-size: 18px;
-	}
-	.price-container p.price {
-		font-size: 20px;
-		margin-top: -20px;
-	}
-}
-
-@media (max-width: 991px) {
-	.frame-bg {
-		padding-bottom: 8px;
-	}
-
-	#work-together-section {
-		padding-bottom: 0px;
-	}
-	.price-container {
-		max-width: 400px;
-		margin: auto;
-		margin-bottom: 20px;
-		margin-top: 20px;
-		min-height: inherit;
-	}
-	.price-container-blue {
-		padding: 30px 20px;
-	}
-
-	#in-the-press-section .carousel-item {
-		min-height: 600px;
-	}
-}
-
-@media (max-width: 767px) {
-	#main-container {
-		position: relative;
-		min-height: 100vh;
-		padding-bottom: 415px;
-	}
-
-	/* h1 {
-		font-size: 34px;
-		line-height: 37.4px;
-	}
-	h2 {
-		font-size: 28px;
-		line-height: 33.6px;
-	} */
-	/* p {
-		font-size: 16px;
-		line-height: 25.6px;
-	} */
-
-	.ml-mobile-0 {
-		margin-left: 0px;
-	}
-
-	.button-link {
-		display: block;
-		min-width: inherit;
-		width: 100%;
-		max-width: 400px;
-		margin: auto;
-		padding: 12px 20px;
-	}
-
-	.img-fluid {
-		margin: auto;
-	}
-
-	.text-center-sm {
-		text-align: center !important;
-	}
-
-	#top-section,
-	#multimedia-notes-section,
-	#work-together-section,
-	#your-note-section {
-		background-image: inherit;
-	}
-
-	#nav-section {
-		padding-top: 20px;
-		padding-bottom: 20px;
-	}
-
-	#top-logo {
-		width: 100px;
-	}
-
-	#menu-mobile {
-		display: flex;
-		flex-direction: column;
-		background-color: #fff;
-		width: 300px;
-		border-top-left-radius: 10px;
-		border-bottom-left-radius: 10px;
-		position: fixed;
-		right: 0;
-		top: 0;
-		height: 100%;
-		padding: 20px 5px 20px 20px;
-		padding-top: 0;
-		margin-right: -300px;
-		box-shadow: -3px 0px 11px 0 rgba(0,0,0,0.1);
-	}
-
-	#toc-mobile {
-		overflow-y: scroll;
-		text-align: left;
-	}
-
-	#toc-mobile ul li a {
-		margin-left: 5px;
-	}
-
-	#toc-mobile ul {
-		list-style-type: none;
-		padding-left: 0;
-	}
-
-	#toc-mobile ul > li > p {
-		font-weight: bold;
-		text-align: center;
-		margin-top: 1em;
-	}
-
-	#toc-mobile ul > li > ul > li {
-		font-weight: normal;
-		margin-bottom: 0.5em;
-	}
-
-	.mobile-menu-link {
-		color: #32363f;
-		width: 100%;
-		display: block !important;
-		padding: 15px 0px;
-		border-bottom: solid 1px #d6e2ef;
-		font-size: 16px;
-		margin: 0px !important;
-	}
-
-	.mobile-menu-link:hover,
-	.mobile-menu-link:focus {
-		color: #32363f !important;
-		text-decoration: none !important;
-	}
-
-	#menu-mobile .button-link {
-		padding: 10px;
-		font-size: 16px;
-		margin-left: 0px;
-	}
-
-	.mobile-menu-link-bottom {
-		font-size: 12px;
-		margin-top: 20px;
-	}
-
-	.mobile-menu-link-bottom a {
-		margin-left: 0px !important;
-	}
-
-	#top-section,
-	.page-container {
-		padding-top: 120px;
-	}
-
-	#top-section-img {
-		margin-bottom: -90px;
-		margin-top: 50px;
-	}
-
-	#work-together-section {
-		padding-top: 100px;
-		padding-bottom: 0px;
-	}
-
-	#multimedia-notes-section {
-		padding-top: 30px;
-	}
-	#save-web-section,
-	#customise-it-section,
-	#your-data-section {
-		padding-top: 30px;
-		padding-bottom: 50px;
-		background-image: inherit;
-	}
-
-	#your-note-section .button-link {
-		margin-bottom: 0px;
-	}
-
-	#in-the-press-section {
-		padding-top: 30px;
-		padding-bottom: 50px;
-	}
-
-	#in-the-press-section .carousel {
-		margin-top: -50px;
-	}
-
-	#in-the-press-section .carousel-item {
-		min-height: 480px;
-	}
-
-	footer {
-		padding-top: 30px;
-		padding-bottom: 30px;
-	}
-}
-
-@media (max-width: 576px) {
-	#in-the-press-section .carousel {
-		margin-top: -20px;
-	}
-}
-
-@media (max-width: 400px) {
-	#top-section {
-		background-image: url("../images/top-bg-mobile.png");
-		background-position: bottom;
-		padding-bottom: 160px;
-	}
-	#top-section-img {
-		margin-bottom: -240px;
-		margin-top: 130px;
-	}
-	#save-web-section {
-		background-image: url("../images/save-web-bg-mobile.png");
-		background-position: bottom;
-	}
-	#your-note-section {
-		background-image: url("../images/your-note-bg-mobile.png");
-		background-position: bottom;
-		padding-bottom: 170px;
-		background-size: contain;
-	}
-
-	.price-container p.plan-type {
-		font-size: 16px;
-	}
-
-	.price-container .plan-type img {
-		width: 45px;
-	}
-
-	.price-container p.price {
-		font-size: 18px;
-		margin-top: -15p;
-	}
-}

Assets/WebsiteAssets/images/apple-icon.svg

@@ -1,11 +0,0 @@
-<svg width="33" height="33" viewBox="0 0 33 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path d="M22.6857 0C20.9264 0.121687 18.8701 1.24781 17.6718 2.71423C16.5787 4.04454 15.6795 6.0204 16.0301 7.94058C17.9523 8.00039 19.9385 6.84746 21.0894 5.35628C22.166 3.96823 22.9807 2.00474 22.6857 0Z" fill="white"/>
-<path d="M29.6386 11.2903C27.9494 9.17211 25.5755 7.94287 23.3335 7.94287C20.3739 7.94287 19.1219 9.3598 17.0656 9.3598C14.9454 9.3598 13.3346 7.947 10.7751 7.947C8.26088 7.947 5.58377 9.48355 3.88634 12.1112C1.50004 15.8113 1.90842 22.768 5.77558 28.6936C7.15951 30.8138 9.0075 33.198 11.4247 33.2187C13.5759 33.2393 14.1823 31.8389 17.0966 31.8244C20.0109 31.8079 20.5636 33.2372 22.7107 33.2145C25.13 33.196 27.079 30.5539 28.4629 28.4337C29.455 26.9136 29.8242 26.1485 30.5935 24.4325C24.998 22.3019 24.1008 14.3448 29.6386 11.2903Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="33" height="33" fill="white"/>
-</clipPath>
-</defs>
-</svg>

Assets/WebsiteAssets/images/badges/Donate-IBAN.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="86" height="20" role="img" aria-label="Donate: IBAN"><title>Donate: IBAN</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="86" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="49" height="20" fill="#555"/><rect x="49" width="37" height="20" fill="#007ec6"/><rect width="86" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="255" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="390">Donate</text><text x="255" y="140" transform="scale(.1)" fill="#fff" textLength="390">Donate</text><text aria-hidden="true" x="665" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="270">IBAN</text><text x="665" y="140" transform="scale(.1)" fill="#fff" textLength="270">IBAN</text></g></svg>

Assets/WebsiteAssets/images/download-icon.svg

@@ -1,4 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.9997 13.75L14.6663 10.0833M10.9997 13.75V2.75V13.75ZM10.9997 13.75L7.33301 10.0833L10.9997 13.75Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M1.83301 15.5833L2.40226 17.8612C2.5014 18.2578 2.73026 18.6099 3.05248 18.8615C3.37469 19.1131 3.77177 19.2499 4.18059 19.2499H17.8188C18.2276 19.2499 18.6247 19.1131 18.9469 18.8615C19.2691 18.6099 19.498 18.2578 19.5971 17.8612L20.1663 15.5833" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

Assets/WebsiteAssets/images/microsoft-icon.svg

@@ -1,6 +0,0 @@
-<svg width="33" height="33" viewBox="0 0 33 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="17.5312" y="17.5312" width="10.3125" height="10.3125" fill="white"/>
-<rect x="5.15625" y="17.5312" width="10.3125" height="10.3125" fill="white"/>
-<rect x="17.5312" y="5.15625" width="10.3125" height="10.3125" fill="white"/>
-<rect x="5.15625" y="5.15625" width="10.3125" height="10.3125" fill="white"/>
-</svg>

Assets/WebsiteAssets/js/script.js

@@ -1,8 +0,0 @@
-$(function () {
-  $("#open-menu-mobile").click(function () {
-    $("#menu-mobile").animate({ "margin-right": "0px" }, 300);
-  });
-  $("#close-menu-mobile").click(function () {
-    $("#menu-mobile").animate({ "margin-right": "-300px" }, 300);
-  });
-});

Assets/WebsiteAssets/templates/main-new.mustache

@@ -1,252 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<!--
-
-!!! WARNING !!!
-
-This file was auto-generated from {{{sourceMarkdownFile}}} and any manual change
-made to it will be overwritten. To make a change to this file please modify
-the source Markdown file:
-
-https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
-
--->
-
-	<head>
-		<meta
-			charset="utf-8"
-			http-equiv="X-UA-Compatible"
-			content="IE=edge,chrome=1"
-		/>
-		<link rel="icon" href="{{imageBaseUrl}}/favicon.png" />
-		<meta name="viewport" content="width=device-width, initial-scale=1" />
-		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
-		<link
-			rel="stylesheet"
-			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
-			as="style"
-		/>
-		<link rel="stylesheet" href="{{cssBaseUrl}}/fontawesome-all.min.css">
-		<link
-			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
-			rel="stylesheet"
-			as="style"
-			media="all"
-			onload="this.media='all'; this.onload = null"
-		/>
-		<link rel="stylesheet" href="{{cssBaseUrl}}/site.css" as="style" />
-		<title>{{pageTitle}}</title>
-	</head>
-	<body>
-		<div class="container-fluid" id="main-container">
-			<div class="with-profile white-bg" id="nav-section">
-				<div class="container">
-					<div class="row">
-						<div class="col-3">
-							<a href="https://joplinapp.org">
-								<img
-									src="{{imageBaseUrl}}/logo-text-blue.svg"
-									alt=""
-									id="top-logo"
-									width="180"
-								>
-							</a>
-						</div>
-						<div class="col-9 text-right d-none d-md-block">
-							<!-- <a href="#" class="fw500">Help</a> -->
-
-							<a href="https://joplinapp.org/gsoc2021/index/" class="fw500">GSoC 2021</a>
-							<a href="https://discourse.joplinapp.org/" class="fw500">Forum</a>
-
-							<!--
-							<a href="#" class="fw500">Joplin Cloud</a>
-
-							<a class="button-link btn-blue ml-20" href="#">
-								<img src="{{imageBaseUrl}}/download-icon.svg" alt="" />&nbsp;
-								Download</a
-							>
-							-->
-						</div>
-						<div class="col-9 text-right d-block d-md-none">
-							<!--
-							<span class="pointer"
-								><img src="{{imageBaseUrl}}/profile-black-icon.png" alt=""
-							/></span>
-							&nbsp;&nbsp;
-							-->
-							<span class="pointer"
-								><img
-									src="{{imageBaseUrl}}/mobile-menu-black-open-icon.png"
-									id="open-menu-mobile"
-									alt=""
-							/></span>
-							&nbsp;&nbsp;
-
-							<div id="menu-mobile">
-
-								<div class="text-right">
-									<img
-										src="{{imageBaseUrl}}/close-icon.png"
-										alt=""
-										class="pointer"
-										id="close-menu-mobile"
-									/>
-								</div>
-
-								<!--
-								<div class="text-center">
-									<img src="{{imageBaseUrl}}/logo-text-blue.svg" alt="" />
-									<a href="#" class="fw500 mobile-menu-link">Contacts</a>
-									<a href="https://discourse.joplinapp.org/" class="fw500 mobile-menu-link">Forum</a>
-									<a href="#" class="fw500 mobile-menu-link">Help</a>
-								</div>
-								-->
-
-								<div id="toc-mobile">{{{tocHtml}}}</div>
-
-								<!--
-								<br />
-								<br />
-								<br />
-								<br />
-								<a class="button-link btn-blue" href="#">
-									<img src="{{imageBaseUrl}}/download-icon.svg" alt="" />
-									Download</a
-								>
-								<br />
-								<p class="light-blue mobile-menu-link-bottom text-center">
-									Joplin© 2021, All rights reserved
-									<br />
-									<a href="#" class="fw500">Terms & Conditions</a>
-									<br />
-									<a href="#" class="fw500">Privacy Policy</a>
-								</p>
-								-->
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-
-			<div class="page-container page-{{sourceMarkdownName}}">
-				<div class="container">
-					<!--
-					<div class="row">
-						<div class="col-12">
-							<h1 class="text-center">
-								Page <span class="frame-bg frame-bg-yellow">title</span>
-							</h1>
-							<p class="text-center">Hello word</p>
-						</div>
-					</div>
-					-->
-
-					<br />
-					<div class="row content-wrapper">
-						<div id="toc">{{{tocHtml}}}</div>
-
-						<div class="main-content">
-							{{{contentHtml}}}
-							<div class="bottom-links">
-								<a href="https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}">
-									<i class="fab fa-github"></i> Improve this doc
-								</a>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="{{imageBaseUrl}}/logo-text.svg" alt="" width="150" />
-						</div>
-						<!--
-						<div class="col-12 col-md-6">
-							<p class="text-center">
-								<a href="#">Help</a>
-								&nbsp;&nbsp;&nbsp;
-								<a href="https://discourse.joplinapp.org/">Forum</a>
-								&nbsp;&nbsp;&nbsp;
-								<a href="#">Contacts</a>
-							</p>
-						</div>
-						<div class="col-12 col-md-3">
-							<br class="d-block d-md-none" />
-							<div class="text-right">
-								<a href="#" class="button-link btn-blue"
-									><img src="{{imageBaseUrl}}/download-icon.svg" alt="" />&nbsp;
-									Download</a
-								>
-							</div>
-						</div>
-						-->
-					</div>
-					<div class="row">
-						<div class="col-12">
-							<hr />
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-12 col-md-6">
-							<img
-								src="{{imageBaseUrl}}/logo-text.svg"
-								width="120"
-								class="img-center d-block d-md-none"
-								alt=""
-							/>
-							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-{{yyyy}} Laurent Cozic, all rights reserved</p>
-						</div>
-						<div class="col-12 col-md-6 right-links">
-							<p class="text-right text-center-sm">
-								<!--
-								<a href="#">Terms & Conditions</a>
-								<span class="d-none d-md-inline">&nbsp;&nbsp;&nbsp;</span>
-								<br class="d-block d-md-none" />
-								<br class="d-block d-md-none" />
-								-->
-								<a href="https://github.com/laurent22/joplin/" class="github-link"><i class="fab fa-github"></i> GitHub Repository</a>
-								<a href="{{baseUrl}}/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
-		</div>
-
-		<script
-			src="{{jsBaseUrl}}/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="{{jsBaseUrl}}/script.js"></script>
-
-		<script>
-			function stickyHeader() { 
-				return; // Disabled
-
-				if ($(window).scrollTop() > 179) {
-					$('.nav').addClass('sticky'); 
-				} else {
-					$('.nav').removeClass('sticky');
-				}
-			}
-
-			$(window).scroll(function() {
-				stickyHeader();
-			});
-
-			(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-			(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-			m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-			})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-			ga('create', 'UA-103586105-1', 'auto');
-			ga('send', 'pageview');
-		</script>
-	</body>
-</html>

Assets/WebsiteAssets/templates/main.mustache

@@ -1,368 +0,0 @@
-<!doctype html>
-<html>
-
-<!--
-
-!!! WARNING !!!
-
-This file was auto-generated from {{{sourceMarkdownFile}}} and any manual change
-made to it will be overwritten. To make a change to this file please modify
-the source Markdown file:
-
-https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
-
--->
-
-<head>
-	<title>{{pageTitle}}</title>
-	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
-	<link rel="shortcut icon" type="image/x-icon" href="https://joplinapp.org/favicon.ico">
-	<!-- <link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css">  -->
-	<link rel="stylesheet" href="https://joplinapp.org/css/fork-awesome.min.css"> 
-	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
-	<style>
-	body {
-		background-color: #F1F1F1;
-		color: #333333;
-	}
-
-	.root {
-		overflow: hidden;
-	}
-
-	a[href^="mailto:"] {
-		word-break: break-all;
-	}
-
-	table {
-		margin-bottom: 1em;
-	}
-	td, th {
-		padding: .8em;
-		border: 1px solid #ccc;
-	}
-
-	.page-markdown table pre,
-	.page-markdown table blockquote {
-		margin-bottom: 0;
-	}
-
-	.page-markdown table pre,
-	.page-markdown table blockquote {
-		margin-bottom: 0;
-	}
-
-	.page-markdown table pre {
-		background-color: rgba(0,0,0,0);
-		border: none;
-		margin: 0;
-		padding: 0;
-	}
-
-	h1, h2 {
-		border-bottom: 1px solid #eaecef;
-		padding-bottom: 0.3em;
-		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-		font-weight: 600;
-		font-size: 2em;
-		margin-bottom: 16px;
-	}
-	h2 {
-		font-size: 1.6em;
-	}
-	h3 {
-		font-size: 1.3em;
-	}
-	code {
-		color: black;
-		background-color: #eee;
-		border: 1px solid #ccc;
-		font-size: .85em;
-	/*	word-break: break-all; */
-	}
-	pre code {
-		border: none;
-	}
-	pre {
-		font-size: .85em;
-	}
-	blockquote {
-		font-size: 1em;
-		color: #555;
-	};
-	#toc ul {
-		margin-bottom: 10px;
-	}
-	#toc > ul > li {
-		margin-bottom: 10px;
-	}
-	#toc {
-		padding-bottom: 1em;
-	}
-	.title {
-		display: flex;
-		align-items: center;
-	}
-	.title-icon {
-		display: flex;
-		height: 1em;
-	}
-	.title-text {
-		display: flex;
-		font-weight: normal;
-		margin-bottom: .2em;
-		margin-left: .5em;
-	}
-	.sub-title {
-		font-weight: normal;
-	}
-	.container {
-		background-color: white;
-		padding: 0;
-		box-shadow: 0 10px 20px #888888;
-	}
-	table.screenshots {
-		margin-top: 2em;
-		margin-bottom: 2em;
-	}
-	table.screenshots th {
-		height: 3em;
-		text-align: center;
-	}
-	table.screenshots th, 
-	table.screenshots td {
-		border: 1px solid #C2C2C2;
-	}
-	img[align="left"] {
-		margin-right: 10px;
-		margin-bottom: 10px;
-	}
-	.mobile-screenshot {
-		height: 40em;
-		padding: 1em;
-	}
-	.cli-screenshot-wrapper {
-		background-color: black;
-		vertical-align: top;
-		padding: 1em 2em 1em 1em;
-	}
-	.cli-screenshot {
-		font-family: "Monaco", "Inconsolata", "CONSOLAS", "Deja Vu Sans Mono", "Droid Sans Mono", "Andale Mono", monospace;
-		background-color: black;
-		color: white;
-		border: none;
-	}
-	.cli-screenshot .prompt {
-		color: #48C2F0;
-	}
-	.top-screenshot {
-		margin-top: 2em;
-		text-align: center;
-	}
-	.header {
-		position: relative;
-		padding-left: 2em;
-		padding-right: 2em;
-		padding-top: 1em;
-		padding-bottom: 1em;
-		color: white;
-		background-color: #2B2B3D;
-	}
-	.header a h1 {
-		color: white;
-	}
-	.header a:hover {
-		text-decoration: none;
-	}
-	.content {
-		padding-left: 2em;
-		padding-right: 2em;
-		padding-bottom: 2em;
-		padding-top: 2em;
-	}
-	.forkme {
-		position: absolute;
-		right: 0;
-		top:0;
-	}
-	.nav-wrapper {
-		position: relative;
-		width: inherit;
-	}
-	.nav {
-		background-color: black;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.nav.sticky {
-		position:fixed;
-		top: 0;
-		width: inherit;
-		box-shadow: 0 0 10px #000000;
-	}
-	.nav a {
-		color: white;
-		display: inline-block;
-		padding: .6em .9em .6em .9em;
-	}
-	.nav ul {
-		padding-left: 2em;
-		margin-bottom: 0;
-		display: table-cell;
-		display: flex;
-		width: 100%;
-		/* For GSoC: */
-		min-width: 470px;
-	}
-	.nav ul li {
-		display: inline-block;
-		padding: 0;
-	}
-	.nav li.selected {
-		background-color: #222;
-		font-weight: bold;
-	}
-	.nav-right {
-		display: flex;
-		text-align: right;
-		vertical-align: middle;
-		line-height: 0;
-		margin-right: 10px;
-	}
-	.nav-right .share-btn {
-		display: none;
-	}
-	.nav-right .small-share-btn {
-		display: none;
-	}
-	.footer {
-		padding: 2em;
-		border-top: 1px solid #d4d4d4;
-		margin-top: 2em;
-		color: gray;
-		font-size: .9em;
-	}
-	a.heading-anchor {
-		display: inline-block;
-		opacity: 0;
-		width: 1.3em;
-		font-size: 0.7em;
-		margin-left: 0.4em;
-		line-height: 1em;
-		text-decoration: none;
-		transition: opacity 0.3s;
-	}
-	a.heading-anchor:hover,
-	h1:hover a.heading-anchor,
-	h2:hover a.heading-anchor,
-	h3:hover a.heading-anchor,
-	h4:hover a.heading-anchor,
-	h5:hover a.heading-anchor,
-	h6:hover a.heading-anchor {
-		opacity: 1;
-	}
-
-	@media (min-width: 992px) {
-		.content{
-			display: flex;
-		}
-
-		#toc{
-			display: block!important;
-			align-self: flex-start;
-			width: 300px;
-			position: sticky; top: 20px; left: 0;            
-		}
-
-		.main{
-			width: calc(100% - 300px);
-		}
-	}
-
-	.bottom-links {
-		display: flex;
-		justify-content: center;
-		border-top: 1px solid #d4d4d4;
-		margin-top: 30px;
-		padding-top: 25px;
-	}
-
-	@media all and (min-width: 400px) {
-		.nav-right .share-btn {
-			display: inline-block;
-		}
-		.nav-right .small-share-btn {
-			display: none;
-		}
-	}
-</style>
-</head>
-
-<body>
-
-<div class="container root page-{{sourceMarkdownName}}">
-
-<div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="{{{imageBaseUrl}}}/ForkMe.png"/></a>
-	<a href="https://joplinapp.org"><h1 class="title"><img class="title-icon" src="{{{imageBaseUrl}}}/Icon512.png"><span class="title-text">Joplin</span></h1></a>
-	<p class="sub-title">An open source note taking and to-do application with synchronisation capabilities</p>
-</div>
-
-<div class="nav-wrapper">
-	<div class="nav">
-		<ul>
-			<li class="{{selectedHome}}"><a href="{{baseUrl}}/" title="Home"><i class="fa fa-home"></i></a></li>
-			<li><a href="https://discourse.joplinapp.org" title="Forum">Forum</a></li>
-			<li><a class="gsoc" href="https://joplinapp.org/gsoc2021/index/" title="Google Summer of Code 2021">GSoC 2021</a></li>
-		</ul>
-		<div class="nav-right">
-			<iframe class="share-btn share-btn-github" src="https://ghbtns.com/github-btn.html?user=laurent22&repo=joplin&type=star&count=true" frameborder="0" scrolling="0" width="115px" height="20px"></iframe>
-		</div>
-	</div>
-</div>
-
-<div class="content">
-	{{{tocHtml}}}
-
-	<div class="main">
-		{{{contentHtml}}}
-		<div class="bottom-links">
-			<a href="https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}">
-				<i class="fa fa-github"></i> Improve this doc
-			</a>
-		</div>
-	</div>
-</div>
-<div class="footer">
-	Copyright (C) 2016-{{yyyy}} Laurent Cozic
-</div>
-
-<script>
-	function stickyHeader() { 
-		return; // Disabled
-
-		if ($(window).scrollTop() > 179) {
-			$('.nav').addClass('sticky'); 
-		} else {
-			$('.nav').removeClass('sticky');
-		}
-	}
-
-	$(window).scroll(function() {
-		stickyHeader();
-	});
-
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
-</script>
-
-</body>
-</html>

BUILD.md

@@ -1,27 +1,17 @@
+ [![Travis Build Status](https://travis-ci.org/laurent22/joplin.svg?branch=master)](https://travis-ci.org/laurent22/joplin) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/laurent22/joplin?branch=master&passingText=master%20-%20OK&svg=true)](https://ci.appveyor.com/project/laurent22/joplin)
+
 # Building the applications
 
-The Joplin source code is hosted on a [monorepo](https://en.wikipedia.org/wiki/Monorepo) managed by Lerna. The usage of Lerna is mostly transparent as the needed commands have been moved to the root package.json and thus are invoked for example when running `npm install` or `npm run watch`. The main thing to know about Lerna is that it links the packages in the monorepo using `npm link`, so if you check the node_modules directory you will see links instead of actual directories for certain packages. This is something to keep in mind as these links can cause issues in some cases.
-
-The list of the main sub-packages is below:
-
-Package name | Description
---- | ---
-app-cli | The CLI application
-app-clipper | The web clipper
-app-desktop | The desktop application
-app-mobile | The mobile application
-lib | The core library, shared by all applications. It deals with things like synchronisation, encryption, import/export, database and pretty much all the app business logic
-renderer | The Joplin Markdown and HTML renderer
-tools | Tools used to build the apps and other tasks
-
-There are also a few forks of existing packages under the "fork-*" name.
+Note that all the applications share the same library, which, for historical reasons, is in `ReactNativeClient/lib`. This library is copied to the relevant directories when building each app.
 
 ## Required dependencies
 
+- Install yarn - https://yarnpkg.com/lang/en/docs/install/
 - Install node 10+ - https://nodejs.org/en/
+- macOS, Linux: Install rsync - https://nodejs.org/en/
 - macOS: Install Cocoapods - `brew install cocoapods`
-- Windows: Install Windows Build Tools - `npm install -g windows-build-tools --vs2015`
-- Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev python rsync`
+- Windows: Install Windows Build Tools - `npm install -g windows-build-tools`
+- Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev`
 
 ## Building
 
@@ -33,69 +23,64 @@ Then you can test the various applications:
 
 ## Testing the desktop application
 
-	cd packages/app-desktop
+	cd ElectronClient
 	npm start
 
 You can also run it under WSL 2. To do so, [follow these instructions](https://www.beekeeperstudio.io/blog/building-electron-windows-ubuntu-wsl2) to setup your environment.
 
 ## Testing the Terminal application
 
-	cd packages/app-cli
+	cd CliClient
 	npm start
 
 ## Testing the Mobile application
 
 First you need to setup React Native to build projects with native code. For this, follow the instructions on the [Get Started](https://facebook.github.io/react-native/docs/getting-started.html) tutorial, in the "React Native CLI Quickstart" tab.
 
-Then, for **Android**:
+Then:
 
-	cd packages/app-mobile/android
-	./gradlew installDebug # or gradlew.bat installDebug on Windows
+	cd ReactNativeClient
+	npm run start-android
+	# Or: npm run start-ios
 
-On **iOS**, open the file `ios/Joplin.xcworkspace` on XCode and run the app from there.
+To run the iOS application, it might be easier to open the file `ios/Joplin.xcworkspace` on XCode and run the app from there.
 
-Normally the **bundler** should start automatically with the application. If it doesn't, run `npm start` from `packages/app-mobile`.
+Normally the bundler should start automatically with the application. If it doesn't, run `npm start`.
 
 ## Building the clipper
 
-	cd packages/app-clipper/popup
+	cd Clipper/popup
 	npm install
 	npm run watch # To watch for changes
 
-To test the extension please refer to the relevant pages for each browser: [Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Your_first_WebExtension#Trying_it_out) / [Chrome](https://developer.chrome.com/docs/extensions/mv3/getstarted/). Please note that the extension in dev mode will only connect to a dev instance of the desktop app (and vice-versa).
+To test the extension please refer to the relevant pages for each browser: [Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Your_first_WebExtension#Trying_it_out) / [Chrome](https://developer.chrome.com/extensions/faq#faq-dev-01). Please note that the extension in dev mode will only connect to a dev instance of the desktop app (and vice-versa).
 
 ## Watching files
 
-To make changes to the application, you'll need to rebuild any TypeScript file you've changed. The simplest way to do this is to watch for changes from the root of the project. Simply run this command, and it should take care of the rest:
+To make changes to the application, you'll need to rebuild any TypeScript file you've changed, and rebuild the lib. The simplest way to do all this is to watch for changes from the root of the project. Simply run this command, and it should take care of the rest:
 
 	npm run watch
 
-Running `npm run tsc` would have the same effect, but without watching.
+Running `npm run build` would have the same effect, but without watching.
 
 ## Running an application with additional parameters
 
 You can specify additional parameters when running the desktop or CLI application. To do so, add `--` to the `npm start` command, followed by your flags. For example:
 
-	npm start -- --debug
-
-## Adding a new dependency
-
-Since Joplin uses Lerna, adding a new dependency should not be done using `npm i -s ...`. Instead you should use the `lerna add` command, which will take care of adding the package while handling the linked packages correctly. For example, to add the package "leftpad" to the "app-desktop" sub-package, you would run:
-
-	npx lerna add leftpad --scope=@joplin/app-desktop
-
-Note that you should most likely always specify a scope because otherwise it will add the package to all the sub-packages.
+	npm start -- --profile ~/MyTestProfile
 
 ## TypeScript
 
-The application was originally written in JavaScript, however it has slowly been migrated to [TypeScript](https://www.typescriptlang.org/). New classes and files should be written in TypeScript. All compiled files are generated next to the .ts or .tsx file. So for example, if there's a file "lib/MyClass.ts", there will be a generated "lib/MyClass.js" next to it. It is implemented that way as it requires minimal changes to integrate TypeScript in the existing JavaScript code base.
+Most of the application is written in JavaScript, however new classes and files should generally be written in [TypeScript](https://www.typescriptlang.org/). All TypeScript files are generated next to the .ts or .tsx file. So for example, if there's a file "lib/MyClass.ts", there will be a generated "lib/MyClass.js" next to it. It is implemented that way as it requires minimal changes to integrate TypeScript in the existing JavaScript code base.
+
+In the current setup, `tsc` is executed from the root of the project, and will compile everything in CliClient, ElectronClient, etc. This is more convenient to have just one place to compile everything, and it also means there's only one watch command to run. However, one drawback is that TypeScript doesn't find types defined in node_modules folders in sub-directories. For example, if you install `immer` in ElectronClient, then try to use the package, TypeScript will report that it cannot find this module. In theory using `typeRoots`, it should be possible to make it find the right modules but it doesn't seem to work in this case. Currently the workaround is to install any such package at the root of the project. By doing so, TypeScript will find the type definitions and compilation will work. It's not ideal since the module is installed at the root even though it's not used, but for now that will work.
 
 ## Hot reload
 
 If you'd like to auto-reload the desktop app on changes rather than having to quit and restart it manually each time, you can use [watchman-make](https://facebook.github.io/watchman/docs/watchman-make.html):
 
 ```sh
-cd packages/app-desktop
+cd ElectronClient
 watchman-make -p '**/*.js' '**/*.jsx' --run "npm start"
 ```
 
@@ -105,6 +90,10 @@ It still requires you to quit the application each time you want it to rebuild,
 2. Switch to the Electron app and <kbd>cmd</kbd>+<kbd>Q</kbd> to quit it.
 3. `watchman` immediately restarts the app for you (whereas usually you'd have to switch back to the terminal, type `"npm start"`, and hit enter).
 
+# Updating Markdown renderer packages
+
+The Markdown renderer is located under ReactNativeClient/lib/joplin-renderer. Whenever updating one of its dependencies, such as Mermaid or Katex, please run `npm run buildAssets` to make sure all assets such as fonts or CSS files are deployed correctly.
+
 # Troubleshooting
 
-Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md) for various tips on how to get the build working.
+Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md) for various tips on how to get the build working.

CONTRIBUTING.md

@@ -44,9 +44,9 @@ Building the apps is relatively easy - please [see the build instructions](https
 
 Coding style is enforced by a pre-commit hook that runs eslint. This hook is installed whenever running `npm install` on any of the application directory. If for some reason the pre-commit hook didn't get installed, you can manually install it by running `npm install` at the root of the repository.
 
-For new React components, please use [React Hooks](https://reactjs.org/docs/hooks-intro.html). For new code in general, please use TypeScript. Even if you are modifying a file that was originally in JavaScript you should ideally convert it first to TypeScript before modifying it. Doing so is relatively easy and it helps maintain code quality.
+For new React components, please use [React Hooks](https://reactjs.org/docs/hooks-intro.html). For new code in general, please use TypeScript (unless you are modifying a file that was originally in JavaScript).
 
-For changes made to the Desktop client that affect the user interface, refer to `packages/app-desktop/theme.ts` for all styling information. The goal is to create a consistent user interface to allow for easy navigation of Joplin's various features and improve the overall user experience.
+For changes made to the Desktop client that affect the user interface, refer to `ElectronClient/app/theme.js` for all styling information. The goal is to create a consistent user interface to allow for easy navigation of Joplin's various features and improve the overall user experience.
 
 ## Automated tests
 
@@ -56,11 +56,11 @@ When submitting a pull request for a new feature or a bug fix, please add automa
 
 * **Feature tests** on the other hand are to test higher level functionalities such as interactions with the GUI and how they affect the underlying model. Often these tests would dispatch Redux actions, and inspect how the application state has been changed. The feature tests should be prefixed with "feature_", for example "feature_TagList". There's a good explanation on what qualifies as a feature test in [this post](https://github.com/laurent22/joplin/pull/2819#issuecomment-603502230).
 
-The tests are under packages/app-cli/tests. To get them running, you first need to build the CLI app:
+The tests are under CliClient/tests. To get them running, you first need to build the CLI app:
 
 ```sh
 npm install
-cd packages/app-cli
+cd CliClient
 ```
 
 To run all the test units:

CliClient/.gitignore

@@ -0,0 +1,25 @@
+node_modules/
+app/src
+tests-build/
+tests/src
+config.json
+app/lib
+tests/fuzzing/client0
+tests/fuzzing/client1
+tests/fuzzing/client2
+tests/fuzzing/sync
+tests/fuzzing.*
+tests/fuzzing -*
+tests/logs/*
+tests/cli-integration/
+tests/tmp/
+*.mo
+*.*~
+tests/sync
+out.txt
+linkToLocal.sh
+yarn-error.log
+tests/support/dropbox-auth.txt
+tests/support/nextcloud-auth.json
+tests/support/onedrive-auth.txt
+build/

CliClient/app/LinkSelector.ts

@@ -41,8 +41,7 @@ class LinkSelector {
 		const newLinkStore: LinkStoreEntry[] = [];
 		const lines: string[] = renderedText.split('\n');
 		for (let i = 0; i < lines.length; i++) {
-			const r = (lines[i] as any).matchAll(this.linkRegex_);
-			const matches = [...r];
+			const matches = [...lines[i].matchAll(this.linkRegex_)];
 			matches.forEach((_e, n) => {
 				newLinkStore.push(
 					{

CliClient/app/ResourceServer.js

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

CliClient/app/app-gui.js

@@ -1,17 +1,17 @@
-const Logger = require('@joplin/lib/Logger').default;
-const Folder = require('@joplin/lib/models/Folder').default;
-const BaseItem = require('@joplin/lib/models/BaseItem').default;
-const Tag = require('@joplin/lib/models/Tag').default;
-const BaseModel = require('@joplin/lib/BaseModel').default;
-const Note = require('@joplin/lib/models/Note').default;
-const Resource = require('@joplin/lib/models/Resource').default;
-const Setting = require('@joplin/lib/models/Setting').default;
-const reducer = require('@joplin/lib/reducer').default;
-const { defaultState } = require('@joplin/lib/reducer');
-const { splitCommandString } = require('@joplin/lib/string-utils.js');
-const { reg } = require('@joplin/lib/registry.js');
-const { _ } = require('@joplin/lib/locale');
-const shim = require('@joplin/lib/shim').default;
+const Logger = require('lib/Logger').default;
+const Folder = require('lib/models/Folder.js');
+const BaseItem = require('lib/models/BaseItem.js');
+const Tag = require('lib/models/Tag.js');
+const BaseModel = require('lib/BaseModel.js');
+const Note = require('lib/models/Note.js');
+const Resource = require('lib/models/Resource.js');
+const Setting = require('lib/models/Setting').default;
+const reducer = require('lib/reducer').default;
+const { defaultState } = require('lib/reducer');
+const { splitCommandString } = require('lib/string-utils.js');
+const { reg } = require('lib/registry.js');
+const { _ } = require('lib/locale');
+const shim = require('lib/shim').default;
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = new Entities().encode;
 
@@ -19,7 +19,7 @@ const chalk = require('chalk');
 const tk = require('terminal-kit');
 const TermWrapper = require('tkwidgets/framework/TermWrapper.js');
 const Renderer = require('tkwidgets/framework/Renderer.js');
-const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker').default;
+const DecryptionWorker = require('lib/services/DecryptionWorker');
 
 const BaseWidget = require('tkwidgets/BaseWidget.js');
 const TextWidget = require('tkwidgets/TextWidget.js');

CliClient/app/app.js

@@ -1,21 +1,20 @@
-const BaseApplication = require('@joplin/lib/BaseApplication').default;
-const { FoldersScreenUtils } = require('@joplin/lib/folders-screen-utils.js');
-const ResourceService = require('@joplin/lib/services/ResourceService').default;
-const BaseModel = require('@joplin/lib/BaseModel').default;
-const Folder = require('@joplin/lib/models/Folder').default;
-const BaseItem = require('@joplin/lib/models/BaseItem').default;
-const Note = require('@joplin/lib/models/Note').default;
-const Tag = require('@joplin/lib/models/Tag').default;
-const Setting = require('@joplin/lib/models/Setting').default;
-const { reg } = require('@joplin/lib/registry.js');
-const { fileExtension } = require('@joplin/lib/path-utils');
-const { splitCommandString } = require('@joplin/lib/string-utils');
-const { _ } = require('@joplin/lib/locale');
+const BaseApplication = require('lib/BaseApplication').default;
+const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
+const ResourceService = require('lib/services/ResourceService');
+const BaseModel = require('lib/BaseModel.js');
+const Folder = require('lib/models/Folder.js');
+const BaseItem = require('lib/models/BaseItem.js');
+const Note = require('lib/models/Note.js');
+const Tag = require('lib/models/Tag.js');
+const Setting = require('lib/models/Setting').default;
+const { reg } = require('lib/registry.js');
+const { fileExtension } = require('lib/path-utils');
+const { _ } = require('lib/locale');
 const fs = require('fs-extra');
 const { cliUtils } = require('./cli-utils.js');
-const Cache = require('@joplin/lib/Cache');
-const RevisionService = require('@joplin/lib/services/RevisionService').default;
-const shim = require('@joplin/lib/shim').default;
+const Cache = require('lib/Cache');
+const RevisionService = require('lib/services/RevisionService');
+const shim = require('lib/shim').default;
 
 class Application extends BaseApplication {
 	constructor() {
@@ -387,21 +386,6 @@ class Application extends BaseApplication {
 		return output;
 	}
 
-	async commandList(argv) {
-		if (argv.length && argv[0] === 'batch') {
-			const commands = [];
-			const commandLines = (await fs.readFile(argv[1], 'utf-8')).split('\n');
-			for (const commandLine of commandLines) {
-				if (!commandLine.trim()) continue;
-				const splitted = splitCommandString(commandLine.trim());
-				commands.push(splitted);
-			}
-			return commands;
-		} else {
-			return [argv];
-		}
-	}
-
 	async start(argv) {
 		argv = await super.start(argv);
 
@@ -419,10 +403,7 @@ class Application extends BaseApplication {
 			await this.applySettingsSideEffects();
 
 			try {
-				const commands = await this.commandList(argv);
-				for (const command of commands) {
-					await this.execCommand(command);
-				}
+				await this.execCommand(argv);
 			} catch (error) {
 				if (this.showStackTraces_) {
 					console.error(error);
@@ -445,7 +426,7 @@ class Application extends BaseApplication {
 
 			const AppGui = require('./app-gui.js');
 			this.gui_ = new AppGui(this, this.store(), keymap);
-			this.gui_.setLogger(this.logger());
+			this.gui_.setLogger(this.logger_);
 			await this.gui_.start();
 
 			// Since the settings need to be loaded before the store is created, it will never

CliClient/app/autocompletion.js

@@ -1,7 +1,7 @@
 const { app } = require('./app.js');
-const Note = require('@joplin/lib/models/Note').default;
-const Folder = require('@joplin/lib/models/Folder').default;
-const Tag = require('@joplin/lib/models/Tag').default;
+const Note = require('lib/models/Note.js');
+const Folder = require('lib/models/Folder.js');
+const Tag = require('lib/models/Tag.js');
 const { cliUtils } = require('./cli-utils.js');
 const yargParser = require('yargs-parser');
 const fs = require('fs-extra');

CliClient/app/base-command.js

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

CliClient/app/build-doc.js

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