splitting sync tests

Although soft-break is part of the CommonMark spec, it requires a
special editor that can wrap text at a certain limit. That doesn't make
much sense in Joplin, where the editor can have various sizes, from
desktop to mobile, and where the tools to wrap text are not present.

.eslintrc.js

@@ -15,7 +15,8 @@ module.exports = {
 		'Atomics': 'readonly',
 		'SharedArrayBuffer': 'readonly',
 
-		// Jasmine variables
+		// Jest variables
+		'test': 'readonly',
 		'expect': 'readonly',
 		'describe': 'readonly',
 		'it': 'readonly',
@@ -23,7 +24,6 @@ module.exports = {
 		'afterAll': 'readonly',
 		'beforeEach': 'readonly',
 		'afterEach': 'readonly',
-		'jasmine': 'readonly',
 
 		// React Native variables
 		'__DEV__': 'readonly',
@@ -126,10 +126,37 @@ 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

@@ -1,15 +0,0 @@
----
-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

@@ -0,0 +1,5 @@
+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 …

.ignore

@@ -1,297 +0,0 @@
-# This is used by VSCode to ignore patterns during search.
-# Before they were in joplin.code-workspace, under the `files.exclude` key
-# but it eventually reached the limit with ENAMETOOLONG error.
-#
-# https://github.com/microsoft/vscode/issues/94718
-
-# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
-CliClient/app/LinkSelector.js
-CliClient/app/services/plugins/PluginRunner.js
-CliClient/tests/fsDriver.js
-CliClient/tests/InMemoryCache.js
-CliClient/tests/MdToHtml.js
-CliClient/tests/models_Setting.js
-CliClient/tests/services_CommandService.js
-CliClient/tests/services_InteropService.js
-CliClient/tests/services_keychainService.js
-CliClient/tests/services_PluginService.js
-CliClient/tests/services_rest_Api.js
-CliClient/tests/services/plugins/api/JoplinSetting.js
-CliClient/tests/services/plugins/sandboxProxy.js
-CliClient/tests/synchronizer_LockHandler.js
-CliClient/tests/synchronizer_MigrationHandler.js
-ElectronClient/app.js
-ElectronClient/bridge.js
-ElectronClient/commands/copyDevCommand.js
-ElectronClient/commands/focusElement.js
-ElectronClient/commands/openProfileDirectory.js
-ElectronClient/commands/startExternalEditing.js
-ElectronClient/commands/stopExternalEditing.js
-ElectronClient/commands/toggleExternalEditing.js
-ElectronClient/ElectronAppWrapper.js
-ElectronClient/global.d.js
-ElectronClient/gui/Button/Button.js
-ElectronClient/gui/ConfigScreen/ButtonBar.js
-ElectronClient/gui/ConfigScreen/ConfigScreen.js
-ElectronClient/gui/ConfigScreen/SideBar.js
-ElectronClient/gui/DropboxLoginScreen.js
-ElectronClient/gui/ErrorBoundary.js
-ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js
-ElectronClient/gui/KeymapConfig/ShortcutRecorder.js
-ElectronClient/gui/KeymapConfig/styles/index.js
-ElectronClient/gui/KeymapConfig/utils/getLabel.js
-ElectronClient/gui/KeymapConfig/utils/useCommandStatus.js
-ElectronClient/gui/KeymapConfig/utils/useKeymap.js
-ElectronClient/gui/MainScreen/commands/editAlarm.js
-ElectronClient/gui/MainScreen/commands/exportPdf.js
-ElectronClient/gui/MainScreen/commands/hideModalMessage.js
-ElectronClient/gui/MainScreen/commands/moveToFolder.js
-ElectronClient/gui/MainScreen/commands/newFolder.js
-ElectronClient/gui/MainScreen/commands/newNote.js
-ElectronClient/gui/MainScreen/commands/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

@@ -1,5 +1,5 @@
 # Only build tags (Doesn't work - doesn't build anything)
-if: tag IS present OR type = pull_request
+if: tag IS present OR type = pull_request OR branch = dev
 
 rvm: 2.3.3
 
@@ -15,21 +15,30 @@ branches:
 matrix:
   include:
     - os: osx
-      osx_image: xcode9.0
+      osx_image: xcode12
       language: node_js
-      node_js: "10"
-      env:
-        - ELECTRON_CACHE=$HOME/.cache/electron
-        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+      node_js: "12"
+      cache:
+        npm: false
+      # Cache was disabled because when changing from node_js 10 to node_js 12
+      # it was still using build files from Node 10 when building SQLite which
+      # was making it fail. Might be ok to re-enable later on, although it doesn't
+      # make build that much faster.
+      #
+      # 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
+      node_js: "12"
+      cache:
+        npm: false
+      # env:
+      #   - ELECTRON_CACHE=$HOME/.cache/electron
+      #   - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
 # cache:
 #   directories:
@@ -59,23 +68,24 @@ before_install:
 
 script:
   - |
+    # Prints some env variables
+    echo "TRAVIS_OS_NAME=$TRAVIS_OS_NAME"
+    echo "TRAVIS_BRANCH=$TRAVIS_BRANCH"
+    echo "TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
+    echo "TRAVIS_TAG=$TRAVIS_TAG"
+
     # 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
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "$TRAVIS_BRANCH" = "dev" ]; then
       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
@@ -93,7 +103,7 @@ script:
     # 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
+        node packages/tools/validate-translation.js
         testResult=$?
         if [ $testResult -ne 0 ]; then
           exit $testResult
@@ -102,7 +112,7 @@ script:
     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
+    # 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 [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
@@ -112,5 +122,17 @@ script:
     fi
 
     # Prepare the Electron app and build it
-    cd ElectronClient
-    USE_HARD_LINKS=false npm run dist
+    #
+    # 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 packages/app-desktop
+
+    if [[ $TRAVIS_TAG = v* ]]; then
+      USE_HARD_LINKS=false npm run dist
+    else
+      USE_HARD_LINKS=false npm run dist -- --publish=never
+    fi

Assets/TinyMCE/IconPack/gulpfile.js

@@ -13,7 +13,7 @@ gulp.task('icon-packager', function() {
 });
 
 gulp.task('deploy', function() {
-	fs.copyFileSync(`${__dirname}/dist/icons/Joplin/icons.js`, `${__dirname}/../../../ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/icons.js`);
+	fs.copyFileSync(`${__dirname}/dist/icons/Joplin/icons.js`, `${__dirname}/../../../packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/icons.js`);
 	return Promise.resolve();
 });
 

Assets/TinyMCE/JoplinLists/Gruntfile.js

@@ -27,7 +27,7 @@ module.exports = function(grunt) {
 		// },
 
 		shell: {
-			command: 'tsc',
+			command: 'tsc --project tsconfig.json',
 		},
 
 		rollup: {
@@ -125,7 +125,7 @@ module.exports = function(grunt) {
 					// { src: ['changelog.txt'], dest: 'dist', expand: true },
 					{
 						src: ['dist/joplinLists.js'],
-						dest: '../../../ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/plugins/lists.js',
+						dest: '../../../packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/plugins/lists.js',
 					},
 				],
 			},

Assets/TinyMCE/JoplinLists/README.md

@@ -1,11 +1,13 @@
 # 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 ElectronClient sub-directory.
+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

@@ -9,7 +9,7 @@
     "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 ElectronClient && npm start"
+    "buildAndStart": "yarn build && cd .. && cd .. && cd .. && cd packages/app-desktop && npm start"
   },
   "keywords": [],
   "author": "Tiny Technologies Inc.",

Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.ts

@@ -48,7 +48,7 @@ const listState = function (editor: Editor, listName, options:any = {}) {
       // dependent on how the checkbox is styled, so if the style is changed, this might need
       // to be updated too.
       // For the styling, see:
-      // ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.ts
+      // packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/checkbox.ts
       //
       // The previous solution was to use "pointer-event: none", which mostly work, however
       // it means that links are no longer clickable when they are within the checkbox label.