Electron release v1.0.230

* [trans] Update zh_CN.po

* [trans] Give the specific names of AWS secret and AWS key

.eslintignore

@@ -61,8 +61,39 @@ Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/langs/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
+ElectronClient/commands/focusElement.js
+ElectronClient/commands/startExternalEditing.js
+ElectronClient/commands/stopExternalEditing.js
+ElectronClient/global.d.js
+ElectronClient/gui/ErrorBoundary.js
+ElectronClient/gui/Header/commands/focusSearch.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/newNote.js
+ElectronClient/gui/MainScreen/commands/newNotebook.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/toggleNoteList.js
+ElectronClient/gui/MainScreen/commands/toggleSidebar.js
+ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.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/AceEditor/AceEditor.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/styles/index.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/Toolbar.js
@@ -76,6 +107,8 @@ 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/useLineSorting.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
@@ -94,12 +127,18 @@ ElectronClient/gui/NoteEditor/utils/useMessageHandler.js
 ElectronClient/gui/NoteEditor/utils/useNoteSearchBar.js
 ElectronClient/gui/NoteEditor/utils/useSearchMarkers.js
 ElectronClient/gui/NoteEditor/utils/useWindowCommandHandler.js
+ElectronClient/gui/NoteList/commands/focusElementNoteList.js
 ElectronClient/gui/NoteListItem.js
 ElectronClient/gui/NoteToolbar/NoteToolbar.js
 ElectronClient/gui/ResourceScreen.js
 ElectronClient/gui/ShareNoteDialog.js
+ElectronClient/gui/SideBar/commands/focusElementSideBar.js
 ReactNativeClient/lib/AsyncActionQueue.js
 ReactNativeClient/lib/checkPermissions.js
+ReactNativeClient/lib/commands/historyBackward.js
+ReactNativeClient/lib/commands/historyForward.js
+ReactNativeClient/lib/commands/synchronize.js
+ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
@@ -107,12 +146,16 @@ ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
 ReactNativeClient/lib/JoplinServerApi.js
+ReactNativeClient/lib/services/CommandService.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/ResourceEditWatcher.js
+ReactNativeClient/lib/services/ResourceEditWatcher/index.js
+ReactNativeClient/lib/services/ResourceEditWatcher/reducer.js
+ReactNativeClient/lib/services/rest/actionApi.desktop.js
+ReactNativeClient/lib/services/rest/errors.js
 ReactNativeClient/lib/services/SettingUtils.js
 ReactNativeClient/lib/services/UndoRedoService.js
 ReactNativeClient/lib/ShareExtension.js

.eslintrc.js

