dependencies: Upgrade to-markdown 3.1.1 to turndown 5.0.3.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
zulip · Nov 12, 2019 · fffef41 · fffef41
1 parent cce85f6
commit fffef41
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 193 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -180,7 +180,6 @@
         "templates": false,
         "tictactoe_widget": false,
         "timerender": false,
-        "toMarkdown": false,
         "todo_widget": false,
         "top_left_corner": false,
         "topic_data": false,

diff --git a/frontend_tests/node_tests/copy_and_paste.js b/frontend_tests/node_tests/copy_and_paste.js
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "stacktrace-gps": "^3.0.3",
     "style-loader": "^1.0.0",
     "terser-webpack-plugin": "^2.1.0",
-    "to-markdown": "^3.1.0",
+    "turndown": "^5.0.3",
     "underscore": "^1.9.1",
     "webfonts-loader": "^5.0.0",
     "webpack": "^4.33.0",

diff --git a/static/js/bundles/app.js b/static/js/bundles/app.js
@@ -15,7 +15,6 @@ import "blueimp-md5/js/md5.js";
 import "clipboard/dist/clipboard.js";
 import "winchan/winchan.js";
 import "handlebars/dist/cjs/handlebars.runtime.js";
-import "to-markdown/dist/to-markdown.js";
 import "flatpickr/dist/flatpickr.js";
 import "flatpickr/dist/plugins/confirmDate/confirmDate.js";
 import "sortablejs/Sortable.js";

diff --git a/static/js/copy_and_paste.js b/static/js/copy_and_paste.js
@@ -1,3 +1,5 @@
+const TurndownService = require("turndown/lib/turndown.cjs.js");
+
 function find_boundary_tr(initial_tr, iterate_row) {
     var j;
     var skip_same_td_check = false;
@@ -259,53 +261,36 @@ exports.analyze_selection = function (selection) {
 };
 
 exports.paste_handler_converter = function (paste_html) {
-    var converters = {
-        converters: [
-            {
-                filter: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'],
-                replacement: function (content) {
-                    return content;
-                },
-            },
-
-            {
-                filter: ['em', 'i'],
-                replacement: function (content) {
-                    return '*' + content + '*';
-                },
-            },
-            {
-                // Checks for raw links without custom text or title.
-                filter: function (node) {
-                    return node.nodeName === "A" &&
-                      node.href === node.innerHTML &&
-                      node.href === node.title;
-                },
-                replacement: function (content) {
-                    return content;
-                },
-            },
-            {
-                // Checks for escaped ordered list syntax.
-                filter: function (node) {
-                    return /(\d+)\\\. /.test(node.innerHTML);
-                },
-                replacement: function (content) {
-                    return content.replace(/(\d+)\\\. /g, '$1. ');
-                },
-            },
-        ],
-    };
-    var markdown_html = toMarkdown(paste_html, converters);
-
-    // Now that we've done the main conversion, we want to remove
-    // any HTML tags that weren't converted to markdown-style
-    // text, since Bugdown doesn't support those.
-    var div = document.createElement("div");
-    div.innerHTML = markdown_html;
-    // Using textContent for modern browsers, innerText works for Internet Explorer
-    var markdown_text = div.textContent || div.innerText || "";
-    markdown_text = markdown_text.trim();
+    const turndownService = new TurndownService();
+    turndownService.addRule('headings', {
+        filter: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'],
+        replacement: function (content) {
+            return content;
+        },
+    });
+    turndownService.addRule('emphasis', {
+        filter: ['em', 'i'],
+        replacement: function (content) {
+            return '*' + content + '*';
+        },
+    });
+    // Checks for raw links without custom text or title.
+    turndownService.addRule('links', {
+        filter: function (node) {
+            return node.nodeName === "A" &&
+                node.href === node.innerHTML &&
+                node.href === node.title;
+        },
+        replacement: function (content) {
+            return content;
+        },
+    });
+
+    let markdown_text = turndownService.turndown(paste_html);
+
+    // Checks for escaped ordered list syntax.
+    markdown_text = markdown_text.replace(/^(\W* {0,3})(\d+)\\\. /gm, '$1$2. ');
+
     // Removes newlines before the start of a list and between list elements.
     markdown_text = markdown_text.replace(/\n+([*+-])/g, '\n$1');
     return markdown_text;

diff --git a/tools/webpack.config.ts b/tools/webpack.config.ts
@@ -230,7 +230,6 @@ export default (env?: string): webpack.Configuration[] => {
         { path: "jquery/dist/jquery.js", name: ['$', 'jQuery'] },
         { path: "underscore/underscore.js", name: '_' },
         { path: "handlebars/dist/cjs/handlebars.runtime.js", name: 'Handlebars' },
-        { path: "to-markdown/dist/to-markdown.js", name: 'toMarkdown' },
         { path: "sortablejs/Sortable.js"},
         { path: "winchan/winchan.js", name: 'WinChan'},
     ];

diff --git a/version.py b/version.py
@@ -26,4 +26,4 @@
 #   historical commits sharing the same major version, in which case a
 #   minor version bump suffices.
 
-PROVISION_VERSION = '64.0'
+PROVISION_VERSION = '65.0'