From 74a797b4109100c3c907dc731b6fd44bc8b5b995 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 30 Dec 2020 00:17:15 +0000 Subject: [PATCH 1/2] Desktop, Cli: Fixed importing ENEX files that contain hidden sections --- packages/lib/import-enex-md-gen.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/lib/import-enex-md-gen.ts b/packages/lib/import-enex-md-gen.ts index 796e7e21e..bae9c3233 100644 --- a/packages/lib/import-enex-md-gen.ts +++ b/packages/lib/import-enex-md-gen.ts @@ -1262,6 +1262,12 @@ function renderLine(line: any) { let hiddenLines = ['
']; hiddenLines = hiddenLines.concat(renderLines(line.lines)); hiddenLines.push('
'); + + // We need to add two new lines after the HTML block, or the Markdown + // after that will not render. + // https://github.com/markdown-it/markdown-it/issues/746 + hiddenLines.push(NEWLINE); + hiddenLines.push(NEWLINE); return hiddenLines; } else if (typeof line === 'object') { console.warn('Unhandled object type:', line); From 9e076bf19401dcb9bf20835564aff2a8d9b6e91c Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 30 Dec 2020 00:18:46 +0000 Subject: [PATCH 2/2] Desktop release v1.5.14 --- packages/app-desktop/package-lock.json | 2 +- packages/app-desktop/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app-desktop/package-lock.json b/packages/app-desktop/package-lock.json index 85aa77f8e..bab54746e 100644 --- a/packages/app-desktop/package-lock.json +++ b/packages/app-desktop/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/app-desktop", - "version": "1.5.13", + "version": "1.5.14", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json index d3511b818..64c202eb2 100644 --- a/packages/app-desktop/package.json +++ b/packages/app-desktop/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/app-desktop", - "version": "1.5.13", + "version": "1.5.14", "description": "Joplin for Desktop", "main": "main.js", "private": true,