@@ -60,6 +60,7 @@ module.exports = {
 		"no-new-func": ["error"],
 		"import/prefer-default-export": ["error"],
 		"import/first": ["error"],
+		"no-array-constructor": ["error"],
 
 		// Checks rules of Hooks
 		"react-hooks/rules-of-hooks": "error",

.github/stale.yml

@@ -1,6 +1,6 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 45
+daysUntilStale: 30
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7
 # Issues with these labels will never be considered stale

.gitignore

@@ -37,6 +37,7 @@ _mydocs
 Assets/DownloadBadges*.psd
 node_modules
 Tools/github_oauth_token.txt
+CliClient/tests/support/amazon-s3-auth.json
 _releases
 ReactNativeClient/lib/csstojs/
 ReactNativeClient/lib/rnInjectedJs/
@@ -51,8 +52,39 @@ Tools/commit_hook.txt
 *.map
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
+ElectronClient/commands/focusElement.js
+ElectronClient/commands/startExternalEditing.js
+ElectronClient/commands/stopExternalEditing.js
+ElectronClient/global.d.js
+ElectronClient/gui/ErrorBoundary.js
+ElectronClient/gui/Header/commands/focusSearch.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/newNote.js
+ElectronClient/gui/MainScreen/commands/newNotebook.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/toggleNoteList.js
+ElectronClient/gui/MainScreen/commands/toggleSidebar.js
+ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.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/AceEditor/AceEditor.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/styles/index.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/Toolbar.js
@@ -66,6 +98,8 @@ 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/useLineSorting.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
@@ -84,12 +118,18 @@ ElectronClient/gui/NoteEditor/utils/useMessageHandler.js
 ElectronClient/gui/NoteEditor/utils/useNoteSearchBar.js
 ElectronClient/gui/NoteEditor/utils/useSearchMarkers.js
 ElectronClient/gui/NoteEditor/utils/useWindowCommandHandler.js
+ElectronClient/gui/NoteList/commands/focusElementNoteList.js
 ElectronClient/gui/NoteListItem.js
 ElectronClient/gui/NoteToolbar/NoteToolbar.js
 ElectronClient/gui/ResourceScreen.js
 ElectronClient/gui/ShareNoteDialog.js
+ElectronClient/gui/SideBar/commands/focusElementSideBar.js
 ReactNativeClient/lib/AsyncActionQueue.js
 ReactNativeClient/lib/checkPermissions.js
+ReactNativeClient/lib/commands/historyBackward.js
+ReactNativeClient/lib/commands/historyForward.js
+ReactNativeClient/lib/commands/synchronize.js
+ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
@@ -97,12 +137,16 @@ ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
 ReactNativeClient/lib/JoplinServerApi.js
+ReactNativeClient/lib/services/CommandService.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/ResourceEditWatcher.js
+ReactNativeClient/lib/services/ResourceEditWatcher/index.js
+ReactNativeClient/lib/services/ResourceEditWatcher/reducer.js
+ReactNativeClient/lib/services/rest/actionApi.desktop.js
+ReactNativeClient/lib/services/rest/errors.js
 ReactNativeClient/lib/services/SettingUtils.js
 ReactNativeClient/lib/services/UndoRedoService.js
 ReactNativeClient/lib/ShareExtension.js

BUILD.md

@@ -70,6 +70,8 @@ You can specify additional parameters when running the desktop or CLI applicatio
 
 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):

CliClient/app/autocompletion.js

