diff --git a/package.json b/package.json index 3a28ac4d..46ec0868 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "flux": "^3.1.3", "jquery": "^3.4.0", "jquery-ui": "^1.12.1", - "markdown": "^0.5.0", + "marked": "^1.0.0", "prop-types": "^15.7.2", "q": "^1.5.1", "raphael": "^2.1.0", diff --git a/src/js/util/debug.js b/src/js/util/debug.js index a9359f1d..227e6113 100644 --- a/src/js/util/debug.js +++ b/src/js/util/debug.js @@ -30,7 +30,7 @@ var toGlobalize = { Level: require('../level'), Sandbox: require('../sandbox/'), GitDemonstrationView: require('../views/gitDemonstrationView'), - Markdown: require('markdown'), + Markdown: require('marked'), LevelDropdownView: require('../views/levelDropdownView'), BuilderViews: require('../views/builderViews'), Util: require('../util/index'), @@ -59,4 +59,3 @@ $(document).ready(function() { return toGlobalize.Main.getSandbox().mainVis.gitEngine.printAndCopyTree(); }; }); - diff --git a/src/js/views/builderViews.js b/src/js/views/builderViews.js index 592e1975..c3931519 100644 --- a/src/js/views/builderViews.js +++ b/src/js/views/builderViews.js @@ -1,5 +1,6 @@ var _ = require('underscore'); var Q = require('q'); +var marked = require('marked'); var Views = require('../views'); var throttle = require('../util/throttle'); @@ -122,7 +123,7 @@ var MarkdownGrabber = ContainedBase.extend({ updatePreview: function() { var raw = this.getRawText(); - var HTML = require('markdown').markdown.toHTML(raw); + var HTML = marked(raw); this.$('div.insidePreview').html(HTML); } }); diff --git a/src/js/views/gitDemonstrationView.js b/src/js/views/gitDemonstrationView.js index fc1da36d..65a841e7 100644 --- a/src/js/views/gitDemonstrationView.js +++ b/src/js/views/gitDemonstrationView.js @@ -1,6 +1,7 @@ var _ = require('underscore'); var Q = require('q'); var Backbone = require('backbone'); +var marked = require('marked'); var util = require('../util'); var intl = require('../intl'); @@ -43,7 +44,7 @@ var GitDemonstrationView = ContainedBase.extend({ ); var convert = function(markdowns) { - return require('markdown').markdown.toHTML(markdowns.join('\n')); + return marked(markdowns.join('\n')); }; this.JSON.beforeHTML = convert(this.JSON.beforeMarkdowns); diff --git a/src/js/views/index.js b/src/js/views/index.js index e5c79b12..ab825f28 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -1,6 +1,7 @@ var _ = require('underscore'); var Q = require('q'); var Backbone = require('backbone'); +var marked = require('marked'); var Main = require('../app'); var intl = require('../intl'); @@ -356,7 +357,7 @@ var ModalAlert = ContainedBase.extend({ render: function() { var HTML = (this.JSON.markdown) ? - require('markdown').markdown.toHTML(this.JSON.markdown) : + marked(this.JSON.markdown) : this.template(this.JSON); // one more hack -- allow adding custom random HTML if specified if (this.options._dangerouslyInsertHTML) { diff --git a/yarn.lock b/yarn.lock index 4d1979a2..42281e10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -202,11 +202,6 @@ JSONStream@^1.0.3: jsonparse "^1.2.0" through ">=2.2.7 <3" -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2, acorn-node@^1.6.1: version "1.8.2" resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" @@ -3065,12 +3060,10 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -markdown@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/markdown/-/markdown-0.5.0.tgz#28205b565a8ae7592de207463d6637dc182722b2" - integrity sha1-KCBbVlqK51kt4gdGPWY33BgnIrI= - dependencies: - nopt "~2.1.1" +marked@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-1.0.0.tgz#d35784245a04871e5988a491e28867362e941693" + integrity sha512-Wo+L1pWTVibfrSr+TTtMuiMfNzmZWiOPeO7rZsQUY5bgsxpHesBEcIWJloWVTFnrMXnf/TL30eTFSGJddmQAng== matchdep@^2.0.0: version "2.0.0" @@ -3305,13 +3298,6 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" -nopt@~2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-2.1.2.tgz#6cccd977b80132a07731d6e8ce58c2c8303cf9af" - integrity sha1-bMzZd7gBMqB3MdbozljCyDA8+a8= - dependencies: - abbrev "1" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"