@@ -95,8 +95,8 @@ async function handleAutocompletionPromise(line) {
 		}
 
 		if (argName == 'tag') {
-			const tags = await Tag.search({ titlePattern: `${next}*` });
-			l.push(...tags.map(n => n.title));
+			const tags = await Tag.search({ fullTitleRegex: `${next}.*` });
+			l.push(...tags.map(tag => Tag.getCachedFullTitle(tag.id)));
 		}
 
 		if (argName == 'file') {

CliClient/app/command-import.js

@@ -21,7 +21,11 @@ class Command extends BaseCommand {
 			.filter(m => m.type === 'importer')
 			.map(m => m.format);
 
-		return [['--format <format>', _('Source format: %s', ['auto'].concat(formats).join(', '))], ['-f, --force', _('Do not ask for confirmation.')]];
+		return [
+			['--format <format>', _('Source format: %s', ['auto'].concat(formats).join(', '))],
+			['-f, --force', _('Do not ask for confirmation.')],
+			['--output-format <output-format>', _('Output format: %s', 'md, html')],
+		];
 	}
 
 	async action(args) {
@@ -55,9 +59,9 @@ class Command extends BaseCommand {
 			this.stdout(s);
 		};
 
-		app()
-			.gui()
-			.showConsole();
+		if (args.options.outputFormat) importOptions.outputFormat = args.options.outputFormat;
+
+		app().gui().showConsole();
 		this.stdout(_('Importing notes...'));
 		const service = new InteropService();
 		const result = await service.import(importOptions);

CliClient/app/command-server.js

@@ -18,7 +18,8 @@ class Command extends BaseCommand {
 		const command = args.command;
 
 		const ClipperServer = require('lib/ClipperServer');
-		const stdoutFn = (s) => this.stdout(s);
+		ClipperServer.instance().initialize();
+		const stdoutFn = (...s) => this.stdout(s.join(' '));
 		const clipperLogger = new Logger();
 		clipperLogger.addTarget('file', { path: `${Setting.value('profileDir')}/log-clipper.txt` });
 		clipperLogger.addTarget('console', { console: {

CliClient/app/command-sync.js

@@ -174,7 +174,7 @@ class Command extends BaseCommand {
 
 			this.stdout(_('Synchronisation target: %s (%s)', Setting.enumOptionLabel('sync.target', this.syncTargetId_), this.syncTargetId_));
 
-			if (!sync) throw new Error(_('Cannot initialize synchroniser.'));
+			if (!sync) throw new Error(_('Cannot initialise synchroniser.'));
 
 			this.stdout(_('Starting synchronisation...'));
 

CliClient/app/command-tag.js

@@ -34,7 +34,7 @@ class Command extends BaseCommand {
 
 		if (command == 'add') {
 			if (!notes.length) throw new Error(_('Cannot find "%s".', args.note));
-			if (!tag) tag = await Tag.save({ title: args.tag }, { userSideValidation: true });
+			if (!tag) tag = await Tag.saveNested({}, args.tag, { userSideValidation: true });
 			for (let i = 0; i < notes.length; i++) {
 				await Tag.addNote(tag.id, notes[i].id);
 			}
@@ -72,7 +72,7 @@ class Command extends BaseCommand {
 			} else {
 				const tags = await Tag.all();
 				tags.map(tag => {
-					this.stdout(tag.title);
+					this.stdout(Tag.getCachedFullTitle(tag.id));
 				});
 			}
 		} else if (command == 'notetags') {

CliClient/app/main.js

@@ -52,8 +52,6 @@ BaseItem.loadClass('Revision', Revision);
 Setting.setConstant('appId', `net.cozic.joplin${env === 'dev' ? 'dev' : ''}-cli`);
 Setting.setConstant('appType', 'cli');
 
-console.info(Setting.value('appId'));
-
 shimInit();
 
 const application = app();

CliClient/locales-build/index.js

@@ -38,42 +38,42 @@ locales['tr_TR'] = require('./tr_TR.json');
 locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":84};
+stats['ar'] = {"percentDone":82};
 stats['eu'] = {"percentDone":35};
-stats['bs_BA'] = {"percentDone":78};
-stats['bg_BG'] = {"percentDone":70};
-stats['ca'] = {"percentDone":55};
-stats['hr_HR'] = {"percentDone":29};
-stats['cs_CZ'] = {"percentDone":86};
-stats['da_DK'] = {"percentDone":78};
-stats['de_DE'] = {"percentDone":97};
-stats['et_EE'] = {"percentDone":69};
+stats['bs_BA'] = {"percentDone":85};
+stats['bg_BG'] = {"percentDone":68};
+stats['ca'] = {"percentDone":54};
+stats['hr_HR'] = {"percentDone":28};
+stats['cs_CZ'] = {"percentDone":84};
+stats['da_DK'] = {"percentDone":76};
+stats['de_DE'] = {"percentDone":99};
+stats['et_EE'] = {"percentDone":68};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":94};
-stats['eo'] = {"percentDone":40};
-stats['fr_FR'] = {"percentDone":99};
-stats['gl_ES'] = {"percentDone":45};
-stats['id_ID'] = {"percentDone":97};
-stats['it_IT'] = {"percentDone":95};
-stats['nl_NL'] = {"percentDone":89};
-stats['nl_BE'] = {"percentDone":36};
-stats['nb_NO'] = {"percentDone":92};
-stats['fa'] = {"percentDone":35};
-stats['pl_PL'] = {"percentDone":88};
-stats['pt_PT'] = {"percentDone":93};
-stats['pt_BR'] = {"percentDone":99};
-stats['ro'] = {"percentDone":36};
-stats['sl_SI'] = {"percentDone":45};
-stats['sv'] = {"percentDone":75};
-stats['th_TH'] = {"percentDone":55};
-stats['vi'] = {"percentDone":90};
+stats['es_ES'] = {"percentDone":91};
+stats['eo'] = {"percentDone":39};
+stats['fr_FR'] = {"percentDone":97};
+stats['gl_ES'] = {"percentDone":44};
+stats['id_ID'] = {"percentDone":95};
+stats['it_IT'] = {"percentDone":93};
+stats['nl_NL'] = {"percentDone":99};
+stats['nl_BE'] = {"percentDone":35};
+stats['nb_NO'] = {"percentDone":91};
+stats['fa'] = {"percentDone":34};
+stats['pl_PL'] = {"percentDone":87};
+stats['pt_PT'] = {"percentDone":91};
+stats['pt_BR'] = {"percentDone":98};
+stats['ro'] = {"percentDone":35};
+stats['sl_SI'] = {"percentDone":44};
+stats['sv'] = {"percentDone":73};
+stats['th_TH'] = {"percentDone":54};
+stats['vi'] = {"percentDone":88};
 stats['tr_TR'] = {"percentDone":99};
-stats['el_GR'] = {"percentDone":95};
-stats['ru_RU'] = {"percentDone":92};
-stats['sr_RS'] = {"percentDone":76};
-stats['zh_CN'] = {"percentDone":98};
-stats['zh_TW'] = {"percentDone":93};
-stats['ja_JP'] = {"percentDone":97};
-stats['ko'] = {"percentDone":91};
+stats['el_GR'] = {"percentDone":93};
+stats['ru_RU'] = {"percentDone":90};
+stats['sr_RS'] = {"percentDone":74};
+stats['zh_CN'] = {"percentDone":99};
+stats['zh_TW'] = {"percentDone":98};
+stats['ja_JP'] = {"percentDone":99};
+stats['ko'] = {"percentDone":89};
 module.exports = { locales: locales, stats: stats };

CliClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.0.164",
+  "version": "1.0.165",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -33,9 +33,9 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "acorn": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
-      "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ=="
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
+      "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
     },
     "acorn-globals": {
       "version": "4.3.4",
@@ -368,6 +368,34 @@
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
     },
+    "aws-sdk": {
+      "version": "2.641.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.641.0.tgz",
+      "integrity": "sha512-9GYrBWR7ygIwwFBr0L+P+6tecNGsDuSe1mB18rv7CXSDLDdg6VPYwma1PSw5bUBs4wix9ganK6QLfW8D8ztBEQ==",
+      "requires": {
+        "buffer": "4.9.1",
+        "events": "1.1.1",
+        "ieee754": "1.1.13",
+        "jmespath": "0.15.0",
+        "querystring": "0.2.0",
+        "sax": "1.2.1",
+        "url": "0.10.3",
+        "uuid": "3.3.2",
+        "xml2js": "0.4.19"
+      },
+      "dependencies": {
+        "sax": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
+          "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+        }
+      }
+    },
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -455,6 +483,11 @@
       "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
       "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs="
     },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+    },
     "base64-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/base64-stream/-/base64-stream-1.0.0.tgz",
@@ -573,6 +606,16 @@
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
     },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
     "buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
@@ -1594,9 +1637,9 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.2.tgz",
-      "integrity": "sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==",
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
       "requires": {
         "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
@@ -1628,6 +1671,11 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+    },
     "execa": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
@@ -3039,9 +3087,9 @@
       "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
     },
     "highlight.js": {
-      "version": "9.18.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz",
-      "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg=="
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz",
+      "integrity": "sha512-b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="
     },
     "homedir-polyfill": {
       "version": "1.0.3",
@@ -3137,6 +3185,11 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
       "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
     },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+    },
     "ignore-walk": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
@@ -3748,10 +3801,15 @@
       "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
       "dev": true
     },
+    "jmespath": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
+      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
+    },
     "joplin-turndown": {
-      "version": "4.0.28",
-      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.28.tgz",
-      "integrity": "sha512-wQP9OUBAkWq/VPPCJcY1EI6tSXWlGs/BJ7Ce8BZYRF/1vEk/TRHOdKmCObQrXz/0nRoLiP5xeqNvHE1nK4XbRQ==",
+      "version": "4.0.29",
+      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.29.tgz",
+      "integrity": "sha512-rVGu8u4TpSRETo59/jiVW9iaXnpdxxpBHjb7nyCflkDfWhg1Kska4uagBQGw7cD2yxw7mB2YUIB/fAgtlIzcDQ==",
       "requires": {
         "css": "^2.2.4",
         "html-entities": "^1.2.1",
@@ -5355,6 +5413,11 @@
         "strict-uri-encode": "^1.0.0"
       }
     },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+    },
     "querystringify": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
@@ -5554,11 +5617,6 @@
         "through2": "^2.0.3"
       }
     },
-    "remove-markdown": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.3.0.tgz",
-      "integrity": "sha1-XktmdJOpNXlyjz1S7MHbnKUF3Jg="
-    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -5708,19 +5766,26 @@
       }
     },
     "request-promise-core": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
       "requires": {
-        "lodash": "^4.17.15"
+        "lodash": "^4.17.19"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.19",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+        }
       }
     },
     "request-promise-native": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
-      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
       "requires": {
-        "request-promise-core": "1.1.3",
+        "request-promise-core": "1.1.4",
         "stealthy-require": "^1.1.1",
         "tough-cookie": "^2.3.3"
       },
@@ -7038,6 +7103,22 @@
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
     },
+    "url": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+      "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+        }
+      }
+    },
     "url-parse": {
       "version": "1.4.7",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
@@ -7302,9 +7383,9 @@
       }
     },
     "ws": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz",
-      "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w=="
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="
     },
     "xdg-basedir": {
       "version": "3.0.0",

CliClient/package.json

@@ -27,7 +27,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.164",
+  "version": "1.0.165",
   "bin": {
     "joplin": "./main.js"
   },
@@ -37,6 +37,7 @@
   "dependencies": {
     "app-module-path": "^2.2.0",
     "async-mutex": "^0.1.3",
+    "aws-sdk": "^2.588.0",
     "base-64": "^0.1.0",
     "base64-stream": "^1.0.0",
     "clean-html": "^1.5.0",
@@ -49,13 +50,13 @@
     "font-awesome-filetypes": "^2.1.0",
     "form-data": "^2.1.4",
     "fs-extra": "^5.0.0",
-    "highlight.js": "^9.17.1",
+    "highlight.js": "10.1.1",
     "html-entities": "^1.2.1",
     "html-minifier": "^3.5.15",
     "htmlparser2": "^4.1.0",
     "image-data-uri": "^2.0.0",
     "image-type": "^3.0.0",
-    "joplin-turndown": "^4.0.28",
+    "joplin-turndown": "^4.0.29",
     "joplin-turndown-plugin-gfm": "^1.0.12",
     "json-stringify-safe": "^5.0.1",
     "jssha": "^2.3.0",
@@ -91,7 +92,6 @@
     "read-chunk": "^2.1.0",
     "redux": "^3.7.2",
     "relative": "^3.0.2",
-    "remove-markdown": "^0.3.0",
     "request": "^2.88.0",
     "sax": "^1.2.4",
     "server-destroy": "^1.0.1",

CliClient/tests/EnexToHtml.js

@@ -89,20 +89,20 @@ describe('EnexToHtml', function() {
 		}],
 	});
 
-	it('fails when not given a matching resource', asyncTest(async () => {
-		// To test the promise-unexpectedly-resolved case, add `audioResource` to the array.
-		const resources = [];
-		const inputFile = fileWithPath('en-media--image.enex');
-		const enexInput = await shim.fsDriver().readFile(inputFile);
-		const promisedOutput = enexXmlToHtml(enexInput, resources);
+	// it('fails when not given a matching resource', asyncTest(async () => {
+	// 	// To test the promise-unexpectedly-resolved case, add `audioResource` to the array.
+	// 	const resources = [];
+	// 	const inputFile = fileWithPath('en-media--image.enex');
+	// 	const enexInput = await shim.fsDriver().readFile(inputFile);
+	// 	const promisedOutput = enexXmlToHtml(enexInput, resources);
 
-		promisedOutput.then(() => {
-			// Promise should not be resolved
-			expect(false).toEqual(true);
-		}, (reason) => {
-			expect(reason)
-				.toBe('Hash with no associated resource: 89ce7da62c6b2832929a6964237e98e9');
-		});
-	}));
+	// 	promisedOutput.then(() => {
+	// 		// Promise should not be resolved
+	// 		expect(false).toEqual(true);
+	// 	}, (reason) => {
+	// 		expect(reason)
+	// 			.toBe('Hash with no associated resource: 89ce7da62c6b2832929a6964237e98e9');
+	// 	});
+	// }));
 
 });

CliClient/tests/MarkupToHtml.js

@@ -0,0 +1,45 @@
+require('app-module-path').addPath(__dirname);
+
+const { asyncTest } = require('test-utils.js');
+const MarkupToHtml = require('lib/joplin-renderer/MarkupToHtml');
+
+describe('MarkupToHtml', function() {
+
+	it('should strip markup', asyncTest(async () => {
+		const service = new MarkupToHtml();
+
+		const testCases = {
+			[MarkupToHtml.MARKUP_LANGUAGE_MARKDOWN]: [
+				['', ''],
+				['## hello', 'hello'],
+				['## hello **hello!**', 'hello hello!'],
+				['*hi!*', 'hi!'],
+				['Some `code` here', 'Some code here'],
+				['Some <s>html</s> here', 'Some html here'],
+				['Some &amp; here', 'Some & here'],
+				['Some & here', 'Some & here'],
+				['[![image alt](:/fe9ea7fa727e4375b2e7d8a1b873314d)](https://example.com)', ''],
+			],
+			[MarkupToHtml.MARKUP_LANGUAGE_HTML]: [
+				['<h1>hello</h1>', 'hello'],
+				['Some <b>strong</b> text', 'Some strong text'],
+				['<b>M&amp;Ms</b>', 'M&Ms'],
+				['<style>BODY{margin:0;padding:0;background:#f0f0f0}</style>', ''],
+			],
+		};
+
+		for (const markup in testCases) {
+			for (const t of testCases[markup]) {
+				const input = t[0];
+				const expected = t[1];
+				const actual = service.stripMarkup(Number(markup), input);
+				expect(actual).toBe(expected, `Markup: ${markup}`);
+			}
+		}
+
+		expect(service.stripMarkup(1, 'one line\n\ntwo line', { collapseWhiteSpaces: true })).toBe('one line two line');
+		expect(service.stripMarkup(1, 'one line    two line', { collapseWhiteSpaces: true })).toBe('one line two line');
+		expect(service.stripMarkup(1, 'one line\n    two line', { collapseWhiteSpaces: true })).toBe('one line two line');
+	}));
+
+});

CliClient/tests/MdToHtml.js

@@ -140,7 +140,7 @@ describe('MdToHtml', function() {
 		// The style is instead in the cssStrings property.
 		const result = await mdToHtml.render('just **testing**', null, { bodyOnly: true });
 		expect(result.cssStrings.length).toBe(1);
-		expect(result.html.trim()).toBe('<p>just <strong>testing</strong></p>');
+		expect(result.html.trim()).toBe('just <strong>testing</strong>');
 	}));
 
 	it('should split HTML and CSS', asyncTest(async () => {

CliClient/tests/enex_to_html/attachment.html

@@ -2,6 +2,5 @@
   <div><a href="joplin://21ca2b948f222a38802940ec7e2e5de3" hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" alt="attachment-1">attachment-1</a></div>
   <div>
     <br>
-    <br>
   </div>
 </en-note>

CliClient/tests/enex_to_html/checklist-list.html

@@ -3,7 +3,7 @@
     <p>For example, consider an exported Evernote list with todo checkboxes like this:</p>
     <ul>
       <li>
-        <div><input type="checkbox" onclick="return false;">Foo</div>
+        <div><input checked="checked" type="checkbox" onclick="return false;">Foo</div>
       </li>
       <li>
         <div><input type="checkbox" onclick="return false;"><b>Bar</b></div>

CliClient/tests/enex_to_html/en-media--audio.html

@@ -8,6 +8,5 @@
   </div>
   <div>
     <br>
-    <br>
   </div>
 </en-note>

CliClient/tests/enex_to_html/en-media--image.html

@@ -4,11 +4,9 @@
   <div>
     <input type="checkbox" onclick="return false;">A test for <i>italic</i>
     <br>
-    <br>
   </div>
   <div>
     <br>
-    <br>
   </div>
   <div><i><img src=":/89ce7da62c6b2832929a6964237e98e9" hash="89ce7da62c6b2832929a6964237e98e9" type="image/jpeg" alt=""></i></div>
 </en-note>

CliClient/tests/file_api_driver.js

@@ -0,0 +1,126 @@
+/* eslint-disable no-unused-vars */
+
+require('app-module-path').addPath(__dirname);
+
+const { uuid } = require('lib/uuid.js');
+const { time } = require('lib/time-utils.js');
+const { asyncTest, sleep, fileApi, fileContentEqual, checkThrowAsync } = require('test-utils.js');
+const { shim } = require('lib/shim.js');
+const fs = require('fs-extra');
+const Setting = require('lib/models/Setting.js');
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+let api = null;
+
+// To test out an FileApi implementation:
+// * add a SyncTarget for your driver in `test-utils.js`
+// * set `syncTargetId_` to your New SyncTarget:
+//   `const syncTargetId_ = SyncTargetRegistry.nameToId('memory');`
+describe('fileApi', function() {
+
+	beforeEach(async (done) => {
+		api = new fileApi();
+		api.clearRoot();
+		done();
+	});
+
+	describe('list', function() {
+		it('should return items with relative path', asyncTest(async () => {
+			await api.mkdir('.subfolder');
+			await api.put('1', 'something on root 1');
+			await api.put('.subfolder/1', 'something subfolder 1');
+			await api.put('.subfolder/2', 'something subfolder 2');
+			await api.put('.subfolder/3', 'something subfolder 3');
+			sleep(0.8);
+
+			const response = await api.list('.subfolder');
+			const items = response.items;
+			expect(items.length).toBe(3);
+			expect(items[0].path).toBe('1');
+		}));
+
+		it('should default to only files on root directory', asyncTest(async () => {
+			await api.mkdir('.subfolder');
+			await api.put('.subfolder/1', 'something subfolder 1');
+			await api.put('file1', 'something 1');
+			await api.put('file2', 'something 2');
+			sleep(0.6);
+
+			const response = await api.list();
+			expect(response.items.length).toBe(2);
+		}));
+	}); // list
+
+	describe('delete', function() {
+		it('should not error if file does not exist', asyncTest(async () => {
+			const hasThrown = await checkThrowAsync(async () => await api.delete('nonexistant_file'));
+			expect(hasThrown).toBe(false);
+		}));
+
+		it('should delete specific file given full path', asyncTest(async () => {
+			await api.mkdir('deleteDir');
+			await api.put('deleteDir/1', 'something 1');
+			await api.put('deleteDir/2', 'something 2');
+			sleep(0.4);
+
+			await api.delete('deleteDir/1');
+			let response = await api.list('deleteDir');
+			expect(response.items.length).toBe(1);
+			response = await api.list('deleteDir/1');
+			expect(response.items.length).toBe(0);
+		}));
+	}); // delete
+
+	describe('get', function() {
+		it('should return null if object does not exist', asyncTest(async () => {
+			const response = await api.get('nonexistant_file');
+			expect(response).toBe(null);
+		}));
+
+		it('should return UTF-8 encoded string by default', asyncTest(async () => {
+			await api.put('testnote.md', 'something 2');
+
+			const response = await api.get('testnote.md');
+			expect(response).toBe('something 2');
+		}));
+
+		it('should return a Response object and writes file to options.path, if options.target is "file"', asyncTest(async () => {
+			const localFilePath = `${Setting.value('tempDir')}/${uuid.create()}.md`;
+			await api.put('testnote.md', 'something 2');
+			sleep(0.2);
+
+			const response = await api.get('testnote.md', { target: 'file', path: localFilePath });
+			expect(typeof response).toBe('object');
+			// expect(response.path).toBe(localFilePath);
+			expect(fs.existsSync(localFilePath)).toBe(true);
+			expect(fs.readFileSync(localFilePath, 'utf8')).toBe('something 2');
+		}));
+	}); // get
+
+	describe('put', function() {
+		it('should create file to remote path and content', asyncTest(async () => {
+			await api.put('putTest.md', 'I am your content');
+			sleep(0.2);
+
+			const response = await api.get('putTest.md');
+			expect(response).toBe('I am your content');
+		}));
+
+		it('should upload file in options.path to remote path, if options.source is "file"', asyncTest(async () => {
+			const localFilePath = `${Setting.value('tempDir')}/${uuid.create()}.md`;
+			fs.writeFileSync(localFilePath, 'I am the local file.');
+
+			await api.put('testfile', 'ignore me', { source: 'file', path: localFilePath });
+			sleep(0.2);
+
+			const response = await api.get('testfile');
+			expect(response).toBe('I am the local file.');
+		}));
+	}); // put
+
+});

CliClient/tests/markdownUtils.js

@@ -100,41 +100,4 @@ describe('markdownUtils', function() {
 		}
 	}));
 
-	it('should remove Markdown syntax elements from the text', asyncTest(async () => {
-		const inputStrings = [
-			'', // Empty string
-			'This is some plain text', // Plain text
-			'## This is a header', // Header syntax
-			'This is a text with **bold** and *italicized* text', // Text with annotations
-			'This is a text with __bold__ and _italicized_ text', // Text with annotations alternate form
-			'[link to google](https://www.google.com/)', // Link
-			'> This is a blockquote\n And another line', // Blockquote
-			'* List item\n* List item', // Unordered list
-			'- List item\n- List item', // Unordered list
-			'1. List item\n2. List item', // Ordered list
-			'This is some `inline code`', // Inlined code
-		];
-
-		const expectedOutputStrings = [
-			'',
-			'This is some plain text',
-			'This is a header',
-			'This is a text with bold and italicized text',
-			'This is a text with bold and italicized text',
-			'link to google',
-			'This is a blockquote\n And another line',
-			'List item\nList item',
-			'List item\nList item',
-			'List item\nList item',
-			'This is some inline code',
-		];
-
-		expect(inputStrings.length).toBe(expectedOutputStrings.length);
-
-		for (let i = 0; i < inputStrings.length; i++) {
-			const outputString = markdownUtils.stripMarkdown(inputStrings[i]);
-			expect(outputString).toBe(expectedOutputStrings[i]);
-		}
-	}));
-
 });

CliClient/tests/md_to_html/code_block.html

@@ -1,5 +1,5 @@
 <div class="joplin-editable"><pre class="joplin-source" data-joplin-language="javascript" data-joplin-source-open="```javascript&#10;" data-joplin-source-close="&#10;```">function() {
     console.info('bonjour');
 }</pre><pre class="hljs"><code><span class="hljs-function"><span class="hljs-keyword">function</span>(<span class="hljs-params"></span>) </span>{
-    <span class="hljs-built_in">console</span>.info(<span class="hljs-string">'bonjour'</span>);
+    <span class="hljs-built_in">console</span>.info(<span class="hljs-string">&#x27;bonjour&#x27;</span>);
 }</code></pre></div>